Update library. Fix an expression error in advanced-criteria. Add message if there are no subjects in each category.
This commit is contained in:
parent
94fc9bda53
commit
500dd61f9b
|
@ -1 +1 @@
|
||||||
Subproject commit 0face4b57f291ea0168fe0d8fe32b51ebb1850d8
|
Subproject commit 8d8eda416b4873c50f689db54444f135396db56d
|
|
@ -48,7 +48,7 @@ import {CommunityInfo} from "../../openaireLibrary/connect/community/communityIn
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<fs-modal #filtersModal (okEmitter)="saveCriteria()" (cancelEmitter)="criteria.reset()"
|
<fs-modal #filtersModal (okEmitter)="saveCriteria()" (cancelEmitter)="criteria.reset()"
|
||||||
[okButtonDisabled]="criteria && criteria.disabled">
|
[okButtonDisabled]="!criteria || criteria.disabled">
|
||||||
<div *ngIf="selectionCriteria" class="uk-container uk-container-large">
|
<div *ngIf="selectionCriteria" class="uk-container uk-container-large">
|
||||||
<criteria #criteria [height]="filtersModal.bodyHeight" [entityType]="'criterion'"
|
<criteria #criteria [height]="filtersModal.bodyHeight" [entityType]="'criterion'"
|
||||||
[entityTypePlural]="'criteria'" [selectionCriteria]="selectionCriteria">
|
[entityTypePlural]="'criteria'" [selectionCriteria]="selectionCriteria">
|
||||||
|
|
|
@ -31,19 +31,19 @@
|
||||||
<li class="uk-active" *ngIf="displayedAllSubjects?.length" (click)="groupSubjects(displayedAllSubjects, 'all')">
|
<li class="uk-active" *ngIf="displayedAllSubjects?.length" (click)="groupSubjects(displayedAllSubjects, 'all')">
|
||||||
<a>All ({{displayedAllSubjects.length}})</a>
|
<a>All ({{displayedAllSubjects.length}})</a>
|
||||||
</li>
|
</li>
|
||||||
<li *ngIf="displayedSubjects?.length" (click)="groupSubjects(displayedSubjects, 'freeText')">
|
<li (click)="groupSubjects(displayedSubjects, 'freeText')">
|
||||||
<a>Free Text ({{displayedSubjects.length}})</a>
|
<a>Free Text ({{displayedSubjects.length}})</a>
|
||||||
</li>
|
</li>
|
||||||
<li *ngIf="displayedSdg?.length" (click)="groupSubjects(displayedSdg, 'sdg')">
|
<li (click)="groupSubjects(displayedSdg, 'sdg')">
|
||||||
<a>SDGs ({{displayedSdg.length}})</a>
|
<a>SDGs ({{displayedSdg.length}})</a>
|
||||||
</li>
|
</li>
|
||||||
<li *ngIf="displayedFos?.length" (click)="groupSubjects(displayedFos, 'fos')">
|
<li (click)="groupSubjects(displayedFos, 'fos')">
|
||||||
<a>Fields of Science ({{displayedFos.length}})</a>
|
<a>Fields of Science ({{displayedFos.length}})</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<ul class="uk-switcher">
|
<ul class="uk-switcher">
|
||||||
<li *ngIf="displayedAllSubjects?.length">
|
<li>
|
||||||
<ng-container *ngIf="groupedAllSubjects?.length">
|
<ng-container *ngIf="displayedAllSubjects?.length">
|
||||||
<div>
|
<div>
|
||||||
<ul class="uk-nav uk-nav-default uk-flex uk-flex-wrap">
|
<ul class="uk-nav uk-nav-default uk-flex uk-flex-wrap">
|
||||||
<li *ngFor="let item of groupedAllSubjects; let i = index;" class="uk-margin-right" [class.uk-margin-left]="i != 0"
|
<li *ngFor="let item of groupedAllSubjects; let i = index;" class="uk-margin-right" [class.uk-margin-left]="i != 0"
|
||||||
|
@ -97,9 +97,14 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
<ng-container *ngIf="displayedAllSubjects?.length === 0">
|
||||||
|
<div class="uk-position-relative uk-height-medium">
|
||||||
|
<h6 class="uk-position-center uk-margin-remove">There are no subjects yet</h6>
|
||||||
|
</div>
|
||||||
|
</ng-container>
|
||||||
</li>
|
</li>
|
||||||
<li *ngIf="displayedSubjects?.length">
|
<li>
|
||||||
<ng-container *ngIf="groupedSubjects?.length">
|
<ng-container *ngIf="displayedSubjects?.length">
|
||||||
<div>
|
<div>
|
||||||
<ul class="uk-nav uk-nav-default uk-flex uk-flex-wrap">
|
<ul class="uk-nav uk-nav-default uk-flex uk-flex-wrap">
|
||||||
<li *ngFor="let item of groupedSubjects; let i = index;" class="uk-margin-right" [class.uk-margin-left]="i != 0"
|
<li *ngFor="let item of groupedSubjects; let i = index;" class="uk-margin-right" [class.uk-margin-left]="i != 0"
|
||||||
|
@ -153,9 +158,14 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
<ng-container *ngIf="displayedSubjects?.length === 0">
|
||||||
|
<div class="uk-position-relative uk-height-medium">
|
||||||
|
<h6 class="uk-position-center uk-margin-remove">There are no subjects yet</h6>
|
||||||
|
</div>
|
||||||
|
</ng-container>
|
||||||
</li>
|
</li>
|
||||||
<li *ngIf="displayedSdg?.length">
|
<li>
|
||||||
<ng-container *ngIf="groupedSdg?.length">
|
<ng-container *ngIf="displayedSdg?.length">
|
||||||
<div>
|
<div>
|
||||||
<ul class="uk-nav uk-nav-default uk-flex uk-flex-wrap">
|
<ul class="uk-nav uk-nav-default uk-flex uk-flex-wrap">
|
||||||
<li *ngFor="let item of groupedSdg; let i = index;" class="uk-margin-right" [class.uk-margin-left]="i != 0"
|
<li *ngFor="let item of groupedSdg; let i = index;" class="uk-margin-right" [class.uk-margin-left]="i != 0"
|
||||||
|
@ -209,9 +219,14 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
<ng-container *ngIf="displayedSdg?.length === 0">
|
||||||
|
<div class="uk-position-relative uk-height-medium">
|
||||||
|
<h6 class="uk-position-center uk-margin-remove">There are no subjects yet</h6>
|
||||||
|
</div>
|
||||||
|
</ng-container>
|
||||||
</li>
|
</li>
|
||||||
<li *ngIf="displayedFos?.length">
|
<li>
|
||||||
<ng-container *ngIf="groupedFos?.length">
|
<ng-container *ngIf="displayedFos?.length">
|
||||||
<div>
|
<div>
|
||||||
<ul class="uk-nav uk-nav-default uk-flex uk-flex-wrap">
|
<ul class="uk-nav uk-nav-default uk-flex uk-flex-wrap">
|
||||||
<li *ngFor="let item of groupedFos; let i = index;" class="uk-margin-right" [class.uk-margin-left]="i != 0"
|
<li *ngFor="let item of groupedFos; let i = index;" class="uk-margin-right" [class.uk-margin-left]="i != 0"
|
||||||
|
@ -265,7 +280,13 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
<ng-container *ngIf="displayedFos?.length === 0">
|
||||||
|
<div class="uk-position-relative uk-height-medium">
|
||||||
|
<h6 class="uk-position-center uk-margin-remove">There are no subjects yet</h6>
|
||||||
|
</div>
|
||||||
|
</ng-container>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -10,7 +10,9 @@ import {AlertModal} from '../../../openaireLibrary/utils/modal/alert';
|
||||||
import {SearchInputComponent} from '../../../openaireLibrary/sharedComponents/search-input/search-input.component';
|
import {SearchInputComponent} from '../../../openaireLibrary/sharedComponents/search-input/search-input.component';
|
||||||
import {forkJoin, Subscription} from 'rxjs';
|
import {forkJoin, Subscription} from 'rxjs';
|
||||||
import {CommunityInfo} from '../../../openaireLibrary/connect/community/communityInfo';
|
import {CommunityInfo} from '../../../openaireLibrary/connect/community/communityInfo';
|
||||||
import {FullScreenModalComponent} from 'src/app/openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.component';
|
import {
|
||||||
|
FullScreenModalComponent
|
||||||
|
} from 'src/app/openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.component';
|
||||||
import {HelperFunctions} from 'src/app/openaireLibrary/utils/HelperFunctions.class';
|
import {HelperFunctions} from 'src/app/openaireLibrary/utils/HelperFunctions.class';
|
||||||
import {NotificationHandler} from "../../../openaireLibrary/utils/notification-handler";
|
import {NotificationHandler} from "../../../openaireLibrary/utils/notification-handler";
|
||||||
import {ClearCacheService} from "../../../openaireLibrary/services/clear-cache.service";
|
import {ClearCacheService} from "../../../openaireLibrary/services/clear-cache.service";
|
||||||
|
|
Loading…
Reference in New Issue