Merge pull request #85 from Gid733/master

Fixed entity-select behavior

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>();
 

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-entitysearch [(fieldValue)]="dataItem.fieldValues[0]" [entityGroupUid]="dataItem.entityGroupId"></element-entitysearch>
+            <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.html

@@ -1,4 +1,3 @@
 <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,6 +1,6 @@
 import {Component, Input, OnDestroy, OnInit} from '@angular/core';
 import {CaseFieldValue, CommonDictionaryTextModel} from 'app/models';
-import {EntitySearchService} from 'app/services';
+import {EntitySearchService, EntitySelectService} from 'app/services';
 import {FormControl} from '@angular/forms';
 import {ISubscription} from 'rxjs/Subscription';
 
@@ -26,27 +26,23 @@ export class ElementEntityselectComponent implements OnInit, OnDestroy {
     this.fieldValueObj = val;
   }
 
-  constructor(private entitySearchService: EntitySearchService) {
+  constructor(private entitySelectService: EntitySelectService) {
   }
 
   ngOnInit() {
     this.sub = this.selectControl.valueChanges.subscribe(value => this.onSelectedChanged(value));
+
+    this.entitySelectService.getEntitySelectableGroupDictionary(this.entityGroupUid).subscribe((operation => {
+      if (operation && operation.success) {
+        this.items  = operation.model;
+      }
+    }));
   }
 
   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;
   }

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);
   }
 }