Fixed filter fields
This commit is contained in:
parent
3d970bc3ce
commit
7414853a2e
|
@ -2,24 +2,30 @@
|
||||||
<div class="filters">
|
<div class="filters">
|
||||||
<h6 class="filters-title">{{'CRITERIA.FILTERS'| translate}}</h6>
|
<h6 class="filters-title">{{'CRITERIA.FILTERS'| translate}}</h6>
|
||||||
<div class="row" style="justify-content: center;">
|
<div class="row" style="justify-content: center;">
|
||||||
<!-- Search -->
|
<!-- Search Filter-->
|
||||||
<mat-form-field class="col-11 search">
|
<mat-form-field class="col-11 search">
|
||||||
<input matInput placeholder="{{'CRITERIA.DMP.LIKE'| translate}}" name="projectCriteriaLike"
|
<input matInput placeholder="{{'CRITERIA.PROJECTS.LIKE'| translate}}" name="projectCriteriaLike"
|
||||||
[formControl]="formGroup.get('like')" (ngModelChange)="controlModified()">
|
[formControl]="formGroup.get('like')" (ngModelChange)="controlModified()">
|
||||||
<mat-error *ngIf="formGroup.get('like').hasError('backendError')">
|
<mat-error *ngIf="formGroup.get('like').hasError('backendError')">
|
||||||
{{formGroup.get('like').getError('backendError').message}}</mat-error>
|
{{formGroup.get('like').getError('backendError').message}}</mat-error>
|
||||||
<mat-icon matSuffix class="style-icon">search</mat-icon>
|
<mat-icon matSuffix class="style-icon">search</mat-icon>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
<!-- End of Search -->
|
<!-- End of Search Filter -->
|
||||||
|
|
||||||
<div *ngIf="showProject" class="col-10 filter-category" [formGroup]="options">
|
<!-- Visibility Filter-->
|
||||||
<h6 class="category-title">STATUS</h6>
|
|
||||||
<mat-list-item><mat-checkbox formControlName="getDrafts">{{ 'TYPES.DATASET-STATUS.DRAFT' | translate }}</mat-checkbox></mat-list-item>
|
|
||||||
<mat-list-item><mat-checkbox formControlName="getFinalized">{{ 'TYPES.DATASET-STATUS.FINALISED' | translate }}</mat-checkbox></mat-list-item>
|
|
||||||
<mat-list-item><mat-checkbox formControlName="getDmpStatuses">{{ 'TYPES.DATASET-STATUS.ANY' | translate }}</mat-checkbox></mat-list-item>
|
|
||||||
</div>
|
|
||||||
<div *ngIf="showProject" class="col-10 filter-category">
|
<div *ngIf="showProject" class="col-10 filter-category">
|
||||||
<h6 class="category-title">RELATED PROJECT</h6>
|
<h6 class="category-title">{{ 'TYPES.DMP-VISIBILITY.VISIBILITY' | translate }}</h6>
|
||||||
|
<mat-radio-group aria-label="Select an option">
|
||||||
|
<mat-list-item><mat-radio-button value="1">{{ 'TYPES.DMP-VISIBILITY.ANY' | translate }}</mat-radio-button></mat-list-item>
|
||||||
|
<mat-list-item><mat-radio-button value="2">{{ 'TYPES.DMP-VISIBILITY.PUBLIC' | translate }}</mat-radio-button></mat-list-item>
|
||||||
|
<mat-list-item><mat-radio-button value="3">{{ 'TYPES.DMP-VISIBILITY.PRIVATE' | translate }}</mat-radio-button></mat-list-item>
|
||||||
|
</mat-radio-group>
|
||||||
|
</div>
|
||||||
|
<!-- End of Visibility Filter-->
|
||||||
|
|
||||||
|
<!-- Related Project Filters -->
|
||||||
|
<div *ngIf="showProject" class="col-10 filter-category">
|
||||||
|
<h6 class="category-title">{{ 'DMP-RELATED-PROJECT.RELATED-PROJECT' | translate}}</h6>
|
||||||
<mat-form-field>
|
<mat-form-field>
|
||||||
<app-multiple-auto-complete [formControl]="formGroup.get('projects')"
|
<app-multiple-auto-complete [formControl]="formGroup.get('projects')"
|
||||||
placeholder="{{'CRITERIA.DMP.SELECT-PROJECTS' | translate}}"
|
placeholder="{{'CRITERIA.DMP.SELECT-PROJECTS' | translate}}"
|
||||||
|
@ -28,14 +34,34 @@
|
||||||
<mat-icon matSuffix class="style-icon">arrow_drop_down</mat-icon>
|
<mat-icon matSuffix class="style-icon">arrow_drop_down</mat-icon>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- End of Related Projects Filters -->
|
||||||
|
|
||||||
|
<!-- Collaborators Filter -->
|
||||||
<div *ngIf="showProject" class="col-10 filter-category">
|
<div *ngIf="showProject" class="col-10 filter-category">
|
||||||
<h6 class="category-title">ROLE</h6>
|
<h6 class="category-title">{{ 'DMP-RELATED-COLLABORATOR.RELATED-COLLABORATOR' | translate}}</h6>
|
||||||
|
<mat-form-field>
|
||||||
|
<input matInput placeholder="Select collaborators">
|
||||||
|
<!-- <app-multiple-auto-complete [formControl]="formGroup.get('projects')"
|
||||||
|
placeholder="{{'CRITERIA.DMP.SELECT-PROJECTS' | translate}}"
|
||||||
|
[configuration]="projectAutoCompleteConfiguration">
|
||||||
|
</app-multiple-auto-complete> -->
|
||||||
|
<mat-icon matSuffix class="style-icon">arrow_drop_down</mat-icon>
|
||||||
|
</mat-form-field>
|
||||||
|
</div>
|
||||||
|
<!-- End of Collaborators Filter -->
|
||||||
|
|
||||||
|
<!-- Role Filter -->
|
||||||
|
<div *ngIf="showProject" class="col-10 filter-category">
|
||||||
|
<h6 class="category-title">{{ 'DATASET-PROFILE-LISTING.COLUMNS.ROLE' | translate }}</h6>
|
||||||
<mat-radio-group aria-label="Select an option">
|
<mat-radio-group aria-label="Select an option">
|
||||||
<mat-list-item><mat-radio-button value="1">{{ 'TYPES.DATASET-ROLE.ANY' | translate }}</mat-radio-button></mat-list-item>
|
<mat-list-item><mat-radio-button value="1">{{ 'TYPES.DATASET-ROLE.ANY' | translate }}</mat-radio-button></mat-list-item>
|
||||||
<mat-list-item><mat-radio-button value="2">{{ 'TYPES.DATASET-ROLE.OWNER' | translate }}</mat-radio-button></mat-list-item>
|
<mat-list-item><mat-radio-button value="2">{{ 'TYPES.DATASET-ROLE.OWNER' | translate }}</mat-radio-button></mat-list-item>
|
||||||
<mat-list-item><mat-radio-button value="3">{{ 'TYPES.DATASET-ROLE.MEMBER' | translate }}</mat-radio-button></mat-list-item>
|
<mat-list-item><mat-radio-button value="3">{{ 'TYPES.DATASET-ROLE.MEMBER' | translate }}</mat-radio-button></mat-list-item>
|
||||||
</mat-radio-group>
|
</mat-radio-group>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- End of Role Filter -->
|
||||||
|
|
||||||
|
<!-- Related Organization Filter -->
|
||||||
<div *ngIf="showProject" class="col-10 filter-category">
|
<div *ngIf="showProject" class="col-10 filter-category">
|
||||||
<h6 class="category-title">RELATED ORGANIZATION</h6>
|
<h6 class="category-title">RELATED ORGANIZATION</h6>
|
||||||
<mat-form-field>
|
<mat-form-field>
|
||||||
|
@ -47,7 +73,9 @@
|
||||||
<mat-icon matSuffix class="style-icon">arrow_drop_down</mat-icon>
|
<mat-icon matSuffix class="style-icon">arrow_drop_down</mat-icon>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- End of Related Organization Filter -->
|
||||||
|
|
||||||
|
<!-- Import Button -->
|
||||||
<div class="col-10 import">
|
<div class="col-10 import">
|
||||||
<button class="importButton" mat-raised-button color="primary"
|
<button class="importButton" mat-raised-button color="primary"
|
||||||
(click)="fileSave($event)" type="button col-auto">
|
(click)="fileSave($event)" type="button col-auto">
|
||||||
|
|
|
@ -592,6 +592,12 @@
|
||||||
"FINALISED": "Finalized",
|
"FINALISED": "Finalized",
|
||||||
"DRAFT": "Draft"
|
"DRAFT": "Draft"
|
||||||
},
|
},
|
||||||
|
"DMP-VISIBILITY": {
|
||||||
|
"VISIBILITY": "Visibility",
|
||||||
|
"PUBLIC": "Public",
|
||||||
|
"PRIVATE": "Private",
|
||||||
|
"ANY": "Any"
|
||||||
|
},
|
||||||
"DATASET-PROFILE-FIELD-VALIDATION-TYPE": {
|
"DATASET-PROFILE-FIELD-VALIDATION-TYPE": {
|
||||||
"NONE": "None",
|
"NONE": "None",
|
||||||
"REQUIRED": "Required"
|
"REQUIRED": "Required"
|
||||||
|
@ -631,6 +637,12 @@
|
||||||
"SAVE": "Save"
|
"SAVE": "Save"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"DMP-RELATED-PROJECT": {
|
||||||
|
"RELATED-PROJECT": "Related Project"
|
||||||
|
},
|
||||||
|
"DMP-RELATED-COLLABORATOR": {
|
||||||
|
"RELATED-COLLABORATOR": "Related Collaborator"
|
||||||
|
},
|
||||||
"DATASET-PROFILE": {
|
"DATASET-PROFILE": {
|
||||||
"PREVIEW": "Preview",
|
"PREVIEW": "Preview",
|
||||||
"FORM-DESCRIPTION": "Form Description",
|
"FORM-DESCRIPTION": "Form Description",
|
||||||
|
|
Loading…
Reference in New Issue