@openmrs/ngx-formentry 3.0.1-pre.25 → 3.0.1-pre.38

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

@@ -1,32 +1,12 @@
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/forms'), require('rxjs'), require('moment'), require('lodash'), require('@angular/animations'), require('@ng-select/ng-select'), require('@angular/platform-browser'), require('ngx-webcam'), require('ngx-file-uploader'), require('@angular/cdk/a11y'), require('@angular/cdk/overlay'), require('@angular/cdk/portal'), require('@angular/cdk/keycodes'), require('@angular/cdk/coercion'), require('rxjs/operators'), require('@angular/cdk/platform'), require('@angular-extensions/elements')) :
     typeof define === 'function' && define.amd ? define('@openmrs/ngx-formentry', ['exports', '@angular/core', '@angular/common', '@angular/forms', 'rxjs', 'moment', 'lodash', '@angular/animations', '@ng-select/ng-select', '@angular/platform-browser', 'ngx-webcam', 'ngx-file-uploader', '@angular/cdk/a11y', '@angular/cdk/overlay', '@angular/cdk/portal', '@angular/cdk/keycodes', '@angular/cdk/coercion', 'rxjs/operators', '@angular/cdk/platform', '@angular-extensions/elements'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.openmrs = global.openmrs || {}, global.openmrs["ngx-formentry"] = {}), global.ng.core, global.ng.common, global.ng.forms, global.rxjs, global.moment, global._, global.ng.animations, global.ngSelect, global.ng.platformBrowser, global.ngxWebcam, global.ngxFileUploader, global.ng.cdk.a11y, global.ng.cdk.overlay, global.ng.cdk.portal, global.ng.cdk.keycodes, global.ng.cdk.coercion, global.rxjs.operators, global.ng.cdk.platform, global.elements));
-})(this, (function (exports, i0, common, forms, rxjs, moment, _, animations, ngSelect, platformBrowser, ngxWebcam, ngxFileUploader, a11y, overlay, portal, keycodes, coercion, operators, platform, elements) { 'use strict';
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.openmrs = global.openmrs || {}, global.openmrs['ngx-formentry'] = {}), global.ng.core, global.ng.common, global.ng.forms, global.rxjs, global.moment, global._, global.ng.animations, global.ngSelect, global.ng.platformBrowser, global.ngxWebcam, global.ngxFileUploader, global.ng.cdk.a11y, global.ng.cdk.overlay, global.ng.cdk.portal, global.ng.cdk.keycodes, global.ng.cdk.coercion, global.rxjs.operators, global.ng.cdk.platform, global.elements));
+}(this, (function (exports, i0, common, forms, rxjs, moment, _, animations, ngSelect, platformBrowser, ngxWebcam, ngxFileUploader, a11y, overlay, portal, keycodes, coercion, operators, platform, elements) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-    function _interopNamespace(e) {
-        if (e && e.__esModule) return e;
-        var n = Object.create(null);
-        if (e) {
-            Object.keys(e).forEach(function (k) {
-                if (k !== 'default') {
-                    var d = Object.getOwnPropertyDescriptor(e, k);
-                    Object.defineProperty(n, k, d.get ? d : {
-                        enumerable: true,
-                        get: function () { return e[k]; }
-                    });
-                }
-            });
-        }
-        n["default"] = e;
-        return Object.freeze(n);
-    }
-
-    var i0__namespace = /*#__PURE__*/_interopNamespace(i0);
     var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
-    var ___namespace = /*#__PURE__*/_interopNamespace(_);
     var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 
     /*
@@ -176,7 +156,7 @@
         { type: i0.Injectable }
     ];
 
-    /******************************************************************************
+    /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
 
     Permission to use, copy, modify, and/or distribute this software for any
@@ -338,11 +318,7 @@
     var __createBinding = Object.create ? (function (o, m, k, k2) {
         if (k2 === undefined)
             k2 = k;
-        var desc = Object.getOwnPropertyDescriptor(m, k);
-        if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-            desc = { enumerable: true, get: function () { return m[k]; } };
-        }
-        Object.defineProperty(o, k2, desc);
+        Object.defineProperty(o, k2, { enumerable: true, get: function () { return m[k]; } });
     }) : (function (o, m, k, k2) {
         if (k2 === undefined)
             k2 = k;
@@ -406,16 +382,10 @@
                 r[k] = a[j];
         return r;
     }
-    function __spreadArray(to, from, pack) {
-        if (pack || arguments.length === 2)
-            for (var i = 0, l = from.length, ar; i < l; i++) {
-                if (ar || !(i in from)) {
-                    if (!ar)
-                        ar = Array.prototype.slice.call(from, 0, i);
-                    ar[i] = from[i];
-                }
-            }
-        return to.concat(ar || Array.prototype.slice.call(from));
+    function __spreadArray(to, from) {
+        for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+            to[j] = from[i];
+        return to;
     }
     function __await(v) {
         return this instanceof __await ? (this.v = v, this) : new __await(v);
@@ -497,11 +467,6 @@
             throw new TypeError("Cannot write private member to an object whose class did not declare it");
         return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
     }
-    function __classPrivateFieldIn(state, receiver) {
-        if (receiver === null || (typeof receiver !== "object" && typeof receiver !== "function"))
-            throw new TypeError("Cannot use 'in' operator on non-object");
-        return typeof state === "function" ? receiver === state : state.has(receiver);
-    }
 
     // import { CanHide } from '../form-entry/control-hiders-disablers/can-hide';
     // import { CanDisable } from '../form-entry/control-hiders-disablers/can-disable';
@@ -1124,7 +1089,7 @@
                     if (control.uuid) {
                         scope[control.uuid] = control.value;
                     }
-                    window['moment'] = moment__default["default"];
+                    window['moment'] = moment__default['default'];
                     // scope.moment = moment;
                     scope['myValue'] = control.value;
                     scope['FORM'] = {};
@@ -1541,7 +1506,6 @@
         return AfeFormArray;
     }(forms.FormArray));
 
-    exports.AfeControlType = void 0;
     (function (AfeControlType) {
         AfeControlType[AfeControlType["AfeFormControl"] = 0] = "AfeFormControl";
         AfeControlType[AfeControlType["AfeFormArray"] = 1] = "AfeFormArray";
@@ -1834,7 +1798,7 @@
             if (height && weight) {
                 bmi = (weight / (((height / 100) * height) / 100)).toFixed(1);
             }
-            var refSectionObject = ___namespace.first(bmiForAgeRef);
+            var refSectionObject = _.first(bmiForAgeRef);
             var formattedSDValue;
             if (refSectionObject) {
                 var refObjectValues = Object.keys(refSectionObject)
@@ -1847,14 +1811,14 @@
                     minReferencePoint_1.push(minimumValue);
                 }
                 else {
-                    ___namespace.forEach(refObjectValues, function (value) {
+                    _.forEach(refObjectValues, function (value) {
                         if (value <= bmi) {
                             minReferencePoint_1.push(value);
                         }
                     });
                 }
-                var lastReferenceValue_1 = ___namespace.last(minReferencePoint_1);
-                var lastValueIndex = ___namespace.findIndex(refObjectValues, function (o) {
+                var lastReferenceValue_1 = _.last(minReferencePoint_1);
+                var lastValueIndex = _.findIndex(refObjectValues, function (o) {
                     return o === lastReferenceValue_1;
                 });
                 var SDValue = refObjectKeys[lastValueIndex];
@@ -1884,11 +1848,11 @@
                 formattedSDValue = -4;
             }
             else {
-                refSection = ___namespace.filter(weightForHeightRef, function (refObject) {
+                refSection = _.filter(weightForHeightRef, function (refObject) {
                     return parseFloat(refObject['Length']).toFixed(1) === height;
                 });
             }
-            var refSectionObject = ___namespace.first(refSection);
+            var refSectionObject = _.first(refSection);
             if (refSectionObject) {
                 var refObjectValues = Object.keys(refSectionObject)
                     .map(function (key) { return refSectionObject[key]; })
@@ -1900,14 +1864,14 @@
                     minReferencePoint_2.push(minimumValue);
                 }
                 else {
-                    ___namespace.forEach(refObjectValues, function (value) {
+                    _.forEach(refObjectValues, function (value) {
                         if (value <= weight) {
                             minReferencePoint_2.push(value);
                         }
                     });
                 }
-                var lastReferenceValue_2 = ___namespace.last(minReferencePoint_2);
-                var lastValueIndex = ___namespace.findIndex(refObjectValues, function (o) {
+                var lastReferenceValue_2 = _.last(minReferencePoint_2);
+                var lastValueIndex = _.findIndex(refObjectValues, function (o) {
                     return o === lastReferenceValue_2;
                 });
                 var SDValue = refObjectKeys[lastValueIndex];
@@ -1926,7 +1890,7 @@
             return height && weight ? formattedSDValue : null;
         };
         JsExpressionHelper.prototype.calcHeightForAgeZscore = function (heightForAgeRef, height, weight) {
-            var refSectionObject = ___namespace.first(heightForAgeRef);
+            var refSectionObject = _.first(heightForAgeRef);
             var formattedSDValue;
             if (refSectionObject) {
                 var refObjectValues = Object.keys(refSectionObject)
@@ -1939,14 +1903,14 @@
                     minReferencePoint_3.push(minimumValue);
                 }
                 else {
-                    ___namespace.forEach(refObjectValues, function (value) {
+                    _.forEach(refObjectValues, function (value) {
                         if (value <= height) {
                             minReferencePoint_3.push(value);
                         }
                     });
                 }
-                var lastReferenceValue_3 = ___namespace.last(minReferencePoint_3);
-                var lastValueIndex = ___namespace.findIndex(refObjectValues, function (o) {
+                var lastReferenceValue_3 = _.last(minReferencePoint_3);
+                var lastValueIndex = _.findIndex(refObjectValues, function (o) {
                     return o === lastReferenceValue_3;
                 });
                 var SDValue = refObjectKeys[lastValueIndex];
@@ -2108,7 +2072,7 @@
             var _this = this;
             var list = [];
             if (question.validators) {
-                ___namespace.forEach(question.validators, function (validator) {
+                _.forEach(question.validators, function (validator) {
                     switch (validator.type) {
                         case 'date':
                             list.push(_this.dateValidator);
@@ -2734,7 +2698,7 @@
         ErrorRendererComponent.prototype.announceErrorField = function (errorNode) {
             var _this = this;
             var nodes = this.form.searchNodeByQuestionId(errorNode.path.substring(0, errorNode.path.indexOf('.')));
-            ___namespace.forEach(nodes, function (node) {
+            _.forEach(nodes, function (node) {
                 if (node.question.renderingType === 'page') {
                     var pageIndex = _this.getPageIndex(node);
                     _this.formErrorsService.announceErrorField(pageIndex + ',' + errorNode.question.key);
@@ -2769,10 +2733,10 @@
         HistoricalFieldHelperService.prototype.getDisplayTextFromOptions = function (question, valueProperty, displayProperty) {
             var displayText = '';
             var historicalValue = question.historicalDataValue;
-            if (___namespace.isArray(historicalValue.value)) {
+            if (_.isArray(historicalValue.value)) {
                 var valueConverted_1 = 0;
-                ___namespace.each(historicalValue.value, function (val) {
-                    ___namespace.each(question.options, function (option) {
+                _.each(historicalValue.value, function (val) {
+                    _.each(question.options, function (option) {
                         if (option[valueProperty] === val) {
                             if (valueConverted_1 === 0) {
                                 displayText = displayText + option[displayProperty];
@@ -2786,7 +2750,7 @@
                 });
             }
             else {
-                ___namespace.each(question.options, function (option) {
+                _.each(question.options, function (option) {
                     if (option[valueProperty] === historicalValue.value) {
                         displayText = option[displayProperty];
                     }
@@ -2830,7 +2794,7 @@
                 if (node) {
                     this._node = node;
                     if (this._node.question.enableHistoricalValue &&
-                        !___namespace.isUndefined(this._node.question.historicalDataValue)) {
+                        !_.isUndefined(this._node.question.historicalDataValue)) {
                         var display = { text: '', _date: '' };
                         if (this._node.question.renderingType === 'select' ||
                             this._node.question.renderingType === 'multi-select' ||
@@ -2839,7 +2803,7 @@
                             display._date = this._node.question.historicalDataValue.valueDate;
                             this._node.question['historicalDisplay'] = display;
                         }
-                        else if (!___namespace.isUndefined(this._node.question.historicalDataValue)) {
+                        else if (!_.isUndefined(this._node.question.historicalDataValue)) {
                             display.text = this._node.question.historicalDataValue.value;
                             display._date = this._node.question.historicalDataValue.valueDate;
                             this._node.question['historicalDisplay'] = display;
@@ -3537,13 +3501,13 @@
             this.onDisplayMonths = false;
             this.onDisplayYears = false;
             this.displayYearsIndex = 0;
-            this.monthsShort = moment__default["default"].monthsShort();
+            this.monthsShort = moment__default['default'].monthsShort();
         }
         DatePickerComponent.prototype.ngOnInit = function () {
             var _this = this;
             this.initValue();
             // default to current year range
-            ___default["default"].each(this.fullYearRange, function (v, i) {
+            ___default['default'].each(this.fullYearRange, function (v, i) {
                 _this.currentYear = _this.calendarDate.clone().startOf('year').year();
                 if (v.indexOf(_this.currentYear) !== -1) {
                     _this.displayYearsIndex = i;
@@ -3605,7 +3569,7 @@
             this.generateCalendar();
         };
         DatePickerComponent.prototype.selectToday = function () {
-            var today = this.parseToReturnObjectType(moment__default["default"]());
+            var today = this.parseToReturnObjectType(moment__default['default']());
             this.onSelectDate.emit(today);
             this.cancelDatePicker();
             return;
@@ -3620,34 +3584,34 @@
             return;
         };
         DatePickerComponent.prototype.generateYears = function () {
-            var currentYear = moment__default["default"]().year();
+            var currentYear = moment__default['default']().year();
             var startYr = this.calendarDate.clone().subtract(100, 'y').year();
             // const endYr = this.calendarDate.clone().add(10, 'y').year();
             var years = [];
             for (var year = startYr; year <= currentYear; year++) {
                 years.push(year);
             }
-            this.fullYearRange = ___default["default"].chunk(years, 14);
+            this.fullYearRange = ___default['default'].chunk(years, 14);
         };
         DatePickerComponent.prototype.initValue = function () {
             // set moment locale (default is en)
-            moment__default["default"].locale(this.locale);
+            moment__default['default'].locale(this.locale);
             // set today value
-            this.today = moment__default["default"]().startOf('date');
-            this.currentMonth = this.monthsShort[moment__default["default"]().month()];
-            this.currentYear = moment__default["default"]().year();
+            this.today = moment__default['default']().startOf('date');
+            this.currentMonth = this.monthsShort[moment__default['default']().month()];
+            this.currentYear = moment__default['default']().year();
             // set week days name array
-            this.dayNames = moment__default["default"].weekdaysShort(true);
+            this.dayNames = moment__default['default'].weekdaysShort(true);
             // check if the input initDate has value
             if (this.initDate) {
                 this.calendarDate =
                     this.returnObject === 'string'
-                        ? moment__default["default"](this.initDate, this.viewFormat)
-                        : moment__default["default"](this.initDate);
+                        ? moment__default['default'](this.initDate, this.viewFormat)
+                        : moment__default['default'](this.initDate);
                 this.selectedDate = this.calendarDate.clone().startOf('date');
             }
             else {
-                this.calendarDate = moment__default["default"]();
+                this.calendarDate = moment__default['default']();
             }
             this.generateYears();
         };
@@ -3655,7 +3619,7 @@
             this.calendarDays = [];
             var start = 0 -
                 ((this.calendarDate.clone().startOf('month').day() +
-                    (7 - moment__default["default"].localeData().firstDayOfWeek())) %
+                    (7 - moment__default['default'].localeData().firstDayOfWeek())) %
                     7);
             var end = 41 + start; // iterator ending point
             for (var i = start; i <= end; i += 1) {
@@ -3689,7 +3653,7 @@
         { type: i0.Component, args: [{
                     selector: 'date-picker',
                     template: "<picker-modal (onOverlayClick)=\"cancelDatePicker()\">\n  <div class=\"picker-wrap\">\n    <div class=\"picker-box\">\n      <div class=\"picker-header\">\n        <div class=\"picker-header-nav\">\n          <span class=\"nav-prev\" (click)=\"prev()\"></span>\n        </div>\n        <div class=\"picker-header-content\">\n          <div class=\"content\">\n            <span (click)=\"showMonthSelection()\" class=\"month\">{{\n              calendarDate | moment: 'MMMM'\n            }}</span>\n            <span class=\"seperator\">|</span>\n            <span (click)=\"showYearSelection()\" class=\"year\">{{\n              calendarDate | moment: 'YYYY'\n            }}</span>\n          </div>\n        </div>\n        <div class=\"picker-header-nav\">\n          <span class=\"nav-next\" (click)=\"next()\"></span>\n        </div>\n      </div>\n      <div class=\"picker-calendar\">\n        <div\n          class=\"picker-calendar-row\"\n          *ngIf=\"!onDisplayMonths && !onDisplayYears\"\n        >\n          <span class=\"picker-weekday\" *ngFor=\"let day of dayNames\">{{\n            day\n          }}</span>\n        </div>\n        <div\n          class=\"picker-calendar-row\"\n          *ngIf=\"!onDisplayMonths && !onDisplayYears\"\n        >\n          <span\n            class=\"picker-day\"\n            (click)=\"selectDay(day)\"\n            [ngClass]=\"{\n              'out-focus': day.month() != calendarDate.month(),\n              today: day.isSame(today),\n              selected: day.isSame(selectedDate)\n            }\"\n            *ngFor=\"let day of calendarDays\"\n          >\n            {{ day | moment: 'D' }}\n          </span>\n        </div>\n        <div class=\"picker-calendar-row\" *ngIf=\"onDisplayMonths\">\n          <span\n            class=\"picker-month\"\n            *ngFor=\"let month of monthsShort\"\n            (click)=\"selectMonth(month)\"\n            [ngClass]=\"{\n              selected: month === currentMonth\n            }\"\n          >\n            {{ month }}\n          </span>\n        </div>\n        <div class=\"picker-calendar-row\" *ngIf=\"onDisplayYears\">\n          <span\n            class=\"picker-year\"\n            *ngFor=\"let year of displayYearRange\"\n            (click)=\"selectYear(year)\"\n            [ngClass]=\"{\n              selected: year === currentYear\n            }\"\n          >\n            {{ year }}\n          </span>\n        </div>\n      </div>\n      <div class=\"picker-footer\">\n        <div class=\"picker-action action-today\" (click)=\"selectToday()\">\n          <span class=\"text\">Today</span>\n        </div>\n        <div class=\"picker-action action-clear\" (click)=\"clearPickDate()\">\n          <span class=\"text\">Clear</span>\n        </div>\n        <div class=\"picker-action action-close\" (click)=\"cancelDatePicker()\">\n          <span class=\"text\">Close</span>\n        </div>\n      </div>\n    </div>\n  </div>\n</picker-modal>\n",
-                    styles: ["*,:after,:before{box-sizing:border-box}.picker-wrap{width:95vw;max-width:666px}.picker-box{font-family:Open Sans;min-width:400px!important;padding:.625rem 1rem;-webkit-user-select:none;-moz-user-select:none;user-select:none}.picker-footer,.picker-header{font-size:1.333rem;line-height:2.5rem;display:flex;height:2.5rem;width:100%}.picker-header-nav{position:relative;cursor:pointer;width:calc(100% / 8)}.picker-header-nav>*{position:absolute;top:50%;right:auto;bottom:auto;left:50%;transform:translate(-50%,-50%)}.picker-header-nav .nav-next:before,.picker-header-nav .nav-prev:before{content:\" \";border-top:.5em solid transparent;border-bottom:.5em solid transparent;border-right:.75em solid #000;width:0;height:0;display:block;margin:0 auto}.picker-header-nav .nav-next:before{border-right:0;border-left:.75em solid #000}.picker-header-content{width:calc(100% * 6 / 8);text-align:center}.picker-header-content .month{font-size:1.778rem;line-height:2.5rem;margin-right:.5rem;font-weight:700}.picker-header-content .year{font-style:italic;color:#999}.picker-calendar{width:100%}.picker-calendar .picker-calendar-row{display:flex;flex-wrap:wrap;width:100%;margin-bottom:.625rem}.picker-calendar .picker-weekday{font-weight:700;text-align:left;color:#999;width:calc(100% / 7)}.picker-calendar .picker-day,.picker-calendar .picker-month,.picker-calendar .picker-year{font-size:1.333rem;line-height:2.5rem;position:relative;height:2.5rem;text-align:center;cursor:pointer;width:calc(100% / 7)}.picker-calendar .picker-day:hover,.picker-calendar .picker-month:hover,.picker-calendar .picker-year:hover{background:#b1dcfb}.picker-calendar .out-focus{color:#ddd}.picker-calendar .out-focus:hover{color:#000}.picker-calendar .selected{background:#0089ec;color:#fff}.picker-calendar .selected:hover{background:#0089ec}.picker-calendar .today:before{content:\" \";position:absolute;top:2px;right:2px;width:0;height:0;border-top:.5em solid #0059bc;border-left:.5em solid transparent}.picker-footer{cursor:pointer}.picker-footer .picker-action{text-align:center;width:calc(100% / 3)}.picker-footer .picker-action:hover{background-color:#b1dcfb}.picker-footer .picker-action .text{padding-left:.8rem}.picker-footer .action-clear:before,.picker-footer .action-close:before,.picker-footer .action-today:before{content:\" \";position:relative;display:inline-block;height:0;width:0}.picker-footer .action-today:before{border-top:.66em solid #0059bc;border-left:.66em solid transparent}.picker-footer .action-clear:before{top:-.5rem;width:1rem;border-top:3px solid #e20}.picker-footer .action-close:before{width:1rem;height:1rem;background:linear-gradient(180deg,transparent 35%,#777 0,#777 65%,transparent 0),linear-gradient(90deg,transparent 35%,#777 0,#777 65%,transparent 0);transform:rotate(45deg)}"]
+                    styles: ["*,:after,:before{box-sizing:border-box}.picker-wrap{width:95vw;max-width:666px}.picker-box{font-family:Open Sans;min-width:400px!important;padding:.625rem 1rem;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.picker-footer,.picker-header{font-size:1.333rem;line-height:2.5rem;display:flex;height:2.5rem;width:100%}.picker-header-nav{position:relative;cursor:pointer;width:calc(100% / 8)}.picker-header-nav>*{position:absolute;top:50%;right:auto;bottom:auto;left:50%;transform:translate(-50%,-50%)}.picker-header-nav .nav-next:before,.picker-header-nav .nav-prev:before{content:\" \";border-top:.5em solid transparent;border-bottom:.5em solid transparent;border-right:.75em solid #000;width:0;height:0;display:block;margin:0 auto}.picker-header-nav .nav-next:before{border-right:0;border-left:.75em solid #000}.picker-header-content{width:calc(100% * 6 / 8);text-align:center}.picker-header-content .month{font-size:1.778rem;line-height:2.5rem;margin-right:.5rem;font-weight:700}.picker-header-content .year{font-style:italic;color:#999}.picker-calendar{width:100%}.picker-calendar .picker-calendar-row{display:flex;flex-wrap:wrap;width:100%;margin-bottom:.625rem}.picker-calendar .picker-weekday{font-weight:700;text-align:left;color:#999;width:calc(100% / 7)}.picker-calendar .picker-day,.picker-calendar .picker-month,.picker-calendar .picker-year{font-size:1.333rem;line-height:2.5rem;position:relative;height:2.5rem;text-align:center;cursor:pointer;width:calc(100% / 7)}.picker-calendar .picker-day:hover,.picker-calendar .picker-month:hover,.picker-calendar .picker-year:hover{background:#b1dcfb}.picker-calendar .out-focus{color:#ddd}.picker-calendar .out-focus:hover{color:#000}.picker-calendar .selected{background:#0089ec;color:#fff}.picker-calendar .selected:hover{background:#0089ec}.picker-calendar .today:before{content:\" \";position:absolute;top:2px;right:2px;width:0;height:0;border-top:.5em solid #0059bc;border-left:.5em solid transparent}.picker-footer{cursor:pointer}.picker-footer .picker-action{text-align:center;width:calc(100% / 3)}.picker-footer .picker-action:hover{background-color:#b1dcfb}.picker-footer .picker-action .text{padding-left:.8rem}.picker-footer .action-clear:before,.picker-footer .action-close:before,.picker-footer .action-today:before{content:\" \";position:relative;display:inline-block;height:0;width:0}.picker-footer .action-today:before{border-top:.66em solid #0059bc;border-left:.66em solid transparent}.picker-footer .action-clear:before{top:-.5rem;width:1rem;border-top:3px solid #e20}.picker-footer .action-close:before{width:1rem;height:1rem;background:linear-gradient(180deg,transparent 35%,#777 0,#777 65%,transparent 0),linear-gradient(90deg,transparent 35%,#777 0,#777 65%,transparent 0);transform:rotate(45deg)}"]
                 },] }
     ];
     DatePickerComponent.ctorParameters = function () { return []; };
@@ -3723,17 +3687,17 @@
                 this.hourFormat = 'hh';
             }
             this.time = this.initTime
-                ? moment__default["default"](this.initTime, this.viewFormat)
-                : moment__default["default"]();
+                ? moment__default['default'](this.initTime, this.viewFormat)
+                : moment__default['default']();
             // check if the input initDate has value
             if (this.initTime) {
                 this.time =
                     this.returnObject === 'string'
-                        ? moment__default["default"](this.initTime, this.viewFormat)
-                        : moment__default["default"](this.initTime);
+                        ? moment__default['default'](this.initTime, this.viewFormat)
+                        : moment__default['default'](this.initTime);
             }
             else {
-                this.time = moment__default["default"]();
+                this.time = moment__default['default']();
             }
         };
         TimePickerComponent.prototype.increaseHour = function () {
@@ -3761,7 +3725,7 @@
             return;
         };
         TimePickerComponent.prototype.selectNow = function () {
-            var selectTime = this.parseToReturnObjectType(moment__default["default"]());
+            var selectTime = this.parseToReturnObjectType(moment__default['default']());
             this.onSelectTime.emit(selectTime);
             this.cancelTimePicker();
             return;
@@ -3801,7 +3765,7 @@
         { type: i0.Component, args: [{
                     selector: 'time-picker',
                     template: "<picker-modal (onOverlayClick)=\"cancelTimePicker()\">\n  <div class=\"picker-wrap\">\n    <div class=\"picker-box\">\n      <div class=\"picker-header\">Time Picker</div>\n      <div class=\"picker-table\">\n        <ul class=\"picker-table-time\">\n          <li class=\"picker-table-number hour\">\n            <span class=\"arrow up\" (click)=\"increaseHour()\"></span>\n            {{ time | moment: hourFormat }}\n            <span class=\"arrow down\" (click)=\"decreaseHour()\"></span>\n          </li>\n          <li class=\"picker-table-separator\">:</li>\n          <li class=\"picker-table-number minute\">\n            <span class=\"arrow up\" (click)=\"increaseMinute()\"></span>\n            {{ time | moment: 'mm' }}\n            <span class=\"arrow down\" (click)=\"decreaseMinute()\"></span>\n          </li>\n          <li *ngIf=\"showSecond\" class=\"picker-table-separator\">:</li>\n          <li *ngIf=\"showSecond\" class=\"picker-table-number second\">\n            <span class=\"arrow up\" (click)=\"increaseSecond()\"></span>\n            {{ time | moment: 'ss' }}\n            <span class=\"arrow down\" (click)=\"decreaseSecond()\"></span>\n          </li>\n          <li *ngIf=\"use12Hour\" class=\"picker-table-meridiem meridiem\">\n            {{ time | moment: 'A' }}\n          </li>\n        </ul>\n      </div>\n      <div class=\"picker-footer\">\n        <div class=\"picker-action action-now\" (click)=\"selectNow()\">\n          <span class=\"text\">Now</span>\n        </div>\n        <div class=\"picker-action action-confirm\" (click)=\"selectTime()\">\n          <span class=\"text\">Confirm</span>\n        </div>\n        <div class=\"picker-action action-clear\" (click)=\"clearTime()\">\n          <span class=\"text\">Clear</span>\n        </div>\n        <div class=\"picker-action action-close\" (click)=\"cancelTimePicker()\">\n          <span class=\"text\">Close</span>\n        </div>\n      </div>\n    </div>\n  </div>\n</picker-modal>\n",
-                    styles: ["*,:after,:before{box-sizing:border-box}.picker-wrap{width:95vw;max-width:40rem;font-family:Open Sans}.picker-box{width:100%;padding:.625rem 1rem;-webkit-user-select:none;-moz-user-select:none;user-select:none}.picker-footer,.picker-header{font-size:1.333rem;line-height:2.5rem;height:2.5rem;width:100%}.picker-header{text-align:center}.picker-table{width:100%;margin:2.5rem 0}.picker-table-time{font-size:2.37rem;line-height:2.5rem;list-style:none;margin:0;padding:0;display:flex;justify-content:center;width:100%;-webkit-user-select:none;-moz-user-select:none;user-select:none}.picker-table-meridiem,.picker-table-number,.picker-table-separator{text-align:center}.picker-table-meridiem,.picker-table-number{position:relative;width:20%}.arrow{position:absolute;left:50%;border:solid #777;border-width:0 .2rem .2rem 0;display:inline-block;padding:.25rem;cursor:pointer}.arrow.up{top:-1rem;transform:translateX(-50%) rotate(-135deg)}.arrow.down{bottom:-1rem;transform:translateX(-50%) rotate(45deg)}.arrow:hover{border-color:#1975d2}.picker-table-separator{width:calc(20% / 3)}.picker-footer{display:flex;justify-content:center;width:100%;cursor:pointer}.picker-footer .picker-action{width:25%;text-align:center}.picker-footer .picker-action:hover{background-color:#b1dcfb}.picker-footer .picker-action .text{padding-left:.8rem}.picker-footer .action-clear:before,.picker-footer .action-close:before,.picker-footer .action-confirm:before,.picker-footer .action-now:before{content:\" \";position:relative;display:inline-block;height:0;width:0}.picker-footer .action-now:before{border-top:.66em solid #0059bc;border-left:.66em solid transparent}.picker-footer .action-confirm:before{width:1rem;height:1rem;border-radius:100%;background-color:#00b5ad}.picker-footer .action-clear:before{top:-.5rem;width:1rem;border-top:3px solid #e20}.picker-footer .action-close:before{width:1rem;height:1rem;background:linear-gradient(180deg,transparent 35%,#777 0,#777 65%,transparent 0),linear-gradient(90deg,transparent 35%,#777 0,#777 65%,transparent 0);transform:rotate(45deg)}"]
+                    styles: ["*,:after,:before{box-sizing:border-box}.picker-wrap{width:95vw;max-width:40rem;font-family:Open Sans}.picker-box{width:100%;padding:.625rem 1rem;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.picker-footer,.picker-header{font-size:1.333rem;line-height:2.5rem;height:2.5rem;width:100%}.picker-header{text-align:center}.picker-table{width:100%;margin:2.5rem 0}.picker-table-time{font-size:2.37rem;line-height:2.5rem;list-style:none;margin:0;padding:0;display:flex;justify-content:center;width:100%;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.picker-table-meridiem,.picker-table-number,.picker-table-separator{text-align:center}.picker-table-meridiem,.picker-table-number{position:relative;width:20%}.arrow{position:absolute;left:50%;border:solid #777;border-width:0 .2rem .2rem 0;display:inline-block;padding:.25rem;cursor:pointer}.arrow.up{top:-1rem;transform:translateX(-50%) rotate(-135deg)}.arrow.down{bottom:-1rem;transform:translateX(-50%) rotate(45deg)}.arrow:hover{border-color:#1975d2}.picker-table-separator{width:calc(20% / 3)}.picker-footer{display:flex;justify-content:center;width:100%;cursor:pointer}.picker-footer .picker-action{width:25%;text-align:center}.picker-footer .picker-action:hover{background-color:#b1dcfb}.picker-footer .picker-action .text{padding-left:.8rem}.picker-footer .action-clear:before,.picker-footer .action-close:before,.picker-footer .action-confirm:before,.picker-footer .action-now:before{content:\" \";position:relative;display:inline-block;height:0;width:0}.picker-footer .action-now:before{border-top:.66em solid #0059bc;border-left:.66em solid transparent}.picker-footer .action-confirm:before{width:1rem;height:1rem;border-radius:100%;background-color:#00b5ad}.picker-footer .action-clear:before{top:-.5rem;width:1rem;border-top:3px solid #e20}.picker-footer .action-close:before{width:1rem;height:1rem;background:linear-gradient(180deg,transparent 35%,#777 0,#777 65%,transparent 0),linear-gradient(90deg,transparent 35%,#777 0,#777 65%,transparent 0);transform:rotate(45deg)}"]
                 },] }
     ];
     TimePickerComponent.ctorParameters = function () { return []; };
@@ -3876,11 +3840,11 @@
         DateTimePickerComponent.prototype.weeksSelected = function (count) {
             var now = new Date();
             var nextDate = now.setDate(now.getDate() + count * 7);
-            this.value = moment__default["default"](nextDate).format();
+            this.value = moment__default['default'](nextDate).format();
         };
         DateTimePickerComponent.prototype.setDate = function (date) {
             if (date && date !== '') {
-                this.value = moment__default["default"](date).format();
+                this.value = moment__default['default'](date).format();
             }
             else {
                 this.value = date;
@@ -3888,7 +3852,7 @@
         };
         DateTimePickerComponent.prototype.setTime = function (time) {
             if (time && time !== '') {
-                this.value = moment__default["default"](time).format();
+                this.value = moment__default['default'](time).format();
             }
             else {
                 this.value = time;
@@ -3934,7 +3898,7 @@
         };
         DateTimePickerComponent.prototype.writeValue = function (value) {
             if (value instanceof Date) {
-                this.value = moment__default["default"](value).format();
+                this.value = moment__default['default'](value).format();
             }
             else {
                 this.value = value;
@@ -4008,11 +3972,11 @@
         }
         NgxDatetimeComponent.prototype.onInput = function ($event) {
             this.onTouch();
-            this.onChange(moment__default["default"]($event.value).format());
+            this.onChange(moment__default['default']($event.value).format());
         };
         NgxDatetimeComponent.prototype.writeValue = function (value) {
             if (value && value !== '') {
-                this.value = moment__default["default"](value).format();
+                this.value = moment__default['default'](value).format();
             }
             else {
                 this.value = '';
@@ -4029,7 +3993,7 @@
         };
         NgxDatetimeComponent.prototype.onWeeksSelected = function (numberOfWeeks) {
             var currentDate = new Date().toString();
-            this.onInput({ value: moment__default["default"](currentDate).add(numberOfWeeks, 'weeks') });
+            this.onInput({ value: moment__default['default'](currentDate).add(numberOfWeeks, 'weeks') });
         };
         return NgxDatetimeComponent;
     }());
@@ -4183,7 +4147,7 @@
         }
         return OwlDateTimeIntl;
     }());
-    OwlDateTimeIntl.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function OwlDateTimeIntl_Factory() { return new OwlDateTimeIntl(); }, token: OwlDateTimeIntl, providedIn: "root" });
+    OwlDateTimeIntl.ɵprov = i0.ɵɵdefineInjectable({ factory: function OwlDateTimeIntl_Factory() { return new OwlDateTimeIntl(); }, token: OwlDateTimeIntl, providedIn: "root" });
     OwlDateTimeIntl.decorators = [
         { type: i0.Injectable, args: [{ providedIn: 'root' },] }
     ];
@@ -6955,7 +6919,7 @@
     };
 
     /* eslint-disable @angular-eslint/no-host-metadata-property */
-    var OWL_DATETIME_VALUE_ACCESSOR$1 = {
+    var OWL_DATETIME_VALUE_ACCESSOR = {
         provide: forms.NG_VALUE_ACCESSOR,
         useExisting: i0.forwardRef(function () { return OwlDateTimeInputDirective; }),
         multi: true
@@ -7582,7 +7546,7 @@
                         '[attr.max]': 'maxIso8601',
                         '[disabled]': 'owlDateTimeInputDisabled'
                     },
-                    providers: [OWL_DATETIME_VALUE_ACCESSOR$1, OWL_DATETIME_VALIDATORS]
+                    providers: [OWL_DATETIME_VALUE_ACCESSOR, OWL_DATETIME_VALIDATORS]
                 },] }
     ];
     OwlDateTimeInputDirective.ctorParameters = function () { return [
@@ -9193,7 +9157,7 @@
                 },] }
     ];
 
-    var OWL_DATETIME_VALUE_ACCESSOR = {
+    var OWL_DATETIME_VALUE_ACCESSOR$1 = {
         provide: forms.NG_VALUE_ACCESSOR,
         useExisting: i0.forwardRef(function () { return OwlDateTimeInlineComponent; }),
         multi: true
@@ -9477,7 +9441,7 @@
                     },
                     changeDetection: i0.ChangeDetectionStrategy.OnPush,
                     preserveWhitespaces: false,
-                    providers: [OWL_DATETIME_VALUE_ACCESSOR],
+                    providers: [OWL_DATETIME_VALUE_ACCESSOR$1],
                     styles: [""]
                 },] }
     ];
@@ -9607,9 +9571,9 @@
         short: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
         narrow: ['S', 'M', 'T', 'W', 'T', 'F', 'S']
     };
-    var ɵ0$1 = function (i) { return String(i + 1); };
+    var ɵ0 = function (i) { return String(i + 1); };
     /** The default date names to use if Intl API is not available. */
-    var DEFAULT_DATE_NAMES = range(31, ɵ0$1);
+    var DEFAULT_DATE_NAMES = range(31, ɵ0);
     /** Whether the browser supports the Intl API. */
     var SUPPORTS_INTL_API = typeof Intl !== 'undefined';
     /**
@@ -9940,7 +9904,7 @@
                     providers: [{ provide: DateTimeAdapter, useClass: NativeDateTimeAdapter }]
                 },] }
     ];
-    var ɵ0 = OWL_NATIVE_DATE_TIME_FORMATS;
+    var ɵ0$1 = OWL_NATIVE_DATE_TIME_FORMATS;
     var OwlNativeDateTimeModule = /** @class */ (function () {
         function OwlNativeDateTimeModule() {
         }
@@ -9950,7 +9914,7 @@
         { type: i0.NgModule, args: [{
                     imports: [NativeDateTimeModule],
                     providers: [
-                        { provide: OWL_DATE_TIME_FORMATS, useValue: ɵ0 }
+                        { provide: OWL_DATE_TIME_FORMATS, useValue: ɵ0$1 }
                     ]
                 },] }
     ];
@@ -9978,7 +9942,7 @@
                 },] }
     ];
 
-    var Option$1 = /** @class */ (function () {
+    var Option = /** @class */ (function () {
         function Option(options) {
             this.label = options.label;
             this.value = options.value;
@@ -10023,7 +9987,7 @@
                 // console.log('options', options);
                 var mappedOptions = new Array();
                 for (var i = 0; i < options.length; i++) {
-                    mappedOptions.push(new Option$1(options[i]));
+                    mappedOptions.push(new Option(options[i]));
                 }
                 _this.subject.next(mappedOptions);
             }, function (error) {
@@ -10074,12 +10038,12 @@
         FormSchemaCompiler.prototype.compileFormSchema = function (formSchema, referencedComponents) {
             // get all referenced forms
             var refForms = this.getReferencedForms(formSchema, referencedComponents);
-            if (___namespace.isEmpty(refForms)) {
+            if (_.isEmpty(refForms)) {
                 return formSchema;
             }
             // get all place-holders from the form schema
             var placeHolders = this.getAllPlaceholderObjects(formSchema);
-            if (___namespace.isEmpty(placeHolders)) {
+            if (_.isEmpty(placeHolders)) {
                 return formSchema;
             }
             // replace all placeHolders
@@ -10087,11 +10051,11 @@
             return formSchema;
         };
         FormSchemaCompiler.prototype.findSchemaByName = function (schemaArray, nameOfSchema) {
-            if (___namespace.isEmpty(schemaArray) || ___namespace.isEmpty(nameOfSchema)) {
+            if (_.isEmpty(schemaArray) || _.isEmpty(nameOfSchema)) {
                 return;
             }
             var foundSchema = {};
-            ___namespace.each(schemaArray, function (schema) {
+            _.each(schemaArray, function (schema) {
                 if (schema.name === nameOfSchema) {
                     foundSchema = schema;
                 }
@@ -10099,11 +10063,11 @@
             return foundSchema;
         };
         FormSchemaCompiler.prototype.getPageInSchemaByLabel = function (schema, pageLabel) {
-            if (___namespace.isEmpty(schema) || ___namespace.isEmpty(pageLabel)) {
+            if (_.isEmpty(schema) || _.isEmpty(pageLabel)) {
                 return;
             }
             var foundPage = {};
-            ___namespace.each(schema.pages, function (page) {
+            _.each(schema.pages, function (page) {
                 if (page.label === pageLabel) {
                     foundPage = page;
                 }
@@ -10111,15 +10075,15 @@
             return foundPage;
         };
         FormSchemaCompiler.prototype.getSectionInSchemaByPageLabelBySectionLabel = function (schema, pageLabel, sectionLabel) {
-            if (___namespace.isEmpty(schema) || ___namespace.isEmpty(pageLabel) || ___namespace.isEmpty(sectionLabel)) {
+            if (_.isEmpty(schema) || _.isEmpty(pageLabel) || _.isEmpty(sectionLabel)) {
                 return;
             }
             var foundPage = this.getPageInSchemaByLabel(schema, pageLabel);
-            if (___namespace.isEmpty(foundPage)) {
+            if (_.isEmpty(foundPage)) {
                 return;
             }
             var foundSection = {};
-            ___namespace.each(foundPage.sections, function (section) {
+            _.each(foundPage.sections, function (section) {
                 if (section.label === sectionLabel) {
                     foundSection = section;
                 }
@@ -10127,16 +10091,16 @@
             return foundSection;
         };
         FormSchemaCompiler.prototype.getQuestionByIdInSchema = function (schema, questionId) {
-            if (___namespace.isEmpty(schema) || ___namespace.isEmpty(questionId)) {
+            if (_.isEmpty(schema) || _.isEmpty(questionId)) {
                 return;
             }
             if (Array.isArray(schema)) {
                 var question = void 0;
                 for (var i = 0; i < schema.length; i++) {
-                    if (!___namespace.isEmpty(schema[i])) {
+                    if (!_.isEmpty(schema[i])) {
                         question = this.getQuestionByIdInSchema(schema[i], questionId);
                     }
-                    if (!___namespace.isEmpty(question)) {
+                    if (!_.isEmpty(question)) {
                         break;
                     }
                 }
@@ -10159,7 +10123,7 @@
             }
         };
         FormSchemaCompiler.prototype.getQuestionsArrayByQuestionIdInSchema = function (schema, questionId) {
-            if (___namespace.isEmpty(schema) || ___namespace.isEmpty(questionId)) {
+            if (_.isEmpty(schema) || _.isEmpty(questionId)) {
                 return;
             }
             return this.getQuestionsArrayByQuestionId(schema, schema, questionId);
@@ -10168,10 +10132,10 @@
             if (Array.isArray(object)) {
                 var returnedValue = void 0;
                 for (var i = 0; i < object.length; i++) {
-                    if (!___namespace.isEmpty(object[i])) {
+                    if (!_.isEmpty(object[i])) {
                         returnedValue = this.getQuestionsArrayByQuestionId(object, object[i], questionId);
                     }
-                    if (!___namespace.isEmpty(returnedValue)) {
+                    if (!_.isEmpty(returnedValue)) {
                         break;
                     }
                 }
@@ -10197,9 +10161,9 @@
         FormSchemaCompiler.prototype.isSchemaSubObjectExpandable = function (object) {
             if (typeof object === 'object') {
                 var objectKeys = Object.keys(object);
-                if (___namespace.includes(objectKeys, 'pages') ||
-                    ___namespace.includes(objectKeys, 'sections') ||
-                    ___namespace.includes(objectKeys, 'questions')) {
+                if (_.includes(objectKeys, 'pages') ||
+                    _.includes(objectKeys, 'sections') ||
+                    _.includes(objectKeys, 'questions')) {
                     return true;
                 }
             }
@@ -10214,18 +10178,18 @@
             return referencedObjects;
         };
         FormSchemaCompiler.prototype.extractPlaceholderObjects = function (subSchema, objectsArray) {
-            if (___namespace.isEmpty(subSchema)) {
+            if (_.isEmpty(subSchema)) {
                 return;
             }
             if (Array.isArray(subSchema)) {
                 for (var i = 0; i < subSchema.length; i++) {
-                    if (!___namespace.isEmpty(subSchema[i])) {
+                    if (!_.isEmpty(subSchema[i])) {
                         this.extractPlaceholderObjects(subSchema[i], objectsArray);
                     }
                 }
             }
             else if (typeof subSchema === 'object') {
-                if (!___namespace.isEmpty(subSchema.reference)) {
+                if (!_.isEmpty(subSchema.reference)) {
                     objectsArray.push(subSchema);
                 }
                 else if (this.isSchemaSubObjectExpandable(subSchema)) {
@@ -10236,7 +10200,7 @@
         };
         FormSchemaCompiler.prototype.fillPlaceholderObject = function (placeHolderObject, referenceObject) {
             for (var member in referenceObject) {
-                if (___namespace.isEmpty(placeHolderObject[member])) {
+                if (_.isEmpty(placeHolderObject[member])) {
                     placeHolderObject[member] = referenceObject[member];
                 }
             }
@@ -10244,9 +10208,9 @@
         };
         FormSchemaCompiler.prototype.replaceAllPlaceholdersWithActualObjects = function (keyValReferencedForms, placeHoldersArray) {
             var _this = this;
-            ___namespace.each(placeHoldersArray, function (placeHolder) {
+            _.each(placeHoldersArray, function (placeHolder) {
                 var referencedObject = _this.getReferencedObject(placeHolder.reference, keyValReferencedForms);
-                if (___namespace.isEmpty(referencedObject)) {
+                if (_.isEmpty(referencedObject)) {
                     console.error('Form compile: Error finding referenced object', placeHolder.reference);
                 }
                 else {
@@ -10267,7 +10231,7 @@
         FormSchemaCompiler.prototype.removeExcludedQuestionsFromPlaceholder = function (placeHolder) {
             var _this = this;
             if (Array.isArray(placeHolder.reference.excludeQuestions)) {
-                ___namespace.each(placeHolder.reference.excludeQuestions, function (excludedQuestionId) {
+                _.each(placeHolder.reference.excludeQuestions, function (excludedQuestionId) {
                     var questionsArray = _this.getQuestionsArrayByQuestionIdInSchema(placeHolder, excludedQuestionId);
                     if (!Array.isArray(questionsArray)) {
                         return;
@@ -10279,21 +10243,21 @@
             return placeHolder;
         };
         FormSchemaCompiler.prototype.getReferencedObject = function (referenceData, keyValReferencedForms) {
-            if (___namespace.isEmpty(referenceData.form)) {
+            if (_.isEmpty(referenceData.form)) {
                 console.error('Form compile: reference missing form attribute', referenceData);
                 return;
             }
-            if (___namespace.isEmpty(keyValReferencedForms[referenceData.form])) {
+            if (_.isEmpty(keyValReferencedForms[referenceData.form])) {
                 console.error('Form compile: referenced form alias not found', referenceData);
                 return;
             }
-            if (!___namespace.isEmpty(referenceData.questionId)) {
+            if (!_.isEmpty(referenceData.questionId)) {
                 return this.getQuestionByIdInSchema(keyValReferencedForms[referenceData.form], referenceData.questionId);
             }
-            if (!___namespace.isEmpty(referenceData.page) && !___namespace.isEmpty(referenceData.section)) {
+            if (!_.isEmpty(referenceData.page) && !_.isEmpty(referenceData.section)) {
                 return this.getSectionInSchemaByPageLabelBySectionLabel(keyValReferencedForms[referenceData.form], referenceData.page, referenceData.section);
             }
-            if (!___namespace.isEmpty(referenceData.page)) {
+            if (!_.isEmpty(referenceData.page)) {
                 return this.getPageInSchemaByLabel(keyValReferencedForms[referenceData.form], referenceData.page);
             }
             console.error('Form compile: Unsupported reference type', referenceData.reference);
@@ -10301,11 +10265,11 @@
         FormSchemaCompiler.prototype.getReferencedForms = function (formSchema, formSchemasLookupArray) {
             var _this = this;
             var referencedForms = formSchema.referencedForms;
-            if (___namespace.isEmpty(referencedForms)) {
+            if (_.isEmpty(referencedForms)) {
                 return;
             }
             var keyValReferencedForms = {};
-            ___namespace.each(referencedForms, function (reference) {
+            _.each(referencedForms, function (reference) {
                 keyValReferencedForms[reference.alias] = _this.findSchemaByName(formSchemasLookupArray, reference.formName);
             });
             return keyValReferencedForms;
@@ -10508,7 +10472,7 @@
         DummyDataSource.prototype.resolveSelectedValue = function (value) {
             var selectOptions = this.sampleData();
             selectOptions = selectOptions.map(function (obj) {
-                var option = new Option$1({
+                var option = new Option({
                     label: obj.label,
                     value: obj.concept
                 });
@@ -10533,7 +10497,7 @@
         DummyDataSource.prototype.searchOptions = function (searchText) {
             var selectOptions = this.sampleData();
             selectOptions = selectOptions.map(function (obj) {
-                var option = new Option$1({
+                var option = new Option({
                     label: obj.label,
                     value: obj.concept
                 });
@@ -10628,13 +10592,13 @@
                     return encStore.data[index];
                 }
             };
-            if (___default["default"].isArray(encounters)) {
+            if (___default['default'].isArray(encounters)) {
                 var group_1 = [];
-                ___default["default"].each(encounters, function (encounter) {
+                ___default['default'].each(encounters, function (encounter) {
                     group_1.push(_this._transformEncounter(encounter));
                 });
                 // Sort them in reverse chronological order
-                encStore.data = ___default["default"].sortBy(group_1, 'encounterDatetime').reverse();
+                encStore.data = ___default['default'].sortBy(group_1, 'encounterDatetime').reverse();
             }
             else {
                 // Assume a single openmrs rest encounter object.
@@ -10654,25 +10618,25 @@
             if (answers.length > 0) {
                 return {
                     value: answers[0],
-                    valueDate: moment__default["default"](object.encounterDatetime).format('YYYY-MM-DDTHH:mm:ss')
+                    valueDate: moment__default['default'](object.encounterDatetime).format('YYYY-MM-DDTHH:mm:ss')
                 };
             }
         };
         HistoricalEncounterDataService.prototype.getAllValues = function (path, object, answers) {
             var _this = this;
-            if (___default["default"].isNil(object)) {
+            if (___default['default'].isNil(object)) {
                 return;
             }
             if (path.length <= 1) {
-                if (!___default["default"].isNil(object[path[0]])) {
+                if (!___default['default'].isNil(object[path[0]])) {
                     answers.push(object[path[0]]);
                 }
                 return;
             }
             var newpath = path.splice(1);
             var key = path[0];
-            if (___default["default"].isArray(object[key]) && object[key].length > 0) {
-                ___default["default"].each(object[key], function (childObject) {
+            if (___default['default'].isArray(object[key]) && object[key].length > 0) {
+                ___default['default'].each(object[key], function (childObject) {
                     _this.getAllValues(newpath.slice(0), childObject, answers);
                 });
             }
@@ -10681,7 +10645,7 @@
             }
         };
         HistoricalEncounterDataService.prototype._transformEncounter = function (encounter) {
-            if (___default["default"].isNil(encounter)) {
+            if (___default['default'].isNil(encounter)) {
                 return;
             }
             // Transform encounter Level details to key value pairs.
@@ -10708,7 +10672,7 @@
             if (encounter.obs) {
                 var processedObs = this._transformObs(encounter.obs);
                 // add in individual processed obs to prevEncounter
-                ___default["default"].extend(prevEncounter, processedObs);
+                ___default['default'].extend(prevEncounter, processedObs);
             }
             return prevEncounter;
         };
@@ -10718,19 +10682,19 @@
                 return null;
             }
             var obsRep = {};
-            if (___default["default"].isArray(obs)) {
-                ___default["default"].each(obs, function (singleObs) {
+            if (___default['default'].isArray(obs)) {
+                ___default['default'].each(obs, function (singleObs) {
                     _this._augumentObs(obsRep, _this._transformObs(singleObs));
                 });
                 return obsRep;
             }
             else if (obs.groupMembers) {
                 var group_2 = {};
-                ___default["default"].each(obs.groupMembers, function (member) {
+                ___default['default'].each(obs.groupMembers, function (member) {
                     _this._augumentObs(group_2, _this._transformObs(member));
                 });
                 // Handle already existing data
-                if (obsRep[obs.concept.uuid] && ___default["default"].isArray(obsRep[obs.concept.uuid])) {
+                if (obsRep[obs.concept.uuid] && ___default['default'].isArray(obsRep[obs.concept.uuid])) {
                     obsRep[obs.concept.uuid].push(group_2);
                 }
                 else {
@@ -10750,14 +10714,14 @@
         };
         HistoricalEncounterDataService.prototype._augumentObs = function (existing, toAdd) {
             for (var key in toAdd) {
-                if (___default["default"].has(existing, key)) {
+                if (___default['default'].has(existing, key)) {
                     // check if not an array yet
-                    if (!___default["default"].isArray(existing[key])) {
+                    if (!___default['default'].isArray(existing[key])) {
                         var temp = existing[key];
                         existing[key] = [temp];
                     }
                     // Check whether the incoming is array (for group members)
-                    if (___default["default"].isArray(toAdd[key])) {
+                    if (___default['default'].isArray(toAdd[key])) {
                         Array.prototype.push.apply(existing[key], toAdd[key]);
                     }
                     else {
@@ -10816,6 +10780,7 @@
         function QuestionFactory() {
             this.dataSources = {};
             this.historicalHelperService = new HistoricalHelperService();
+            this.quetionIndex = 0;
         }
         QuestionFactory.prototype.createQuestionModel = function (formSchema, form) {
             if (form) {
@@ -10826,6 +10791,7 @@
         };
         QuestionFactory.prototype.toSelectQuestion = function (schemaQuestion) {
             var question = new SelectQuestion({ options: [], type: '', key: '' });
+            question.questionIndex = this.quetionIndex;
             question.label = schemaQuestion.label;
             question.prefix = schemaQuestion.prefix;
             question.key = schemaQuestion.id;
@@ -10862,6 +10828,7 @@
                 type: '',
                 key: ''
             });
+            question.questionIndex = this.quetionIndex;
             question.label = schemaQuestion.label;
             question.prefix = schemaQuestion.prefix;
             question.key = schemaQuestion.id;
@@ -10889,6 +10856,7 @@
                 type: '',
                 key: ''
             });
+            question.questionIndex = this.quetionIndex;
             question.label = schemaQuestion.label;
             question.prefix = schemaQuestion.prefix;
             question.key = schemaQuestion.id;
@@ -10914,6 +10882,7 @@
                 return this.toEncounterDatetimeQuestion(schemaQuestion);
             }
             var question = new DateQuestion({ type: '', key: '' });
+            question.questionIndex = this.quetionIndex;
             question.renderingType = 'date';
             question.validators = this.addValidators(schemaQuestion);
             question.extras = schemaQuestion;
@@ -10937,6 +10906,7 @@
         QuestionFactory.prototype.toEncounterDatetimeQuestion = function (schemaQuestion) {
             var _a;
             var question = new DateQuestion({ type: '', key: '' });
+            question.questionIndex = this.quetionIndex;
             question.label = schemaQuestion.label;
             question.prefix = schemaQuestion.prefix;
             question.renderingType = 'date';
@@ -10963,6 +10933,7 @@
         };
         QuestionFactory.prototype.toCheckBoxQuestion = function (schemaQuestion) {
             var question = new CheckBoxQuestion({ options: [], type: '', key: '' });
+            question.questionIndex = this.quetionIndex;
             question.label = schemaQuestion.label;
             question.prefix = schemaQuestion.prefix;
             question.key = schemaQuestion.id;
@@ -10996,6 +10967,7 @@
                 type: '',
                 key: ''
             });
+            question.questionIndex = this.quetionIndex;
             question.label = schemaQuestion.label;
             question.prefix = schemaQuestion.prefix;
             question.key = schemaQuestion.id;
@@ -11029,6 +11001,7 @@
                 type: '',
                 key: ''
             });
+            question.questionIndex = this.quetionIndex;
             question.label = schemaQuestion.label;
             question.prefix = schemaQuestion.prefix;
             question.key = schemaQuestion.id;
@@ -11057,6 +11030,7 @@
                 type: '',
                 key: ''
             });
+            question.questionIndex = this.quetionIndex;
             question.label = schemaQuestion.label;
             question.prefix = schemaQuestion.prefix;
             question.key = schemaQuestion.id;
@@ -11080,6 +11054,7 @@
         };
         QuestionFactory.prototype.toFileUploadQuestion = function (schemaQuestion) {
             var question = new FileUploadQuestion({ type: '', key: '' });
+            question.questionIndex = this.quetionIndex;
             question.label = schemaQuestion.label;
             question.prefix = schemaQuestion.prefix;
             question.key = schemaQuestion.id;
@@ -11102,6 +11077,7 @@
         };
         QuestionFactory.prototype.toDrugQuestion = function (schemaQuestion) {
             var question = new SelectQuestion({ options: [], type: '', key: '' });
+            question.questionIndex = this.quetionIndex;
             question.label = schemaQuestion.label;
             question.prefix = schemaQuestion.prefix;
             question.key = schemaQuestion.id;
@@ -11124,6 +11100,7 @@
         };
         QuestionFactory.prototype.toProblemQuestion = function (schemaQuestion) {
             var question = new SelectQuestion({ options: [], type: '', key: '' });
+            question.questionIndex = this.quetionIndex;
             question.label = schemaQuestion.label;
             question.prefix = schemaQuestion.prefix;
             question.key = schemaQuestion.id;
@@ -11146,6 +11123,7 @@
         };
         QuestionFactory.prototype.toConceptAnswerSelect = function (schemaQuestion) {
             var question = new SelectQuestion({ options: [], type: '', key: '' });
+            question.questionIndex = this.quetionIndex;
             question.label = schemaQuestion.label;
             question.prefix = schemaQuestion.prefix;
             question.key = schemaQuestion.id;
@@ -11176,6 +11154,7 @@
                 type: '',
                 key: ''
             });
+            question.questionIndex = this.quetionIndex;
             question.label = schemaQuestion.label;
             question.prefix = schemaQuestion.prefix;
             question.questions = this.getChildrenQuestionModels(schemaQuestion.questions);
@@ -11203,6 +11182,7 @@
         };
         QuestionFactory.prototype.toGroupQuestion = function (schemaQuestion) {
             var question = new QuestionGroup({ questions: [], type: '', key: '' });
+            question.questionIndex = this.quetionIndex;
             question.label = schemaQuestion.label;
             question.prefix = schemaQuestion.prefix;
             question.questions = this.getChildrenQuestionModels(schemaQuestion.questions);
@@ -11273,6 +11253,7 @@
                 searchFunction: function () { },
                 resolveFunction: function () { }
             });
+            question.questionIndex = this.quetionIndex;
             question.label = schemaQuestion.label;
             question.prefix = schemaQuestion.prefix;
             question.key = schemaQuestion.id;
@@ -11302,6 +11283,7 @@
                 searchFunction: function () { },
                 resolveFunction: function () { }
             });
+            question.questionIndex = this.quetionIndex;
             question.label = schemaQuestion.label;
             question.prefix = schemaQuestion.prefix;
             question.key = schemaQuestion.id;
@@ -11336,6 +11318,7 @@
                 searchFunction: function () { },
                 resolveFunction: function () { }
             });
+            question.questionIndex = this.quetionIndex;
             question.label = schemaQuestion.label;
             question.prefix = schemaQuestion.prefix;
             question.key = schemaQuestion.id;
@@ -11367,6 +11350,7 @@
                 label: '',
                 rendering: ''
             });
+            question.questionIndex = this.quetionIndex;
             question.label = schemaQuestion.label;
             question.prefix = schemaQuestion.prefix;
             question.key = schemaQuestion.id;
@@ -11431,6 +11415,7 @@
             return children;
         };
         QuestionFactory.prototype.toModel = function (schema, renderType) {
+            this.quetionIndex++;
             if (renderType === 'ui-select-extended') {
                 renderType = schema.type;
             }
@@ -11542,7 +11527,7 @@
             var validators = [];
             if (schemaQuestion.validators) {
                 // TODO - add more validator types
-                ___default["default"].forEach(schemaQuestion.validators, function (validator) {
+                ___default['default'].forEach(schemaQuestion.validators, function (validator) {
                     switch (validator.type) {
                         case 'date':
                             validators.push(new DateValidationModel(validator));
@@ -11617,8 +11602,8 @@
                     // sample schema options for this branch
                     // "historicalPrepopulate":true,
                     // "allowedHistoricalValueAgeInDays": 40000,
-                    var valDate = moment__default["default"](origValue.valueDate);
-                    var differenceInDays = moment__default["default"]().diff(valDate, 'days');
+                    var valDate = moment__default['default'](origValue.valueDate);
+                    var differenceInDays = moment__default['default']().diff(valDate, 'days');
                     if (Number.isInteger(schemaQuestion.allowedHistoricalValueAgeInDays)) {
                         if (differenceInDays <= schemaQuestion.allowedHistoricalValueAgeInDays) {
                             question.defaultValue = origValue.value;
@@ -11827,7 +11812,7 @@
                         if (arrayNode &&
                             arrayNode.children &&
                             arrayNode.children.length > 0) {
-                            ___namespace.forEach(arrayNode.children, function (groupNode) {
+                            _.forEach(arrayNode.children, function (groupNode) {
                                 _this.markInvalidControls(groupNode, invalidControlNodes);
                             });
                         }
@@ -11895,6 +11880,7 @@
             this.controlService = controlService;
             this.questionFactroy = questionFactroy;
             this.controlRelationsFactory = controlRelationsFactory;
+            this.nodeIndex = 0;
             this.hd = {
                 getValue: function () {
                     return 20;
@@ -11936,6 +11922,8 @@
             else {
                 node = this.createLeafNode(question, parentNode, parentControl, form);
             }
+            node.nodeIndex = this.nodeIndex;
+            this.nodeIndex++;
             return node;
         };
         FormFactory.prototype.createLeafNode = function (question, parentNode, parentControl, form) {
@@ -12017,16 +12005,19 @@
 
     var ObsAdapterHelper = /** @class */ (function () {
         function ObsAdapterHelper() {
+            this.formFieldNamespace = 'O3';
+            this.obsIndex = 0;
         }
         ObsAdapterHelper.prototype.findObsAnswerToQuestion = function (node, obsArray) {
             var _this = this;
+            // Find and Order the obs based on form_namespace_and_path
             var found = [];
             if (!this.isObsNode(node)) {
                 return found;
             }
             if (node instanceof LeafNode ||
                 (node instanceof GroupNode && node.question.extras.type === 'complex-obs')) {
-                ___default["default"].each(obsArray, function (item) {
+                ___default['default'].each(obsArray, function (item) {
                     if (item.concept &&
                         item.concept.uuid === node.question.extras.questionOptions.concept) {
                         found.push(item);
@@ -12037,7 +12028,7 @@
             // At this point the node is either a group or a repeating node
             var childQuestionsUuids = this.getChildQuestionsConceptUuids(node);
             if (childQuestionsUuids.length > 0) {
-                ___default["default"].each(obsArray, function (obs) {
+                ___default['default'].each(obsArray, function (obs) {
                     if (obs.concept &&
                         obs.concept.uuid === node.question.extras.questionOptions.concept &&
                         Array.isArray(obs.groupMembers) &&
@@ -12051,7 +12042,7 @@
         ObsAdapterHelper.prototype.getChildQuestionsConceptUuids = function (node) {
             var found = [];
             if (node.question.extras && node.question.extras.questions) {
-                ___default["default"].each(node.question.extras.questions, function (question) {
+                ___default['default'].each(node.question.extras.questions, function (question) {
                     if (question.questionOptions && question.questionOptions.concept) {
                         found.push(question.questionOptions.concept);
                     }
@@ -12062,7 +12053,7 @@
         ObsAdapterHelper.prototype.getGroupMembersConceptUuids = function (obsWithGroupMembers) {
             var found = [];
             if (Array.isArray(obsWithGroupMembers.groupMembers)) {
-                ___default["default"].each(obsWithGroupMembers.groupMembers, function (member) {
+                ___default['default'].each(obsWithGroupMembers.groupMembers, function (member) {
                     found.push(member.concept.uuid);
                 });
             }
@@ -12098,8 +12089,9 @@
             }
         };
         ObsAdapterHelper.prototype.setMultiselectObsNodeValue = function (node, obs) {
-            var e_1, _a;
+            var e_1, _b;
             if (node && obs.length > 0) {
+                obs = obs.sort(this.comparePath);
                 node.initialValue = obs;
                 var obsUuids = [];
                 try {
@@ -12111,7 +12103,7 @@
                 catch (e_1_1) { e_1 = { error: e_1_1 }; }
                 finally {
                     try {
-                        if (obs_1_1 && !obs_1_1.done && (_a = obs_1.return)) _a.call(obs_1);
+                        if (obs_1_1 && !obs_1_1.done && (_b = obs_1.return)) _b.call(obs_1);
                     }
                     finally { if (e_1) throw e_1.error; }
                 }
@@ -12157,6 +12149,7 @@
         ObsAdapterHelper.prototype.setRepeatingGroupObsNodeValue = function (node, obs) {
             if (node && obs.length > 0) {
                 var arrayNode = node;
+                obs = obs.sort(this.comparePath);
                 arrayNode.initialValue = obs;
                 for (var i = 0; i < obs.length; i++) {
                     var createdNode = arrayNode.createChildNode();
@@ -12164,6 +12157,12 @@
                 }
             }
         };
+        ObsAdapterHelper.prototype.comparePath = function (first, second) {
+            if (!first || !second) {
+                return -1;
+            }
+            return Number(first.formFieldPath) - Number(second.formFieldPath);
+        };
         ObsAdapterHelper.prototype.setNodeValue = function (node, obs) {
             switch (this.getObsNodeType(node)) {
                 case 'unknown':
@@ -12288,6 +12287,13 @@
                 delete obs.concept;
                 obs.uuid = node.initialValue.uuid;
             }
+            return this.addFieldNameSpaceandPath(node, obs);
+        };
+        ObsAdapterHelper.prototype.addFieldNameSpaceandPath = function (node, obs) {
+            var _a;
+            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;
+            this.obsIndex++;
             return obs;
         };
         ObsAdapterHelper.prototype.getComplexObsPayload = function (node) {
@@ -12324,11 +12330,12 @@
             return null;
         };
         ObsAdapterHelper.prototype.getMultiselectObsPayload = function (node) {
+            var _this = this;
             var payload = [];
             var existingUuids = [];
             // add voided obs i.e. deleted options
             if (Array.isArray(node.initialValue)) {
-                ___default["default"].each(node.initialValue, function (item) {
+                ___default['default'].each(node.initialValue, function (item) {
                     existingUuids.push(item.value.uuid);
                     if (Array.isArray(node.control.value)) {
                         if (node.control.value.indexOf(item.value.uuid) < 0) {
@@ -12349,12 +12356,12 @@
             }
             // add new obs i.e they didn't exisit originally
             if (Array.isArray(node.control.value)) {
-                ___default["default"].each(node.control.value, function (item) {
+                ___default['default'].each(node.control.value, function (item) {
                     if (existingUuids.indexOf(item) < 0) {
-                        payload.push({
+                        payload.push(_this.addFieldNameSpaceandPath(node, {
                             concept: node.question.extras.questionOptions.concept,
                             value: item
-                        });
+                        }));
                     }
                 });
             }
@@ -12364,7 +12371,7 @@
             var _this = this;
             var nodeAsGroup = node;
             var childrenPayload = [];
-            ___default["default"].each(nodeAsGroup.children, function (child) {
+            ___default['default'].each(nodeAsGroup.children, function (child) {
                 var payload = _this.getObsNodePayload(child);
                 if (payload.length > 0) {
                     childrenPayload = childrenPayload.concat(payload);
@@ -12383,6 +12390,7 @@
                 groupPayload.concept =
                     nodeAsGroup.question.extras.questionOptions.concept;
             }
+            this.addFieldNameSpaceandPath(node, groupPayload);
             return groupPayload;
         };
         ObsAdapterHelper.prototype.getRepeatingGroupPayload = function (node) {
@@ -12390,7 +12398,7 @@
             var nodeAsArray = node;
             var childrenPayload = [];
             var groupsUuidsAfterEditting = [];
-            ___default["default"].each(nodeAsArray.children, function (child) {
+            ___default['default'].each(nodeAsArray.children, function (child) {
                 var payload = _this.getObsNodePayload(child);
                 if (payload.length > 0) {
                     childrenPayload = childrenPayload.concat(payload);
@@ -12402,7 +12410,7 @@
             // void deleted groups
             // console.log('groupsUuidsAfterEditting', groupsUuidsAfterEditting);
             if (nodeAsArray.initialValue && Array.isArray(nodeAsArray.initialValue)) {
-                ___default["default"].each(nodeAsArray.initialValue, function (obs) {
+                ___default['default'].each(nodeAsArray.initialValue, function (obs) {
                     if (groupsUuidsAfterEditting.indexOf(obs.uuid) < 0) {
                         var voidedGroup = {
                             uuid: obs.uuid,
@@ -12494,7 +12502,7 @@
             return false;
         };
         ObsAdapterHelper.prototype.areDatesEqual = function (date1, date2) {
-            return moment__default["default"](date1).isSame(date2);
+            return moment__default['default'](date1).isSame(date2);
         };
         ObsAdapterHelper.prototype.isEmpty = function (value) {
             if (value === '' ||
@@ -12513,7 +12521,7 @@
             }
             else {
                 // transform value to moment value to avoid error
-                var formattedVal = moment__default["default"](datetime).format();
+                var formattedVal = moment__default['default'](datetime).format();
                 var val = formattedVal.substring(0, 19).replace('T', ' ');
                 return this.isEmpty(val) ? undefined : val;
             }
@@ -12566,7 +12574,7 @@
                         node.question.extras &&
                         node.question.renderingType === 'group') ||
                         forcegroup) {
-                        var groupObs = ___namespace.find(payload, function (o) {
+                        var groupObs = _.find(payload, function (o) {
                             return (o.concept.uuid === node.question.extras.questionOptions.concept &&
                                 o.groupMembers);
                         });
@@ -12620,7 +12628,7 @@
                 node.question.extras.questionOptions.rendering !== 'multiCheckbox') ||
                 node.question.extras.questionOptions.rendering !== 'checkbox' ||
                 node.question.extras.questionOptions.rendering !== 'multi-select') {
-                var obs = ___namespace.find(payload, function (o) {
+                var obs = _.find(payload, function (o) {
                     return o.concept.uuid === node.question.extras.questionOptions.concept;
                 });
                 if (obs) {
@@ -12636,7 +12644,7 @@
                 }
             }
             else {
-                var multiObs = ___namespace.filter(payload, function (o) {
+                var multiObs = _.filter(payload, function (o) {
                     return o.concept.uuid === node.question.extras.questionOptions.concept;
                 });
                 if (multiObs && multiObs.length > 0) {
@@ -12663,7 +12671,7 @@
             // set the usual obs value
             this.setObsValue(valueField, payload);
             // set the obs date
-            var obs = ___namespace.find(payload, function (o) {
+            var obs = _.find(payload, function (o) {
                 return o.concept.uuid === node.question.extras.questionOptions.concept;
             });
             if (obs) {
@@ -12692,7 +12700,7 @@
         };
         ObsValueAdapter.prototype.setRepeatingGroupValues = function (node, payload) {
             var e_3, _a;
-            var groupRepeatingObs = ___namespace.filter(payload, function (o) {
+            var groupRepeatingObs = _.filter(payload, function (o) {
                 var found = o.concept.uuid === node.question.extras.questionOptions.concept;
                 var intersect = false;
                 if (found && o.groupMembers) {
@@ -12702,7 +12710,7 @@
                     var schemaQuestions = node.question.questions.map(function (a) {
                         return a.extras.questionOptions.concept;
                     });
-                    intersect = ___namespace.intersection(obs, schemaQuestions).length > 0;
+                    intersect = _.intersection(obs, schemaQuestions).length > 0;
                 }
                 return found && intersect;
             });
@@ -12797,7 +12805,7 @@
             if (obs.question &&
                 obs.question.extras &&
                 obs.question.extras.questionOptions.rendering === 'group') {
-                var members = ___namespace.filter(this.getObsPayload(obs.groupMembers), function (o) {
+                var members = _.filter(this.getObsPayload(obs.groupMembers), function (o) {
                     return o.value !== '';
                 });
                 var mappedMembers = members.map(function (a) {
@@ -12857,7 +12865,7 @@
             var current = {};
             for (var key in value) {
                 if (value.hasOwnProperty(key)) {
-                    var groupQuestion = ___namespace.find(node.question.questions, {
+                    var groupQuestion = _.find(node.question.questions, {
                         key: key
                     });
                     var modelValue = value[key];
@@ -12950,7 +12958,7 @@
         ObsValueAdapter.prototype.leftOuterJoinArrays = function (first, second) {
             var unique = first.filter(function (obj) {
                 return !second.some(function (obj2) {
-                    return ___namespace.isEqual(obj.value, obj2.value);
+                    return _.isEqual(obj.value, obj2.value);
                 });
             });
             return unique;
@@ -13339,7 +13347,7 @@
                         dateVoided: o.auditInfo.dateVoided
                     };
                 });
-                return (existingOrders = ___namespace.filter(existingOrders, function (order) {
+                return (existingOrders = _.filter(existingOrders, function (order) {
                     if (order.voided === true || order.dateVoided) {
                         return false;
                     }
@@ -13502,8 +13510,8 @@
                     case 'encounterDatetime':
                         if (payload['encounterDatetime']) {
                             // console.log('date', payload['encounterDatetime']);
-                            node.control.setValue(moment__default["default"](payload['encounterDatetime']).toDate());
-                            node.initialValue = moment__default["default"](payload['encounterDatetime']).toDate();
+                            node.control.setValue(moment__default['default'](payload['encounterDatetime']).toDate());
+                            node.initialValue = moment__default['default'](payload['encounterDatetime']).toDate();
                         }
                         break;
                     case 'encounterProvider':
@@ -13547,7 +13555,7 @@
                     node.control.value !== '') {
                     switch (node.question.extras.type) {
                         case 'encounterDatetime':
-                            var dateValue = moment__default["default"](node.control.value).utcOffset(rootNode.form.valueProcessingInfo.utcOffset || '+0300');
+                            var dateValue = moment__default['default'](node.control.value).utcOffset(rootNode.form.valueProcessingInfo.utcOffset || '+0300');
                             payload['encounterDatetime'] = dateValue.format();
                             break;
                         case 'encounterProvider':
@@ -13906,15 +13914,15 @@
                         }
                         var locationUuid = (_b = (_a = node.form.dataSourcesContainer.dataSources) === null || _a === void 0 ? void 0 : _a.userLocation) === null || _b === void 0 ? void 0 : _b.uuid;
                         if (dataSource && locationUuid) {
-                            var startDate = moment__default["default"](appointmentDate)
+                            var startDate = moment__default['default'](appointmentDate)
                                 .startOf('week')
                                 .add(1, 'day')
                                 .format('YYYY-MM-DD');
-                            var endDate = moment__default["default"](appointmentDate)
+                            var endDate = moment__default['default'](appointmentDate)
                                 .endOf('week')
                                 .subtract(1, 'day')
                                 .format('YYYY-MM-DD');
-                            _this.today = moment__default["default"](appointmentDate).format('DD-MM-YYYY');
+                            _this.today = moment__default['default'](appointmentDate).format('DD-MM-YYYY');
                             // create 5 week days
                             var scheduledAppointments_1 = [];
                             var programTypes = [
@@ -13930,7 +13938,7 @@
                             var programTypeParams = programTypes.join();
                             for (var i = 1; i <= 5; i++) {
                                 scheduledAppointments_1.push({
-                                    date: moment__default["default"](appointmentDate)
+                                    date: moment__default['default'](appointmentDate)
                                         .startOf('week')
                                         .add(i, 'day')
                                         .format('DD-MM-YYYY'),
@@ -14403,19 +14411,19 @@
     };
 
     /* eslint-disable @angular-eslint/component-class-suffix, @angular-eslint/directive-class-suffix */
-    var Option = /** @class */ (function () {
+    var Option$1 = /** @class */ (function () {
         function Option() {
             this.inputClass = 'cds--select-option';
         }
         return Option;
     }());
-    Option.decorators = [
+    Option$1.decorators = [
         { type: i0.Directive, args: [{
                     // eslint-disable-next-line
                     selector: 'option'
                 },] }
     ];
-    Option.propDecorators = {
+    Option$1.propDecorators = {
         inputClass: [{ type: i0.HostBinding, args: ['class',] }]
     };
 
@@ -14444,8 +14452,8 @@
     }());
     SelectModule.decorators = [
         { type: i0.NgModule, args: [{
-                    declarations: [Select, Option, OptGroup],
-                    exports: [Select, Option, OptGroup],
+                    declarations: [Select, Option$1, OptGroup],
+                    exports: [Select, Option$1, OptGroup],
                     imports: [common.CommonModule, forms.FormsModule]
                 },] }
     ];
@@ -14865,7 +14873,6 @@
         return Pair;
     }());
 
-    exports.RenderingType = void 0;
     (function (RenderingType) {
         RenderingType[RenderingType["Form"] = 0] = "Form";
         RenderingType[RenderingType["Page"] = 1] = "Page";
@@ -14910,7 +14917,7 @@
     exports.NgxDateTimePickerModule = NgxDateTimePickerModule;
     exports.ObsAdapterHelper = ObsAdapterHelper;
     exports.ObsValueAdapter = ObsValueAdapter;
-    exports.Option = Option$1;
+    exports.Option = Option;
     exports.OrderValueAdapter = OrderValueAdapter;
     exports.Pair = Pair;
     exports.PersonAttribuAdapter = PersonAttribuAdapter;
@@ -14925,91 +14932,91 @@
     exports.UiSelectQuestion = UiSelectQuestion;
     exports.ValidationFactory = ValidationFactory;
     exports.ValidationModel = ValidationModel;
-    exports["ɵa"] = SelectModule;
-    exports["ɵb"] = Select;
-    exports["ɵba"] = OWL_DIALOG_SCROLL_STRATEGY;
-    exports["ɵbb"] = OWL_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY;
-    exports["ɵbc"] = OWL_DIALOG_SCROLL_STRATEGY_PROVIDER;
-    exports["ɵbd"] = OWL_DIALOG_DEFAULT_OPTIONS;
-    exports["ɵbe"] = OwlDialogService;
-    exports["ɵbf"] = OwlDialogConfig;
-    exports["ɵbg"] = OwlCalendarComponent;
-    exports["ɵbi"] = OWL_DATE_TIME_FORMATS;
-    exports["ɵbj"] = OwlDateTimeIntl;
-    exports["ɵbk"] = OWL_DATE_TIME_LOCALE;
-    exports["ɵbl"] = OWL_DATE_TIME_LOCALE_FACTORY;
-    exports["ɵbm"] = DateTimeAdapter;
-    exports["ɵbn"] = OwlTimerComponent;
-    exports["ɵbo"] = OwlDateTimeTriggerDirective;
-    exports["ɵbp"] = OWL_DATETIME_VALUE_ACCESSOR$1;
-    exports["ɵbq"] = OWL_DATETIME_VALIDATORS;
-    exports["ɵbr"] = OwlDateTimeInputDirective;
-    exports["ɵbs"] = OWL_DTPICKER_SCROLL_STRATEGY;
-    exports["ɵbt"] = OWL_DTPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY;
-    exports["ɵbu"] = OWL_DTPICKER_SCROLL_STRATEGY_PROVIDER;
-    exports["ɵbv"] = OwlDateTimeComponent;
-    exports["ɵbw"] = OwlDateTime;
-    exports["ɵbx"] = OWL_DATETIME_VALUE_ACCESSOR;
-    exports["ɵby"] = OwlDateTimeInlineComponent;
-    exports["ɵbz"] = OwlDateTimeContainerComponent;
-    exports["ɵc"] = Option;
-    exports["ɵca"] = owlDateTimePickerAnimations;
-    exports["ɵcb"] = OwlMultiYearViewComponent;
-    exports["ɵcc"] = OwlCalendarBodyComponent;
-    exports["ɵcd"] = OwlYearViewComponent;
-    exports["ɵce"] = OwlMonthViewComponent;
-    exports["ɵcf"] = OwlTimerBoxComponent;
-    exports["ɵcg"] = NumberFixedLenPipe;
-    exports["ɵch"] = NativeDateTimeModule;
-    exports["ɵci"] = OwlNativeDateTimeModule;
-    exports["ɵcj"] = NativeDateTimeAdapter;
-    exports["ɵck"] = OWL_NATIVE_DATE_TIME_FORMATS;
-    exports["ɵcl"] = NgxDatetimeComponent;
-    exports["ɵcm"] = CustomControlWrapperModule;
-    exports["ɵcn"] = CustomControlWrapperComponent;
-    exports["ɵco"] = CustomComponentWrapperModule;
-    exports["ɵcp"] = CustomComponentWrapperComponent;
-    exports["ɵcq"] = NgxTabSetModule;
-    exports["ɵcr"] = TabComponent;
-    exports["ɵcs"] = TabSetComponent;
-    exports["ɵct"] = HoverClassDirective;
-    exports["ɵcu"] = FormRendererComponent;
-    exports["ɵcv"] = AfeNgSelectComponent;
-    exports["ɵcw"] = AppointmentsOverviewComponent;
-    exports["ɵcx"] = HistoricalValueDirective;
-    exports["ɵcy"] = HistoricalFieldHelperService;
-    exports["ɵcz"] = ErrorRendererComponent;
-    exports["ɵd"] = OptGroup;
-    exports["ɵda"] = TimeAgoPipe;
-    exports["ɵdb"] = CollapseDirective;
-    exports["ɵdc"] = HidersDisablersFactory;
-    exports["ɵdd"] = ExpressionRunner;
-    exports["ɵde"] = DebugModeService;
-    exports["ɵdf"] = AlertsFactory;
-    exports["ɵe"] = NumberInputModule;
-    exports["ɵf"] = NumberInputComponent;
-    exports["ɵg"] = InputModule;
-    exports["ɵh"] = Label;
-    exports["ɵi"] = TextArea;
-    exports["ɵj"] = TextInput;
-    exports["ɵk"] = DatePickerComponent;
-    exports["ɵl"] = TimePickerComponent;
-    exports["ɵm"] = ModalComponent;
-    exports["ɵn"] = MomentPipe;
-    exports["ɵo"] = DateTimePickerComponent;
-    exports["ɵp"] = NgxRemoteSelectModule;
-    exports["ɵq"] = RemoteSelectComponent;
-    exports["ɵr"] = RemoteFileUploadModule;
-    exports["ɵs"] = SharedModule;
-    exports["ɵt"] = SecurePipe;
-    exports["ɵu"] = FileUploadComponent;
-    exports["ɵv"] = CheckboxModule;
-    exports["ɵw"] = CheckboxControlComponent;
-    exports["ɵx"] = OwlDateTimeModule;
-    exports["ɵy"] = OwlDialogModule;
-    exports["ɵz"] = OwlDialogContainerComponent;
+    exports.ɵa = SelectModule;
+    exports.ɵb = Select;
+    exports.ɵba = OWL_DIALOG_SCROLL_STRATEGY;
+    exports.ɵbb = OWL_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY;
+    exports.ɵbc = OWL_DIALOG_SCROLL_STRATEGY_PROVIDER;
+    exports.ɵbd = OWL_DIALOG_DEFAULT_OPTIONS;
+    exports.ɵbe = OwlDialogService;
+    exports.ɵbf = OwlDialogConfig;
+    exports.ɵbg = OwlCalendarComponent;
+    exports.ɵbi = OWL_DATE_TIME_FORMATS;
+    exports.ɵbj = OwlDateTimeIntl;
+    exports.ɵbk = OWL_DATE_TIME_LOCALE;
+    exports.ɵbl = OWL_DATE_TIME_LOCALE_FACTORY;
+    exports.ɵbm = DateTimeAdapter;
+    exports.ɵbn = OwlTimerComponent;
+    exports.ɵbo = OwlDateTimeTriggerDirective;
+    exports.ɵbp = OWL_DATETIME_VALUE_ACCESSOR;
+    exports.ɵbq = OWL_DATETIME_VALIDATORS;
+    exports.ɵbr = OwlDateTimeInputDirective;
+    exports.ɵbs = OWL_DTPICKER_SCROLL_STRATEGY;
+    exports.ɵbt = OWL_DTPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY;
+    exports.ɵbu = OWL_DTPICKER_SCROLL_STRATEGY_PROVIDER;
+    exports.ɵbv = OwlDateTimeComponent;
+    exports.ɵbw = OwlDateTime;
+    exports.ɵbx = OWL_DATETIME_VALUE_ACCESSOR$1;
+    exports.ɵby = OwlDateTimeInlineComponent;
+    exports.ɵbz = OwlDateTimeContainerComponent;
+    exports.ɵc = Option$1;
+    exports.ɵca = owlDateTimePickerAnimations;
+    exports.ɵcb = OwlMultiYearViewComponent;
+    exports.ɵcc = OwlCalendarBodyComponent;
+    exports.ɵcd = OwlYearViewComponent;
+    exports.ɵce = OwlMonthViewComponent;
+    exports.ɵcf = OwlTimerBoxComponent;
+    exports.ɵcg = NumberFixedLenPipe;
+    exports.ɵch = NativeDateTimeModule;
+    exports.ɵci = OwlNativeDateTimeModule;
+    exports.ɵcj = NativeDateTimeAdapter;
+    exports.ɵck = OWL_NATIVE_DATE_TIME_FORMATS;
+    exports.ɵcl = NgxDatetimeComponent;
+    exports.ɵcm = CustomControlWrapperModule;
+    exports.ɵcn = CustomControlWrapperComponent;
+    exports.ɵco = CustomComponentWrapperModule;
+    exports.ɵcp = CustomComponentWrapperComponent;
+    exports.ɵcq = NgxTabSetModule;
+    exports.ɵcr = TabComponent;
+    exports.ɵcs = TabSetComponent;
+    exports.ɵct = HoverClassDirective;
+    exports.ɵcu = FormRendererComponent;
+    exports.ɵcv = AfeNgSelectComponent;
+    exports.ɵcw = AppointmentsOverviewComponent;
+    exports.ɵcx = HistoricalValueDirective;
+    exports.ɵcy = HistoricalFieldHelperService;
+    exports.ɵcz = ErrorRendererComponent;
+    exports.ɵd = OptGroup;
+    exports.ɵda = TimeAgoPipe;
+    exports.ɵdb = CollapseDirective;
+    exports.ɵdc = HidersDisablersFactory;
+    exports.ɵdd = ExpressionRunner;
+    exports.ɵde = DebugModeService;
+    exports.ɵdf = AlertsFactory;
+    exports.ɵe = NumberInputModule;
+    exports.ɵf = NumberInputComponent;
+    exports.ɵg = InputModule;
+    exports.ɵh = Label;
+    exports.ɵi = TextArea;
+    exports.ɵj = TextInput;
+    exports.ɵk = DatePickerComponent;
+    exports.ɵl = TimePickerComponent;
+    exports.ɵm = ModalComponent;
+    exports.ɵn = MomentPipe;
+    exports.ɵo = DateTimePickerComponent;
+    exports.ɵp = NgxRemoteSelectModule;
+    exports.ɵq = RemoteSelectComponent;
+    exports.ɵr = RemoteFileUploadModule;
+    exports.ɵs = SharedModule;
+    exports.ɵt = SecurePipe;
+    exports.ɵu = FileUploadComponent;
+    exports.ɵv = CheckboxModule;
+    exports.ɵw = CheckboxControlComponent;
+    exports.ɵx = OwlDateTimeModule;
+    exports.ɵy = OwlDialogModule;
+    exports.ɵz = OwlDialogContainerComponent;
 
     Object.defineProperty(exports, '__esModule', { value: true });
 
-}));
+})));
 //# sourceMappingURL=openmrs-ngx-formentry.umd.js.map