@iapps/ng-dhis2-ui 1.1.73 → 1.1.75
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.
|
@@ -3577,7 +3577,7 @@ class LineListService {
|
|
|
3577
3577
|
? `&ouMode=${ouMode}`
|
|
3578
3578
|
: `&orgUnitMode=${ouMode}`;
|
|
3579
3579
|
return this.httpClient
|
|
3580
|
-
.get(`tracker/trackedEntities.json?program=${programId}&orgUnit=${orgUnit}${ouModeIdentifier}&page=${page}&pageSize=${pageSize}&fields=trackedEntity,orgUnit,attributes[*],enrollments[*]&totalPages=true&${filterParams}
|
|
3580
|
+
.get(`tracker/trackedEntities.json?program=${programId}&orgUnit=${orgUnit}${ouModeIdentifier}&page=${page}&pageSize=${pageSize}&fields=trackedEntity,orgUnit,attributes[*],enrollments[*]&totalPages=true&${filterParams}&${filterParamsFromEvents}${dateFilter}&order=createdAt:desc`)
|
|
3581
3581
|
.pipe(switchMap((response) => {
|
|
3582
3582
|
if (filterRootOrgUnit) {
|
|
3583
3583
|
response.trackedEntities = response.trackedEntities.filter((tei) => tei.orgUnit !== orgUnit);
|
|
@@ -3956,14 +3956,12 @@ const getTrackedEntityData = (response, programId, pager, isOptionSetNameVisible
|
|
|
3956
3956
|
}));
|
|
3957
3957
|
const searchableKeys = new Set(searchableAttributes.map((attr) => attr.key));
|
|
3958
3958
|
const filteredEntityColumns = entityColumns.filter((column) => searchableKeys.has(column.key));
|
|
3959
|
-
console.log('teis', teis);
|
|
3960
3959
|
const attributesData = teis.map((tei, idx) => {
|
|
3961
3960
|
const row = {
|
|
3962
3961
|
trackedEntityInstance: tei.trackedEntity,
|
|
3963
3962
|
index: (pager.page - 1) * pager.pageSize + idx + 1,
|
|
3964
3963
|
};
|
|
3965
3964
|
allAttributes.forEach((attrId) => (row[attrId] = ''));
|
|
3966
|
-
console.log('all attributes', allAttributes);
|
|
3967
3965
|
const matchingEnrollment = tei.enrollments.find((enrollment) => enrollment.program === programId);
|
|
3968
3966
|
let attributesToUse = matchingEnrollment
|
|
3969
3967
|
? matchingEnrollment.attributes
|
|
@@ -4017,7 +4015,6 @@ const getTrackedEntityData = (response, programId, pager, isOptionSetNameVisible
|
|
|
4017
4015
|
row['orgUnit'] = orgUnitMap?.get(matchingEnrollment.orgUnit) || 'N/A';
|
|
4018
4016
|
return row;
|
|
4019
4017
|
});
|
|
4020
|
-
console.log('entity columns', entityColumns);
|
|
4021
4018
|
if (teis.length === 0) {
|
|
4022
4019
|
entityColumns = [
|
|
4023
4020
|
{ label: orgUnitLabel || 'registering unit', key: 'orgUnit' },
|
|
@@ -4032,7 +4029,6 @@ const getTrackedEntityData = (response, programId, pager, isOptionSetNameVisible
|
|
|
4032
4029
|
})),
|
|
4033
4030
|
];
|
|
4034
4031
|
}
|
|
4035
|
-
console.log('filtered entity columns', filteredEntityColumns);
|
|
4036
4032
|
return {
|
|
4037
4033
|
columns: entityColumns,
|
|
4038
4034
|
data: attributesData,
|
|
@@ -4359,8 +4355,9 @@ class LineListTableComponent extends ReactWrapperModule {
|
|
|
4359
4355
|
gap: '10px',
|
|
4360
4356
|
flexWrap: 'wrap',
|
|
4361
4357
|
} },
|
|
4362
|
-
React__default.createElement(InputField$1, { key: "location",
|
|
4363
|
-
|
|
4358
|
+
React__default.createElement(InputField$1, { key: "location",
|
|
4359
|
+
//label={orgUnitLabel}
|
|
4360
|
+
label: orgUnitLabel ? orgUnitLabel : 'registering unit', value: selectedOrgUnit, clearable: true, onFocus: () => setHide(false), className: "custom-input", onChange: (event) => {
|
|
4364
4361
|
setSelectedOrgUnit(event.value);
|
|
4365
4362
|
setOrgUnitState(defaultOrgUnit);
|
|
4366
4363
|
} }),
|