Skip to content

Refactoring container element #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
renemadsen merged 2 commits into from
Dec 18, 2017
Merged

Refactoring container element #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ff14cd
Added container element
Gid733 Dec 18, 2017
376cd66
Merge remote-tracking branch 'origin/master'
Gid733 Dec 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion eform-client/src/app/components/auth/auth.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion eform-client/src/app/modules/advanced/components/workers/workers.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 7 additions & 1 deletion eform-client/src/app/modules/cases/cases.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -42,6 +47,7 @@ import {
ElementSingleselectComponent,
ElementNumberComponent,
ElementTextComponent,
ElementContainerComponent,
ElementPictureComponent,
ElementCheckboxComponent,
ElementDateComponent,
Expand Down
68 changes: 1 addition & 67 deletions ...lient/src/app/modules/cases/components/case-edit-element/case-edit-element.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,73 +28,7 @@
</div>
</td>
</tr>
<ng-container *ngIf="element.dataItemList">
<ng-container *ngFor="let dataItem of element.dataItemList">

<!--<pre>{{dataItem | json}}</pre>-->
<!--<pre>{{dataItem.fieldType | json}}</pre>
-->

<tr [style.backgroundColor]="getStyleColorFromDataItem(dataItem)">
<td>
<strong>{{dataItem.label}}</strong>
<!--<div [innerHTML]="dataItem.description.inderValue"></div>-->
</td>
</tr>
<tr [style.backgroundColor]="getStyleColorFromDataItem(dataItem)">
<td>

<div [ngSwitch]="dataItem.fieldType">
<div *ngSwitchCase="'Picture'">
<element-picture [fieldValues]="dataItem.fieldValues"></element-picture>
</div>
<div *ngSwitchCase="'CheckBox'">
<element-checkbox [(fieldValue)]="dataItem.fieldValues[0]"></element-checkbox>
</div>
<div *ngSwitchCase="'Number'">
<element-number [(fieldValue)]="dataItem.fieldValues[0]"></element-number>
</div>
<div *ngSwitchCase="'Comment'">
<element-comment (ngModelChange)="dsvsdv($event)"
[(fieldValue)]="dataItem.fieldValues[0]"></element-comment>
</div>
<div *ngSwitchCase="'Text'">
<element-text [(fieldValue)]="dataItem.fieldValues[0]"></element-text>
</div>
<ng-container *ngSwitchCase="'Date'">
<element-date [(ngModel)]="dataItem.fieldValues[0].value"
[datepicker]="{format: 'yyyy-mm-dd' }"
[timepicker]="false">
</element-date>
</ng-container>
<div *ngSwitchCase="'SingleSelect'">
<element-singleselect [(fieldValue)]="dataItem.fieldValues[0]"></element-singleselect>
</div>
<div *ngSwitchCase="'MultiSelect'">
<element-multiselect [(fieldValue)]="dataItem.fieldValues[0]"></element-multiselect>
</div>
<div *ngSwitchCase="'ShowPdf'">
<element-pdf [dataItem]="dataItem"></element-pdf>
</div>
<div *ngSwitchCase="'None'">
<element-infobox [(fieldValue)]="dataItem.fieldValues[0]"></element-infobox>
</div>
<div *ngSwitchCase="'Timer'">
<element-timer [(fieldValue)]="dataItem.fieldValues[0]"></element-timer>
</div>
<div *ngSwitchCase="'Signature'">
<element-signature [(fieldValue)]="dataItem.fieldValues[0]"></element-signature>
</div>
<!--<div *ngSwitchCase="'SaveButton'">-->
<!--<pre>{{dataItem | json}}</pre>-->
<!--SaveButton-->
<!--</div>-->
<div *ngSwitchDefault></div>
</div>
</td>
</tr>
</ng-container>
</ng-container>
<tbody case-edit-switch [dataItemList]="element.dataItemList"></tbody>
<ng-container *ngIf="element.extraFieldsEnabled">
<tr>
<td>
Expand Down
69 changes: 22 additions & 47 deletions ...-client/src/app/modules/cases/components/case-edit-element/case-edit-element.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import {
CaseEditRequest,
CaseEditRequestField,
CaseEditRequestFieldValue,
CaseElement
CaseElement,
CaseDataItem
} from 'app/models';

@Component({
Expand All @@ -29,62 +30,36 @@ export class CaseEditElementComponent {
this.requestModels = [];
}

extractDataItemList(dataItemList: Array<CaseDataItem> ) {
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;
}
}
67 changes: 67 additions & 0 deletions ...-client/src/app/modules/cases/components/case-edit-switch/case-edit-switch.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<ng-container *ngIf="dataItemList">
<ng-container *ngFor="let dataItem of dataItemList; let i = index">
<tr [style.backgroundColor]="getStyleColorFromDataItem(dataItem)">
<td>
<strong>{{dataItem.label}}</strong>
</td>
</tr>
<tr [style.backgroundColor]="getStyleColorFromDataItem(dataItem)">
<td>

<div [ngSwitch]="dataItem.fieldType">
<div *ngSwitchCase="'Picture'">
<element-picture [fieldValues]="dataItem.fieldValues"></element-picture>
</div>
<div *ngSwitchCase="'CheckBox'">
<element-checkbox [(fieldValue)]="dataItem.fieldValues[0]"></element-checkbox>
</div>
<div *ngSwitchCase="'Number'">
<element-number [(fieldValue)]="dataItem.fieldValues[0]"></element-number>
</div>
<div *ngSwitchCase="'Comment'">
<element-comment [(fieldValue)]="dataItem.fieldValues[0]"></element-comment>
</div>
<div *ngSwitchCase="'Text'">
<element-text [(fieldValue)]="dataItem.fieldValues[0]"></element-text>
</div>
<ng-container *ngSwitchCase="'Date'">
<element-date [(ngModel)]="dataItem.fieldValues[0].value"
[datepicker]="{format: 'yyyy-mm-dd' }"
[timepicker]="false">
</element-date>
</ng-container>
<div *ngSwitchCase="'SingleSelect'">
<element-singleselect [(fieldValue)]="dataItem.fieldValues[0]"></element-singleselect>
</div>
<div *ngSwitchCase="'MultiSelect'">
<element-multiselect [(fieldValue)]="dataItem.fieldValues[0]"></element-multiselect>
</div>
<div *ngSwitchCase="'ShowPdf'">
<element-pdf [dataItem]="dataItem"></element-pdf>
</div>
<div *ngSwitchCase="'None'">
<element-infobox [(fieldValue)]="dataItem.fieldValues[0]"></element-infobox>
</div>
<div *ngSwitchCase="'Timer'">
<element-timer [(fieldValue)]="dataItem.fieldValues[0]"></element-timer>
</div>
<div *ngSwitchCase="'Signature'">
<element-signature [(fieldValue)]="dataItem.fieldValues[0]"></element-signature>
</div>

<div *ngSwitchCase="'Signature'">
<element-signature [(fieldValue)]="dataItem.fieldValues[0]"></element-signature>
</div>

<div *ngSwitchCase="'Signature'">
<element-signature [(fieldValue)]="dataItem.fieldValues[0]"></element-signature>
</div>
<div *ngSwitchDefault></div>
</div>
<div *ngIf="dataItem.label == 'Group open/close'">
<element-container [(fieldValue)]="dataItem.dataItemList" [dataItemLabel]="dataItem.description.inderValue"></element-container>
</div>
</td>
</tr>
</ng-container>
</ng-container>
22 changes: 22 additions & 0 deletions eform-client/src/app/modules/cases/components/case-edit-switch/case-edit-switch.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<CaseDataItem> = [];

constructor() {
}

getStyleColorFromDataItem(dataItem: any) {
let style = '';
if (dataItem.Color) {
style = '#' + dataItem.Color + '';
}
return style;
}
}
14 changes: 14 additions & 0 deletions ...modules/cases/components/case-elements/element-container/element-container.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<div class="panel panel-default">
<div class="panel-heading" (click)="isCollapsed = !isCollapsed" style="cursor: pointer">
<strong>{{dataItemLabel}}</strong>
<i class="glyphicon glyphicon-plus" *ngIf="isCollapsed"></i>
<i class="glyphicon glyphicon-minus" *ngIf="!isCollapsed"></i>
</div>
<div [collapse]="isCollapsed" class="panel-body" >
<ng-container *ngIf="dataItemList">
<table class="table">
<tbody case-edit-switch [dataItemList]="dataItemList"></tbody>
</table>
</ng-container>
</div>
</div>
22 changes: 22 additions & 0 deletions ...p/modules/cases/components/case-elements/element-container/element-container.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<CaseDataItem> = [];
@Input() dataItemLabel: string;
@Input()
get fieldValue() {
return this.dataItemList;
}
set fieldValue(val) {
this.dataItemList = val;
}

constructor() {
}
}
1 change: 1 addition & 0 deletions eform-client/src/app/modules/cases/components/case-elements/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
1 change: 0 additions & 1 deletion eform-client/src/app/services/accounts/auth.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ export class AuthService extends BaseService {
}

sendEmailRecoveryLink(rawValue: any): Observable<any> {
debugger;
return this.post(AuthMethods.EmailRecoveryLink, {email: rawValue.email}).map((result) => {
return result;
});
Expand Down