@openmrs/ngx-formentry 3.0.1-pre.94 → 3.1.1-pre.177

package/form-entry/form-factory/form.d.ts

@@ -2,6 +2,7 @@ import { FormFactory } from './form.factory';
 import { QuestionFactory } from './question.factory';
 import { DataSources } from '../data-sources/data-sources';
 import { NodeBase, GroupNode } from './form-node';
+import { Diagnosis } from '../value-adapters/diagnosis.adapter';
 export declare class Form {
     schema: any;
     formFactory: FormFactory;
@@ -9,6 +10,7 @@ export declare class Form {
     rootNode: GroupNode;
     valueProcessingInfo: any;
     existingOrders: any;
+    existingDiagnoses: Array<Diagnosis>;
     private _dataSourcesContainer;
     private _showErrors;
     constructor(schema: any, formFactory: FormFactory, questionFactory: QuestionFactory);

package/form-entry/form-factory/question.factory.d.ts

@@ -14,6 +14,7 @@ import { HistoricalHelperService } from '../helpers/historical-expression-helper
 import { Form } from './form';
 import { CheckBoxQuestion } from '../question-models/models';
 import { RadioButtonQuestion } from '../question-models/models';
+import { DiagnosisQuestion } from '../question-models/diagnosis-question';
 import * as i0 from "@angular/core";
 export declare class QuestionFactory {
     dataSources: any;
@@ -45,6 +46,7 @@ export declare class QuestionFactory {
     toFieldSetQuestion(schemaQuestion: any): QuestionGroup;
     toEncounterLocationQuestion(schemaQuestion: any): UiSelectQuestion;
     toTestOrderQuestion(schemaQuestion: any): TestOrderQuestion;
+    toDiagnosisQuestion(schemaQuestion: any): DiagnosisQuestion;
     getSchemaQuestions(schema: any): any;
     getQuestions(schema: any, foundArray: any): any;
     getChildrenQuestionModels(schema: any): any;

package/form-entry/form-factory/validation.factory.d.ts

@@ -1,4 +1,3 @@
-import { Validators } from '@angular/forms';
 import { ConditionalRequiredValidator } from '../validators/conditional-required.validator';
 import { ConditionalAnsweredValidator } from '../validators/conditional-answered.validator';
 import { JsExpressionValidator } from '../validators/js-expression.validator';
@@ -14,8 +13,12 @@ export declare class ValidationFactory {
     get futureDateRestrictionValidator(): any;
     get maxDateValidator(): any;
     get minDateValidator(): any;
-    get minLengthValidator(): any;
-    get maxLengthValidator(): typeof Validators.maxLength;
+    minLengthValidator(minLength: number): (control: import("../../abstract-controls-extension/afe-form-control").AfeFormControl) => {
+        [key: string]: any;
+    };
+    maxLengthValidator(maxLength: number): (control: import("../../abstract-controls-extension/afe-form-control").AfeFormControl) => {
+        [key: string]: any;
+    };
     getMinValueValidator(min: number): any;
     getMaxValueValidator(max: number): any;
     get jsExpressionValidator(): JsExpressionValidator;

package/form-entry/helpers/js-expression-helper.d.ts

@@ -5,24 +5,32 @@ export declare class JsExpressionHelper {
     calcBMIForAgeZscore(bmiForAgeRef: any, height: any, weight: any): any;
     calcWeightForHeightZscore(weightForHeightRef: any, height: any, weight: any): any;
     calcHeightForAgeZscore(heightForAgeRef: any, height: any, weight: any): any;
-    calcSouthEastAsiaNonLabCVDRisk(sex: 'M' | 'F', smoker: boolean, age: number, sbp: number, bmi: number): number;
+    calcSouthEastAsiaNonLabCVDRisk(sex: 'M' | 'F', smoker?: boolean, age?: number, sbp?: number, bmi?: number): number;
     isEmpty(val: any): boolean;
     arrayContains(array: any, members: any): boolean;
     extractRepeatingGroupValues(key: any, array: any): any;
     formatDate(value: any, format: any, offset: any): any;
     arrayContainsAny(array: any, members: any): boolean;
-    extractObsValue(rawEncounter: any, uuid: any, alternateControl?: any): any;
+    /**
+     * Takes a target control, an encounter and concept uuid. If the target control has a value it returns it
+     * otherwise it tries to find it in the encounter. Finally it returns null of it can't find either of them.
+     * @param targetControl
+     * @param rawEncounter
+     * @param uuid
+     * @returns
+     */
+    getObsFromControlOrEncounter(targetControl: any, rawEncounter: any, uuid: any): any;
     get helperFunctions(): {
         arrayContainsAny: (array: any, members: any) => boolean;
         calcBMI: (height: any, weight: any) => number;
         calcBMIForAgeZscore: (bmiForAgeRef: any, height: any, weight: any) => any;
         calcWeightForHeightZscore: (weightForHeightRef: any, height: any, weight: any) => any;
         calcHeightForAgeZscore: (heightForAgeRef: any, height: any, weight: any) => any;
-        calcSouthEastAsiaNonLabCVDRisk: (sex: "M" | "F", smoker: boolean, age: number, sbp: number, bmi: number) => number;
+        calcSouthEastAsiaNonLabCVDRisk: (sex: "M" | "F", smoker?: boolean, age?: number, sbp?: number, bmi?: number) => number;
         isEmpty: (val: any) => boolean;
         arrayContains: (array: any, members: any) => boolean;
         extractRepeatingGroupValues: (key: any, array: any) => any;
-        extractObsValue: (rawEncounter: any, uuid: any, alternateControl?: any) => any;
+        getObsFromControlOrEncounter: (targetControl: any, rawEncounter: any, uuid: any) => any;
     };
     static ɵfac: i0.ɵɵFactoryDeclaration<JsExpressionHelper, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<JsExpressionHelper>;

package/form-entry/question-models/diagnosis-question.d.ts

@@ -0,0 +1,8 @@
+import { QuestionBase } from './question-base';
+import { DiagnosisQuestionOptions } from './interfaces/diagnosis-question-options';
+export declare class DiagnosisQuestion extends QuestionBase {
+    rendering: string;
+    options: any[];
+    dataSource?: any;
+    constructor(options: DiagnosisQuestionOptions);
+}

package/form-entry/question-models/interfaces/diagnosis-question-options.d.ts

@@ -0,0 +1,7 @@
+import { BaseOptions } from '../interfaces/base-options';
+export interface DiagnosisQuestionOptions extends BaseOptions {
+    dataSource?: string;
+    rendering: string;
+    rank: number;
+    options?: Array<Record<string, string>>;
+}

package/form-entry/question-models/interfaces/select-question-options.d.ts

@@ -2,7 +2,7 @@ import { BaseOptions } from '../interfaces/base-options';
 import { DataSource } from '../interfaces/data-source';
 export interface SelectQuestionOptions extends BaseOptions {
     options: {
-        key: string;
+        label: string;
         value: string;
     }[];
     dataSource?: DataSource;

package/form-entry/question-models/max-length-validation.model.d.ts

@@ -0,0 +1,5 @@
+import { ValidationModel } from './validation.model';
+export declare class MaxLengthValidationModel extends ValidationModel {
+    maxlength: number;
+    constructor(validations: any);
+}

package/form-entry/question-models/min-length-validation.model.d.ts

@@ -0,0 +1,5 @@
+import { ValidationModel } from './validation.model';
+export declare class MinLengthValidationModel extends ValidationModel {
+    minlength: number;
+    constructor(validations: any);
+}

package/form-entry/question-models/multi-select-question.d.ts

@@ -2,7 +2,7 @@ import { SelectQuestion } from './select-question';
 import { MultiSelectQuestionOptions } from './interfaces/multi-select-options';
 export declare class MultiSelectQuestion extends SelectQuestion {
     options: {
-        key: string;
+        label: string;
         value: string;
     }[];
     constructor(options: MultiSelectQuestionOptions);

package/form-entry/question-models/select-question.d.ts

@@ -2,7 +2,7 @@ import { QuestionBase } from './question-base';
 import { SelectQuestionOptions } from './interfaces/select-question-options';
 export declare class SelectQuestion extends QuestionBase {
     options: {
-        key: string;
+        label: string;
         value: string;
     }[];
     dataSource?: any;

package/form-entry/validators/max-length.validator.d.ts

@@ -0,0 +1,6 @@
+import { AfeFormControl } from '../../abstract-controls-extension/afe-form-control';
+export declare class MaxLengthValidator {
+    validate(maxLength: number): (control: AfeFormControl) => {
+        [key: string]: any;
+    };
+}

package/form-entry/validators/min-length.validator.d.ts

@@ -0,0 +1,6 @@
+import { AfeFormControl } from '../../abstract-controls-extension/afe-form-control';
+export declare class MinLengthValidator {
+    validate(minLength: number): (control: AfeFormControl) => {
+        [key: string]: any;
+    };
+}

package/form-entry/value-adapters/diagnosis.adapter.d.ts

@@ -0,0 +1,45 @@
+import { Form } from '../form-factory/form';
+import { ValueAdapter } from './value.adapter';
+import * as i0 from "@angular/core";
+export declare class DiagnosisValueAdapter implements ValueAdapter {
+    formDiagnosisNodes: any[];
+    generateFormPayload(form: Form): DiagnosisPayload[];
+    populateForm(form: Form, diagnoses: Array<Diagnosis>): void;
+    private _createDiagnosesPayload;
+    private _createPayloadDiagnosis;
+    private _getDeletedDiagnoses;
+    private _updatedOldDiagnoses;
+    private _setDiagnosesValues;
+    private _findDiagnosisQuestionNodes;
+    private _convert;
+    static ɵfac: i0.ɵɵFactoryDeclaration<DiagnosisValueAdapter, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<DiagnosisValueAdapter>;
+}
+export interface Diagnosis {
+    uuid?: string;
+    display?: string;
+    encounter?: string;
+    patient?: string;
+    diagnosis: {
+        coded?: {
+            uuid: string;
+            display?: string;
+        };
+        nonCoded?: string;
+    };
+    certainty: 'CONFIRMED' | 'PROVISIONAL';
+    rank: number;
+    voided?: boolean;
+}
+export interface DiagnosisPayload {
+    uuid?: string;
+    encounter?: string;
+    patient?: string;
+    diagnosis: {
+        coded?: string;
+        nonCoded?: string;
+    };
+    certainty: 'CONFIRMED' | 'PROVISIONAL';
+    rank: number;
+    voided?: boolean;
+}

package/form-entry/value-adapters/encounter.adapter.d.ts

@@ -3,11 +3,13 @@ import { Form } from '../form-factory/form';
 import { ValueAdapter } from './value.adapter';
 import { ObsValueAdapter } from './obs.adapter';
 import { OrderValueAdapter } from './order.adapter';
+import { DiagnosisValueAdapter } from './diagnosis.adapter';
 import * as i0 from "@angular/core";
 export declare class EncounterAdapter implements ValueAdapter {
     ordersAdapter: OrderValueAdapter;
+    diagnosesAdapter: DiagnosisValueAdapter;
     obsAdapter: ObsValueAdapter;
-    constructor(ordersAdapter: OrderValueAdapter, obsAdapter: ObsValueAdapter);
+    constructor(ordersAdapter: OrderValueAdapter, diagnosesAdapter: DiagnosisValueAdapter, obsAdapter: ObsValueAdapter);
     populateForm(form: Form, payload: any): void;
     populateNode(rootNode: NodeBase, payload: any): void;
     generateFormPayload(form: Form): {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/ngx-formentry",
-  "version": "3.0.1-pre.94",
+  "version": "3.1.1-pre.177",
   "dependencies": {
     "tslib": "^2.2.0"
   },
@@ -14,6 +14,7 @@
     "@angular/forms": ">=11.2.14 <=12.0.4",
     "@carbon/styles": "^1.11.0",
     "@ng-select/ng-select": "^6.1.0",
+    "@ngx-translate/core": "^13.0.0",
     "hammerjs": "^2.0.8",
     "lodash": "^4.17.4",
     "moment": "^2.17.1",

package/styles/ngx-formentry.css

@@ -78,7 +78,6 @@
 
 .ng-select .ng-select-container .ng-value-container {
   align-items: stretch;
-  padding: 0.4375em 0;
   border-top: 0.84375em solid transparent;
 }
 
@@ -97,14 +96,12 @@
 }
 
 .ng-select.ng-select-single .ng-select-container .ng-arrow-wrapper {
-  align-self: flex-end;
+  align-self: center;
   right: 4px;
-  top: -5px;
 }
 
 .ng-select.ng-select-single .ng-select-container .ng-clear-wrapper {
-  align-self: flex-end;
-  bottom: 7px;
+  align-self: center;
 }
 
 .ng-select.ng-select-multiple.ng-select-disabled
@@ -232,10 +229,15 @@
 }
 
 .ng-dropdown-panel {
+  margin-top: -1rem;
   background: #fff;
   left: 0;
 }
 
+.ng-select > .ng-dropdown-panel {
+  margin-top: 0;
+}
+
 .ng-dropdown-panel.ng-select-bottom {
   top: calc(100% - 1.25em);
   box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2),