@iapps/d2-web-sdk 1.0.14 → 1.0.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/lib/modules/data-element/models/data-element.model.d.ts +1 -0
- package/src/lib/modules/data-element/models/data-element.model.js.map +1 -1
- package/src/lib/modules/event/decorators/data-element-field.decorator.d.ts +1 -1
- package/src/lib/modules/event/decorators/data-element-field.decorator.js +2 -2
- package/src/lib/modules/event/decorators/data-element-field.decorator.js.map +1 -1
- package/src/lib/modules/event/decorators/event-date-field.decorator.d.ts +1 -1
- package/src/lib/modules/event/decorators/event-date-field.decorator.js +2 -2
- package/src/lib/modules/event/decorators/event-date-field.decorator.js.map +1 -1
- package/src/lib/modules/event/decorators/event-field.decorator.d.ts +1 -1
- package/src/lib/modules/event/decorators/event-field.decorator.js +2 -2
- package/src/lib/modules/event/decorators/event-field.decorator.js.map +1 -1
- package/src/lib/modules/event/decorators/event-id-field.decorator.d.ts +1 -1
- package/src/lib/modules/event/decorators/event-id-field.decorator.js +2 -2
- package/src/lib/modules/event/decorators/event-id-field.decorator.js.map +1 -1
- package/src/lib/modules/event/decorators/event.decorator.d.ts +1 -1
- package/src/lib/modules/event/decorators/event.decorator.js +2 -2
- package/src/lib/modules/event/decorators/event.decorator.js.map +1 -1
- package/src/lib/modules/event/models/event-url-generator.model.d.ts +3 -1
- package/src/lib/modules/event/models/event-url-generator.model.js +10 -1
- package/src/lib/modules/event/models/event-url-generator.model.js.map +1 -1
- package/src/lib/modules/event/queries/base-event.query.d.ts +5 -1
- package/src/lib/modules/event/queries/base-event.query.js +10 -0
- package/src/lib/modules/event/queries/base-event.query.js.map +1 -1
- package/src/lib/modules/option-set/models/option.model.d.ts +4 -1
- package/src/lib/modules/option-set/models/option.model.js +1 -1
- package/src/lib/modules/option-set/models/option.model.js.map +1 -1
- package/src/lib/modules/program/models/program-stage-data-element.model.js +1 -1
- package/src/lib/modules/program/models/program-stage-data-element.model.js.map +1 -1
- package/src/lib/modules/program/models/program-stage.model.d.ts +3 -1
- package/src/lib/modules/program/models/program-stage.model.js +2 -0
- package/src/lib/modules/program/models/program-stage.model.js.map +1 -1
- package/src/lib/modules/program/models/program-tracked-entity-attribute.model.js +1 -1
- package/src/lib/modules/program/models/program-tracked-entity-attribute.model.js.map +1 -1
- package/src/lib/modules/program/models/tracked-entity-attribute.model.d.ts +1 -0
- package/src/lib/modules/program/models/tracked-entity-attribute.model.js.map +1 -1
- package/src/lib/modules/program/models/tracked-entity-type.model.d.ts +2 -1
- package/src/lib/modules/program/program.module.d.ts +2 -1
- package/src/lib/modules/program/program.module.js +3 -0
- package/src/lib/modules/program/program.module.js.map +1 -1
- package/src/lib/modules/program/queries/index.d.ts +1 -0
- package/src/lib/modules/program/queries/index.js +1 -0
- package/src/lib/modules/program/queries/index.js.map +1 -1
- package/src/lib/modules/program/queries/tracked-entity-type-attribute.query.d.ts +5 -0
- package/src/lib/modules/program/queries/tracked-entity-type-attribute.query.js +15 -0
- package/src/lib/modules/program/queries/tracked-entity-type-attribute.query.js.map +1 -0
- package/src/lib/modules/tracker/decorators/attribute-field.decorator.d.ts +1 -1
- package/src/lib/modules/tracker/decorators/attribute-field.decorator.js +2 -2
- package/src/lib/modules/tracker/decorators/attribute-field.decorator.js.map +1 -1
- package/src/lib/modules/tracker/decorators/enrollment-date-field.decorator.d.ts +1 -1
- package/src/lib/modules/tracker/decorators/enrollment-date-field.decorator.js +2 -2
- package/src/lib/modules/tracker/decorators/enrollment-date-field.decorator.js.map +1 -1
- package/src/lib/modules/tracker/decorators/relationship-field.decorator.d.ts +1 -1
- package/src/lib/modules/tracker/decorators/relationship-field.decorator.js +2 -2
- package/src/lib/modules/tracker/decorators/relationship-field.decorator.js.map +1 -1
- package/src/lib/modules/tracker/decorators/tracked-entity-id-field.decorator.d.ts +1 -1
- package/src/lib/modules/tracker/decorators/tracked-entity-id-field.decorator.js +2 -2
- package/src/lib/modules/tracker/decorators/tracked-entity-id-field.decorator.js.map +1 -1
- package/src/lib/modules/tracker/decorators/tracked-entity.decorator.d.ts +1 -1
- package/src/lib/modules/tracker/decorators/tracked-entity.decorator.js +2 -2
- package/src/lib/modules/tracker/decorators/tracked-entity.decorator.js.map +1 -1
- package/src/lib/modules/tracker/index.d.ts +1 -0
- package/src/lib/modules/tracker/index.js +1 -0
- package/src/lib/modules/tracker/index.js.map +1 -1
- package/src/lib/modules/tracker/models/d2-tracker-response.model.d.ts +1 -1
- package/src/lib/modules/tracker/models/d2-tracker-response.model.js +5 -5
- package/src/lib/modules/tracker/models/d2-tracker-response.model.js.map +1 -1
- package/src/lib/modules/tracker/models/enrollment.model.js +1 -3
- package/src/lib/modules/tracker/models/enrollment.model.js.map +1 -1
- package/src/lib/modules/tracker/models/tracked-entity-instance.model.d.ts +2 -0
- package/src/lib/modules/tracker/models/tracked-entity-instance.model.js +24 -1
- package/src/lib/modules/tracker/models/tracked-entity-instance.model.js.map +1 -1
- package/src/lib/modules/tracker/models/tracker-url-generator.model.d.ts +1 -0
- package/src/lib/modules/tracker/models/tracker-url-generator.model.js +3 -2
- package/src/lib/modules/tracker/models/tracker-url-generator.model.js.map +1 -1
- package/src/lib/modules/tracker/queries/base-tracker.query.d.ts +5 -1
- package/src/lib/modules/tracker/queries/base-tracker.query.js +77 -23
- package/src/lib/modules/tracker/queries/base-tracker.query.js.map +1 -1
- package/src/lib/modules/tracker/utils/enrollment.util.js +1 -1
- package/src/lib/modules/tracker/utils/enrollment.util.js.map +1 -1
- package/src/lib/shared/interfaces/data-filter-condition.interface.d.ts +1 -0
- package/src/lib/shared/interfaces/data-filter-condition.interface.js +1 -0
- package/src/lib/shared/interfaces/data-filter-condition.interface.js.map +1 -1
- package/src/lib/shared/interfaces/data-order-criteria.interface.d.ts +6 -0
- package/src/lib/shared/interfaces/data-order-criteria.interface.js +6 -0
- package/src/lib/shared/interfaces/data-order-criteria.interface.js.map +1 -0
- package/src/lib/shared/interfaces/data-order-field.interface.d.ts +1 -0
- package/src/lib/shared/interfaces/data-order-field.interface.js +6 -0
- package/src/lib/shared/interfaces/data-order-field.interface.js.map +1 -0
- package/src/lib/shared/interfaces/data-order.interface.d.ts +1 -0
- package/src/lib/shared/interfaces/data-order.interface.js +3 -0
- package/src/lib/shared/interfaces/data-order.interface.js.map +1 -0
- package/src/lib/shared/interfaces/index.d.ts +3 -0
- package/src/lib/shared/interfaces/index.js +3 -0
- package/src/lib/shared/interfaces/index.js.map +1 -1
- package/src/lib/shared/models/data-order-criteria.model.d.ts +8 -0
- package/src/lib/shared/models/data-order-criteria.model.js +27 -0
- package/src/lib/shared/models/data-order-criteria.model.js.map +1 -0
- package/src/lib/shared/models/data-query-filter.model.d.ts +7 -2
- package/src/lib/shared/models/data-query-filter.model.js +15 -4
- package/src/lib/shared/models/data-query-filter.model.js.map +1 -1
- package/src/lib/shared/models/data-url-generator.model.d.ts +2 -0
- package/src/lib/shared/models/data-url-generator.model.js +8 -1
- package/src/lib/shared/models/data-url-generator.model.js.map +1 -1
- package/src/lib/shared/models/index.d.ts +1 -0
- package/src/lib/shared/models/index.js +1 -0
- package/src/lib/shared/models/index.js.map +1 -1
package/package.json
CHANGED
|
@@ -16,6 +16,7 @@ export declare class DataElement extends IdentifiableObject<DataElement> {
|
|
|
16
16
|
periodOffset?: number;
|
|
17
17
|
optionSetValue?: boolean;
|
|
18
18
|
optionSet?: OptionSet;
|
|
19
|
+
sortOrder?: number;
|
|
19
20
|
programStageId?: string;
|
|
20
21
|
allowFutureDate?: boolean;
|
|
21
22
|
isProgramStageRepeatable?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-element.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/data-element/models/data-element.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,iDAA6C;AAC7C,4CAIyB;AAgBzB,MAAa,WAAY,SAAQ,2BAA+B;
|
|
1
|
+
{"version":3,"file":"data-element.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/data-element/models/data-element.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,iDAA6C;AAC7C,4CAIyB;AAgBzB,MAAa,WAAY,SAAQ,2BAA+B;IAkC9D,YAAY,WAAiC;QAC3C,KAAK,CAAC,WAAW,CAAC,CAAC;QACnB,IAAI,WAAW,CAAC,cAAc,EAAE,CAAC;YAC/B,IAAI,CAAC,SAAS,GAAG,IAAI,sBAAS,CAAC,WAAW,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;;AAvCH,kCAwCC;AAvCQ,wBAAY,GAAG,cAAc,CAAC;AAC9B,gCAAoB,GAAG,aAAa,CAAC;AACrC,kBAAM,GAA0B;IACrC,GAAG,4BAAmB;IACtB,UAAU;IACV,WAAW;IACX,iBAAiB;IACjB,YAAY;IACZ,oBAAoB;IACpB,iBAAiB;IACjB,qBAAqB;IACrB,mBAAmB;IACnB,cAAc;IACd,gBAAgB;IAChB,WAAW;CACZ,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { TrackedEntityInstance } from '../../tracker';
|
|
2
2
|
import { DHIS2Event } from '../models';
|
|
3
|
-
export declare function
|
|
3
|
+
export declare function DataElementFieldDecorator(dataElement: string, programStage?: string, fromTracker?: boolean): PropertyDecorator;
|
|
4
4
|
export declare function getDataElementField(instance: TrackedEntityInstance | DHIS2Event, dataElement: string, fromTracker: boolean, programStage?: string): any;
|
|
5
5
|
export declare function setDataElementField(instance: TrackedEntityInstance | DHIS2Event, dataElement: string, fromTracker: boolean, value: unknown, programStage?: string): void;
|
|
@@ -3,10 +3,10 @@
|
|
|
3
3
|
// Use of this source code is governed by a BSD-style
|
|
4
4
|
// license that can be found in the LICENSE file.
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
6
|
+
exports.DataElementFieldDecorator = DataElementFieldDecorator;
|
|
7
7
|
exports.getDataElementField = getDataElementField;
|
|
8
8
|
exports.setDataElementField = setDataElementField;
|
|
9
|
-
function
|
|
9
|
+
function DataElementFieldDecorator(dataElement, programStage, fromTracker = false) {
|
|
10
10
|
return function () {
|
|
11
11
|
const adjustedDescripter = {
|
|
12
12
|
configurable: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-element-field.decorator.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/decorators/data-element-field.decorator.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;AAKjD,
|
|
1
|
+
{"version":3,"file":"data-element-field.decorator.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/decorators/data-element-field.decorator.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;AAKjD,8DA8BC;AAED,kDAqBC;AAED,kDAoBC;AA3ED,SAAgB,yBAAyB,CACvC,WAAmB,EACnB,YAAqB,EACrB,WAAW,GAAG,KAAK;IAEnB,OAAO;QACL,MAAM,kBAAkB,GAAuB;YAC7C,YAAY,EAAE,IAAI;YAClB,UAAU,EAAE,IAAI;YAChB,GAAG,CAAO,QAAQ;gBAChB,mBAAmB,CACjB,IAA0C,EAC1C,WAAW,EACX,WAAW,EACX,QAAQ,EACR,YAAY,CACb,CAAC;YACJ,CAAC;YACD,GAAG;gBACD,OAAO,mBAAmB,CACxB,IAA0C,EAC1C,WAAW,EACX,WAAW,EACX,YAAY,CACb,CAAC;YACJ,CAAC;SACF,CAAC;QAEF,OAAO,kBAAkB,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,mBAAmB,CACjC,QAA4C,EAC5C,WAAmB,EACnB,WAAoB,EACpB,YAAqB;;IAErB,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,KAAK,GAA4B,CACrC,CAAA,MAAC,QAAkC,CAAC,gBAAgB,0CAAE,MAAM,KAAI,EAAE,CACnE,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,KAAK,YAAY,CAAC,CAAC;QAEvD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO,MAAC,KAAoB,CAAC,YAAY,CAAC,WAAW,CAAC,0CAAE,KAAK,CAAC;IAChE,CAAC;IAED,OAAQ,QAAuB,CAAC,YAAY;QAC1C,CAAC,CAAC,MAAA,QAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,0CAAE,KAAK;QAC3C,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED,SAAgB,mBAAmB,CACjC,QAA4C,EAC5C,WAAmB,EACnB,WAAoB,EACpB,KAAc,EACd,YAAqB;IAErB,IAAI,WAAW,EAAE,CAAC;QAChB,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,mBAAmB,CAAC,YAAsB,EAAE;YACpD;gBACE,WAAW;gBACX,KAAK;aACN;SACF,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACL,QAAuB,aAAvB,QAAQ,uBAAR,QAAQ,CAAiB,YAAY,CAAC;YACrC,WAAW,EAAE,WAAW;YACxB,KAAK,EAAE,KAAe;SACvB,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function
|
|
1
|
+
export declare function EventDateFieldDecorator(): PropertyDecorator;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
function
|
|
3
|
+
exports.EventDateFieldDecorator = EventDateFieldDecorator;
|
|
4
|
+
function EventDateFieldDecorator() {
|
|
5
5
|
return function () {
|
|
6
6
|
const adjustedDescripter = {
|
|
7
7
|
configurable: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-date-field.decorator.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/decorators/event-date-field.decorator.ts"],"names":[],"mappings":";;AAEA,
|
|
1
|
+
{"version":3,"file":"event-date-field.decorator.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/decorators/event-date-field.decorator.ts"],"names":[],"mappings":";;AAEA,0DAiBC;AAjBD,SAAgB,uBAAuB;IACrC,OAAO;QACL,MAAM,kBAAkB,GAAuB;YAC7C,YAAY,EAAE,IAAI;YAClB,UAAU,EAAE,IAAI;YAChB,GAAG,CAAO,QAAQ;gBAChB,MAAM,KAAK,GAAG,IAAkB,CAAC;gBACjC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAC/B,CAAC;YACD,GAAG;gBACD,MAAM,KAAK,GAAG,IAAkB,CAAC;gBACjC,OAAO,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,KAAI,KAAK,CAAC,SAAS,CAAC;YAC9C,CAAC;SACF,CAAC;QAEF,OAAO,kBAAkB,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { DHIS2Event } from '../models';
|
|
2
|
-
export declare function
|
|
2
|
+
export declare function EventFieldDecorator(programStage: string, EventClass?: typeof DHIS2Event, multiple?: boolean): PropertyDecorator;
|
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
// Use of this source code is governed by a BSD-style
|
|
4
4
|
// license that can be found in the LICENSE file.
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
6
|
+
exports.EventFieldDecorator = EventFieldDecorator;
|
|
7
7
|
const lodash_1 = require("lodash");
|
|
8
|
-
function
|
|
8
|
+
function EventFieldDecorator(programStage, EventClass, multiple) {
|
|
9
9
|
return function () {
|
|
10
10
|
const adjustedDescripter = {
|
|
11
11
|
configurable: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-field.decorator.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/decorators/event-field.decorator.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;AAMjD,
|
|
1
|
+
{"version":3,"file":"event-field.decorator.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/decorators/event-field.decorator.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;AAMjD,kDAqDC;AAvDD,mCAAiC;AAEjC,SAAgB,mBAAmB,CACjC,YAAoB,EACpB,UAA8B,EAC9B,QAAkB;IAElB,OAAO;QACL,MAAM,kBAAkB,GAAuB;YAC7C,YAAY,EAAE,IAAI;YAClB,UAAU,EAAE,IAAI;YAChB,GAAG,CAAO,QAAmC;gBAC3C,IAAI,CAAC,IAAA,gBAAO,EAAC,QAAQ,CAAC,EAAE,CAAC;oBACvB,MAAM,QAAQ,GAAG,IAA6B,CAAC;oBAE/C,IAAI,QAAQ,EAAE,CAAC;wBACb,MAAM,MAAM,GAAG,QAAwB,CAAC;wBAExC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;;4BACvB,KAAK,CAAC,YAAY,GAAG,YAAY,CAAC;4BAClC,KAAK,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;4BACjC,KAAK,CAAC,UAAU,GAAG,MAAA,QAAQ,CAAC,gBAAgB,0CAAE,UAAU,CAAC;4BACzD,KAAK,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;4BACjC,KAAK,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;4BAC7C,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;wBAC3B,CAAC,CAAC,CAAC;oBACL,CAAC;yBAAM,CAAC;wBACN,MAAM,KAAK,GAAG,QAAsB,CAAC;wBACrC,KAAK,CAAC,YAAY,GAAG,YAAY,CAAC;wBAClC,KAAK,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;wBACjC,KAAK,CAAC,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CAAC,UAAU,CAAC;wBACxD,KAAK,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;wBACjC,KAAK,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;wBAC7C,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;oBAC3B,CAAC;gBACH,CAAC;YACH,CAAC;YACD,GAAG;;gBACD,MAAM,QAAQ,GAAG,IAA6B,CAAC;gBAC/C,MAAM,MAAM,GAAG,CAAC,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,gBAAgB,0CAAE,MAAM,KAAI,EAAE,CAAC,CAAC,MAAM,CAC9D,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,KAAK,YAAY,CAC/C,CAAC;gBAEF,IAAI,UAAU,EAAE,CAAC;oBACf,OAAO,QAAQ;wBACb,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC;wBAC9C,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC9C,CAAC;gBAED,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3B,CAAC;SACF,CAAC;QAEF,OAAO,kBAAkB,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function
|
|
1
|
+
export declare function EventIdFieldDecorator(): PropertyDecorator;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
function
|
|
3
|
+
exports.EventIdFieldDecorator = EventIdFieldDecorator;
|
|
4
|
+
function EventIdFieldDecorator() {
|
|
5
5
|
return function () {
|
|
6
6
|
const adjustedDescripter = {
|
|
7
7
|
configurable: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-id-field.decorator.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/decorators/event-id-field.decorator.ts"],"names":[],"mappings":";;AAEA,
|
|
1
|
+
{"version":3,"file":"event-id-field.decorator.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/decorators/event-id-field.decorator.ts"],"names":[],"mappings":";;AAEA,sDAiBC;AAjBD,SAAgB,qBAAqB;IACnC,OAAO;QACL,MAAM,kBAAkB,GAAuB;YAC7C,YAAY,EAAE,IAAI;YAClB,UAAU,EAAE,IAAI;YAChB,GAAG,CAAO,QAAQ;gBAChB,MAAM,KAAK,GAAG,IAAkB,CAAC;gBACjC,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC;YACzB,CAAC;YACD,GAAG;gBACD,MAAM,KAAK,GAAG,IAAkB,CAAC;gBACjC,OAAO,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAK,CAAC;YACtB,CAAC;SACF,CAAC;QAEF,OAAO,kBAAkB,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
// Use of this source code is governed by a BSD-style
|
|
4
4
|
// license that can be found in the LICENSE file.
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
7
|
-
function
|
|
6
|
+
exports.EventDecorator = EventDecorator;
|
|
7
|
+
function EventDecorator(params) {
|
|
8
8
|
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
9
9
|
return function (constructor) {
|
|
10
10
|
constructor.prototype.programStage = params.programStage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event.decorator.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/decorators/event.decorator.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;AAEjD,
|
|
1
|
+
{"version":3,"file":"event.decorator.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/decorators/event.decorator.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;AAEjD,wCAKC;AALD,SAAgB,cAAc,CAAC,MAAgC;IAC7D,wDAAwD;IACxD,OAAO,UAAU,WAAqB;QACpC,WAAW,CAAC,SAAS,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;IAC3D,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AssignedUserMode } from '../interfaces';
|
|
2
|
-
import { DataUrlGenerator } from '../../../shared';
|
|
2
|
+
import { DataQueryFilter, DataUrlGenerator } from '../../../shared';
|
|
3
3
|
export declare class EventUrlGenerator extends DataUrlGenerator<EventUrlGenerator> {
|
|
4
4
|
baseEndpoint: string;
|
|
5
5
|
programStage?: string;
|
|
@@ -10,6 +10,7 @@ export declare class EventUrlGenerator extends DataUrlGenerator<EventUrlGenerato
|
|
|
10
10
|
event?: string;
|
|
11
11
|
assignedUserMode?: AssignedUserMode;
|
|
12
12
|
assignedUser?: string;
|
|
13
|
+
attributeFilters?: DataQueryFilter[];
|
|
13
14
|
constructor(params: Partial<EventUrlGenerator>);
|
|
14
15
|
addEvent(url: string): string;
|
|
15
16
|
addProgramStage(url: string): string;
|
|
@@ -17,5 +18,6 @@ export declare class EventUrlGenerator extends DataUrlGenerator<EventUrlGenerato
|
|
|
17
18
|
addAssignedUser(url: string): string;
|
|
18
19
|
addOccurredDates(url: string): string;
|
|
19
20
|
addScheduledDates(url: string): string;
|
|
21
|
+
addAttributeFilters(url: string): string;
|
|
20
22
|
generate(): string;
|
|
21
23
|
}
|
|
@@ -16,6 +16,7 @@ class EventUrlGenerator extends shared_1.DataUrlGenerator {
|
|
|
16
16
|
this.orgUnit = params.orgUnit;
|
|
17
17
|
this.ouMode = params.ouMode || 'SELECTED';
|
|
18
18
|
this.filters = params.filters;
|
|
19
|
+
this.attributeFilters = params.attributeFilters;
|
|
19
20
|
this.fields = (_a = params.fields) !== null && _a !== void 0 ? _a : DEFAULT_FIELDS;
|
|
20
21
|
this.assignedUser = params.assignedUser;
|
|
21
22
|
this.assignedUserMode = params.assignedUserMode;
|
|
@@ -77,8 +78,16 @@ class EventUrlGenerator extends shared_1.DataUrlGenerator {
|
|
|
77
78
|
return (url +
|
|
78
79
|
`${isThereParams ? '&' : '?'}${this.scheduledAfter ? `scheduledAfter=${this.scheduledAfter}&` : ''}scheduledBefore=${this.scheduledBefore}`);
|
|
79
80
|
}
|
|
81
|
+
addAttributeFilters(url) {
|
|
82
|
+
if (!this.attributeFilters) {
|
|
83
|
+
return url;
|
|
84
|
+
}
|
|
85
|
+
const filterParams = shared_1.DataQueryFilter.getApiFilters(this.attributeFilters, 'filterAttributes');
|
|
86
|
+
const isThereParams = this.isThereQueryParams(url);
|
|
87
|
+
return url + `${isThereParams ? '&' : '?'}${filterParams}`;
|
|
88
|
+
}
|
|
80
89
|
generate() {
|
|
81
|
-
return this.addPager(this.addOrder(this.addAssignedUser(this.addAssignedUserMode(this.addEnrollmentDates(this.addOccurredDates(this.addScheduledDates(this.addFields(this.addOrgUnit(this.addFilters(this.addProgramStage(this.addProgram(this.addEvent(`${this.baseEndpoint}`)))))))))))));
|
|
90
|
+
return this.addPager(this.addOrder(this.addAssignedUser(this.addAssignedUserMode(this.addEnrollmentDates(this.addOccurredDates(this.addScheduledDates(this.addFields(this.addOrgUnit(this.addAttributeFilters(this.addFilters(this.addProgramStage(this.addProgram(this.addEvent(`${this.baseEndpoint}`))))))))))))));
|
|
82
91
|
}
|
|
83
92
|
}
|
|
84
93
|
exports.EventUrlGenerator = EventUrlGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-url-generator.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/models/event-url-generator.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAGjD,
|
|
1
|
+
{"version":3,"file":"event-url-generator.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/models/event-url-generator.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { D2HttpClient, DataQueryFilter, OuMode, Pager } from '../../../shared';
|
|
1
|
+
import { D2HttpClient, DataOrderCriteria, DataQueryFilter, OuMode, Pager } from '../../../shared';
|
|
2
2
|
import { Program } from '../../program';
|
|
3
3
|
import { AssignedUserMode, EventDateType } from '../interfaces';
|
|
4
4
|
import { D2EventResponse, DHIS2Event, IDHIS2Event } from '../models';
|
|
@@ -10,6 +10,7 @@ export declare class BaseEventQuery<T extends DHIS2Event> {
|
|
|
10
10
|
protected program?: string;
|
|
11
11
|
protected programStage?: string;
|
|
12
12
|
protected filters?: DataQueryFilter[];
|
|
13
|
+
protected attributeFilters?: DataQueryFilter[];
|
|
13
14
|
protected fields?: string;
|
|
14
15
|
protected event?: string;
|
|
15
16
|
protected trackedEntity?: string;
|
|
@@ -22,6 +23,7 @@ export declare class BaseEventQuery<T extends DHIS2Event> {
|
|
|
22
23
|
protected assignedUserMode?: AssignedUserMode;
|
|
23
24
|
protected enrollmentEnrolledBefore?: string;
|
|
24
25
|
protected enrollmentEnrolledAfter?: string;
|
|
26
|
+
protected orderCriterias?: DataOrderCriteria[];
|
|
25
27
|
pager: Pager;
|
|
26
28
|
[key: string]: unknown;
|
|
27
29
|
instance: T;
|
|
@@ -29,11 +31,13 @@ export declare class BaseEventQuery<T extends DHIS2Event> {
|
|
|
29
31
|
constructor(httpClient: D2HttpClient);
|
|
30
32
|
setOrgUnit(orgUnitValue: string | string[]): BaseEventQuery<T>;
|
|
31
33
|
setOuMode(ouMode: OuMode): BaseEventQuery<T>;
|
|
34
|
+
setOrderCriterias(orderCriterias: DataOrderCriteria[]): BaseEventQuery<T>;
|
|
32
35
|
setProgram(program: string): BaseEventQuery<T>;
|
|
33
36
|
setProgramStage(programStage: string): BaseEventQuery<T>;
|
|
34
37
|
setStartDate(startDate: string, dateType?: EventDateType): BaseEventQuery<T>;
|
|
35
38
|
setEndDate(endDate: string, dateType?: string): BaseEventQuery<T>;
|
|
36
39
|
setFilters(filters: DataQueryFilter[]): BaseEventQuery<T>;
|
|
40
|
+
setAttributeFilters(filters: DataQueryFilter[]): BaseEventQuery<T>;
|
|
37
41
|
setFields(fields: string): BaseEventQuery<T>;
|
|
38
42
|
setPagination(pagination: Pager): BaseEventQuery<T>;
|
|
39
43
|
setData(data: T): BaseEventQuery<T>;
|
|
@@ -27,6 +27,10 @@ class BaseEventQuery {
|
|
|
27
27
|
this.ouMode = ouMode;
|
|
28
28
|
return this;
|
|
29
29
|
}
|
|
30
|
+
setOrderCriterias(orderCriterias) {
|
|
31
|
+
this.orderCriterias = orderCriterias;
|
|
32
|
+
return this;
|
|
33
|
+
}
|
|
30
34
|
setProgram(program) {
|
|
31
35
|
this.program = program;
|
|
32
36
|
return this;
|
|
@@ -71,6 +75,10 @@ class BaseEventQuery {
|
|
|
71
75
|
this.filters = filters;
|
|
72
76
|
return this;
|
|
73
77
|
}
|
|
78
|
+
setAttributeFilters(filters) {
|
|
79
|
+
this.attributeFilters = filters;
|
|
80
|
+
return this;
|
|
81
|
+
}
|
|
74
82
|
setFields(fields) {
|
|
75
83
|
this.fields = fields;
|
|
76
84
|
return this;
|
|
@@ -133,6 +141,7 @@ class BaseEventQuery {
|
|
|
133
141
|
orgUnit: this.orgUnit,
|
|
134
142
|
ouMode: this.ouMode,
|
|
135
143
|
filters: this.filters,
|
|
144
|
+
attributeFilters: this.attributeFilters,
|
|
136
145
|
fields: this.fields,
|
|
137
146
|
enrollmentEnrolledAfter: this.enrollmentEnrolledAfter,
|
|
138
147
|
enrollmentEnrolledBefore: this.enrollmentEnrolledBefore,
|
|
@@ -140,6 +149,7 @@ class BaseEventQuery {
|
|
|
140
149
|
occurredBefore: this.occurredBefore,
|
|
141
150
|
scheduledAfter: this.scheduledAfter,
|
|
142
151
|
scheduledBefore: this.scheduledBefore,
|
|
152
|
+
orderCriterias: this.orderCriterias,
|
|
143
153
|
pager: this.pager,
|
|
144
154
|
}).generate());
|
|
145
155
|
const eventResponse = new models_1.D2EventResponse(response, this.identifiable);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-event.query.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/queries/base-event.query.ts"],"names":[],"mappings":";;;;;AAAA,mCAAmC;AAEnC,
|
|
1
|
+
{"version":3,"file":"base-event.query.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/queries/base-event.query.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import { IdentifiableObject, IdentifiableField } from '../../../shared';
|
|
2
|
-
export type OptionField = IdentifiableField;
|
|
2
|
+
export type OptionField = IdentifiableField | 'style';
|
|
3
3
|
export declare class Option extends IdentifiableObject<Option> {
|
|
4
4
|
static resourceName: string;
|
|
5
5
|
static singularResourceName: string;
|
|
6
|
+
style?: {
|
|
7
|
+
color?: string;
|
|
8
|
+
};
|
|
6
9
|
static fields: OptionField[];
|
|
7
10
|
}
|
|
@@ -10,5 +10,5 @@ class Option extends shared_1.IdentifiableObject {
|
|
|
10
10
|
exports.Option = Option;
|
|
11
11
|
Option.resourceName = 'options';
|
|
12
12
|
Option.singularResourceName = 'option';
|
|
13
|
-
Option.fields = [...shared_1.IDENTIFIABLE_FIELDS];
|
|
13
|
+
Option.fields = [...shared_1.IDENTIFIABLE_FIELDS, 'style'];
|
|
14
14
|
//# sourceMappingURL=option.model.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"option.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/option-set/models/option.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,4CAIyB;AAEzB,MAAa,MAAO,SAAQ,2BAA0B;;AAAtD,
|
|
1
|
+
{"version":3,"file":"option.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/option-set/models/option.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,4CAIyB;AAEzB,MAAa,MAAO,SAAQ,2BAA0B;;AAAtD,wBAKC;AAJQ,mBAAY,GAAG,SAAS,CAAC;AACzB,2BAAoB,GAAG,QAAQ,CAAC;AAEhC,aAAM,GAAkB,CAAC,GAAG,4BAAmB,EAAG,OAAO,CAAC,CAAC"}
|
|
@@ -9,7 +9,7 @@ const shared_1 = require("../../../shared");
|
|
|
9
9
|
class ProgramStageDataElement extends shared_1.IdentifiableObject {
|
|
10
10
|
constructor(programStageDataElement) {
|
|
11
11
|
super(programStageDataElement);
|
|
12
|
-
this.dataElement = new data_element_1.DataElement(programStageDataElement.dataElement || {});
|
|
12
|
+
this.dataElement = new data_element_1.DataElement(Object.assign(Object.assign({}, (programStageDataElement.dataElement || {})), { sortOrder: programStageDataElement.sortOrder }));
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
exports.ProgramStageDataElement = ProgramStageDataElement;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"program-stage-data-element.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/program-stage-data-element.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,gDAAgD;AAChD,qDAAiD;AACjD,4CAIyB;AAUzB,MAAa,uBAAwB,SAAQ,2BAA2C;IAoBtF,YAAY,uBAAyD;QACnE,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,
|
|
1
|
+
{"version":3,"file":"program-stage-data-element.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/program-stage-data-element.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,gDAAgD;AAChD,qDAAiD;AACjD,4CAIyB;AAUzB,MAAa,uBAAwB,SAAQ,2BAA2C;IAoBtF,YAAY,uBAAyD;QACnE,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,iCAC5B,CAAC,uBAAuB,CAAC,WAAW,IAAI,EAAE,CAAC,KAAE,SAAS,EAAE,uBAAuB,CAAC,SAAS,IAC9F,CAAC;IACJ,CAAC;;AAzBH,0DA0BC;AAzBQ,oCAAY,GAAG,0BAA0B,CAAC;AAC1C,4CAAoB,GAAG,yBAAyB,CAAC;AACxD,6BAA6B;AACtB,8BAAM,GAAmC;IAC9C,GAAG,4BAAmB;IACtB,kBAAkB;IAClB,YAAY;IACZ,WAAW;IACX,iBAAiB;IACjB,sBAAsB;IACtB,aAAa;CACd,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ProgramStageSection } from './program-stage-section.model';
|
|
2
2
|
import { ProgramStageDataElement } from './program-stage-data-element.model';
|
|
3
3
|
import { IdentifiableField, IdentifiableObject } from '../../../shared';
|
|
4
|
-
export type ProgramStageField = IdentifiableField | 'sortOrder' | 'executionDateLabel' | 'description' | 'formType' | 'blockEntryForm' | 'hideDueDate' | 'repeatable' | 'allowGenerateNextVisit' | 'minDaysFromStart' | 'generatedByEnrollmentDate' | 'autoGenerateEvent' | 'captureCoordinates' | 'featureType' | 'dueDateLabel';
|
|
4
|
+
export type ProgramStageField = IdentifiableField | 'sortOrder' | 'executionDateLabel' | 'description' | 'formType' | 'blockEntryForm' | 'hideDueDate' | 'repeatable' | 'allowGenerateNextVisit' | 'preGenerateUID' | 'openAfterEnrollment' | 'minDaysFromStart' | 'generatedByEnrollmentDate' | 'autoGenerateEvent' | 'captureCoordinates' | 'featureType' | 'dueDateLabel';
|
|
5
5
|
export declare class ProgramStage extends IdentifiableObject<ProgramStage> {
|
|
6
6
|
static resourceName: string;
|
|
7
7
|
static singularResourceName: string;
|
|
@@ -17,6 +17,8 @@ export declare class ProgramStage extends IdentifiableObject<ProgramStage> {
|
|
|
17
17
|
minDaysFromStart?: number;
|
|
18
18
|
generatedByEnrollmentDate?: boolean;
|
|
19
19
|
autoGenerateEvent?: boolean;
|
|
20
|
+
preGenerateUID?: boolean;
|
|
21
|
+
openAfterEnrollment?: boolean;
|
|
20
22
|
captureCoordinates?: boolean;
|
|
21
23
|
featureType?: string;
|
|
22
24
|
dueDateLabel?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"program-stage.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/program-stage.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,+EAAoE;AACpE,yFAA6E;AAC7E,4CAIyB;
|
|
1
|
+
{"version":3,"file":"program-stage.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/program-stage.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,+EAAoE;AACpE,yFAA6E;AAC7E,4CAIyB;AAoBzB,MAAa,YAAa,SAAQ,2BAAgC;IA0ChE,YAAY,YAAmC;QAC7C,KAAK,CAAC,YAAY,CAAC,CAAC;QACpB,IAAI,CAAC,oBAAoB,GAAG,CAAC,YAAY,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,GAAG,CACvE,CAAC,mBAAmB,EAAE,EAAE,CAAC,IAAI,iDAAmB,CAAC,mBAAmB,CAAC,CACtE,CAAC;QAEF,IAAI,CAAC,wBAAwB,GAAG,CAC9B,YAAY,CAAC,wBAAwB,IAAI,EAAE,CAC5C,CAAC,GAAG,CACH,CAAC,uBAAuB,EAAE,EAAE,CAC1B,IAAI,0DAAuB,CAAC,uBAAuB,CAAC,CACvD,CAAC;IACJ,CAAC;;AAtDH,oCAuDC;AAtDQ,yBAAY,GAAG,eAAe,CAAC;AAC/B,iCAAoB,GAAG,cAAc,CAAC;AACtC,mBAAM,GAAwB;IACnC,GAAG,4BAAmB;IACtB,WAAW;IACX,oBAAoB;IACpB,aAAa;IACb,UAAU;IACV,gBAAgB;IAChB,aAAa;IACb,YAAY;IACZ,wBAAwB;IACxB,gBAAgB;IAChB,qBAAqB;IACrB,kBAAkB;IAClB,2BAA2B;IAC3B,mBAAmB;IACnB,oBAAoB;IACpB,aAAa;IACb,cAAc;CACf,CAAC"}
|
|
@@ -9,7 +9,7 @@ const shared_1 = require("../../../shared");
|
|
|
9
9
|
class ProgramTrackedEntityAttribute extends shared_1.IdentifiableObject {
|
|
10
10
|
constructor(programTrackedEntityAttribute) {
|
|
11
11
|
super(programTrackedEntityAttribute);
|
|
12
|
-
this.trackedEntityAttribute = new tracked_entity_attribute_model_1.TrackedEntityAttribute(programTrackedEntityAttribute.trackedEntityAttribute || {});
|
|
12
|
+
this.trackedEntityAttribute = new tracked_entity_attribute_model_1.TrackedEntityAttribute(Object.assign(Object.assign({}, (programTrackedEntityAttribute.trackedEntityAttribute || {})), { sortOrder: programTrackedEntityAttribute.sortOrder }));
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
exports.ProgramTrackedEntityAttribute = ProgramTrackedEntityAttribute;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"program-tracked-entity-attribute.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/program-tracked-entity-attribute.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,qFAA0E;AAC1E,4CAIyB;AAYzB,MAAa,6BAA8B,SAAQ,2BAAiD;IAsBlG,YACE,6BAAqE;QAErE,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACrC,IAAI,CAAC,sBAAsB,GAAG,IAAI,uDAAsB,
|
|
1
|
+
{"version":3,"file":"program-tracked-entity-attribute.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/program-tracked-entity-attribute.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,qFAA0E;AAC1E,4CAIyB;AAYzB,MAAa,6BAA8B,SAAQ,2BAAiD;IAsBlG,YACE,6BAAqE;QAErE,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACrC,IAAI,CAAC,sBAAsB,GAAG,IAAI,uDAAsB,iCAClD,CAAC,6BAA6B,CAAC,sBAAsB,IAAI,EAAE,CAAC,KAAE,SAAS,EAAE,6BAA6B,CAAC,SAAS,IACrH,CAAC;IACJ,CAAC;;AA7BH,sEA8BC;AA7BQ,0CAAY,GAAG,gCAAgC,CAAC;AAChD,kDAAoB,GAAG,+BAA+B,CAAC;AAC9D,6BAA6B;AACtB,oCAAM,GAAyC;IACpD,GAAG,4BAAmB;IACtB,wBAAwB;IACxB,YAAY;IACZ,sBAAsB;IACtB,WAAW;IACX,WAAW;IACX,eAAe;IACf,iBAAiB;CAClB,CAAC"}
|
|
@@ -14,5 +14,6 @@ export declare class TrackedEntityAttribute extends IdentifiableObject<TrackedEn
|
|
|
14
14
|
optionSetValueCount?: number;
|
|
15
15
|
optionSet?: OptionSet;
|
|
16
16
|
allowFutureDate?: boolean;
|
|
17
|
+
sortOrder?: number;
|
|
17
18
|
constructor(trackedEntityAttribute: Partial<TrackedEntityAttribute>);
|
|
18
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracked-entity-attribute.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/tracked-entity-attribute.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,iDAA6C;AAC7C,4CAIyB;AAYzB,MAAa,sBAAuB,SAAQ,2BAA0C;
|
|
1
|
+
{"version":3,"file":"tracked-entity-attribute.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/tracked-entity-attribute.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,iDAA6C;AAC7C,4CAIyB;AAYzB,MAAa,sBAAuB,SAAQ,2BAA0C;IA0BpF,YAAY,sBAAuD;QACjE,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC9B,IAAI,sBAAsB,CAAC,cAAc,EAAE,CAAC;YAC1C,IAAI,CAAC,SAAS,GAAG,IAAI,sBAAS,CAAC,sBAAsB,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;;AA/BH,wDAgCC;AA/BQ,mCAAY,GAAG,yBAAyB,CAAC;AACzC,2CAAoB,GAAG,wBAAwB,CAAC;AACvD,6BAA6B;AACtB,6BAAM,GAAkC;IAC7C,GAAG,4BAAmB;IACtB,UAAU;IACV,WAAW;IACX,iBAAiB;IACjB,WAAW;IACX,QAAQ;IACR,gBAAgB;IAChB,qBAAqB;IACrB,WAAW;CACZ,CAAC"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { IdentifiableField, IdentifiableObject } from '../../../shared';
|
|
2
|
+
import { TrackedEntityTypeAttribute } from './tracked-entity-type-attribute.model';
|
|
2
3
|
export type TrackedEntityTypeField = IdentifiableField | 'trackedEntityTypeAttributes' | 'featureType' | 'minAttributesRequiredToSearch' | 'maxTeiCountToReturn' | 'allowAuditLog' | 'description' | 'displayDescription' | 'displayFormName';
|
|
3
4
|
export declare class TrackedEntityType extends IdentifiableObject<TrackedEntityType> {
|
|
4
5
|
#private;
|
|
5
6
|
static resourceName: string;
|
|
6
7
|
static singularResourceName: string;
|
|
7
8
|
static fields: TrackedEntityTypeField[];
|
|
8
|
-
trackedEntityTypeAttributes:
|
|
9
|
+
trackedEntityTypeAttributes: TrackedEntityTypeAttribute[];
|
|
9
10
|
featureType: string;
|
|
10
11
|
minAttributesRequiredToSearch: number;
|
|
11
12
|
maxTeiCountToReturn: number;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { D2HttpClient } from '../../shared';
|
|
2
|
-
import { ProgramQuery, ProgramRuleActionQuery, ProgramRuleQuery, ProgramRuleVariableQuery, ProgramSectionQuery, ProgramStageDataElementQuery, ProgramStageQuery, ProgramStageSectionQuery, ProgramTrackedEntityAttributeQuery, TrackedEntityAttributeQuery, TrackedEntityTypeQuery } from './queries';
|
|
2
|
+
import { ProgramQuery, ProgramRuleActionQuery, ProgramRuleQuery, ProgramRuleVariableQuery, ProgramSectionQuery, ProgramStageDataElementQuery, ProgramStageQuery, ProgramStageSectionQuery, ProgramTrackedEntityAttributeQuery, TrackedEntityAttributeQuery, TrackedEntityTypeAttributeQuery, TrackedEntityTypeQuery } from './queries';
|
|
3
3
|
export declare class ProgramModule {
|
|
4
4
|
private httpClient;
|
|
5
5
|
constructor(httpClient: D2HttpClient);
|
|
@@ -14,4 +14,5 @@ export declare class ProgramModule {
|
|
|
14
14
|
get programTrackedEntityAttribute(): ProgramTrackedEntityAttributeQuery;
|
|
15
15
|
get trackedEntityAttribute(): TrackedEntityAttributeQuery;
|
|
16
16
|
get trackedEntityType(): TrackedEntityTypeQuery;
|
|
17
|
+
get trackedEntityTypeAttribute(): TrackedEntityTypeAttributeQuery;
|
|
17
18
|
}
|
|
@@ -39,6 +39,9 @@ class ProgramModule {
|
|
|
39
39
|
get trackedEntityType() {
|
|
40
40
|
return new queries_1.TrackedEntityTypeQuery(this.httpClient);
|
|
41
41
|
}
|
|
42
|
+
get trackedEntityTypeAttribute() {
|
|
43
|
+
return new queries_1.TrackedEntityTypeAttributeQuery(this.httpClient);
|
|
44
|
+
}
|
|
42
45
|
}
|
|
43
46
|
exports.ProgramModule = ProgramModule;
|
|
44
47
|
//# sourceMappingURL=program.module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"program.module.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/program.module.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"program.module.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/program.module.ts"],"names":[],"mappings":";;;AACA,uCAamB;AAEnB,MAAa,aAAa;IACxB,YAAoB,UAAwB;QAAxB,eAAU,GAAV,UAAU,CAAc;IAAG,CAAC;IAChD,IAAI,OAAO;QACT,OAAO,IAAI,sBAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,2BAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,6BAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,mBAAmB;QACrB,OAAO,IAAI,kCAAwB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACvD,CAAC;IAED,IAAI,uBAAuB;QACzB,OAAO,IAAI,sCAA4B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,0BAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,IAAI,gCAAsB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACrD,CAAC;IAED,IAAI,mBAAmB;QACrB,OAAO,IAAI,kCAAwB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACvD,CAAC;IAED,IAAI,6BAA6B;QAC/B,OAAO,IAAI,4CAAkC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACjE,CAAC;IAED,IAAI,sBAAsB;QACxB,OAAO,IAAI,qCAA2B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,IAAI,gCAAsB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACrD,CAAC;IAED,IAAI,0BAA0B;QAC5B,OAAO,IAAI,yCAA+B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC9D,CAAC;CACF;AAjDD,sCAiDC"}
|
|
@@ -15,4 +15,5 @@ tslib_1.__exportStar(require("./program-stage-section.query"), exports);
|
|
|
15
15
|
tslib_1.__exportStar(require("./program-tracked-entity-attribute.query"), exports);
|
|
16
16
|
tslib_1.__exportStar(require("./tracked-entity-attribute.query"), exports);
|
|
17
17
|
tslib_1.__exportStar(require("./tracked-entity-type.query"), exports);
|
|
18
|
+
tslib_1.__exportStar(require("./tracked-entity-type-attribute.query"), exports);
|
|
18
19
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/queries/index.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,0DAAgC;AAChC,gEAAsC;AACtC,kEAAwC;AACxC,+DAAqC;AACrC,sEAA4C;AAC5C,wEAA8C;AAC9C,6EAAmD;AACnD,wEAA8C;AAC9C,mFAAyD;AACzD,2EAAiD;AACjD,sEAA4C"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/queries/index.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,0DAAgC;AAChC,gEAAsC;AACtC,kEAAwC;AACxC,+DAAqC;AACrC,sEAA4C;AAC5C,wEAA8C;AAC9C,6EAAmD;AACnD,wEAA8C;AAC9C,mFAAyD;AACzD,2EAAiD;AACjD,sEAA4C;AAC5C,gFAAsD"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { BaseQuery, D2HttpClient } from '../../../shared';
|
|
2
|
+
import { TrackedEntityTypeAttribute, TrackedEntityTypeAttributeField } from '../models';
|
|
3
|
+
export declare class TrackedEntityTypeAttributeQuery extends BaseQuery<TrackedEntityTypeAttribute, TrackedEntityTypeAttributeField> {
|
|
4
|
+
constructor(httpClient: D2HttpClient);
|
|
5
|
+
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TrackedEntityTypeAttributeQuery = void 0;
|
|
4
|
+
// Copyright 2025 UDSM DHIS2 Lab. All rights reserved.
|
|
5
|
+
// Use of this source code is governed by a BSD-style
|
|
6
|
+
// license that can be found in the LICENSE file.
|
|
7
|
+
const shared_1 = require("../../../shared");
|
|
8
|
+
const models_1 = require("../models");
|
|
9
|
+
class TrackedEntityTypeAttributeQuery extends shared_1.BaseQuery {
|
|
10
|
+
constructor(httpClient) {
|
|
11
|
+
super(models_1.TrackedEntityTypeAttribute, httpClient);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
exports.TrackedEntityTypeAttributeQuery = TrackedEntityTypeAttributeQuery;
|
|
15
|
+
//# sourceMappingURL=tracked-entity-type-attribute.query.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tracked-entity-type-attribute.query.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/queries/tracked-entity-type-attribute.query.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,4CAA0D;AAC1D,sCAGmB;AAEnB,MAAa,+BAAgC,SAAQ,kBAGpD;IACC,YAAY,UAAwB;QAClC,KAAK,CAAC,mCAA0B,EAAE,UAAU,CAAC,CAAC;IAChD,CAAC;CACF;AAPD,0EAOC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function
|
|
1
|
+
export declare function AttributeFieldDecorator(attributeId: string, generated?: boolean): PropertyDecorator;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.AttributeFieldDecorator = AttributeFieldDecorator;
|
|
4
4
|
const utils_1 = require("../utils");
|
|
5
|
-
function
|
|
5
|
+
function AttributeFieldDecorator(attributeId, generated) {
|
|
6
6
|
return function (target, propertyKey) {
|
|
7
7
|
const adjustedDescripter = {
|
|
8
8
|
configurable: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attribute-field.decorator.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/decorators/attribute-field.decorator.ts"],"names":[],"mappings":";;AAGA,
|
|
1
|
+
{"version":3,"file":"attribute-field.decorator.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/decorators/attribute-field.decorator.ts"],"names":[],"mappings":";;AAGA,0DAkCC;AApCD,oCAAyC;AAEzC,SAAgB,uBAAuB,CACrC,WAAmB,EACnB,SAAmB;IAEnB,OAAO,UAAU,MAAW,EAAE,WAAgB;QAC5C,MAAM,kBAAkB,GAAuB;YAC7C,YAAY,EAAE,IAAI;YAClB,UAAU,EAAE,IAAI;YAChB,GAAG,CAAO,QAAQ;gBAChB,MAAM,QAAQ,GAAG,IAA6B,CAAC;gBAC/C,2EAA2E;gBAC3E,QAAQ,CAAC,MAAM,mCACV,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC,KAC1B,CAAC,WAAW,CAAC,EAAE;wBACb,EAAE,EAAE,WAAW;wBACf,IAAI,EAAE,WAAW;wBACjB,SAAS;qBACV,GACF,CAAC;gBAEF,QAAQ,CAAC,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACpD,CAAC;YACD,GAAG;gBACD,MAAM,QAAQ,GAAG,IAA6B,CAAC;gBAE/C,OAAO,qBAAa,CAAC,iBAAiB,CACpC,WAAW,EACX,QAAQ,CAAC,YAAY,CAAC,CACb,CAAC;YACd,CAAC;SACF,CAAC;QAEF,OAAO,kBAAkB,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function
|
|
1
|
+
export declare function EnrollmentDateFieldDecorator(): PropertyDecorator;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
function
|
|
3
|
+
exports.EnrollmentDateFieldDecorator = EnrollmentDateFieldDecorator;
|
|
4
|
+
function EnrollmentDateFieldDecorator() {
|
|
5
5
|
return function () {
|
|
6
6
|
const adjustedDescripter = {
|
|
7
7
|
configurable: true,
|