From 97a3338ddaf18c5f2db1d2c4ee028a9d1cef7d85 Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Thu, 1 Oct 2020 16:35:20 +0300
Subject: [PATCH] Fixes enumerating of editor fields, changes title of fields
 1.1

---
 .../dataset-editor.component.html             |  2 +-
 ...-external-references-editor.component.html |  2 +-
 .../dataset-info/dataset-info.component.html  |  2 +-
 .../ui/dmp/editor/dmp-editor.component.html   |  4 +-
 .../license-info/license-info.component.html  |  2 +-
 .../editor/main-info/main-info.component.html | 38 +++++++++----------
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html
index b8bfceed5..fcbe904f1 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html
@@ -52,7 +52,7 @@
 		<!-- External Fields -->
 		<app-dataset-external-references-editor-component [formGroup]="formGroup" [viewOnly]="viewOnly"></app-dataset-external-references-editor-component>
 		<!-- Template Field -->
-		<div class="heading">1.5 {{'DATASET-EDITOR.FIELDS.PROFILE' | translate}}*</div>
+		<div class="heading">1.4 {{'DATASET-EDITOR.FIELDS.PROFILE' | translate}}*</div>
 		<div class="profile-form">
 			<mat-form-field>
 				<mat-select placeholder="{{'DATASET-WIZARD.FIRST-STEP.PROFILE'| translate}}" [required]="true" [compareWith]="compareWith" formControlName="profile">
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.html
index 7232f104c..4882e2944 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.html
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.html
@@ -3,7 +3,7 @@
 	<div class="pt-2">
 		<div class="row">
 			<div class="col-12 pl-0 pr-0 pb-2 d-flex flex-row">
-				<h4 class="col-auto heading">1.4 {{'DATASET-EDITOR.FIELDS.TAGS' | translate}}</h4>
+				<h4 class="col-auto heading">1.3 {{'DATASET-EDITOR.FIELDS.TAGS' | translate}}</h4>
 			</div>
 		</div>
 		<div class="tags-form">
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html
index b902d4f51..d2a37ecf0 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html
+++ b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html
@@ -6,7 +6,7 @@
 	<div class="col-12 card">
 		<div class="row">
 			<div class="col-12">
-				<div class="heading">3 {{'DMP-EDITOR.STEPPER.DATASET-INFO' | translate}}*</div>
+				<div class="heading">4.1 {{'DMP-EDITOR.STEPPER.DATASET-INFO' | translate}}*</div>
 				<div class="hint">
 					<div class="pb-1">{{'DMP-EDITOR.DATASET-INFO.HINT' | translate}}</div>
 					<div><span class="material-icons-outlined align-bottom">info</span> {{'DMP-EDITOR.MAIN-INFO.TYPING' | translate}}</div>
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html
index cff0b741e..1e3108530 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html
+++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html
@@ -33,9 +33,9 @@
 					<div class="stepper-title">{{'DMP-EDITOR.STEPPER.USER-GUIDE' | translate}}</div>
 					<div class="stepper-options">
 						<ol class="stepper-list">
-							<li (click)="changeStep(0)" [ngClass]="{'active': this.step === 0}">{{'DMP-EDITOR.STEPPER.MAIN-INFO' | translate}} (8)</li>
+							<li (click)="changeStep(0)" [ngClass]="{'active': this.step === 0}">{{'DMP-EDITOR.STEPPER.MAIN-INFO' | translate}} (7)</li>
 							<li (click)="changeStep(1)" [ngClass]="{'active': this.step === 1}">{{'DMP-EDITOR.STEPPER.FUNDING-INFO' | translate}} (3)</li>
-							<li (click)="changeStep(2)" [ngClass]="{'active': this.step === 2}">{{'DMP-EDITOR.STEPPER.LICENSE-INFO' | translate}} (1)</li>
+							<li (click)="changeStep(2)" [ngClass]="{'active': this.step === 2}">{{'DMP-EDITOR.STEPPER.LICENSE-INFO' | translate}}</li>
 							<li (click)="changeStep(3)" [ngClass]="{'active': this.step === 3}">{{'DMP-EDITOR.STEPPER.DATASET-INFO' | translate}}</li>
 
 							<!-- <li *ngFor="let dataset of datasets.controls; let i = index" (click)="changeStep(i + stepsBeforeDatasets, dataset)" [ngClass]="{'active-dataset': this.step === i + stepsBeforeDatasets}"> -->
diff --git a/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.html b/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.html
index 1e28f56e4..f09ecebc6 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.html
+++ b/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.html
@@ -6,7 +6,7 @@
 		<!-- License field -->
 		<div class="row">
 			<div class="col-12">
-				<div class="heading">4.1 {{'DMP-EDITOR.FIELDS.LICENSE' | translate}}</div>
+				<div class="heading">3.1 {{'DMP-EDITOR.FIELDS.LICENSE' | translate}}</div>
 				<div class="hint">{{'DMP-EDITOR.LICENSE-INFO.HINT' | translate}}</div>
 				<div class="description-form">
 					<mat-form-field>
diff --git a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html
index ec4094549..aa20383a8 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html
+++ b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html
@@ -124,28 +124,10 @@
 				</div>
 			</div>
 		</div>
-		<!-- Publication Field -->
-		<div class="row" *ngIf="formGroup.get('extraProperties').get('visible').value">
-			<div class="col-12">
-				<div class="heading">1.7 {{'DMP-EDITOR.FIELDS.PUBLICATION' | translate}}</div>
-				<!-- <div class="hint">{{'DMP-EDITOR.LICENSE-INFO.HINT' | translate}}</div> -->
-				<div class="publication-form">
-					<mat-form-field>
-						<input matInput [matDatepicker]="picker" [formControl]="formGroup.get('extraProperties').get('publicDate')" placeholder="{{'DMP-EDITOR.FIELDS.PUBLICATION' | translate}}">
-  					<mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
-  					<mat-datepicker #picker></mat-datepicker>
-					<mat-error *ngIf="formGroup.get('extraProperties').get('publicDate').hasError('backendError')">
-						{{formGroup.get('extraProperties').get('publicDate').getError('backendError').message}}</mat-error>
-					<mat-error *ngIf="formGroup.get('extraProperties').get('publicDate').hasError('required')">
-						{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-					</mat-form-field>
-				</div>
-			</div>
-		</div>
 		<!-- Contact Field -->
 		<div class="row">
 			<div class="col-12">
-				<div class="heading">1.8 {{'DMP-EDITOR.FIELDS.CONTACT' | translate}}</div>
+				<div class="heading">1.7 {{'DMP-EDITOR.FIELDS.CONTACT' | translate}}</div>
 				<!-- <div class="hint">{{'DMP-EDITOR.LICENSE-INFO.HINT' | translate}}</div> -->
 				<div class="contact-form">
 					<mat-form-field>
@@ -162,5 +144,23 @@
 				</div>
 			</div>
 		</div>
+		<!-- Publication Field -->
+		<div class="row" *ngIf="formGroup.get('extraProperties').get('visible').value">
+			<div class="col-12">
+				<div class="heading">1.8 {{'DMP-EDITOR.FIELDS.PUBLICATION' | translate}}</div>
+				<!-- <div class="hint">{{'DMP-EDITOR.LICENSE-INFO.HINT' | translate}}</div> -->
+				<div class="publication-form">
+					<mat-form-field>
+						<input matInput [matDatepicker]="picker" [formControl]="formGroup.get('extraProperties').get('publicDate')" placeholder="{{'DMP-EDITOR.FIELDS.PUBLICATION' | translate}}">
+  					<mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
+  					<mat-datepicker #picker></mat-datepicker>
+					<mat-error *ngIf="formGroup.get('extraProperties').get('publicDate').hasError('backendError')">
+						{{formGroup.get('extraProperties').get('publicDate').getError('backendError').message}}</mat-error>
+					<mat-error *ngIf="formGroup.get('extraProperties').get('publicDate').hasError('required')">
+						{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+					</mat-form-field>
+				</div>
+			</div>
+		</div>
 	</div>
 </div>