From c1b2d0d7ab6a60403ff6f334059e0d14177e6ae2 Mon Sep 17 00:00:00 2001
From: Denys Vuika <denis.vuyka@gmail.com>
Date: Wed, 14 Sep 2016 18:40:40 +0100
Subject: [PATCH] #726 people widget validator and bug fixes

- people widget validator (Required)
- fixes #744
- fixes #745
---
 .../widgets/core/form-field-validator.ts         |  3 ++-
 .../components/widgets/people/people.widget.css  | 16 ++++++++++++++++
 .../components/widgets/people/people.widget.html |  5 +++--
 .../components/widgets/people/people.widget.ts   | 10 +++++++++-
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts
index 496079aab4..21192fa3b5 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts
@@ -32,7 +32,8 @@ export class RequiredFieldValidator implements FormFieldValidator {
         FormFieldTypes.MULTILINE_TEXT,
         FormFieldTypes.NUMBER,
         FormFieldTypes.TYPEAHEAD,
-        FormFieldTypes.DROPDOWN
+        FormFieldTypes.DROPDOWN,
+        FormFieldTypes.PEOPLE
     ];
 
     isSupported(field: FormFieldModel): boolean {
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.css b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.css
index de35519d8b..2d444f1b7f 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.css
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.css
@@ -27,3 +27,19 @@
 .people-widget--autocomplete > ul > li {
     opacity: 1;
 }
+
+.people-widget__invalid .mdl-textfield__input {
+    border-color: #d50000;
+}
+
+.people-widget__invalid .mdl-textfield__label {
+    color: #d50000;
+}
+
+.people-widget__invalid .mdl-textfield__label:after {
+    background-color: #d50000;
+}
+
+.people-widget__invalid .mdl-textfield__error {
+    visibility: visible !important;
+}
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.html
index 0d660b2bb4..a3896ab26e 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.html
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.html
@@ -1,4 +1,5 @@
-<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label people-widget">
+<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label people-widget"
+     [class.people-widget__invalid]="!field.isValid">
     <input class="mdl-textfield__input"
            type="text"
            [attr.id]="field.id"
@@ -8,8 +9,8 @@
            (blur)="onBlur()"
            [disabled]="field.readOnly">
     <label class="mdl-textfield__label" [attr.for]="field.id">{{field.name}}</label>
+    <span *ngIf="field.validationSummary" class="mdl-textfield__error">{{field.validationSummary}}</span>
 </div>
-
 <div class="people-widget--autocomplete mdl-shadow--2dp" *ngIf="popupVisible && users.length > 0">
     <ul>
         <li *ngFor="let item of users"
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.ts
index 9eb2a468f6..7912ade856 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.ts
@@ -55,6 +55,14 @@ export class PeopleWidget extends WidgetComponent implements OnInit {
                 let restrictWithGroup = <GroupModel> params['restrictWithGroup'];
                 this.groupId = restrictWithGroup.id;
             }
+
+            // Load auto-completion for previously saved value
+            if (this.value) {
+                this.formService.getWorkflowUsers(this.value, this.groupId)
+                    .subscribe((result: GroupUserModel[]) => {
+                        this.users = result || [];
+                    });
+            }
         }
     }
 
@@ -97,7 +105,7 @@ export class PeopleWidget extends WidgetComponent implements OnInit {
 
     getDisplayName(model: GroupUserModel) {
         if (model) {
-            let displayName = `${model.firstName} ${model.lastName}`;
+            let displayName = `${model.firstName || ''} ${model.lastName || ''}`;
             return displayName.trim();
         }