openchs-models 1.31.91 → 1.31.92
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -226,7 +226,11 @@ class FormElementGroup extends _BaseEntity.default {
|
|
|
226
226
|
}
|
|
227
227
|
|
|
228
228
|
nonVoidedFormElements() {
|
|
229
|
-
return _lodash.default.filter(this.formElements, formElement =>
|
|
229
|
+
return _lodash.default.filter(this.formElements, formElement => {
|
|
230
|
+
let parentFormElement;
|
|
231
|
+
if (!_lodash.default.isNil(formElement.groupUuid)) parentFormElement = _lodash.default.find(this.formElements, fe => fe.uuid === formElement.groupUuid);
|
|
232
|
+
return !formElement.voided && (_lodash.default.isNil(parentFormElement) || !parentFormElement.voided);
|
|
233
|
+
});
|
|
230
234
|
}
|
|
231
235
|
|
|
232
236
|
getFormElements() {
|