MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Fixes bug on get Draft Dmps when clicking "VIEW ALL" on DRAFT table on /home and makes Draft radio button on filters checked

This commit is contained in:
apapachristou 2019-09-17 11:40:49 +03:00
parent f851c138d3
commit 26147d0c9e
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html
View File

@ -16,7 +16,7 @@
<div class="col-10 gray-container" > <div class="col-10 gray-container" >
<h6 class="category-title">{{'CRITERIA.DATA-SETS.STATUS'| translate}}</h6> <h6 class="category-title">{{'CRITERIA.DATA-SETS.STATUS'| translate}}</h6>
<mat-radio-group aria-label="Select an option" [formControl]="formGroup.get('status')"> <mat-radio-group aria-label="Select an option" [formControl]="formGroup.get('status')">
<mat-list-item><mat-radio-button value="0">{{ 'TYPES.DATASET-STATUS.DRAFT' | translate }}</mat-radio-button></mat-list-item> <mat-list-item><mat-radio-button value="0" [checked]="status == 0">{{ 'TYPES.DATASET-STATUS.DRAFT' | translate }}</mat-radio-button></mat-list-item>
<mat-list-item><mat-radio-button value="1">{{ 'TYPES.DATASET-STATUS.FINALISED' | translate }}</mat-radio-button></mat-list-item> <mat-list-item><mat-radio-button value="1">{{ 'TYPES.DATASET-STATUS.FINALISED' | translate }}</mat-radio-button></mat-list-item>
<mat-list-item><mat-radio-button value="null">{{ 'TYPES.DATASET-STATUS.ANY' | translate }}</mat-radio-button></mat-list-item> <mat-list-item><mat-radio-button value="null">{{ 'TYPES.DATASET-STATUS.ANY' | translate }}</mat-radio-button></mat-list-item>
</mat-radio-group> </mat-radio-group>

1
dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts
View File

@ -43,6 +43,7 @@ import { DatasetService } from '../../../../core/services/dataset/dataset.servic
export class DatasetCriteriaComponent extends BaseCriteriaComponent implements OnInit { export class DatasetCriteriaComponent extends BaseCriteriaComponent implements OnInit {
@Input() dmpSearchEnabled; @Input() dmpSearchEnabled;
@Input() status;
public criteria: any; public criteria: any;
public filteringTagsAsync = false; public filteringTagsAsync = false;
public filteredTags: ExternalSourceItemModel[]; public filteredTags: ExternalSourceItemModel[];

2
dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html
View File

@ -15,7 +15,7 @@
<div class="card-body table-responsive"> <div class="card-body table-responsive">
<div class="listing row"> <div class="listing row">
<div class="col-3"> <div class="col-3">
<app-dataset-criteria-component class="col-auto"></app-dataset-criteria-component> <app-dataset-criteria-component [status]="status" class="col-auto"></app-dataset-criteria-component>
</div> </div>
<div class="col-9"> <div class="col-9">
<div *ngFor="let item of listingItems; let i = index"> <div *ngFor="let item of listingItems; let i = index">

2
dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts
View File

@ -81,8 +81,8 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB
if (this.status != null && this.status == DatasetStatus.Draft) { if (this.status != null && this.status == DatasetStatus.Draft) {
this.criteria.setCriteria(this.getDraftCriteria()); this.criteria.setCriteria(this.getDraftCriteria());
this.refresh();
this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages)); this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages));
this.refresh();
} }
}); });
} }