npm - @iapps/d2-web-sdk - Versions diffs - 1.0.15 → 1.0.17 - Mend

@iapps/d2-web-sdk 1.0.15 → 1.0.17

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 (65) hide show

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

@@ -1,4 +1,4 @@
-import { D2HttpClient, D2HttpResponse, Pager, DataQueryFilter, ProgramDateType, OuMode } from '../../../shared';
+import { D2HttpClient, D2HttpResponse, Pager, DataQueryFilter, ProgramDateType, OuMode, DataOrderCriteria } from '../../../shared';
 import { Program } from '../../program';
 import { D2TrackerResponse, ITrackedEntityInstance, TrackedEntityInstance } from '../models';
 export type TrackerFetchScope = 'TRACKED_ENTITY' | 'ENROLLMENT';
@@ -14,6 +14,7 @@ export declare class BaseTrackerQuery<T extends TrackedEntityInstance> {
     protected enrollmentEnrolledAfter?: string;
     protected enrollmentEnrolledBefore?: string;
     protected trackedEntity?: string;
+    protected orderCriterias?: DataOrderCriteria[];
     event?: string;
     protected pager: Pager;
     [key: string]: unknown;
@@ -22,6 +23,7 @@ export declare class BaseTrackerQuery<T extends TrackedEntityInstance> {
     constructor(httpClient: D2HttpClient);
     setOrgUnit(orgUnitValue: string | string[]): BaseTrackerQuery<T>;
     setOuMode(ouMode: OuMode): BaseTrackerQuery<T>;
+    setOrderCriterias(orderCriterias: DataOrderCriteria[]): BaseTrackerQuery<T>;
     setProgram(program: string): BaseTrackerQuery<T>;
     setStartDate(startDate: string, dateType?: ProgramDateType): BaseTrackerQuery<T>;
     setEndDate(endDate: string, dateType?: ProgramDateType): BaseTrackerQuery<T>;
@@ -41,6 +43,8 @@ export declare class BaseTrackerQuery<T extends TrackedEntityInstance> {
         fetchScope: TrackerFetchScope;
     }): Promise<D2TrackerResponse<T>>;
     create(): Promise<T>;
+    setInstanceFields(program: Program): void;
+    protected fetchFromEvent(dataElementFilters: DataQueryFilter[], baseUrl: string): 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

@@ -9,6 +9,7 @@ const tslib_1 = require("tslib");
 const lodash_1 = require("lodash");
 const shared_1 = require("../../../shared");
 const models_1 = require("../models");
+const event_1 = require("../../event");
 class BaseTrackerQuery {
     constructor(httpClient) {
         _BaseTrackerQuery_instances.add(this);
@@ -28,6 +29,10 @@ class BaseTrackerQuery {
         this.ouMode = ouMode;
         return this;
     }
+    setOrderCriterias(orderCriterias) {
+        this.orderCriterias = orderCriterias;
+        return this;
+    }
     setProgram(program) {
         this.program = program;
         return this;
@@ -113,7 +118,7 @@ class BaseTrackerQuery {
     get(config) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const response = yield this.fetchData((config === null || config === void 0 ? void 0 : config.fetchScope) || 'TRACKED_ENTITY');
-            return new models_1.D2TrackerResponse(response, this.identifiable);
+            return new models_1.D2TrackerResponse(response, this.identifiable, this.program);
         });
     }
     create() {
@@ -128,25 +133,20 @@ class BaseTrackerQuery {
                         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
-                            ? (0, lodash_1.camelCase)(dataElement.code)
-                            : dataElement.id;
-                        return Object.assign(Object.assign({}, fieldObject), { [key]: {
-                                id: dataElement.id,
-                                type: 'DATA_ELEMENT',
-                                stageId: dataElement.programStageId,
-                            } });
-                    }, {})), (program.trackedEntityAttributes || []).reduce((fieldObject, trackedEntityAttribute) => {
-                        const key = trackedEntityAttribute.code
-                            ? (0, lodash_1.camelCase)(trackedEntityAttribute.code)
-                            : trackedEntityAttribute.id;
-                        return Object.assign(Object.assign({}, fieldObject), { [key]: {
-                                id: trackedEntityAttribute.id,
-                                type: 'ATTRIBUTE',
-                                generated: trackedEntityAttribute.generated,
-                            } });
-                    }, {}));
+                    const autoGeneratedProgramStages = (program.programStages || []).filter((programStage) => programStage.autoGenerateEvent);
+                    if (autoGeneratedProgramStages.length > 0) {
+                        autoGeneratedProgramStages.forEach((programStage) => {
+                            const event = new event_1.DHIS2Event({
+                                program: this.program,
+                                programStage: programStage.id,
+                                orgUnit: this.orgUnit,
+                            }, {
+                                generateIdIfNotExists: programStage.preGenerateUID,
+                            });
+                            this.instance.setEvent(event);
+                        });
+                    }
+                    this.setInstanceFields(program);
                     const reservedValues = yield this.generateReservedValues();
                     (reservedValues || []).forEach((reserved) => {
                         this.instance.setAttributeValue(reserved.ownerUid, reserved.value);
@@ -156,11 +156,60 @@ class BaseTrackerQuery {
             return this.instance;
         });
     }
+    setInstanceFields(program) {
+        this.instance.setFields(program);
+    }
+    fetchFromEvent(dataElementFilters, baseUrl) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a;
+            // TODO: This assumes all data element filters will be of the same program stage, there is currently no support to filter from multiple program stages
+            const programStage = dataElementFilters[0].programStage;
+            const attributeFilters = (this.filters || []).filter((filter) => filter.attributeType === 'TRACKED_ENTITY_ATTRIBUTE');
+            const eventQuery = yield new event_1.BaseEventQuery(this.httpClient)
+                .setFields('trackedEntity')
+                .setStartDate(this.enrollmentEnrolledAfter)
+                .setEndDate(this.enrollmentEnrolledBefore)
+                .setProgram(this.program)
+                .setPagination(this.pager)
+                .setOrgUnit(this.orgUnit)
+                .setOuMode(this.ouMode)
+                .setProgramStage(programStage)
+                .setFilters(dataElementFilters)
+                .setAttributeFilters(attributeFilters)
+                .get();
+            const trackedEntities = (_a = eventQuery === null || eventQuery === void 0 ? void 0 : eventQuery.data) === null || _a === void 0 ? void 0 : _a.map((event) => event.trackedEntity);
+            if (!trackedEntities || trackedEntities.length === 0) {
+                const eventResponse = new shared_1.D2HttpResponse({});
+                eventResponse.responseStatus = eventQuery.responseStatus;
+                eventResponse.data = Object.assign(Object.assign({}, eventQuery === null || eventQuery === void 0 ? void 0 : eventQuery.pagination), { trackedEntities: [] });
+                return eventResponse;
+            }
+            return yield this.httpClient.get(new models_1.TrackerUrlGenerator({
+                baseEndpoint: baseUrl,
+                program: this.program,
+                trackedEntityType: this.trackedEntityType,
+                orgUnit: this.orgUnit,
+                ouMode: this.ouMode,
+                filters: [],
+                fields: this.fields,
+                orderCriterias: this.orderCriterias,
+                enrollmentEnrolledAfter: this.enrollmentEnrolledAfter,
+                enrollmentEnrolledBefore: this.enrollmentEnrolledBefore,
+                trackedEntity: trackedEntities.join(';'),
+                pager: this.pager,
+                preferList: true,
+            }).generate());
+        });
+    }
     fetchData(fetchScope) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const baseUrl = fetchScope === 'ENROLLMENT'
                 ? 'tracker/enrollments'
                 : 'tracker/trackedEntities';
+            const dataElementFilters = (this.filters || []).filter((filter) => filter.attributeType === 'DATA_ELEMENT');
+            if (dataElementFilters.length > 0) {
+                return yield this.fetchFromEvent(dataElementFilters, baseUrl);
+            }
             return yield this.httpClient.get(new models_1.TrackerUrlGenerator({
                 baseEndpoint: baseUrl,
                 program: this.program,
@@ -169,6 +218,7 @@ class BaseTrackerQuery {
                 ouMode: this.ouMode,
                 filters: this.filters,
                 fields: this.fields,
+                orderCriterias: this.orderCriterias,
                 enrollmentEnrolledAfter: this.enrollmentEnrolledAfter,
                 enrollmentEnrolledBefore: this.enrollmentEnrolledBefore,
                 trackedEntity: this.trackedEntity,
@@ -271,19 +321,19 @@ _BaseTrackerQuery_instances = new WeakSet(), _BaseTrackerQuery_saveSelectedEvent
         const selectedEvent = (((_a = this.instance.latestEnrollment) === null || _a === void 0 ? void 0 : _a.events) || []).find((event) => event.event === this.event);
         if (selectedEvent) {
             const response = new shared_1.D2HttpResponse({});
-            return new models_1.D2TrackerResponse(response, this.identifiable);
+            return new models_1.D2TrackerResponse(response, this.identifiable, this.program);
         }
         const data = yield this.httpClient.post('tracker?async=false', {
             events: [selectedEvent.toObject()],
         });
-        return new models_1.D2TrackerResponse(data, this.identifiable);
+        return new models_1.D2TrackerResponse(data, this.identifiable, this.program);
     });
 }, _BaseTrackerQuery_saveAll = function _BaseTrackerQuery_saveAll() {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const data = yield this.httpClient.post('tracker?async=false', {
             trackedEntities: [this.instance.toObject()],
         });
-        return new models_1.D2TrackerResponse(data, this.identifiable);
+        return new models_1.D2TrackerResponse(data, this.identifiable, this.program);
     });
 };
 //# sourceMappingURL=base-tracker.query.js.map

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":"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"}
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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"}

package/src/lib/modules/tracker/utils/enrollment.util.js CHANGED Viewed

@@ -6,7 +6,7 @@ const models_1 = require("../models");
 class EnrollmentUtil {
     static getEnrollments(enrollmentResponse, params) {
         const enrollments = (enrollmentResponse || []).map((enrollment) => {
-            if (params.program) {
+            if (!enrollment['program'] && params.program) {
                 enrollment['program'] = params.program;
             }
             if (params.trackedEntityType) {

package/src/lib/modules/tracker/utils/enrollment.util.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"enrollment.util.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/utils/enrollment.util.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAC9C,sCAAoD;AAEpD,MAAa,cAAc;IACzB,MAAM,CAAC,cAAc,CACnB,kBAAyC,EACzC,MAAsD;QAEtD,MAAM,WAAW,GAAG,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;YAChE,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;~~gBACnB~~,UAAU,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC;YACzC,CAAC;YAED,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;gBAC7B,UAAU,CAAC,mBAAmB,CAAC,GAAG,MAAM,CAAC,iBAAiB,CAAC;YAC7D,CAAC;YAED,OAAO,IAAI,mBAAU,CAAC,UAAU,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,OAAO,cAAc,CAAC,eAAe,CAAC,WAAkB,CAAC,CAAC;IAC5D,CAAC;IACD,MAAM,CAAC,eAAe,CACpB,WAA0B,EAC1B,YAA4B,MAAM;QAElC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE;YACjD,MAAM,KAAK,GAAQ,IAAI,IAAI,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,cAAc,MAAI,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,YAAY,CAAA,CAAC,CAAC;YAClE,MAAM,KAAK,GAAQ,IAAI,IAAI,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,cAAc,MAAI,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,YAAY,CAAA,CAAC,CAAC;YAElE,QAAQ,SAAS,EAAE,CAAC;gBAClB,KAAK,MAAM;oBACT,OAAO,KAAK,GAAG,KAAK,CAAC;gBACvB,KAAK,KAAK,CAAC;gBACX;oBACE,OAAO,KAAK,GAAG,KAAK,CAAC;YACzB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,mBAAmB,CACxB,WAA0B,EAC1B,WAAW,GAAG,IAAI;QAElB,OAAO,CAAC,CAAC,WAAW;YAClB,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,cAAc,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,CAAC,oBAAoB,CACzB,UAAuB,EACvB,OAAe;QAEf,uCACK,UAAU,KACb,OAAO,EACP,WAAW,EAAE,EAAE,IACf;IACJ,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,OAMf;QACC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAChE,OAAO,CAAC;QACV,OAAO;YACL,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,IAAI;YAChB,eAAe,EAAE,IAAI;YACrB,OAAO;YACP,WAAW,EAAE,IAAI;YACjB,OAAO;YACP,aAAa;YACb,UAAU,EAAE,IAAA,oBAAW,GAAE;YACzB,iBAAiB;YACjB,MAAM,EAAE,EAAE;SACX,CAAC;IACJ,CAAC;CACF;AA/ED,wCA+EC"}
1	+ {"version":3,"file":"enrollment.util.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/utils/enrollment.util.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAC9C,sCAAoD;AAEpD,MAAa,cAAc;IACzB,MAAM,CAAC,cAAc,CACnB,kBAAyC,EACzC,MAAsD;QAEtD,MAAM,WAAW,GAAG,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;YAChE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBAC7C,UAAU,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC;YACzC,CAAC;YAED,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;gBAC7B,UAAU,CAAC,mBAAmB,CAAC,GAAG,MAAM,CAAC,iBAAiB,CAAC;YAC7D,CAAC;YAED,OAAO,IAAI,mBAAU,CAAC,UAAU,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,OAAO,cAAc,CAAC,eAAe,CAAC,WAAkB,CAAC,CAAC;IAC5D,CAAC;IACD,MAAM,CAAC,eAAe,CACpB,WAA0B,EAC1B,YAA4B,MAAM;QAElC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE;YACjD,MAAM,KAAK,GAAQ,IAAI,IAAI,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,cAAc,MAAI,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,YAAY,CAAA,CAAC,CAAC;YAClE,MAAM,KAAK,GAAQ,IAAI,IAAI,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,cAAc,MAAI,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,YAAY,CAAA,CAAC,CAAC;YAElE,QAAQ,SAAS,EAAE,CAAC;gBAClB,KAAK,MAAM;oBACT,OAAO,KAAK,GAAG,KAAK,CAAC;gBACvB,KAAK,KAAK,CAAC;gBACX;oBACE,OAAO,KAAK,GAAG,KAAK,CAAC;YACzB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,mBAAmB,CACxB,WAA0B,EAC1B,WAAW,GAAG,IAAI;QAElB,OAAO,CAAC,CAAC,WAAW;YAClB,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,cAAc,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,CAAC,oBAAoB,CACzB,UAAuB,EACvB,OAAe;QAEf,uCACK,UAAU,KACb,OAAO,EACP,WAAW,EAAE,EAAE,IACf;IACJ,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,OAMf;QACC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAChE,OAAO,CAAC;QACV,OAAO;YACL,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,IAAI;YAChB,eAAe,EAAE,IAAI;YACrB,OAAO;YACP,WAAW,EAAE,IAAI;YACjB,OAAO;YACP,aAAa;YACb,UAAU,EAAE,IAAA,oBAAW,GAAE;YACzB,iBAAiB;YACjB,MAAM,EAAE,EAAE;SACX,CAAC;IACJ,CAAC;CACF;AA/ED,wCA+EC"}

package/src/lib/shared/interfaces/data-filter-condition.interface.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 export declare enum DataFilterCondition {
     In = "IN",
     Equal = "EQ",
+    NotEqual = "NE",
     Like = "LIKE",
     Ilike = "ILIKE",
     LessThan = "LT",

package/src/lib/shared/interfaces/data-filter-condition.interface.js CHANGED Viewed

@@ -8,6 +8,7 @@ var DataFilterCondition;
 (function (DataFilterCondition) {
     DataFilterCondition["In"] = "IN";
     DataFilterCondition["Equal"] = "EQ";
+    DataFilterCondition["NotEqual"] = "NE";
     DataFilterCondition["Like"] = "LIKE";
     DataFilterCondition["Ilike"] = "ILIKE";
     DataFilterCondition["LessThan"] = "LT";

package/src/lib/shared/interfaces/data-filter-condition.interface.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"data-filter-condition.interface.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/interfaces/data-filter-condition.interface.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,IAAY,~~mBASX~~;~~AATD~~,WAAY,mBAAmB;IAC7B,gCAAS,CAAA;IACT,mCAAY,CAAA;IACZ,oCAAa,CAAA;IACb,sCAAe,CAAA;IACf,sCAAe,CAAA;IACf,+CAAwB,CAAA;IACxB,yCAAkB,CAAA;IAClB,kDAA2B,CAAA;AAC7B,CAAC,~~EATW~~,mBAAmB,mCAAnB,mBAAmB,~~QAS9B~~"}
1	+ {"version":3,"file":"data-filter-condition.interface.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/interfaces/data-filter-condition.interface.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,IAAY,mBAUX;AAVD,WAAY,mBAAmB;IAC7B,gCAAS,CAAA;IACT,mCAAY,CAAA;IACZ,sCAAe,CAAA;IACf,oCAAa,CAAA;IACb,sCAAe,CAAA;IACf,sCAAe,CAAA;IACf,+CAAwB,CAAA;IACxB,yCAAkB,CAAA;IAClB,kDAA2B,CAAA;AAC7B,CAAC,EAVW,mBAAmB,mCAAnB,mBAAmB,QAU9B"}

package/src/lib/shared/interfaces/data-order-criteria.interface.d.ts ADDED Viewed

@@ -0,0 +1,6 @@
+import { DataOrder } from './data-order.interface';
+import { DataOrderFields } from './data-order-field.interface';
+export interface IDataOrderCriteria {
+    field: DataOrderFields;
+    order: DataOrder;
+}

package/src/lib/shared/interfaces/data-order-criteria.interface.js ADDED Viewed

@@ -0,0 +1,6 @@
+"use strict";
+// Copyright 2025 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.
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=data-order-criteria.interface.js.map

package/src/lib/shared/interfaces/data-order-criteria.interface.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"data-order-criteria.interface.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/interfaces/data-order-criteria.interface.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD"}

package/src/lib/shared/interfaces/data-order-field.interface.d.ts ADDED Viewed

@@ -0,0 +1 @@

package/src/lib/shared/interfaces/data-order-field.interface.js ADDED Viewed

@@ -0,0 +1,6 @@
+"use strict";
+// Copyright 2025 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.
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=data-order-field.interface.js.map

package/src/lib/shared/interfaces/data-order-field.interface.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"data-order-field.interface.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/interfaces/data-order-field.interface.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD"}

package/src/lib/shared/interfaces/data-order.interface.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export type DataOrder = 'desc' \| 'asc';

package/src/lib/shared/interfaces/data-order.interface.js ADDED Viewed

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=data-order.interface.js.map

package/src/lib/shared/interfaces/data-order.interface.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"data-order.interface.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/interfaces/data-order.interface.ts"],"names":[],"mappings":""}

package/src/lib/shared/interfaces/index.d.ts CHANGED Viewed

@@ -2,3 +2,6 @@ export * from './data-filter-condition.interface';
 export * from './data-query-filter.interface';
 export * from './ou-mode.interface';
 export * from './program-date-type.interface';
+export * from './data-order-criteria.interface';
+export * from './data-order-field.interface';
+export * from './data-order.interface';

package/src/lib/shared/interfaces/index.js CHANGED Viewed

@@ -8,4 +8,7 @@ tslib_1.__exportStar(require("./data-filter-condition.interface"), exports);
 tslib_1.__exportStar(require("./data-query-filter.interface"), exports);
 tslib_1.__exportStar(require("./ou-mode.interface"), exports);
 tslib_1.__exportStar(require("./program-date-type.interface"), exports);
+tslib_1.__exportStar(require("./data-order-criteria.interface"), exports);
+tslib_1.__exportStar(require("./data-order-field.interface"), exports);
+tslib_1.__exportStar(require("./data-order.interface"), exports);
 //# sourceMappingURL=index.js.map

package/src/lib/shared/interfaces/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/interfaces/index.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,4EAAkD;AAClD,wEAA8C;AAC9C,8DAAoC;AACpC,wEAA8C"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/interfaces/index.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,4EAAkD;AAClD,wEAA8C;AAC9C,8DAAoC;AACpC,wEAA8C;AAC9C,0EAAgD;AAChD,uEAA6C;AAC7C,iEAAuC"}

package/src/lib/shared/models/data-order-criteria.model.d.ts ADDED Viewed

@@ -0,0 +1,8 @@
+import { DataOrder, DataOrderFields, IDataOrderCriteria } from '../interfaces';
+export declare class DataOrderCriteria implements IDataOrderCriteria {
+    field: DataOrderFields;
+    order: DataOrder;
+    setField(field: DataOrderFields): DataOrderCriteria;
+    setOrder(order: DataOrder): DataOrderCriteria;
+    getQueryParams(): string;
+}

package/src/lib/shared/models/data-order-criteria.model.js ADDED Viewed

@@ -0,0 +1,27 @@
+"use strict";
+// Copyright 2025 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.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataOrderCriteria = void 0;
+class DataOrderCriteria {
+    constructor() {
+        this.order = 'asc';
+    }
+    setField(field) {
+        this.field = field;
+        return this;
+    }
+    setOrder(order) {
+        this.order = order;
+        return this;
+    }
+    getQueryParams() {
+        if (!this.order) {
+            return `order=${this.field}`;
+        }
+        return `order=${this.field}:${this.order}`;
+    }
+}
+exports.DataOrderCriteria = DataOrderCriteria;
+//# sourceMappingURL=data-order-criteria.model.js.map

package/src/lib/shared/models/data-order-criteria.model.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"data-order-criteria.model.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/models/data-order-criteria.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAIjD,MAAa,iBAAiB;IAA9B;QAEE,UAAK,GAAc,KAAK,CAAC;IAmB3B,CAAC;IAjBC,QAAQ,CAAC,KAAsB;QAC7B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,QAAQ,CAAC,KAAgB;QACvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,cAAc;QACZ,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,OAAO,SAAS,IAAI,CAAC,KAAK,EAAE,CAAC;QAC/B,CAAC;QAED,OAAO,SAAS,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;IAC7C,CAAC;CACF;AArBD,8CAqBC"}

package/src/lib/shared/models/data-query-filter.model.d.ts CHANGED Viewed

@@ -1,12 +1,17 @@
 import { DataFilterCondition, IDataQueryFilter } from '../interfaces';
+export type DataQueryAttributeType = 'DATA_ELEMENT' | 'TRACKED_ENTITY_ATTRIBUTE';
 export declare class DataQueryFilter implements IDataQueryFilter {
     attribute: string;
     condition: DataFilterCondition;
     value: string | string[];
+    attributeType: DataQueryAttributeType;
+    programStage: string;
     setAttribute(attribute: string): DataQueryFilter;
     setCondition(condition: DataFilterCondition): DataQueryFilter;
     setValue(value: string | string[]): DataQueryFilter;
-    static getApiFilters(filters: DataQueryFilter[]): string;
-    toApiFilters(): string;
+    setType(type: DataQueryAttributeType): DataQueryFilter;
+    setProgramStage(programStage: string): DataQueryFilter;
+    static getApiFilters(filters: DataQueryFilter[], filterKey?: string): string;
+    toApiFilters(filterKey?: string): string;
     private _getApiFilterValue;
 }

package/src/lib/shared/models/data-query-filter.model.js CHANGED Viewed

@@ -6,6 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataQueryFilter = void 0;
 const interfaces_1 = require("../interfaces");
 class DataQueryFilter {
+    constructor() {
+        this.attributeType = 'TRACKED_ENTITY_ATTRIBUTE';
+    }
     setAttribute(attribute) {
         this.attribute = attribute;
         return this;
@@ -18,13 +21,21 @@ class DataQueryFilter {
         this.value = value;
         return this;
     }
-    static getApiFilters(filters) {
+    setType(type) {
+        this.attributeType = type;
+        return this;
+    }
+    setProgramStage(programStage) {
+        this.programStage = programStage;
+        return this;
+    }
+    static getApiFilters(filters, filterKey = 'filter') {
         return filters
-            .map((trackerQueryFilter) => trackerQueryFilter.toApiFilters())
+            .map((trackerQueryFilter) => trackerQueryFilter.toApiFilters(filterKey))
             .join('&');
     }
-    toApiFilters() {
-        return `filter=${this.attribute}:${this.condition}:${this._getApiFilterValue()}`;
+    toApiFilters(filterKey = 'filter') {
+        return `${filterKey}=${this.attribute}:${this.condition}:${this._getApiFilterValue()}`;
     }
     _getApiFilterValue() {
         switch (this.condition) {

package/src/lib/shared/models/data-query-filter.model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"data-query-filter.model.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/models/data-query-filter.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,8CAAsE;~~AAEtE~~,MAAa,eAAe;~~IAK1B~~,YAAY,CAAC,SAAiB;QAC5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY,CAAC,SAA8B;QACzC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,QAAQ,CAAC,KAAwB;QAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,~~MAAM~~,CAAC,aAAa,CAAC,OAA0B;~~QAC7C~~,OAAO,OAAO;aACX,GAAG,CAAC,CAAC,kBAAkB,EAAE,EAAE,CAAC,kBAAkB,CAAC,YAAY,~~EAAE~~,CAAC;~~aAC9D~~,IAAI,CAAC,GAAG,CAAC,CAAC;IACf,CAAC;IAED,YAAY;~~QACV~~,OAAO,~~UAAU~~,IAAI,CAAC,SAAS,~~IAC7B~~,IAAI,CAAC,SACP,IAAI,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC;IAClC,CAAC;IAEO,kBAAkB;QACxB,QAAQ,IAAI,CAAC,SAAS,EAAE,CAAC;YACvB,KAAK,gCAAmB,CAAC,EAAE;gBACzB,OAAQ,IAAI,CAAC,KAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAE5C;gBACE,OAAO,IAAI,CAAC,KAAK,CAAC;QACtB,CAAC;IACH,CAAC;CACF;~~AAzCD~~,~~0CAyCC~~"}
1	+ {"version":3,"file":"data-query-filter.model.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/models/data-query-filter.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,8CAAsE;AAKtE,MAAa,eAAe;IAA5B;QAIE,kBAAa,GAA2B,0BAA0B,CAAC;IAmDrE,CAAC;IAhDC,YAAY,CAAC,SAAiB;QAC5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY,CAAC,SAA8B;QACzC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,QAAQ,CAAC,KAAwB;QAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CAAC,IAA4B;QAClC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,eAAe,CAAC,YAAoB;QAClC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,CAAC,aAAa,CAClB,OAA0B,EAC1B,SAAS,GAAG,QAAQ;QAEpB,OAAO,OAAO;aACX,GAAG,CAAC,CAAC,kBAAkB,EAAE,EAAE,CAAC,kBAAkB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;aACvE,IAAI,CAAC,GAAG,CAAC,CAAC;IACf,CAAC;IAED,YAAY,CAAC,SAAS,GAAG,QAAQ;QAC/B,OAAO,GAAG,SAAS,IAAI,IAAI,CAAC,SAAS,IACnC,IAAI,CAAC,SACP,IAAI,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC;IAClC,CAAC;IAEO,kBAAkB;QACxB,QAAQ,IAAI,CAAC,SAAS,EAAE,CAAC;YACvB,KAAK,gCAAmB,CAAC,EAAE;gBACzB,OAAQ,IAAI,CAAC,KAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAE5C;gBACE,OAAO,IAAI,CAAC,KAAK,CAAC;QACtB,CAAC;IACH,CAAC;CACF;AAvDD,0CAuDC"}

package/src/lib/shared/models/data-url-generator.model.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import { DataQueryFilter } from './data-query-filter.model';
 import { OuMode } from '../interfaces';
 import { Pager } from './pager.model';
+import { DataOrderCriteria } from './data-order-criteria.model';
 export declare abstract class DataUrlGenerator<T extends DataUrlGenerator<T>> {
     abstract baseEndpoint: string;
     fields: string;
@@ -8,6 +9,7 @@ export declare abstract class DataUrlGenerator<T extends DataUrlGenerator<T>> {
     ouMode: OuMode;
     program?: string;
     filters?: DataQueryFilter[];
+    orderCriterias?: DataOrderCriteria[];
     enrollmentEnrolledAfter?: string;
     enrollmentEnrolledBefore?: string;
     pager: Pager;

package/src/lib/shared/models/data-url-generator.model.js CHANGED Viewed

@@ -18,6 +18,7 @@ class DataUrlGenerator {
         this.enrollmentEnrolledAfter = params.enrollmentEnrolledAfter;
         this.enrollmentEnrolledBefore = params.enrollmentEnrolledBefore;
         this.pager = params.pager || new pager_model_1.Pager();
+        this.orderCriterias = params.orderCriterias;
     }
     addProgram(url) {
         if (!this.program) {
@@ -60,8 +61,14 @@ class DataUrlGenerator {
                 : ''}enrollmentEnrolledBefore=${this.enrollmentEnrolledBefore}`);
     }
     addOrder(url) {
+        if (!this.orderCriterias) {
+            return url;
+        }
         const isThereParams = this.isThereQueryParams(url);
-        return url + `${isThereParams ? '&' : '?'}order=updatedAt:desc`;
+        return (url +
+            `${isThereParams ? '&' : '?'}${this.orderCriterias
+                .map((orderCriteria) => orderCriteria.getQueryParams())
+                .join('&')}`);
     }
     addPager(url) {
         const isThereParams = this.isThereQueryParams(url);

package/src/lib/shared/models/data-url-generator.model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"data-url-generator.model.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/models/data-url-generator.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,uEAA4D;AAE5D,+CAAsC;~~AAEtC~~,MAAsB,gBAAgB;~~IAWpC~~,YAAY,MAAkB;QAC5B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,UAAU,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,uBAAuB,GAAG,MAAM,CAAC,uBAAuB,CAAC;QAC9D,IAAI,CAAC,wBAAwB,GAAG,MAAM,CAAC,wBAAwB,CAAC;QAChE,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,IAAI,mBAAK,EAAE,CAAC;~~IAC3C~~,CAAC;IAID,UAAU,CAAC,GAAW;QACpB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO,GAAG,CAAC;QACb,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAEnD,OAAO,GAAG,GAAG,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,WAAW,IAAI,CAAC,OAAO,EAAE,CAAC;IACrE,CAAC;IAED,UAAU,CAAC,GAAW;QACpB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO,GAAG,CAAC;QACb,CAAC;QAED,MAAM,YAAY,GAAG,yCAAe,CAAC,aAAa,CAChD,IAAI,CAAC,OAA4B,CAClC,CAAC;QAEF,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAEnD,OAAO,GAAG,GAAG,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,YAAY,EAAE,CAAC;IAC7D,CAAC;IAED,UAAU,CAAC,GAAW;QACpB,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACnD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO,GAAG,GAAG,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,UAAU,IAAI,CAAC,MAAM,EAAE,CAAC;QACnE,CAAC;QAED,OAAO,CACL,GAAG;YACH,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,WAAW,IAAI,CAAC,OAAO,GACjD,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAC3C,EAAE,CACH,CAAC;IACJ,CAAC;IAED,SAAS,CAAC,GAAW;QACnB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,GAAG,CAAC;QACb,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAEnD,OAAO,GAAG,GAAG,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,UAAU,IAAI,CAAC,MAAM,EAAE,CAAC;IACnE,CAAC;IAED,kBAAkB,CAAC,GAAW;QAC5B,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC;YACnC,OAAO,GAAG,CAAC;QACb,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAEnD,OAAO,CACL,GAAG;YACH,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAC1B,IAAI,CAAC,uBAAuB;gBAC1B,CAAC,CAAC,2BAA2B,IAAI,CAAC,uBAAuB,GAAG;gBAC5D,CAAC,CAAC,EACN,4BAA4B,IAAI,CAAC,wBAAwB,EAAE,CAC5D,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,GAAW;QAClB,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAEnD,OAAO,~~GAAG~~,GAAG,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,~~sBAAsB~~,CAAC;~~IAClE~~,CAAC;IAED,QAAQ,CAAC,GAAW;QAClB,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAEnD,OAAO,CACL,GAAG,GAAG,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,oBAAoB,EAAE,EAAE,CACzE,CAAC;IACJ,CAAC;IAED,kBAAkB,CAAC,GAAW;QAC5B,OAAO,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;CACF;~~AAzGD~~,~~4CAyGC~~"}
1	+ {"version":3,"file":"data-url-generator.model.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/models/data-url-generator.model.ts"],"names":[],"mappings":"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"}

package/src/lib/shared/models/index.d.ts CHANGED Viewed

@@ -14,3 +14,4 @@ export * from './http-client-config.model';
 export * from './d2-http-request-config.model';
 export * from './data-query-filter.model';
 export * from './data-url-generator.model';
+export * from './data-order-criteria.model';

package/src/lib/shared/models/index.js CHANGED Viewed

@@ -20,4 +20,5 @@ tslib_1.__exportStar(require("./http-client-config.model"), exports);
 tslib_1.__exportStar(require("./d2-http-request-config.model"), exports);
 tslib_1.__exportStar(require("./data-query-filter.model"), exports);
 tslib_1.__exportStar(require("./data-url-generator.model"), exports);
+tslib_1.__exportStar(require("./data-order-criteria.model"), exports);
 //# sourceMappingURL=index.js.map

package/src/lib/shared/models/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/models/index.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,sEAA4C;AAC5C,+DAAqC;AACrC,kEAAwC;AACxC,wDAA8B;AAC9B,uDAA6B;AAC7B,oEAA0C;AAC1C,gEAAsC;AACtC,8DAAoC;AACpC,wDAA8B;AAC9B,8DAAoC;AACpC,yEAA+C;AAC/C,gEAAsC;AACtC,qEAA2C;AAC3C,yEAA+C;AAC/C,oEAA0C;AAC1C,qEAA2C"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/models/index.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,sEAA4C;AAC5C,+DAAqC;AACrC,kEAAwC;AACxC,wDAA8B;AAC9B,uDAA6B;AAC7B,oEAA0C;AAC1C,gEAAsC;AACtC,8DAAoC;AACpC,wDAA8B;AAC9B,8DAAoC;AACpC,yEAA+C;AAC/C,gEAAsC;AACtC,qEAA2C;AAC3C,yEAA+C;AAC/C,oEAA0C;AAC1C,qEAA2C;AAC3C,sEAA4C"}