@iapps/d2-web-sdk 1.0.14 → 1.0.16

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,6 @@
+"use strict";
+// Copyright 2025 UDSM DHIS2 Lab. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=data-order-criteria.interface.js.map

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

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

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

@@ -0,0 +1 @@
+export type DataOrderFields = 'assignedUser' | 'assignedUserDisplayName' | 'attributeOptionCombo' | 'completedAt' | 'completedBy' | 'createdAt' | 'createdBy' | 'deleted' | 'enrolledAt' | 'enrollment' | 'enrollmentStatus' | 'event' | 'followup' | 'occurredAt' | 'orgUnit' | 'orgUnitName' | 'program' | 'programStage' | 'scheduleAt' | 'status' | 'storedBy' | 'trackedEntity' | 'updatedAt' | 'updatedBy';

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

@@ -0,0 +1,6 @@
+"use strict";
+// Copyright 2025 UDSM DHIS2 Lab. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=data-order-field.interface.js.map

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,27 @@
+"use strict";
+// Copyright 2025 UDSM DHIS2 Lab. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataOrderCriteria = void 0;
+class DataOrderCriteria {
+    constructor() {
+        this.order = 'asc';
+    }
+    setField(field) {
+        this.field = field;
+        return this;
+    }
+    setOrder(order) {
+        this.order = order;
+        return this;
+    }
+    getQueryParams() {
+        if (!this.order) {
+            return `order=${this.field}`;
+        }
+        return `order=${this.field}:${this.order}`;
+    }
+}
+exports.DataOrderCriteria = DataOrderCriteria;
+//# sourceMappingURL=data-order-criteria.model.js.map

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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