@openmrs/ngx-formentry 18.0.1-pre.487 → 19.0.1-pre.492

package/fesm2022/openmrs-ngx-formentry.mjs

@@ -178,8 +178,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
             type: Injectable
         }] });
 
-// import { CanHide } from '../form-entry/control-hiders-disablers/can-hide';
-// import { CanDisable } from '../form-entry/control-hiders-disablers/can-disable';
 class ControlRelation {
     constructor(control, relatedTo) {
         this._control = control;
@@ -1827,14 +1825,21 @@ class JsExpressionHelper {
     formatDate(value, format, offset) {
         format = format || 'yyyy-MM-dd';
         offset = offset || '+0300';
-        if (!(value instanceof Date)) {
-            value = new Date(value);
-            if (value === null || value === undefined) {
-                throw new Error('DateFormatException: value passed ' + 'is not a valid date');
-            }
+        if (value === null || value === undefined || value === '') {
+            throw new Error('DateFormatException: value passed is not a valid date');
+        }
+        const date = moment(value);
+        if (!date.isValid()) {
+            throw new Error('DateFormatException: value passed is not a valid date');
+        }
+        if (offset) {
+            date.utcOffset(offset);
         }
-        return value; // TODO implement this
-        // return $filter('date')(value, format, offset);
+        const momentFormat = format
+            .replace(/yyyy/g, 'YYYY')
+            .replace(/yy/g, 'YY')
+            .replace(/dd/g, 'DD');
+        return date.format(momentFormat);
     }
     arrayContainsAny(array, members) {
         if (Array.isArray(members)) {
@@ -10654,6 +10659,20 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
 
 class FormSchemaCompiler {
     constructor() { }
+    isTestEnv() {
+        const globalRef = typeof globalThis !== 'undefined'
+            ? globalThis
+            : typeof window !== 'undefined'
+                ? window
+                : {};
+        return (typeof globalRef.jasmine !== 'undefined' ||
+            typeof globalRef.__karma__ !== 'undefined');
+    }
+    logError(message, payload) {
+        if (!this.isTestEnv()) {
+            console.error(message, payload);
+        }
+    }
     compileFormSchema(formSchema, referencedComponents) {
         // get all referenced forms
         const refForms = this.getReferencedForms(formSchema, referencedComponents);
@@ -10829,7 +10848,7 @@ class FormSchemaCompiler {
         _.each(placeHoldersArray, (placeHolder) => {
             const referencedObject = this.getReferencedObject(placeHolder.reference, keyValReferencedForms);
             if (_.isEmpty(referencedObject)) {
-                console.error('Form compile: Error finding referenced object', placeHolder.reference);
+                this.logError('Form compile: Error finding referenced object', placeHolder.reference);
             }
             else {
                 placeHolder = this.fillPlaceholderObject(placeHolder, referencedObject);
@@ -10861,11 +10880,11 @@ class FormSchemaCompiler {
     }
     getReferencedObject(referenceData, keyValReferencedForms) {
         if (_.isEmpty(referenceData.form)) {
-            console.error('Form compile: reference missing form attribute', referenceData);
+            this.logError('Form compile: reference missing form attribute', referenceData);
             return;
         }
         if (_.isEmpty(keyValReferencedForms[referenceData.form])) {
-            console.error('Form compile: referenced form alias not found', referenceData);
+            this.logError('Form compile: referenced form alias not found', referenceData);
             return;
         }
         if (!_.isEmpty(referenceData.questionId)) {
@@ -10877,7 +10896,7 @@ class FormSchemaCompiler {
         if (!_.isEmpty(referenceData.page)) {
             return this.getPageInSchemaByLabel(keyValReferencedForms[referenceData.form], referenceData.page);
         }
-        console.error('Form compile: Unsupported reference type', referenceData.reference);
+        this.logError('Form compile: Unsupported reference type', referenceData.reference);
     }
     getReferencedForms(formSchema, formSchemasLookupArray) {
         const referencedForms = formSchema.referencedForms;
@@ -12209,7 +12228,7 @@ class QuestionFactory {
         return question;
     }
     getSchemaQuestions(schema) {
-        const listQuestions = new Array();
+        const listQuestions = [];
         this.getQuestions(schema, listQuestions);
         return listQuestions;
     }
@@ -12546,9 +12565,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
         }], ctorParameters: () => [] });
 
 class FormFactory {
-    constructor(controlService, questionFactroy, controlRelationsFactory, translate) {
+    constructor(controlService, questionFactory, controlRelationsFactory, translate) {
         this.controlService = controlService;
-        this.questionFactroy = questionFactroy;
+        this.questionFactory = questionFactory;
         this.controlRelationsFactory = controlRelationsFactory;
         this.translate = translate;
         this.nodeIndex = 0;
@@ -12559,7 +12578,7 @@ class FormFactory {
         };
     }
     createForm(schema, dataSource) {
-        const form = new Form(schema, this, this.questionFactroy);
+        const form = new Form(schema, this, this.questionFactory);
         if (dataSource) {
             for (const key in dataSource) {
                 if (dataSource.hasOwnProperty(key)) {
@@ -12567,7 +12586,7 @@ class FormFactory {
                 }
             }
         }
-        const question = this.questionFactroy.createQuestionModel(schema, form);
+        const question = this.questionFactory.createQuestionModel(schema, form);
         form.rootNode = this.createNode(question, null, null, form);
         this.buildRelations(form.rootNode);
         form.updateHiddenDisabledStateForAllControls();
@@ -12656,7 +12675,7 @@ class FormFactory {
     removeArrayNodeChild(index, node) {
         const nodeToRemove = node.children[index];
         node.children.splice(index, 1);
-        if (node.control !== null || node.control !== undefined) {
+        if (node.control !== null && node.control !== undefined) {
             if (node.control instanceof AfeFormArray) {
                 const control = node.control;
                 const controlIndexToRemove = control.controls.indexOf(nodeToRemove.control);
@@ -13304,9 +13323,9 @@ class ObsValueAdapter {
             (node.question.extras.type === 'obs' ||
                 (node.question.extras.type === 'complex-obs-child' &&
                     node.question.extras.questionOptions.obsField === 'value')) &&
-            node.question.extras.questionOptions.rendering !== 'multiCheckbox') ||
-            node.question.extras.questionOptions.rendering !== 'checkbox' ||
-            node.question.extras.questionOptions.rendering !== 'multi-select') {
+            node.question.extras.questionOptions.rendering !== 'multiCheckbox' &&
+            node.question.extras.questionOptions.rendering !== 'checkbox' &&
+            node.question.extras.questionOptions.rendering !== 'multi-select')) {
             const obs = _.find(payload, (o) => {
                 return o.concept.uuid === node.question.extras.questionOptions.concept;
             });
@@ -13858,7 +13877,7 @@ class OrderValueAdapter {
         }
         return payload;
     }
-    _createPayloadOrder(orderConcept, quesitonExtras) {
+    _createPayloadOrder(orderConcept, questionExtras) {
         const order = {
             concept: '',
             type: '',
@@ -13866,9 +13885,9 @@ class OrderValueAdapter {
             careSetting: ''
         };
         order.concept = orderConcept;
-        order.type = quesitonExtras.questionOptions.orderType;
+        order.type = questionExtras.questionOptions.orderType;
         order.orderer = this.provider;
-        order.careSetting = quesitonExtras.questionOptions.orderSettingUuid;
+        order.careSetting = questionExtras.questionOptions.orderSettingUuid;
         // delete orderer if provider not provided
         if (order.orderer === '') {
             delete order.orderer;
@@ -14362,7 +14381,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
             type: Injectable
         }], ctorParameters: () => [{ type: OrderValueAdapter }, { type: DiagnosisValueAdapter }, { type: ObsValueAdapter }] });
 
-class PersonAttribuAdapter {
+class PersonAttributeAdapter {
     constructor() { }
     generateFormPayload(form) {
         return this.generateNodePayload(form.rootNode);
@@ -14440,10 +14459,10 @@ class PersonAttribuAdapter {
             });
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: PersonAttribuAdapter, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: PersonAttribuAdapter }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: PersonAttributeAdapter, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: PersonAttributeAdapter }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: PersonAttribuAdapter, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: PersonAttributeAdapter, decorators: [{
             type: Injectable
         }], ctorParameters: () => [] });
 
@@ -14981,7 +15000,6 @@ class FormEntryModule {
             InputModule,
             DateTimePickerModule,
             NgxRemoteSelectModule,
-            // NoopAnimationsModule,
             RemoteFileUploadModule,
             CheckboxModule,
             RadioModule,
@@ -15008,12 +15026,11 @@ class FormEntryModule {
             FormSchemaCompiler,
             FormFactory,
             QuestionFactory,
-            ValidationFactory,
             ControlRelationsFactory,
             ObsAdapterHelper,
             ObsValueAdapter,
             EncounterAdapter,
-            PersonAttribuAdapter,
+            PersonAttributeAdapter,
             OrderValueAdapter,
             DiagnosisValueAdapter,
             DebugModeService,
@@ -15026,7 +15043,6 @@ class FormEntryModule {
             InputModule,
             DateTimePickerModule,
             NgxRemoteSelectModule,
-            // NoopAnimationsModule,
             RemoteFileUploadModule,
             CheckboxModule,
             RadioModule,
@@ -15053,7 +15069,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
                         InputModule,
                         DateTimePickerModule,
                         NgxRemoteSelectModule,
-                        // NoopAnimationsModule,
                         RemoteFileUploadModule,
                         CheckboxModule,
                         RadioModule,
@@ -15087,12 +15102,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
                         FormSchemaCompiler,
                         FormFactory,
                         QuestionFactory,
-                        ValidationFactory,
                         ControlRelationsFactory,
                         ObsAdapterHelper,
                         ObsValueAdapter,
                         EncounterAdapter,
-                        PersonAttribuAdapter,
+                        PersonAttributeAdapter,
                         OrderValueAdapter,
                         DiagnosisValueAdapter,
                         DebugModeService,
@@ -15121,5 +15135,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { AfeControlType, AfeFormArray, AfeFormControl, AfeFormGroup, AfeNgSelectComponent, CheckBoxQuestion, ConditionalValidationModel, ControlRelationsFactory, DataSources, DatePickerComponent, DateQuestion, DateTimePickerComponent, DateTimePickerModule, DateValidationModel, EncounterAdapter, ErrorRendererComponent, FileUploadQuestion, Form, FormControlService, FormEntryModule, FormErrorsService, FormFactory, FormRendererComponent, FormSchemaCompiler, HistoricalEncounterDataService, JsExpressionHelper, JsExpressionValidationModel, MaxValidationModel, MinValidationModel, ModalComponent, MomentPipe, MultiSelectQuestion, NestedQuestion, NgxDateTimePickerModule, NgxDatetimeComponent, ObsAdapterHelper, ObsValueAdapter, Option, OrderValueAdapter, Pair, PatientIdentifierAdapter, PersonAttribuAdapter, QuestionBase, QuestionFactory, QuestionGroup, RenderingType, RepeatingQuestion, SelectQuestion, TestOrderQuestion, TextAreaInputQuestion, TextInputQuestion, TimePickerComponent, UiSelectQuestion, ValidationFactory, ValidationModel };
+export { AfeControlType, AfeFormArray, AfeFormControl, AfeFormGroup, AfeNgSelectComponent, CheckBoxQuestion, ConditionalValidationModel, ControlRelationsFactory, DataSources, DatePickerComponent, DateQuestion, DateTimePickerComponent, DateTimePickerModule, DateValidationModel, EncounterAdapter, ErrorRendererComponent, FileUploadQuestion, Form, FormControlService, FormEntryModule, FormErrorsService, FormFactory, FormRendererComponent, FormSchemaCompiler, HistoricalEncounterDataService, JsExpressionHelper, JsExpressionValidationModel, MaxValidationModel, MinValidationModel, ModalComponent, MomentPipe, MultiSelectQuestion, NestedQuestion, NgxDateTimePickerModule, NgxDatetimeComponent, ObsAdapterHelper, ObsValueAdapter, Option, OrderValueAdapter, Pair, PatientIdentifierAdapter, PersonAttributeAdapter, QuestionBase, QuestionFactory, QuestionGroup, RenderingType, RepeatingQuestion, SelectQuestion, TestOrderQuestion, TextAreaInputQuestion, TextInputQuestion, TimePickerComponent, UiSelectQuestion, ValidationFactory, ValidationModel };
 //# sourceMappingURL=openmrs-ngx-formentry.mjs.map