From 77175e979e31c5ed33266dfd10012f039ca698a8 Mon Sep 17 00:00:00 2001
From: ivan-sim <ivan@sismedika.com>
Date: Fri, 20 Oct 2023 18:29:34 +0700
Subject: [PATCH] Update Member & Hospital

---
 ...10_19_132434_create_corporate_hospitals.php |  2 +-
 .../src/pages/Corporates/Hospital/Form.tsx     | 16 +++++++++++++---
 .../src/pages/Corporates/Hospital/List.tsx     | 18 +++++++++---------
 .../src/pages/Corporates/Member/List.tsx       | 10 +++++-----
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/database/migrations/2023_10_19_132434_create_corporate_hospitals.php b/database/migrations/2023_10_19_132434_create_corporate_hospitals.php
index 5b1bb211..ae434a69 100644
--- a/database/migrations/2023_10_19_132434_create_corporate_hospitals.php
+++ b/database/migrations/2023_10_19_132434_create_corporate_hospitals.php
@@ -21,7 +21,7 @@ return new class extends Migration
             $table->string('name', 255);
             $table->text('description')->nullable();
             $table->tinyInteger('active')->default(1);
-            $table->text('reason');
+            $table->text('reason')->nullable();
             $table->timestamps();
             $table->softDeletes();
             $table->bigInteger('created_by')->nullable();
diff --git a/frontend/dashboard/src/pages/Corporates/Hospital/Form.tsx b/frontend/dashboard/src/pages/Corporates/Hospital/Form.tsx
index f31ac177..b0d708bf 100644
--- a/frontend/dashboard/src/pages/Corporates/Hospital/Form.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Hospital/Form.tsx
@@ -14,19 +14,28 @@ export default function CorporateHospitalForm({ isEdit }: Props) {
   const navigate = useNavigate();
   const { corporate_id, id, organization_id } = useParams();
   const [dataHospital, setDataHospital] = useState(null);
-  const [addData, setAddData] = useState(null);
   let idHospital = organization_id && isEdit ? organization_id : 0;
   const [indexData, setIndexData] = useState(idHospital);
   const [updateData, setUpdateData] = useState(null);
+  const [dataDefault, setDataDefault] = useState(null);
 
   useEffect(() => {
     axios.get('/corporates/' + corporate_id + '/hospitals/data')
     .then((res) => {
       setDataHospital(res.data);
+      const data = {
+        corporate_id : corporate_id ? corporate_id : null,
+        organization_id : res.data[0] ? res.data[0].id : null,
+        code : res.data[0] ? res.data[0].code : null,
+        name : res.data[0] ? res.data[0].name : null,
+      }
+      setDataDefault(data);
     })
     
   }, [isEdit]);
-  
+
+  const [addData, setAddData] = useState(dataDefault);
+
   const handlePageChange = (index:any) => {
     setIndexData(index);
     const data = {
@@ -36,11 +45,12 @@ export default function CorporateHospitalForm({ isEdit }: Props) {
       name : dataHospital ? dataHospital[index].name : null,
     }
     setAddData(data);
+    
   }
   const handleSaveData = () => {
     //Save data
     axios
-    .post('/corporates/'+corporate_id+'/hospitals/save', addData)
+    .post('/corporates/'+corporate_id+'/hospitals/save', (addData ? addData : dataDefault))
     .then((response) => {
       if(response.data)
       {
diff --git a/frontend/dashboard/src/pages/Corporates/Hospital/List.tsx b/frontend/dashboard/src/pages/Corporates/Hospital/List.tsx
index 9a706f12..74f4bc94 100644
--- a/frontend/dashboard/src/pages/Corporates/Hospital/List.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Hospital/List.tsx
@@ -96,10 +96,10 @@ export default function PlanList() {
 
     return (
       <React.Fragment>
-        <TableRow>
-          <TableCell align="center">{row.code ? row.code : '-'}</TableCell>
+        <TableRow sx={{ '& > *': open ? {borderBottom: 'unset'} : {}, cursor: open ? 'pointer' : '' }} onClick={() => {if(open==true) setOpen(!open)}}>
+          <TableCell align="left">{row.code ? row.code : '-'}</TableCell>
           <TableCell align="left">{row.name ? row.name : '-'}</TableCell>
-          <TableCell align="center">
+          <TableCell align="left">
             {row.active === 1 ? (
               <Label color='success' >
                 Active
@@ -110,7 +110,7 @@ export default function PlanList() {
               </Label>
             )}
             </TableCell>
-          <TableCell align="center">
+          <TableCell align="left">
             <TableMoreMenu actions={
               <>
                 <MenuItem onClick={() => setOpen(!open)}>
@@ -135,8 +135,8 @@ export default function PlanList() {
           </TableCell>
         </TableRow>
         {/* COLLAPSIBLE ROW */}
-        <TableRow sx={{display: open ? '' : 'none',}}>
-          <TableCell colSpan={4 }>
+        <TableRow sx={{display: open ? '' : 'none', cursor: open ? 'pointer' : ''}} onClick={() => {if(open==true) setOpen(!open)}}>
+          <TableCell colSpan={4}>
             <Collapse in={open} timeout="auto" unmountOnExit>
               <Card sx={{padding:2}}>
                 <Box sx={{ pb: 2 }}>
@@ -290,16 +290,16 @@ export default function PlanList() {
             {/* Table Head */}
             <TableHead>
               <TableRow>
-                <TableCell sx={{width: '20%'}} align="center">
+                <TableCell sx={{width: '20%'}} align="left">
                   <Typography variant='subtitle2'>Code</Typography>
                 </TableCell>
                 <TableCell sx={{width: '50%'}} align="left">
                   <Typography variant='subtitle2'>Hospital</Typography>
                 </TableCell>
-                <TableCell sx={{width: '20%'}} align="center">
+                <TableCell sx={{width: '20%'}} align="left">
                   <Typography variant='subtitle2'>Status</Typography>
                 </TableCell>
-                <TableCell sx={{width: '10%'}} align="center">
+                <TableCell sx={{width: '10%'}} align="left">
                 </TableCell>
               </TableRow>
             </TableHead>
diff --git a/frontend/dashboard/src/pages/Corporates/Member/List.tsx b/frontend/dashboard/src/pages/Corporates/Member/List.tsx
index ad92b05f..35e208ca 100644
--- a/frontend/dashboard/src/pages/Corporates/Member/List.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Member/List.tsx
@@ -424,7 +424,7 @@ export default function CorporatePlanList({handleSubmitSuccess}) {
   }
 
   const [columns, setColumns] = React.useState([
-    { id: 'member_id', label: 'Member ID', minWidth: 100, align: 'center', width: '10%' },
+    { id: 'member_id', label: 'Member ID', minWidth: 100, align: 'left', width: '10%' },
     { id: 'effective_date', label: 'Effective Date', minWidth: 100, align: 'left', width: '20%' },
     { id: 'name', label: 'Name', minWidth: 100, align: 'left', width: '20%' },
     { id: 'plan_id', label: 'Plan ID', minWidth: 100, align: 'left', width: '10%' },
@@ -470,8 +470,8 @@ export default function CorporatePlanList({handleSubmitSuccess}) {
     
     return (
       <React.Fragment>
-        <TableRow key={row.id || index}>
-          <TableCell align="center">
+        <TableRow key={row.id || index} sx={{ '& > *': open ? {borderBottom: 'unset'} : {}, cursor: open ? 'pointer' : '' }} onClick={() => {if(open==true) setOpen(!open)}}>
+          <TableCell align="left">
             <Typography variant='body2'>{row.member_id ? row.member_id : '-'}</Typography>
           </TableCell>
           <TableCell align="left">
@@ -489,7 +489,7 @@ export default function CorporatePlanList({handleSubmitSuccess}) {
           <TableCell align="left">
             <Typography variant='body2'>{row.terminated_date ? row.terminated_date : '-'}</Typography>
           </TableCell>
-          <TableCell align='center'>
+          <TableCell align='left'>
             <TableMoreMenu actions={
               <>
                 <MenuItem onClick={() => setOpen(!open)}>
@@ -510,7 +510,7 @@ export default function CorporatePlanList({handleSubmitSuccess}) {
           </TableCell>
         </TableRow>
         {/* COLLAPSIBLE ROW */}
-        <TableRow sx={{display: open ? '' : 'none',}}>
+        <TableRow sx={{display: open ? '' : 'none', cursor: open ? 'pointer' : ''}} onClick={() => {if(open==true) setOpen(!open)}}>
           <TableCell colSpan={8}>
             <Collapse in={open} timeout="auto" unmountOnExit>
               <Card sx={{padding:2}}>