From 08310568a593839bae38afab47e2ae52d36fc7d0 Mon Sep 17 00:00:00 2001
From: annampak <annampak@hotmail.com>
Date: Tue, 7 Nov 2017 11:19:31 +0200
Subject: [PATCH] bug fixes in datasets and dmps dropdown fields

---
 dmp-frontend/src/app/datasets/dataset.html | 8 +++++++-
 dmp-frontend/src/app/dmps/dmp.component.ts | 9 +++++++--
 dmp-frontend/src/app/dmps/dmps.html        | 4 ++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/dmp-frontend/src/app/datasets/dataset.html b/dmp-frontend/src/app/datasets/dataset.html
index 6320a38e1..ff48d8c52 100644
--- a/dmp-frontend/src/app/datasets/dataset.html
+++ b/dmp-frontend/src/app/datasets/dataset.html
@@ -92,7 +92,7 @@
                     <form #newProjectForm="ngForm" (ngSubmit)="SaveDataset()">
                         <div class="form-group">
                             <label for="recipient-name" class="col-form-label">Dataset Profile:</label>
-                            <select class="form-control" [id]="datasetProfileDropDownKey" [(ngModel)]="dataset.profile" [name]="datasetProfileDropDown"
+                            <select class="form-control" id="datasetProfileDropDownKey" [(ngModel)]="dataset.profile" name="datasetProfileDropDown"
                                 #datasetfield>
                                       <option *ngFor="let opt of datasetProfileDropDown.options" [value]="opt.key">{{opt.value}}</option>
                                       </select>
@@ -109,6 +109,12 @@
                             <label for="uri-text" class="form-control-label">Uri:</label>
                             <input class="form-control" id="uri-text" [(ngModel)]="dataset.uri" name="uri">
                         </div>
+                        <div class="form-group">
+                                <label for="status-name" class="col-form-label">Status:</label>
+                                <select class="form-control" id="statusid" [(ngModel)]="dataset.status" name="statusDropDown" #datasetfield>
+                                <option *ngFor="let opt of statusDropDown.options" [value]="opt.key">{{opt.value}}</option>
+                                </select>
+                            </div>
                         <!-- <div class="form-group">
                             <label for="start-date" class="form-control-label">Properties:</label>
                             <input class="form-control" id="startDate-date" [(ngModel)]= "dataset.properties" name = "properties">
diff --git a/dmp-frontend/src/app/dmps/dmp.component.ts b/dmp-frontend/src/app/dmps/dmp.component.ts
index cab745344..70a21ceb3 100644
--- a/dmp-frontend/src/app/dmps/dmp.component.ts
+++ b/dmp-frontend/src/app/dmps/dmp.component.ts
@@ -82,7 +82,6 @@ export class DmpComponent implements OnInit{
         previous:'',
         version:'',
         profileData:''
-        //,
         //profile:{}
      }
   }
@@ -185,7 +184,12 @@ editRow(item, event){
     this.dmp.profileData = item.profileData;
     this.dmp.id = item.id;
     this.dmp.project = item.project.id;
-    $("#newDmpModal").modal("show");
+    this.dmp.description = item.description;
+    this.dmp.status = item.status;
+    setTimeout(function() {
+      $("#newDmpModal").modal("show");  
+    },0);
+    
   }
   if(event.toElement.id == "changeVersionDMP"){
     this.dmp.label = item.label;
@@ -195,6 +199,7 @@ editRow(item, event){
     this.dmp.profileData = item.profileData;
     this.dmp.id = item.id;
     this.dmp.project = item.project.id;
+    this.dmp.description = item.description;
     $("#newVersionDmpModal").modal("show");
   }
   
diff --git a/dmp-frontend/src/app/dmps/dmps.html b/dmp-frontend/src/app/dmps/dmps.html
index 8135a164c..8ce22102f 100644
--- a/dmp-frontend/src/app/dmps/dmps.html
+++ b/dmp-frontend/src/app/dmps/dmps.html
@@ -103,13 +103,13 @@
                             <input type="text" class="form-control" id="label-name" [(ngModel)]="dmp.label" name="label">
                         </div>
                         <label for="recipient-name" class="col-form-label">Project:</label>
-                        <select class="form-control" [id]="projectsDropDownKey" [(ngModel)]="dmp.project" [name]="projectsDropDown" #datasetfield>
+                        <select class="form-control" id="projectsDropDownKey" [(ngModel)]="dmp.project" name="projectsDropDown">
                                   <option *ngFor="let opt of projectsDropDown.options" [value]="opt.key">{{opt.value}}</option>
                                   </select>
                     </div>
                     <div class="form-group">
                         <label for="status-name" class="col-form-label">Status:</label>
-                        <select class="form-control" [id]="statusid" [(ngModel)]="dmp.status" [name]="statusDropDown" #datasetfield>
+                        <select class="form-control" id="statusid" [(ngModel)]="dmp.status" name="statusDropDown">
                         <option *ngFor="let opt of statusDropDown.options" [value]="opt.key">{{opt.value}}</option>
                         </select>
                     </div>