-
-
-
{loading &&
Loading shifts...
}
{error &&
{error}
}
{!loading && !error && shifts.length === 0 &&
No shifts yet. Create your first shift.
}
-
- {shifts.map((s, idx) => {
- const displayLocation =
- typeof s.location === "string"
- ? s.location
- : s.location
- ? [s.location.street, s.location.suburb, s.location.state]
- .filter(Boolean)
- .join(", ")
- : "No location";
-
- const displayDate = s.date
- ? new Date(s.date).toLocaleDateString()
- : "--";
-
- const displayTime =
- s.startTime && s.endTime
- ? `${s.startTime} - ${s.endTime}`
- : s.time || "--";
-
- const displayStatus = s.status || "open";
- const displayRate = s.payRate ?? s.rate ?? 0;
- const displayTitle = s.title || s.role || "Shift";
-
- return view === "grid" ? (
-
+
+ {shifts.map((s, idx) =>
+ view === "grid" ? (
+
-
{displayTitle}
-
${displayRate} p/h
+
{s.title}
+
${s.payRate} p/h
-
-
{displayLocation}
-
-
- Status: {displayStatus}
+
+
{s.location}
+
+
+ Status: {s.status.text}
-
+
- {displayDate}
+ {s.date}
- {displayTime}
+ {s.time}
) : (
-
-
{displayTitle}
-
{displayLocation}
-
${displayRate} p/h
+
+
{s.title}
+
{s.location}
+
${s.payRate} p/h
- {displayDate}
+ {s.date}
- {displayTime}
+ {s.time}
-
- Status: {displayStatus}
+
+ Status: {s.status.text}
- );
- })}
+ )
+ )}
-
-
- {/* Incident Reports */}
+
Priority Shifts
+
+
+
+
+
{upcomingShiftCount}
+
Upcoming Shifts
+
+
+
{highPriorityCount}
+
High Priority
+
+
+
{totalAssignedGuards}
+
Guards Assigned
+
+
+
+
+ {priorityShifts.map((shift, idx) => (
+
+
+
{shift.title}
+
{shift.location}
+
+
+
+
+
+ {shift.date}
+
+
+
+ {shift.time}
+
+
+
+
+
+ {shift.priority}
+
+
{shift.assignedGuards} guards assigned
+
+
+ ))}
+
+
+
+
+
Shift Swap / Leave Requests
+
+
+
+ {requests.map((req) => (
+
+
+
{req.type}
+
+ {req.employee} — {req.shift}
+
+
{req.reason}
+
+
+
+
+
+ {req.requestDate}
+
+
{req.status}
+
+
+
+
+
+
+
+ ))}
+
+
+
+
Incident Reports
{
Reset
+
{incidentSummary.total} Total
{incidentSummary.pending} Pending
{incidentSummary.resolved} Resolved
{filteredIncidents.length} Showing
+
@@ -425,17 +663,23 @@ useEffect(() => {
)}
{filteredIncidents.map((inc, i) => (
-
{inc.guard}
+
+ {inc.guard}
+
{inc.shift}
{inc.id}
{inc.date}
-
- {inc.status}
-
+
{inc.status}
-
+
))}
@@ -444,39 +688,47 @@ useEffect(() => {
- {/* Reviews */}
Recent Review
-
+
{reviews.map((r, i) => (
- {[0,1,2,3,4].map((k) => )}
+ {[0, 1, 2, 3, 4].map((k) => (
+
+ ))}
))}
-
+
- {/* Incident Detail Modal */}
{selectedIncident && (
setSelectedIncident(null)}>
-
e.stopPropagation()} style={{ maxWidth: '700px' }}>
+
e.stopPropagation()} style={{ maxWidth: "700px" }}>
-
Incident Details ({selectedIncident.id})
-
+
+ Incident Details ({selectedIncident.id})
+
+
Recorded on: {selectedIncident.date} at {selectedIncident.time}
@@ -485,17 +737,19 @@ useEffect(() => {
-
+
-
{selectedIncident.guard}
+
+ {selectedIncident.guard}
+
-
-
+
+
{selectedIncident.description}
-
+
-
+
{(selectedIncident.photos || []).map((url, idx) => (
))}
{(!selectedIncident.photos || selectedIncident.photos.length === 0) && (
-
No evidence photos attached.
+
No evidence photos attached.
)}
@@ -527,31 +781,45 @@ useEffect(() => {
placeholder="Add internal notes..."
value={incidentDraft.comments}
onChange={(e) => setIncidentDraft((prev) => ({ ...prev, comments: e.target.value }))}
- style={{ border: '1px solid #ddd', borderRadius: '4px', padding: '10px' }}
+ style={{ border: "1px solid #ddd", borderRadius: "4px", padding: "10px" }}
rows={4}
/>
-
+
-
+
)}
-
-
);
-}
+}
\ No newline at end of file