@ampath-kenya/ngx-openmrs-formentry 3.0.0-alpha9 → 3.0.0-ampath.1-beta.0

package/form-entry/data-sources/data-sources.d.ts

@@ -1,7 +1,7 @@
 export declare class DataSources {
     private _dataSources;
     constructor();
-    get dataSources(): any;
+    readonly dataSources: any;
     registerDataSource(key: string, dataSource: any, unWrap?: boolean): void;
     clearDataSource(key: string): void;
 }

package/form-entry/directives/historical-value-directive.d.ts

@@ -8,6 +8,6 @@ export declare class HistoricalValueDirective {
     historicalDisplay: string;
     constructor(historicalFieldHelper: HistoricalFieldHelperService);
     setValue(e: any): void;
-    private compareString;
-    set node(node: NodeBase);
+    private compareString(a, b);
+    node: NodeBase;
 }

package/form-entry/error-renderer/error-renderer.component.d.ts

@@ -10,7 +10,7 @@ export declare class ErrorRendererComponent implements OnInit {
     constructor(validationFactory: ValidationFactory, formErrorsService: FormErrorsService);
     ngOnInit(): void;
     showErrors(): boolean;
-    get errorNodes(): any;
+    readonly errorNodes: any;
     getControlError(node: LeafNode): string[];
     announceErrorField(errorNode: LeafNode): void;
     getPageIndex(node: NodeBase): number;

package/form-entry/expression-runner/expression-runner.d.ts

@@ -2,12 +2,12 @@ import { AfeFormControl, AfeFormArray, AfeFormGroup } from '../../abstract-contr
 import { Form } from '../form-factory/form';
 export declare class ExpressionRunner {
     getRunnable(expression: string, control: AfeFormArray | AfeFormGroup | AfeFormControl, helper: any, dataDependencies: any, form?: Form): Runnable;
-    private getControlRelationValueString;
-    private setControlArrayValues;
-    private _getFormControlKeys;
-    private _getValuesForKey;
-    private getHelperMethods;
-    private getDataDependencies;
+    private getControlRelationValueString(control, scope);
+    private setControlArrayValues(control, relationsForControl, scope);
+    private _getFormControlKeys(array);
+    private _getValuesForKey(key, array);
+    private getHelperMethods(obj, scope?);
+    private getDataDependencies(obj, scope?);
 }
 export interface Runnable {
     run(): any;

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

@@ -16,7 +16,7 @@ export declare class FormControlService {
     _generateFormGroupChildrenModel(questions: QuestionBase[], parentControl: AfeFormGroup, form?: Form): void;
     generateFormArray(question: QuestionBase, parentControl?: AfeFormGroup, form?: Form): AfeFormArray;
     generateFormControl(question: QuestionBase, parentControl?: AfeFormGroup, form?: Form): AfeFormControl;
-    private wireAlerts;
-    private wireHidersDisablers;
-    private wireCalculator;
+    private wireAlerts(question, control, form?);
+    private wireHidersDisablers(question, control, form?);
+    private wireCalculator(question, control, dataSource?);
 }

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

@@ -10,40 +10,39 @@ export declare type CreateArrayChildNodeFunction = (question: RepeatingQuestion,
 export interface RemoveArrayChildNodeFunction {
     (index: number, node: ArrayNode): any;
 }
-export declare abstract class NodeBase {
-    abstract children?: any;
+export declare class NodeBase {
+    children?: any;
     private _control;
     private _questionModel;
     private _form;
     private _path;
     initialValue: any;
     constructor(question: QuestionBase, control?: AfeFormControl | AfeFormArray | AfeFormGroup, form?: Form, parentPath?: string);
-    get question(): QuestionBase;
-    get control(): AfeFormControl | AfeFormArray | AfeFormGroup;
-    get form(): Form;
-    get path(): string;
+    readonly question: QuestionBase;
+    readonly control: AfeFormControl | AfeFormArray | AfeFormGroup;
+    readonly form: Form;
+    readonly path: string;
     removeAt(index: number): void;
     createChildNode(): void;
     removeChildNode(): void;
 }
 export declare class LeafNode extends NodeBase {
-    get children(): any;
     constructor(question: QuestionBase, control?: AfeFormControl | AfeFormArray | AfeFormGroup, parentControl?: AfeFormControl | AfeFormArray | AfeFormGroup, form?: Form, parentPath?: string);
 }
 export declare class GroupNode extends NodeBase {
     private _children;
     constructor(question: QuestionBase, control?: AfeFormControl | AfeFormArray | AfeFormGroup, parentControl?: AfeFormControl | AfeFormArray | AfeFormGroup, form?: Form, parentPath?: string);
-    get children(): any;
+    readonly children: any;
     setChild(key: string, node: NodeBase): void;
 }
 export declare class ArrayNode extends NodeBase implements ChildNodeCreatedListener {
-    private formFactory?;
+    private formFactory;
     private childNodeCreatedEvents;
     private _children;
     createChildFunc: CreateArrayChildNodeFunction;
     removeChildFunc: RemoveArrayChildNodeFunction;
     constructor(question: QuestionBase, control?: AfeFormControl | AfeFormArray | AfeFormGroup, parentControl?: AfeFormControl | AfeFormArray | AfeFormGroup, formFactory?: FormFactory, form?: Form, parentPath?: string);
-    get children(): GroupNode[];
+    readonly children: GroupNode[];
     createChildNode(): GroupNode;
     removeAt(index: number): void;
     addChildNodeCreatedListener(func: any): void;

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

@@ -12,17 +12,16 @@ export declare class Form {
     private _dataSourcesContainer;
     private _showErrors;
     constructor(schema: any, formFactory: FormFactory, questionFactory: QuestionFactory);
-    get dataSourcesContainer(): DataSources;
+    readonly dataSourcesContainer: DataSources;
     searchNodeByPath(node: GroupNode, path: any, found: Array<NodeBase>): NodeBase[];
     searchNodeByQuestionId(questionId: string, questionType?: string): Array<NodeBase>;
     searchNodeByQuestionType(rootNode: any, questionType: string, found: Array<NodeBase>): void;
-    private findNodesByQuestionId;
-    get valid(): boolean;
-    set showErrors(show: boolean);
-    get showErrors(): boolean;
+    private findNodesByQuestionId(rootNode, questionId, results);
+    readonly valid: boolean;
+    showErrors: boolean;
     markInvalidControls(node: GroupNode, invalidControlNodes?: any): any;
     updateHiddenDisabledStateForAllControls(): void;
     updateAlertsForAllControls(): void;
-    private _updateAlertsForAllControls;
-    private _updateHiddenDisabledStateForAllControls;
+    private _updateAlertsForAllControls(rootNode);
+    private _updateHiddenDisabledStateForAllControls(rootNode);
 }

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

@@ -3,6 +3,7 @@ import { TextAreaInputQuestion } from '../question-models/text-area-input-questi
 import { SelectQuestion } from '../question-models/select-question';
 import { UiSelectQuestion } from '../question-models/ui-select-question';
 import { DateQuestion } from '../question-models/date-question';
+import { TimeQuestion } from './../question-models/time-question';
 import { MultiSelectQuestion } from '../question-models/multi-select-question';
 import { QuestionGroup } from '../question-models/group-question';
 import { RepeatingQuestion } from '../question-models/repeating-question';
@@ -21,7 +22,9 @@ export declare class QuestionFactory {
     toSelectQuestion(schemaQuestion: any): SelectQuestion;
     toNumericQuestion(schemaQuestion: any): TextInputQuestion;
     toNumberQuestion(schemaQuestion: any): TextInputQuestion;
+    toDecimalQuestion(schemaQuestion: any): TextInputQuestion;
     toDateQuestion(schemaQuestion: any): DateQuestion;
+    toTimeQuestion(schemaQuestion: any): TimeQuestion;
     toEncounterDatetimeQuestion(schemaQuestion: any): DateQuestion;
     toCheckBoxQuestion(schemaQuestion: any): CheckBoxQuestion;
     toMultiCheckboxQuestion(schemaQuestion: any): MultiSelectQuestion;
@@ -40,6 +43,9 @@ export declare class QuestionFactory {
     toEncounterProviderQuestion(schemaQuestion: any): UiSelectQuestion;
     toFieldSetQuestion(schemaQuestion: any): QuestionGroup;
     toEncounterLocationQuestion(schemaQuestion: any): UiSelectQuestion;
+    toAmrsLocationsQuestion(schemaQuestion: any): UiSelectQuestion;
+    toSiblingLocationsQuestion(schemaQuestion: any): UiSelectQuestion;
+    toNonAmrsLocationsQuestion(schemaQuestion: any): UiSelectQuestion;
     toTestOrderQuestion(schemaQuestion: any): TestOrderQuestion;
     getSchemaQuestions(schema: any): any;
     getQuestions(schema: any, foundArray: any): any;
@@ -52,5 +58,5 @@ export declare class QuestionFactory {
     addCalculatorProperty(schemaQuestion: any, question: QuestionBase): any;
     addAlertProperty(schemaQuestion: any, question: QuestionBase): any;
     addDisableOrHideProperty(schemaQuestion: any, question: QuestionBase): any;
-    private generateId;
+    private generateId(x);
 }

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

@@ -6,17 +6,17 @@ import { QuestionBase } from '../question-models/question-base';
 export declare class ValidationFactory {
     constructor();
     getValidators(question: QuestionBase, form?: any): any[];
-    get conditionalRequiredValidator(): ConditionalRequiredValidator;
-    get conditionalAnsweredValidator(): ConditionalAnsweredValidator;
-    get requiredValidator(): any;
-    get dateValidator(): any;
-    get futureDateRestrictionValidator(): any;
-    get maxDateValidator(): any;
-    get minDateValidator(): any;
-    get minLengthValidator(): any;
-    get maxLengthValidator(): typeof Validators.maxLength;
+    readonly conditionalRequiredValidator: ConditionalRequiredValidator;
+    readonly conditionalAnsweredValidator: ConditionalAnsweredValidator;
+    readonly requiredValidator: any;
+    readonly dateValidator: any;
+    readonly futureDateRestrictionValidator: any;
+    readonly maxDateValidator: any;
+    readonly minDateValidator: any;
+    readonly minLengthValidator: any;
+    readonly maxLengthValidator: typeof Validators.maxLength;
     getMinValueValidator(min: number): any;
     getMaxValueValidator(max: number): any;
-    get jsExpressionValidator(): JsExpressionValidator;
+    readonly jsExpressionValidator: JsExpressionValidator;
     errors(errors: any, question: QuestionBase): Array<string>;
 }

package/form-entry/form-renderer/form-renderer.component.css.d.ts

@@ -1 +1 @@
-export declare const DEFAULT_STYLES = "a {\n      color: white;\n      text-decoration: none;\n      font-size: 12px;\n      text-transform: uppercase;\n    }\n\n    ul {\n      list-style-type: none;\n      margin: 2px auto;\n      position: relative;\n    }\n\n    li {\n      display: block;\n      padding: 10px 20px;\n      white-space: nowrap;\n      transition: all 0.3s ease-in;\n      border-bottom: 4px solid transparent;\n    }\n\n    li:hover {\n      border-bottom: 4px solid white;\n      opacity: 0.7;\n      cursor: pointer;\n    }\n\n    .owl-theme .owl-controls .owl-nav {\n      position: absolute;\n      width: 100%;\n      top: 0;\n    }\n\n    .owl-theme .owl-controls .owl-nav [class*=\"owl-\"] {\n      position: absolute;\n      background: none;\n      color: black;\n    }\n\n    .owl-theme .owl-controls .owl-nav [class*=\"owl-\"]:hover {\n      background: none;\n      color: black;\n    }\n\n    .owl-theme .owl-controls .owl-nav .owl-next {\n      right: 0;\n      transform: translate(120%);\n    }\n\n    .owl-theme .owl-controls .owl-nav .owl-prev {\n      left: 0;\n      transform: translate(-120%);\n    }\n\n    .slick-initialized .swipe-tab-content {\n      position: relative;\n      min-height: 365px;\n    }\n    @media screen and (min-width: 767px) {\n      .slick-initialized .swipe-tab-content {\n        min-height: 500px;\n      }\n    }\n    .slick-initialized .swipe-tab {\n      display: flex;\n      align-items: center;\n      justify-content: center;\n      height: 50px;\n      background: none;\n      border: 0;\n      color: #757575;\n      cursor: pointer;\n      text-align: center;\n      border-bottom: 2px solid rgba(51, 122, 183, 0);\n      transition: all 0.5s;\n    }\n    .slick-initialized .swipe-tab:hover {\n      color: #337AB7;\n    }\n    .slick-initialized .swipe-tab.active-tab {\n      border-bottom-color: #337AB7;\n      color: #337AB7;\n      font-weight: bold;\n    }\n\n    .disabled {\n      opacity: .5;\n      pointer-events: none;\n    }\n\n    .select2-container {\n      margin-top: -5px;\n    }\n\n    .btn {\n      padding: 0px 12px !important;\n    }\n\n    .form-tooltip{\n      color:rgb(51, 122, 183);\n      display: inline-block;\n    }\n    .question-info{\n          opacity:0;\n          height:0px;\n          display: none;\n          transition-duration: opacity 1s ease-out;\n          transtion-delay: 0.5s;\n          padding-top: 2px;\n          padding-bottom: 2px;\n          color: #696969;\n          border-style: ridge;\n          border-width: 1px;\n          border-color: #337ab7;\n          margin-top: 2px;\n    }\n    .hide-info{\n      display:none;\n      height:0px;\n    }\n    .form-tooltip:hover ~ .question-info {\n          display:block;\n          opacity:1;\n          height:auto;\n     }\n    .form-tooltip .tooltipcontent::after {\n          content: \" \";\n          position: absolute;\n          bottom: 100%;  /* At the top of the tooltip */\n          right: 0%;\n          margin-left: -5px;\n          border-width: 5px;\n          border-style: solid;\n          border-top-color: transparent;\n          border-right-color: transparent;\n          border-bottom-color: #337ab7;\n          border-left-color: transparent;\n }\n\n    ng-select.form-control {\n      padding-top: 0;\n      height: auto;\n      padding-bottom: 0;\n    }\n\n .forms-dropdown-menu {\n     max-height: 450px;\n     overflow-y: scroll;\n }\n .no-border {\n  border: 0;\n  box-shadow: none;\n}\n.text-danger{\n  color: var(--cds-support-01, #da1e28);\n}\n.error{\n  margin-bottom: 3rem;\n}\n.afe-control{\n  margin-bottom: 1.5rem;\n}\n[hidden] {\n  display: none !important;\n}\n    ";
+export declare const DEFAULT_STYLES = "a {\n      color: white;\n      text-decoration: none;\n      font-size: 12px;\n      text-transform: uppercase;\n    }\n\n    ul {\n      list-style-type: none;\n      margin: 2px auto;\n      position: relative;\n    }\n\n    li {\n      display: block;\n      padding: 10px 20px;\n      white-space: nowrap;\n      transition: all 0.3s ease-in;\n      border-bottom: 4px solid transparent;\n    }\n\n    li:hover {\n      border-bottom: 4px solid white;\n      opacity: 0.7;\n      cursor: pointer;\n    }\n\n    .owl-theme .owl-controls .owl-nav {\n      position: absolute;\n      width: 100%;\n      top: 0;\n    }\n\n    .owl-theme .owl-controls .owl-nav [class*=\"owl-\"] {\n      position: absolute;\n      background: none;\n      color: black;\n    }\n\n    .owl-theme .owl-controls .owl-nav [class*=\"owl-\"]:hover {\n      background: none;\n      color: black;\n    }\n\n    .owl-theme .owl-controls .owl-nav .owl-next {\n      right: 0;\n      transform: translate(120%);\n    }\n\n    .owl-theme .owl-controls .owl-nav .owl-prev {\n      left: 0;\n      transform: translate(-120%);\n    }\n\n    .slick-initialized .swipe-tab-content {\n      position: relative;\n      min-height: 365px;\n    }\n    @media screen and (min-width: 767px) {\n      .slick-initialized .swipe-tab-content {\n        min-height: 500px;\n      }\n      .time-control{\n        width:50%;\n      }\n    }\n    .slick-initialized .swipe-tab {\n      display: flex;\n      align-items: center;\n      justify-content: center;\n      height: 50px;\n      background: none;\n      border: 0;\n      color: #757575;\n      cursor: pointer;\n      text-align: center;\n      border-bottom: 2px solid rgba(51, 122, 183, 0);\n      transition: all 0.5s;\n    }\n    .slick-initialized .swipe-tab:hover {\n      color: #337AB7;\n    }\n    .slick-initialized .swipe-tab.active-tab {\n      border-bottom-color: #337AB7;\n      color: #337AB7;\n      font-weight: bold;\n    }\n\n    .disabled {\n      opacity: .5;\n      pointer-events: none;\n    }\n\n    .select2-container {\n      margin-top: -5px;\n    }\n\n    .btn {\n      padding: 0px 12px !important;\n    }\n\n    .form-tooltip{\n      color:rgb(51, 122, 183);\n      display: inline-block;\n    }\n    .question-info{\n          opacity:0;\n          height:0px;\n          display: none;\n          transition-duration: opacity 1s ease-out;\n          transtion-delay: 0.5s;\n          padding-top: 2px;\n          padding-bottom: 2px;\n          color: #696969;\n          border-style: ridge;\n          border-width: 1px;\n          border-color: #337ab7;\n          margin-top: 2px;\n    }\n    .hide-info{\n      display:none;\n      height:0px;\n    }\n    .form-tooltip:hover ~ .question-info {\n          display:block;\n          opacity:1;\n          height:auto;\n     }\n    .form-tooltip .tooltipcontent::after {\n          content: \" \";\n          position: absolute;\n          bottom: 100%;  /* At the top of the tooltip */\n          right: 0%;\n          margin-left: -5px;\n          border-width: 5px;\n          border-style: solid;\n          border-top-color: transparent;\n          border-right-color: transparent;\n          border-bottom-color: #337ab7;\n          border-left-color: transparent;\n }\n\n    ng-select.form-control {\n      padding-top: 0;\n      height: auto;\n      padding-bottom: 0;\n    }\n\n .forms-dropdown-menu {\n     max-height: 450px;\n     overflow-y: scroll;\n }\n .no-border {\n  border: 0;\n  box-shadow: none;\n}\n.time-control{\n  width:100%;\n}\n\n    ";

package/form-entry/form-renderer/form-renderer.component.d.ts

@@ -1,4 +1,5 @@
 import { OnInit } from '@angular/core';
+import 'hammerjs';
 import { DataSources } from '../data-sources/data-sources';
 import { NodeBase, LeafNode } from '../form-factory/form-node';
 import { AfeFormGroup } from '../../abstract-controls-extension/afe-form-group';
@@ -16,20 +17,17 @@ export declare class FormRendererComponent implements OnInit {
     childComponents: FormRendererComponent[];
     showTime: boolean;
     showWeeks: boolean;
+    showHolidays: boolean;
     activeTab: number;
     dataSource: DataSource;
     isCollapsed: boolean;
     auto: any;
-    followFocus: boolean;
-    cacheActive: boolean;
-    isNavigation: boolean;
-    type: string;
-    inlineDatePicker: Date;
     constructor(validationFactory: ValidationFactory, dataSources: DataSources, formErrorsService: FormErrorsService, document: any);
     ngOnInit(): void;
     addChildComponent(child: FormRendererComponent): void;
     setUpRemoteSelect(): void;
     setUpFileUpload(): void;
+    setUpDatepickerHolidays(): void;
     checkSection(node: NodeBase): boolean;
     clickTab(tabNumber: any): void;
     loadPreviousTab(): void;
@@ -44,5 +42,5 @@ export declare class FormRendererComponent implements OnInit {
     onDateChanged(node: LeafNode): void;
     upload(event: any): void;
     toggleInformation(infoId: any): void;
-    private getErrors;
+    private getErrors(node);
 }

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

@@ -9,7 +9,7 @@ export declare class JsExpressionHelper {
     extractRepeatingGroupValues(key: any, array: any): any;
     formatDate(value: any, format: any, offset: any): any;
     arrayContainsAny(array: any, members: any): boolean;
-    get helperFunctions(): {
+    readonly helperFunctions: {
         arrayContainsAny: (array: any, members: any) => boolean;
         calcBMI: (height: any, weight: any) => number;
         calcBMIForAgeZscore: (bmiForAgeRef: any, height: any, weight: any) => any;

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

@@ -3,5 +3,7 @@ import { DateQuestionOptions } from './interfaces/date-question-options';
 export declare class DateQuestion extends QuestionBase {
     showTime: boolean;
     showWeeksAdder: boolean;
+    showHolidays: boolean;
+    dataSource?: any;
     constructor(options: DateQuestionOptions);
 }

package/form-entry/question-models/decimal-point-validation.model.d.ts

@@ -0,0 +1,10 @@
+export declare class DecimalPointValidationModel {
+    type: string;
+    message: string;
+    decimalPlace: number;
+    failsWhenExpression: string;
+    constructor(validations: any);
+    setFailExpression(): void;
+    setMessage(): void;
+    setValuesAndExpressions(): void;
+}

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

@@ -24,4 +24,5 @@ export interface BaseOptions {
     historicalDisplay?: any;
     rows?: any;
     showWeeksAdder?: any;
+    showHolidays?: boolean;
 }

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

@@ -0,0 +1,3 @@
+import { BaseOptions } from '../interfaces/base-options';
+export interface TimeQuestionOptions extends BaseOptions {
+}

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

@@ -10,9 +10,11 @@ export declare class QuestionBase implements BaseOptions {
     hidden?: any;
     showTime?: any;
     showWeek?: any;
+    showDate?: boolean;
     historicalDisplay?: any;
     rows?: any;
     showWeeksAdder?: any;
+    showHolidays?: boolean;
     key: string;
     alert?: any;
     label?: string;
@@ -32,6 +34,8 @@ export declare class QuestionBase implements BaseOptions {
     disable?: string | boolean;
     calculateExpression?: string;
     options?: any;
+    maxTime?: string;
+    minTime?: string;
     constructor(options: BaseOptions);
     setHistoricalValue(v: boolean): void;
     showHistoricalEncounterDate(v?: boolean): void;

package/form-entry/question-models/rendering-type.d.ts

@@ -3,5 +3,5 @@ export declare enum RenderingType {
     Page = 1,
     Section = 2,
     Select = 3,
-    DropDown = 4
+    DropDown = 4,
 }

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

@@ -0,0 +1,5 @@
+import { QuestionBase } from './question-base';
+import { TimeQuestionOptions } from './interfaces/time-question-options';
+export declare class TimeQuestion extends QuestionBase {
+    constructor(options: TimeQuestionOptions);
+}

package/form-entry/services/form-errors.service.d.ts

@@ -1,4 +1,5 @@
-import { Subject, Observable } from 'rxjs';
+import { Subject } from 'rxjs';
+import { Observable } from 'rxjs';
 import { AfeFormControl } from '../../public_api';
 import { AfeFormArray, AfeFormGroup } from '../../abstract-controls-extension';
 export declare class FormErrorsService {

package/form-entry/services/form-schema-compiler.service.d.ts

@@ -1,20 +1,20 @@
 export declare class FormSchemaCompiler {
     constructor();
     compileFormSchema(formSchema: Object, referencedComponents: Array<any>): Object;
-    private findSchemaByName;
-    private getPageInSchemaByLabel;
-    private getSectionInSchemaByPageLabelBySectionLabel;
-    private getQuestionByIdInSchema;
-    private getQuestionsArrayByQuestionIdInSchema;
-    private getQuestionsArrayByQuestionId;
-    private isSchemaSubObjectExpandable;
-    private isQuestionObjectWithId;
-    private getAllPlaceholderObjects;
-    private extractPlaceholderObjects;
-    private fillPlaceholderObject;
-    private replaceAllPlaceholdersWithActualObjects;
-    private removeObjectFromArray;
-    private removeExcludedQuestionsFromPlaceholder;
-    private getReferencedObject;
-    private getReferencedForms;
+    private findSchemaByName(schemaArray, nameOfSchema);
+    private getPageInSchemaByLabel(schema, pageLabel);
+    private getSectionInSchemaByPageLabelBySectionLabel(schema, pageLabel, sectionLabel);
+    private getQuestionByIdInSchema(schema, questionId);
+    private getQuestionsArrayByQuestionIdInSchema(schema, questionId);
+    private getQuestionsArrayByQuestionId(parent, object, questionId);
+    private isSchemaSubObjectExpandable(object);
+    private isQuestionObjectWithId(object, id);
+    private getAllPlaceholderObjects(schema);
+    private extractPlaceholderObjects(subSchema, objectsArray);
+    private fillPlaceholderObject(placeHolderObject, referenceObject);
+    private replaceAllPlaceholdersWithActualObjects(keyValReferencedForms, placeHoldersArray);
+    private removeObjectFromArray(array, object);
+    private removeExcludedQuestionsFromPlaceholder(placeHolder);
+    private getReferencedObject(referenceData, keyValReferencedForms);
+    private getReferencedForms(formSchema, formSchemasLookupArray);
 }

package/form-entry/services/historical-encounter-data.service.d.ts

@@ -6,7 +6,7 @@ export declare class HistoricalEncounterDataService {
     getObject(name: string): any;
     getFirstValue(path: Array<string>, object: any): any;
     getAllValues(path: any, object: any, answers: any): void;
-    private _transformEncounter;
-    private _transformObs;
-    private _augumentObs;
+    private _transformEncounter(encounter);
+    private _transformObs(obs);
+    private _augumentObs(existing, toAdd);
 }

package/form-entry/utils/messages.d.ts

@@ -1,11 +1,11 @@
 export declare class Messages {
-    static readonly REQUIRED_FIELD_MSG = "This field is required!";
-    static readonly INVALID_DATE_MSG = "Provided date is invalid!";
-    static readonly FUTURE_DATE_RESTRICTION_MSG = "Future date is not allowed!";
-    static readonly MIN_LENGTH_MSG = "Min Length should be {minLength}";
-    static readonly MAX_LENGTH_MSG = "Max Length should be {maxLength}";
-    static readonly MAX_DATE_MSG = "Max Date should be {maxDate}";
-    static readonly MIN_DATE_MSG = "Min Date should be {minDate}";
-    static readonly MAX_MSG = "Max value should be {max}";
-    static readonly MIN_MSG = "Min value should be {min}";
+    static readonly REQUIRED_FIELD_MSG: string;
+    static readonly INVALID_DATE_MSG: string;
+    static readonly FUTURE_DATE_RESTRICTION_MSG: string;
+    static readonly MIN_LENGTH_MSG: string;
+    static readonly MAX_LENGTH_MSG: string;
+    static readonly MAX_DATE_MSG: string;
+    static readonly MIN_DATE_MSG: string;
+    static readonly MAX_MSG: string;
+    static readonly MIN_MSG: string;
 }

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

@@ -18,6 +18,6 @@ export declare class EncounterAdapter implements ValueAdapter {
     setPayloadEncounterTypeUuid(payload: any, encounterTypeUuid: string): void;
     setPayloadFormUuid(payload: any, formUuid: string): void;
     setPayloadEncounterUuid(payload: any, encounterUuid: string): void;
-    private _getEncounterNodes;
-    private _isEncounterNode;
+    private _getEncounterNodes(rootNode, array);
+    private _isEncounterNode(node);
 }

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

@@ -5,13 +5,13 @@ export declare class OrderValueAdapter implements ValueAdapter {
     private provider;
     generateFormPayload(form: Form): any;
     populateForm(form: Form, payload: any): void;
-    private _setOrderProvider;
-    private _createOrdersPayload;
-    private _getExistingOrders;
-    private _setOrderValues;
-    private _addDeletedOrdersToPayload;
-    private _createPayloadOrder;
-    private _getDeletedOrders;
-    private _setOrderNodeValues;
-    private _findTestOrderQuestionNodes;
+    private _setOrderProvider(form);
+    private _createOrdersPayload(orderNodes, form);
+    private _getExistingOrders(form);
+    private _setOrderValues(node, existingOrders);
+    private _addDeletedOrdersToPayload(deletedOrders, payload);
+    private _createPayloadOrder(orderConcept, quesitonExtras);
+    private _getDeletedOrders(selectedOrders, existingOrders);
+    private _setOrderNodeValues(node, orders);
+    private _findTestOrderQuestionNodes(formNode);
 }

package/form-entry/value-adapters/person-attribute.adapter.d.ts

@@ -8,5 +8,5 @@ export declare class PersonAttribuAdapter implements ValueAdapter {
     populateForm(form: Form, payload: any): void;
     populateNode(rootNode: NodeBase, payload: any): void;
     getPersonAttributeNodes(rootNode: NodeBase): Array<NodeBase>;
-    private _getPersonAttributesNodes;
+    private _getPersonAttributesNodes(rootNode, array);
 }

package/package.json

@@ -1,33 +1,35 @@
 {
   "name": "@ampath-kenya/ngx-openmrs-formentry",
-  "version": "3.0.0-alpha9",
-  "dependencies": {
-    "tslib": "^2.0.0"
-  },
+  "version": "3.0.0-ampath.1-beta.0",
   "peerDependencies": {
-    "@angular/animations": ">=11.2.14 <=12.0.4",
-    "@angular/cdk": ">=11.2.13 <=12.0.4",
-    "@angular/common": ">=11.2.14 <=12.0.4",
-    "@angular/compiler": ">=11.2.14 <=12.0.4",
-    "@angular/core": ">=11.2.14 <=12.0.4",
-    "@angular/forms": ">=11.2.14 <=12.0.4",
+    "@angular/common": "^6.1.0",
+    "@angular/core": "^6.1.0",
     "hammerjs": "^2.0.8",
+    "jquery": "^3.1.1",
     "lodash": "^4.17.4",
     "moment": "^2.17.1",
-    "@ng-select/ng-select": "^6.1.0",
+    "@ng-select/ng-select": "^2.13.1",
+    "ngx-bootstrap": "next",
+    "pdfmake": "0.1.40",
+    "jspdf": "^1.5.3",
+    "ngx-file-uploader": "0.0.18",
     "ngx-webcam": "^0.2.2",
     "reflect-metadata": "^0.1.9",
     "shelljs": "^0.7.0",
     "slick-carousel": "^1.6.0",
-    "tree-model": "^1.0.5",
-    "carbon-components": "^10.36.0"
+    "tree-model": "^1.0.5"
   },
   "main": "bundles/ampath-kenya-ngx-openmrs-formentry.umd.js",
-  "module": "fesm2015/ampath-kenya-ngx-openmrs-formentry.js",
+  "module": "fesm5/ampath-kenya-ngx-openmrs-formentry.js",
   "es2015": "fesm2015/ampath-kenya-ngx-openmrs-formentry.js",
+  "esm5": "esm5/ampath-kenya-ngx-openmrs-formentry.js",
   "esm2015": "esm2015/ampath-kenya-ngx-openmrs-formentry.js",
+  "fesm5": "fesm5/ampath-kenya-ngx-openmrs-formentry.js",
   "fesm2015": "fesm2015/ampath-kenya-ngx-openmrs-formentry.js",
   "typings": "ampath-kenya-ngx-openmrs-formentry.d.ts",
   "metadata": "ampath-kenya-ngx-openmrs-formentry.metadata.json",
-  "sideEffects": false
-}
+  "sideEffects": false,
+  "dependencies": {
+    "tslib": "^1.9.0"
+  }
+}

package/public_api.d.ts

@@ -1 +1,50 @@
-export * from './lib/index';
+export { FormEntryModule } from './form-entry/form-entry.module';
+export { AfeFormControl } from './abstract-controls-extension/afe-form-control';
+export { AfeFormGroup } from './abstract-controls-extension/afe-form-group';
+export { AfeFormArray } from './abstract-controls-extension/afe-form-array';
+export { AfeControlType } from './abstract-controls-extension/afe-control-type';
+export { EncounterPdfViewerService } from './encounter-viewer/encounter-pdf-viewer.service';
+export { ControlRelationsFactory } from './form-entry/form-factory/control-relations.factory';
+export { FormControlService } from './form-entry/form-factory/form-control.service';
+export { FormFactory } from './form-entry/form-factory/form.factory';
+export { Form } from './form-entry/form-factory/form';
+export { QuestionFactory } from './form-entry/form-factory/question.factory';
+export { ValidationFactory } from './form-entry/form-factory/validation.factory';
+export { FormSchemaCompiler } from './form-entry/services/form-schema-compiler.service';
+export { HistoricalEncounterDataService } from './form-entry/services/historical-encounter-data.service';
+export { FormErrorsService } from './form-entry/services/form-errors.service';
+export { EncounterAdapter } from './form-entry/value-adapters/encounter.adapter';
+export { PersonAttribuAdapter } from './form-entry/value-adapters/person-attribute.adapter';
+export { OrderValueAdapter } from './form-entry/value-adapters/order.adapter';
+export { ObsValueAdapter } from './form-entry/value-adapters/obs.adapter';
+export { ObsAdapterHelper } from './form-entry/value-adapters/obs-adapter-helper';
+export { ValueAdapter } from './form-entry/value-adapters/value.adapter';
+export { DataSources } from './form-entry/data-sources/data-sources';
+export { CheckBoxQuestion } from './form-entry/question-models/checkbox.model';
+export { ConditionalValidationModel } from './form-entry/question-models/conditional-validation.model';
+export { DateQuestion } from './form-entry/question-models/date-question';
+export { DateValidationModel } from './form-entry/question-models/date-validation.model';
+export { FileUploadQuestion } from './form-entry/question-models/file-upload-question';
+export { QuestionGroup } from './form-entry/question-models/group-question';
+export { JsExpressionValidationModel } from './form-entry/question-models/js-expression-validation.model';
+export { MaxValidationModel } from './form-entry/question-models/max-validation.model';
+export { MinValidationModel } from './form-entry/question-models/min-validation.model';
+export { MultiSelectQuestion } from './form-entry/question-models/multi-select-question';
+export { Pair } from './form-entry/question-models/pair.model';
+export { QuestionBase } from './form-entry/question-models/question-base';
+export { RenderingType } from './form-entry/question-models/rendering-type';
+export { RepeatingQuestion } from './form-entry/question-models/repeating-question';
+export { Option } from './form-entry/question-models/select-option';
+export { SelectQuestion } from './form-entry/question-models/select-question';
+export { TestOrderQuestion } from './form-entry/question-models/test-order-question';
+export { TextAreaInputQuestion } from './form-entry/question-models/text-area-input-question';
+export { TextInputQuestion } from './form-entry/question-models/text-input-question';
+export { UiSelectQuestion } from './form-entry/question-models/ui-select-question';
+export { ValidationModel } from './form-entry/question-models/validation.model';
+export { BaseOptions } from './form-entry/question-models/interfaces/base-options';
+export { RepeatingQuestionOptions } from './form-entry/question-models/interfaces/repeating-question-options';
+export { GroupQuestionOptions } from './form-entry/question-models/interfaces/group-question-options';
+export { NestedQuestion } from './form-entry/question-models/interfaces/nested-questions';
+export { DateTimePickerModule } from './components/date-time-picker/date-time-picker.module';
+export { NgxDateTimePickerModule } from './components/ngx-date-time-picker/ngx-date-time-picker.module';
+export { JsExpressionHelper } from './form-entry/helpers/js-expression-helper';

package/components/input/input.directive.d.ts

@@ -1,28 +0,0 @@
-/**
- * A directive for applying styling to an input element.
- *
- * Example:
- *
- * ```html
- * <input ibmText/>
- * ```
- *
- * See the [vanilla carbon docs](http://www.carbondesignsystem.com/components/text-input/code) for more detail.
- */
-export declare class TextInput {
-    /**
-     * `light` or `dark` input theme
-     */
-    theme: "light" | "dark";
-    /**
-     * Input field render size
-     */
-    size: "sm" | "md" | "xl";
-    inputClass: boolean;
-    get isSizeXl(): boolean;
-    get isSizeSm(): boolean;
-    invalid: boolean;
-    warn: boolean;
-    skeleton: boolean;
-    get isLightTheme(): boolean;
-}

package/components/input/input.module.d.ts

@@ -1,2 +0,0 @@
-export declare class InputModule {
-}