@iapps/ng-dhis2-ui 1.2.5 → 1.2.7

package/fesm2022/iapps-ng-dhis2-ui.mjs

@@ -3314,15 +3314,14 @@ const FilterToolbar = ({ orgUnitLabel, selectedOrgUnit, setSelectedOrgUnit, setO
                 setOrgUnitState(defaultOrgUnit);
             } }),
         React__default.createElement(CalendarInput, { label: "Start date:", calendar: "gregory", locale: "en-GB", timeZone: "Africa/Dar_es_Salaam", className: "custom-input", clearable: !!startDateState, date: startDateState, onDateSelect: (selectedDate) => {
-                if (!(selectedDate.calendarDateString === null)) {
-                    setStartDateState(selectedDate.calendarDateString);
-                }
-                console.log(selectedDate.calendarDateString);
+                // if (!(selectedDate.calendarDateString === null)) {
+                setStartDateState(selectedDate.calendarDateString);
+                //}
             } }),
         React__default.createElement(CalendarInput, { label: "End date:", calendar: "gregory", locale: "en-GB", timeZone: "Africa/Dar_es_Salaam", className: "custom-input", clearable: !!endDateState, date: endDateState, onDateSelect: (selectedDate) => {
-                if (!(selectedDate.calendarDateString === null)) {
-                    setEndDateState(selectedDate.calendarDateString);
-                }
+                // if (!(selectedDate.calendarDateString === null)) {
+                setEndDateState(selectedDate.calendarDateString);
+                //}
             } }),
         (visibleFilters ?? []).map(({ label, key, valueType, options }) => {
             if (valueType === 'DATE') {
@@ -3535,6 +3534,7 @@ const DataTableActions = (props) => {
 // license that can be found in the LICENSE file.
 
 const TableCell = ({ cell, getTextColorFromBackGround, }) => {
+    console.log('cel value', cell);
     if (cell?.style && cell?.style !== 'default-value') {
         return (React__default.createElement(DataTableCell, null,
             React__default.createElement("div", { style: { display: 'flex', justifyContent: 'center' } },
@@ -3787,15 +3787,15 @@ const getTrackedEntityTableData = (response, programId, pager, metaData) => {
         .orgUnitsMap;
     const attributeColumns = metaData.displayInListTrackedEntityAttributes
         .sort((a, b) => a.sortOrder - b.sortOrder)
-        .map((attr) => ({
-        label: attr.name,
-        key: attr.id,
+        .map((trackedEntityAttribute) => ({
+        label: trackedEntityAttribute.formName ?? trackedEntityAttribute.name,
+        key: trackedEntityAttribute.id,
     }));
     const dataElementColumns = metaData.displayInListDataElements
         .sort((a, b) => a.sortOrder - b.sortOrder)
-        .map((element) => ({
-        label: element.name,
-        key: element.id,
+        .map((dataElement) => ({
+        label: dataElement.formName || dataElement.name,
+        key: dataElement.id,
     }));
     const dataElementOptions = metaData.displayInListDataElements.map((element) => ({
         id: element.id,
@@ -3843,7 +3843,17 @@ const getTrackedEntityTableData = (response, programId, pager, metaData) => {
             return attr;
         });
         attributesData.forEach((attr) => {
-            row[attr.attribute] = { value: attr.value };
+            const attributeMeta = metaData.programTrackedEntityAttributes?.find((metadata) => metadata.trackedEntityAttribute.id === attr.attribute);
+            if (attributeMeta?.trackedEntityAttribute.optionSetValue) {
+                const optionSet = attributeMeta?.trackedEntityAttribute?.optionSet;
+                const option = optionSet?.options?.find((option) => option.code === attr.value);
+                row[attr.attribute] = option
+                    ? { value: option?.name }
+                    : { value: attr.value };
+            }
+            else {
+                row[attr.attribute] = { value: attr.value };
+            }
         });
         dataElementsData.forEach((element) => {
             // Find the matching data element in dataElementOptions by ID
@@ -3887,6 +3897,58 @@ const addActionsColumn = (columns, actionOptions) => {
     ];
 };
 
+const getEvents = (response, programStageId, pager, metaData) => {
+    const events = response.data.events;
+    const eventsiiii = response.data;
+    const allDataElements = new Set();
+    events.forEach((event) => {
+        event.dataValues.forEach((dv) => allDataElements.add(dv.dataElement));
+    });
+    let stageFromMetaData;
+    if (programStageId) {
+        stageFromMetaData = metaData.programStages.find((stage) => stage.id === programStageId);
+    }
+    else if (metaData.programType === 'WITHOUT_REGISTRATION') {
+        stageFromMetaData = metaData.programStages[0];
+    }
+    if (!stageFromMetaData) {
+        throw new Error(`Program stage with ID ${programStageId} not found`);
+    }
+    const entityColumns = Array.from(allDataElements).map((dataElementId) => {
+        const dataElementMeta = stageFromMetaData.programStageDataElements.find((psde) => psde.dataElement.id === dataElementId);
+        return {
+            label: dataElementMeta?.dataElement.name || dataElementId,
+            key: dataElementId,
+        };
+    });
+    const dataElementsData = events.map((event, idx) => {
+        const row = {
+            event: { value: event.event },
+            index: {
+                value: (pager.page - 1) * pager.pageSize + idx + 1,
+            },
+        };
+        allDataElements.forEach((dataElementId) => {
+            row[dataElementId] = { value: '' };
+        });
+        event.dataValues.forEach((dv) => {
+            const dataElementMeta = stageFromMetaData.programStageDataElements.find((psde) => psde.dataElement.id === dv.dataElement);
+            if (dataElementMeta?.dataElement.optionSet) {
+                const optionSet = dataElementMeta.dataElement.optionSet;
+                const matchingOption = optionSet.options.find((option) => option.code === dv.value);
+                row[dv.dataElement] = matchingOption
+                    ? { value: matchingOption.name }
+                    : { value: dv.value };
+            }
+            else {
+                row[dv.dataElement] = { value: dv.value };
+            }
+        });
+        return row;
+    });
+    return { columns: entityColumns, data: dataElementsData };
+};
+
 // src/app/line-list-table.component.ts
 class LineListTableComponent extends ReactWrapperModule {
     constructor() {
@@ -3974,10 +4036,36 @@ class LineListTableComponent extends ReactWrapperModule {
                 if (!metaData) {
                     return undefined;
                 }
-                setLoading(true);
                 const isTracker = metaData.programType === 'WITH_REGISTRATION';
+                const isEvent = metaData.programType === 'WITHOUT_REGISTRATION';
                 const endDate = endDateState ?? new Date().toISOString().split('T')[0];
-                if (isTracker) {
+                if (this.programStageId || isEvent) {
+                    setLoading(true);
+                    d2.eventModule.event
+                        .setProgram(this.programId)
+                        .setProgramStage(this.programStageId)
+                        .setPagination(new Pager({
+                        pageSize: pager.pageSize,
+                        page: pager.page,
+                    }))
+                        .get()
+                        .then((response) => {
+                        const eventsResponse = {
+                            events: response.data,
+                            pager: pager,
+                            // orgUnitsMap: fetchedOrgUnits,
+                        };
+                        const { columns, data } = getEvents({ data: eventsResponse }, this.programStageId, pager, metaData);
+                        const finalColumns = addActionsColumn([{ label: '#', key: 'index' }, ...columns], this.actionOptions);
+                        const pagerResponse = response.pagination;
+                        setLoading(false);
+                        setColumns(finalColumns);
+                        setData(data);
+                        setPager(new Pager(pagerResponse || {}));
+                    });
+                }
+                else if (isTracker) {
+                    setLoading(true);
                     d2.trackerModule.trackedEntity
                         .setEndDate(endDate)
                         .setStartDate(startDateState)
@@ -4028,9 +4116,6 @@ class LineListTableComponent extends ReactWrapperModule {
                         });
                     });
                 }
-                else {
-                    //TODO: TO IMPLEMEMNT EVENT QUERY FOR FILTERING EVENTS WHEN PROGRAM STAGE IS PASSED OR DEALING WITH EVENT PROGRAM USING TRACKER SDK QUERY
-                }
             }, [
                 metaData,
                 programIdState,
@@ -5009,7 +5094,9 @@ class FormFieldGroup {
                 ...field,
                 id: field.id,
                 code: fieldMetaData['code'],
-                label: (fieldMetaData['formName'] ?? field['label']),
+                label: (fieldMetaData['formName'] ??
+                    fieldMetaData['name'] ??
+                    field['label']),
                 key: camelCase(fieldMetaData['code']) || field.id,
                 required: (fieldMetaData['mandatory'] ??
                     fieldMetaData['required']),
@@ -5140,7 +5227,6 @@ class FormMetadataSection {
         return programTrackedEntityAttributes.map((programTrackedEntityAttribute) => {
             return {
                 ...programTrackedEntityAttribute['trackedEntityAttribute'],
-                formName: (programTrackedEntityAttribute['trackedEntityAttribute'] || {})['name'],
                 sortOrder: programTrackedEntityAttribute['sortOrder'],
                 mandatory: programTrackedEntityAttribute['mandatory'],
                 allowFutureDate: programTrackedEntityAttribute['allowFutureDate'],
@@ -6625,6 +6711,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.8", ngImpor
 class FlatFormComponent extends BaseFormWrapperComponent {
     ngOnInit() {
         this.formGroup = FormUtil.getFormGroup(this.fields(), this.dataValues());
+        this.onFormUpdate();
     }
     onFormUpdate() {
         this.updateDataValues(this.formGroup.getRawValue());
@@ -7048,7 +7135,7 @@ class TrackerFormComponent {
                 programs: [program],
                 programStage: this.programStage(),
                 disableEnrollmentDate: true,
-                excludeInheritedAttributes: true,
+                excludeInheritedAttributes: false,
             }).toJson();
         }
     }
@@ -7185,8 +7272,11 @@ class ProgramEntryFormFieldUtil {
         });
     }
     get dataElements() {
-        return flatten((this.program.programStages || []).map((programStage) => {
-            return (programStage.programStageDataElements || []).map((stageDataElement) => {
+        const programStages = this.config.programStage
+            ? this.program.programStages?.filter((programStage) => programStage.id === this.config.programStage)
+            : this.program.programStages;
+        return flatten((programStages || []).map((programStage) => {
+            const dataElements = (programStage.programStageDataElements || []).map((stageDataElement) => {
                 return {
                     ...stageDataElement.dataElement,
                     sortOrder: stageDataElement.sortOrder,
@@ -7196,6 +7286,28 @@ class ProgramEntryFormFieldUtil {
                     metaType: 'DATA_ELEMENT',
                 };
             });
+            const eventDateName = programStage.executionDateLabel ||
+                `Reporting date - ${programStage.name}`;
+            return [
+                {
+                    id: 'occurredAt',
+                    code: 'OCCURRED_AT',
+                    formName: eventDateName,
+                    name: eventDateName,
+                    shortName: eventDateName,
+                    displayName: eventDateName,
+                    sortOrder: 1,
+                    mandatory: true,
+                    stepId: programStage.id,
+                    valueType: 'DATE',
+                    metaType: 'EVENT_DATE',
+                    domainType: 'TRACKER',
+                    aggregationType: 'NONE',
+                    lastUpdated: '',
+                    created: '',
+                },
+                ...dataElements,
+            ];
         }));
     }
     #getOrgUniField() {
@@ -7214,7 +7326,7 @@ class ProgramEntryFormFieldUtil {
         });
     }
     #getEnrollmentDateField() {
-        if (this.config.hideEnrollmentDate) {
+        if (this.config.hideEnrollmentDate || this.config.programStage) {
             return null;
         }
         return new FormField({
@@ -7229,7 +7341,7 @@ class ProgramEntryFormFieldUtil {
         });
     }
     #getIncidentDateField() {
-        if (!this.program.displayIncidentDate) {
+        if (!this.program.displayIncidentDate || this.config.programStage) {
             return null;
         }
         return new DateField({
@@ -7340,7 +7452,6 @@ class ProgramEntryFormMetaData {
             .with(this.d2.programModule.trackedEntityTypeAttribute.select([
             'trackedEntityAttribute',
         ])), 'ToOne')
-            .with(this.d2.programModule.programTrackedEntityAttribute.with(this.d2.programModule.trackedEntityAttribute.with(this.d2.optionSetModule.optionSet.with(this.d2.optionSetModule.option), 'ToOne'), 'ToOne'))
             .with(this.d2.programModule.programRuleVariable
             .with(this.d2.dataElementModule.dataElement.select([
             'id',
@@ -7353,13 +7464,17 @@ class ProgramEntryFormMetaData {
             'name',
         ]), 'ToOne'))
             .byId(program);
+        if (!this.config.programStage) {
+            programQuery.with(this.d2.programModule.programTrackedEntityAttribute.with(this.d2.programModule.trackedEntityAttribute.with(this.d2.optionSetModule.optionSet.with(this.d2.optionSetModule.option), 'ToOne'), 'ToOne'));
+        }
         if (this.config.displayType === 'FLAT') {
             programQuery.with(this.d2.programModule.programSection.with(this.d2.programModule.trackedEntityAttribute.select(['id'])));
         }
-        if (!this.config.excludeProgramStages) {
-            programQuery.with(this.d2.programModule.programStage
+        if (!this.config.excludeProgramStages || this.config.programStage) {
+            const programStageQuery = this.d2.programModule.programStage
                 .with(this.d2.programModule.programStageSection)
-                .with(this.d2.programModule.programStageDataElement.with(this.d2.dataElementModule.dataElement.with(this.d2.optionSetModule.optionSet.with(this.d2.optionSetModule.option), 'ToOne'), 'ToOne')));
+                .with(this.d2.programModule.programStageDataElement.with(this.d2.dataElementModule.dataElement.with(this.d2.optionSetModule.optionSet.with(this.d2.optionSetModule.option), 'ToOne'), 'ToOne'));
+            programQuery.with(programStageQuery);
         }
         return programQuery.get();
     }
@@ -7577,14 +7692,22 @@ class ProgramEntryFormModule {
     }
     async #saveInstance() {
         switch (this.config().formType) {
-            case 'TRACKER':
+            case 'TRACKER': {
+                if (this.config().autoComplete) {
+                    this.instance().complete();
+                }
                 return this.instanceQuery
                     .setData(this.instance())
                     .save();
-            case 'EVENT':
+            }
+            case 'EVENT': {
+                if (this.config().autoComplete) {
+                    this.instance().complete();
+                }
                 return this.instanceQuery
                     .setData(this.instance())
                     .save();
+            }
             default:
                 return firstValueFrom(of(null));
         }
@@ -7614,10 +7737,17 @@ class ProgramEntryFormModule {
             .setEnrollment(this.enrollment())
             .setTrackedEntity(this.trackedEntity())
             .setOrgUnit(this.orgUnit());
-        return this.event()
-            ? (await this.instanceQuery.setEvent(this.event()).get())
-                .data || (await this.instanceQuery.create())
-            : await this.instanceQuery.create();
+        if (!this.event()) {
+            return await this.instanceQuery.create();
+        }
+        const instance = (await this.instanceQuery.setEvent(this.event()).get()).data;
+        if (!instance) {
+            return await this.instanceQuery.create();
+        }
+        if (this.metaData()?.program) {
+            instance.setFields(this.metaData().program);
+        }
+        return instance;
     }
     #getInstance() {
         switch (this.config().formType) {