diff --git a/dmp-backend/src/main/java/eu/eudat/models/listingmodels/DataManagementPlanListingModel.java b/dmp-backend/src/main/java/eu/eudat/models/listingmodels/DataManagementPlanListingModel.java index b10ab6a5f..8cbdd317f 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/listingmodels/DataManagementPlanListingModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/listingmodels/DataManagementPlanListingModel.java @@ -18,7 +18,7 @@ public class DataManagementPlanListingModel implements DataModel { private String label; private String project; private String profile; - private String researchers; + private String creationTime; private String organisations; private String version; private Integer numOfDatasets; @@ -55,12 +55,12 @@ public class DataManagementPlanListingModel implements DataModel { this.profile = profile; } - public String getResearchers() { - return researchers; + public String getCreationTime() { + return creationTime; } - public void setResearchers(String researchers) { - this.researchers = researchers; + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; } public String getOrganisations() { @@ -94,7 +94,7 @@ public class DataManagementPlanListingModel implements DataModel { this.project = entity.getProject().getLabel(); if(entity.getProfile()!=null)this.profile = entity.getProfile().getLabel(); this.organisations =LabelBuilder.getLabel(new DomainModelConverter().fromDataModel(entity.getOrganisations().stream().collect(Collectors.toList()),Organisation.class)); - this.researchers =LabelBuilder.getLabel(new DomainModelConverter().fromDataModel(entity.getResearchers().stream().collect(Collectors.toList()),Researcher.class)); + this.creationTime = entity.getCreated().toString(); this.version = ""+entity.getVersion(); this.numOfDatasets = entity.getDataset().size(); } diff --git a/dmp-frontend/src/app/dmps/listing/dmp-listing.component.html b/dmp-frontend/src/app/dmps/listing/dmp-listing.component.html index 797fa99fa..94bed3d58 100644 --- a/dmp-frontend/src/app/dmps/listing/dmp-listing.component.html +++ b/dmp-frontend/src/app/dmps/listing/dmp-listing.component.html @@ -11,13 +11,13 @@ - {{'DMP-LISTING.COLUMNS.NAME' | translate}} + {{'DMP-LISTING.COLUMNS.NAME' | translate}} {{row.label}} - {{'DMP-LISTING.COLUMNS.PROJECT' | translate}} + {{'DMP-LISTING.COLUMNS.PROJECT' | translate}} {{row.project}} @@ -28,9 +28,9 @@ --> - - {{'DMP-LISTING.COLUMNS.RESEARCHERS' | translate}} - {{row.researchers}} + + {{'DMP-LISTING.COLUMNS.CREATION-TIME' | translate}} + {{row.creationTime | date:'shortDate'}} @@ -41,13 +41,13 @@ - {{'DMP-LISTING.COLUMNS.VERSION' | translate}} + {{'DMP-LISTING.COLUMNS.VERSION' | translate}} {{row.version}} - {{'DMP-LISTING.COLUMNS.DATASETS' | translate}} + {{'DMP-LISTING.COLUMNS.DATASETS' | translate}} {{row.numOfDatasets}} diff --git a/dmp-frontend/src/app/dmps/listing/dmp-listing.component.ts b/dmp-frontend/src/app/dmps/listing/dmp-listing.component.ts index 827604c24..32dbabb30 100644 --- a/dmp-frontend/src/app/dmps/listing/dmp-listing.component.ts +++ b/dmp-frontend/src/app/dmps/listing/dmp-listing.component.ts @@ -22,13 +22,14 @@ import { Observable } from "rxjs/Observable"; providers: [DataManagementPlanService] }) export class DataManagementPlanListingComponent implements OnInit { + @ViewChild(MatPaginator) _paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; @ViewChild(DataManagementPlanCriteriaComponent) criteria: DataManagementPlanCriteriaComponent; dataSource: DataManagementPlanDataSource | null; - displayedColumns: String[] = ['name', 'project', 'researchers', 'organisations', 'version', 'numOfDatasets', 'actions']; + displayedColumns: String[] = ['name', 'project', 'creationTime', 'organisations', 'version', 'numOfDatasets', 'actions']; constructor( private dataManagementPlanService: DataManagementPlanService, @@ -46,6 +47,8 @@ export class DataManagementPlanListingComponent implements OnInit { this.criteria.setRefreshCallback(() => this.refresh()); } + + refresh() { this.dataSource = new DataManagementPlanDataSource(this.dataManagementPlanService, this._paginator, this.sort, this.languageService, this.snackBar, this.criteria, ); } diff --git a/dmp-frontend/src/app/models/data-managemnt-plans/DataManagementPlanListingModel.ts b/dmp-frontend/src/app/models/data-managemnt-plans/DataManagementPlanListingModel.ts index 8930e9e09..81c85b2e8 100644 --- a/dmp-frontend/src/app/models/data-managemnt-plans/DataManagementPlanListingModel.ts +++ b/dmp-frontend/src/app/models/data-managemnt-plans/DataManagementPlanListingModel.ts @@ -5,7 +5,7 @@ export class DataManagementPlanListingModel implements Serializable