tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
ivan-sim
2024-10-07 15:04:50 +07:00
parent f676f4a244
commit 82eca4b58a
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Modules/HospitalPortal/Http/Controllers/ApotekController.php
View File

@@ -26,6 +26,7 @@ class ApotekController extends Controller
$results = DB::connection('oldlms')->table('tx_prescriptions') $results = DB::connection('oldlms')->table('tx_prescriptions')
->join('tx_prescription_orders', 'tx_prescription_orders.nIDPrescription', '=', 'tx_prescriptions.nID') ->join('tx_prescription_orders', 'tx_prescription_orders.nIDPrescription', '=', 'tx_prescriptions.nID')
->join('tm_users', 'tm_users.nID', '=', 'tx_prescriptions.nIDUser') ->join('tm_users', 'tm_users.nID', '=', 'tx_prescriptions.nIDUser')
->where('tx_prescription_orders.nIDApotek', '=', auth()->user()->organization_id)
->when($request->input('search'), function ($query, $search) { ->when($request->input('search'), function ($query, $search) {
$query->where(function ($query) use ($search) { $query->where(function ($query) use ($search) {
$query->orWhere('tx_prescriptions.sKodeResep', 'like', "%" . $search . "%") $query->orWhere('tx_prescriptions.sKodeResep', 'like', "%" . $search . "%")

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

@@ -47,7 +47,7 @@ export default function NotificationsPopover() {
}; };
useEffect(() => { useEffect(() => {
getDataNotifications(); getDataNotifications();
}, []); }, []);
const totalUnRead = notifications.filter((item) => item.isUnRead === 1).length; const totalUnRead = notifications.filter((item) => item.isUnRead === 1).length;
@@ -137,7 +137,7 @@ export default function NotificationsPopover() {
</List> </List>
</> </>
): ''} ): ''}
</Scrollbar> </Scrollbar>
<Divider sx={{ borderStyle: 'dashed' }} /> <Divider sx={{ borderStyle: 'dashed' }} />
@@ -256,12 +256,12 @@ function renderContent(notification: NotificationItemProps) {
title, title,
}; };
} }
if (notification.type === 'mail' || notification.type === 'request_document') { if (notification.type === 'mail' || notification.type === 'request_document' || notification.type === 'grab_status') {
return { return {
avatar: ( avatar: (
<img <img
alt={notification.title} alt={notification.title}
src="https://minimal-assets-api.vercel.app/assets/icons/ic_notification_mail.svg" src="/icons/ic_mail.svg"
/> />
), ),
title, title,