Merge remote-tracking branch 'origin/staging' into origin/production

frontend/dashboard/src/pages/CustomerService/Request/Components/DialogConfirmation.tsx

@@ -86,7 +86,7 @@ export default function DialogConfirmation({requestLog, setOpenDialog, openDialo
     const resetForm = () => {
         setFormData({
             status: approve,
-            no_identitas: '',
+            no_identitas: requestLog?.no_identitas ?? '',
             keterangan: '',
             hak_kamar_pasien: '',
             penempatan_kamar: '',

frontend/hospital-portal/public/lang/en-US.json

@@ -38,5 +38,7 @@
   "txtAddNew" : "Add New",
   "txtAddress" : "Address",
   "txtProvider": "Provider",
-  "txtAlertProvider" : "Please enter provider"
+  "txtAlertProvider" : "Please enter provider",
+  "txtHelp" : "Need help?",
+  "txtContactUs" : "Contact Us"
 }

frontend/hospital-portal/public/lang/id-ID.json

@@ -30,13 +30,15 @@
   "txtSubmissionDate" : "Tanggal Pengajuan",
   "txtDataNotFound" : "Data Tidak Ditemukan",
   "txtConditionDocument" : "Dokumen Kondisi",
-  "txtDiagnosisDokument" : "Dokumen Diagnosa",
-  "txtSupportingResultDocument" : "Dokumen Hasil Pendukung",
+  "txtDiagnosisDokument" : "Dokumen Diagnosis",
+  "txtSupportingResultDocument" : "Dokumen Pendukung",
   "txtAddResult" : "Tambah Hasil",
   "txtServiceType" : "Tipe Layanan",
   "txtAdditionalDocuments" : "Dokumen Tambahan",
   "txtAddNew" : "Tambah Baru",
   "txtAddress" : "Alamat",
   "txtProvider": "Provider",
-  "txtAlertProvider" : "Mohon masukan provider"
+  "txtAlertProvider" : "Mohon masukan provider",
+  "txtHelp" : "Butuh Bantuan?",
+  "txtContactUs" : "Kontak Kami"
 }

frontend/hospital-portal/src/layouts/dashboard/header/NotificationsPopover.tsx

@@ -167,7 +167,7 @@ function NotificationItem({ notification, getDataNotifications }: { notification
   const {enqueueSnackbar} = useSnackbar();
   const handleClick = () => {
     const data = {
-      'hospital_id' : 1,
+      'user_id' : 1,
       'id' : notification.id,
     };
     if(notification.isUnRead)

frontend/hospital-portal/src/layouts/dashboard/navbar/NavbarDocs.tsx

@@ -1,11 +1,16 @@
 // @mui
-import { Stack, Button, Typography } from '@mui/material';
+import { Stack,Link, Button, Typography } from '@mui/material';
 // assets
 import { DocIllustration } from '@/assets';
+import { Link as RouterLink } from "react-router-dom";
+
+import { LanguageContext } from '@/contexts/LanguageContext';
+import { useContext, useEffect, useState } from 'react';
 
 // ----------------------------------------------------------------------
 
 export default function NavbarDocs() {
+  const { localeData }: any =  useContext(LanguageContext);
   const handleClick = () => {
     window.location.href = 'https://wa.me/6285890008500';
   };
@@ -15,7 +20,7 @@ export default function NavbarDocs() {
         spacing={3}
         sx={{ px: 5, pb: 5, mt: 10, width: 1, textAlign: 'center', display: 'block' }}
       >
-        <DocIllustration sx={{ width: 1 }} />
+        {/* <DocIllustration sx={{ width: 1 }} />
 
         <div>
           <Typography gutterBottom variant="subtitle1">
@@ -28,7 +33,18 @@ export default function NavbarDocs() {
         </div>
 
         <Button variant="contained" onClick={handleClick}>WhatsApp</Button>
-        <Typography variant='body2'>Hak Cipta © 2023 - 2024 LinkSehat</Typography>
+        <Typography variant='body2'>Hak Cipta © 2023 - 2024 LinkSehat</Typography> */}
+        <Typography variant="body2" >
+            {localeData.txtHelp} {""}
+            <Link
+                variant="subtitle2"
+                component={RouterLink}
+                to="#"
+                onClick={handleClick}
+            >
+                {localeData.txtContactUs}
+            </Link>
+        </Typography>
       </Stack>
     </>
   );

frontend/hospital-portal/src/pages/auth/Login.tsx

@@ -116,14 +116,16 @@ export default function Login() {
             />
           </SectionStyle>
         )} */}
-
+                
                 <Container maxWidth="sm">
                     <ContentStyle>
+                    <Card sx={{padding:2}}>
                         <Stack
                             direction="row"
                             alignItems="center"
                             sx={{ mb: 5 }}
                         >
+                            
                             <Logo sx={{ width: 90, height: 90 }} />
                             <Box sx={{ flexGrow: 1 }}>
                                 <Typography variant="h4" gutterBottom>
@@ -149,6 +151,7 @@ export default function Login() {
                         </Stack>
 
                         <LoginForm />
+                        </Card>
 
                         {/*{false && !smUp && (
                             <Typography