@iapps/d2-web-sdk 1.0.14 → 1.0.16

package/src/lib/modules/tracker/decorators/enrollment-date-field.decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"enrollment-date-field.decorator.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/decorators/enrollment-date-field.decorator.ts"],"names":[],"mappings":";;AAEA,kDAiBC;AAjBD,SAAgB,mBAAmB;IACjC,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,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YACvC,CAAC;YACD,GAAG;;gBACD,MAAM,QAAQ,GAAG,IAA6B,CAAC;gBAC/C,OAAO,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,gBAAgB,0CAAE,cAAc,CAAC;YACpD,CAAC;SACF,CAAC;QAEF,OAAO,kBAAkB,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"enrollment-date-field.decorator.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/decorators/enrollment-date-field.decorator.ts"],"names":[],"mappings":";;AAEA,oEAiBC;AAjBD,SAAgB,4BAA4B;IAC1C,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,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YACvC,CAAC;YACD,GAAG;;gBACD,MAAM,QAAQ,GAAG,IAA6B,CAAC;gBAC/C,OAAO,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,gBAAgB,0CAAE,cAAc,CAAC;YACpD,CAAC;SACF,CAAC;QAEF,OAAO,kBAAkB,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC"}

package/src/lib/modules/tracker/decorators/relationship-field.decorator.d.ts

@@ -1,3 +1,3 @@
 import { TrackedEntityInstance } from '../models';
 import { DHIS2Event } from '../../event';
-export declare function RelationshipField(relationshipType: string, RelationshipClass?: typeof TrackedEntityInstance | typeof DHIS2Event, multiple?: boolean): PropertyDecorator;
+export declare function RelationshipFieldDecorator(relationshipType: string, RelationshipClass?: typeof TrackedEntityInstance | typeof DHIS2Event, multiple?: boolean): PropertyDecorator;

package/src/lib/modules/tracker/decorators/relationship-field.decorator.js

@@ -3,10 +3,10 @@
 // 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.RelationshipField = RelationshipField;
+exports.RelationshipFieldDecorator = RelationshipFieldDecorator;
 const lodash_1 = require("lodash");
 const shared_1 = require("../../../shared");
-function RelationshipField(relationshipType, RelationshipClass, multiple) {
+function RelationshipFieldDecorator(relationshipType, RelationshipClass, multiple) {
     return function () {
         const adjustedDescripter = {
             configurable: true,

package/src/lib/modules/tracker/decorators/relationship-field.decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"relationship-field.decorator.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/decorators/relationship-field.decorator.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;AAQjD,8CA2DC;AAjED,mCAA0C;AAG1C,4CAA8C;AAG9C,SAAgB,iBAAiB,CAC/B,gBAAwB,EACxB,iBAAoE,EACpE,QAAkB;IAElB,OAAO;QACL,MAAM,kBAAkB,GAAuB;YAC7C,YAAY,EAAE,IAAI;YAClB,UAAU,EAAE,IAAI;YAChB,GAAG,CAAO,YAAyD;gBACjE,IAAI,CAAC,IAAA,gBAAO,EAAC,YAAY,CAAC,EAAE,CAAC;oBAC3B,MAAM,QAAQ,GAAG,IAA6B,CAAC;oBAE/C,IAAI,IAAA,gBAAO,EAAC,YAAY,CAAC,EAAE,CAAC;wBAC1B,YAAY,CAAC,OAAO,CAAC,CAAC,gBAAgB,EAAE,EAAE;4BACxC,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,CAAC;gCACnC,gBAAgB,CAAC,YAAY,GAAG,IAAA,oBAAW,GAAE,CAAC;4BAChD,CAAC;4BAED,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,CAAC;gCACxC,gBAAgB,CAAC,iBAAiB,GAAG,IAAI,CAAC;4BAC5C,CAAC;4BACD,gBAAgB,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;4BACrD,QAAQ,CAAC,eAAgB,CAAC,gBAAgB,CAAC,CAAC;wBAC9C,CAAC,CAAC,CAAC;oBACL,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;4BAC/B,YAAY,CAAC,YAAY,GAAG,IAAA,oBAAW,GAAE,CAAC;wBAC5C,CAAC;wBAED,IAAI,CAAC,YAAY,CAAC,iBAAiB,EAAE,CAAC;4BACpC,YAAY,CAAC,iBAAiB,GAAG,MAAM,CAAC;wBAC1C,CAAC;wBAED,YAAY,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;wBACjD,QAAQ,CAAC,eAAgB,CAAC,YAAY,CAAC,CAAC;oBAC1C,CAAC;gBACH,CAAC;YACH,CAAC;YACD,GAAG;gBACD,MAAM,QAAQ,GAAG,IAA6B,CAAC;gBAC/C,MAAM,aAAa,GAAG,CAAC,QAAQ,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,MAAM,CAC3D,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,CAAC,gBAAgB,KAAK,gBAAgB,CACvE,CAAC;gBAEF,IAAI,iBAAiB,EAAE,CAAC;oBACtB,OAAO,QAAQ;wBACb,CAAC,CAAC,aAAa,CAAC,GAAG,CACf,CAAC,YAAY,EAAE,EAAE,CAAC,IAAI,iBAAiB,CAAC,YAAY,CAAC,CACtD;wBACH,CAAC,CAAC,IAAI,iBAAiB,CAAC,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC5D,CAAC;gBAED,OAAO,aAAa,CAAC;YACvB,CAAC;SACF,CAAC;QAEF,OAAO,kBAAkB,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"relationship-field.decorator.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/decorators/relationship-field.decorator.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;AAQjD,gEA2DC;AAjED,mCAA0C;AAG1C,4CAA8C;AAG9C,SAAgB,0BAA0B,CACxC,gBAAwB,EACxB,iBAAoE,EACpE,QAAkB;IAElB,OAAO;QACL,MAAM,kBAAkB,GAAuB;YAC7C,YAAY,EAAE,IAAI;YAClB,UAAU,EAAE,IAAI;YAChB,GAAG,CAAO,YAAyD;gBACjE,IAAI,CAAC,IAAA,gBAAO,EAAC,YAAY,CAAC,EAAE,CAAC;oBAC3B,MAAM,QAAQ,GAAG,IAA6B,CAAC;oBAE/C,IAAI,IAAA,gBAAO,EAAC,YAAY,CAAC,EAAE,CAAC;wBAC1B,YAAY,CAAC,OAAO,CAAC,CAAC,gBAAgB,EAAE,EAAE;4BACxC,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,CAAC;gCACnC,gBAAgB,CAAC,YAAY,GAAG,IAAA,oBAAW,GAAE,CAAC;4BAChD,CAAC;4BAED,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,CAAC;gCACxC,gBAAgB,CAAC,iBAAiB,GAAG,IAAI,CAAC;4BAC5C,CAAC;4BACD,gBAAgB,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;4BACrD,QAAQ,CAAC,eAAgB,CAAC,gBAAgB,CAAC,CAAC;wBAC9C,CAAC,CAAC,CAAC;oBACL,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;4BAC/B,YAAY,CAAC,YAAY,GAAG,IAAA,oBAAW,GAAE,CAAC;wBAC5C,CAAC;wBAED,IAAI,CAAC,YAAY,CAAC,iBAAiB,EAAE,CAAC;4BACpC,YAAY,CAAC,iBAAiB,GAAG,MAAM,CAAC;wBAC1C,CAAC;wBAED,YAAY,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;wBACjD,QAAQ,CAAC,eAAgB,CAAC,YAAY,CAAC,CAAC;oBAC1C,CAAC;gBACH,CAAC;YACH,CAAC;YACD,GAAG;gBACD,MAAM,QAAQ,GAAG,IAA6B,CAAC;gBAC/C,MAAM,aAAa,GAAG,CAAC,QAAQ,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,MAAM,CAC3D,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,CAAC,gBAAgB,KAAK,gBAAgB,CACvE,CAAC;gBAEF,IAAI,iBAAiB,EAAE,CAAC;oBACtB,OAAO,QAAQ;wBACb,CAAC,CAAC,aAAa,CAAC,GAAG,CACf,CAAC,YAAY,EAAE,EAAE,CAAC,IAAI,iBAAiB,CAAC,YAAY,CAAC,CACtD;wBACH,CAAC,CAAC,IAAI,iBAAiB,CAAC,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC5D,CAAC;gBAED,OAAO,aAAa,CAAC;YACvB,CAAC;SACF,CAAC;QAEF,OAAO,kBAAkB,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC"}

package/src/lib/modules/tracker/decorators/tracked-entity-id-field.decorator.d.ts

@@ -1 +1 @@
-export declare function TrackedEntityIdField(): PropertyDecorator;
+export declare function TrackedEntityIdFieldDecorator(): PropertyDecorator;

package/src/lib/modules/tracker/decorators/tracked-entity-id-field.decorator.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TrackedEntityIdField = TrackedEntityIdField;
-function TrackedEntityIdField() {
+exports.TrackedEntityIdFieldDecorator = TrackedEntityIdFieldDecorator;
+function TrackedEntityIdFieldDecorator() {
     return function () {
         const adjustedDescripter = {
             configurable: true,

package/src/lib/modules/tracker/decorators/tracked-entity-id-field.decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"tracked-entity-id-field.decorator.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/decorators/tracked-entity-id-field.decorator.ts"],"names":[],"mappings":";;AAEA,oDAmBC;AAnBD,SAAgB,oBAAoB;IAClC,OAAO;QACL,MAAM,kBAAkB,GAAuB;YAC7C,YAAY,EAAE,IAAI;YAClB,UAAU,EAAE,IAAI;YAChB,GAAG,CAAO,QAAQ;gBAChB,MAAM,QAAQ,GAAG,IAA6B,CAAC;gBAE/C,QAAQ,CAAC,aAAa,GAAG,QAAQ,CAAC;gBAClC,QAAQ,CAAC,qBAAqB,GAAG,QAAQ,CAAC;YAC5C,CAAC;YACD,GAAG;gBACD,MAAM,QAAQ,GAAG,IAA6B,CAAC;gBAC/C,OAAO,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,aAAa,CAAC;YACjC,CAAC;SACF,CAAC;QAEF,OAAO,kBAAkB,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"tracked-entity-id-field.decorator.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/decorators/tracked-entity-id-field.decorator.ts"],"names":[],"mappings":";;AAEA,sEAmBC;AAnBD,SAAgB,6BAA6B;IAC3C,OAAO;QACL,MAAM,kBAAkB,GAAuB;YAC7C,YAAY,EAAE,IAAI;YAClB,UAAU,EAAE,IAAI;YAChB,GAAG,CAAO,QAAQ;gBAChB,MAAM,QAAQ,GAAG,IAA6B,CAAC;gBAE/C,QAAQ,CAAC,aAAa,GAAG,QAAQ,CAAC;gBAClC,QAAQ,CAAC,qBAAqB,GAAG,QAAQ,CAAC;YAC5C,CAAC;YACD,GAAG;gBACD,MAAM,QAAQ,GAAG,IAA6B,CAAC;gBAC/C,OAAO,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,aAAa,CAAC;YACjC,CAAC;SACF,CAAC;QAEF,OAAO,kBAAkB,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC"}

package/src/lib/modules/tracker/decorators/tracked-entity.decorator.d.ts

@@ -1,4 +1,4 @@
-export declare function TrackedEntity(params: {
+export declare function TrackedEntityDecorator(params: {
     program: string;
     trackedEntityType: string;
 }): (constructor: Function) => void;

package/src/lib/modules/tracker/decorators/tracked-entity.decorator.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TrackedEntity = TrackedEntity;
+exports.TrackedEntityDecorator = TrackedEntityDecorator;
 // 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.
-function TrackedEntity(params) {
+function TrackedEntityDecorator(params) {
     // eslint-disable-next-line @typescript-eslint/ban-types
     return function (constructor) {
         constructor.prototype.program = params.program;

package/src/lib/modules/tracker/decorators/tracked-entity.decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"tracked-entity.decorator.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/decorators/tracked-entity.decorator.ts"],"names":[],"mappings":";;AAGA,sCASC;AAZD,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,SAAgB,aAAa,CAAC,MAG7B;IACC,wDAAwD;IACxD,OAAO,UAAU,WAAqB;QACpC,WAAW,CAAC,SAAS,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC/C,WAAW,CAAC,SAAS,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;IACrE,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"tracked-entity.decorator.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/decorators/tracked-entity.decorator.ts"],"names":[],"mappings":";;AAGA,wDASC;AAZD,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,SAAgB,sBAAsB,CAAC,MAGtC;IACC,wDAAwD;IACxD,OAAO,UAAU,WAAqB;QACpC,WAAW,CAAC,SAAS,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC/C,WAAW,CAAC,SAAS,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;IACrE,CAAC,CAAC;AACJ,CAAC"}

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

@@ -3,3 +3,4 @@ export * from './models';
 export * from './utils';
 export * from './interfaces';
 export * from './tracker.module';
+export * from './decorators';

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

@@ -6,4 +6,5 @@ tslib_1.__exportStar(require("./models"), exports);
 tslib_1.__exportStar(require("./utils"), exports);
 tslib_1.__exportStar(require("./interfaces"), exports);
 tslib_1.__exportStar(require("./tracker.module"), exports);
+tslib_1.__exportStar(require("./decorators"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/index.ts"],"names":[],"mappings":";;;AAAA,oDAA0B;AAC1B,mDAAyB;AACzB,kDAAwB;AACxB,uDAA6B;AAC7B,2DAAiC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/index.ts"],"names":[],"mappings":";;;AAAA,oDAA0B;AAC1B,mDAAyB;AACzB,kDAAwB;AACxB,uDAA6B;AAC7B,2DAAiC;AACjC,uDAA6B"}

package/src/lib/modules/tracker/models/d2-tracker-response.model.d.ts

@@ -5,5 +5,5 @@ export declare class D2TrackerResponse<T extends TrackedEntityInstance> {
     data?: T | T[];
     pagination?: Pager;
     responseStatus: D2HttpResponseStatus;
-    constructor(response: D2HttpResponse, model: ITrackedEntityInstance);
+    constructor(response: D2HttpResponse, model: ITrackedEntityInstance, program?: string);
 }

package/src/lib/modules/tracker/models/d2-tracker-response.model.js

@@ -9,12 +9,12 @@ const tslib_1 = require("tslib");
 const lodash_1 = require("lodash");
 const shared_1 = require("../../../shared");
 class D2TrackerResponse {
-    constructor(response, model) {
+    constructor(response, model, program) {
         _D2TrackerResponse_instances.add(this);
         this.responseStatus = response.responseStatus;
         if (response.data) {
             this.pagination = tslib_1.__classPrivateFieldGet(this, _D2TrackerResponse_instances, "m", _D2TrackerResponse_getPagination).call(this, response.data);
-            this.data = tslib_1.__classPrivateFieldGet(this, _D2TrackerResponse_instances, "m", _D2TrackerResponse_getData).call(this, response.data, model);
+            this.data = tslib_1.__classPrivateFieldGet(this, _D2TrackerResponse_instances, "m", _D2TrackerResponse_getData).call(this, response.data, model, program);
         }
     }
 }
@@ -29,15 +29,15 @@ _D2TrackerResponse_instances = new WeakSet(), _D2TrackerResponse_getPagination =
         total: data['total'],
         pageCount: data['pageCount'],
     });
-}, _D2TrackerResponse_getData = function _D2TrackerResponse_getData(dataResponse, model) {
+}, _D2TrackerResponse_getData = function _D2TrackerResponse_getData(dataResponse, model, program) {
     const data = dataResponse['instances'] ||
         dataResponse['trackedEntities'] ||
         dataResponse;
     if ((0, lodash_1.isPlainObject)(data)) {
-        return new model(data);
+        return new model(Object.assign(Object.assign({}, data), { program }));
     }
     return (0, lodash_1.isArray)(data)
-        ? data.map((dataItem) => new model(dataItem))
+        ? data.map((dataItem) => new model(Object.assign(Object.assign({}, dataItem), { program })))
         : undefined;
 };
 //# sourceMappingURL=d2-tracker-response.model.js.map

package/src/lib/modules/tracker/models/d2-tracker-response.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"d2-tracker-response.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/models/d2-tracker-response.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;;AAEjD,mCAAgD;AAEhD,4CAA8E;AAM9E,MAAa,iBAAiB;IAK5B,YAAY,QAAwB,EAAE,KAA6B;;QACjE,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;QAE9C,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YAClB,IAAI,CAAC,UAAU,GAAG,+BAAA,IAAI,sEAAe,MAAnB,IAAI,EAAgB,QAAQ,CAAC,IAAI,CAAC,CAAC;YACrD,IAAI,CAAC,IAAI,GAAG,+BAAA,IAAI,gEAAS,MAAb,IAAI,EAAU,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;CAgCF;AA5CD,8CA4CC;2HA9BgB,IAA6B;IAC1C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAClB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,IAAI,cAAK,CAAC;QACf,IAAI,EAAE,IAAI,CAAC,MAAM,CAAW;QAC5B,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAW;QACpC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAW;QAC9B,SAAS,EAAE,IAAI,CAAC,WAAW,CAAW;KACvC,CAAC,CAAC;AACL,CAAC,mEAGC,YAAqC,EACrC,KAA6B;IAE7B,MAAM,IAAI,GACR,YAAY,CAAC,WAAW,CAAC;QACzB,YAAY,CAAC,iBAAiB,CAAC;QAC/B,YAAY,CAAC;IAEf,IAAI,IAAA,sBAAa,EAAC,IAAI,CAAC,EAAE,CAAC;QACxB,OAAO,IAAK,KAAa,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,IAAA,gBAAO,EAAC,IAAI,CAAC;QAClB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAK,KAAa,CAAC,QAAQ,CAAC,CAAC;QACtD,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC"}
+{"version":3,"file":"d2-tracker-response.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/models/d2-tracker-response.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;;AAEjD,mCAAgD;AAEhD,4CAA8E;AAM9E,MAAa,iBAAiB;IAK5B,YACE,QAAwB,EACxB,KAA6B,EAC7B,OAAgB;;QAEhB,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;QAE9C,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YAClB,IAAI,CAAC,UAAU,GAAG,+BAAA,IAAI,sEAAe,MAAnB,IAAI,EAAgB,QAAQ,CAAC,IAAI,CAAC,CAAC;YACrD,IAAI,CAAC,IAAI,GAAG,+BAAA,IAAI,gEAAS,MAAb,IAAI,EAAU,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC;CAiCF;AAjDD,8CAiDC;2HA/BgB,IAA6B;IAC1C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAClB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,IAAI,cAAK,CAAC;QACf,IAAI,EAAE,IAAI,CAAC,MAAM,CAAW;QAC5B,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAW;QACpC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAW;QAC9B,SAAS,EAAE,IAAI,CAAC,WAAW,CAAW;KACvC,CAAC,CAAC;AACL,CAAC,mEAGC,YAAqC,EACrC,KAA6B,EAC7B,OAAgB;IAEhB,MAAM,IAAI,GACR,YAAY,CAAC,WAAW,CAAC;QACzB,YAAY,CAAC,iBAAiB,CAAC;QAC/B,YAAY,CAAC;IAEf,IAAI,IAAA,sBAAa,EAAC,IAAI,CAAC,EAAE,CAAC;QACxB,OAAO,IAAK,KAAa,iCAAM,IAAI,KAAE,OAAO,IAAG,CAAC;IAClD,CAAC;IAED,OAAO,IAAA,gBAAO,EAAC,IAAI,CAAC;QAClB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAK,KAAa,iCAAM,QAAQ,KAAE,OAAO,IAAG,CAAC;QACtE,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC"}

package/src/lib/modules/tracker/models/enrollment.model.js

@@ -102,9 +102,7 @@ class Enrollment extends base_model_1.BaseTrackerSDKModel {
             orgUnit: this === null || this === void 0 ? void 0 : this.orgUnit,
             trackedEntity: this.trackedEntity,
             trackedEntityType: this.trackedEntityType,
-            events: this.events
-                .map((event) => event.toObject())
-                .filter((event) => (event.dataValues || []).length > 0),
+            events: this.events.map((event) => event.toObject()),
             attributes: utils_1.AttributeUtil.sanitizeAttributes(this.attributes || []),
         };
     }

package/src/lib/modules/tracker/models/enrollment.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"enrollment.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/models/enrollment.model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"enrollment.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/models/enrollment.model.ts"],"names":[],"mappings":"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"}

package/src/lib/modules/tracker/models/tracked-entity-instance.model.d.ts

@@ -3,6 +3,7 @@ import { BaseTrackerSDKModel } from './base.model';
 import { Enrollment, IEnrollment } from './enrollment.model';
 import { DHIS2Event, IDHIS2Event } from '../../event/models/event.model';
 import { TrackerRelationship } from './tracker-relationship.model';
+import { Program } from '../../program';
 export interface ProgramOwner {
     ownerOrgUnit: string;
     program: string;
@@ -108,6 +109,7 @@ export declare class TrackedEntityInstance extends BaseTrackerSDKModel<ITrackedE
     setRelationship?(relationship: TrackerRelationship): void;
     setEnrollmentDate(enrollmentDate: string): void;
     setIncidentDate(incidentDate: string): void;
+    setFields(program: Program): void;
     complete(): void;
     getEventByStage?(programStage: string): DHIS2Event | {
         dataValues: never[];

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

@@ -52,7 +52,9 @@ class TrackedEntityInstance extends base_model_1.BaseTrackerSDKModel {
             tslib_1.__classPrivateFieldGet(this, _TrackedEntityInstance_instances, "m", _TrackedEntityInstance_spreadEvents).call(this);
             // Spread enrollment data values as standalone attributes of the class
             Object.keys(this.latestEnrollment || {}).forEach((key) => {
-                this[key] = this.latestEnrollment[key];
+                if (key !== 'orgUnit') {
+                    this[key] = this.latestEnrollment[key];
+                }
             });
             this.orgUnitName = (_a = this.latestEnrollment) === null || _a === void 0 ? void 0 : _a.orgUnitName;
             this.relatedEntities = utils_1.TrackerRelationshipUtil.getRelationships(this['relationships'] || [], this.trackedEntity);
@@ -131,6 +133,27 @@ class TrackedEntityInstance extends base_model_1.BaseTrackerSDKModel {
             this.latestEnrollment.incidentDate = incidentDate;
         }
     }
+    setFields(program) {
+        this.fields = Object.assign(Object.assign(Object.assign({}, (this.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,
+                } });
+        }, {}));
+    }
     complete() {
         if (this.latestEnrollment) {
             this.latestEnrollment.status = 'COMPLETED';

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

@@ -1 +1 @@
-{"version":3,"file":"tracked-entity-instance.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/models/tracked-entity-instance.model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tracked-entity-instance.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/models/tracked-entity-instance.model.ts"],"names":[],"mappings":"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"}

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

@@ -3,6 +3,7 @@ export declare class TrackerUrlGenerator extends DataUrlGenerator<TrackerUrlGene
     baseEndpoint: string;
     trackedEntity?: string;
     trackedEntityType?: string;
+    preferList?: boolean;
     constructor(params: Partial<TrackerUrlGenerator>);
     generate(): string;
     addTrackedEntityType(url: string): string;

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

@@ -5,7 +5,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrackerUrlGenerator = void 0;
 const shared_1 = require("../../../shared");
-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]]';
+const DEFAULT_FIELDS = 'createdAt,updatedAt,trackedEntity,trackedEntityType,orgUnit,orgUnitName,enrollments[enrollment,enrolledAt,occurredAt,program,status,orgUnit,storedBy,attributes[attribute,code,createdAt,updatedAt,valueType,value],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;
@@ -14,6 +14,7 @@ class TrackerUrlGenerator extends shared_1.DataUrlGenerator {
         this.trackedEntityType = params.trackedEntityType;
         this.fields = (_a = params.fields) !== null && _a !== void 0 ? _a : DEFAULT_FIELDS;
         this.trackedEntity = params.trackedEntity;
+        this.preferList = params.preferList;
     }
     generate() {
         return this.addPager(this.addOrder(this.addEnrollmentDates(this.addFields(this.addOrgUnit(this.addFilters(this.addTrackedEntityType(this.addProgram(this.addTrackedEntity(`${this.baseEndpoint}`)))))))));
@@ -30,7 +31,7 @@ class TrackerUrlGenerator extends shared_1.DataUrlGenerator {
         if (!this.trackedEntity) {
             return url;
         }
-        if (this.trackedEntity.split(';').length === 1) {
+        if (this.trackedEntity.split(';').length === 1 && !this.preferList) {
             return url + `/${this.trackedEntity}`;
         }
         const isThereParams = this.isThereQueryParams(url);

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":";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"}
+{"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,6dAA6d,CAAC;AAEhe,MAAa,mBAAoB,SAAQ,yBAAqC;IAM5E,YAAY,MAAoC;;QAC9C,KAAK,CAAC,MAAM,CAAC,CAAC;QANhB,iBAAY,GAAG,yBAAyB,CAAC;QAOvC,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;QAC1C,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAA;IACrC,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,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACnE,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;AA5DD,kDA4DC"}

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

@@ -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

@@ -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,19 @@ 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,
+                            }, {
+                                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 +155,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 +217,7 @@ class BaseTrackerQuery {
                 ouMode: this.ouMode,
                 filters: this.filters,
                 fields: this.fields,
+                orderCriterias: this.orderCriterias,
                 enrollmentEnrolledAfter: this.enrollmentEnrolledAfter,
                 enrollmentEnrolledBefore: this.enrollmentEnrolledBefore,
                 trackedEntity: this.trackedEntity,
@@ -206,6 +255,11 @@ class BaseTrackerQuery {
                         'trackedEntityType',
                     ])
                         .byId(this.program)
+                        .with(d2.programModule.trackedEntityType
+                        .select(['id', 'name'])
+                        .with(d2.programModule.trackedEntityTypeAttribute.select([
+                        'trackedEntityAttribute',
+                    ])), 'ToOne')
                         .with(d2.programModule.programStage
                         .with(d2.programModule.programStageSection)
                         .with(d2.programModule.programStageDataElement.with(d2.dataElementModule.dataElement.with(d2.optionSetModule.optionSet.with(d2.optionSetModule.option), 'ToOne'), 'ToOne')))
@@ -266,19 +320,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

@@ -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,mCAA4C;AAE5C,4CAQyB;AAEzB,sCAKmB;AAInB,MAAa,gBAAgB;IAe3B,YAAsB,UAAwB;;QAAxB,eAAU,GAAV,UAAU,CAAc;QAbpC,WAAM,GAAW,KAAK,CAAC;QASvB,UAAK,GAAG,IAAI,cAAK,EAAE,CAAC;QAK5B,IAAI,CAAC,YAAY;YACf,8BAA0D,CAAC;IAC/D,CAAC;IAED,UAAU,CAAC,YAA+B;QACxC,IAAI,CAAC,OAAO,GAAG,IAAA,gBAAO,EAAC,YAAY,CAAC;YAClC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC;YACxB,CAAC,CAAC,YAAY,CAAC;QAEjB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,SAAS,CAAC,MAAc;QACtB,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,OAA0B;QACnC,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,CAAC,MAET;;YACC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CACnC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,KAAI,gBAAgB,CACvC,CAAC;YAEF,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;wBACnB,OAAO,EAAE,IAAI,CAAC,OAAO;qBACtB,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,CAAC,UAA6B;;YACrD,MAAM,OAAO,GACX,UAAU,KAAK,YAAY;gBACzB,CAAC,CAAC,qBAAqB;gBACvB,CAAC,CAAC,yBAAyB,CAAC;YAChC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAC9B,IAAI,4BAAmB,CAAC;gBACtB,YAAY,EAAE,OAAO;gBACrB,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;IA2BK,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,MAAM,CAAC;wBACN,IAAI;wBACJ,MAAM;wBACN,MAAM;wBACN,oBAAoB;wBACpB,aAAa;wBACb,qBAAqB;wBACrB,mBAAmB;wBACnB,qBAAqB;wBACrB,gBAAgB;wBAChB,cAAc;wBACd,aAAa;wBACb,iCAAiC;wBACjC,mBAAmB;qBACpB,CAAC;yBACD,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,MAAM,CAAC;wBACN,IAAI;wBACJ,uBAAuB;wBACvB,MAAM;wBACN,gBAAgB;wBAChB,SAAS;qBACV,CAAC;yBACD,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;yBACA,IAAI,CACH,EAAE,CAAC,eAAe,CAAC,WAAW;yBAC3B,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC;yBACd,IAAI,CACH,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC;wBAC/B,IAAI;wBACJ,MAAM;wBACN,aAAa;qBACd,CAAC,EACF,QAAQ,CACT,EACH,OAAO,CACR;yBACA,IAAI,CACH,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,EAC/D,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;AArYD,4CAqYC;;;;QA3JG,MAAM,aAAa,GAAG,CAAC,CAAA,MAAA,IAAI,CAAC,QAAQ,CAAC,gBAAgB,0CAAE,MAAM,KAAI,EAAE,CAAC,CAAC,IAAI,CACvE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CACtC,CAAC;QAEF,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,QAAQ,GAAG,IAAI,uBAAc,CAAC,EAAE,CAAC,CAAC;YACxC,OAAO,IAAI,0BAAiB,CAAI,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/D,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,qBAAqB,EAAE;YAC7D,MAAM,EAAE,CAAC,aAAc,CAAC,QAAQ,EAAE,CAAC;SACpC,CAAC,CAAC;QAEH,OAAO,IAAI,0BAAiB,CAAI,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAC3D,CAAC;;;QAGC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,qBAAqB,EAAE;YAC7D,eAAe,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAS,EAAE,CAAC;SAC7C,CAAC,CAAC;QAEH,OAAO,IAAI,0BAAiB,CAAI,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAC3D,CAAC"}
+{"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

@@ -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) {