openchs-models 1.32.21 → 1.32.22
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.
- package/dist/application/Form.js +3 -3
- package/package.json +1 -1
package/dist/application/Form.js
CHANGED
|
@@ -305,12 +305,12 @@ class Form extends _BaseEntity.default {
|
|
|
305
305
|
|
|
306
306
|
const orderedFormElements = _lodash.default.sortBy(childFormElements, fe => fe.displayOrder);
|
|
307
307
|
|
|
308
|
-
_lodash.default.forEach(orderedFormElements, formElement => this.addSortedObservations(formElement, observations, orderedChildObs));
|
|
308
|
+
_lodash.default.forEach(orderedFormElements, formElement => this.addSortedObservations(formElement, observations, orderedChildObs, true));
|
|
309
309
|
|
|
310
310
|
return orderedChildObs;
|
|
311
311
|
}
|
|
312
312
|
|
|
313
|
-
addSortedObservations(formElement, observations, orderedObservations) {
|
|
313
|
+
addSortedObservations(formElement, observations, orderedObservations, forQGChildren = false) {
|
|
314
314
|
const concept = formElement.concept;
|
|
315
315
|
const foundObs = observations.find(obs => obs.concept.uuid === concept.uuid);
|
|
316
316
|
|
|
@@ -326,7 +326,7 @@ class Form extends _BaseEntity.default {
|
|
|
326
326
|
orderedObservations.push(clonedObs);
|
|
327
327
|
}
|
|
328
328
|
} else {
|
|
329
|
-
if (!_lodash.default.isNil(foundObs)) {
|
|
329
|
+
if (!_lodash.default.isNil(foundObs) && (_lodash.default.isNil(formElement.groupUuid) || forQGChildren)) {
|
|
330
330
|
foundObs.styles = formElement.styles;
|
|
331
331
|
orderedObservations.push(foundObs);
|
|
332
332
|
}
|