🐛 fix detection of extended checkin time (#2929)

Traewelling · Sep 24, 2024 · cb7766e · cb7766e
1 parent b0768c8
commit cb7766e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/Models/Event.php b/app/Models/Event.php
@@ -33,6 +33,7 @@
  * @property bool    isPride
  * @property Carbon  start         Timestamp of event starts (returns event_start or checkin_start)
  * @property Carbon  end           Timestamp of event ends (returns event_end or checkin_end)
+ * @property bool    hasExtendedCheckin
  */
 class Event extends Model
 {
@@ -83,11 +84,16 @@ public function getIsPrideAttribute(): bool {
     }
 
     public function getStartAttribute(): Carbon {
-        return $this->event_start?$this->event_start:$this->checkin_start;
+        return $this->event_start ? $this->event_start : $this->checkin_start;
     }
 
     public function getEndAttribute(): Carbon {
-        return $this->event_end?$this->event_end:$this->checkin_end;
+        return $this->event_end ? $this->event_end : $this->checkin_end;
+    }
+
+    public function getHasExtendedCheckinAttribute(): bool {
+        return ($this->event_start && $this->event_start != $this->checkin_start)
+            || ($this->event_end && $this->event_end != $this->checkin_end);
     }
 
     public function approvedBy(): HasOne {

diff --git a/resources/views/events/overview.blade.php b/resources/views/events/overview.blade.php
@@ -46,7 +46,7 @@
                                                         {{$event->start->format('d.m.Y')}}
                                                         - {{$event->end->format('d.m.Y')}}
                                                     @endif
-                                                    @if($event->event_start || $event->event_end)
+                                                    @if($event->hasExtendedCheckin)
                                                         *
                                                     @endif
                                                 </td>