diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-progress-indication/form-progress-indication.component.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-progress-indication/form-progress-indication.component.ts index 25691b74f..3cf3158d3 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-progress-indication/form-progress-indication.component.ts +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-progress-indication/form-progress-indication.component.ts @@ -51,7 +51,7 @@ export class FormProgressIndicationComponent extends BaseComponent implements On let valueCurent = 0; if (formControl instanceof FormGroup) { if (this.checkFormsIfIsFieldsAndVisible(formControl) && this.checkIfIsRequired((formControl as FormGroup))) { - if (this.haseValue(formControl)) + if (this.hasValue(formControl)) valueCurent++; } if (this.chechFieldIfIsFieldSetAndVisible((formControl as FormGroup)) && this.checkIfIsRequired((formControl as FormGroup))) { @@ -69,11 +69,8 @@ export class FormProgressIndicationComponent extends BaseComponent implements On } return valueCurent; } - private haseValue(formGroup: FormGroup): boolean { - if (formGroup.get('value').value != null && formGroup.get('value').value !== '' && this.visibilityRulesService.checkElementVisibility(formGroup.get('id').value)) { - return true; - } - return false; + private hasValue(formGroup: FormGroup): boolean { + return formGroup.get('value').valid && formGroup.get('value').value != null && formGroup.get('value').value !== '' && this.visibilityRulesService.checkElementVisibility(formGroup.get('id').value); } private compositeFieldsGetChildsForProgress(formGroup: FormGroup): number { diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.ts index c7ca771b8..f04760f7d 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.ts +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.ts @@ -158,7 +158,6 @@ export class FormSectionComponent extends BaseComponent implements OnInit, OnCha const outerRules = (this.visibilityRulesService.getVisibilityDependency(target) as VisibilityRuleSource[]).filter(x => x.sourceControlId === element.id); const updatedRules = outerRules.map(x => { - console.log(idMappings, element); return {...x, sourceControlId: idMappings.find(y => y.old === element.id).new}; });