MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Fixed Issue With Visibility Service on initial values

This commit is contained in:
Ioannis Kalyvas 2018-10-22 12:37:55 +03:00
parent 7cc9854f11
commit 38d356703a
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.ts
View File

@ -10,8 +10,12 @@ import { Component, Input, ViewEncapsulation, OnInit } from '@angular/core';
],
encapsulation: ViewEncapsulation.None
})
export class DynamicFieldCheckBoxComponent {
export class DynamicFieldCheckBoxComponent implements OnInit {
@Input() field: Field;
@Input() form: FormGroup;
ngOnInit(): void {
if (this.form.get('value').value === null) { this.form.get('value').patchValue(false); }
}
}

6
dmp-frontend/src/app/models/Field.ts
View File

@ -41,9 +41,9 @@ export class Field extends BaseModel implements Serializable<Field>, FormGenerat
this.defaultValue = JsonSerializer.fromJSONObject(item.defaultValue, DefaultValue);
this.value = this.defaultValue.value && !item.value ? this.defaultValue.value : item.value;
//this.multiplicity = new Multiplicity();
// if (this.viewStyle.renderStyle === 'checkBox') {
// this.value = this.value === 'true';
// }
if (this.viewStyle.renderStyle === 'checkBox') {
this.value = this.value === 'true';
}
//this.multiplicity.max = 2;
if (item.multiplicityItems) { this.multiplicityItems = JsonSerializer.fromJSONArray(item.multiplicityItems, Field); }
this.data = item.data;

21
dmp-frontend/src/app/utilities/visibility-rules/visibility-rules.service.ts
View File

@ -55,7 +55,7 @@ export class VisibilityRulesService {
private evaluateVisibility(visibilityRule: VisibilityRule) {
for (let i = 0; i < visibilityRule.sourceVisibilityRules.length; i++) {
const pathKey = this.fieldsPathMemory[visibilityRule.sourceVisibilityRules[i].sourceControlId];
if (this.formGroup.get(pathKey + '.value') && ((this.formGroup.get(pathKey + '.value').value == null || this.formGroup.get(pathKey + '.value').value == null) || '' + this.formGroup.get(pathKey + '.value').value !== '' + visibilityRule.sourceVisibilityRules[i].sourceControlValue)) {
if (this.formGroup.get(pathKey + '.value') && (this.parseValue(this.formGroup.get(pathKey + '.value').value) !== this.parseValue(visibilityRule.sourceVisibilityRules[i].sourceControlValue))) {
if (this.formGroup.get(pathKey).parent.get('id')) {
if (!this.checkElementVisibility(this.formGroup.get(pathKey).parent.get('id').value)) {
const targetPathKey = this.fieldsPathMemory[visibilityRule.targetControlId];
@ -88,20 +88,11 @@ export class VisibilityRulesService {
}
}
// deleteFromModel(path: string, obj: any) {
// if (!path) return
// const _obj = JSON.parse(JSON.stringify(obj));
// const keys = path.split('.');
// keys.reduce((acc, key, index) => {
// if (index === keys.length - 1) {
// delete acc[key];
// return true;
// }
// return acc[key];
// }, _obj);
// return _obj;
// }
parseValue(value: any) {
if (typeof value === 'string') {
if (value === 'true') { return true; } else if (value === 'false') { return false; } else { return value; }
} else { return value; }
}
updateValue(obj, value, path) {
let i;