diff --git a/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringForm.tsx b/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringForm.tsx index f3692db7..6a6af022 100644 --- a/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringForm.tsx +++ b/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringForm.tsx @@ -12,7 +12,7 @@ import { LoadingButton } from "@mui/lab"; * ============================================ */ import Page from '@/components/Page'; -import { FormProvider, RHFTextField } from '@/components/hook-form'; +import { FormProvider, RHFEditor, RHFTextField } from '@/components/hook-form'; import RHFDatePickerV2 from '@/components/hook-form/RHFDatePickerV2'; /** @@ -293,7 +293,7 @@ export default function DetailMonitoringList() { Subject* : - + {/* + */} + + @@ -313,7 +316,7 @@ export default function DetailMonitoringList() { Objective - + {/* + */} + + @@ -427,7 +433,7 @@ export default function DetailMonitoringList() { Analysis* : - + {/* + */} + + @@ -453,12 +462,10 @@ export default function DetailMonitoringList() { return ( - { @@ -512,8 +519,8 @@ export default function DetailMonitoringList() { return ( - - - + diff --git a/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringList.tsx b/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringList.tsx index f25f407f..093e0807 100644 --- a/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringList.tsx +++ b/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringList.tsx @@ -38,6 +38,7 @@ import MuiDialog from '@/components/MuiDialog'; import { DialogActions } from '@mui/material'; import axios from '@/utils/axios'; import { enqueueSnackbar } from 'notistack'; +import { escape } from 'lodash'; export default function DetailMonitoringList() { @@ -172,6 +173,18 @@ export default function DetailMonitoringList() { setOrganizationId(organization_id); } + const clearCodeHtml = (text:any) => { + return new DOMParser().parseFromString(text, 'text/html').documentElement.textContent + } + + const renderHTML = (data:string) => { + return ( +
+ ); + } + return ( @@ -255,7 +268,7 @@ export default function DetailMonitoringList() { - {row.subject} + {clearCodeHtml(row.subject)} @@ -270,7 +283,7 @@ export default function DetailMonitoringList() { - {row.object} + {clearCodeHtml(row.object)} @@ -329,7 +342,7 @@ export default function DetailMonitoringList() { - {row.analysis} + {clearCodeHtml(row.analysis)} @@ -348,7 +361,7 @@ export default function DetailMonitoringList() { row.medical_plan?.map((data, index) => { return ( - {data.medical_plan_str} + {renderHTML(data.medical_plan_str)} ) }) @@ -371,7 +384,7 @@ export default function DetailMonitoringList() { row.non_medikamentosa_plan?.map((data, index) => { return ( - {data.non_medikamentosa_plan_str} + {renderHTML(data.non_medikamentosa_plan_str)} ) }) @@ -420,7 +433,7 @@ export default function DetailMonitoringList() { - {row.examination != null ? row.examination : '-' } + {row.examination != null ? clearCodeHtml(row.examination) : '-' }