@iapps/d2-web-sdk 1.0.10 → 1.0.12

package/src/lib/modules/tracker/models/tracker-url-generator.model.js

@@ -2,100 +2,40 @@
 // Copyright 2023 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.
-var _TrackerUrlGenerator_instances, _TrackerUrlGenerator_baseEndpoint, _TrackerUrlGenerator_orgUnit, _TrackerUrlGenerator_ouMode, _TrackerUrlGenerator_program, _TrackerUrlGenerator_trackedEntityType, _TrackerUrlGenerator_fields, _TrackerUrlGenerator_enrollmentEnrolledAfter, _TrackerUrlGenerator_enrollmentEnrolledBefore, _TrackerUrlGenerator_trackedEntity, _TrackerUrlGenerator_pager, _TrackerUrlGenerator_addProgram, _TrackerUrlGenerator_addTrackedEntityType, _TrackerUrlGenerator_addFilters, _TrackerUrlGenerator_addOrgUnit, _TrackerUrlGenerator_addFields, _TrackerUrlGenerator_addTrackedEntity, _TrackerUrlGenerator_addEnrollmentDates, _TrackerUrlGenerator_addOrder, _TrackerUrlGenerator_addPager, _TrackerUrlGenerator_isThereQueryParams;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrackerUrlGenerator = void 0;
-const tslib_1 = require("tslib");
 const shared_1 = require("../../../shared");
-const tracker_query_filter_model_1 = require("./tracker-query-filter.model");
-class TrackerUrlGenerator {
+const DEFAULT_FIELDS = 'createdAt,updatedAt,trackedEntity,trackedEntityType,orgUnit,orgUnitName,attributes,enrollments[enrollment,enrolledAt,occurredAt,program,status,orgUnit,storedBy,events[event,occurredAt,dueDate,scheduledAt,status,programStage,program,trackedEntity,enrollment,orgUnit,orgUnitName,assignedUser,storedBy,dataValues]],relationships[relationship,relationshipType,from[trackedEntity[trackedEntity]],to[trackedEntity[trackedEntity]]';
+class TrackerUrlGenerator extends shared_1.DataUrlGenerator {
     constructor(params) {
         var _a;
-        _TrackerUrlGenerator_instances.add(this);
-        _TrackerUrlGenerator_baseEndpoint.set(this, 'tracker/trackedEntities');
-        _TrackerUrlGenerator_orgUnit.set(this, void 0);
-        _TrackerUrlGenerator_ouMode.set(this, 'SELECTED');
-        _TrackerUrlGenerator_program.set(this, void 0);
-        _TrackerUrlGenerator_trackedEntityType.set(this, void 0);
-        _TrackerUrlGenerator_fields.set(this, 'createdAt,updatedAt,trackedEntity,trackedEntityType,orgUnit,orgUnitName,attributes,enrollments[enrollment,enrolledAt,occurredAt,program,status,orgUnit,storedBy,events[event,occurredAt,dueDate,scheduledAt,status,programStage,program,trackedEntity,enrollment,orgUnit,orgUnitName,assignedUser,storedBy,dataValues]],relationships[relationship,relationshipType,from[trackedEntity[trackedEntity]],to[trackedEntity[trackedEntity]]');
-        _TrackerUrlGenerator_enrollmentEnrolledAfter.set(this, void 0);
-        _TrackerUrlGenerator_enrollmentEnrolledBefore.set(this, void 0);
-        _TrackerUrlGenerator_trackedEntity.set(this, void 0);
-        _TrackerUrlGenerator_pager.set(this, void 0);
-        tslib_1.__classPrivateFieldSet(this, _TrackerUrlGenerator_program, params.program, "f");
-        tslib_1.__classPrivateFieldSet(this, _TrackerUrlGenerator_trackedEntityType, params.trackedEntityType, "f");
-        tslib_1.__classPrivateFieldSet(this, _TrackerUrlGenerator_orgUnit, params.orgUnit, "f");
-        tslib_1.__classPrivateFieldSet(this, _TrackerUrlGenerator_ouMode, params.ouMode || tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_ouMode, "f"), "f");
-        this.filters = params.filters;
-        tslib_1.__classPrivateFieldSet(this, _TrackerUrlGenerator_fields, (_a = params.fields) !== null && _a !== void 0 ? _a : tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_fields, "f"), "f");
-        tslib_1.__classPrivateFieldSet(this, _TrackerUrlGenerator_enrollmentEnrolledAfter, params.enrollmentEnrolledAfter, "f");
-        tslib_1.__classPrivateFieldSet(this, _TrackerUrlGenerator_enrollmentEnrolledBefore, params.enrollmentEnrolledBefore, "f");
-        tslib_1.__classPrivateFieldSet(this, _TrackerUrlGenerator_trackedEntity, params.trackedEntity, "f");
-        tslib_1.__classPrivateFieldSet(this, _TrackerUrlGenerator_pager, params.pager || new shared_1.Pager(), "f");
+        super(params);
+        this.baseEndpoint = 'tracker/trackedEntities';
+        this.trackedEntityType = params.trackedEntityType;
+        this.fields = (_a = params.fields) !== null && _a !== void 0 ? _a : DEFAULT_FIELDS;
+        this.trackedEntity = params.trackedEntity;
     }
     generate() {
-        return tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_instances, "m", _TrackerUrlGenerator_addPager).call(this, tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_instances, "m", _TrackerUrlGenerator_addOrder).call(this, tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_instances, "m", _TrackerUrlGenerator_addEnrollmentDates).call(this, tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_instances, "m", _TrackerUrlGenerator_addFields).call(this, tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_instances, "m", _TrackerUrlGenerator_addOrgUnit).call(this, tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_instances, "m", _TrackerUrlGenerator_addFilters).call(this, tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_instances, "m", _TrackerUrlGenerator_addTrackedEntityType).call(this, tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_instances, "m", _TrackerUrlGenerator_addProgram).call(this, tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_instances, "m", _TrackerUrlGenerator_addTrackedEntity).call(this, `${tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_baseEndpoint, "f")}`)))))))));
+        return this.addPager(this.addOrder(this.addEnrollmentDates(this.addFields(this.addOrgUnit(this.addFilters(this.addTrackedEntityType(this.addProgram(this.addTrackedEntity(`${this.baseEndpoint}`)))))))));
+    }
+    addTrackedEntityType(url) {
+        if (!this.trackedEntityType || this.program) {
+            return url;
+        }
+        const isThereParams = this.isThereQueryParams(url);
+        return (url +
+            `${isThereParams ? '&' : '?'}trackedEntityType=${this.trackedEntityType}`);
+    }
+    addTrackedEntity(url) {
+        if (!this.trackedEntity) {
+            return url;
+        }
+        if (this.trackedEntity.split(';').length === 1) {
+            return url + `/${this.trackedEntity}`;
+        }
+        const isThereParams = this.isThereQueryParams(url);
+        return (url + `${isThereParams ? '&' : '?'}trackedEntity=${this.trackedEntity}`);
     }
 }
 exports.TrackerUrlGenerator = TrackerUrlGenerator;
-_TrackerUrlGenerator_baseEndpoint = new WeakMap(), _TrackerUrlGenerator_orgUnit = new WeakMap(), _TrackerUrlGenerator_ouMode = new WeakMap(), _TrackerUrlGenerator_program = new WeakMap(), _TrackerUrlGenerator_trackedEntityType = new WeakMap(), _TrackerUrlGenerator_fields = new WeakMap(), _TrackerUrlGenerator_enrollmentEnrolledAfter = new WeakMap(), _TrackerUrlGenerator_enrollmentEnrolledBefore = new WeakMap(), _TrackerUrlGenerator_trackedEntity = new WeakMap(), _TrackerUrlGenerator_pager = new WeakMap(), _TrackerUrlGenerator_instances = new WeakSet(), _TrackerUrlGenerator_addProgram = function _TrackerUrlGenerator_addProgram(url) {
-    if (!tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_program, "f")) {
-        return url;
-    }
-    const isThereParams = tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_instances, "m", _TrackerUrlGenerator_isThereQueryParams).call(this, url);
-    return url + `${isThereParams ? '&' : '?'}program=${tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_program, "f")}`;
-}, _TrackerUrlGenerator_addTrackedEntityType = function _TrackerUrlGenerator_addTrackedEntityType(url) {
-    if (!tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_trackedEntityType, "f") || tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_program, "f")) {
-        return url;
-    }
-    const isThereParams = tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_instances, "m", _TrackerUrlGenerator_isThereQueryParams).call(this, url);
-    return (url +
-        `${isThereParams ? '&' : '?'}trackedEntityType=${tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_trackedEntityType, "f")}`);
-}, _TrackerUrlGenerator_addFilters = function _TrackerUrlGenerator_addFilters(url) {
-    if (!this.filters) {
-        return url;
-    }
-    const filterParams = tracker_query_filter_model_1.TrackerQueryFilter.getApiFilters(this.filters);
-    const isThereParams = tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_instances, "m", _TrackerUrlGenerator_isThereQueryParams).call(this, url);
-    return url + `${isThereParams ? '&' : '?'}${filterParams}`;
-}, _TrackerUrlGenerator_addOrgUnit = function _TrackerUrlGenerator_addOrgUnit(url) {
-    const isThereParams = tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_instances, "m", _TrackerUrlGenerator_isThereQueryParams).call(this, url);
-    if (!tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_orgUnit, "f")) {
-        return url + `${isThereParams ? '&' : '?'}ouMode=${tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_ouMode, "f")}`;
-    }
-    return (url +
-        `${isThereParams ? '&' : '?'}orgUnit=${tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_orgUnit, "f")}${tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_ouMode, "f") ? `&ouMode=${tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_ouMode, "f")}` : ''}`);
-}, _TrackerUrlGenerator_addFields = function _TrackerUrlGenerator_addFields(url) {
-    if (!tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_fields, "f")) {
-        return url;
-    }
-    const isThereParams = tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_instances, "m", _TrackerUrlGenerator_isThereQueryParams).call(this, url);
-    return url + `${isThereParams ? '&' : '?'}fields=${tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_fields, "f")}`;
-}, _TrackerUrlGenerator_addTrackedEntity = function _TrackerUrlGenerator_addTrackedEntity(url) {
-    if (!tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_trackedEntity, "f")) {
-        return url;
-    }
-    if (tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_trackedEntity, "f").split(';').length === 1) {
-        return url + `/${tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_trackedEntity, "f")}`;
-    }
-    const isThereParams = tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_instances, "m", _TrackerUrlGenerator_isThereQueryParams).call(this, url);
-    return (url + `${isThereParams ? '&' : '?'}trackedEntity=${tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_trackedEntity, "f")}`);
-}, _TrackerUrlGenerator_addEnrollmentDates = function _TrackerUrlGenerator_addEnrollmentDates(url) {
-    if (!tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_enrollmentEnrolledBefore, "f")) {
-        return url;
-    }
-    const isThereParams = tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_instances, "m", _TrackerUrlGenerator_isThereQueryParams).call(this, url);
-    return (url +
-        `${isThereParams ? '&' : '?'}${tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_enrollmentEnrolledAfter, "f")
-            ? `enrollmentEnrolledAfter=${tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_enrollmentEnrolledAfter, "f")}&`
-            : ''}enrollmentEnrolledBefore=${tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_enrollmentEnrolledBefore, "f")}`);
-}, _TrackerUrlGenerator_addOrder = function _TrackerUrlGenerator_addOrder(url) {
-    const isThereParams = tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_instances, "m", _TrackerUrlGenerator_isThereQueryParams).call(this, url);
-    return url + `${isThereParams ? '&' : '?'}order=updatedAt:desc`;
-}, _TrackerUrlGenerator_addPager = function _TrackerUrlGenerator_addPager(url) {
-    const isThereParams = tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_instances, "m", _TrackerUrlGenerator_isThereQueryParams).call(this, url);
-    return (url + `${isThereParams ? '&' : '?'}${tslib_1.__classPrivateFieldGet(this, _TrackerUrlGenerator_pager, "f").getPagingQueryParams()}`);
-}, _TrackerUrlGenerator_isThereQueryParams = function _TrackerUrlGenerator_isThereQueryParams(url) {
-    return (url || '').includes('?');
-};
 //# sourceMappingURL=tracker-url-generator.model.js.map

package/src/lib/modules/tracker/models/tracker-url-generator.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"tracker-url-generator.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/models/tracker-url-generator.model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tracker-url-generator.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/models/tracker-url-generator.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,4CAA2E;AAE3E,MAAM,cAAc,GAClB,yaAAya,CAAC;AAE5a,MAAa,mBAAoB,SAAQ,yBAAqC;IAK5E,YAAY,MAAoC;;QAC9C,KAAK,CAAC,MAAM,CAAC,CAAC;QALhB,iBAAY,GAAG,yBAAyB,CAAC;QAMvC,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;QAClD,IAAI,CAAC,MAAM,GAAG,MAAA,MAAM,CAAC,MAAM,mCAAI,cAAc,CAAC;QAC9C,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;IAC5C,CAAC;IAEQ,QAAQ;QACf,OAAO,IAAI,CAAC,QAAQ,CAClB,IAAI,CAAC,QAAQ,CACX,IAAI,CAAC,kBAAkB,CACrB,IAAI,CAAC,SAAS,CACZ,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,oBAAoB,CACvB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAC/D,CACF,CACF,CACF,CACF,CACF,CACF,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAC,GAAW;QAC9B,IAAI,CAAC,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAC5C,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,qBAAqB,IAAI,CAAC,iBAAiB,EAAE,CAC1E,CAAC;IACJ,CAAC;IAED,gBAAgB,CAAC,GAAW;QAC1B,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,OAAO,GAAG,CAAC;QACb,CAAC;QAED,IAAI,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/C,OAAO,GAAG,GAAG,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QACxC,CAAC;QAED,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,iBAAiB,IAAI,CAAC,aAAa,EAAE,CACxE,CAAC;IACJ,CAAC;CACF;AA1DD,kDA0DC"}

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

@@ -1,14 +1,14 @@
-import { D2HttpClient, D2HttpResponse, Pager } from '../../../shared';
+import { D2HttpClient, D2HttpResponse, Pager, DataQueryFilter, ProgramDateType, OuMode } from '../../../shared';
 import { Program } from '../../program';
-import { D2TrackerResponse, ITrackedEntityInstance, ProgramDateType, TrackedEntityInstance, TrackerQueryFilter } from '../models';
+import { D2TrackerResponse, ITrackedEntityInstance, TrackedEntityInstance } from '../models';
 export declare class BaseTrackerQuery<T extends TrackedEntityInstance> {
     #private;
     protected httpClient: D2HttpClient;
     protected orgUnit?: string;
-    protected ouMode: 'ALL' | 'DESCENDANTS' | 'SELECTED';
+    protected ouMode: OuMode;
     protected program?: string;
     protected trackedEntityType?: string;
-    protected filters?: TrackerQueryFilter[];
+    protected filters?: DataQueryFilter[];
     protected fields?: string;
     protected enrollmentEnrolledAfter?: string;
     protected enrollmentEnrolledBefore?: string;
@@ -20,14 +20,14 @@ export declare class BaseTrackerQuery<T extends TrackedEntityInstance> {
     identifiable: ITrackedEntityInstance;
     constructor(httpClient: D2HttpClient);
     setOrgUnit(orgUnitValue: string | string[]): BaseTrackerQuery<T>;
-    setOuMode(ouMode: 'ALL' | 'DESCENDANTS' | 'SELECTED'): BaseTrackerQuery<T>;
+    setOuMode(ouMode: OuMode): BaseTrackerQuery<T>;
     setProgram(program: string): BaseTrackerQuery<T>;
     setStartDate(startDate: string, dateType?: ProgramDateType): BaseTrackerQuery<T>;
     setEndDate(endDate: string, dateType?: ProgramDateType): BaseTrackerQuery<T>;
     setTrackedEntity(trackedEntity: string): BaseTrackerQuery<T>;
     setTrackedEntities(trackedEntities: string[]): BaseTrackerQuery<T>;
     setTrackedEntityType(trackedEntityType: string): BaseTrackerQuery<T>;
-    setFilters(filters: TrackerQueryFilter[]): BaseTrackerQuery<T>;
+    setFilters(filters: DataQueryFilter[]): BaseTrackerQuery<T>;
     setFields(fields: string): BaseTrackerQuery<T>;
     setPagination(pagination: Pager): BaseTrackerQuery<T>;
     setData(data: T): BaseTrackerQuery<T>;

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

@@ -188,6 +188,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 +223,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;
@@ -243,10 +273,6 @@ _BaseTrackerQuery_instances = new WeakSet(), _BaseTrackerQuery_saveSelectedEvent
     });
 }, _BaseTrackerQuery_saveAll = function _BaseTrackerQuery_saveAll() {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const reservedValues = yield this.generateReservedValues();
-        (reservedValues || []).forEach((reserved) => {
-            this.instance.setAttributeValue(reserved.ownerUid, reserved.value);
-        });
         const data = yield this.httpClient.post('tracker?async=false', {
             trackedEntities: [this.instance.toObject()],
         });

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

@@ -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,4CAKyB;AAEzB,sCAOmB;AAEnB,MAAa,gBAAgB;IAe3B,YAAsB,UAAwB;;QAAxB,eAAU,GAAV,UAAU,CAAc;QAbpC,WAAM,GAAuC,KAAK,CAAC;QASnD,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,OAAO,IAAI,CAAC;IACd,CAAC;IAED,SAAS,CAAC,MAA0C;QAClD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,UAAU,CAAC,OAAe;QACxB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY,CACV,SAAiB,EACjB,WAA4B,aAAa;QAEzC,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,aAAa;gBAChB,IAAI,CAAC,uBAAuB,GAAG,SAAS,CAAC;gBACzC,MAAM;YAER;gBACE,MAAM;QACV,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,UAAU,CACR,OAAe,EACf,WAA4B,aAAa;QAEzC,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,aAAa;gBAChB,IAAI,CAAC,wBAAwB,GAAG,OAAO,CAAC;gBACxC,MAAM;YAER;gBACE,MAAM;QACV,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IACD,gBAAgB,CAAC,aAAqB;QACpC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,kBAAkB,CAAC,eAAyB;QAC1C,IAAI,CAAC,aAAa,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,oBAAoB,CAAC,iBAAyB;QAC5C,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,UAAU,CAAC,OAA6B;QACtC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,SAAS,CAAC,MAAc;QACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,CAAC,UAAiB;QAC7B,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CAAC,IAAO;QACb,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,SAAS,CAAC,KAAa;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAEK,sBAAsB;;YAG1B,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC;YAEjD,MAAM,yBAAyB,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;iBACzD,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;gBACd,MAAM,KAAK,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;gBACjC,OAAO,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,SAAS,CAAC;YAC1B,CAAC,CAAC;iBACD,GAAG,CAAC,CAAC,GAAW,EAAE,EAAE;gBACnB,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBAC1C,IAAI,cAAc,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAChD,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,MAAM,KAAK,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;gBAEjC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CACxB,2BAA2B,KAAK,CAAC,EAAE,gBAAgB,CACpD,CAAC;YACJ,CAAC,CAAC;iBACD,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC;YAEnD,IAAI,yBAAyB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzC,MAAM,qBAAqB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7C,yBAAyB,CAC1B,CAAC;gBAEF,OAAO,CAAC,qBAAqB,IAAI,EAAE,CAAC;qBACjC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAW,CAAC;qBACxC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;YAC5B,CAAC;YAED,OAAO,EAAE,CAAC;QACZ,CAAC;KAAA;IACK,GAAG;;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,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAC9B,IAAI,4BAAmB,CAAC;gBACtB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,uBAAuB,EAAE,IAAI,CAAC,uBAAuB;gBACrD,wBAAwB,EAAE,IAAI,CAAC,wBAAwB;gBACvD,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,KAAK,EAAE,IAAI,CAAC,KAAK;aAClB,CAAC,CAAC,QAAQ,EAAE,CACd,CAAC;QACJ,CAAC;KAAA;IAiCK,IAAI;;YACR,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACf,OAAO,+BAAA,IAAI,wEAAmB,MAAvB,IAAI,CAAqB,CAAC;YACnC,CAAC;YAED,OAAO,+BAAA,IAAI,8DAAS,MAAb,IAAI,CAAW,CAAC;QACzB,CAAC;KAAA;IAEK,WAAW;;YACf,IAAI,CAAC;gBACH,MAAM,EAAE,GAAI,MAA8B,CAAC,KAAK,CAAC;gBACjD,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;oBACzC,EAAE,CAAC,aAAa,CAAC,OAAO;yBACrB,IAAI,CAAC,IAAI,CAAC,OAAiB,CAAC;yBAC5B,IAAI,CACH,EAAE,CAAC,aAAa,CAAC,YAAY;yBAC1B,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,mBAAmB,CAAC;yBAC1C,IAAI,CACH,EAAE,CAAC,aAAa,CAAC,uBAAuB,CAAC,IAAI,CAC3C,EAAE,CAAC,iBAAiB,CAAC,WAAW,CAAC,IAAI,CACnC,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAC/B,EAAE,CAAC,eAAe,CAAC,MAAM,CAC1B,EACD,OAAO,CACR,EACD,OAAO,CACR,CACF,CACJ;yBACA,IAAI,CACH,EAAE,CAAC,aAAa,CAAC,cAAc,CAAC,IAAI,CAClC,EAAE,CAAC,aAAa,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CACvD,CACF;yBACA,IAAI,CACH,EAAE,CAAC,aAAa,CAAC,mBAAmB;yBACjC,IAAI,CACH,EAAE,CAAC,iBAAiB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,EAC/D,OAAO,CACR;yBACA,IAAI,CACH,EAAE,CAAC,aAAa,CAAC,sBAAsB,CAAC,MAAM,CAAC;wBAC7C,IAAI;wBACJ,MAAM;wBACN,MAAM;qBACP,CAAC,EACF,OAAO,CACR,CACJ;yBACA,IAAI,CACH,EAAE,CAAC,aAAa,CAAC,6BAA6B,CAAC,IAAI,CACjD,EAAE,CAAC,aAAa,CAAC,sBAAsB,CAAC,IAAI,CAC1C,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,EAC5D,OAAO,CACR,EACD,OAAO,CACR,CACF;yBACA,GAAG,EAAE;oBACR,EAAE,CAAC,aAAa,CAAC,WAAW;yBACzB,KAAK,CAAC;wBACL,SAAS,EAAE,YAAmB;wBAC9B,KAAK,EAAE,IAAI,CAAC,OAAiB;qBAC9B,CAAC;yBACD,IAAI,CACH,EAAE,CAAC,aAAa,CAAC,iBAAiB;yBAC/B,IAAI,CACH,EAAE,CAAC,iBAAiB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,EAC/D,OAAO,CACR;yBACA,IAAI,CACH,EAAE,CAAC,aAAa,CAAC,sBAAsB,CAAC,MAAM,CAAC;wBAC7C,IAAI;wBACJ,MAAM;wBACN,MAAM;qBACP,CAAC,EACF,OAAO,CACR,CACJ;yBACA,GAAG,EAAE;iBACT,CAAC,CAAC;gBAEH,MAAM,CAAC,eAAe,EAAE,mBAAmB,CAAC,GAAG,gBAAgB,CAAC;gBAEhE,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAe,CAAC;gBACjD,QAAQ,CAAC,YAAY,GAAG,mBAAmB,CAAC,IAAqB,CAAC;gBAElE,OAAO,QAAQ,CAAC;YAClB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;KAAA;CACF;AA7VD,4CA6VC;;;;QA1HG,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,cAAc,GAAG,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAE3D,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC1C,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC;QAEH,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"}
+{"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/queries/index.d.ts

@@ -1,3 +1,2 @@
 export * from './base-tracker.query';
 export * from './model-base-tracker.query';
-export * from './base-event.query';

package/src/lib/modules/tracker/queries/index.js

@@ -3,5 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./base-tracker.query"), exports);
 tslib_1.__exportStar(require("./model-base-tracker.query"), exports);
-tslib_1.__exportStar(require("./base-event.query"), exports);
 //# sourceMappingURL=index.js.map

package/src/lib/modules/tracker/queries/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/queries/index.ts"],"names":[],"mappings":";;;AAAA,+DAAqC;AACrC,qEAA2C;AAC3C,6DAAmC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/queries/index.ts"],"names":[],"mappings":";;;AAAA,+DAAqC;AACrC,qEAA2C"}

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

@@ -5,7 +5,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelBaseTrackerQuery = void 0;
 const tslib_1 = require("tslib");
-const models_1 = require("../models");
+const shared_1 = require("../../../shared");
 const base_tracker_query_1 = require("./base-tracker.query");
 class ModelBaseTrackerQuery extends base_tracker_query_1.BaseTrackerQuery {
     constructor(httpClient, identifiable) {
@@ -23,7 +23,7 @@ class ModelBaseTrackerQuery extends base_tracker_query_1.BaseTrackerQuery {
             return this;
         }
         this.setFilters([
-            new models_1.TrackerQueryFilter()
+            new shared_1.DataQueryFilter()
                 .setAttribute(attributeProperty.id)
                 .setCondition('EQ')
                 .setValue(id),

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

@@ -1 +1 @@
-{"version":3,"file":"model-base-tracker.query.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/queries/model-base-tracker.query.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;AAGjD,sCAImB;AACnB,6DAAwD;AAExD,MAAa,qBAEX,SAAQ,qCAAmB;IAC3B,YAAY,UAAwB,EAAE,YAAoC;QACxE,KAAK,CAAC,UAAU,CAAC,CAAC;QAClB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,IAAK,YAAoB,EAAE,CAAC;QAC5C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACvC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,CAAC,EAAU;QACb,+FAA+F;QAC9F,IAAI,CAAC,QAAgB,CAAC,EAAE,GAAG,EAAE,CAAC;QAC/B,MAAM,iBAAiB,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QAE7D,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC,UAAU,CAAC;YACd,IAAI,2BAAkB,EAAE;iBACrB,YAAY,CAAC,iBAAiB,CAAC,EAAE,CAAC;iBAClC,YAAY,CAAC,IAAW,CAAC;iBACzB,QAAQ,CAAC,EAAE,CAAC;SAChB,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC;IAEc,sBAAsB;;YAGnC,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC;YAEjD,MAAM,yBAAyB,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;iBACzD,GAAG,CAAC,CAAC,GAAW,EAAE,EAAE;gBACnB,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBAC1C,IAAI,cAAc,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAChD,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,MAAM,KAAK,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;gBAEjC,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;oBAC/B,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CACxB,2BAA2B,KAAK,CAAC,EAAE,gBAAgB,CACpD,CAAC;YACJ,CAAC,CAAC;iBACD,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC;YAEnD,IAAI,yBAAyB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzC,MAAM,qBAAqB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7C,yBAAyB,CAC1B,CAAC;gBAEF,OAAO,CAAC,qBAAqB,IAAI,EAAE,CAAC;qBACjC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAW,CAAC;qBACxC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;YAC5B,CAAC;YAED,OAAO,EAAE,CAAC;QACZ,CAAC;KAAA;CACF;AAlED,sDAkEC"}
+{"version":3,"file":"model-base-tracker.query.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/queries/model-base-tracker.query.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;AAEjD,4CAAgE;AAEhE,6DAAwD;AAExD,MAAa,qBAEX,SAAQ,qCAAmB;IAC3B,YAAY,UAAwB,EAAE,YAAoC;QACxE,KAAK,CAAC,UAAU,CAAC,CAAC;QAClB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,IAAK,YAAoB,EAAE,CAAC;QAC5C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACvC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,CAAC,EAAU;QACb,+FAA+F;QAC9F,IAAI,CAAC,QAAgB,CAAC,EAAE,GAAG,EAAE,CAAC;QAC/B,MAAM,iBAAiB,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QAE7D,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC,UAAU,CAAC;YACd,IAAI,wBAAe,EAAE;iBAClB,YAAY,CAAC,iBAAiB,CAAC,EAAE,CAAC;iBAClC,YAAY,CAAC,IAAW,CAAC;iBACzB,QAAQ,CAAC,EAAE,CAAC;SAChB,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC;IAEc,sBAAsB;;YAGnC,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC;YAEjD,MAAM,yBAAyB,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;iBACzD,GAAG,CAAC,CAAC,GAAW,EAAE,EAAE;gBACnB,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBAC1C,IAAI,cAAc,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAChD,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,MAAM,KAAK,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;gBAEjC,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;oBAC/B,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CACxB,2BAA2B,KAAK,CAAC,EAAE,gBAAgB,CACpD,CAAC;YACJ,CAAC,CAAC;iBACD,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC;YAEnD,IAAI,yBAAyB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzC,MAAM,qBAAqB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7C,yBAAyB,CAC1B,CAAC;gBAEF,OAAO,CAAC,qBAAqB,IAAI,EAAE,CAAC;qBACjC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAW,CAAC;qBACxC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;YAC5B,CAAC;YAED,OAAO,EAAE,CAAC;QACZ,CAAC;KAAA;CACF;AAlED,sDAkEC"}

package/src/lib/modules/tracker/utils/attribute.util.d.ts

@@ -1,4 +1,4 @@
-import { Attribute, AttributeEntity, AttributeValueEntity } from '../models/attribute.model';
+import { Attribute, AttributeEntity, AttributeValueEntity } from '../models';
 export declare class AttributeUtil {
     static getAttribute(attributeId: string, attributes: Attribute[], code?: string): Attribute | undefined;
     static getAttributeValue(attributeId: string, attributes: Attribute[]): string | undefined;

package/src/lib/modules/tracker/utils/attribute.util.js.map

@@ -1 +1 @@
-{"version":3,"file":"attribute.util.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/utils/attribute.util.ts"],"names":[],"mappings":";;;AAMA,MAAa,aAAa;IACxB,MAAM,CAAC,YAAY,CACjB,WAAmB,EACnB,UAAuB,EACvB,IAAa;QAEb,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QACzE,CAAC;QAED,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,IAAI,CAC5B,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,KAAK,WAAW,CACnD,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,iBAAiB,CACtB,WAAmB,EACnB,UAAuB;;QAEvB,OAAO,MAAA,aAAa,CAAC,YAAY,CAAC,WAAW,EAAE,UAAU,CAAC,0CAAE,KAAK,CAAC;IACpE,CAAC;IAED,MAAM,CAAC,iBAAiB,CACtB,UAAuB,EACvB,SAAiB,EACjB,KAAsB,EACtB,IAAa;QAEb,MAAM,kBAAkB,GACtB,aAAa,CAAC,YAAY,CAAC,SAAS,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAE1D,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,OAAO;gBACL,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;gBACrB;oBACE,SAAS;oBACT,IAAI;oBACJ,KAAK;iBACN;aACF,CAAC;QACJ,CAAC;QAED,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAE9D,OAAO;YACL,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC;4CACjC,kBAAkB,KAAE,KAAK;YAC9B,GAAG,UAAU,CAAC,KAAK,CAAC,cAAc,GAAG,CAAC,CAAC;SACxC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,oBAAoB,CAAC,UAAuB;QACjD,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,SAAc,EAAE,EAAE;YAC1D,uCACK,MAAM,KACT,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,IAChC;QACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IAED,MAAM,CAAC,yBAAyB,CAC9B,UAAuB;QAEvB,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,SAAoB,EAAE,EAAE;YAChE,uCACK,MAAM,KACT,CAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,SAAS,CAAC,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,IACxC;QACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,UAAuB;QAC/C,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,CAC9B,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,MAAM,GAAG,CAAC,CACxE,CAAC;IACJ,CAAC;CACF;AA5ED,sCA4EC"}
+{"version":3,"file":"attribute.util.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/utils/attribute.util.ts"],"names":[],"mappings":";;;AAEA,MAAa,aAAa;IACxB,MAAM,CAAC,YAAY,CACjB,WAAmB,EACnB,UAAuB,EACvB,IAAa;QAEb,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QACzE,CAAC;QAED,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,IAAI,CAC5B,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,KAAK,WAAW,CACnD,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,iBAAiB,CACtB,WAAmB,EACnB,UAAuB;;QAEvB,OAAO,MAAA,aAAa,CAAC,YAAY,CAAC,WAAW,EAAE,UAAU,CAAC,0CAAE,KAAK,CAAC;IACpE,CAAC;IAED,MAAM,CAAC,iBAAiB,CACtB,UAAuB,EACvB,SAAiB,EACjB,KAAsB,EACtB,IAAa;QAEb,MAAM,kBAAkB,GACtB,aAAa,CAAC,YAAY,CAAC,SAAS,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAE1D,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,OAAO;gBACL,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;gBACrB;oBACE,SAAS;oBACT,IAAI;oBACJ,KAAK;iBACN;aACF,CAAC;QACJ,CAAC;QAED,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAE9D,OAAO;YACL,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC;4CACjC,kBAAkB,KAAE,KAAK;YAC9B,GAAG,UAAU,CAAC,KAAK,CAAC,cAAc,GAAG,CAAC,CAAC;SACxC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,oBAAoB,CAAC,UAAuB;QACjD,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,SAAc,EAAE,EAAE;YAC1D,uCACK,MAAM,KACT,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,IAChC;QACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IAED,MAAM,CAAC,yBAAyB,CAC9B,UAAuB;QAEvB,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,SAAoB,EAAE,EAAE;YAChE,uCACK,MAAM,KACT,CAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,SAAS,CAAC,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,IACxC;QACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,UAAuB;QAC/C,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,CAC9B,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,MAAM,GAAG,CAAC,CACxE,CAAC;IACJ,CAAC;CACF;AA5ED,sCA4EC"}

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnrollmentUtil = void 0;
-const d2_web_sdk_1 = require("@iapps/d2-web-sdk");
+const shared_1 = require("../../../shared");
 const models_1 = require("../models");
 class EnrollmentUtil {
     static getEnrollments(enrollmentResponse, params) {
@@ -47,7 +47,7 @@ class EnrollmentUtil {
             lastUpdated: date,
             orgUnit,
             trackedEntity,
-            enrollment: (0, d2_web_sdk_1.generateUid)(),
+            enrollment: (0, shared_1.generateUid)(),
             trackedEntityType,
             events: [],
         };

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

@@ -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,kDAAgD;AAChD,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,wBAAW,GAAE;YACzB,iBAAiB;YACjB,MAAM,EAAE,EAAE;SACX,CAAC;IACJ,CAAC;CACF;AA/ED,wCA+EC"}
+{"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"}

package/src/lib/modules/tracker/utils/index.d.ts

@@ -2,4 +2,3 @@ export * from './attribute.util';
 export * from './tracked-entity-instance.util';
 export * from './enrollment.util';
 export * from './tracker-relationship.util';
-export * from './event.util';

package/src/lib/modules/tracker/utils/index.js

@@ -5,5 +5,4 @@ tslib_1.__exportStar(require("./attribute.util"), exports);
 tslib_1.__exportStar(require("./tracked-entity-instance.util"), exports);
 tslib_1.__exportStar(require("./enrollment.util"), exports);
 tslib_1.__exportStar(require("./tracker-relationship.util"), exports);
-tslib_1.__exportStar(require("./event.util"), exports);
 //# sourceMappingURL=index.js.map

package/src/lib/modules/tracker/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/utils/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiC;AACjC,yEAA+C;AAC/C,4DAAkC;AAClC,sEAA4C;AAC5C,uDAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/utils/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiC;AACjC,yEAA+C;AAC/C,4DAAkC;AAClC,sEAA4C"}

package/src/lib/modules/tracker/utils/tracked-entity-instance.util.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrackedEntityInstanceUtil = void 0;
-const d2_web_sdk_1 = require("@iapps/d2-web-sdk");
+const shared_1 = require("../../../shared");
 const enrollment_util_1 = require("./enrollment.util");
 class TrackedEntityInstanceUtil {
     static getProgramDateQueryParams(date, dateType) {
@@ -32,7 +32,7 @@ class TrackedEntityInstanceUtil {
     static generate(options) {
         const { trackedEntityType, program, orgUnit, trackedEntity } = options;
         const date = new Date().toISOString();
-        const trackedEntityId = trackedEntity !== null && trackedEntity !== void 0 ? trackedEntity : (0, d2_web_sdk_1.generateUid)();
+        const trackedEntityId = trackedEntity !== null && trackedEntity !== void 0 ? trackedEntity : (0, shared_1.generateUid)();
         const initialTrackedEntityInstance = {
             orgUnit,
             trackedEntity: trackedEntityId,

package/src/lib/modules/tracker/utils/tracked-entity-instance.util.js.map

@@ -1 +1 @@
-{"version":3,"file":"tracked-entity-instance.util.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/utils/tracked-entity-instance.util.ts"],"names":[],"mappings":";;;AAAA,kDAAgD;AAEhD,uDAAmD;AAEnD,MAAa,yBAAyB;IACpC,MAAM,CAAC,yBAAyB,CAC9B,IAAY,EACZ,QAAgB;QAEhB,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,YAAY;gBACf,OAAO,IAAI,CAAC,CAAC,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YACvD,KAAK,UAAU;gBACb,OAAO,IAAI,CAAC,CAAC,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YACrD;gBACE,OAAO,SAAS,CAAC;QACrB,CAAC;IACH,CAAC;IAED,MAAM,CAAC,4BAA4B,CAAC,OAAe,EAAE,MAAc;QACjE,OAAO,OAAO,CAAC,CAAC,CAAC,MAAM,OAAO,WAAW,MAAM,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACvE,CAAC;IAED,MAAM,CAAC,oBAAoB,CACzB,IAAY,EACZ,QAAgB,EAChB,MAAe;QAEf,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,cAAc,CAAC;QACxB,CAAC;QACD,OAAO,QAAQ,IAAI,IAAI,CAAC,aACtB,QAAQ,IAAI,EACd,mCAAmC,CAAC;IACtC,CAAC;IAED,MAAM,CAAC,6BAA6B,CAClC,SAAiB,EACjB,KAAa,EACb,QAA4C;QAE5C,OAAO,KAAK,CAAC,CAAC,CAAC,UAAU,SAAS,IAAI,QAAQ,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACxE,CAAC;IAED,MAAM,CAAC,oBAAoB,CACzB,eAAuB,EACvB,gBAAwB;QAExB,OAAO,qBAAqB,eAAe,+BAA+B,gBAAgB,iCAAiC,CAAC;IAC9H,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,OAKf;QACC,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;QACvE,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACtC,MAAM,eAAe,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,IAAA,wBAAW,GAAE,CAAC;QAEvD,MAAM,4BAA4B,GAAG;YACnC,OAAO;YACP,aAAa,EAAE,eAAe;YAC9B,qBAAqB,EAAE,eAAe;YACtC,iBAAiB;YACjB,UAAU,EAAE,EAAE;SACf,CAAC;QAEF,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,4BAA4B,CAAC;QACtC,CAAC;QAED,uCACK,4BAA4B,KAC/B,WAAW,EAAE;gBACX,gCAAc,CAAC,QAAQ,CAAC;oBACtB,IAAI;oBACJ,OAAO;oBACP,aAAa,EAAE,eAAe;oBAC9B,iBAAiB,EAAE,iBAAwB;oBAC3C,OAAO;iBACR,CAAC;aACH,IACD;IACJ,CAAC;CACF;AAlFD,8DAkFC"}
+{"version":3,"file":"tracked-entity-instance.util.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/utils/tracked-entity-instance.util.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAE9C,uDAAmD;AAEnD,MAAa,yBAAyB;IACpC,MAAM,CAAC,yBAAyB,CAC9B,IAAY,EACZ,QAAgB;QAEhB,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,YAAY;gBACf,OAAO,IAAI,CAAC,CAAC,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YACvD,KAAK,UAAU;gBACb,OAAO,IAAI,CAAC,CAAC,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YACrD;gBACE,OAAO,SAAS,CAAC;QACrB,CAAC;IACH,CAAC;IAED,MAAM,CAAC,4BAA4B,CAAC,OAAe,EAAE,MAAc;QACjE,OAAO,OAAO,CAAC,CAAC,CAAC,MAAM,OAAO,WAAW,MAAM,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACvE,CAAC;IAED,MAAM,CAAC,oBAAoB,CACzB,IAAY,EACZ,QAAgB,EAChB,MAAe;QAEf,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,cAAc,CAAC;QACxB,CAAC;QACD,OAAO,QAAQ,IAAI,IAAI,CAAC,aACtB,QAAQ,IAAI,EACd,mCAAmC,CAAC;IACtC,CAAC;IAED,MAAM,CAAC,6BAA6B,CAClC,SAAiB,EACjB,KAAa,EACb,QAA4C;QAE5C,OAAO,KAAK,CAAC,CAAC,CAAC,UAAU,SAAS,IAAI,QAAQ,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACxE,CAAC;IAED,MAAM,CAAC,oBAAoB,CACzB,eAAuB,EACvB,gBAAwB;QAExB,OAAO,qBAAqB,eAAe,+BAA+B,gBAAgB,iCAAiC,CAAC;IAC9H,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,OAKf;QACC,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;QACvE,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACtC,MAAM,eAAe,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,IAAA,oBAAW,GAAE,CAAC;QAEvD,MAAM,4BAA4B,GAAG;YACnC,OAAO;YACP,aAAa,EAAE,eAAe;YAC9B,qBAAqB,EAAE,eAAe;YACtC,iBAAiB;YACjB,UAAU,EAAE,EAAE;SACf,CAAC;QAEF,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,4BAA4B,CAAC;QACtC,CAAC;QAED,uCACK,4BAA4B,KAC/B,WAAW,EAAE;gBACX,gCAAc,CAAC,QAAQ,CAAC;oBACtB,IAAI;oBACJ,OAAO;oBACP,aAAa,EAAE,eAAe;oBAC9B,iBAAiB,EAAE,iBAAwB;oBAC3C,OAAO;iBACR,CAAC;aACH,IACD;IACJ,CAAC;CACF;AAlFD,8DAkFC"}

package/src/lib/shared/decorators/index.d.ts

@@ -0,0 +1 @@
+export * from './org-unit-field.decorator';

package/src/lib/shared/decorators/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./org-unit-field.decorator"), exports);
+//# sourceMappingURL=index.js.map

package/src/lib/shared/decorators/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/decorators/index.ts"],"names":[],"mappings":";;;AAAA,qEAA2C"}

package/src/lib/shared/decorators/org-unit-field.decorator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"org-unit-field.decorator.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/decorators/org-unit-field.decorator.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;AAIjD,oCAqBC;AArBD,SAAgB,YAAY,CAAC,OAE5B;IACC,OAAO;QACL,MAAM,kBAAkB,GAAuB;YAC7C,YAAY,EAAE,IAAI;YAClB,UAAU,EAAE,IAAI;YAChB,GAAG,CAAO,QAAQ;gBAChB,MAAM,QAAQ,GAAG,IAA6B,CAAC;gBAC/C,IAAI,QAAQ,CAAC,UAAU;oBAAE,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YACzD,CAAC;YACD,GAAG;;gBACD,MAAM,QAAQ,GAAG,IAA6B,CAAC;gBAC/C,OAAO,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO;oBACrB,CAAC,CAAC,MAAA,QAAQ,CAAC,gBAAgB,0CAAE,WAAW;oBACxC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;YACvB,CAAC;SACF,CAAC;QAEF,OAAO,kBAAkB,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC"}

package/src/lib/shared/index.d.ts

@@ -1,3 +1,5 @@
 export * from './models';
 export * from './queries';
 export * from './utils';
+export * from './decorators';
+export * from './interfaces';

package/src/lib/shared/index.js

@@ -7,4 +7,6 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./models"), exports);
 tslib_1.__exportStar(require("./queries"), exports);
 tslib_1.__exportStar(require("./utils"), exports);
+tslib_1.__exportStar(require("./decorators"), exports);
+tslib_1.__exportStar(require("./interfaces"), exports);
 //# sourceMappingURL=index.js.map

package/src/lib/shared/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/dhis2-web-sdk/src/lib/shared/index.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,mDAAyB;AACzB,oDAA0B;AAC1B,kDAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/dhis2-web-sdk/src/lib/shared/index.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,mDAAyB;AACzB,oDAA0B;AAC1B,kDAAwB;AACxB,uDAA6B;AAC7B,uDAA6B"}

package/src/lib/{modules/tracker/interfaces/tracker-filter-condition.interface.d.ts → shared/interfaces/data-filter-condition.interface.d.ts}

@@ -1,4 +1,4 @@
-export declare enum TrackerFilterCondition {
+export declare enum DataFilterCondition {
     In = "IN",
     Equal = "EQ",
     Like = "LIKE",

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

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataFilterCondition = void 0;
+// Copyright 2023 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.
+var DataFilterCondition;
+(function (DataFilterCondition) {
+    DataFilterCondition["In"] = "IN";
+    DataFilterCondition["Equal"] = "EQ";
+    DataFilterCondition["Like"] = "LIKE";
+    DataFilterCondition["Ilike"] = "ILIKE";
+    DataFilterCondition["LessThan"] = "LT";
+    DataFilterCondition["LessThanOrEqualTo"] = "LE";
+    DataFilterCondition["GreaterThan"] = "GT";
+    DataFilterCondition["GreaterThanOrEqualTo"] = "GE";
+})(DataFilterCondition || (exports.DataFilterCondition = DataFilterCondition = {}));
+//# sourceMappingURL=data-filter-condition.interface.js.map

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

@@ -0,0 +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"}

package/src/lib/shared/interfaces/data-query-filter.interface.d.ts

@@ -0,0 +1,6 @@
+import { DataFilterCondition } from './data-filter-condition.interface';
+export interface IDataQueryFilter {
+    attribute: string;
+    condition: DataFilterCondition;
+    value: unknown;
+}

package/src/lib/{modules/tracker/interfaces/tracker-query-filter.interface.js → shared/interfaces/data-query-filter.interface.js}

@@ -3,4 +3,4 @@
 // 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=tracker-query-filter.interface.js.map
+//# sourceMappingURL=data-query-filter.interface.js.map

package/src/lib/shared/interfaces/data-query-filter.interface.js.map

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

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

@@ -0,0 +1,4 @@
+export * from './data-filter-condition.interface';
+export * from './data-query-filter.interface';
+export * from './ou-mode.interface';
+export * from './program-date-type.interface';

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

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+// 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.
+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);
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +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"}

package/src/lib/shared/interfaces/ou-mode.interface.d.ts

@@ -0,0 +1 @@
+export type OuMode = 'ALL' | 'DESCENDANTS' | 'SELECTED' | 'CHILDREN';

package/src/lib/shared/interfaces/ou-mode.interface.js

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

package/src/lib/shared/interfaces/ou-mode.interface.js.map

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

package/src/lib/shared/interfaces/program-date-type.interface.d.ts

@@ -0,0 +1 @@
+export type ProgramDateType = 'ENROLLED_ON' | 'OCCURED_ON';

package/src/lib/shared/interfaces/program-date-type.interface.js

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

package/src/lib/shared/interfaces/program-date-type.interface.js.map

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

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

@@ -0,0 +1,12 @@
+import { DataFilterCondition, IDataQueryFilter } from '../interfaces';
+export declare class DataQueryFilter implements IDataQueryFilter {
+    attribute: string;
+    condition: DataFilterCondition;
+    value: string | string[];
+    setAttribute(attribute: string): DataQueryFilter;
+    setCondition(condition: DataFilterCondition): DataQueryFilter;
+    setValue(value: string | string[]): DataQueryFilter;
+    static getApiFilters(filters: DataQueryFilter[]): string;
+    toApiFilters(): string;
+    private _getApiFilterValue;
+}