Merge pull request #141 from ECFMP/139-avoiding-errors-over-now-times

fix(FlowMeasureResource): force start time to now if needed
ECFMP · Jul 10, 2022 · 7c83075 · 7c83075
2 parents c5fa7a3 + f4a8af1
commit 7c83075
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/Filament/Resources/FlowMeasureResource.php b/app/Filament/Resources/FlowMeasureResource.php
@@ -128,7 +128,7 @@ public static function form(Form $form): Form
                     ->label(__('Start time [UTC]'))
                     ->default(now()->addMinutes(5))
                     ->withoutSeconds()
-                    ->minDate(fn (Page $livewire) => $livewire instanceof CreateRecord ? now() : now()->startOfDay())
+                    ->minDate(fn (Page $livewire) => $livewire instanceof CreateRecord ? now()->subMinutes(30) : now()->startOfDay())
                     ->maxDate(now()->addDays(10))
                     ->disabled(fn (Page $livewire, Closure $get) => !$livewire instanceof CreateRecord && !in_array($get('edit_mode'), [self::FULL_EDIT, self::PARTIAL_EDIT_WITH_START_TIME]))
                     ->dehydrated(function (Page $livewire, Closure $get) {

diff --git a/app/Filament/Resources/FlowMeasureResource/Pages/CreateFlowMeasure.php b/app/Filament/Resources/FlowMeasureResource/Pages/CreateFlowMeasure.php
@@ -22,6 +22,11 @@ protected function mutateFormDataBeforeCreate(array $data): array
         $fir = FlightInformationRegion::find($data['flight_information_region_id']);
 
         $startTime = Carbon::parse($data['start_time']);
+
+        if ($startTime->isBefore(now())) {
+            $startTime = now();
+        }
+
         $data['identifier'] = FlowMeasureIdentifierGenerator::generateIdentifier($startTime, $fir);
         $data['user_id'] = auth()->id();