From 3d8860870a25125ad1173f2aecc79ac697a2163b Mon Sep 17 00:00:00 2001
From: annampak <annampak@hotmail.com>
Date: Wed, 3 Jan 2018 17:19:52 +0200
Subject: [PATCH] label required

---
 .../dataset-profile-form/form/form.component.html | 15 +++++++--------
 .../section-form/section-form.component.ts        |  2 +-
 .../models/DataSetProfile/DatasetProfileModel.ts  |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dmp-admin/src/app/dataset-profile-form/form/form.component.html b/dmp-admin/src/app/dataset-profile-form/form/form.component.html
index be0343124..e83634299 100644
--- a/dmp-admin/src/app/dataset-profile-form/form/form.component.html
+++ b/dmp-admin/src/app/dataset-profile-form/form/form.component.html
@@ -4,12 +4,12 @@
             <div class="row">
                 <div class="form-group col-md-12">
                     <label>Label</label>
-                    <input type="text" class="form-control" formControlName="label" id="label">
-                    <!-- <div *ngIf="form.get('label').invalid && (form.get('label').dirty || form.get('label').touched)" class="alert alert-danger">  -->
-                    <!-- <div *ngIf="form.get('label').errors.required" class="alert alert-danger">
-                        Name is required.
-                      </div> -->
-                    <!-- </div> -->
+                    <input type="text" class="form-control" formControlName="label">
+                    <div *ngIf="form.get('label').invalid && (form.get('label').dirty || form.get('label').touched)"> 
+                    <div *ngIf="form.get('label').errors.required" class="alert alert-danger">
+                        Label is required.
+                      </div>
+                    </div>
                 </div>
             </div>
 
@@ -67,8 +67,7 @@
             </a>
           </div>
 
-            <button class="btn btn-primary" style="margin-top:20px;" type="submit">Save</button> 
-            <!-- [disabled]="!form.valid" -->
+            <button class="btn btn-primary" style="margin-top:20px;" type="submit" [disabled]="!form.valid">Save</button> 
         </form>
     </div>
     <p>Form value: {{ form.value | json }}</p>
diff --git a/dmp-admin/src/app/dataset-profile-form/section-form/section-form.component.ts b/dmp-admin/src/app/dataset-profile-form/section-form/section-form.component.ts
index ea8a2317c..efe3357dc 100644
--- a/dmp-admin/src/app/dataset-profile-form/section-form/section-form.component.ts
+++ b/dmp-admin/src/app/dataset-profile-form/section-form/section-form.component.ts
@@ -38,7 +38,7 @@ export class SectionFormComponent {
   //   (<FormArray>this.form.get("fieldGroups")).push(fieldGroup.buildForm());
   // }
 
-  addField() {debugger;
+  addField() {
     let fieldSet: FieldSet = new FieldSet();
     let field: Field = new Field();
     //let fieldGroup: FieldGroup = new FieldGroup();
diff --git a/dmp-admin/src/app/models/DataSetProfile/DatasetProfileModel.ts b/dmp-admin/src/app/models/DataSetProfile/DatasetProfileModel.ts
index 1df3f0d36..b4568e99a 100644
--- a/dmp-admin/src/app/models/DataSetProfile/DatasetProfileModel.ts
+++ b/dmp-admin/src/app/models/DataSetProfile/DatasetProfileModel.ts
@@ -36,7 +36,7 @@ export class DatasetProfileModel extends BaseModel implements Serializable<Datas
 		// })
 		formGroup.addControl('pages', this.formBuilder.array(pagesFormArray));
 
-        formGroup.addControl('label', new FormControl(this.label));
+        formGroup.addControl('label', new FormControl(this.label, Validators.required));
         return formGroup;
     }