From 2121646303e0b2615cadddca76b481a3748288fa Mon Sep 17 00:00:00 2001
From: annampak <annampak@hotmail.com>
Date: Fri, 1 Dec 2017 18:33:37 +0200
Subject: [PATCH] section in section & show type field when user selects
 combobox view style

---
 dmp-admin/src/app/app.component.css           |  8 +++++++
 .../app/field-form/field-form.component.html  | 24 +++++++++++--------
 .../section-form/section-form.component.html  | 15 ++++++++----
 .../section-form/section-form.component.ts    |  6 +++++
 4 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/dmp-admin/src/app/app.component.css b/dmp-admin/src/app/app.component.css
index 8e856d79c..75fcc7987 100644
--- a/dmp-admin/src/app/app.component.css
+++ b/dmp-admin/src/app/app.component.css
@@ -17,4 +17,12 @@
 
 .cursor{
     cursor: pointer;
+}
+
+.hide{
+    display:none;
+}
+
+.show {
+    display:block;
 }
\ No newline at end of file
diff --git a/dmp-admin/src/app/field-form/field-form.component.html b/dmp-admin/src/app/field-form/field-form.component.html
index 062a0d12d..85b1c0c24 100644
--- a/dmp-admin/src/app/field-form/field-form.component.html
+++ b/dmp-admin/src/app/field-form/field-form.component.html
@@ -14,17 +14,21 @@
                     <div class="form-group">
                         <label>View style</label>
                         <select class="form-control" formControlName="renderStyle">
-                            <option>textarea</option>
-                            <option>booleanDesicion</option>
-                            <option>combobox</option>
-                            <option>checkBox</option>
-                            <option>freetext</option>
-                         </select>
+                            <option value="textarea">textarea</option>
+                            <option value="booleanDesicion">booleanDesicion</option>
+                            <option value='combobox'>combobox</option>
+                            <option value="checkBox">checkBox</option>
+                            <option value="freetext">freetext</option>
+                        </select>
                     </div>
                 </div>
-
             </div>
-
+        </div>
+        <div class="form-row" [ngSwitch]="form.get('viewStyle').get('renderStyle').value">
+            <div *ngSwitchCase="'combobox'">
+                <label>Type</label>
+                <input type="text" class="form-control" formControlName="description">
+            </div>
         </div>
         <div class="form-row">
             <div class="form-group col-md-6">
@@ -62,10 +66,10 @@
                 </div>
             </div>
 
-            <div  class="form-group col-md-2">
+            <div class="form-group col-md-2">
                 <label class="radio control-label">Default Visibility</label>
                 <label class="radio-inline">
-                    <input type="radio"  [value]="true" formControlName="defaultVisibility"> true
+                    <input type="radio" [value]="true" formControlName="defaultVisibility"> true
                 </label>
                 <label class="radio-inline">
                     <input type="radio" [value]="false" formControlName="defaultVisibility"> false
diff --git a/dmp-admin/src/app/section-form/section-form.component.html b/dmp-admin/src/app/section-form/section-form.component.html
index 2763192bc..20aa82d87 100644
--- a/dmp-admin/src/app/section-form/section-form.component.html
+++ b/dmp-admin/src/app/section-form/section-form.component.html
@@ -38,21 +38,26 @@
                 </button>
             </h4>
             <groupfield-form [form]="form.get('fieldGroups').get(''+i)" [dataModel]="fieldGroup"></groupfield-form>
-
             <div>
                 <a (click)="addGroupField()" style="cursor: pointer">
-                    Add another group +
+                    Add group +
                 </a>
             </div>
 
         </div>
     </div>
 
-    <div>
-            <a (click)="addGroupField()" style="cursor: pointer">
-                Add another group +
+    <div style="margin-top:20px; padding-left: 15px;">
+            <a (click)="addSectioninSection()" style="cursor: pointer">
+                Add section +
             </a>
         </div>
 
+    <div *ngIf="dataModel.fieldGroups.length == 0;">
+        <a (click)="addGroupField()" style="cursor: pointer">
+            Add group +
+        </a>
+    </div>
+
 
 </div>
\ No newline at end of file
diff --git a/dmp-admin/src/app/section-form/section-form.component.ts b/dmp-admin/src/app/section-form/section-form.component.ts
index a4961c8ef..cef984dc6 100644
--- a/dmp-admin/src/app/section-form/section-form.component.ts
+++ b/dmp-admin/src/app/section-form/section-form.component.ts
@@ -33,5 +33,11 @@ export class SectionFormComponent {
     this.dataModel.fieldGroups.splice(index);
     (<FormArray>this.form.get("fieldGroups")).removeAt(index)
   }
+
+  addSectioninSection(){
+    let section:Section = new Section();
+    this.dataModel.sections.push(section);
+    (<FormArray>this.form.get("sections")).push(section.buildForm());
+  }
     
 }
\ No newline at end of file