feat: display assigned users on the events in enrollment overview

dhis2 · Oct 30, 2023 · 7487a3a · 7487a3a
1 parent d10cc18
commit 7487a3a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/...ore_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/Stage.component.js b/...ore_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/Stage.component.js
@@ -30,7 +30,7 @@ const hideProgramStage = (ruleEffects, stageId) => (
 
 export const StagePlain = ({ stage, events, classes, className, onCreateNew, ruleEffects, ...passOnProps }: Props) => {
     const [open, setOpenStatus] = useState(true);
-    const { id, name, icon, description, dataElements, hideDueDate, repeatable } = stage;
+    const { id, name, icon, description, dataElements, hideDueDate, repeatable, enableUserAssignment } = stage;
     const hiddenProgramStage = hideProgramStage(ruleEffects, id);
 
     return (
@@ -57,6 +57,7 @@ export const StagePlain = ({ stage, events, classes, className, onCreateNew, rul
                     dataElements={dataElements}
                     hideDueDate={hideDueDate}
                     repeatable={repeatable}
+                    enableUserAssignment={enableUserAssignment}
                     onCreateNew={onCreateNew}
                     hiddenProgramStage={hiddenProgramStage}
                     {...passOnProps}

diff --git a/...e-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/StageDetail.component.js b/...e-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/StageDetail.component.js
@@ -66,6 +66,7 @@ const StageDetailPlain = (props: Props) => {
         dataElements,
         hideDueDate = false,
         repeatable = false,
+        enableUserAssignment = false,
         onEventClick,
         onViewAll,
         onCreateNew,
@@ -76,7 +77,7 @@ const StageDetailPlain = (props: Props) => {
         sortDirection: SORT_DIRECTION.DESC,
     };
     const { stage } = getProgramAndStageForProgram(programId, stageId);
-    const headerColumns = useComputeHeaderColumn(dataElements, hideDueDate, stage?.stageForm);
+    const headerColumns = useComputeHeaderColumn(dataElements, hideDueDate, enableUserAssignment, stage?.stageForm);
     const { loading, value: dataSource, error } = useComputeDataFromEvent(dataElements, events);
 
 

diff --git a/...ture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/hooks/useEventList.js b/...ture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/hooks/useEventList.js
@@ -18,17 +18,19 @@ import {
 import { SORT_DIRECTION, MULIT_TEXT_WITH_NO_OPTIONS_SET } from './constants';
 import { isNotValidOptionSet } from '../../../../../../utils/isNotValidOptionSet';
 
-const baseKeys = [{ id: 'status' }, { id: 'occurredAt' }, { id: 'orgUnitName' }, { id: 'scheduledAt' }, { id: 'comments' }];
+const baseKeys = [{ id: 'status' }, { id: 'occurredAt' }, { id: 'assignedUser' }, { id: 'orgUnitName' }, { id: 'scheduledAt' }, { id: 'comments' }];
 const basedFieldTypes = [
     { type: dataElementTypes.STATUS, resolveValue: convertStatusForView },
     { type: dataElementTypes.DATE },
+    { type: 'ASSIGNEE' },
     { type: dataElementTypes.TEXT },
     { type: dataElementTypes.DATE },
     { type: dataElementTypes.UNKNOWN, resolveValue: convertCommentForView },
 ];
 const getBaseColumnHeaders = props => [
     { header: i18n.t('Status'), sortDirection: SORT_DIRECTION.DEFAULT, isPredefined: true },
     { header: props.formFoundation.getLabel('occurredAt'), sortDirection: SORT_DIRECTION.DEFAULT, isPredefined: true },
+    { header: i18n.t('Assigned to'), sortDirection: SORT_DIRECTION.DEFAULT, isPredefined: true },
     { header: i18n.t('Registering unit'), sortDirection: SORT_DIRECTION.DEFAULT, isPredefined: true },
     { header: props.formFoundation.getLabel('scheduledAt'), sortDirection: SORT_DIRECTION.DEFAULT, isPredefined: true },
     { header: '', sortDirection: null, isPredefined: true },
@@ -110,7 +112,7 @@ const useComputeDataFromEvent = (dataElements: Array<StageDataElement>, events:
 };
 
 
-const useComputeHeaderColumn = (dataElements: Array<StageDataElement>, hideDueDate: boolean, formFoundation: Object) => {
+const useComputeHeaderColumn = (dataElements: Array<StageDataElement>, hideDueDate: boolean, enableUserAssignment: boolean, formFoundation: Object) => {
     const headerColumns = useMemo(() => {
         const dataElementHeaders = dataElements.reduce((acc, currDataElement) => {
             const { id, name, formName, type, optionSet } = currDataElement;
@@ -124,9 +126,10 @@ const useComputeHeaderColumn = (dataElements: Array<StageDataElement>, hideDueDa
             return acc;
         }, []);
         return [
-            ...getBaseColumns({ formFoundation }).filter(col => (hideDueDate ? col.id !== 'scheduledAt' : true)),
+            ...getBaseColumns({ formFoundation })
+                .filter(col => (enableUserAssignment || col.id !== 'assignedUser') && (!hideDueDate || col.id !== 'scheduledAt')),
             ...dataElementHeaders];
-    }, [dataElements, hideDueDate, formFoundation]);
+    }, [dataElements, hideDueDate, enableUserAssignment, formFoundation]);
 
     return headerColumns;
 };

diff --git a/...pture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/stageDetail.types.js b/...pture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/stageDetail.types.js
@@ -7,6 +7,7 @@ import type { StageDataElement, StageCommonProps } from '../../../types/common.t
     eventName: string,
     hideDueDate?: boolean,
     repeatable?: boolean,
+    enableUserAssignment?: boolean,
     stageId: string,
     hiddenProgramStage?: boolean,
     ...CssClasses,

diff --git a/src/core_modules/capture-core/converters/clientToList.js b/src/core_modules/capture-core/converters/clientToList.js
@@ -92,7 +92,7 @@ const valueConvertersForType = {
     [dataElementTypes.FILE_RESOURCE]: convertResourceForDisplay,
     [dataElementTypes.IMAGE]: convertResourceForDisplay,
     [dataElementTypes.ORGANISATION_UNIT]: (rawValue: Object) => rawValue.name,
-    [dataElementTypes.ASSIGNEE]: (rawValue: Object) => `${rawValue.name} (${rawValue.username})`,
+    [dataElementTypes.ASSIGNEE]: (rawValue: Object) => `${rawValue.name || rawValue.displayName} (${rawValue.username})`,
     [dataElementTypes.NUMBER_RANGE]: convertNumberRangeForDisplay,
     [dataElementTypes.STATUS]: convertStatusForDisplay,
 };