@iapps/d2-web-sdk 1.0.12 → 1.0.14
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/queries/base-event.query.js +1 -0
- package/src/lib/modules/event/queries/base-event.query.js.map +1 -1
- package/src/lib/modules/tracker/queries/base-tracker.query.d.ts +5 -2
- package/src/lib/modules/tracker/queries/base-tracker.query.js +11 -9
- package/src/lib/modules/tracker/queries/base-tracker.query.js.map +1 -1
- package/src/lib/shared/interfaces/ou-mode.interface.d.ts +1 -1
package/package.json
CHANGED
|
@@ -114,6 +114,7 @@ class BaseEventQuery {
|
|
|
114
114
|
enrollment: this.enrollment,
|
|
115
115
|
program: this.program,
|
|
116
116
|
programStage: this.programStage,
|
|
117
|
+
orgUnit: this.orgUnit,
|
|
117
118
|
}, { generateIdIfNotExists: true });
|
|
118
119
|
this.instance.fields = tslib_1.__classPrivateFieldGet(this, _BaseEventQuery_instances, "m", _BaseEventQuery_getFields).call(this, program, this.instance);
|
|
119
120
|
}
|
|
@@ -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":"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
|
|
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,6 +1,7 @@
|
|
|
1
1
|
import { D2HttpClient, D2HttpResponse, Pager, DataQueryFilter, ProgramDateType, OuMode } from '../../../shared';
|
|
2
2
|
import { Program } from '../../program';
|
|
3
3
|
import { D2TrackerResponse, ITrackedEntityInstance, TrackedEntityInstance } from '../models';
|
|
4
|
+
export type TrackerFetchScope = 'TRACKED_ENTITY' | 'ENROLLMENT';
|
|
4
5
|
export declare class BaseTrackerQuery<T extends TrackedEntityInstance> {
|
|
5
6
|
#private;
|
|
6
7
|
protected httpClient: D2HttpClient;
|
|
@@ -36,9 +37,11 @@ export declare class BaseTrackerQuery<T extends TrackedEntityInstance> {
|
|
|
36
37
|
ownerUid: string;
|
|
37
38
|
value: string;
|
|
38
39
|
}[]>;
|
|
39
|
-
get(
|
|
40
|
+
get(config?: {
|
|
41
|
+
fetchScope: TrackerFetchScope;
|
|
42
|
+
}): Promise<D2TrackerResponse<T>>;
|
|
40
43
|
create(): Promise<T>;
|
|
41
|
-
protected fetchData(): Promise<D2HttpResponse>;
|
|
44
|
+
protected fetchData(fetchScope: TrackerFetchScope): Promise<D2HttpResponse>;
|
|
42
45
|
save(): Promise<D2TrackerResponse<T>>;
|
|
43
46
|
getMetaData(): Promise<Program | null>;
|
|
44
47
|
}
|
|
@@ -19,12 +19,9 @@ class BaseTrackerQuery {
|
|
|
19
19
|
models_1.TrackedEntityInstance;
|
|
20
20
|
}
|
|
21
21
|
setOrgUnit(orgUnitValue) {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
? orgUnitValue.join(';')
|
|
26
|
-
: orgUnitValue;
|
|
27
|
-
}
|
|
22
|
+
this.orgUnit = (0, lodash_1.isArray)(orgUnitValue)
|
|
23
|
+
? orgUnitValue.join(';')
|
|
24
|
+
: orgUnitValue;
|
|
28
25
|
return this;
|
|
29
26
|
}
|
|
30
27
|
setOuMode(ouMode) {
|
|
@@ -113,9 +110,9 @@ class BaseTrackerQuery {
|
|
|
113
110
|
return [];
|
|
114
111
|
});
|
|
115
112
|
}
|
|
116
|
-
get() {
|
|
113
|
+
get(config) {
|
|
117
114
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
118
|
-
const response = yield this.fetchData();
|
|
115
|
+
const response = yield this.fetchData((config === null || config === void 0 ? void 0 : config.fetchScope) || 'TRACKED_ENTITY');
|
|
119
116
|
return new models_1.D2TrackerResponse(response, this.identifiable);
|
|
120
117
|
});
|
|
121
118
|
}
|
|
@@ -129,6 +126,7 @@ class BaseTrackerQuery {
|
|
|
129
126
|
trackedEntity: (0, shared_1.generateUid)(),
|
|
130
127
|
trackedEntityType: (_a = program.trackedEntityType) === null || _a === void 0 ? void 0 : _a.id,
|
|
131
128
|
program: program.id,
|
|
129
|
+
orgUnit: this.orgUnit,
|
|
132
130
|
});
|
|
133
131
|
this.instance.fields = Object.assign(Object.assign(Object.assign({}, (this.instance.fields || {})), (program.dataElements || []).reduce((fieldObject, dataElement) => {
|
|
134
132
|
const key = dataElement.code
|
|
@@ -158,9 +156,13 @@ class BaseTrackerQuery {
|
|
|
158
156
|
return this.instance;
|
|
159
157
|
});
|
|
160
158
|
}
|
|
161
|
-
fetchData() {
|
|
159
|
+
fetchData(fetchScope) {
|
|
162
160
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
161
|
+
const baseUrl = fetchScope === 'ENROLLMENT'
|
|
162
|
+
? 'tracker/enrollments'
|
|
163
|
+
: 'tracker/trackedEntities';
|
|
163
164
|
return yield this.httpClient.get(new models_1.TrackerUrlGenerator({
|
|
165
|
+
baseEndpoint: baseUrl,
|
|
164
166
|
program: this.program,
|
|
165
167
|
trackedEntityType: this.trackedEntityType,
|
|
166
168
|
orgUnit: this.orgUnit,
|
|
@@ -1 +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,
|
|
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":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export type OuMode = 'ALL' | 'DESCENDANTS' | 'SELECTED' | 'CHILDREN';
|
|
1
|
+
export type OuMode = 'ALL' | 'DESCENDANTS' | 'SELECTED' | 'CHILDREN' | 'ACCESSIBLE';
|