From 11fa25da403fa599a6635874bb9f1c4ba7197b3f Mon Sep 17 00:00:00 2001
From: annampak <annampak@hotmail.com>
Date: Mon, 18 Dec 2017 15:24:10 +0200
Subject: [PATCH] dataset criteria & payload json object

---
 .../src/app/datasets_new/dataset-listing.component.ts         | 4 ++--
 dmp-frontend/src/app/homepage/homepage.component.ts           | 3 ++-
 .../criteria/datasets/datasets-criteria.component.html        | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dmp-frontend/src/app/datasets_new/dataset-listing.component.ts b/dmp-frontend/src/app/datasets_new/dataset-listing.component.ts
index c733a2a56..0fd088961 100644
--- a/dmp-frontend/src/app/datasets_new/dataset-listing.component.ts
+++ b/dmp-frontend/src/app/datasets_new/dataset-listing.component.ts
@@ -76,7 +76,7 @@ export class DatasetDataSource extends DataSource<DatasetListingModel> {
     private _sort: MatSort,
     private _languageService: TranslateService,
     private _snackBar: MatSnackBar,
-    private _criteria: ProjectCriteriaComponent
+    private _criteria: DatasetCriteriaComponent
   ) {
     super();
 
@@ -113,7 +113,7 @@ export class DatasetDataSource extends DataSource<DatasetListingModel> {
         setTimeout(() => {
           this.isLoadingResults = false;
         });
-        return result.data;
+        return result.payload;
       })
       .map(result => {
         if (!result) { return []; }
diff --git a/dmp-frontend/src/app/homepage/homepage.component.ts b/dmp-frontend/src/app/homepage/homepage.component.ts
index a7c8c6a8d..35f06d7a8 100644
--- a/dmp-frontend/src/app/homepage/homepage.component.ts
+++ b/dmp-frontend/src/app/homepage/homepage.component.ts
@@ -33,7 +33,8 @@ export class HomepageComponent implements OnInit{
       }
     );   
     
-    this.dashBoardService.getStatistics().subscribe(data =>{
+    this.dashBoardService.getStatistics().subscribe(results =>{
+      let data = results['payload'];
       this.dashboardStatisticsData = new JsonSerializer<DashboardStatisticsModel>().fromJSONObject(data,DashboardStatisticsModel);
     })
 
diff --git a/dmp-frontend/src/app/shared/components/criteria/datasets/datasets-criteria.component.html b/dmp-frontend/src/app/shared/components/criteria/datasets/datasets-criteria.component.html
index c5782c810..dafcd3bba 100644
--- a/dmp-frontend/src/app/shared/components/criteria/datasets/datasets-criteria.component.html
+++ b/dmp-frontend/src/app/shared/components/criteria/datasets/datasets-criteria.component.html
@@ -17,13 +17,13 @@
 			</div> -->
 			<div class="col-sm-6 col-md-2">
 				<mat-form-field>
-					<input matInput placeholder=" {{'CRITERIA.FORMS.NAME'| translate}}" name="name" [ngModel]="this.criteria.Name" (ngModelChange)="controlModified()">
+					<input matInput placeholder=" {{'CRITERIA.FORMS.NAME'| translate}}" name="datasetCriterianame" [ngModel]="this.criteria.Name" (ngModelChange)="controlModified()">
 					<mat-error *ngIf="getFormControl('name').errors?.backendError">{{baseErrorModel['Criteria.Name']}}</mat-error>
 				</mat-form-field>
 			</div>
 			<div class="col-sm-6 col-md-2">
 				<mat-form-field>
-					<input matInput placeholder=" {{'CRITERIA.FORMS.STATUS'| translate}}" name="name" [ngModel]="this.criteria.Status" (ngModelChange)="controlModified()">
+					<input matInput placeholder=" {{'CRITERIA.FORMS.STATUS'| translate}}" name="datasetCriteriastatus" [ngModel]="this.criteria.Status" (ngModelChange)="controlModified()">
 					<mat-error *ngIf="getFormControl('status').errors?.backendError">{{baseErrorModel['Criteria.Status']}}</mat-error>
 				</mat-form-field>
 			</div>