diff --git a/src/pages/notification/component/DetailNotification.jsx b/src/pages/notification/component/DetailNotification.jsx index 3ec4c77..54bad25 100644 --- a/src/pages/notification/component/DetailNotification.jsx +++ b/src/pages/notification/component/DetailNotification.jsx @@ -1,5 +1,5 @@ import React, { memo } from 'react'; -import { Row, Col, Tag, Divider, Card, Button } from 'antd'; +import { Row, Col, Tag, Card, Button } from 'antd'; import { CloseCircleFilled, WarningFilled, CheckCircleFilled, InfoCircleFilled } from '@ant-design/icons'; const DetailNotification = memo(function DetailNotification({ selectedData, onClose }) { @@ -47,6 +47,7 @@ const DetailNotification = memo(function DetailNotification({ selectedData, onCl title="Detail Notifikasi" extra={} style={{ height: '100%' }} + bodyStyle={{ padding: '0 24px' }} >
{/* Header with Icon and Status */} @@ -54,91 +55,87 @@ const DetailNotification = memo(function DetailNotification({ selectedData, onCl style={{ display: 'flex', alignItems: 'center', - gap: '16px', - marginBottom: '24px', - padding: '16px', + gap: '8px', + marginBottom: '0', + padding: '2px 0', backgroundColor: '#fafafa', borderRadius: '8px', }} >
- {IconComponent && } + {IconComponent && }
- + {selectedData.type.toUpperCase()} -
+
{selectedData.title}
- - {/* Information Grid */} - + -
-
+
+
PLC
-
+
{selectedData.plc}
-
-
Tag
-
+
+
Tag
+
{selectedData.tag}
- + -
-
+
+
Engineer
-
+
{selectedData.engineer}
-
-
+
+
Waktu
-
+
{selectedData.time}
- - {/* Status */} -
-
Status
+
+
Status
{selectedData.isRead ? 'Sudah Dibaca' : 'Belum Dibaca'} @@ -147,14 +144,14 @@ const DetailNotification = memo(function DetailNotification({ selectedData, onCl {/* Additional Info */}
-
+
Catatan: Notifikasi ini telah dikirim ke engineer yang bersangkutan untuk ditindaklanjuti sesuai dengan prosedur yang berlaku.
diff --git a/src/pages/notification/component/ListNotification.jsx b/src/pages/notification/component/ListNotification.jsx index 2e5ef42..a859add 100644 --- a/src/pages/notification/component/ListNotification.jsx +++ b/src/pages/notification/component/ListNotification.jsx @@ -645,200 +645,199 @@ const ListNotification = memo(function ListNotification(props) { ); - const renderDetailsNotification = () => { - if (!selectedNotification) return null; - - const { IconComponent, color } = getIconAndColor(selectedNotification.type); - - return ( - - - {/* Kolom Kiri: Data Kompresor */} - - - - - -
- -
- - - {selectedNotification.title} -
- - {selectedNotification.issue} - -
- -
-
- Plant Subsection -
{selectedNotification.subsection}
- - Time - -
{selectedNotification.timestamp.split(' ')[1]} WIB
-
- -
- + const renderDetailsNotification = () => { + if (!selectedNotification) return null; + + const { IconComponent, color } = getIconAndColor(selectedNotification.type); + + return ( + + + {/* Kolom Kiri: Data Kompresor */} + + + + - - Value -
- N/A +
- - Treshold - -
N/A
+ {selectedNotification.title} +
+ + {selectedNotification.issue} + +
-
-
-
- - - {/* Kolom Kanan: Informasi Teknis */} - - - -
- PLC -
{selectedNotification.plc}
-
-
- Status -
- {selectedNotification.status} +
+ Plant Subsection +
{selectedNotification.subsection}
+ + Time + +
{selectedNotification.timestamp.split(' ')[1]} WIB
-
-
- Tag +
- {selectedNotification.tag} + + + + Value + +
+ N/A +
+ + + + Treshold + +
N/A
+ +
-
- - - - -
- - - - - - - Handling Guideline - - - - - - - Spare Part - - - - - - setModalContent('log')} - > - - - - Log Activity - + + {/* Kolom Kanan: Informasi Teknis */} + + + +
+ PLC +
{selectedNotification.plc}
+
+
+ Status +
+ {selectedNotification.status} +
+
+
+ Tag +
+ {selectedNotification.tag} +
+
- - - - - - PDF - - } - > +
+ + + + + + + Handling Guideline + + + + + + + + + + Spare Part + + + + + + setModalContent('log')} + > + + + + Log Activity + + + + + + + + + + + PDF + + } >
{ const logHistoryData = getDummyLogHistory(notificationData); return ( - + );