From f43c7af2db414edbb10f9484391a20f68da693ea Mon Sep 17 00:00:00 2001
From: Denys Vuika <denis.vuyka@gmail.com>
Date: Wed, 20 Jul 2016 12:06:04 +0100
Subject: [PATCH] #440 widgets show real values of the form

---
 .../src/components/widgets/checkbox/checkbox.widget.html      | 2 +-
 .../widgets/multiline-text/multiline-text.widget.html         | 4 +++-
 .../src/components/widgets/number/number.widget.html          | 3 ++-
 .../src/components/widgets/text/text.widget.html              | 2 +-
 .../src/components/widgets/widget.model.ts                    | 2 ++
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/checkbox/checkbox.widget.html b/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/checkbox/checkbox.widget.html
index 28bb149192..cee9bd4148 100644
--- a/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/checkbox/checkbox.widget.html
+++ b/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/checkbox/checkbox.widget.html
@@ -1,4 +1,4 @@
 <label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" [attr.for]="field.id">
-    <input type="checkbox" [attr.id]="field.id" class="mdl-checkbox__input">
+    <input type="checkbox" [attr.id]="field.id" class="mdl-checkbox__input" [(ngModel)]="field.value">
     <span class="mdl-checkbox__label">{{field.name}}</span>
 </label>
diff --git a/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/multiline-text/multiline-text.widget.html b/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/multiline-text/multiline-text.widget.html
index 660e19edf9..21e1310d50 100644
--- a/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/multiline-text/multiline-text.widget.html
+++ b/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/multiline-text/multiline-text.widget.html
@@ -1,4 +1,6 @@
 <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label multiline-text-widget">
-    <textarea class="mdl-textfield__input" type="text" rows= "3" [attr.id]="field.id"></textarea>
+    <textarea class="mdl-textfield__input" type="text" rows= "3"
+              [attr.id]="field.id" [(ngModel)]="field.value">
+    </textarea>
     <label class="mdl-textfield__label" [attr.for]="field.id">{{field.name}}</label>
 </div>
diff --git a/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/number/number.widget.html b/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/number/number.widget.html
index 02f659b0ef..879ad88dd7 100644
--- a/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/number/number.widget.html
+++ b/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/number/number.widget.html
@@ -1,5 +1,6 @@
 <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label number-widget">
-    <input class="mdl-textfield__input" type="text" pattern="-?[0-9]*(\.[0-9]+)?" [attr.id]="field.id">
+    <input class="mdl-textfield__input" type="text" pattern="-?[0-9]*(\.[0-9]+)?"
+           [attr.id]="field.id" [(ngModel)]="field.value">
     <label class="mdl-textfield__label" [attr.for]="field.id">{{field.name}}</label>
     <span class="mdl-textfield__error">Input is not a number!</span>
 </div>
diff --git a/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/text/text.widget.html b/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/text/text.widget.html
index a0f708bc7b..65d13b4eeb 100644
--- a/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/text/text.widget.html
+++ b/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/text/text.widget.html
@@ -1,4 +1,4 @@
 <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label text-widget">
-    <input class="mdl-textfield__input" type="text" [attr.id]="field.id">
+    <input class="mdl-textfield__input" type="text" [attr.id]="field.id" [(ngModel)]="field.value">
     <label class="mdl-textfield__label" [attr.for]="field.id">{{field.name}}</label>
 </div>
diff --git a/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/widget.model.ts b/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/widget.model.ts
index 4154c6f561..2390b8958c 100644
--- a/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/widget.model.ts
+++ b/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/widget.model.ts
@@ -43,6 +43,7 @@ export class FormFieldModel extends FormWidgetModel {
     id: string;
     name: string;
     type: string;
+    value: any;
     tab: string;
     colspan: number = 1;
 
@@ -55,6 +56,7 @@ export class FormFieldModel extends FormWidgetModel {
             this.id = json.id;
             this.name = json.name;
             this.type = json.type;
+            this.value = json.value;
             this.tab = json.tab;
             this.colspan = <number> json.colspan;
         }