From 9a14a73b862e023dd980de3de7cf88d8cd8281df Mon Sep 17 00:00:00 2001
From: dtziotzios <dtziotzios@cite.gr>
Date: Wed, 6 Mar 2019 16:19:08 +0200
Subject: [PATCH] set Default Project criteria Value And Add en.json the
 "NONE":"-"

---
 .../dataset/listing/criteria/dataset-criteria.component.html | 2 +-
 .../project/listing/criteria/project-criteria.component.html | 2 +-
 .../project/listing/criteria/project-criteria.component.ts   | 5 ++++-
 dmp-frontend/src/assets/i18n/en.json                         | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html
index 4f3b0085a..492cc3a6f 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html
+++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html
@@ -11,7 +11,7 @@
 			</mat-form-field>
 			<mat-form-field class="col-md-4">
 				<mat-select placeholder=" {{'CRITERIA.DATA-SETS.STATUS'| translate}}" name="datasetCriteriastatus" [(ngModel)]="criteria.status" (ngModelChange)="controlModified()">
-					<mat-option [value]="null">-</mat-option>
+					<mat-option [value]="null">{{'CRITERIA.DATA-SETS.NONE'| translate}}</mat-option>
 					<mat-option [value]="statuses.Draft">{{enumUtils.toDatasetStatusString(statuses.Draft)}}</mat-option>
 					<mat-option [value]="statuses.Finalized">{{enumUtils.toDatasetStatusString(statuses.Finalized)}}</mat-option>
 				</mat-select>
diff --git a/dmp-frontend/src/app/ui/project/listing/criteria/project-criteria.component.html b/dmp-frontend/src/app/ui/project/listing/criteria/project-criteria.component.html
index 690551f54..5df5610c8 100644
--- a/dmp-frontend/src/app/ui/project/listing/criteria/project-criteria.component.html
+++ b/dmp-frontend/src/app/ui/project/listing/criteria/project-criteria.component.html
@@ -28,7 +28,7 @@
 			<mat-select placeholder=" {{ 'CRITERIA.PROJECTS.PROJECT-STATE-TYPE' | translate}}" [(ngModel)]="criteria.projectStateType"
 			 (ngModelChange)="controlModified()">
 			 <mat-option [value]="null">
-					-
+				{{ 'CRITERIA.PROJECTS.TYPES.NONE' | translate}}
 				</mat-option>
 				<mat-option [value]="ProjectStateType.OnGoing">
 					{{ 'CRITERIA.PROJECTS.TYPES.ON-GOING' | translate}}
diff --git a/dmp-frontend/src/app/ui/project/listing/criteria/project-criteria.component.ts b/dmp-frontend/src/app/ui/project/listing/criteria/project-criteria.component.ts
index 6321a1634..ca20e14fd 100644
--- a/dmp-frontend/src/app/ui/project/listing/criteria/project-criteria.component.ts
+++ b/dmp-frontend/src/app/ui/project/listing/criteria/project-criteria.component.ts
@@ -28,7 +28,10 @@ export class ProjectCriteriaComponent extends BaseCriteriaComponent implements O
 
 	ngOnInit() {
 		super.ngOnInit();
-		if (this.criteria == null) { this.criteria = new ProjectCriteria(); }
+		if (this.criteria == null) { 
+			this.criteria = new ProjectCriteria(); 
+			this.criteria.projectStateType = ProjectStateType.OnGoing;
+		}
 	}
 
 	setCriteria(criteria: ProjectCriteria): void {
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 20fef7e00..1b1e058b7 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -411,6 +411,7 @@
 			"PERIOD-TO": "Project End",
 			"PROJECT-STATE-TYPE": "Project Status",
 			"TYPES": {
+				"NONE": "-",
 				"ON-GOING": "On Going",
 				"FINISHED": "Finished"
 			}
@@ -422,6 +423,7 @@
 			"PERIOD-FROM": "Start",
 			"PERIOD-TO": "End",
 			"STATUS": "Status",
+			"NONE":"-",
 			"TAGS": "Tags"
 		},
 		"DMP": {