@openmrs/ngx-formentry 3.2.1-pre.214 → 3.2.1-pre.224

package/bundles/openmrs-ngx-formentry.umd.js

@@ -14432,8 +14432,10 @@
             if (node instanceof LeafNode ||
                 (node instanceof GroupNode && node.question.extras.type === 'complex-obs')) {
                 ___default["default"].each(obsArray, function (item) {
-                    if (item.concept &&
-                        item.concept.uuid === node.question.extras.questionOptions.concept) {
+                    var _a, _b;
+                    var questionId = _this.getQuestionIdFromFormFieldPath(item.formFieldPath);
+                    if ((questionId && questionId === ((_b = (_a = node === null || node === void 0 ? void 0 : node.question) === null || _a === void 0 ? void 0 : _a.extras) === null || _b === void 0 ? void 0 : _b.id)) ||
+                        (!questionId && item.concept && item.concept.uuid === node.question.extras.questionOptions.concept)) {
                         found.push(item);
                     }
                 });
@@ -14570,10 +14572,25 @@
             }
         };
         ObsAdapterHelper.prototype.comparePath = function (first, second) {
+            var _a, _b;
             if (!first || !second) {
                 return -1;
             }
-            return Number(first.formFieldPath) - Number(second.formFieldPath);
+            var firstNumber;
+            if ((_a = first.formFieldPath) === null || _a === void 0 ? void 0 : _a.includes('~')) {
+                firstNumber = first.formFieldPath.split('~', 1)[1];
+            }
+            else {
+                firstNumber = first.formFieldPath;
+            }
+            var secondNumber;
+            if ((_b = second.formFieldPath) === null || _b === void 0 ? void 0 : _b.includes('~')) {
+                secondNumber = second.formFieldPath.split('~', 1)[1];
+            }
+            else {
+                secondNumber = second.formFieldPath;
+            }
+            return Number(firstNumber) - Number(secondNumber);
         };
         ObsAdapterHelper.prototype.setNodeValue = function (node, obs) {
             switch (this.getObsNodeType(node)) {
@@ -14674,6 +14691,11 @@
             this.obsIndex++;
             return obs;
         };
+        ObsAdapterHelper.prototype.getQuestionIdFromFormFieldPath = function (formFieldPath) {
+            if (formFieldPath === null || formFieldPath === void 0 ? void 0 : formFieldPath.includes('~')) {
+                return formFieldPath.split('~', 1)[0];
+            }
+        };
         ObsAdapterHelper.prototype.getSimpleObsPayload = function (node) {
             // check for empty values first
             if (this.isEmpty(node.control.value)) {
@@ -15770,6 +15792,7 @@
             return results;
         };
         EncounterAdapter.prototype.setNonFilledPayloadMembers = function (form, payload) {
+            var _a;
             if (form.valueProcessingInfo.patientUuid) {
                 this.setPayloadPatientUuid(payload, form.valueProcessingInfo.patientUuid);
             }
@@ -15779,6 +15802,9 @@
             if (form.valueProcessingInfo.encounterTypeUuid) {
                 this.setPayloadEncounterTypeUuid(payload, form.valueProcessingInfo.encounterTypeUuid);
             }
+            if (!payload.encounterDatetime) {
+                this.setPayloadEncounterDate(payload, (_a = form.valueProcessingInfo.encounterDatetime) !== null && _a !== void 0 ? _a : new Date().toISOString(), form.valueProcessingInfo.utcOffset);
+            }
             if (form.valueProcessingInfo.formUuid) {
                 this.setPayloadFormUuid(payload, form.valueProcessingInfo.formUuid);
             }
@@ -15795,6 +15821,10 @@
         EncounterAdapter.prototype.setPayloadEncounterTypeUuid = function (payload, encounterTypeUuid) {
             payload['encounterType'] = encounterTypeUuid;
         };
+        EncounterAdapter.prototype.setPayloadEncounterDate = function (payload, encounterDatetime, utcOffset) {
+            var dateValue = moment__default["default"](encounterDatetime).utcOffset(utcOffset || '+0300');
+            payload['encounterDatetime'] = dateValue.format();
+        };
         EncounterAdapter.prototype.setPayloadFormUuid = function (payload, formUuid) {
             payload['form'] = formUuid;
         };