npm - @iapps/d2-web-sdk - Versions diffs - 1.0.11 → 1.0.13 - Mend

@iapps/d2-web-sdk 1.0.11 → 1.0.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (40) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@iapps/d2-web-sdk",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "dependencies": {
     "axios": "^1.8.1",
     "date-fns": "^4.1.0",

package/src/lib/modules/data-element/models/data-element.model.d.ts CHANGED Viewed

@@ -17,6 +17,7 @@ export declare class DataElement extends IdentifiableObject<DataElement> {
     optionSetValue?: boolean;
     optionSet?: OptionSet;
     programStageId?: string;
+    allowFutureDate?: boolean;
     isProgramStageRepeatable?: boolean;
     constructor(dataElement: Partial<DataElement>);
 }

package/src/lib/modules/data-element/models/data-element.model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"data-element.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/data-element/models/data-element.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,iDAA6C;AAC7C,4CAIyB;AAgBzB,MAAa,WAAY,SAAQ,2BAA+B;~~IAgC9D~~,YAAY,WAAiC;QAC3C,KAAK,CAAC,WAAW,CAAC,CAAC;QACnB,IAAI,WAAW,CAAC,cAAc,EAAE,CAAC;YAC/B,IAAI,CAAC,SAAS,GAAG,IAAI,sBAAS,CAAC,WAAW,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;;~~AArCH~~,~~kCAsCC~~;~~AArCQ~~,wBAAY,GAAG,cAAc,CAAC;AAC9B,gCAAoB,GAAG,aAAa,CAAC;AACrC,kBAAM,GAA0B;IACrC,GAAG,4BAAmB;IACtB,UAAU;IACV,WAAW;IACX,iBAAiB;IACjB,YAAY;IACZ,oBAAoB;IACpB,iBAAiB;IACjB,qBAAqB;IACrB,mBAAmB;IACnB,cAAc;IACd,gBAAgB;IAChB,WAAW;CACZ,CAAC"}
1	+ {"version":3,"file":"data-element.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/data-element/models/data-element.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,iDAA6C;AAC7C,4CAIyB;AAgBzB,MAAa,WAAY,SAAQ,2BAA+B;IAiC9D,YAAY,WAAiC;QAC3C,KAAK,CAAC,WAAW,CAAC,CAAC;QACnB,IAAI,WAAW,CAAC,cAAc,EAAE,CAAC;YAC/B,IAAI,CAAC,SAAS,GAAG,IAAI,sBAAS,CAAC,WAAW,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;;AAtCH,kCAuCC;AAtCQ,wBAAY,GAAG,cAAc,CAAC;AAC9B,gCAAoB,GAAG,aAAa,CAAC;AACrC,kBAAM,GAA0B;IACrC,GAAG,4BAAmB;IACtB,UAAU;IACV,WAAW;IACX,iBAAiB;IACjB,YAAY;IACZ,oBAAoB;IACpB,iBAAiB;IACjB,qBAAqB;IACrB,mBAAmB;IACnB,cAAc;IACd,gBAAgB;IAChB,WAAW;CACZ,CAAC"}

package/src/lib/modules/engine/program-rule/program-rule.engine.d.ts CHANGED Viewed

@@ -3,5 +3,6 @@ export declare class ProgramRuleEngine {
     dataValues: Record<string, unknown>;
     setRules(rules: any[]): this;
     setDataValues(dataValues: Record<string, unknown>): this;
+    getAssignedData(assignedDataExpression: string): string | undefined;
     execute(): any[];
 }

package/src/lib/modules/engine/program-rule/program-rule.engine.js CHANGED Viewed

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProgramRuleEngine = void 0;
 const lodash_1 = require("lodash");
 const utils_1 = require("./utils");
+const date_fns_1 = require("date-fns");
 // license that can be found in the LICENSE file.
 class ProgramRuleEngine {
     setRules(rules) {
@@ -12,9 +13,26 @@ class ProgramRuleEngine {
         return this;
     }
     setDataValues(dataValues) {
-        this.dataValues = dataValues;
+        const currentDate = (0, date_fns_1.format)(new Date(), 'yyyy-MM-dd');
+        this.dataValues = Object.assign(Object.assign({}, (dataValues || {})), { current_date: currentDate });
         return this;
     }
+    getAssignedData(assignedDataExpression) {
+        let assignedData = assignedDataExpression || '';
+        try {
+            Object.keys(this.dataValues).forEach((key) => {
+                assignedData = assignedData.replace(new RegExp(`{${key}}`, 'g'), `'${this.dataValues[key]}'`);
+            });
+            if (assignedData.includes('d2:')) {
+                assignedData = (0, utils_1.dhisD2Functions)(assignedData, {});
+            }
+        }
+        catch (err) {
+            console.warn('Problem processing assigned value', err);
+            return undefined;
+        }
+        return assignedData !== 'NaN' ? assignedData : undefined;
+    }
     execute() {
         return (0, lodash_1.flatten)((this.rules || []).map((rule) => {
             if (!rule) {
@@ -34,7 +52,15 @@ class ProgramRuleEngine {
             catch (e) {
                 //
             }
-            return (rule.actions || []).map((action) => (Object.assign(Object.assign({}, action), { actionType: evaluationResult ? action['actionType'] : '' })));
+            return (rule.actions || []).map((action) => {
+                const actionType = evaluationResult ? action['actionType'] : '';
+                let assignedData;
+                if (actionType === 'ASSIGN') {
+                    assignedData = this.getAssignedData(action['assignedData']);
+                }
+                return Object.assign(Object.assign({}, action), { assignedData,
+                    actionType });
+            });
         }));
     }
 }

package/src/lib/modules/engine/program-rule/program-rule.engine.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"program-rule.engine.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/engine/program-rule/program-rule.engine.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;;;AAErD,mCAAiC;AACjC,mCAA0C;~~AAE1C~~,iDAAiD;AACjD,MAAa,iBAAiB;IAI5B,QAAQ,CAAC,KAAY;QACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,CAAC,UAAmC;QAC/C,IAAI,CAAC,UAAU,~~GAAG~~,UAAU,CAAC;~~QAC7B~~,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,OAAO,IAAA,gBAAO,EACZ,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAC9B,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,IAAI,aAAa,GAAG,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC;YAEzC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC3C,aAAa,GAAG,aAAa,CAAC,OAAO,CACnC,IAAI,MAAM,CAAC,IAAI,GAAG,GAAG,EAAE,GAAG,CAAC,EAC3B,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAC5B,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClC,aAAa,GAAG,IAAA,uBAAe,EAAC,aAAa,EAAE,EAAE,CAAC,CAAC;YACrD,CAAC;YAED,IAAI,gBAAyB,CAAC;YAC9B,IAAI,CAAC;gBACH,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;YACzC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,EAAE;YACJ,CAAC;YAED,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAA+B,EAAE,EAAE,~~CAAC,iCAChE,~~MAAM,~~KACT,~~UAAU,~~EAAE~~,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,~~IACxD~~,CAAC,CAAC;~~QACN~~,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;CACF;~~AA/CD~~,~~8CA+CC~~"}
1	+ {"version":3,"file":"program-rule.engine.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/engine/program-rule/program-rule.engine.ts"],"names":[],"mappings":"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"}

package/src/lib/modules/event/models/event.model.js CHANGED Viewed

@@ -86,22 +86,20 @@ class DHIS2Event extends base_model_1.BaseTrackerSDKModel {
         const dataValueKeys = Object.keys(dataValueEntities);
         dataValueKeys.forEach((key) => {
             const dataValue = dataValueEntities[key];
-            if (dataValue && dataValue.length > 0) {
-                const field = (this.fields || {})[key];
-                switch (field === null || field === void 0 ? void 0 : field.type) {
-                    case 'DATA_ELEMENT':
-                        this.setDataValue({ dataElement: field.id, value: dataValue });
-                        break;
-                    case 'OCCURRED_DATE':
-                        this.occurredAt = dataValue;
-                        break;
-                    case 'SCHEDULED_DATE':
-                        this.scheduledAt = dataValue;
-                        break;
-                    case 'ORG_UNIT':
-                        this.orgUnit = dataValue;
-                        break;
-                }
+            const field = (this.fields || {})[key];
+            switch (field === null || field === void 0 ? void 0 : field.type) {
+                case 'DATA_ELEMENT':
+                    this.setDataValue({ dataElement: field.id, value: dataValue });
+                    break;
+                case 'OCCURRED_DATE':
+                    this.occurredAt = dataValue;
+                    break;
+                case 'SCHEDULED_DATE':
+                    this.scheduledAt = dataValue;
+                    break;
+                case 'ORG_UNIT':
+                    this.orgUnit = dataValue;
+                    break;
             }
         });
     }

package/src/lib/modules/event/models/event.model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"event.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/models/event.model.ts"],"names":[],"mappings":"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~~YACnD~~,~~IAAI,SAAS,IAAI,SAAS,CAAC,~~MAAM,~~GAAG,CAAC,EAAE,CAAC;gBACtC,MAAM,~~KAAK,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;~~gBACvC~~,QAAQ,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,EAAE,CAAC;~~oBACpB~~,KAAK,cAAc;~~wBACjB~~,IAAI,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;~~wBAC~~/D,MAAM;~~oBACR~~,KAAK,eAAe;~~wBAClB~~,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;~~wBAC5B~~,MAAM;~~oBACR~~,KAAK,gBAAgB;~~wBACnB~~,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;~~wBAC7B~~,MAAM;~~oBACR~~,KAAK,UAAU;~~wBACb~~,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;~~wBACzB~~,MAAM;~~gBACV~~,CAAC;~~YACH,CAAC;~~QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,SAAS,CAAC,MAAe;QACvB,IAAI,CAAC,MAAM,GAAG,MAAa,CAAC;IAC9B,CAAC;IAED,QAAQ;QACN,MAAM,UAAU,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE;YAC9D,OAAO,CAAC,IAAA,oBAAW,EAAC,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,KAAK,KAAK,EAAE,CAAC;QACjE,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,WAAW,EAAE,IAAI,CAAC,OAAO;YACzB,UAAU;YACV,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC7B,CAAC,CAAC;oBACE,GAAG,EAAE,IAAA,iBAAQ,EAAC,IAAI,CAAC,YAAuB,CAAC;wBACzC,CAAC,CAAE,IAAI,CAAC,YAAkC;wBAC1C,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG;iBAC1B;gBACH,CAAC,CAAC,SAAS;SACd,CAAC;IACJ,CAAC;CACF;~~AAhLD~~,~~gCAgLC~~"}
1	+ {"version":3,"file":"event.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/models/event.model.ts"],"names":[],"mappings":"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"}

package/src/lib/modules/event/queries/base-event.query.js CHANGED Viewed

@@ -114,6 +114,7 @@ class BaseEventQuery {
                         enrollment: this.enrollment,
                         program: this.program,
                         programStage: this.programStage,
+                        orgUnit: this.orgUnit,
                     }, { generateIdIfNotExists: true });
                     this.instance.fields = tslib_1.__classPrivateFieldGet(this, _BaseEventQuery_instances, "m", _BaseEventQuery_getFields).call(this, program, this.instance);
                 }
@@ -165,6 +166,21 @@ class BaseEventQuery {
                 const d2 = window.d2Web;
                 const metaDataResponse = yield Promise.all([
                     d2.programModule.program
+                        .select([
+                        'id',
+                        'code',
+                        'name',
+                        'captureCoordinates',
+                        'featureType',
+                        'enrollmentDateLabel',
+                        'incidentDateLabel',
+                        'displayIncidentDate',
+                        'onlyEnrollOnce',
+                        'orgUnitLabel',
+                        'programType',
+                        'useFirstStageDuringRegistration',
+                        'trackedEntityType',
+                    ])
                         .byId(this.program)
                         .with(d2.programModule.programStage
                         .with(d2.programModule.programStageSection)
@@ -185,12 +201,27 @@ class BaseEventQuery {
                         value: this.program,
                     })
                         .with(d2.programModule.programRuleAction
+                        .select([
+                        'id',
+                        'programRuleActionType',
+                        'data',
+                        'displayContent',
+                        'content',
+                    ])
                         .with(d2.dataElementModule.dataElement.select(['id', 'code', 'name']), 'ToOne')
                         .with(d2.programModule.trackedEntityAttribute.select([
                         'id',
                         'code',
                         'name',
-                    ]), 'ToOne'))
+                    ]), 'ToOne')
+                        .with(d2.optionSetModule.optionGroup
+                        .select(['id'])
+                        .with(d2.optionSetModule.option.select([
+                        'id',
+                        'code',
+                        'displayName',
+                    ]), 'ToMany'), 'ToOne')
+                        .with(d2.optionSetModule.option.select(['id', 'code', 'displayName']), 'ToOne'))
                         .get(),
                 ]);
                 const [programResponse, programRuleResponse] = metaDataResponse;

package/src/lib/modules/event/queries/base-event.query.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"base-event.query.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/queries/base-event.query.ts"],"names":[],"mappings":"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~~qBAChC~~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~~AA5TD~~,~~wCA4TC~~;~~0GAzJG~~,OAAgB,EAChB,QAAW;IAEX,uCACK,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC,GACvB,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC;SAC5B,MAAM,CACL,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,cAAc,KAAK,IAAI,CAAC,YAAY,CAClE;SACA,MAAM,CAAC,CAAC,WAAW,EAAE,WAAW,EAAE,EAAE;QACnC,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI;YAC1B,CAAC,CAAC,IAAA,kBAAS,EAAC,WAAW,CAAC,IAAI,CAAC;YAC7B,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC;QACnB,uCACK,WAAW,KACd,CAAC,GAAG,CAAC,EAAE;gBACL,EAAE,EAAE,WAAW,CAAC,EAAE;gBAClB,IAAI,EAAE,cAAc;aACrB,IACD;IACJ,CAAC,EAAE,EAAE,CAAC,EACR;AACJ,CAAC"}
1	+ {"version":3,"file":"base-event.query.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/queries/base-event.query.ts"],"names":[],"mappings":"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"}

package/src/lib/modules/option-set/models/index.d.ts CHANGED Viewed

@@ -1,2 +1,3 @@
 export * from './option.model';
 export * from './option-set.model';
+export * from './option-group.model';

package/src/lib/modules/option-set/models/index.js CHANGED Viewed

@@ -6,4 +6,5 @@ const tslib_1 = require("tslib");
 // license that can be found in the LICENSE file.
 tslib_1.__exportStar(require("./option.model"), exports);
 tslib_1.__exportStar(require("./option-set.model"), exports);
+tslib_1.__exportStar(require("./option-group.model"), exports);
 //# sourceMappingURL=index.js.map

package/src/lib/modules/option-set/models/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/option-set/models/index.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,yDAA+B;AAC/B,6DAAmC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/option-set/models/index.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,yDAA+B;AAC/B,6DAAmC;AACnC,+DAAqC"}

package/src/lib/modules/option-set/models/option-group.model.d.ts ADDED Viewed

@@ -0,0 +1,10 @@
+import { Option } from './option.model';
+import { IdentifiableObject, IdentifiableField } from '../../../shared';
+export type OptionGroupField = IdentifiableField | 'options';
+export declare class OptionGroup extends IdentifiableObject<OptionGroup> {
+    static resourceName: string;
+    static singularResourceName: string;
+    static fields: OptionGroupField[];
+    options: Option[];
+    constructor(optionGroup: Partial<OptionGroup>);
+}

package/src/lib/modules/option-set/models/option-group.model.js ADDED Viewed

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OptionGroup = void 0;
+// Copyright 2024 UDSM DHIS2 Lab. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+const option_model_1 = require("./option.model");
+const shared_1 = require("../../../shared");
+class OptionGroup extends shared_1.IdentifiableObject {
+    constructor(optionGroup) {
+        super(optionGroup);
+        this.options = (optionGroup.options || []).map((option) => new option_model_1.Option(option));
+    }
+}
+exports.OptionGroup = OptionGroup;
+OptionGroup.resourceName = 'optionGroups';
+OptionGroup.singularResourceName = 'optionGroup';
+OptionGroup.fields = [...shared_1.IDENTIFIABLE_FIELDS, 'options'];
+//# sourceMappingURL=option-group.model.js.map

package/src/lib/modules/option-set/models/option-group.model.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"option-group.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/option-set/models/option-group.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,iDAAwC;AACxC,4CAIyB;AAIzB,MAAa,WAAY,SAAQ,2BAA+B;IAM9D,YAAY,WAAiC;QAC3C,KAAK,CAAC,WAAW,CAAC,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,CAAC,WAAW,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAC5C,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,qBAAM,CAAC,MAAM,CAAC,CAC/B,CAAC;IACJ,CAAC;;AAXH,kCAYC;AAXQ,wBAAY,GAAG,cAAc,CAAC;AAC9B,gCAAoB,GAAG,aAAa,CAAC;AACrC,kBAAM,GAAuB,CAAC,GAAG,4BAAmB,EAAE,SAAS,CAAC,CAAC"}

package/src/lib/modules/option-set/option-set.module.d.ts CHANGED Viewed

@@ -1,8 +1,9 @@
 import { D2HttpClient } from '../../shared';
-import { OptionQuery, OptionSetQuery } from './queries';
+import { OptionGroupQuery, OptionQuery, OptionSetQuery } from './queries';
 export declare class OptionSetModule {
     private httpClient;
     constructor(httpClient: D2HttpClient);
     get optionSet(): OptionSetQuery;
+    get optionGroup(): OptionGroupQuery;
     get option(): OptionQuery;
 }

package/src/lib/modules/option-set/option-set.module.js CHANGED Viewed

@@ -9,6 +9,9 @@ class OptionSetModule {
     get optionSet() {
         return new queries_1.OptionSetQuery(this.httpClient);
     }
+    get optionGroup() {
+        return new queries_1.OptionGroupQuery(this.httpClient);
+    }
     get option() {
         return new queries_1.OptionQuery(this.httpClient);
     }

package/src/lib/modules/option-set/option-set.module.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"option-set.module.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/modules/option-set/option-set.module.ts"],"names":[],"mappings":";;;AACA,~~uCAAwD~~;~~AAExD~~,MAAa,eAAe;IAC1B,YAAoB,UAAwB;QAAxB,eAAU,GAAV,UAAU,CAAc;IAAG,CAAC;IAChD,IAAI,SAAS;QACX,OAAO,IAAI,wBAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,qBAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC1C,CAAC;CACF;~~AATD~~,~~0CASC~~"}
1	+ {"version":3,"file":"option-set.module.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/modules/option-set/option-set.module.ts"],"names":[],"mappings":";;;AACA,uCAA0E;AAE1E,MAAa,eAAe;IAC1B,YAAoB,UAAwB;QAAxB,eAAU,GAAV,UAAU,CAAc;IAAG,CAAC;IAChD,IAAI,SAAS;QACX,OAAO,IAAI,wBAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,0BAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,qBAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC1C,CAAC;CACF;AAbD,0CAaC"}

package/src/lib/modules/option-set/queries/index.d.ts CHANGED Viewed

@@ -1,2 +1,3 @@
 export * from './option-set.query';
 export * from './option.query';
+export * from './option-group.query';

package/src/lib/modules/option-set/queries/index.js CHANGED Viewed

@@ -6,4 +6,5 @@ const tslib_1 = require("tslib");
 // license that can be found in the LICENSE file.
 tslib_1.__exportStar(require("./option-set.query"), exports);
 tslib_1.__exportStar(require("./option.query"), exports);
+tslib_1.__exportStar(require("./option-group.query"), exports);
 //# sourceMappingURL=index.js.map

package/src/lib/modules/option-set/queries/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/option-set/queries/index.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,6DAAmC;AACnC,yDAA+B"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/option-set/queries/index.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,6DAAmC;AACnC,yDAA+B;AAC/B,+DAAqC"}

package/src/lib/modules/option-set/queries/option-group.query.d.ts ADDED Viewed

@@ -0,0 +1,5 @@
+import { BaseQuery, D2HttpClient } from '../../../shared';
+import { OptionGroup, OptionGroupField } from '../models';
+export declare class OptionGroupQuery extends BaseQuery<OptionGroup, OptionGroupField> {
+    constructor(httpClient: D2HttpClient);
+}

package/src/lib/modules/option-set/queries/option-group.query.js ADDED Viewed

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OptionGroupQuery = void 0;
+// Copyright 2024 UDSM DHIS2 Lab. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+const shared_1 = require("../../../shared");
+const models_1 = require("../models");
+class OptionGroupQuery extends shared_1.BaseQuery {
+    constructor(httpClient) {
+        super(models_1.OptionGroup, httpClient);
+    }
+}
+exports.OptionGroupQuery = OptionGroupQuery;
+//# sourceMappingURL=option-group.query.js.map

package/src/lib/modules/option-set/queries/option-group.query.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"option-group.query.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/option-set/queries/option-group.query.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,4CAA0D;AAC1D,sCAA0D;AAE1D,MAAa,gBAAiB,SAAQ,kBAAwC;IAC5E,YAAY,UAAwB;QAClC,KAAK,CAAC,oBAAW,EAAE,UAAU,CAAC,CAAC;IACjC,CAAC;CACF;AAJD,4CAIC"}

package/src/lib/modules/program/models/program-rule-action.model.d.ts CHANGED Viewed

@@ -1,7 +1,8 @@
 import { DataElement } from '../../data-element';
 import { IdentifiableField, IdentifiableObject } from '../../../shared';
 import { TrackedEntityAttribute } from '../models';
-export type ProgramRuleActionField = IdentifiableField | 'content' | 'data' | 'displayContent' | 'programRuleActionType' | 'evaluationTime' | 'dataElement' | 'trackedEntityAttribute' | 'programRule';
+import { OptionGroup, Option } from '../../option-set';
+export type ProgramRuleActionField = IdentifiableField | 'content' | 'data' | 'displayContent' | 'programRuleActionType' | 'evaluationTime' | 'dataElement' | 'trackedEntityAttribute' | 'optionGroup' | 'option' | 'programRule';
 export declare class ProgramRuleAction extends IdentifiableObject<ProgramRuleAction> {
     static resourceName: string;
     static singularResourceName: string;
@@ -13,5 +14,7 @@ export declare class ProgramRuleAction extends IdentifiableObject<ProgramRuleAct
     evaluationTime?: string;
     dataElement?: Partial<DataElement>;
     trackedEntityAttribute?: Partial<TrackedEntityAttribute>;
+    optionGroup?: Partial<OptionGroup>;
+    option?: Partial<Option>;
     programRule: any;
 }

package/src/lib/modules/program/models/program-rule-action.model.js CHANGED Viewed

@@ -20,6 +20,8 @@ ProgramRuleAction.fields = [
     'evaluationTime',
     'dataElement',
     'trackedEntityAttribute',
+    'optionGroup',
+    'option',
     'programRule',
 ];
 //# sourceMappingURL=program-rule-action.model.js.map

package/src/lib/modules/program/models/program-rule-action.model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"program-rule-action.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/program-rule-action.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAGjD,4CAIyB;~~AAczB~~,MAAa,iBAAkB,SAAQ,2BAAqC;;AAA5E,~~8CAwBC~~;~~AAvBQ~~,8BAAY,GAAG,oBAAoB,CAAC;AACpC,sCAAoB,GAAG,mBAAmB,CAAC;AAClD,6BAA6B;AACtB,wBAAM,GAA6B;IACxC,GAAG,4BAAmB;IACtB,SAAS;IACT,MAAM;IACN,gBAAgB;IAChB,uBAAuB;IACvB,gBAAgB;IAChB,aAAa;IACb,wBAAwB;IACxB,aAAa;CACd,CAAC"}
1	+ {"version":3,"file":"program-rule-action.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/program-rule-action.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAGjD,4CAIyB;AAiBzB,MAAa,iBAAkB,SAAQ,2BAAqC;;AAA5E,8CA4BC;AA3BQ,8BAAY,GAAG,oBAAoB,CAAC;AACpC,sCAAoB,GAAG,mBAAmB,CAAC;AAClD,6BAA6B;AACtB,wBAAM,GAA6B;IACxC,GAAG,4BAAmB;IACtB,SAAS;IACT,MAAM;IACN,gBAAgB;IAChB,uBAAuB;IACvB,gBAAgB;IAChB,aAAa;IACb,wBAAwB;IACxB,aAAa;IACb,QAAQ;IACR,aAAa;CACd,CAAC"}

package/src/lib/modules/program/models/program-tracked-entity-attribute.model.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { TrackedEntityAttribute } from './tracked-entity-attribute.model';
 import { IdentifiableField, IdentifiableObject } from '../../../shared';
-export type ProgramTrackedEntityAttributeField = IdentifiableField | 'trackedEntityAttribute' | 'searchable' | 'renderOptionsAsRadio' | 'sortOrder' | 'mandatory' | 'displayInList';
+export type ProgramTrackedEntityAttributeField = IdentifiableField | 'trackedEntityAttribute' | 'searchable' | 'renderOptionsAsRadio' | 'sortOrder' | 'mandatory' | 'displayInList' | 'allowFutureDate';
 export declare class ProgramTrackedEntityAttribute extends IdentifiableObject<ProgramTrackedEntityAttribute> {
     static resourceName: string;
     static singularResourceName: string;
@@ -11,5 +11,6 @@ export declare class ProgramTrackedEntityAttribute extends IdentifiableObject<Pr
     sortOrder: number;
     mandatory?: boolean;
     displayInList?: boolean;
+    allowFutureDate?: boolean;
     constructor(programTrackedEntityAttribute: Partial<ProgramTrackedEntityAttribute>);
 }

package/src/lib/modules/program/models/program-tracked-entity-attribute.model.js CHANGED Viewed

@@ -24,5 +24,6 @@ ProgramTrackedEntityAttribute.fields = [
     'sortOrder',
     'mandatory',
     'displayInList',
+    'allowFutureDate',
 ];
 //# sourceMappingURL=program-tracked-entity-attribute.model.js.map

package/src/lib/modules/program/models/program-tracked-entity-attribute.model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"program-tracked-entity-attribute.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/program-tracked-entity-attribute.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,qFAA0E;AAC1E,4CAIyB;~~AAWzB~~,MAAa,6BAA8B,SAAQ,2BAAiD;~~IAoBlG~~,YACE,6BAAqE;QAErE,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACrC,IAAI,CAAC,sBAAsB,GAAG,IAAI,uDAAsB,CACtD,6BAA6B,CAAC,sBAAsB,IAAI,EAAE,CAC3D,CAAC;IACJ,CAAC;;~~AA3BH~~,~~sEA4BC~~;~~AA3BQ~~,0CAAY,GAAG,gCAAgC,CAAC;AAChD,kDAAoB,GAAG,+BAA+B,CAAC;AAC9D,6BAA6B;AACtB,oCAAM,GAAyC;IACpD,GAAG,4BAAmB;IACtB,wBAAwB;IACxB,YAAY;IACZ,sBAAsB;IACtB,WAAW;IACX,WAAW;IACX,eAAe;~~CAChB~~,CAAC"}
1	+ {"version":3,"file":"program-tracked-entity-attribute.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/program-tracked-entity-attribute.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,qFAA0E;AAC1E,4CAIyB;AAYzB,MAAa,6BAA8B,SAAQ,2BAAiD;IAsBlG,YACE,6BAAqE;QAErE,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACrC,IAAI,CAAC,sBAAsB,GAAG,IAAI,uDAAsB,CACtD,6BAA6B,CAAC,sBAAsB,IAAI,EAAE,CAC3D,CAAC;IACJ,CAAC;;AA7BH,sEA8BC;AA7BQ,0CAAY,GAAG,gCAAgC,CAAC;AAChD,kDAAoB,GAAG,+BAA+B,CAAC;AAC9D,6BAA6B;AACtB,oCAAM,GAAyC;IACpD,GAAG,4BAAmB;IACtB,wBAAwB;IACxB,YAAY;IACZ,sBAAsB;IACtB,WAAW;IACX,WAAW;IACX,eAAe;IACf,iBAAiB;CAClB,CAAC"}

package/src/lib/modules/program/models/program.model.js CHANGED Viewed

@@ -23,7 +23,9 @@ class Program extends shared_1.IdentifiableObject {
         this.programRuleVariables = tslib_1.__classPrivateFieldGet(this, _Program_instances, "m", _Program_getProgramRuleVariables).call(this, program.programRuleVariables || []);
     }
     get trackedEntityAttributes() {
-        return (this.programTrackedEntityAttributes || []).map((programTrackedEntityAttribute) => programTrackedEntityAttribute.trackedEntityAttribute);
+        return (this.programTrackedEntityAttributes || []).map((programTrackedEntityAttribute) => {
+            return Object.assign(Object.assign({}, programTrackedEntityAttribute.trackedEntityAttribute), { allowFutureDate: programTrackedEntityAttribute.allowFutureDate });
+        });
     }
     get searchableTrackedEntityAttributes() {
         return (this.programTrackedEntityAttributes || [])
@@ -51,7 +53,7 @@ class Program extends shared_1.IdentifiableObject {
         return (0, lodash_1.flatten)((this.programStages || []).map((programStage) => {
             return (programStage.programStageDataElements || [])
                 .map((programStageDataElement) => {
-                return Object.assign(Object.assign({}, programStageDataElement.dataElement), { programStageId: programStage.id, isProgramStageRepeatable: programStage.repeatable });
+                return Object.assign(Object.assign({}, programStageDataElement.dataElement), { programStageId: programStage.id, allowFutureDate: programStageDataElement.allowFutureDate, isProgramStageRepeatable: programStage.repeatable });
             })
                 .filter((dataElement) => dataElement);
         }));

package/src/lib/modules/program/models/program.model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"program.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/program.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;;AAEjD,qGAAyF;AACzF,+EAAoE;AACpE,+DAAqD;AACrD,mEAAyD;AACzD,4CAIyB;AAGzB,mCAAiC;AA6BjC,MAAa,OAAQ,SAAQ,2BAA2B;IAmDtD,YAAY,OAAyB;QACnC,KAAK,CAAC,OAAO,CAAC,CAAC;;QACf,IAAI,CAAC,aAAa,GAAG,+BAAA,IAAI,qDAAkB,MAAtB,IAAI,EAAmB,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC;QACzE,IAAI,CAAC,eAAe,GAAG,+BAAA,IAAI,uDAAoB,MAAxB,IAAI,EACzB,OAAO,CAAC,eAAe,IAAI,EAAE,CAC9B,CAAC;QACF,IAAI,CAAC,8BAA8B;YACjC,+BAAA,IAAI,sEAAmC,MAAvC,IAAI,EACF,OAAO,CAAC,8BAA8B,IAAI,EAAE,CAC7C,CAAC;QACJ,IAAI,CAAC,oBAAoB,GAAG,+BAAA,IAAI,4DAAyB,MAA7B,IAAI,EAC9B,OAAO,CAAC,oBAAoB,IAAI,EAAE,CACnC,CAAC;IACJ,CAAC;IAED,IAAI,uBAAuB;QACzB,OAAO,CAAC,IAAI,CAAC,8BAA8B,IAAI,EAAE,CAAC,CAAC,GAAG,CACpD,CAAC,6BAA6B,EAAE,EAAE,~~CAChC~~,6BAA6B,CAAC,sBAAsB,~~CACvD~~,CAAC;IACJ,CAAC;IAED,IAAI,iCAAiC;QACnC,OAAO,CAAC,IAAI,CAAC,8BAA8B,IAAI,EAAE,CAAC;aAC/C,MAAM,CACL,CAAC,6BAA6B,EAAE,EAAE;;YAChC,OAAA,6BAA6B,CAAC,UAAU;iBACxC,MAAA,6BAA6B,aAA7B,6BAA6B,uBAA7B,6BAA6B,CAAE,sBAAsB,0CAAE,MAAM,CAAA,CAAA;SAAA,CAChE;aACA,GAAG,CACF,CAAC,6BAA6B,EAAE,EAAE,CAChC,6BAA6B,CAAC,sBAAsB,CACvD;aACA,MAAM,CAAC,CAAC,sBAAsB,EAAE,EAAE,CAAC,sBAAsB,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,+BAA+B;QACjC,OAAO,CAAC,IAAI,CAAC,8BAA8B,IAAI,EAAE,CAAC;aAC/C,MAAM,CACL,CAAC,6BAA6B,EAAE,EAAE,WAChC,OAAA,MAAA,6BAA6B,CAAC,sBAAsB,0CAAE,SAAS,CAAA,EAAA,CAClE;aACA,GAAG,CACF,CAAC,6BAA6B,EAAE,EAAE,CAChC,6BAA6B,CAAC,sBAAsB,CACvD;aACA,MAAM,CAAC,CAAC,sBAAsB,EAAE,EAAE,CAAC,sBAAsB,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,oCAAoC;QACtC,OAAO,CAAC,IAAI,CAAC,8BAA8B,IAAI,EAAE,CAAC;aAC/C,MAAM,CACL,CAAC,6BAA6B,EAAE,EAAE,CAChC,6BAA6B,CAAC,aAAa,CAC9C;aACA,GAAG,CACF,CAAC,6BAA6B,EAAE,EAAE,CAChC,6BAA6B,CAAC,sBAAsB,CACvD;aACA,MAAM,CAAC,CAAC,sBAAsB,EAAE,EAAE,CAAC,sBAAsB,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAA,gBAAO,EACZ,CAAC,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE;YAC9C,OAAO,CAAC,YAAY,CAAC,wBAAwB,IAAI,EAAE,CAAC;iBACjD,GAAG,CAAC,CAAC,uBAAuB,EAAE,EAAE;gBAC/B,uCACK,uBAAuB,CAAC,WAAW,KACtC,cAAc,EAAE,YAAY,CAAC,EAAE,EAC/B,wBAAwB,EAAE,YAAY,CAAC,UAAU,IACjD;YACJ,CAAC,CAAC;iBACD,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC;QAC1C,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,IAAI,yBAAyB;QAC3B,OAAO,IAAA,gBAAO,EACZ,CAAC,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE;YAC9C,OAAO,CAAC,YAAY,CAAC,wBAAwB,IAAI,EAAE,CAAC;iBACjD,MAAM,CACL,CAAC,uBAAuB,EAAE,EAAE,CAC1B,uBAAuB,CAAC,gBAAgB,CAC3C;iBACA,GAAG,CAAC,CAAC,uBAAuB,EAAE,EAAE,CAAC,uBAAuB,CAAC,WAAW,CAAC;iBACrE,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC;QAC1C,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;;~~AA7IH~~,~~0BA2KC~~;mGA5BmB,aAAsC;IACtD,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,GAAG,CAC9B,CAAC,YAAY,EAAE,EAAE,CAAC,IAAI,kCAAY,CAAC,YAAY,CAAC,CACjD,CAAC;AACJ,CAAC,qEAEmB,eAA0C;IAC5D,OAAO,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,GAAG,CAChC,CAAC,cAAc,EAAE,EAAE,CAAC,IAAI,sCAAc,CAAC,cAAc,CAAC,CACvD,CAAC;AACJ,CAAC,mGAGC,8BAAwE;IAExE,OAAO,CAAC,8BAA8B,IAAI,EAAE,CAAC,CAAC,GAAG,CAC/C,CAAC,6BAA6B,EAAE,EAAE,CAChC,IAAI,sEAA6B,CAAC,6BAA6B,CAAC,CACnE,CAAC;AACJ,CAAC,+EAGC,oBAAoD;IAEpD,OAAO,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,GAAG,CACrC,CAAC,mBAAmB,EAAE,EAAE,CAAC,IAAI,iDAAmB,CAAC,mBAAmB,CAAC,CACtE,CAAC;AACJ,CAAC;~~AAzKM~~,oBAAY,GAAG,UAAU,AAAb,CAAc;AAC1B,4BAAoB,GAAG,SAAS,AAAZ,CAAa;AACxC,6BAA6B;AACtB,cAAM,GAAmB;IAC9B,GAAG,4BAAmB;IACtB,aAAa;IACb,qBAAqB;IACrB,aAAa;IACb,qBAAqB;IACrB,qBAAqB;IACrB,oBAAoB;IACpB,aAAa;IACb,qBAAqB;IACrB,cAAc;IACd,gBAAgB;IAChB,6BAA6B;IAC7B,+BAA+B;IAC/B,iCAAiC;IACjC,mBAAmB;IACnB,0BAA0B;IAC1B,sBAAsB;IACtB,mBAAmB;IACnB,mBAAmB;IACnB,gCAAgC;CACjC,AArBY,CAqBX"}
1	+ {"version":3,"file":"program.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/program.model.ts"],"names":[],"mappings":"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"}

package/src/lib/modules/program/models/tracked-entity-attribute.model.d.ts CHANGED Viewed

@@ -13,5 +13,6 @@ export declare class TrackedEntityAttribute extends IdentifiableObject<TrackedEn
     optionSetValue?: boolean;
     optionSetValueCount?: number;
     optionSet?: OptionSet;
+    allowFutureDate?: boolean;
     constructor(trackedEntityAttribute: Partial<TrackedEntityAttribute>);
 }

package/src/lib/modules/program/models/tracked-entity-attribute.model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tracked-entity-attribute.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/tracked-entity-attribute.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,iDAA6C;AAC7C,4CAIyB;AAYzB,MAAa,sBAAuB,SAAQ,2BAA0C;~~IAwBpF~~,YAAY,sBAAuD;QACjE,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC9B,IAAI,sBAAsB,CAAC,cAAc,EAAE,CAAC;YAC1C,IAAI,CAAC,SAAS,GAAG,IAAI,sBAAS,CAAC,sBAAsB,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;;~~AA7BH~~,~~wDA8BC~~;~~AA7BQ~~,mCAAY,GAAG,yBAAyB,CAAC;AACzC,2CAAoB,GAAG,wBAAwB,CAAC;AACvD,6BAA6B;AACtB,6BAAM,GAAkC;IAC7C,GAAG,4BAAmB;IACtB,UAAU;IACV,WAAW;IACX,iBAAiB;IACjB,WAAW;IACX,QAAQ;IACR,gBAAgB;IAChB,qBAAqB;IACrB,WAAW;CACZ,CAAC"}
1	+ {"version":3,"file":"tracked-entity-attribute.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/tracked-entity-attribute.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,iDAA6C;AAC7C,4CAIyB;AAYzB,MAAa,sBAAuB,SAAQ,2BAA0C;IAyBpF,YAAY,sBAAuD;QACjE,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC9B,IAAI,sBAAsB,CAAC,cAAc,EAAE,CAAC;YAC1C,IAAI,CAAC,SAAS,GAAG,IAAI,sBAAS,CAAC,sBAAsB,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;;AA9BH,wDA+BC;AA9BQ,mCAAY,GAAG,yBAAyB,CAAC;AACzC,2CAAoB,GAAG,wBAAwB,CAAC;AACvD,6BAA6B;AACtB,6BAAM,GAAkC;IAC7C,GAAG,4BAAmB;IACtB,UAAU;IACV,WAAW;IACX,iBAAiB;IACjB,WAAW;IACX,QAAQ;IACR,gBAAgB;IAChB,qBAAqB;IACrB,WAAW;CACZ,CAAC"}

package/src/lib/modules/tracker/models/tracked-entity-instance.model.js CHANGED Viewed

@@ -167,35 +167,35 @@ class TrackedEntityInstance extends base_model_1.BaseTrackerSDKModel {
         const dataValueKeys = Object.keys(dataValueEntities);
         dataValueKeys.forEach((key) => {
             const dataValue = dataValueEntities[key];
-            if (dataValue && dataValue.length > 0) {
-                const field = (this.fields || {})[key];
-                switch (field === null || field === void 0 ? void 0 : field.type) {
-                    case 'ATTRIBUTE':
-                        this.setAttributeValue(field.id, dataValue);
-                        break;
-                    case 'DATA_ELEMENT':
-                        this.setDataValue(field.id, dataValue, field.stageId);
-                        break;
-                    case 'ENROLLMENT_DATE':
-                        this.setEnrollmentDate(dataValue);
-                        break;
-                    case 'INCIDENT_DATE':
-                        this.setIncidentDate(dataValue);
-                        break;
-                    case 'ORG_UNIT':
-                        this.setOrgUnit(dataValue);
-                        break;
-                    default: {
-                        if ((0, lodash_1.isArray)(dataValue)) {
-                            dataValue.forEach((data) => {
-                                this.updateDataValues(data);
-                            });
-                        }
-                        else if ((0, lodash_1.isPlainObject)(dataValue)) {
-                            this.updateDataValues(dataValue);
-                        }
-                        break;
+            const field = (this.fields || {})[key];
+            switch (field === null || field === void 0 ? void 0 : field.type) {
+                case 'ATTRIBUTE': {
+                    this.setAttributeValue(field.id, dataValue);
+                    break;
+                }
+                case 'DATA_ELEMENT': {
+                    this.setDataValue(field.id, dataValue, field.stageId);
+                    break;
+                }
+                case 'ENROLLMENT_DATE':
+                    this.setEnrollmentDate(dataValue);
+                    break;
+                case 'INCIDENT_DATE':
+                    this.setIncidentDate(dataValue);
+                    break;
+                case 'ORG_UNIT':
+                    this.setOrgUnit(dataValue);
+                    break;
+                default: {
+                    if ((0, lodash_1.isArray)(dataValue)) {
+                        dataValue.forEach((data) => {
+                            this.updateDataValues(data);
+                        });
+                    }
+                    else if ((0, lodash_1.isPlainObject)(dataValue)) {
+                        this.updateDataValues(dataValue);
                     }
+                    break;
                 }
             }
         });

package/src/lib/modules/tracker/models/tracked-entity-instance.model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tracked-entity-instance.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/models/tracked-entity-instance.model.ts"],"names":[],"mappings":"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~~IAAI,SAAS,IAAI,SAAS,CAAC,~~MAAM,~~GAAG,CAAC,EAAE,CAAC;gBACtC,MAAM,~~KAAK,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;~~gBACvC~~,QAAQ,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,EAAE,CAAC;~~oBACpB~~,KAAK,WAAW;~~wBACd~~,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;~~wBAC5C~~,MAAM;~~oBACR~~,KAAK,cAAc;~~wBACjB~~,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,OAAQ,CAAC,CAAC;~~wBACvD~~,MAAM;~~oBACR~~,KAAK,iBAAiB;~~wBACpB~~,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;~~wBAClC~~,MAAM;~~oBACR~~,KAAK,eAAe;~~wBAClB~~,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;~~wBAChC~~,MAAM;~~oBACR~~,KAAK,UAAU;~~wBACb~~,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;~~wBAC3B~~,MAAM;~~oBAER~~,OAAO,CAAC,CAAC,CAAC;~~wBACR~~,IAAI,IAAA,gBAAO,EAAC,SAAS,CAAC,EAAE,CAAC;~~4BACtB~~,SAAuC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;~~gCACxD~~,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;~~4BAC9B~~,CAAC,CAAC,CAAC;~~wBACL~~,CAAC;~~6BAAM~~,IAAI,IAAA,sBAAa,EAAC,SAAS,CAAC,EAAE,CAAC;~~4BACpC~~,IAAI,CAAC,gBAAgB,CACnB,SAA+C,CAChD,CAAC;~~wBACJ~~,CAAC;~~wBACD~~,MAAM;~~oBACR~~,CAAC;~~gBACH,CAAC;~~YACH,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,YAAY,CACV,WAAmB,EACnB,KAAa,EACb,YAAoB,EACpB,OAAgB;QAEhB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAChC,WAAW,EACX,KAAK,EACL,YAAY,EACZ,OAAO,CACR,CAAC;QACJ,CAAC;IACH,CAAC;IAED,uFAAuF;IACvF,UAAU,CAAC,aAAqB,EAAE,aAAiC;QACjE,QAAQ,aAAa,EAAE,CAAC;YACtB,KAAK,MAAM,CAAC,CAAC,CAAC;gBACZ,IAAI,CAAC;oBACH,OAAO,IAAA,iBAAM,EAAC,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;gBAChE,CAAC;gBAAC,OAAO,EAAE,EAAE,CAAC;oBACZ,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC;gBAC7B,CAAC;YACH,CAAC;YACD,KAAK,SAAS,CAAC,CAAC,CAAC;gBACf,IAAI,CAAC;oBACH,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;gBACvD,CAAC;gBAAC,OAAO,EAAE,EAAE,CAAC;oBACZ,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC;gBAC7B,CAAC;YACH,CAAC;YACD;gBACE,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,QAAQ,CAAC,OAER;QACC,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC5C,CAAC;QAED,OAAO;YACL,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,OAAO,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO;YACtB,WAAW,EAAE,IAAI,CAAC,WAAW;iBAC1B,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAClB,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CACnD;iBACA,MAAM,CACL,CAAC,UAAU,EAAE,EAAE,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,MAAK,IAAI,CAAC,OAAO,CACpC;YACpB,UAAU,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc;gBACjC,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,qBAAa,CAAC,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC;YACrD,aAAa,EAAE,CAAC,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CAChE,aAAa,CAAC,QAAQ,EAAE,CACzB;SACF,CAAC;IACJ,CAAC;IAED,eAAe;QACb,OAAO;YACL,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,UAAU,EAAE,IAAI,CAAC,UAAU;SAC5B,CAAC;IACJ,CAAC;CACF;~~AAhWD~~,~~sDAgWC~~;;;~~IAhRG~~,CACE,MAAM,CAAC,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,kBAAkB,KAAI,EAAE,CAAC,IAAI,EAAE,CACnE,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;;QACrB,MAAM,UAAU,GAAG,CAAC,CAAA,MAAA,CAAC,CAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,kBAAkB,KAAI,EAAE,CAAC,CACnE,QAAQ,CACT,0CAAE,MAAM,KAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAEpB,MAAM,CAAC,IAAI,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,iBAAiB,KAAI,EAAE,CAAC,CAAC,OAAO,CACtD,CAAC,YAAY,EAAE,EAAE;YACf,IAAI,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;QAChD,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
1	+ {"version":3,"file":"tracked-entity-instance.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/models/tracked-entity-instance.model.ts"],"names":[],"mappings":"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"}

package/src/lib/modules/tracker/queries/base-tracker.query.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import { D2HttpClient, D2HttpResponse, Pager, DataQueryFilter, ProgramDateType, OuMode } from '../../../shared';
 import { Program } from '../../program';
 import { D2TrackerResponse, ITrackedEntityInstance, TrackedEntityInstance } from '../models';
+export type TrackerFetchScope = 'TRACKED_ENTITY' | 'ENROLLMENT';
 export declare class BaseTrackerQuery<T extends TrackedEntityInstance> {
     #private;
     protected httpClient: D2HttpClient;
@@ -36,9 +37,11 @@ export declare class BaseTrackerQuery<T extends TrackedEntityInstance> {
         ownerUid: string;
         value: string;
     }[]>;
-    get(): Promise<D2TrackerResponse<T>>;
+    get(config?: {
+        fetchScope: TrackerFetchScope;
+    }): Promise<D2TrackerResponse<T>>;
     create(): Promise<T>;
-    protected fetchData(): Promise<D2HttpResponse>;
+    protected fetchData(fetchScope: TrackerFetchScope): Promise<D2HttpResponse>;
     save(): Promise<D2TrackerResponse<T>>;
     getMetaData(): Promise<Program | null>;
 }

package/src/lib/modules/tracker/queries/base-tracker.query.js CHANGED Viewed

@@ -19,12 +19,9 @@ class BaseTrackerQuery {
             models_1.TrackedEntityInstance;
     }
     setOrgUnit(orgUnitValue) {
-        if (orgUnitValue) {
-            this.orgUnit =
-                typeof orgUnitValue === 'object'
-                    ? orgUnitValue.join(';')
-                    : orgUnitValue;
-        }
+        this.orgUnit = (0, lodash_1.isArray)(orgUnitValue)
+            ? orgUnitValue.join(';')
+            : orgUnitValue;
         return this;
     }
     setOuMode(ouMode) {
@@ -113,9 +110,9 @@ class BaseTrackerQuery {
             return [];
         });
     }
-    get() {
+    get(config) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const response = yield this.fetchData();
+            const response = yield this.fetchData((config === null || config === void 0 ? void 0 : config.fetchScope) || 'TRACKED_ENTITY');
             return new models_1.D2TrackerResponse(response, this.identifiable);
         });
     }
@@ -129,6 +126,7 @@ class BaseTrackerQuery {
                         trackedEntity: (0, shared_1.generateUid)(),
                         trackedEntityType: (_a = program.trackedEntityType) === null || _a === void 0 ? void 0 : _a.id,
                         program: program.id,
+                        orgUnit: this.orgUnit,
                     });
                     this.instance.fields = Object.assign(Object.assign(Object.assign({}, (this.instance.fields || {})), (program.dataElements || []).reduce((fieldObject, dataElement) => {
                         const key = dataElement.code
@@ -158,9 +156,13 @@ class BaseTrackerQuery {
             return this.instance;
         });
     }
-    fetchData() {
+    fetchData(fetchScope) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const baseUrl = fetchScope === 'ENROLLMENT'
+                ? 'tracker/enrollments'
+                : 'tracker/trackedEntities';
             return yield this.httpClient.get(new models_1.TrackerUrlGenerator({
+                baseEndpoint: baseUrl,
                 program: this.program,
                 trackedEntityType: this.trackedEntityType,
                 orgUnit: this.orgUnit,
@@ -188,6 +190,21 @@ class BaseTrackerQuery {
                 const d2 = window.d2Web;
                 const metaDataResponse = yield Promise.all([
                     d2.programModule.program
+                        .select([
+                        'id',
+                        'code',
+                        'name',
+                        'captureCoordinates',
+                        'featureType',
+                        'enrollmentDateLabel',
+                        'incidentDateLabel',
+                        'displayIncidentDate',
+                        'onlyEnrollOnce',
+                        'orgUnitLabel',
+                        'programType',
+                        'useFirstStageDuringRegistration',
+                        'trackedEntityType',
+                    ])
                         .byId(this.program)
                         .with(d2.programModule.programStage
                         .with(d2.programModule.programStageSection)
@@ -208,12 +225,27 @@ class BaseTrackerQuery {
                         value: this.program,
                     })
                         .with(d2.programModule.programRuleAction
+                        .select([
+                        'id',
+                        'programRuleActionType',
+                        'data',
+                        'displayContent',
+                        'content',
+                    ])
                         .with(d2.dataElementModule.dataElement.select(['id', 'code', 'name']), 'ToOne')
                         .with(d2.programModule.trackedEntityAttribute.select([
                         'id',
                         'code',
                         'name',
-                    ]), 'ToOne'))
+                    ]), 'ToOne')
+                        .with(d2.optionSetModule.optionGroup
+                        .select(['id'])
+                        .with(d2.optionSetModule.option.select([
+                        'id',
+                        'code',
+                        'displayName',
+                    ]), 'ToMany'), 'ToOne')
+                        .with(d2.optionSetModule.option.select(['id', 'code', 'displayName']), 'ToOne'))
                         .get(),
                 ]);
                 const [programResponse, programRuleResponse] = metaDataResponse;

package/src/lib/modules/tracker/queries/base-tracker.query.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"base-tracker.query.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/queries/base-tracker.query.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;;AAEjD,~~mCAAmC~~;~~AAEnC~~,4CAQyB;AAEzB,sCAKmB;~~AAEnB~~,MAAa,gBAAgB;IAe3B,YAAsB,UAAwB;;QAAxB,eAAU,GAAV,UAAU,CAAc;QAbpC,WAAM,GAAW,KAAK,CAAC;QASvB,UAAK,GAAG,IAAI,cAAK,EAAE,CAAC;QAK5B,IAAI,CAAC,YAAY;YACf,8BAA0D,CAAC;IAC/D,CAAC;IAED,UAAU,CAAC,YAA+B;QACxC,IAAI,~~YAAY~~,~~EAAE~~,~~CAAC;YACjB~~,~~IAAI~~,~~CAAC~~,~~OAAO;gBACV~~,~~OAAO,~~YAAY,~~KAAK,QAAQ~~;~~oBAC9B~~,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC;~~oBACxB~~,CAAC,~~CAAE~~,~~YAAuB~~,CAAC;~~QACjC~~,~~CAAC;QAED,~~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~~YACP~~,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,~~EAAE~~,CAAC;~~YAExC~~,OAAO,IAAI,0BAAiB,CAAI,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/D,CAAC;KAAA;IAEK,MAAM;;;YACV,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;gBAEzC,IAAI,OAAO,EAAE,CAAC;oBACZ,IAAI,CAAC,QAAQ,GAAG,IAAK,IAAI,CAAC,YAAoB,CAAC;wBAC7C,aAAa,EAAE,IAAA,oBAAW,GAAE;wBAC5B,iBAAiB,EAAE,MAAA,OAAO,CAAC,iBAAiB,0CAAE,EAAE;wBAChD,OAAO,EAAE,OAAO,CAAC,EAAE;~~qBACpB~~,CAAC,CAAC;oBAEH,IAAI,CAAC,QAAQ,CAAC,MAAM,iDACf,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC,GAC5B,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,WAAW,EAAE,EAAE;wBAClE,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI;4BAC1B,CAAC,CAAC,IAAA,kBAAS,EAAC,WAAW,CAAC,IAAI,CAAC;4BAC7B,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC;wBACnB,uCACK,WAAW,KACd,CAAC,GAAG,CAAC,EAAE;gCACL,EAAE,EAAE,WAAW,CAAC,EAAE;gCAClB,IAAI,EAAE,cAAc;gCACpB,OAAO,EAAE,WAAW,CAAC,cAAc;6BACpC,IACD;oBACJ,CAAC,EAAE,EAAE,CAAC,GACH,CAAC,OAAO,CAAC,uBAAuB,IAAI,EAAE,CAAC,CAAC,MAAM,CAC/C,CAAC,WAAW,EAAE,sBAAsB,EAAE,EAAE;wBACtC,MAAM,GAAG,GAAG,sBAAsB,CAAC,IAAI;4BACrC,CAAC,CAAC,IAAA,kBAAS,EAAC,sBAAsB,CAAC,IAAI,CAAC;4BACxC,CAAC,CAAC,sBAAsB,CAAC,EAAE,CAAC;wBAC9B,uCACK,WAAW,KACd,CAAC,GAAG,CAAC,EAAE;gCACL,EAAE,EAAE,sBAAsB,CAAC,EAAE;gCAC7B,IAAI,EAAE,WAAW;gCACjB,SAAS,EAAE,sBAAsB,CAAC,SAAS;6BAC5C,IACD;oBACJ,CAAC,EACD,EAAE,CACH,CACF,CAAC;oBAEF,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;oBAE3D,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;wBAC1C,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;oBACrE,CAAC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC;KAAA;IAEe,SAAS;;~~YACvB~~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~~AAvVD~~,~~4CAuVC~~;;;;~~QApHG~~,MAAM,aAAa,GAAG,CAAC,CAAA,MAAA,IAAI,CAAC,QAAQ,CAAC,gBAAgB,0CAAE,MAAM,KAAI,EAAE,CAAC,CAAC,IAAI,CACvE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CACtC,CAAC;QAEF,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,QAAQ,GAAG,IAAI,uBAAc,CAAC,EAAE,CAAC,CAAC;YACxC,OAAO,IAAI,0BAAiB,CAAI,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/D,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,qBAAqB,EAAE;YAC7D,MAAM,EAAE,CAAC,aAAc,CAAC,QAAQ,EAAE,CAAC;SACpC,CAAC,CAAC;QAEH,OAAO,IAAI,0BAAiB,CAAI,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAC3D,CAAC;;;QAGC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,qBAAqB,EAAE;YAC7D,eAAe,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAS,EAAE,CAAC;SAC7C,CAAC,CAAC;QAEH,OAAO,IAAI,0BAAiB,CAAI,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAC3D,CAAC"}
1	+ {"version":3,"file":"base-tracker.query.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/queries/base-tracker.query.ts"],"names":[],"mappings":"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"}