diff --git a/app/Cron/Nightly/SetActiveFlights.php b/app/Cron/Nightly/SetActiveFlights.php index 3dda0707..9915d38c 100644 --- a/app/Cron/Nightly/SetActiveFlights.php +++ b/app/Cron/Nightly/SetActiveFlights.php @@ -49,15 +49,10 @@ class SetActiveFlights extends Listener // and move onto the next one if ($flight->start_date === null || $flight->end_date === null) { if ($flight->days !== null && $flight->days > 0) { - $visible = Days::isToday($flight->days); - if ($flight->visible !== $visible) { - Log::info('Flight '.$flight->ident.' to '.($visible ? 'shown' : 'hidden')); - - $flight->visible = $visible; - if ($visible === false) { - Log::info('Today='.date('N').', start=no, mask='.$flight->days.', in=' - .Days::in($flight->days, Days::$isoDayMap[(int) date('N')])); - } + $flight->visible = Days::isToday($flight->days); + if (!$flight->visible) { + Log::info('Today='.date('N').', start=no, mask='.$flight->days.', in=' + .Days::in($flight->days, Days::$isoDayMap[(int) date('N')])); } } @@ -71,16 +66,10 @@ class SetActiveFlights extends Listener // and then make sure if days of the week are specified, check that too if ($today->gte($flight->start_date) && $today->lte($flight->end_date)) { if ($flight->days !== null && $flight->days > 0) { - $visible = Days::isToday($flight->days); - if ($flight->visible !== $visible) { - Log::info('Toggling flight '.$flight->ident.' to '.($visible ? 'shown' : 'hidden').''); - - $flight->visible = $visible; - if ($visible === false) { - Log::info('Today='.date('N').', start='.$flight->start_date - .', end='.$flight->end_date.', mask='.$flight->days.', in=' + $flight->visible = Days::isToday($flight->days); + if (!$flight->visible) { + Log::info('Today='.date('N').', start=no, mask='.$flight->days.', in=' .Days::in($flight->days, Days::$isoDayMap[(int) date('N')])); - } } } } else { diff --git a/app/Http/Resources/User.php b/app/Http/Resources/User.php index 3d9f8d81..3ef2fb8f 100644 --- a/app/Http/Resources/User.php +++ b/app/Http/Resources/User.php @@ -25,6 +25,7 @@ class User extends Resource 'last_pirep_id' => $this->last_pirep_id, 'flights' => $this->flights, 'flight_time' => $this->flight_time, + 'transfer_time' => $this->transfer_time, 'timezone' => $this->timezone, 'state' => $this->state, ];