Merge pull request #84 from Gid733/master

Fixes for entity-select

Author: renemadsen

eFormAPI/eFormAPI/Infrastructure/Helpers/CaseUpdateHelper.cs

@@ -107,6 +107,14 @@ public static List<string> GetFieldValuesByRequestField(CaseEditRequestField edi
                         list.Add(val);
                     }
                     break;
+                case "EntitySelect":
+                    var entitySelect = editRequestField?.FieldValues?.First();
+                    if (entitySelect?.Value != null && entitySelect?.FieldId != null)
+                    {
+                        string val = $"{entitySelect.FieldId}|{entitySelect.Value.ToString()}";
+                        list.Add(val);
+                    }
+                    break;
                 case "MultiSelect":
                     var multiFirst = editRequestField?.FieldValues?.First();
                     if (multiFirst?.Value != null && multiFirst?.FieldId != null)

eform-client/src/app/modules/cases/components/case-edit-switch/case-edit-switch.component.html

@@ -54,7 +54,7 @@
             <element-entitysearch [(fieldValue)]="dataItem.fieldValues[0]" [entityGroupUid]="dataItem.entityGroupId"></element-entitysearch>
           </div>
           <div *ngSwitchCase="'EntitySelect'">
-            <element-entityselect [(fieldValue)]="dataItem.fieldValues[0]"></element-entityselect>
+            <element-entitysearch [(fieldValue)]="dataItem.fieldValues[0]" [entityGroupUid]="dataItem.entityGroupId"></element-entitysearch>
           </div>
           <div *ngSwitchDefault></div>
         </div>

eform-client/src/app/modules/cases/components/case-elements/element-entityselect/element-entityselect.component.html

@@ -1,3 +1,4 @@
 <ngx-select [items]="items"
+            (typed)="onSelectInputChanged($event)"
             [formControl]="selectControl"
             [placeholder]="fieldValueObj.valueReadable">

eform-client/src/app/modules/cases/components/case-elements/element-entityselect/element-entityselect.component.ts

@@ -1,7 +1,8 @@
 import {Component, Input, OnDestroy, OnInit} from '@angular/core';
 import {CaseFieldValue, CommonDictionaryTextModel} from 'app/models';
-import {ISubscription} from 'rxjs/Subscription';
+import {EntitySearchService} from 'app/services';
 import {FormControl} from '@angular/forms';
+import {ISubscription} from 'rxjs/Subscription';
 
 @Component({
   selector: 'element-entityselect',
@@ -11,9 +12,11 @@ import {FormControl} from '@angular/forms';
 export class ElementEntityselectComponent implements OnInit, OnDestroy {
   sub:  ISubscription;
   selectControl = new FormControl();
-  fieldValueObj: CaseFieldValue = new CaseFieldValue();
   items: Array<CommonDictionaryTextModel> = [];
 
+  fieldValueObj: CaseFieldValue = new CaseFieldValue();
+  @Input() entityGroupUid: string;
+
   @Input()
   get fieldValue() {
     return this.fieldValueObj;
@@ -23,22 +26,28 @@ export class ElementEntityselectComponent implements OnInit, OnDestroy {
     this.fieldValueObj = val;
   }
 
-  constructor() {
+  constructor(private entitySearchService: EntitySearchService) {
   }
 
   ngOnInit() {
     this.sub = this.selectControl.valueChanges.subscribe(value => this.onSelectedChanged(value));
-    for (const keyValuePair of this.fieldValueObj.keyValuePairList) {
-      this.items.push({id: keyValuePair.key, text: keyValuePair.value});
-    }
   }
 
   ngOnDestroy(): void {
     this.sub.unsubscribe();
   }
 
+  onSelectInputChanged(searchString: string) {
+    if (searchString.length > 2) {
+      this.entitySearchService.getEntitySearchableGroupDictionary(this.entityGroupUid, searchString).subscribe((operation => {
+        if (operation && operation.success) {
+          this.items  = operation.model;
+        }
+      }));
+    }
+  }
+
   onSelectedChanged(value: string) {
     this.fieldValue.value = value;
   }
-
 }