From 8ed2425a551c64f197c31ead3896a62f531f5a43 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Tue, 12 Mar 2024 10:16:03 +0700 Subject: [PATCH 1/3] update texteditor --- .../Components/DetailMonitoringForm.tsx | 33 +++++++++++-------- .../Components/DetailMonitoringList.tsx | 25 ++++++++++---- 2 files changed, 38 insertions(+), 20 deletions(-) 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) : '-' } From ace5035879f1ca3b412e339e7c62018e30a0a2b8 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Tue, 12 Mar 2024 10:34:32 +0700 Subject: [PATCH 2/3] service monitoring --- .../pages/AlarmCenter/ServiceMonitoring.tsx | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx b/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx index bbbb1f7b..5db4dacb 100644 --- a/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx +++ b/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx @@ -248,6 +248,19 @@ export default function ServiceMonitoring() { }; }, [corporateValue]); + const clearCodeHtml = (text:any) => { + return new DOMParser().parseFromString(text, 'text/html').documentElement.textContent + } + + const renderHTML = (data:string) => { + return ( +
+ ); + } + + return ( @@ -977,7 +990,7 @@ export default function ServiceMonitoring() { Subject {dailyMonitoring.subject - ? dailyMonitoring.subject + ? clearCodeHtml(dailyMonitoring.subject) : '-'} @@ -989,7 +1002,7 @@ export default function ServiceMonitoring() { {dailyMonitoring.object - ? dailyMonitoring.object + ? clearCodeHtml(dailyMonitoring.object) : '-'} @@ -1087,7 +1100,7 @@ export default function ServiceMonitoring() { {dailyMonitoring.analysis - ? dailyMonitoring.analysis + ? clearCodeHtml(dailyMonitoring.analysis) : '-'} @@ -1106,7 +1119,7 @@ export default function ServiceMonitoring() { {dailyMonitoring.plans.length > 0 ? ( dailyMonitoring.plans.map((plan, planIndex) => plan.type === 1 ? ( -
  • {plan.plan}
    • +
  • {renderHTML(plan.plan)}
    • ) : null ) ) : ( @@ -1133,7 +1146,7 @@ export default function ServiceMonitoring() { {dailyMonitoring.plans.length > 0 ? ( dailyMonitoring.plans.map((plan, planIndex) => plan.type === 2 ? ( -
  • {plan.plan}
    • +
  • {renderHTML(plan.plan)}
    • ) : null ) ) : ( From f19eb5743f5cf3deaf92971306a0a1f2909478d1 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Tue, 12 Mar 2024 15:23:42 +0700 Subject: [PATCH 3/3] update view texteditor --- .../src/pages/AlarmCenter/ServiceMonitoring.tsx | 11 ++++------- .../Components/DetailMonitoringList.tsx | 14 +++++--------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx b/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx index 5db4dacb..449f036c 100644 --- a/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx +++ b/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx @@ -248,10 +248,7 @@ export default function ServiceMonitoring() { }; }, [corporateValue]); - const clearCodeHtml = (text:any) => { - return new DOMParser().parseFromString(text, 'text/html').documentElement.textContent - } - + const renderHTML = (data:string) => { return (
    Subject {dailyMonitoring.subject - ? clearCodeHtml(dailyMonitoring.subject) + ? renderHTML(dailyMonitoring.subject) : '-'} @@ -1002,7 +999,7 @@ export default function ServiceMonitoring() { {dailyMonitoring.object - ? clearCodeHtml(dailyMonitoring.object) + ? renderHTML(dailyMonitoring.object) : '-'} @@ -1100,7 +1097,7 @@ export default function ServiceMonitoring() { {dailyMonitoring.analysis - ? clearCodeHtml(dailyMonitoring.analysis) + ? renderHTML(dailyMonitoring.analysis) : '-'} diff --git a/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringList.tsx b/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringList.tsx index 093e0807..e01f2f54 100644 --- a/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringList.tsx +++ b/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringList.tsx @@ -172,11 +172,7 @@ export default function DetailMonitoringList() { setDetailMonitoringList(response); setOrganizationId(organization_id); } - - const clearCodeHtml = (text:any) => { - return new DOMParser().parseFromString(text, 'text/html').documentElement.textContent - } - + const renderHTML = (data:string) => { return (
    - {clearCodeHtml(row.subject)} + {renderHTML(row.subject)} @@ -283,7 +279,7 @@ export default function DetailMonitoringList() { - {clearCodeHtml(row.object)} + {renderHTML(row.object)} @@ -342,7 +338,7 @@ export default function DetailMonitoringList() { - {clearCodeHtml(row.analysis)} + {renderHTML(row.analysis)} @@ -433,7 +429,7 @@ export default function DetailMonitoringList() { - {row.examination != null ? clearCodeHtml(row.examination) : '-' } + {row.examination != null ? renderHTML(row.examination) : '-' }