@iapps/ng-dhis2-ui 1.1.63 → 1.1.64
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.
|
@@ -3339,7 +3339,7 @@ class LineListService {
|
|
|
3339
3339
|
startDate ? `enrollmentEnrolledAfter=${startDate}` : '',
|
|
3340
3340
|
endDate ? `enrollmentEnrolledBefore=${endDate}` : '',
|
|
3341
3341
|
].filter(Boolean).join('&');
|
|
3342
|
-
const ouModeIdentifier = ouMode && useOuModeWithOlderDHIS2Instance ?
|
|
3342
|
+
const ouModeIdentifier = ouMode && useOuModeWithOlderDHIS2Instance ? `&ouMode=${ouMode}` : `&orgUnitMode=${ouMode}`;
|
|
3343
3343
|
return this.httpClient
|
|
3344
3344
|
.get(`tracker/trackedEntities.json?program=${programId}&orgUnit=${orgUnit}${ouModeIdentifier}&page=${page}&pageSize=${pageSize}&fields=trackedEntity,orgUnit,attributes[*],enrollments[*]&totalPages=true&${filterParams}${dateFilter}&order=createdAt:desc`)
|
|
3345
3345
|
.pipe(switchMap((response) => {
|
|
@@ -3385,7 +3385,7 @@ class LineListService {
|
|
|
3385
3385
|
getEvents(programId, orgUnit, page, pageSize, filters = [], startDate, endDate, ouMode, useOuModeWithOlderDHIS2Instance) {
|
|
3386
3386
|
const filterParams = buildFilters(filters);
|
|
3387
3387
|
const dateFilter = startDate && endDate ? `&startDate=${startDate}&endDate=${endDate}` : '';
|
|
3388
|
-
const ouModeIdentifier = ouMode && useOuModeWithOlderDHIS2Instance ?
|
|
3388
|
+
const ouModeIdentifier = ouMode && useOuModeWithOlderDHIS2Instance ? `&ouMode=${ouMode}` : `&ouMode=${ouMode}`;
|
|
3389
3389
|
// const ouModeIdentifier = ouMode ? `&ouMode=${ouMode}`: ``;
|
|
3390
3390
|
return this.httpClient.get(`events.json?program=${programId}&orgUnit=${orgUnit}${ouModeIdentifier}&page=${page}&pageSize=${pageSize}&fields=*&totalPages=true&${filterParams}${dateFilter}`);
|
|
3391
3391
|
}
|