@openmrs/ngx-formentry 3.2.1-pre.210 → 3.2.1-pre.218

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

@@ -14503,7 +14503,7 @@
             }
         };
         ObsAdapterHelper.prototype.setMultiselectObsNodeValue = function (node, obs) {
-            var e_1, _b;
+            var e_1, _c;
             if (node && obs.length > 0) {
                 obs = obs.sort(this.comparePath);
                 node.initialValue = obs;
@@ -14517,7 +14517,7 @@
                 catch (e_1_1) { e_1 = { error: e_1_1 }; }
                 finally {
                     try {
-                        if (obs_1_1 && !obs_1_1.done && (_b = obs_1.return)) _b.call(obs_1);
+                        if (obs_1_1 && !obs_1_1.done && (_c = obs_1.return)) _c.call(obs_1);
                     }
                     finally { if (e_1) throw e_1.error; }
                 }
@@ -14668,9 +14668,9 @@
         };
         // PAYLOAD GENERATION FUNCTIONS
         ObsAdapterHelper.prototype.addFieldNameSpaceandPath = function (node, obs) {
-            var _a;
+            var _a, _b;
             obs.formFieldNamespace = this.formFieldNamespace;
-            obs.formFieldPath = "" + ((_a = node === null || node === void 0 ? void 0 : node.question) === null || _a === void 0 ? void 0 : _a.questionIndex) + (node === null || node === void 0 ? void 0 : node.nodeIndex) + this.obsIndex;
+            obs.formFieldPath = ((_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) + "~" + this.obsIndex;
             this.obsIndex++;
             return obs;
         };
@@ -15770,6 +15770,7 @@
             return results;
         };
         EncounterAdapter.prototype.setNonFilledPayloadMembers = function (form, payload) {
+            var _a;
             if (form.valueProcessingInfo.patientUuid) {
                 this.setPayloadPatientUuid(payload, form.valueProcessingInfo.patientUuid);
             }
@@ -15779,6 +15780,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 +15799,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;
         };