🐛 Fix Denied bookings causing conflict warning

Dsek-LTH · Oct 4, 2023 · de8e6da · de8e6da
1 parent 1bd70d1
commit de8e6da
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/frontend/components/BookingTable/bookingTableRow.tsx b/frontend/components/BookingTable/bookingTableRow.tsx
@@ -30,10 +30,14 @@ const getStatusColor = (bookingRequest: BookingRequest, otherBookingRequests: Bo
       && start < DateTime.fromISO(br.end)
       && br.what.some((ba) => bookingRequest.what.map((ba2) => ba2.id).includes(ba.id)));
   if (conflict) {
-    if (bookingRequest.status === BookingStatus.Pending) {
+    if (otherBookingRequests.some((br) =>
+      br.status === BookingStatus.Accepted)
+    && bookingRequest.status !== BookingStatus.Denied) {
       return 'error';
     }
-    if (bookingRequest.status === BookingStatus.Accepted) {
+    if (otherBookingRequests.some((br) =>
+      br.status === BookingStatus.Pending)
+    && bookingRequest.status !== BookingStatus.Denied) {
       return 'warning';
     }
   }