@openmrs/ngx-formentry 3.2.1-pre.236 → 3.2.1-pre.241

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

@@ -1625,7 +1625,7 @@
                     [21, 23, 25, 26, 28],
                     [17, 19, 20, 21, 23],
                     [14, 15, 16, 17, 18],
-                    [11, 12, 13, 14, 15], // sbp < 120
+                    [11, 12, 13, 14, 15] // sbp < 120
                 ],
                 // Age 65 - 69
                 [
@@ -1633,7 +1633,7 @@
                     [16, 17, 19, 21, 22],
                     [12, 14, 15, 16, 18],
                     [10, 11, 12, 13, 14],
-                    [8, 8, 9, 10, 11], // < 120
+                    [8, 8, 9, 10, 11] // < 120
                 ],
                 // Age 60 - 64
                 [
@@ -1641,7 +1641,7 @@
                     [12, 13, 14, 16, 18],
                     [9, 10, 11, 12, 14],
                     [7, 8, 8, 9, 10],
-                    [5, 6, 6, 7, 8], // sbp < 120
+                    [5, 6, 6, 7, 8] // sbp < 120
                 ],
                 // Age 55 - 59
                 [
@@ -1649,7 +1649,7 @@
                     [9, 10, 11, 12, 14],
                     [7, 7, 8, 9, 10],
                     [5, 5, 6, 7, 8],
-                    [4, 4, 4, 5, 6], // sbp < 120
+                    [4, 4, 4, 5, 6] // sbp < 120
                 ],
                 // Age 50 - 54
                 [
@@ -1657,7 +1657,7 @@
                     [7, 7, 8, 9, 11],
                     [5, 5, 6, 7, 8],
                     [3, 4, 4, 5, 6],
-                    [2, 3, 3, 4, 4], // sbp < 120
+                    [2, 3, 3, 4, 4] // sbp < 120
                 ],
                 // Age 45 - 49
                 [
@@ -1665,7 +1665,7 @@
                     [5, 6, 6, 7, 8],
                     [3, 4, 4, 5, 6],
                     [2, 3, 3, 4, 4],
-                    [2, 2, 2, 2, 3], // < 120
+                    [2, 2, 2, 2, 3] // < 120
                 ],
                 // Age 40 - 44
                 [
@@ -1673,8 +1673,8 @@
                     [4, 4, 5, 6, 7],
                     [2, 3, 3, 4, 4],
                     [2, 2, 2, 3, 3],
-                    [1, 1, 2, 2, 2],
-                ],
+                    [1, 1, 2, 2, 2]
+                ]
             ],
             // Smoker
             [
@@ -1684,7 +1684,7 @@
                     [28, 30, 32, 34, 36],
                     [23, 24, 26, 28, 30],
                     [18, 20, 21, 23, 24],
-                    [15, 16, 17, 18, 20], // < 120
+                    [15, 16, 17, 18, 20] // < 120
                 ],
                 // Age 65 - 69
                 [
@@ -1692,7 +1692,7 @@
                     [22, 24, 26, 29, 31],
                     [18, 19, 21, 23, 25],
                     [14, 15, 16, 18, 20],
-                    [11, 12, 13, 14, 16], // < 120
+                    [11, 12, 13, 14, 16] // < 120
                 ],
                 // Age 60 - 64
                 [
@@ -1700,7 +1700,7 @@
                     [18, 18, 20, 22, 24],
                     [14, 15, 17, 19, 21],
                     [10, 12, 13, 14, 16],
-                    [8, 9, 10, 11, 12], // < 120
+                    [8, 9, 10, 11, 12] // < 120
                 ],
                 // Age 55 - 59
                 [
@@ -1708,7 +1708,7 @@
                     [14, 16, 18, 20, 23],
                     [11, 12, 13, 15, 17],
                     [8, 9, 10, 11, 13],
-                    [6, 7, 7, 8, 10],
+                    [6, 7, 7, 8, 10]
                 ],
                 // Age 50 - 54
                 [
@@ -1716,7 +1716,7 @@
                     [11, 13, 15, 17, 20],
                     [8, 9, 11, 12, 14],
                     [6, 7, 8, 9, 11],
-                    [4, 5, 6, 7, 8],
+                    [4, 5, 6, 7, 8]
                 ],
                 // Age 45 - 49
                 [
@@ -1724,7 +1724,7 @@
                     [9, 10, 12, 14, 17],
                     [6, 7, 9, 10, 12],
                     [4, 5, 6, 7, 8],
-                    [3, 4, 4, 5, 6],
+                    [3, 4, 4, 5, 6]
                 ],
                 // Age 40 - 44
                 [
@@ -1732,9 +1732,9 @@
                     [7, 8, 10, 12, 14],
                     [5, 6, 7, 8, 10],
                     [3, 4, 5, 6, 7],
-                    [2, 3, 3, 4, 5],
-                ],
-            ],
+                    [2, 3, 3, 4, 5]
+                ]
+            ]
         ],
         // Women
         [
@@ -1746,7 +1746,7 @@
                     [17, 18, 19, 19, 20],
                     [15, 15, 16, 16, 17],
                     [12, 12, 13, 13, 14],
-                    [10, 10, 11, 11, 11], // < 120
+                    [10, 10, 11, 11, 11] // < 120
                 ],
                 // Age 65 - 69
                 [
@@ -1754,7 +1754,7 @@
                     [13, 14, 14, 15, 15],
                     [11, 11, 11, 12, 12],
                     [9, 9, 9, 10, 10],
-                    [7, 7, 7, 8, 8],
+                    [7, 7, 7, 8, 8]
                 ],
                 // Age 60 - 64
                 [
@@ -1762,7 +1762,7 @@
                     [10, 10, 11, 11, 12],
                     [8, 8, 8, 9, 9],
                     [6, 6, 7, 7, 7],
-                    [5, 5, 5, 5, 6],
+                    [5, 5, 5, 5, 6]
                 ],
                 // Age 55 - 59
                 [
@@ -1770,7 +1770,7 @@
                     [8, 8, 8, 9, 9],
                     [6, 6, 6, 7, 7],
                     [4, 5, 5, 5, 5],
-                    [3, 3, 4, 4, 4],
+                    [3, 3, 4, 4, 4]
                 ],
                 // Age 50 - 54
                 [
@@ -1778,7 +1778,7 @@
                     [6, 6, 6, 7, 7],
                     [4, 4, 5, 5, 5],
                     [3, 3, 3, 4, 4],
-                    [2, 2, 3, 3, 3],
+                    [2, 2, 3, 3, 3]
                 ],
                 // Age 45 - 49
                 [
@@ -1786,7 +1786,7 @@
                     [4, 5, 5, 5, 5],
                     [3, 3, 3, 4, 4],
                     [2, 2, 2, 3, 3],
-                    [2, 2, 2, 2, 2],
+                    [2, 2, 2, 2, 2]
                 ],
                 // Age 40 - 44
                 [
@@ -1794,8 +1794,8 @@
                     [3, 3, 4, 4, 4],
                     [2, 2, 3, 3, 3],
                     [2, 2, 2, 2, 2],
-                    [1, 1, 1, 1, 1],
-                ],
+                    [1, 1, 1, 1, 1]
+                ]
             ],
             // Smoker
             [
@@ -1805,7 +1805,7 @@
                     [25, 26, 27, 28, 29],
                     [21, 22, 22, 23, 24],
                     [17, 18, 19, 19, 20],
-                    [14, 15, 15, 16, 17],
+                    [14, 15, 15, 16, 17]
                 ],
                 // Age 65 - 69
                 [
@@ -1813,7 +1813,7 @@
                     [21, 22, 22, 23, 24],
                     [17, 18, 18, 19, 20],
                     [14, 14, 15, 15, 16],
-                    [11, 11, 12, 12, 13],
+                    [11, 11, 12, 12, 13]
                 ],
                 // Age 60 - 64
                 [
@@ -1821,7 +1821,7 @@
                     [17, 18, 19, 20, 21],
                     [13, 14, 15, 16, 16],
                     [11, 11, 12, 12, 13],
-                    [8, 9, 9, 10, 10],
+                    [8, 9, 9, 10, 10]
                 ],
                 // Age 55 - 59
                 [
@@ -1829,7 +1829,7 @@
                     [14, 15, 15, 16, 17],
                     [11, 11, 12, 13, 13],
                     [8, 9, 9, 10, 10],
-                    [6, 7, 7, 7, 8],
+                    [6, 7, 7, 7, 8]
                 ],
                 // Age 50 - 54
                 [
@@ -1837,7 +1837,7 @@
                     [11, 12, 13, 14, 14],
                     [9, 9, 10, 10, 11],
                     [6, 7, 7, 8, 8],
-                    [5, 5, 5, 6, 6],
+                    [5, 5, 5, 6, 6]
                 ],
                 // Age 45 - 49
                 [
@@ -1845,7 +1845,7 @@
                     [9, 10, 11, 11, 12],
                     [7, 7, 8, 8, 9],
                     [5, 5, 6, 6, 6],
-                    [4, 4, 4, 4, 5],
+                    [4, 4, 4, 4, 5]
                 ],
                 // Age 40 - 44
                 [
@@ -1853,10 +1853,10 @@
                     [8, 8, 9, 9, 10],
                     [5, 6, 6, 7, 7],
                     [4, 4, 4, 5, 5],
-                    [3, 3, 3, 3, 4],
-                ],
-            ],
-        ],
+                    [3, 3, 3, 3, 4]
+                ]
+            ]
+        ]
     ];
 
     var JsExpressionHelper = /** @class */ (function () {
@@ -2013,7 +2013,11 @@
             return height && weight && refSectionObject ? formattedSDValue : null;
         };
         JsExpressionHelper.prototype.calcSouthEastAsiaNonLabCVDRisk = function (sex, smoker, age, sbp, bmi) {
-            var hasValidValues = (typeof sex === "string" && typeof smoker === "boolean" && typeof age === "number" && typeof sbp === "number" && typeof bmi === "number");
+            var hasValidValues = typeof sex === 'string' &&
+                typeof smoker === 'boolean' &&
+                typeof age === 'number' &&
+                typeof sbp === 'number' &&
+                typeof bmi === 'number';
             if (!hasValidValues) {
                 return null;
             }
@@ -2108,11 +2112,21 @@
             var _a;
             var findObs = function (obs, uuid) {
                 var result;
-                obs === null || obs === void 0 ? void 0 : obs.some(function (o) { var _a; return result = ((_a = o === null || o === void 0 ? void 0 : o.concept) === null || _a === void 0 ? void 0 : _a.uuid) === uuid ? o : findObs(o.groupMembers || [], uuid); });
+                obs === null || obs === void 0 ? void 0 : obs.some(function (o) {
+                    var _a;
+                    return (result =
+                        ((_a = o === null || o === void 0 ? void 0 : o.concept) === null || _a === void 0 ? void 0 : _a.uuid) === uuid ? o : findObs(o.groupMembers || [], uuid));
+                });
                 return result;
             };
             var obsValue = (_a = findObs(rawEncounter === null || rawEncounter === void 0 ? void 0 : rawEncounter.obs, uuid)) === null || _a === void 0 ? void 0 : _a.value;
-            return !!targetControl ? targetControl : typeof obsValue === 'object' ? obsValue.uuid : !!obsValue ? obsValue : null;
+            return !!targetControl
+                ? targetControl
+                : typeof obsValue === 'object'
+                    ? obsValue.uuid
+                    : !!obsValue
+                        ? obsValue
+                        : null;
         };
         JsExpressionHelper.prototype.doesNotMatchExpression = function (regexString, val) {
             if (!val || ['undefined', 'null', ''].includes(val.toString())) {
@@ -2466,7 +2480,7 @@
                     return null;
                 }
                 if (control.value && control.value.length !== 0) {
-                    var v = (control.value).toString().length;
+                    var v = control.value.toString().length;
                     return v <= maxLength
                         ? null
                         : { maxlength: { requiredLength: maxLength, actualValue: v } };
@@ -2486,7 +2500,7 @@
                     return null;
                 }
                 if (control.value && control.value.length !== 0) {
-                    var v = (control.value).toString().length;
+                    var v = control.value.toString().length;
                     return v >= minLength
                         ? null
                         : { minlength: { requiredLength: minLength, actualValue: v } };
@@ -9387,7 +9401,7 @@
         Object.defineProperty(RadioButtonControlComponent.prototype, "value", {
             get: function () {
                 var _a;
-                return (_a = this._value) !== null && _a !== void 0 ? _a : "";
+                return (_a = this._value) !== null && _a !== void 0 ? _a : '';
             },
             set: function (value) {
                 this._value = value;
@@ -9424,7 +9438,7 @@
             if (this.selected) {
                 var maybeOpt_1 = this.options.find(function (opt) { return opt.value === _this.selected; });
                 if (maybeOpt_1) {
-                    this.options.forEach(function (opt) { return opt.checked = opt === maybeOpt_1; });
+                    this.options.forEach(function (opt) { return (opt.checked = opt === maybeOpt_1); });
                     this.value = this.selected;
                 }
             }
@@ -9438,7 +9452,7 @@
                 useExisting: i0.forwardRef(function () { return RadioButtonControlComponent; }),
                 multi: true
             }
-        ], usesOnChanges: true, ngImport: i0__namespace, template: "<fieldset class=\"cds--fieldset\">\n  <div\n    *ngFor=\"let option of options; let i = index\"\n    class=\"cds--form-item cds--radio-wrapper\"\n    [ngClass]=\"{'inline': orientation === 'horizontal'}\"\n  >\n    <label class=\"form-control no-border\">\n      <input\n        type=\"radio\"\n        [id]=\"id + '_' + i\"\n        [name]=\"id\"\n        [checked]=\"option.checked\"\n        [value]=\"option.value\"\n        (click)=\"handleClick(option)\"\n        (change)=\"handleChange(option)\"\n      />\n      {{ option.label }}\n    </label>\n  </div>\n</fieldset>\n", styles: [".inline{display:inline-block;padding-right:.5rem}\n"], directives: [{ type: i1__namespace.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { type: i1__namespace.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }] });
+        ], usesOnChanges: true, ngImport: i0__namespace, template: "<fieldset class=\"cds--fieldset\">\n  <div\n    *ngFor=\"let option of options; let i = index\"\n    class=\"cds--form-item cds--radio-wrapper\"\n    [ngClass]=\"{ inline: orientation === 'horizontal' }\"\n  >\n    <label class=\"form-control no-border\">\n      <input\n        type=\"radio\"\n        [id]=\"id + '_' + i\"\n        [name]=\"id\"\n        [checked]=\"option.checked\"\n        [value]=\"option.value\"\n        (click)=\"handleClick(option)\"\n        (change)=\"handleChange(option)\"\n      />\n      {{ option.label }}\n    </label>\n  </div>\n</fieldset>\n", styles: [".inline{display:inline-block;padding-right:.5rem}\n"], directives: [{ type: i1__namespace.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { type: i1__namespace.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }] });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: RadioButtonControlComponent, decorators: [{
                 type: i0.Component,
                 args: [{
@@ -14306,7 +14320,9 @@
             var payload = [];
             var deletedDiagnoses = [];
             diagnosisNodes === null || diagnosisNodes === void 0 ? void 0 : diagnosisNodes.forEach(function (node) {
-                node.control.value.filter(function (v) { return v[node.question.key]; }).forEach(function (value) {
+                node.control.value
+                    .filter(function (v) { return v[node.question.key]; })
+                    .forEach(function (value) {
                     // Create Payload
                     var payloadDiagnosis = _this._createPayloadDiagnosis(value[node.question.key], node.question.extras);
                     // Validate if is new value
@@ -14320,7 +14336,7 @@
         DiagnosisValueAdapter.prototype._createPayloadDiagnosis = function (codedUuid, questionExtras) {
             var diagnosis = {
                 diagnosis: {
-                    coded: codedUuid,
+                    coded: codedUuid
                 },
                 certainty: 'CONFIRMED',
                 rank: questionExtras.questionOptions.rank,
@@ -14352,7 +14368,9 @@
         DiagnosisValueAdapter.prototype._setDiagnosesValues = function (formDiagnosisNodes, existingDiagnoses, rank) {
             formDiagnosisNodes === null || formDiagnosisNodes === void 0 ? void 0 : formDiagnosisNodes.filter(function (node) { return node.question.extras.questionOptions.rank == rank; }).forEach(function (node) {
                 node['initialValue'] = existingDiagnoses;
-                existingDiagnoses.filter(function (d) { return d.rank == rank; }).forEach(function (diagnosis, index) {
+                existingDiagnoses
+                    .filter(function (d) { return d.rank == rank; })
+                    .forEach(function (diagnosis, index) {
                     node.createChildNode();
                     var value = {};
                     value[node.question.key] = diagnosis.diagnosis.coded.uuid;
@@ -14382,7 +14400,9 @@
                                         var _loop_1 = function (node) {
                                             var question = formNode.children[node].question;
                                             var index = formNode.children[node].nodeIndex;
-                                            if (question.extras && question.extras.type === 'diagnosis' && !this_1.formDiagnosisNodes.some(function (x) { return index === x.nodeIndex; })) {
+                                            if (question.extras &&
+                                                question.extras.type === 'diagnosis' &&
+                                                !this_1.formDiagnosisNodes.some(function (x) { return index === x.nodeIndex; })) {
                                                 this_1.formDiagnosisNodes.push(formNode.children[node]);
                                             }
                                         };
@@ -14407,11 +14427,11 @@
                 patient: diagnosis.patient,
                 diagnosis: {
                     coded: diagnosis.diagnosis.coded.uuid,
-                    nonCoded: diagnosis.diagnosis.nonCoded,
+                    nonCoded: diagnosis.diagnosis.nonCoded
                 },
                 certainty: diagnosis.certainty,
                 rank: diagnosis.rank,
-                voided: diagnosis.voided,
+                voided: diagnosis.voided
             };
         };
         return DiagnosisValueAdapter;
@@ -14440,7 +14460,9 @@
                     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)) {
+                        (!questionId &&
+                            item.concept &&
+                            item.concept.uuid === node.question.extras.questionOptions.concept)) {
                         found.push(item);
                     }
                 });
@@ -15756,7 +15778,8 @@
             this.setNonFilledPayloadMembers(form, payload);
             payload['obs'] = this.obsAdapter.generateFormPayload(form) || [];
             payload['orders'] = this.ordersAdapter.generateFormPayload(form) || [];
-            payload['diagnoses'] = this.diagnosesAdapter.generateFormPayload(form) || [];
+            payload['diagnoses'] =
+                this.diagnosesAdapter.generateFormPayload(form) || [];
             return payload;
         };
         EncounterAdapter.prototype.generateNodePayload = function (rootNode) {