From 71a0e7371e1d864616b62285fd9704307e60e417 Mon Sep 17 00:00:00 2001
From: annampak <annampak@hotmail.com>
Date: Mon, 30 Oct 2017 10:37:00 +0200
Subject: [PATCH] columns in datatable

---
 dmp-frontend/src/app/dmps/dmps.html | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/dmp-frontend/src/app/dmps/dmps.html b/dmp-frontend/src/app/dmps/dmps.html
index 339f3b443..9152fd95e 100644
--- a/dmp-frontend/src/app/dmps/dmps.html
+++ b/dmp-frontend/src/app/dmps/dmps.html
@@ -13,11 +13,13 @@
         </data-table-column>
         <data-table-column [property]="'projectLabel'" [header]="'project'" [sortable]="true">
         </data-table-column>
-        <data-table-column [property]="'abbreviation'" [header]="'Abbreviation'" [sortable]="true">
+        <data-table-column [property]="'previous'" [header]="'Previous'" [sortable]="true">
         </data-table-column>
-        <data-table-column [property]="'startDate'" [header]="'Start Date'" [sortable]="true">
+        <data-table-column [property]="'version'" [header]="'Version'" [sortable]="true">
         </data-table-column>
-        <data-table-column [property]="'endDate'" [header]="'End Date'" [sortable]="true">
+        <data-table-column [property]="'profileData'" [header]="'Profile Data'" [sortable]="true">
+        </data-table-column>
+        <data-table-column [property]="'profile'" [header]="'Profile'" [sortable]="true">
         </data-table-column>
         <data-table-column [property]="'active'" [header]="'Status'" [width]="100" [resizable]="true">
             <template #dataTableHeader let-item="item">
@@ -44,7 +46,7 @@
         <!-- <span *ngIf="dmpsTable.selectedRow == null"><i>No item selected</i></span>
         <span [textContent]="dmpsTable.selectedRow && dmpsTable.selectedRow.item.name"></span> -->
     </div>
-    <button type="button" class="btn btn-info" data-toggle="modal" data-target="#newDmpModal">New Dmp</button>
+    <button type="button" class="btn btn-info" data-toggle="modal" data-target="# ">New Dmp</button>
 
     <!-- <select class="form-control" [id]="datasetDropDownKey" [(ngModel)]="datasetDropDownKey">
                 <option *ngFor="let opt of datasetDropDown.options" [value]="opt.key">{{opt.value}}</option>
@@ -70,30 +72,34 @@
                                   <option *ngFor="let opt of projectsDropDown.options" [value]="opt.key">{{opt.value}}</option>
                                   </select>
                               </div>
+                    <div class="form-group">
+                        <label for="label-name" class="form-control-label">Previous:</label>
+                        <input type="text" class="form-control" id="label-previous" [(ngModel)]= "dmp.previous" name = "label">
+                    </div>
                     <div class="form-group">
                         <label for="label-name" class="form-control-label">Label:</label>
                         <input type="text" class="form-control" id="label-name" [(ngModel)]= "dmp.label" name = "label">
                     </div>
                     <div class="form-group">
                         <label for="abbreviation-text" class="form-control-label">Abbreviation:</label>
-                        <input class="form-control" id="abbreviation-text" [(ngModel)]= "dmp.abbreviation" name = "abbreviation">
+                        <input class="form-control" id="abbreviation-text" [(ngModel)]= "dmp.version" name = "abbreviation">
                     </div>
                     <div class="form-group">
                         <label for="reference-text" class="form-control-label">Reference:</label>
-                        <input class="form-control" id="reference-text" [(ngModel)]= "dmp.reference" name = "reference">
+                        <input class="form-control" id="reference-text" [(ngModel)]= "dmp.profileData" name = "reference">
                     </div>
                     <div class="form-group">
                         <label for="uri-text" class="form-control-label">Uri:</label>
-                        <input class="form-control" id="uri-text" [(ngModel)]= "dmp.uri" name = "uri">
+                        <input class="form-control" id="uri-text" [(ngModel)]= "dmp.profile" name = "uri">
                     </div>
-                    <div class="form-group">
+                    <!-- <div class="form-group">
                         <label for="start-date" class="form-control-label">Start Date:</label>
                         <input class="form-control" id="startDate-date" [(ngModel)]= "dmp.startDate" name = "startDate">
                     </div>
                     <div class="form-group">
                         <label for="end-date" class="form-control-label">End Date:</label>
                         <input class="form-control" id="endDate-date" [(ngModel)]= "dmp.endDate" name = "endDate">
-                    </div>
+                    </div> -->
                     <div class="form-group">
                         <label for="code-name" class="form-control-label">Code:</label>
                         <input type="text" class="form-control" id="code-name" disabled>