@iapps/d2-web-sdk 1.0.19 → 1.0.21
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/event/models/d2-event-response.model.js +1 -1
- package/src/lib/modules/event/models/d2-event-response.model.js.map +1 -1
- package/src/lib/modules/event/models/event.model.d.ts +2 -0
- package/src/lib/modules/event/models/event.model.js +18 -3
- package/src/lib/modules/event/models/event.model.js.map +1 -1
package/package.json
CHANGED
|
@@ -30,7 +30,7 @@ _D2EventResponse_instances = new WeakSet(), _D2EventResponse_getPagination = fun
|
|
|
30
30
|
pageCount: data['pageCount'],
|
|
31
31
|
});
|
|
32
32
|
}, _D2EventResponse_getData = function _D2EventResponse_getData(dataResponse, model) {
|
|
33
|
-
const data = dataResponse['events'] || dataResponse;
|
|
33
|
+
const data = dataResponse['events'] || dataResponse['instances'] || dataResponse;
|
|
34
34
|
if ((0, lodash_1.isPlainObject)(data)) {
|
|
35
35
|
return new model(data);
|
|
36
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"d2-event-response.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/models/d2-event-response.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;;AAEjD,mCAAgD;AAEhD,4CAA8E;AAG9E,MAAa,eAAe;IAK1B,YAAY,QAAwB,EAAE,KAAkB;;QACtD,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;QAE9C,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YAClB,IAAI,CAAC,UAAU,GAAG,+BAAA,IAAI,kEAAe,MAAnB,IAAI,EAAgB,QAAQ,CAAC,IAAI,CAAC,CAAC;YACrD,IAAI,CAAC,IAAI,GAAG,+BAAA,IAAI,4DAAS,MAAb,IAAI,EAAU,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;CA0BF;AAtCD,0CAsCC;qHAxBgB,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,+DAEQ,YAAqC,EAAE,KAAkB;IAChE,MAAM,IAAI,GAAG,YAAY,CAAC,QAAQ,CAAC,IAAI,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"d2-event-response.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/models/d2-event-response.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;;AAEjD,mCAAgD;AAEhD,4CAA8E;AAG9E,MAAa,eAAe;IAK1B,YAAY,QAAwB,EAAE,KAAkB;;QACtD,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;QAE9C,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YAClB,IAAI,CAAC,UAAU,GAAG,+BAAA,IAAI,kEAAe,MAAnB,IAAI,EAAgB,QAAQ,CAAC,IAAI,CAAC,CAAC;YACrD,IAAI,CAAC,IAAI,GAAG,+BAAA,IAAI,4DAAS,MAAb,IAAI,EAAU,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;CA0BF;AAtCD,0CAsCC;qHAxBgB,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,+DAEQ,YAAqC,EAAE,KAAkB;IAChE,MAAM,IAAI,GAAG,YAAY,CAAC,QAAQ,CAAC,IAAK,YAAY,CAAC,WAAW,CAAC,IAAI,YAAY,CAAC;IAElF,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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { BaseTrackerSDKModel } from '../../tracker/models/base.model';
|
|
2
2
|
import { DataValue } from './data-value.model';
|
|
3
3
|
import { DHIS2EventAssignedUser, DHIS2EventStatus, EventFieldProperty } from '../interfaces';
|
|
4
|
+
import { Program } from '../../program';
|
|
4
5
|
export interface IDHIS2Event {
|
|
5
6
|
storedBy?: string;
|
|
6
7
|
dueDate?: string;
|
|
@@ -86,6 +87,7 @@ export declare class DHIS2Event extends BaseTrackerSDKModel<DHIS2Event> implemen
|
|
|
86
87
|
value: string;
|
|
87
88
|
code?: string;
|
|
88
89
|
}): void;
|
|
90
|
+
setFields(program: Program): void;
|
|
89
91
|
getDataValue(dataElement: string): DataValue;
|
|
90
92
|
updateDataValues(dataValueEntities: Record<string, unknown>): void;
|
|
91
93
|
setStatus(status?: string): void;
|
|
@@ -21,6 +21,7 @@ const DEFAULT_FIELD_PROPERTIES = {
|
|
|
21
21
|
};
|
|
22
22
|
class DHIS2Event extends base_model_1.BaseTrackerSDKModel {
|
|
23
23
|
constructor(eventDetails, config) {
|
|
24
|
+
var _a, _b, _c, _d;
|
|
24
25
|
if ((0, lodash_1.isEmpty)(eventDetails) && !(config === null || config === void 0 ? void 0 : config.skipAutoGeneration)) {
|
|
25
26
|
eventDetails = event_util_1.EventUtil.generateEvent({
|
|
26
27
|
program: '',
|
|
@@ -36,9 +37,10 @@ class DHIS2Event extends base_model_1.BaseTrackerSDKModel {
|
|
|
36
37
|
if ((config === null || config === void 0 ? void 0 : config.generateIdIfNotExists) && !this.event) {
|
|
37
38
|
this.event = (0, shared_1.generateUid)();
|
|
38
39
|
}
|
|
39
|
-
this.occurredAt =
|
|
40
|
-
this.
|
|
41
|
-
|
|
40
|
+
this.occurredAt = (_b = (_a = (this.eventDate ||
|
|
41
|
+
this.occurredAt ||
|
|
42
|
+
new Date().toISOString())) === null || _a === void 0 ? void 0 : _a.split('T')) === null || _b === void 0 ? void 0 : _b[0];
|
|
43
|
+
this.dueDate = (_d = (_c = (this.dueDate || this.scheduledAt)) === null || _c === void 0 ? void 0 : _c.split('T')) === null || _d === void 0 ? void 0 : _d[0];
|
|
42
44
|
(this.dataValues || []).forEach((dataValue) => {
|
|
43
45
|
if (dataValue.code && dataValue.code.length > 0) {
|
|
44
46
|
this[(0, lodash_1.camelCase)(dataValue.code)] = dataValue.value;
|
|
@@ -79,6 +81,19 @@ class DHIS2Event extends base_model_1.BaseTrackerSDKModel {
|
|
|
79
81
|
: [...(this.dataValues || []), { dataElement, value, code }];
|
|
80
82
|
}
|
|
81
83
|
}
|
|
84
|
+
setFields(program) {
|
|
85
|
+
this.fields = Object.assign(Object.assign({}, (this.fields || {})), (program.dataElements || [])
|
|
86
|
+
.filter((dataElement) => dataElement.programStageId === this.programStage)
|
|
87
|
+
.reduce((fieldObject, dataElement) => {
|
|
88
|
+
const key = dataElement.code
|
|
89
|
+
? (0, lodash_1.camelCase)(dataElement.code)
|
|
90
|
+
: dataElement.id;
|
|
91
|
+
return Object.assign(Object.assign({}, fieldObject), { [key]: {
|
|
92
|
+
id: dataElement.id,
|
|
93
|
+
type: 'DATA_ELEMENT',
|
|
94
|
+
} });
|
|
95
|
+
}, {}));
|
|
96
|
+
}
|
|
82
97
|
getDataValue(dataElement) {
|
|
83
98
|
return (this.dataValues || []).find((dataValue) => dataValue.dataElement === dataElement);
|
|
84
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/models/event.model.ts"],"names":[],"mappings":";;;AAAA,mCAAmE;AACnE,oDAAgD;AAChD,gEAAsE;AAEtE,4CAA8C;
|
|
1
|
+
{"version":3,"file":"event.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/models/event.model.ts"],"names":[],"mappings":"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"}
|