From acc0140397ac5b37835246987355c1e011be0885 Mon Sep 17 00:00:00 2001
From: annampak <annampak@hotmail.com>
Date: Tue, 7 Nov 2017 18:08:20 +0200
Subject: [PATCH] label in clone dmp form

---
 dmp-frontend/src/app/dmps/dmps.html | 64 +++++++++++++++--------------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/dmp-frontend/src/app/dmps/dmps.html b/dmp-frontend/src/app/dmps/dmps.html
index ce81a9687..75ef807d6 100644
--- a/dmp-frontend/src/app/dmps/dmps.html
+++ b/dmp-frontend/src/app/dmps/dmps.html
@@ -3,7 +3,7 @@
 <table class="table table-striped customTable" [mfData]="tableData | dmpTableFilter : filterQuery | dmpVersionFilter : versionFilter |dmpstatusFilter: statusFilter"
     #mf="mfDataTable" [mfRowsOnPage]="rowsOnPage" [(mfSortBy)]="sortBy" [(mfSortOrder)]="sortOrder">
     <thead>
-        <tr class = "rowFilter">
+        <tr class="rowFilter">
             <th colspan="1">
                 <input class="form-control" [(ngModel)]="filterQuery" placeholder='Search in Labels' />
             </th>
@@ -13,17 +13,18 @@
                 </button>
             </th>
 
-            <th class = "rowFilterTopBorder" colspan="3">
+            <th class="rowFilterTopBorder" colspan="3">
                 <button type="button" class="btn btn-info btnMoreFilters" data-toggle="collapse" data-target="#demo" (click)="clickFilters($event.target)">More filters</button>
                 <div id="demo" class="collapse">
-                    <input style= "margin-top: 5px;" class="form-control" type="number" [(ngModel)]="versionFilter" placeholder='Version'/>
-                    <select style= "margin-top: 5px;" class="form-control" [id]="statusid" [(ngModel)]="statusFilter" [name]="statusDropDown" #datasetfield >
+                    <input style="margin-top: 5px;" class="form-control" type="number" [(ngModel)]="versionFilter" placeholder='Version' />
+                    <select style="margin-top: 5px;" class="form-control" [id]="statusid" [(ngModel)]="statusFilter" [name]="statusDropDown"
+                        #datasetfield>
                             <option *ngFor="let opt of statusDropDown.options" [value]="opt.key">{{opt.value}}</option>
                         </select>
                 </div>
             </th>
         </tr>
-        
+
         <tr>
             <th [ngClass]="{true:'visible', false:'invisible'}[showIDs]">
                 <mfDefaultSorter by="id">ID</mfDefaultSorter>
@@ -162,40 +163,43 @@
             </div>
             <div class="modal-body">
                 <form #newProjectForm="ngForm" (ngSubmit)="SaveNewDmp()">
-                    <div class="form-group" hidden>
                         <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>
-                        <label for="recipient-name" class="col-form-label">Project:</label>
-                        <select class="form-control" [id]="projectsDropDownKey" [(ngModel)]="dmp.project" [name]="projectsDropDown" #datasetfield>
-                                      <option *ngFor="let opt of projectsDropDown.options" [value]="opt.key">{{opt.value}}</option>
-                                      </select>
-                    </div>
-                    <div class="form-group" hidden>
-                        <label for="label-name" class="form-control-label">Previous:</label>
-                        <input type="text" class="form-control" id="label-previous" [(ngModel)]="dmp.previous" name="previous">
-                    </div>
-                    <div class="form-group">
-                        <label for="abbreviation-text" class="form-control-label">Version:</label>
-                        <input class="form-control" id="abbreviation-text" [(ngModel)]="dmp.version" name="version">
-                    </div>
+                        <div class="form-group" hidden>
+                            <label for="recipient-name" class="col-form-label">Project:</label>
+                            <select class="form-control" [id]="projectsDropDownKey" [(ngModel)]="dmp.project" [name]="projectsDropDown" #datasetfield>
+                                <option *ngFor="let opt of projectsDropDown.options" [value]="opt.key">{{opt.value}}</option>
+                                </select>
+                        </div>
+
+
+                        <div class="form-group" hidden>
+                            <label for="label-name" class="form-control-label">Previous:</label>
+                            <input type="text" class="form-control" id="label-previous" [(ngModel)]="dmp.previous" name="previous">
+                        </div>
+                        <div class="form-group" hidden>
+                            <label for="abbreviation-text" class="form-control-label">Version:</label>
+                            <input class="form-control" id="abbreviation-text" [(ngModel)]="dmp.version" name="version">
+                        </div>
                 </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                <button type="submit" class="btn btn-primary" (click)="cloneDMP(dmp);">Save Dmp</button>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+                    <button type="submit" class="btn btn-primary" (click)="cloneDMP(dmp);">Save Dmp</button>
+                </div>
             </div>
         </div>
     </div>
-</div>
 
-<!--Modal for DMPs-->
-<!-- <modal *ngIf="item && show" [(show)]="show" [item]="item" [(dataSetVisibe)]="dataSetVisibe"></modal> -->
+    <!--Modal for DMPs-->
+    <!-- <modal *ngIf="item && show" [(show)]="show" [item]="item" [(dataSetVisibe)]="dataSetVisibe"></modal> -->
 
-<!--DATASET TABLE-->
-<datasets-table *ngIf="dataSetVisibe" [dmpIdforDatasets]="dmpIdforDatasets" [dmpLabelforDatasets]="dmpLabelforDatasets" [(dataSetVisibe)]="dataSetVisibe"></datasets-table>
+    <!--DATASET TABLE-->
+    <datasets-table *ngIf="dataSetVisibe" [dmpIdforDatasets]="dmpIdforDatasets" [dmpLabelforDatasets]="dmpLabelforDatasets" [(dataSetVisibe)]="dataSetVisibe"></datasets-table>
 
 
-<!-- Confirmation module- do not delete --> 
-<confirmation [confirmationID]="'delete-dmp-confirm'" [confirmationTitle]="'Caution'" [confirmationDescr]="'This action will delete this DMP. Are you sure you want to delete this DMP ? This is not revertable !'" (responseSender)="deleteDMP($event)"></confirmation>
\ No newline at end of file
+    <!-- Confirmation module- do not delete -->
+    <confirmation [confirmationID]="'delete-dmp-confirm'" [confirmationTitle]="'Caution'" [confirmationDescr]="'This action will delete this DMP. Are you sure you want to delete this DMP ? This is not revertable !'"
+        (responseSender)="deleteDMP($event)"></confirmation>
\ No newline at end of file