Schedule UX tweaks

2023-12-01 22:20:23 -05:00
parent 8600000e24
commit 9d1d7398b9
3 changed files with 36 additions and 37 deletions
--- a/src/stores/schedule.ts
+++ b/src/stores/schedule.ts
@@ -97,6 +97,7 @@ export const useScheduleStore = defineStore('schedule', () => {
      return (
        (x.start.getDate() == curDate.getDate() ||
          x.end.getDate() == curDate.getDate()) &&
+        x.resource != undefined &&
        (typeof boat == 'number'
          ? x.resource.id == boat
          : x.resource.name == boat)
@@ -107,6 +108,7 @@ export const useScheduleStore = defineStore('schedule', () => {
  const isOverlapped = (res: Reservation) => {
    const lapped = reservations.value.filter(
      (entry: Reservation) =>
+        entry.id != res.id &&
        entry.resource == res.resource &&
        ((entry.start <= res.start && entry.end > res.start) ||
          (entry.end >= res.end && entry.start <= res.end))