From f390505f52caa097228e85b8913a5b9aab81d26a Mon Sep 17 00:00:00 2001
From: annampak <annampak@hotmail.com>
Date: Fri, 26 Jan 2018 17:50:16 +0200
Subject: [PATCH] no message

---
 .../src/app/dataset-wizard/dataset-wizard.component.html | 9 ++++++++-
 dmp-frontend/src/app/dmps/dmp-listing.component.scss     | 6 +++++-
 dmp-frontend/src/app/form/dynamic-form.component.html    | 4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html b/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html
index 34d568b7c..4bd33e0f8 100644
--- a/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html
+++ b/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html
@@ -1,6 +1,12 @@
 <div class="dataset-wizard">
     <h3 *ngIf="isNew">New {{datasetWizardModel?.dmp?.project?.label}} Dataset</h3>
     <h3 *ngIf="!isNew">{{datasetWizardModel?.dmp?.project?.label}} Dataset</h3>
+    <button mat-raised-button color="primary" *ngIf="datasetWizardModel&&datasetWizardModel?.status != 1" style="margin-top: 15px;margin-bottom: 15px;margin-right: 15px;"
+        (click)="save();" type="button">Save</button>
+        <!-- .toString() -->
+    <button mat-raised-button color="primary" *ngIf="datasetWizardModel&&datasetWizardModel?.status != 1" style="margin-top: 15px;margin-bottom: 15px;margin-right: 15px;"
+        (click)="saveFinalize();" type="button">Save and Finalize</button>
+
     <mat-horizontal-stepper [linear]="isLinear" #stepper>
         <mat-step [stepControl]="formGroup">
             <form *ngIf="formGroup" [formGroup]="formGroup">
@@ -16,6 +22,7 @@
                 <app-dataset-editor-component [formGroup]="formGroup"></app-dataset-editor-component>
                 <div class="navigation-buttons-container">
                     <button matStepperNext mat-raised-button style="float:right;" color="primary">{{'DATASET-WIZARD.ACTIONS.NEXT' | translate}}</button>
+
                 </div>
             </form>
         </mat-step>
@@ -86,7 +93,7 @@
         </mat-step>
         <mat-step>
             <ng-template matStepLabel>{{'DATASET-WIZARD.THIRD-STEP.TITLE' | translate}}</ng-template>
-            <dynamic-form class="full-width" *ngIf="datasetWizardModel && datasetWizardModel.id" [dataModel]="datasetWizardModel"></dynamic-form>
+            <dynamic-form class="full-width" *ngIf="datasetWizardModel && datasetWizardModel.datasetProfileDefinition" [dataModel]="datasetWizardModel"></dynamic-form>
             <div class="navigation-buttons-container">
                 <button style="margin-top:10px;" matStepperPrevious mat-raised-button color="primary">{{'DATASET-WIZARD.ACTIONS.BACK' | translate}}</button>
             </div>
diff --git a/dmp-frontend/src/app/dmps/dmp-listing.component.scss b/dmp-frontend/src/app/dmps/dmp-listing.component.scss
index 4ad3cb49f..40e52cbb2 100644
--- a/dmp-frontend/src/app/dmps/dmp-listing.component.scss
+++ b/dmp-frontend/src/app/dmps/dmp-listing.component.scss
@@ -24,4 +24,8 @@
 
 mat-row:hover { 
     background-color: lightgray;
-}
\ No newline at end of file
+}
+
+mat-row:nth-child(odd){
+    background-color:#eef0fb;
+    }
\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/dynamic-form.component.html b/dmp-frontend/src/app/form/dynamic-form.component.html
index 5617b57ab..d67041f47 100644
--- a/dmp-frontend/src/app/form/dynamic-form.component.html
+++ b/dmp-frontend/src/app/form/dynamic-form.component.html
@@ -7,10 +7,10 @@
 	<!-- <mat-sidenav-content> -->
 	<!-- <button mat-raised-button color="primary" style="margin: 15px;" (click)="toggleSidebar()" icon="fa-arrow-left">Table Of Contents</button> -->
 	<form *ngIf="form" novalidate [formGroup]="form">
-		<button mat-raised-button color="primary" *ngIf="dataModel&&dataModel.status.toString() != 1" style="margin-top: 15px;margin-bottom: 15px;margin-right: 15px;"
+		<!-- <button mat-raised-button color="primary" *ngIf="dataModel&&dataModel.status.toString() != 1" style="margin-top: 15px;margin-bottom: 15px;margin-right: 15px;"
 		 (click)="save();" type="button">Save</button>
 		<button mat-raised-button color="primary" *ngIf="dataModel&&dataModel?.status != 1" style="margin-top: 15px;margin-bottom: 15px;margin-right: 15px;"
-		 (click)="saveFinalize();" type="button">Save and Finalize</button>
+		 (click)="saveFinalize();" type="button">Save and Finalize</button> -->
 		<div>
 			<div class="alignment-center">
 				<!-- <ngb-pagination *ngIf="pages" [collectionSize]="pages.length*10" [page]="currentPageIndex" (pageChange)="changePageIndex($event)" aria-label="Default pagination"></ngb-pagination> -->