From e04c90dd2bc60da19da8ffbbfec1084052a4d745 Mon Sep 17 00:00:00 2001
From: annampak <annampak@hotmail.com>
Date: Thu, 7 Dec 2017 15:44:17 +0200
Subject: [PATCH] minor fixes

---
 .../src/app/field-form/field-form.component.html      |  2 +-
 dmp-admin/src/app/field-form/field-form.component.ts  |  5 ++---
 dmp-admin/src/app/form/form.component.ts              | 11 +++++++----
 dmp-admin/src/app/models/Field.ts                     |  4 +++-
 dmp-admin/src/app/models/FieldGroup.ts                |  2 ++
 dmp-admin/src/app/models/Section.ts                   |  5 ++++-
 dmp-admin/src/app/rule-component/rule.component.ts    |  1 -
 7 files changed, 19 insertions(+), 11 deletions(-)

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 fefbca431..68d14ab9b 100644
--- a/dmp-admin/src/app/field-form/field-form.component.html
+++ b/dmp-admin/src/app/field-form/field-form.component.html
@@ -15,7 +15,7 @@
                         <label>View style</label>
                         <select class="form-control" formControlName="renderStyle">
                             <option value="textarea">textarea</option>
-                            <option value="booleanDesicion">booleanDesicion</option>
+                            <option value="booleanDecision">booleanDecision</option>
                             <option value='combobox'>combobox</option>
                             <option value="checkBox">checkBox</option>
                             <option value="freetext">freetext</option>
diff --git a/dmp-admin/src/app/field-form/field-form.component.ts b/dmp-admin/src/app/field-form/field-form.component.ts
index de0733025..a3f284556 100644
--- a/dmp-admin/src/app/field-form/field-form.component.ts
+++ b/dmp-admin/src/app/field-form/field-form.component.ts
@@ -16,10 +16,9 @@ export class FieldFormComponent {
 @Input() form: FormGroup;
 @Input() dataModel: Field;
 
-constructon(){}
+constructor(){}
 
-ngOnInit(){
-  console.log("init field")
+ngOnInit(){ 
  // this.addNewRule();
 }
 
diff --git a/dmp-admin/src/app/form/form.component.ts b/dmp-admin/src/app/form/form.component.ts
index 8b388d545..baafc21f8 100644
--- a/dmp-admin/src/app/form/form.component.ts
+++ b/dmp-admin/src/app/form/form.component.ts
@@ -59,14 +59,17 @@ export class FormComponent {
     (<FormArray>this.form.get("sections")).removeAt(index)
   }
 
-  updateForm(data) {
+  createForm(data) {
     return this.restBase.post("/admin/addDmp", data);
   }
-
+  updateForm(id,data) {
+    return this.restBase.post("/admin/addDmp/"+id, data);
+  }
   onSubmit() {
-    debugger;
     let data = this.form.value;
-    this.updateForm(data).subscribe();
+    
+    if(this.profileID) this.updateForm(this.profileID, data).subscribe();
+    else this.createForm(data).subscribe();
   }
 
 }
\ No newline at end of file
diff --git a/dmp-admin/src/app/models/Field.ts b/dmp-admin/src/app/models/Field.ts
index 9cd9767ed..4bc4eb2a6 100644
--- a/dmp-admin/src/app/models/Field.ts
+++ b/dmp-admin/src/app/models/Field.ts
@@ -34,7 +34,7 @@ export class Field extends BaseModel implements Serializable<Field>,FormGenerato
         this.defaultValue = new JsonSerializer<DefaultValue>().fromJSONObject(item.defaultValue, DefaultValue);
         this.description = item.description;
         this.extendedDescription = item.extendedDescription;
-        this.defaultVisibility = item.defaultVisibility;
+        this.defaultVisibility = item.defaultVisibility ? item.defaultVisibility : true;
         this.page = item.page;
         this.multiplicity =  new JsonSerializer<Multiplicity>().fromJSONObject(item.multiplicity, Multiplicity);
         this.ordinal = item.ordinal;
@@ -70,6 +70,8 @@ export class Field extends BaseModel implements Serializable<Field>,FormGenerato
         //formGroup.addControl("data",this.data? this.data.buildForm():this.formBuilder.group({}));
         if(this.data)formGroup.addControl("data",this.data.buildForm());
         
+        if( !formGroup.controls["defaultVisibility"].value) formGroup.controls["defaultVisibility"].setValue(true);
+
         return formGroup;
     }
 }
\ No newline at end of file
diff --git a/dmp-admin/src/app/models/FieldGroup.ts b/dmp-admin/src/app/models/FieldGroup.ts
index 2f7acac08..3ec538c2d 100644
--- a/dmp-admin/src/app/models/FieldGroup.ts
+++ b/dmp-admin/src/app/models/FieldGroup.ts
@@ -52,6 +52,8 @@ export class FieldGroup extends BaseModel implements Serializable<FieldGroup>, F
             })
         }
         formGroup.addControl('compositeFields', this.formBuilder.array(compositeFieldsFormArray));
+        
+        if( !formGroup.controls["defaultVisibility"].value) formGroup.controls["defaultVisibility"].setValue(true);
 
         return formGroup;
     }
diff --git a/dmp-admin/src/app/models/Section.ts b/dmp-admin/src/app/models/Section.ts
index 789e9f63d..96313363f 100644
--- a/dmp-admin/src/app/models/Section.ts
+++ b/dmp-admin/src/app/models/Section.ts
@@ -49,7 +49,10 @@ export class Section extends BaseModel implements Serializable<Section>, FormGen
         formGroup.addControl('id', new FormControl(this.id));
         formGroup.addControl('title', new FormControl(this.title));
         formGroup.addControl('description', new FormControl(this.description));      
-        formGroup.addControl('ordinal', new FormControl(this.ordinal));        
+        formGroup.addControl('ordinal', new FormControl(this.ordinal));       
+        
+        if( !formGroup.controls["defaultVisibility"].value) formGroup.controls["defaultVisibility"].setValue(true);
+        
         return formGroup;
     }
 }
\ No newline at end of file
diff --git a/dmp-admin/src/app/rule-component/rule.component.ts b/dmp-admin/src/app/rule-component/rule.component.ts
index b6c746321..251371c34 100644
--- a/dmp-admin/src/app/rule-component/rule.component.ts
+++ b/dmp-admin/src/app/rule-component/rule.component.ts
@@ -13,7 +13,6 @@ export class RuleFormComponent {
 @Input() dataModel: FormGroup;
 
 TargetValidation(){
-  debugger;
 }
 
 }
\ No newline at end of file