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

Modules/Internal/Http/Controllers/Api/CorporateMemberController.php

@@ -16,6 +16,7 @@ use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Console\Command;
 use Modules\Internal\Services\MemberEnrollmentService;
 use PDF;
 use Illuminate\Support\Facades\DB;
@@ -158,6 +159,9 @@ class CorporateMemberController extends Controller
 
     public function import(Request $request, $corporate_id)
     {
+        // setting tambahan php
+        ini_set('max_execution_time', 300);
+
         $request->validate([
             'file' => 'required|file|mimes:xls,xlsx,csv,txt',
         ]);
@@ -166,7 +170,7 @@ class CorporateMemberController extends Controller
         $file_name = now()->getPreciseTimestamp(3) . '-' . $request->file('file')->getClientOriginalName();
         $file = $request->file('file')->storeAs('temp', $file_name);
 
-        $reader = ReaderEntityFactory::createReaderFromFile(Storage::path('temp/' . $file_name));
+        $reader = ReaderEntityFactory::createXLSXReader(Storage::path('temp/' . $file_name));
         $reader->open(Storage::path('temp/' . $file_name));
 
         $writer = WriterEntityFactory::createXLSXWriter();
@@ -236,6 +240,7 @@ class CorporateMemberController extends Controller
 
             break; //only read first sheet
         }
+
         $reader->close();
         $writer->close();
         Storage::delete('temp/' . $file_name);

frontend/hospital-portal/index.html

@@ -30,7 +30,7 @@
   <noscript>You need to enable JavaScript to run this app.</noscript>
   <div id="root"></div>
   
-  <script type="module" src="/src/index.tsx"></script>
+  <script type="module" src="/src/index.tsx?v=<?php echo time(); ?>"></script>
 </body>
 
 </html>

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

@@ -40,5 +40,10 @@
   "txtProvider": "Provider",
   "txtAlertProvider" : "Please enter provider",
   "txtHelp" : "Need help?",
-  "txtContactUs" : "Contact Us"
+  "txtContactUs" : "Contact Us",
+  "txtNotifications" : "Notifications",
+  "txtYouHave" : "You have",
+  "txtUnm" : "unread messages",
+  "txtNew" : "New",
+  "txtBeforeThat" : "Before that"
 }

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

@@ -40,5 +40,10 @@
   "txtProvider": "Provider",
   "txtAlertProvider" : "Mohon masukan provider",
   "txtHelp" : "Butuh Bantuan?",
-  "txtContactUs" : "Kontak Kami"
+  "txtContactUs" : "Kontak Kami",
+  "txtNotifications" : "Notifikasi",
+  "txtYouHave" : "Anda memiliki",
+  "txtUnm" : "pesan yang belum dibaca",
+  "txtNew" : "Baru",
+  "txtBeforeThat" : "Sebelum"
 }

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

@@ -1,5 +1,5 @@
 import { noCase } from 'change-case';
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useContext } from 'react';
 // @mui
 import {
   Box,
@@ -27,10 +27,12 @@ import MenuPopover from '@/components/MenuPopover';
 import { IconButtonAnimate } from '@/components/animate';
 import axios from '@/utils/axios';
 import { useSnackbar } from 'notistack';
+import { LanguageContext } from '@/contexts/LanguageContext';
 
 // ----------------------------------------------------------------------
 
 export default function NotificationsPopover() {
+  const { localeData }: any =  useContext(LanguageContext);
   const [notifications, setNotifications] = useState([]);
   const {enqueueSnackbar} = useSnackbar();
   const getDataNotifications = async () => {
@@ -88,9 +90,9 @@ export default function NotificationsPopover() {
       >
         <Box sx={{ display: 'flex', alignItems: 'center', py: 2, px: 2.5 }}>
           <Box sx={{ flexGrow: 1 }}>
-            <Typography variant="subtitle1">Notifications</Typography>
+            <Typography variant="subtitle1">{localeData.txtNotifications}</Typography>
             <Typography variant="body2" sx={{ color: 'text.secondary' }}>
-              You have {totalUnRead} unread messages
+              {localeData.txtYouHave} {totalUnRead} {localeData.txtUnm}
             </Typography>
           </Box>
 
@@ -112,7 +114,7 @@ export default function NotificationsPopover() {
                 disablePadding
                 subheader={
                   <ListSubheader disableSticky sx={{ py: 1, px: 2.5, typography: 'overline' }}>
-                    New
+                    {localeData.txtNew}
                   </ListSubheader>
                 }
               >
@@ -125,7 +127,7 @@ export default function NotificationsPopover() {
                 disablePadding
                 subheader={
                   <ListSubheader disableSticky sx={{ py: 1, px: 2.5, typography: 'overline' }}>
-                    Before that
+                    {localeData.txtBeforeThat}
                   </ListSubheader>
                 }
               >