Index: frontend/src/App.js =================================================================== --- frontend/src/App.js (revision e1f74f6c04f9d460135de378f659fedfd9c74b44) +++ frontend/src/App.js (revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500) @@ -65,63 +65,63 @@ return ( - -
- {user && } -
- - } /> + +
+ {user && } +
+ + } /> - - - - } /> + + + + } /> - {/* Patient Routes */} - } /> - } /> - } /> - } /> + {/* Patient Routes */} + } /> + } /> + } /> + } /> - {/* Doctor Routes */} - } /> - } /> - } /> - } /> + {/* Doctor Routes */} + } /> + } /> + } /> + } /> - {/* Department Routes */} - } /> - } /> - } /> + {/* Department Routes */} + } /> + } /> + } /> - {/* Appointment Routes */} - } /> - } /> + {/* Appointment Routes */} + } /> + } /> - {/* Medical Record Routes */} - } /> - } /> + {/* Medical Record Routes */} + } /> + } /> - {/* Medical Report Routes */} - } /> + {/* Medical Report Routes */} + } /> - {/* Lab Test Routes */} - } /> - } /> + {/* Lab Test Routes */} + } /> + } /> - {/* Procedure Routes */} - } /> - } /> + {/* Procedure Routes */} + } /> + } /> - {/* Billing Routes */} - } /> - } /> + {/* Billing Routes */} + } /> + } /> - {/* Referral Routes */} - } /> - -
-
- + {/* Referral Routes */} + } /> + +
+
+ ); } Index: frontend/src/components/Navbar.js =================================================================== --- frontend/src/components/Navbar.js (revision e1f74f6c04f9d460135de378f659fedfd9c74b44) +++ frontend/src/components/Navbar.js (revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500) @@ -18,6 +18,8 @@ }; + // Load user on mount loadUser(); + // Listen for storage changes (when user logs in/out) window.addEventListener('storage', loadUser); return () => window.removeEventListener('storage', loadUser); @@ -29,5 +31,5 @@ setUser(null); - + // Dispatch custom event to notify components on the same tab window.dispatchEvent(new CustomEvent('userStorageChange', { detail: { userData: null } @@ -45,142 +47,142 @@ return ( - ); } Index: frontend/src/components/ProtectedRoute.js =================================================================== --- frontend/src/components/ProtectedRoute.js (revision e1f74f6c04f9d460135de378f659fedfd9c74b44) +++ frontend/src/components/ProtectedRoute.js (revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500) @@ -1,2 +1,3 @@ + import React from 'react'; import { Navigate } from 'react-router-dom'; Index: frontend/src/index.css =================================================================== --- frontend/src/index.css (revision e1f74f6c04f9d460135de378f659fedfd9c74b44) +++ frontend/src/index.css (revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500) @@ -0,0 +1,22 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; + +* { + margin: 0; + padding: 0; + box-sizing: border-box; +} + +body { + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', + 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', + sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +code { + font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', + monospace; +} Index: frontend/src/index.js =================================================================== --- frontend/src/index.js (revision e1f74f6c04f9d460135de378f659fedfd9c74b44) +++ frontend/src/index.js (revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500) @@ -7,6 +7,6 @@ const root = ReactDOM.createRoot(document.getElementById('root')); root.render( - - - + + + ); Index: frontend/src/pages/Dashboard.js =================================================================== --- frontend/src/pages/Dashboard.js (revision e1f74f6c04f9d460135de378f659fedfd9c74b44) +++ frontend/src/pages/Dashboard.js (revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500) @@ -6,5 +6,4 @@ import { labService } from '../services/labService'; import { billingService } from '../services/billingService'; -import { medicalRecordService } from '../services/medicalRecordService'; import Loading from '../components/Loading'; @@ -19,5 +18,4 @@ const [pendingLabTests, setPendingLabTests] = useState([]); const [billings, setBillings] = useState([]); - const [medicalRecords, setMedicalRecords] = useState([]); const [patientBillings, setPatientBillings] = useState([]); const [loading, setLoading] = useState(true); @@ -33,14 +31,9 @@ if (isPatient) { // For patients, fetch their own appointments, medical records, and billing - const [appointmentsRes, medicalRes, billingRes] = await Promise.all([ + const [appointmentsRes, billingRes] = await Promise.all([ appointmentService.getAppointmentsForPatient(user.patientId), - medicalRecordService.getMedicalRecordByPatientId(user.patientId), billingService.getBillingHistoryForPatient(user.patientId) ]); setUserAppointments(appointmentsRes.data || []); - // Handle medical records - could be single object or array - const medicalData = medicalRes.data; - const medicalArray = Array.isArray(medicalData) ? medicalData : (medicalData ? [medicalData] : []); - setMedicalRecords(medicalArray); setPatientBillings(billingRes.data || []); } else if (isDoctor) { @@ -82,5 +75,5 @@ fetchStats(); - }, [user.userId, isPatient, isDoctor, isLabTechnician]); + }, []); if (loading) return ; Index: frontend/src/pages/Login.js =================================================================== --- frontend/src/pages/Login.js (revision e1f74f6c04f9d460135de378f659fedfd9c74b44) +++ frontend/src/pages/Login.js (revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500) @@ -75,66 +75,66 @@ return ( -
-
-
-

Medora

-

Hospital Management System

+
+
+
+

Medora

+

Hospital Management System

+
+ + {error && setError(null)} />} + {success && setSuccess(null)} />} + +
+
+ + setUsername(e.target.value)} + placeholder="Enter your username or EMBG" + className="w-full px-4 py-3 border-2 border-gray-300 rounded-lg focus:outline-none focus:border-purple-500 transition" + disabled={loading} + />
- {error && setError(null)} />} - {success && setSuccess(null)} />} +
+ + setPassword(e.target.value)} + placeholder="Enter your password" + className="w-full px-4 py-3 border-2 border-gray-300 rounded-lg focus:outline-none focus:border-purple-500 transition" + disabled={loading} + /> +
- -
- - setUsername(e.target.value)} - placeholder="Enter your username or EMBG" - className="w-full px-4 py-3 border-2 border-gray-300 rounded-lg focus:outline-none focus:border-purple-500 transition" - disabled={loading} - /> -
+ + -
- - setPassword(e.target.value)} - placeholder="Enter your password" - className="w-full px-4 py-3 border-2 border-gray-300 rounded-lg focus:outline-none focus:border-purple-500 transition" - disabled={loading} - /> -
- - - - -
-

Demo Credentials:

-

- Admin: username: admin | password: admin123 -

-

- Doctor: username: ivan.stojanov@medora.com | password: doctor123 -

-

- Patient: username: [EMBG] | password: password123 -

-
+
+

Demo Credentials:

+

+ Admin: username: admin | password: admin123 +

+

+ Doctor: username: ivan.stojanov@medora.com | password: doctor123 +

+

+ Patient: username: [EMBG] | password: password123 +

+
); } Index: frontend/src/pages/ProtectedRoute.js =================================================================== --- frontend/src/pages/ProtectedRoute.js (revision e1f74f6c04f9d460135de378f659fedfd9c74b44) +++ (revision ) @@ -1,24 +1,0 @@ -import React from 'react'; -import { Navigate } from 'react-router-dom'; - -function ProtectedRoute({ children, requiredRoles = [] }) { - const token = localStorage.getItem('token'); - const userStr = localStorage.getItem('user'); - - // If no token, redirect to login - if (!token) { - return ; - } - - // If roles are specified and user's role is not in the list, redirect to dashboard - if (requiredRoles.length > 0 && userStr) { - const user = JSON.parse(userStr); - if (!requiredRoles.includes(user.role)) { - return ; - } - } - - return children; -} - -export default ProtectedRoute; Index: frontend/src/pages/appointments/AppointmentForm.js =================================================================== --- frontend/src/pages/appointments/AppointmentForm.js (revision e1f74f6c04f9d460135de378f659fedfd9c74b44) +++ frontend/src/pages/appointments/AppointmentForm.js (revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500) @@ -26,21 +26,20 @@ useEffect(() => { + const fetchData = async () => { + try { + if (!isPatient) { + const patientsRes = await patientService.getAllPatients(); + setPatients(patientsRes.data); + } + + const doctorsRes = await doctorService.getAllDoctors(); + setDoctors(doctorsRes.data); + } catch (err) { + setError('Failed to fetch doctors'); + } + }; + fetchData(); - }, []); - - const fetchData = async () => { - try { - // For patients, we don't need to fetch all patients - if (!isPatient) { - const patientsRes = await patientService.getAllPatients(); - setPatients(patientsRes.data); - } - - const doctorsRes = await doctorService.getAllDoctors(); - setDoctors(doctorsRes.data); - } catch (err) { - setError('Failed to fetch doctors'); - } - }; + }, [isPatient]); const handleChange = (e) => { Index: frontend/src/pages/appointments/AppointmentList.js =================================================================== --- frontend/src/pages/appointments/AppointmentList.js (revision e1f74f6c04f9d460135de378f659fedfd9c74b44) +++ frontend/src/pages/appointments/AppointmentList.js (revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500) @@ -15,30 +15,26 @@ useEffect(() => { - fetchAppointments(); + const fetchAppointmentsData = async () => { + try { + setLoading(true); + let response; + if (patientId) { + response = await appointmentService.getAppointmentsForPatient(patientId); + } else if (doctorId) { + response = await appointmentService.getAppointmentsForDoctor(doctorId); + } else { + response = await appointmentService.getAllAppointments(); + } + setAppointments(response.data || []); + } catch (err) { + setError('Failed to fetch appointments'); + console.error(err); + } finally { + setLoading(false); + } + }; + + fetchAppointmentsData(); }, [doctorId, patientId]); - - const fetchAppointments = async () => { - try { - setLoading(true); - let response; - if (patientId) { - response = await appointmentService.getAppointmentsForPatient(patientId); - } else if (doctorId) { - response = await appointmentService.getAppointmentsForDoctor(doctorId); - } else if (user.role === 'PATIENT') { - response = await appointmentService.getAppointmentsForPatient(user.patientId); - } else if (user.role === 'DOCTOR') { - response = await appointmentService.getAppointmentsForDoctor(user.doctorId); - } else { - response = await appointmentService.getAllAppointments(); - } - setAppointments(response.data); - } catch (err) { - setError('Failed to fetch appointments'); - console.error(err); - } finally { - setLoading(false); - } - }; const handleCancelAppointment = async (id) => { @@ -47,5 +43,5 @@ await appointmentService.cancelAppointment(id); setAppointments(appointments.map(apt => - apt.appointmentId === id ? { ...apt, status: 'CANCELLED' } : apt + apt.appointmentId === id ? { ...apt, status: 'CANCELLED' } : apt )); } catch (err) { @@ -58,28 +54,28 @@ return ( -
-
-

- {patientId ? 'Patient Appointments' : doctorId ? 'My Appointments' : 'All Appointments'} -

- e.currentTarget.style.background = '#93c5fd'} onMouseLeave={(e) => e.currentTarget.style.background = '#bfdbfe'}> - New Appointment - -
+
+
+

+ {patientId ? 'Patient Appointments' : doctorId ? 'My Appointments' : 'All Appointments'} +

+ e.currentTarget.style.background = '#93c5fd'} onMouseLeave={(e) => e.currentTarget.style.background = '#bfdbfe'}> + New Appointment + +
- {error && setError(null)} />} + {error && setError(null)} />} -
- - +
+
+ @@ -90,39 +86,39 @@ - - + + {appointments.map(appointment => ( - - - - - - + + + + + - - + + + ))} - -
PatientActions
{appointment.patient?.firstName} {appointment.patient?.lastName}Dr. {appointment.doctor?.firstName} {appointment.doctor?.lastName}{appointment.appointmentDate}{appointment.appointmentTime} +
{appointment.patient?.firstName} {appointment.patient?.lastName}Dr. {appointment.doctor?.firstName} {appointment.doctor?.lastName}{appointment.appointmentDate}{appointment.appointmentTime} {appointment.status} - - {appointment.status === 'SCHEDULED' && ( - (user.role === 'DOCTOR' && appointment.doctor?.doctorId !== user.doctorId) ? null : ( - - ) - )} -
+ {appointment.status === 'SCHEDULED' && ( + (user.role === 'DOCTOR' && appointment.doctor?.doctorId !== user.doctorId) ? null : ( + + ) + )} +
-
+ +
+
); } Index: frontend/src/pages/billing/BillingDetail.js =================================================================== --- frontend/src/pages/billing/BillingDetail.js (revision e1f74f6c04f9d460135de378f659fedfd9c74b44) +++ frontend/src/pages/billing/BillingDetail.js (revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500) @@ -22,11 +22,8 @@ useEffect(() => { - fetchBilling(); - }, [id]); - - const fetchBilling = async () => { - try { - setLoading(true); - const response = await billingService.getBillingById(id); + const fetchBilling = async () => { + try { + setLoading(true); + const response = await billingService.getBillingById(id); setBilling(response.data); setPaymentStatus(response.data.paymentStatus); @@ -39,11 +36,14 @@ console.error('Could not fetch billing details:', err); } - } catch (err) { - setError('Failed to fetch billing record'); - console.error(err); - } finally { - setLoading(false); - } - }; + } catch (err) { + setError('Failed to fetch billing record'); + console.error(err); + } finally { + setLoading(false); + } + }; + + fetchBilling(); + }, [id]); const handleUpdatePaymentStatus = async () => { @@ -81,8 +81,8 @@ if (user.role === 'DOCTOR' || user.role === 'LAB_TECHNICIAN') { return ( -
-

Access Denied

-

You do not have permission to access billing records.

-
+
+

Access Denied

+

You do not have permission to access billing records.

+
); } @@ -90,144 +90,144 @@ if (!billing) { return ( -
- navigate('/billing')} /> -
+
+ navigate('/billing')} /> +
); } return ( -
-
-

Billing Record #{billing.billId}

-
- - -
+
+
+

Billing Record #{billing.billId}

+
+ +
- - {error && setError(null)} />} - {success && setSuccess(null)} />} - -
+
+ + {error && setError(null)} />} + {success && setSuccess(null)} />} + +
+
+

Billing Information

+
+ + + + +
+
+ + {!isPatient && (
-

Billing Information

-
- - - - +

Update Payment Status

+
+
+ + +
+
- - {!isPatient && ( -
-

Update Payment Status

-
-
- - -
- -
-
- )} - -
-

Patient Details

-
- {billingDetail && ( - <> - - - - - )} + )} + +
+

Patient Details

+
+ {billingDetail && ( + <> + + + + + )} +
+
+
+ +
+

Itemized Services

+ + {billingDetail && (billingDetail.procedures.length > 0 || billingDetail.labTests.length > 0) ? ( +
+ {billingDetail.procedures.length > 0 && ( +
+

Procedures

+ + + + + + + + + {billingDetail.procedures.map((proc, idx) => ( + + + + + ))} + +
DescriptionCost
{proc.description}${proc.cost}
+
+ )} + + {billingDetail.labTests.length > 0 && ( +
+

Lab Tests

+ + + + + + + + + {billingDetail.labTests.map((test, idx) => ( + + + + + ))} + +
DescriptionCost
{test.description}${test.cost}
+
+ )} + +
+
+

Total Amount:

+

${billing.totalCost}

+
-
- -
-

Itemized Services

- - {billingDetail && (billingDetail.procedures.length > 0 || billingDetail.labTests.length > 0) ? ( -
- {billingDetail.procedures.length > 0 && ( -
-

Procedures

- - - - - - - - - {billingDetail.procedures.map((proc, idx) => ( - - - - - ))} - -
DescriptionCost
{proc.description}${proc.cost}
-
- )} - - {billingDetail.labTests.length > 0 && ( -
-

Lab Tests

- - - - - - - - - {billingDetail.labTests.map((test, idx) => ( - - - - - ))} - -
DescriptionCost
{test.description}${test.cost}
-
- )} - -
-
-

Total Amount:

-

${billing.totalCost}

-
-
-
- ) : ( -

No services itemized for this billing record.

- )} -
-
+ ) : ( +

No services itemized for this billing record.

+ )} +
+
); } @@ -235,8 +235,8 @@ function InfoRow({ label, value }) { return ( -
- {label}: - {value || 'N/A'} -
+
+ {label}: + {value || 'N/A'} +
); } Index: frontend/src/pages/billing/BillingList.js =================================================================== --- frontend/src/pages/billing/BillingList.js (revision e1f74f6c04f9d460135de378f659fedfd9c74b44) +++ frontend/src/pages/billing/BillingList.js (revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500) @@ -89,6 +89,6 @@ // Refresh the list const response = user.role === 'BILLING_ADMIN' - ? await billingService.getAllBillings() - : await billingService.getBillingHistoryForPatient(patientId || user.patientId); + ? await billingService.getAllBillings() + : await billingService.getBillingHistoryForPatient(patientId || user.patientId); setBillings(response.data || []); } catch (err) { @@ -101,8 +101,8 @@ if (user.role === 'DOCTOR' || user.role === 'LAB_TECHNICIAN') { return ( -
-

Access Denied

-

You do not have permission to access billing records.

-
+
+

Access Denied

+

You do not have permission to access billing records.

+
); } @@ -111,73 +111,73 @@ return ( -
-

{patientId ? 'Patient Billing History' : 'Billing Records'}

- - {error && setError(null)} />} - {success && setSuccess(null)} />} - - {/* Filters for Billing Admin */} - {user.role === 'BILLING_ADMIN' && ( -
-

Filters

-
+
+

{patientId ? 'Patient Billing History' : 'Billing Records'}

+ + {error && setError(null)} />} + {success && setSuccess(null)} />} + + {/* Filters for Billing Admin */} + {user.role === 'BILLING_ADMIN' && ( +
+

Filters

+
+
+ + +
+
+ + +
+
+
+ )} + + {/* Pending Billing Records Section (for Billing Admin) */} + {user.role === 'BILLING_ADMIN' && pendingBillings.length > 0 && ( +
+

Pending Billing Records ({pendingBillings.length})

+
+ {pendingBillings.map(billing => ( +
- - +

{billing.patientName}

+

${billing.totalCost}

-
- - -
+
-
- )} - - {/* Pending Billing Records Section (for Billing Admin) */} - {user.role === 'BILLING_ADMIN' && pendingBillings.length > 0 && ( -
-

Pending Billing Records ({pendingBillings.length})

-
- {pendingBillings.map(billing => ( -
-
-

{billing.patientName}

-

${billing.totalCost}

-
- -
- ))} -
-
- )} - -
- - + ))} + + + )} + +
+
+ @@ -187,37 +187,37 @@ - - + + {filteredBillings.map(billing => ( - - - - + + + - - - + + + + ))} - -
PatientActions
{billing.patientName}${billing.totalCost} +
{billing.patientName}${billing.totalCost} {billing.paymentStatus} - {billing.paymentDate || 'Not paid'} - e.currentTarget.style.textDecoration = 'underline'} onMouseLeave={(e) => e.currentTarget.style.textDecoration = 'none'}> - View - -
{billing.paymentDate || 'Not paid'} + e.currentTarget.style.textDecoration = 'underline'} onMouseLeave={(e) => e.currentTarget.style.textDecoration = 'none'}> + View + +
- - {filteredBillings.length === 0 && ( -
- {billings.length === 0 ? 'No billing records found' : 'No records match the selected filters'} -
- )} -
+ + + + {filteredBillings.length === 0 && ( +
+ {billings.length === 0 ? 'No billing records found' : 'No records match the selected filters'} +
+ )}
+
); } Index: frontend/src/pages/departments/DepartmentDetail.js =================================================================== --- frontend/src/pages/departments/DepartmentDetail.js (revision e1f74f6c04f9d460135de378f659fedfd9c74b44) +++ frontend/src/pages/departments/DepartmentDetail.js (revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500) @@ -19,8 +19,5 @@ useEffect(() => { - fetchDepartmentAndDoctors(); - }, [departmentId]); - - const fetchDepartmentAndDoctors = async () => { + const fetchDepartmentAndDoctors = async () => { try { setLoading(true); @@ -39,5 +36,8 @@ setLoading(false); } - }; + }; + + fetchDepartmentAndDoctors(); + }, [departmentId]); if (loading) return ; Index: frontend/src/pages/departments/DoctorsByDepartment.js =================================================================== --- frontend/src/pages/departments/DoctorsByDepartment.js (revision e1f74f6c04f9d460135de378f659fedfd9c74b44) +++ frontend/src/pages/departments/DoctorsByDepartment.js (revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500) @@ -19,8 +19,5 @@ useEffect(() => { - fetchDepartmentAndDoctors(); - }, [departmentId]); - - const fetchDepartmentAndDoctors = async () => { + const fetchDepartmentAndDoctors = async () => { try { setLoading(true); @@ -39,5 +36,8 @@ setLoading(false); } - }; + }; + + fetchDepartmentAndDoctors(); + }, [departmentId]); if (loading) return ; Index: frontend/src/pages/doctors/DoctorDetail.js =================================================================== --- frontend/src/pages/doctors/DoctorDetail.js (revision e1f74f6c04f9d460135de378f659fedfd9c74b44) +++ frontend/src/pages/doctors/DoctorDetail.js (revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500) @@ -24,19 +24,19 @@ useEffect(() => { + const fetchDoctor = async () => { + try { + setLoading(true); + const response = await doctorService.getDoctorById(id); + setDoctor(response.data); + } catch (err) { + setError('Failed to fetch doctor details'); + console.error(err); + } finally { + setLoading(false); + } + }; + fetchDoctor(); }, [id]); - - const fetchDoctor = async () => { - try { - setLoading(true); - const response = await doctorService.getDoctorById(id); - setDoctor(response.data); - } catch (err) { - setError('Failed to fetch doctor details'); - console.error(err); - } finally { - setLoading(false); - } - }; if (loading) return ; Index: frontend/src/pages/doctors/DoctorForm.js =================================================================== --- frontend/src/pages/doctors/DoctorForm.js (revision e1f74f6c04f9d460135de378f659fedfd9c74b44) +++ frontend/src/pages/doctors/DoctorForm.js (revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500) @@ -22,26 +22,26 @@ useEffect(() => { if (id) { + const fetchDoctor = async () => { + try { + setLoading(true); + const response = await doctorService.getDoctorById(id); + setFormData({ + firstName: response.data.firstName, + lastName: response.data.lastName, + emailAddress: response.data.emailAddress, + levelId: response.data.level?.levelId || '', + specializationId: response.data.specialization?.specializationId || '', + departmentId: response.data.department?.departmentId || '', + }); + } catch (err) { + setError('Failed to fetch doctor'); + } finally { + setLoading(false); + } + }; + fetchDoctor(); } }, [id]); - - const fetchDoctor = async () => { - try { - setLoading(true); - const response = await doctorService.getDoctorById(id); - setFormData({ - firstName: response.data.firstName, - lastName: response.data.lastName, - emailAddress: response.data.emailAddress, - levelId: response.data.level?.levelId || '', - specializationId: response.data.specialization?.specializationId || '', - departmentId: response.data.department?.departmentId || '', - }); - } catch (err) { - setError('Failed to fetch doctor'); - } finally { - setLoading(false); - } - }; const handleChange = (e) => { Index: frontend/src/pages/lab-tests/LabResultForm.js =================================================================== --- frontend/src/pages/lab-tests/LabResultForm.js (revision e1f74f6c04f9d460135de378f659fedfd9c74b44) +++ frontend/src/pages/lab-tests/LabResultForm.js (revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500) @@ -1,3 +1,3 @@ -import React, { useState, useEffect } from 'react'; +import React, { useState } from 'react'; import { useNavigate } from 'react-router-dom'; import { labService } from '../../services/labService'; Index: frontend/src/pages/lab-tests/LabTestList.js =================================================================== --- frontend/src/pages/lab-tests/LabTestList.js (revision e1f74f6c04f9d460135de378f659fedfd9c74b44) +++ frontend/src/pages/lab-tests/LabTestList.js (revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500) @@ -5,5 +5,5 @@ function LabTestList() { - const user = JSON.parse(localStorage.getItem('user') || '{}'); + const [user, setUser] = useState({}); const isLabTechnician = user.role === 'LAB_TECHNICIAN'; @@ -46,4 +46,39 @@ testDate: '', }); + + // Load user from localStorage and listen for changes + useEffect(() => { + const loadUser = () => { + const userStr = localStorage.getItem('user'); + console.log('[LabTestList] Loading user from localStorage:', userStr); + if (userStr) { + try { + const parsedUser = JSON.parse(userStr); + console.log('[LabTestList] Parsed user:', parsedUser); + setUser(parsedUser); + } catch (err) { + console.error('Failed to parse user:', err); + setUser({}); + } + } else { + console.log('[LabTestList] No user in localStorage'); + setUser({}); + } + }; + + console.log('[LabTestList] useEffect running - loading user'); + loadUser(); + + // Listen for storage changes (other tabs/windows) + window.addEventListener('storage', loadUser); + + // Listen for custom event (same tab changes) + window.addEventListener('userStorageChange', loadUser); + + return () => { + window.removeEventListener('storage', loadUser); + window.removeEventListener('userStorageChange', loadUser); + }; + }, []); useEffect(() => { @@ -134,6 +169,6 @@ setLoading(true); - // Get doctor ID from localStorage (set during login) - const doctorId = localStorage.getItem('doctorId') || 1; + // Get doctor ID from logged-in user + const doctorId = user.doctorId; const request = { @@ -145,4 +180,7 @@ notes: requestData.notes, }; + + console.log('User object:', user); + console.log('Sending lab test request with doctorId:', doctorId, 'Full request:', request); await labService.requestLabTest(request); @@ -228,494 +266,494 @@ if (isLabTechnician) { return ( -
-

Lab Tests - Submit Results

- - {error && setError(null)} />} - - {selectedTest ? ( - // Submit Result Form -
-

Submit Lab Result

-
-

Test: {selectedTest.testName}

-

Patient: {selectedTest.patientName}

-

Doctor: {selectedTest.doctorName}

-

Test Date: {selectedTest.testDate}

- {selectedTest.notes &&

Notes: {selectedTest.notes}

} +
+

Lab Tests - Submit Results

+ + {error && setError(null)} />} + + {selectedTest ? ( + // Submit Result Form +
+

Submit Lab Result

+
+

Test: {selectedTest.testName}

+

Patient: {selectedTest.patientName}

+

Doctor: {selectedTest.doctorName}

+

Test Date: {selectedTest.testDate}

+ {selectedTest.notes &&

Notes: {selectedTest.notes}

} +
+ +
+
+ +