Merge branch 'master' of https://github.com/microting/eform-angular-frontend

Author: renemadsen

eFormAPI/eFormAPI/Controllers/EntitySelectController.cs

@@ -101,13 +101,13 @@ public OperationDataResult<EntityGroup> GetEntityGroup(string entityGroupUid)
 
         [HttpGet]
         [Route("api/selectable-groups/dict/{entityGroupUid}")]
-        public OperationDataResult<List<CommonDictionaryTextModel>> GetEntityGroupDictionary(string entityGroupUid, string searchString)
+        public OperationDataResult<List<CommonDictionaryTextModel>> GetEntityGroupDictionary(string entityGroupUid)
         {
             try
             {
                 var core = _coreHelper.GetCore();
 
-                var entityGroup = core.EntityGroupRead(entityGroupUid, null, searchString);
+                var entityGroup = core.EntityGroupRead(entityGroupUid);
 
                 var mappedEntityGroupDict = new List<CommonDictionaryTextModel>();
 

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-entityselect [(fieldValue)]="dataItem.fieldValues[0]" [entityGroupUid]="dataItem.entityGroupId"></element-entityselect>
           </div>
           <div *ngSwitchDefault></div>
         </div>

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, EntitySelectService} 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,14 +26,17 @@ export class ElementEntityselectComponent implements OnInit, OnDestroy {
     this.fieldValueObj = val;
   }
 
-  constructor() {
+  constructor(private entitySelectService: EntitySelectService) {
   }
 
   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});
-    }
+
+    this.entitySelectService.getEntitySelectableGroupDictionary(this.entityGroupUid).subscribe((operation => {
+      if (operation && operation.success) {
+        this.items  = operation.model;
+      }
+    }));
   }
 
   ngOnDestroy(): void {
@@ -40,5 +46,4 @@ export class ElementEntityselectComponent implements OnInit, OnDestroy {
   onSelectedChanged(value: string) {
     this.fieldValue.value = value;
   }
-
 }

eform-client/src/app/services/entity-select.service.ts

@@ -41,10 +41,10 @@ export class EntitySelectService extends BaseService {
     return this.postModelOperationResult<AdvEntitySelectableGroupEditModel>(AdvSelectableEntityMethods.CreateSingle, model);
   }
 
-  public getEntitySelectableGroupDictionary = (entityGroupUid: string, searchString: string):
+  public getEntitySelectableGroupDictionary = (entityGroupUid: string):
     Observable<OperationDataResult<Array<CommonDictionaryTextModel>>> => {
     return this.getWithOperationDataResult<Array<CommonDictionaryTextModel>>(AdvSelectableEntityMethods.GetAll + '/dict/'
-      + entityGroupUid + '?searchString=' + searchString);
+      + entityGroupUid);
   }
 }