From 9d92225f68e36b3ad550ada22f4f283daefb787f Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Wed, 26 Jun 2019 10:39:25 +0300
Subject: [PATCH] Rename fields on Dmp Wizard - (Issue #123) and fixes
 breadcrumb get language

---
 .../project-editor-wizard.component.html           |  6 ++++--
 .../quick-wizard-editor.component.ts               | 14 +++++++++-----
 dmp-frontend/src/assets/i18n/en.json               | 10 ++++++----
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.html b/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.html
index 27436ab00..5a1c62ce0 100644
--- a/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.html
+++ b/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.html
@@ -24,15 +24,17 @@
 						<input matInput
 							placeholder="{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.FIELDS.LABEL' | translate}}"
 							type="text" name="label" [formControl]="formGroup.get('label')" required>
+						<mat-hint>{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.FIELDS.LABEL-HINT' | translate}}</mat-hint>
 						<mat-error *ngIf="formGroup.get('label').hasError('backendError')">
 							{{formGroup.get('label').getError('backendError').message}}</mat-error>
 						<mat-error *ngIf="formGroup.get('label').hasError('required')">
 							{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 					</mat-form-field>
-					<mat-form-field class="col-md-12">
+					<mat-form-field class="col-md-12 mt-2">
 						<textarea matInput class="description-area"
 							placeholder="{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.FIELDS.DESCRIPTION' | translate}}"
 							[formControl]="formGroup.get('description')" required></textarea>
+						<mat-hint>{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.FIELDS.DESCRIPTION-HINT' | translate}}</mat-hint>
 						<mat-error *ngIf="formGroup.get('description').hasError('backendError')">
 							{{formGroup.get('description').getError('backendError').message}}</mat-error>
 						<mat-error *ngIf="formGroup.get('description').hasError('required')">
@@ -65,4 +67,4 @@
 			</mat-card-content>
 		</mat-card>
 	</form>
-</div>
\ No newline at end of file
+</div>
diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts
index f6c8c3607..bc0314d5d 100644
--- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts
+++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts
@@ -50,11 +50,15 @@ export class QuickWizardEditorComponent extends BaseComponent implements OnInit,
 		this.quickWizard = new QuickWizardEditorWizardModel();
 		this.quickWizard.project = new ProjectEditorWizardModel();
 		this.formGroup = this.quickWizard.buildForm();
-		this.breadCrumbs = Observable.of([{
-			parentComponentName: 'Dashboard',
-			label: this.language.instant('NAV-BAR.DMP-WIZARD'),
-			url: '/quick-wizard'
-		}]);
+		this.language.get('NAV-BAR.DMP-WIZARD').pipe(takeUntil(this._destroyed)).subscribe(x => {
+			this.breadCrumbs = Observable.of([
+				{
+					parentComponentName: 'Dashboard',
+					label: x,
+					url: '/quick-wizard'
+				}]
+			);
+		})
 	}
 
 	isActive(step: string): boolean {
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 5b1b332c0..e33cbbba7 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -874,16 +874,18 @@
 						"SAVE-AND-FINALIZE": "Save and Finalize",
 						"NEXT": "Next",
 						"BACK": "Back",
-						"CREATE-NEW": "Create new project",
+						"CREATE-NEW": "Add project",
 						"EXIST": "Existing Project"
 					},
 					"FIRST-STEP": {
 						"TITLE": "Project",
 						"OR": "or",
 						"FIELDS": {
-							"SELECT-PROJECT": "Pick the project the DMP is associate with",
-							"LABEL": "Label",
-							"DESCRIPTION": "Description"
+							"SELECT-PROJECT": "Select the project that the DMP is associated with",
+							"LABEL": "Project Name",
+							"LABEL-HINT": "Add the name of the project as it appears in the call for grant proposal",
+							"DESCRIPTION": "Description",
+							"DESCRIPTION-HINT": "Briefly explain the aims and objectives of the project"
 						}
 					},
 					"SECOND-STEP": {