Merge pull request #80 from Gid733/master

renemadsen · web-flow · commit f2bee8a4d1bb · 2018-02-13T09:17:09.000+01:00
Updates
diff --git a/eform-client/package.json b/eform-client/package.json
@@ -9,7 +9,7 @@
     "test": "ng test",
     "pree2e": "webdriver-manager update --standalone false --gecko false",
     "e2e": "protractor",
-    "build": "ng build --env=prod",
+    "build": "ng build --aot --prod --env=prod",
     "server": "node server.js",
     "winserver-install": "node svc.js install",
     "winserver-uninstall": "node svc.js uninstall",
@@ -44,6 +44,7 @@
     "ng2-file-upload": "^1.2.1",
     "ngx-bootstrap": "^1.6.6",
     "ngx-gallery": "^3.1.4",
+    "ngx-select-ex": "^3.1.2",
     "pnotify": "^3.2.0",
     "rxjs": "^5.4.2",
     "trumbowyg": "^2.5.1",
diff --git a/eform-client/src/app/models/advanced/adv-entity-group-edit.model.ts b/eform-client/src/app/models/advanced/adv-entity-group-edit.model.ts
@@ -1,4 +1,4 @@
-import {AdvEntityItemModel} from 'app/models/advanced';
+import {AdvEntityItemModel} from './adv-entity-item.model';
 export class AdvEntityGroupEditModel {
   name: string;
   advEntityItemModels: Array<AdvEntityItemModel> = [];
diff --git a/eform-client/src/app/models/advanced/adv-entity-group-list.model.ts b/eform-client/src/app/models/advanced/adv-entity-group-list.model.ts
@@ -1,4 +1,4 @@
-import {AdvEntityGroupModel} from 'app/models/advanced';
+import {AdvEntityGroupModel} from './adv-entity-group.model';
 export class AdvEntityGroupListModel {
   numOfElements: number;
   pageNum: number;
diff --git a/eform-client/src/app/models/advanced/adv-entity-group.model.ts b/eform-client/src/app/models/advanced/adv-entity-group.model.ts
@@ -1,4 +1,4 @@
-import {AdvEntityItemModel} from 'app/models/advanced/adv-entity-item.model';
+import {AdvEntityItemModel} from './adv-entity-item.model';
 export class AdvEntityGroupModel {
   name: string;
   type: string;
diff --git a/eform-client/src/app/models/advanced/worker-create.model.ts b/eform-client/src/app/models/advanced/worker-create.model.ts
@@ -1,5 +1,3 @@
-import {SiteDto} from 'app/models/dto';
-
 export class WorkerCreateModel {
   firstName: string;
   lastName: string;
diff --git a/eform-client/src/app/models/cases/index.ts b/eform-client/src/app/models/cases/index.ts
@@ -4,12 +4,12 @@ export * from './request/edit-request-field.model'
 export * from './request/edit-request.model'
 export * from './request/reply-request.model'
 export * from './request/edit-request-group-field.model'
+
 export * from './response/case-element'
 export * from './response/case-field-value'
 export * from './response/data-item.model'
 export * from './response/key-value-pair.model'
 export * from './response/reply-element.model'
-export * from './response/data-item-group.model'
 export * from './response/column-field.model'
 export * from './request/update-columns.model'
 
diff --git a/eform-client/src/app/models/cases/request/edit-request-group-field.model.ts b/eform-client/src/app/models/cases/request/edit-request-group-field.model.ts
@@ -1,4 +1,4 @@
-import {CaseEditRequestField} from 'app/models';
+import {CaseEditRequestField} from './edit-request-field.model';
 
 export class CaseEditRequestGroupField {
   id: number;
diff --git a/eform-client/src/app/models/cases/response/data-item-group.model.ts b/eform-client/src/app/models/cases/response/data-item-group.model.ts
@@ -1,4 +1,3 @@
-import {CaseDataItem} from 'app/models';
 
 // export class CaseDataItemGroup {
 //   id: number;
diff --git a/eform-client/src/app/models/cases/response/data-item.model.ts b/eform-client/src/app/models/cases/response/data-item.model.ts
@@ -13,6 +13,7 @@ export class CaseDataItem {
   fieldValue: string;
   fieldValues: Array<CaseFieldValue> = [];
   dataItemList: Array<CaseDataItem> = [];
+  entityGroupId: string;
   // Picture
   multi: number;
   geolocationEnabled: number;
diff --git a/eform-client/src/app/models/common/common-dictionary-text.model.ts b/eform-client/src/app/models/common/common-dictionary-text.model.ts
@@ -0,0 +1,4 @@
+export class CommonDictionaryTextModel {
+  id: string;
+  text: string;
+}
diff --git a/eform-client/src/app/models/common/index.ts b/eform-client/src/app/models/common/index.ts
@@ -1,3 +1,4 @@
 export * from './pagination-model'
 export * from './common-dictionary.model';
 export * from './key-value.model';
+export * from './common-dictionary-text.model';
diff --git a/eform-client/src/app/models/dto/template.dto.ts b/eform-client/src/app/models/dto/template.dto.ts
@@ -1,6 +1,6 @@
 import {SiteNameDto} from './site-name.dto';
 import {FieldDto} from './field.dto';
-import {KeyValueModel} from 'app/models/common';
+import {KeyValueModel} from '../common/key-value.model';
 
 export class TemplateDto {
   id: number;
diff --git a/eform-client/src/app/models/eFormTemplates/deploy-to.model.ts b/eform-client/src/app/models/eFormTemplates/deploy-to.model.ts
@@ -1,5 +1,5 @@
-import {SiteNameDto, TemplateDto} from '../dto';
-export class DeployToModel {
-  templateDto: TemplateDto;
-  siteNamesDto: Array<SiteNameDto>;
-}
+// import {SiteNameDto, TemplateDto} from '../dto/';
+// export class DeployToModel {
+//   templateDto: TemplateDto;
+//   siteNamesDto: Array<SiteNameDto>;
+// }
diff --git a/eform-client/src/app/models/eFormTemplates/index.ts b/eform-client/src/app/models/eFormTemplates/index.ts
@@ -1,4 +1,3 @@
 export * from './deploy.model';
-export * from './deploy-to.model';
 export * from './eform-create.model';
 
diff --git a/eform-client/src/app/models/eFormTemplates/template-list.model.ts b/eform-client/src/app/models/eFormTemplates/template-list.model.ts
@@ -1,4 +1,4 @@
-import {TemplateDto} from 'app/models/dto';
+import {TemplateDto} from '../dto/template.dto';
 
 export class TemplateListModel {
   numOfElements: number;
diff --git a/eform-client/src/app/models/index.ts b/eform-client/src/app/models/index.ts
@@ -6,3 +6,4 @@ export * from './simpleSite';
 export * from './cases'
 export * from './auth'
 export * from './user'
+export * from './common';
diff --git a/eform-client/src/app/models/user/user-info-model-list.ts b/eform-client/src/app/models/user/user-info-model-list.ts
@@ -1,4 +1,4 @@
-import {UserInfoModel} from 'app/models/user';
+import {UserInfoModel} from './user-info-model';
 export class UserInfoModelList {
   userList: Array<UserInfoModel> = [];
   totalUsers: number;
diff --git a/eform-client/src/app/modules/cases/cases.module.ts b/eform-client/src/app/modules/cases/cases.module.ts
@@ -1,13 +1,8 @@
-import {FormsModule} from '@angular/forms';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {CasesRoutingModule} from './cases-routing.module';
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {NgxGalleryModule} from 'ngx-gallery';
-import {CasesComponent} from './components/cases.component';
-import {CasesTableComponent} from './components/cases-table/cases-table.component';
-import {CasesEditComponent} from './components/cases-edit/cases-edit.component';
-import {CaseEditElementComponent} from './components/case-edit-element/case-edit-element.component';
-import {CaseEditSwitchComponent} from 'app/modules/cases/components/case-edit-switch/case-edit-switch.component';
 
 import {
   ElementCheckboxComponent,
@@ -24,20 +19,29 @@ import {
   ElementTimerComponent,
   ElementSignatureComponent,
   TrumbowygComponent,
-  ElementEntitysearchComponent, ElementEntityselectComponent
-} from './components/case-elements';
+  ElementEntitysearchComponent,
+  ElementEntityselectComponent,
+  CaseEditSwitchComponent,
+  CaseEditElementComponent,
+  CasesEditComponent,
+  CasesTableComponent,
+  CasesComponent
+} from './components';
 import {CollapseModule, TooltipModule} from 'ngx-bootstrap';
 import {Ng2Bs3ModalModule} from 'ng2-bs3-modal/ng2-bs3-modal';
+import {NgxSelectModule} from 'ngx-select-ex';
 
 @NgModule({
   imports: [
     CommonModule,
     NgxGalleryModule,
     FormsModule,
+    ReactiveFormsModule,
     CasesRoutingModule,
     CollapseModule.forRoot(),
     Ng2Bs3ModalModule,
     TooltipModule.forRoot(),
+    NgxSelectModule
   ],
   declarations: [CasesComponent,
     TrumbowygComponent,
diff --git a/eform-client/src/app/modules/cases/components/case-edit-switch/case-edit-switch.component.html b/eform-client/src/app/modules/cases/components/case-edit-switch/case-edit-switch.component.html
@@ -51,7 +51,7 @@
             <element-container [(fieldValue)]="dataItem.dataItemList" [dataItemLabel]="dataItem.label"></element-container>
           </div>
           <div *ngSwitchCase="'EntitySearch'">
-            <element-entitysearch [(fieldValue)]="dataItem.fieldValues[0]"></element-entitysearch>
+            <element-entitysearch [(fieldValue)]="dataItem.fieldValues[0]" [entityGroupUid]="dataItem.entityGroupId"></element-entitysearch>
           </div>
           <div *ngSwitchCase="'EntitySelect'">
             <element-entityselect [(fieldValue)]="dataItem.fieldValues[0]"></element-entityselect>
diff --git a/eform-client/src/app/modules/cases/components/case-edit-switch/case-edit-switch.component.ts b/eform-client/src/app/modules/cases/components/case-edit-switch/case-edit-switch.component.ts
@@ -1,5 +1,5 @@
 import {Component, Input} from '@angular/core';
-import {CaseDataItem} from 'app/models/cases/response/data-item.model';
+import {CaseDataItem} from 'app/models';
 
 @Component({
   selector: '[case-edit-switch]',
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-container/element-container.component.ts b/eform-client/src/app/modules/cases/components/case-elements/element-container/element-container.component.ts
@@ -1,5 +1,5 @@
 import {Component, Input} from '@angular/core';
-import {CaseDataItem} from 'app/models/cases/response/data-item.model';
+import {CaseDataItem} from 'app/models';
 
 @Component({
   selector: 'element-container',
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-entitysearch/element-entitysearch.component.html b/eform-client/src/app/modules/cases/components/case-elements/element-entitysearch/element-entitysearch.component.html
@@ -1,4 +1,10 @@
-<select class="form-control" [(ngModel)]="fieldValueObj.value" name="value" disabled>
+<!-- <select class="form-control" [(ngModel)]="fieldValueObj.value" name="value" disabled>
   <option [value]="fieldValueObj.value">{{fieldValueObj.valueReadable}}
   </option>
 </select>
+-->
+
+<ngx-select [items]="items"
+            (typed)="onSelectInputChanged($event)"
+            [formControl]="selectControl"
+            [placeholder]="fieldValueObj.valueReadable">
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-entitysearch/element-entitysearch.component.ts b/eform-client/src/app/modules/cases/components/case-elements/element-entitysearch/element-entitysearch.component.ts
@@ -1,13 +1,21 @@
-import {Component, Input, OnInit} from '@angular/core';
-import {CaseFieldValue} from 'app/models';
+import {Component, Input, OnDestroy, OnInit} from '@angular/core';
+import {CaseFieldValue, CommonDictionaryTextModel} from 'app/models';
+import {EntitySearchService} from 'app/services';
+import {FormControl} from '@angular/forms';
+import {ISubscription} from 'rxjs/Subscription';
 
 @Component({
   selector: 'element-entitysearch',
   templateUrl: './element-entitysearch.component.html',
   styleUrls: ['./element-entitysearch.component.css']
 })
-export class ElementEntitysearchComponent implements OnInit {
+export class ElementEntitysearchComponent implements OnInit, OnDestroy {
+  sub:  ISubscription;
+  selectControl = new FormControl();
+  items: Array<CommonDictionaryTextModel> = [];
+
   fieldValueObj: CaseFieldValue = new CaseFieldValue();
+  @Input() entityGroupUid: string;
 
   @Input()
   get fieldValue() {
@@ -18,10 +26,28 @@ export class ElementEntitysearchComponent implements OnInit {
     this.fieldValueObj = val;
   }
 
-  constructor() {
+  constructor(private entitySearchService: EntitySearchService) {
   }
 
   ngOnInit() {
+    this.sub = this.selectControl.valueChanges.subscribe(value => this.onSelectedChanged(value));
+  }
+
+  ngOnDestroy(): void {
+    this.sub.unsubscribe();
   }
 
+  onSelectInputChanged(searchString: string) {
+    if (searchString.length > 2) {
+      this.entitySearchService.getEntityGroupDictionary(this.entityGroupUid, searchString).subscribe((operation => {
+        if (operation && operation.success) {
+          this.items  = operation.model;
+        }
+      }));
+    }
+  }
+
+  onSelectedChanged(value: string) {
+    this.fieldValue.value = value;
+  }
 }
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-picture/element-picture.component.ts b/eform-client/src/app/modules/cases/components/case-elements/element-picture/element-picture.component.ts
@@ -1,7 +1,6 @@
 import {Component, Input, OnChanges, OnInit, SimpleChanges, ViewChild} from '@angular/core';
 import {CaseFieldValue} from 'app/models';
-import {ImageService} from 'app/services/files';
-import {NotifyService} from 'app/services/notify.service';
+import {ImageService, NotifyService} from 'app/services';
 import {NgxGalleryComponent, NgxGalleryImage, NgxGalleryOptions} from 'ngx-gallery';
 
 
diff --git a/eform-client/src/app/modules/cases/components/cases-edit/cases-edit.component.ts b/eform-client/src/app/modules/cases/components/cases-edit/cases-edit.component.ts
@@ -1,10 +1,8 @@
 import {CaseEditElementComponent} from '../case-edit-element/case-edit-element.component';
 import {ActivatedRoute, Router} from '@angular/router';
 import {Component, OnInit, QueryList, ViewChildren} from '@angular/core';
-import {CaseEditRequest, ReplyElement, ReplyRequest} from 'app/models';
-import {CasesService, NotifyService} from 'app/services';
-import {TemplateDto} from 'app/models/dto';
-import {EFormService} from 'app/services';
+import {CaseEditRequest, ReplyElement, ReplyRequest, TemplateDto} from 'app/models';
+import {CasesService, NotifyService, EFormService} from 'app/services';
 
 @Component({
   selector: 'app-cases-edit',
diff --git a/eform-client/src/app/modules/cases/components/cases-table/cases-table.component.ts b/eform-client/src/app/modules/cases/components/cases-table/cases-table.component.ts
@@ -1,11 +1,8 @@
 import {ActivatedRoute, Router} from '@angular/router';
 import {Component, OnInit, ViewChild} from '@angular/core';
-import {EFormService} from 'app/services/eform/eform.service';
-import {TemplateDto} from 'app/models/dto';
-import {CaseModel} from 'app/models/cases';
-import {CasesService} from 'app/services/cases/cases.service';
+import {TemplateDto, CaseModel} from 'app/models';
+import {CasesService, NotifyService, EFormService} from 'app/services';
 import {ModalComponent} from 'ng2-bs3-modal/ng2-bs3-modal';
-import {NotifyService} from 'app/services/notify.service';
 
 @Component({
   selector: 'app-cases-table',
diff --git a/eform-client/src/app/modules/cases/components/index.ts b/eform-client/src/app/modules/cases/components/index.ts
@@ -0,0 +1,6 @@
+export * from './case-elements';
+export * from './case-edit-switch/case-edit-switch.component';
+export * from './case-edit-element/case-edit-element.component';
+export * from './cases-edit/cases-edit.component';
+export * from './cases-table/cases-table.component';
+export * from './cases.component';
diff --git a/eform-client/src/app/services/entity-search.service.ts b/eform-client/src/app/services/entity-search.service.ts
@@ -8,6 +8,7 @@ import {OperationDataResult, OperationResult} from 'app/modules/helpers/operatio
 import {BaseService} from 'app/services/base.service';
 import 'rxjs/add/operator/map';
 import {Observable} from 'rxjs/Observable';
+import {CommonDictionaryModel, CommonDictionaryTextModel} from '../models/common';
 
 @Injectable()
 export class EntitySearchService extends BaseService {
@@ -40,5 +41,10 @@ export class EntitySearchService extends BaseService {
     return this.postModelOperationResult<AdvEntityGroupEditModel>(AdvSearchableEntityMethods.CreateSingle, model);
   }
 
+  public getEntityGroupDictionary = (entityGroupUid: string, searchString: string):
+    Observable<OperationDataResult<Array<CommonDictionaryTextModel>>> => {
+    return this.getWithOperationDataResult<Array<CommonDictionaryTextModel>>(AdvSearchableEntityMethods.GetAll + '/dict/'
+      + entityGroupUid + '?searchString=' + searchString);
+  }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import {AdvEntityItemModel} from 'app/models/advanced';`
	`1`	`+import {AdvEntityItemModel} from './adv-entity-item.model';`
`2`	`2`	`export class AdvEntityGroupEditModel {`
`3`	`3`	`name: string;`
`4`	`4`	`advEntityItemModels: Array<AdvEntityItemModel> = [];`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import {AdvEntityGroupModel} from 'app/models/advanced';`
	`1`	`+import {AdvEntityGroupModel} from './adv-entity-group.model';`
`2`	`2`	`export class AdvEntityGroupListModel {`
`3`	`3`	`numOfElements: number;`
`4`	`4`	`pageNum: number;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import {SiteDto} from 'app/models/dto';`
`2`		`-`
`3`	`1`	`export class WorkerCreateModel {`
`4`	`2`	`firstName: string;`
`5`	`3`	`lastName: string;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import {CaseEditRequestField} from 'app/models';`
	`1`	`+import {CaseEditRequestField} from './edit-request-field.model';`
`2`	`2`
`3`	`3`	`export class CaseEditRequestGroupField {`
`4`	`4`	`id: number;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import {CaseDataItem} from 'app/models';`
`2`	`1`
`3`	`2`	`// export class CaseDataItemGroup {`
`4`	`3`	`// id: number;`