diff --git a/eform-client/src/app/components/auth/auth.component.ts b/eform-client/src/app/components/auth/auth.component.ts index 98565861f8..7737608c46 100644 --- a/eform-client/src/app/components/auth/auth.component.ts +++ b/eform-client/src/app/components/auth/auth.component.ts @@ -87,7 +87,6 @@ export class AuthComponent implements OnInit { getSettings() { this.settingsService.getLoginPageSettings().subscribe((data) => { if (data && data.success) { - debugger; this.loginPageSettings = data.model; if (this.loginPageSettings.imageLink && this.loginPageSettings.imageLinkVisible) { this.loginImage = 'api/images/login-page-images?fileName=' + this.loginPageSettings.imageLink; diff --git a/eform-client/src/app/modules/advanced/components/workers/workers.component.ts b/eform-client/src/app/modules/advanced/components/workers/workers.component.ts index 01f77d52cc..436fdfe2bc 100644 --- a/eform-client/src/app/modules/advanced/components/workers/workers.component.ts +++ b/eform-client/src/app/modules/advanced/components/workers/workers.component.ts @@ -92,7 +92,6 @@ export class WorkersComponent implements OnInit { } selectSiteForWorker(e: any) { - debugger; if (e.target.value != 'null') { let foundSiteDto = this.simpleSites.find(x => x.siteId === +e.target.value); this.newWorkerModel.siteId = foundSiteDto.siteId; diff --git a/eform-client/src/app/modules/cases/cases.module.ts b/eform-client/src/app/modules/cases/cases.module.ts index e6f307d3f3..79b31f0460 100644 --- a/eform-client/src/app/modules/cases/cases.module.ts +++ b/eform-client/src/app/modules/cases/cases.module.ts @@ -7,6 +7,7 @@ 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, @@ -17,23 +18,27 @@ import { ElementPictureComponent, ElementPdfComponent, ElementSingleselectComponent, + ElementContainerComponent, ElementTextComponent, ElementInfoboxComponent, ElementTimerComponent, ElementSignatureComponent, TrumbowygComponent } from './components/case-elements'; +import {CollapseModule} from 'ngx-bootstrap'; @NgModule({ imports: [ CommonModule, NgxGalleryModule, FormsModule, - CasesRoutingModule + CasesRoutingModule, + CollapseModule.forRoot() ], declarations: [CasesComponent, TrumbowygComponent, CasesEditComponent, + CaseEditSwitchComponent, CasesTableComponent, CaseEditElementComponent, ElementCommentComponent, @@ -42,6 +47,7 @@ import { ElementSingleselectComponent, ElementNumberComponent, ElementTextComponent, + ElementContainerComponent, ElementPictureComponent, ElementCheckboxComponent, ElementDateComponent, diff --git a/eform-client/src/app/modules/cases/components/case-edit-element/case-edit-element.component.html b/eform-client/src/app/modules/cases/components/case-edit-element/case-edit-element.component.html index 71bce03c51..82aebf8388 100644 --- a/eform-client/src/app/modules/cases/components/case-edit-element/case-edit-element.component.html +++ b/eform-client/src/app/modules/cases/components/case-edit-element/case-edit-element.component.html @@ -28,73 +28,7 @@ - - - - - - - - - {{dataItem.label}} - - - - - - -
-
- -
-
- -
-
- -
-
- -
-
- -
- - - - -
- -
-
- -
-
- -
-
- -
-
- -
-
- -
- - - - -
-
- - - - + diff --git a/eform-client/src/app/modules/cases/components/case-edit-element/case-edit-element.component.ts b/eform-client/src/app/modules/cases/components/case-edit-element/case-edit-element.component.ts index 556ed1c37e..c9999dfed7 100644 --- a/eform-client/src/app/modules/cases/components/case-edit-element/case-edit-element.component.ts +++ b/eform-client/src/app/modules/cases/components/case-edit-element/case-edit-element.component.ts @@ -3,7 +3,8 @@ import { CaseEditRequest, CaseEditRequestField, CaseEditRequestFieldValue, - CaseElement + CaseElement, + CaseDataItem } from 'app/models'; @Component({ @@ -29,62 +30,36 @@ export class CaseEditElementComponent { this.requestModels = []; } + extractDataItemList(dataItemList: Array ) { + dataItemList.forEach(item => { + const elem = new CaseEditRequestField(); + elem.fieldType = item.fieldType; + if (item.fieldValues && item.fieldValues.length > 0) { + item.fieldValues.forEach(fieldValue => { + const val = new CaseEditRequestFieldValue(); + val.fieldId = fieldValue.fieldId; + val.value = fieldValue.value; + elem.fieldValues.push(val); + }); + } + if (item.dataItemList && item.dataItemList.length > 0) { + this.extractDataItemList(item.dataItemList); + } + this.requestModel.fields.push(elem); + }); + } + extractData() { this.clearRequestModel(); this.requestModel.status = this.element.status; this.requestModel.id = this.element.id; - // if it is single element if (this.element.dataItemList) { - this.element.dataItemList.forEach(item => { - const elem = new CaseEditRequestField(); - elem.fieldType = item.fieldType; - if (item.fieldValues && item.fieldValues.length > 0) { - item.fieldValues.forEach(fieldValue => { - const val = new CaseEditRequestFieldValue(); - val.fieldId = fieldValue.fieldId; - val.value = fieldValue.value; - elem.fieldValues.push(val); - }); - } - if (item.dataItemList && item.dataItemList.length > 0) { - - } - this.requestModel.fields.push(elem); - }); + this.extractDataItemList(this.element.dataItemList); } - - // else if (this.element.dataItemGroupList ) { - // this.element.dataItemGroupList.forEach(y => { - // const group = new CaseEditRequestGroupField(); - // group.id = y.id; - // group.label = y.label; - // y.dataItemList.forEach(item => { - // const elem = new CaseEditRequestField(); - // elem.fieldType = item.fieldType; - // item.fieldValues.forEach(fieldValue => { - // const val = new CaseEditRequestFieldValue(); - // val.fieldId = fieldValue.fieldId; - // val.value = fieldValue.value; - // elem.fieldValues.push(val); - // }); - // group.fields.push(elem); - // }); - // this.requestModel.groupFields.push(group); - // }); - // } - this.editElements.forEach(x => { x.extractData(); this.requestModels.push(x.requestModel); }); this.requestModel.elementList = this.requestModels; } - - getStyleColorFromDataItem(dataItem: any) { - let style = ''; - if (dataItem.Color) { - style = '#' + dataItem.Color + ''; - } - return style; - } } 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 new file mode 100644 index 0000000000..82ae0fcbf4 --- /dev/null +++ b/eform-client/src/app/modules/cases/components/case-edit-switch/case-edit-switch.component.html @@ -0,0 +1,67 @@ + + + + + {{dataItem.label}} + + + + + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ + + + +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+
+
+
+ +
+ + + + 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 new file mode 100644 index 0000000000..968a627fdb --- /dev/null +++ b/eform-client/src/app/modules/cases/components/case-edit-switch/case-edit-switch.component.ts @@ -0,0 +1,22 @@ +import {Component, Input} from '@angular/core'; +import {CaseDataItem} from 'app/models/cases/response/data-item.model'; + +@Component({ + selector: '[case-edit-switch]', + templateUrl: './case-edit-switch.component.html' +}) + +export class CaseEditSwitchComponent { + @Input() dataItemList: Array = []; + + constructor() { + } + + getStyleColorFromDataItem(dataItem: any) { + let style = ''; + if (dataItem.Color) { + style = '#' + dataItem.Color + ''; + } + return style; + } +} diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-container/element-container.component.html b/eform-client/src/app/modules/cases/components/case-elements/element-container/element-container.component.html new file mode 100644 index 0000000000..7ed103fe44 --- /dev/null +++ b/eform-client/src/app/modules/cases/components/case-elements/element-container/element-container.component.html @@ -0,0 +1,14 @@ +
+
+ {{dataItemLabel}} + + +
+
+ + + +
+ +
+
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 new file mode 100644 index 0000000000..a2c4901ecd --- /dev/null +++ b/eform-client/src/app/modules/cases/components/case-elements/element-container/element-container.component.ts @@ -0,0 +1,22 @@ +import {Component, Input} from '@angular/core'; +import {CaseDataItem} from 'app/models/cases/response/data-item.model'; + +@Component({ + selector: 'element-container', + templateUrl: './element-container.component.html' +}) +export class ElementContainerComponent { + isCollapsed = true; + dataItemList: Array = []; + @Input() dataItemLabel: string; + @Input() + get fieldValue() { + return this.dataItemList; + } + set fieldValue(val) { + this.dataItemList = val; + } + + constructor() { + } +} diff --git a/eform-client/src/app/modules/cases/components/case-elements/index.ts b/eform-client/src/app/modules/cases/components/case-elements/index.ts index 6b52e0c0d3..51aa73e998 100644 --- a/eform-client/src/app/modules/cases/components/case-elements/index.ts +++ b/eform-client/src/app/modules/cases/components/case-elements/index.ts @@ -11,3 +11,4 @@ export * from './element-pdf/element-text.component' export * from './element-infobox/element-infobox.component' export * from './element-timer/element-timer.component' export * from './element-signature/element-signature.component' +export * from './element-container/element-container.component' diff --git a/eform-client/src/app/services/accounts/auth.service.ts b/eform-client/src/app/services/accounts/auth.service.ts index a8d40647d2..210d12daca 100644 --- a/eform-client/src/app/services/accounts/auth.service.ts +++ b/eform-client/src/app/services/accounts/auth.service.ts @@ -40,7 +40,6 @@ export class AuthService extends BaseService { } sendEmailRecoveryLink(rawValue: any): Observable { - debugger; return this.post(AuthMethods.EmailRecoveryLink, {email: rawValue.email}).map((result) => { return result; });