newspace2-push

Author: malisharfer

.github/workflows/php-build-and-deploy.yml

@@ -35,7 +35,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ secrets.REGISTRY_LOGIN_SERVER }}/newspace2_15
+          images: ${{ secrets.REGISTRY_LOGIN_SERVER }}/newspace2_16
           flavor: |
             latest=false
           tags: |

app/Exports/CourceSheet.php

@@ -29,7 +29,6 @@ class CourceSheet implements FromCollection, ShouldAutoSize, WithEvents, WithHea
 
     public function __construct($month, $course)
     {
-        set_time_limit(0);
         $this->month = $month;
         $this->course = $course;
         $this->shifts = Shift::whereNotNull('soldier_id')

app/Exports/ShiftsExport.php

@@ -22,7 +22,6 @@ public function __construct($month)
 
     public function sheets(): array
     {
-        set_time_limit(0);
         $tasksTypes = Task::select('type', 'color')
             ->get()
             ->groupBy('type')

app/Exports/TaskTypeSheet.php

@@ -45,7 +45,7 @@ protected function convertColorToRBGFormat($color)
 
     protected function getTasksNames()
     {
-        $tasksNames = $this->shifts->groupBy(fn ($shift) => $shift->task->type)
+        $tasksNames = $this->shifts->groupBy(fn ($shift) => $shift->task()->withTrashed()->first()->type)
             ->map(fn ($shifts, $type) => $shifts->pluck('task.name')->unique())
             ->flatten();
         $tasksNamesWithoutWeekendAndThurthday = $tasksNames->filter(fn ($name) => strpos($name, 'סופש') !== false || strpos($name, 'חמישי') !== false)->flatten();
@@ -137,7 +137,14 @@ public function collection()
             $row = [$date];
             foreach ($this->tasksNames as $name) {
                 $shiftForDate = $shiftsByDate->get($date, collect())->first(function ($shift) use ($name) {
-                    return $shift->task && strpos($shift->task->name, $name) !== false;
+                    $taskName = $shift->task()->withTrashed()->first()->name;
+                    $baseName = str_replace([' סופש', ' חמישי'], '', $taskName);
+                    $columnBase = str_replace([' סופש', ' חמישי'], '', $name);
+                    if ($columnBase === $baseName) {
+                        return true;
+                    }
+
+                    return false;
                 });
                 $row[] = ($shiftForDate && $shiftForDate->soldier) ? $shiftForDate->soldier->user->displayName : ' ';
             }

app/Filament/Widgets/CalendarWidget.php

@@ -344,7 +344,11 @@ protected function getBasicActions()
                 }),
             DeleteAction::make()
                 ->outlined()
-                ->label(__('Delete')),
+                ->label(__('Delete'))
+                ->action(function (Model $record) {
+                    $record->delete_cascade = true;
+                    $record->delete();
+                }),
         ];
     }
 

app/Models/Shift.php

@@ -75,6 +75,17 @@ public function getTaskColorAttribute()
         return $this->task()->withTrashed()->first()->color;
     }
 
+    protected static function booted(): void
+    {
+        static::deleting(function (Shift $shift) {
+            if ($shift->task->recurring['type'] == 'One time' && isset($shift->delete_cascade) && $shift->delete_cascade) {
+                if ($shift->task) {
+                    $shift->task->delete();
+                }
+            }
+        });
+    }
+
     public static function getSchema(): array
     {
         return [

app/Services/Helpers.php

@@ -146,7 +146,6 @@ protected static function getLastDayOfLastMonthShifts($soldierId, $lastDay)
 
     public static function updateShiftTable($assignments)
     {
-        set_time_limit(seconds: 0);
         if (empty($assignments)) {
             return;
         }

app/Services/PredictingProblems.php

@@ -26,7 +26,6 @@ public function __construct($date)
 
     public function getData()
     {
-        set_time_limit(0);
         $this->maxNightsGreaterThanMaxShifts();
         $this->maxWeekendsGreaterThanCapacity();
         $this->weekendShiftsNotPointed();

app/Services/RecurringEvents.php

@@ -21,7 +21,7 @@ public function __construct($month = null)
 
     public function recurringTask(): void
     {
-        Task::whereNotIn('recurring->type', ['Daily range', 'One time'])
+        Task::whereNotIn('recurring->type', ['Daily range'])
             ->get()
             ->each(fn ($task) => $this->switchTasks($task));
     }
@@ -40,9 +40,14 @@ public function dailyRangeTask(Task $task)
         $this->createShifts($dates);
     }
 
-    protected function switchTasks(Task $task): void
+    protected function switchTasks(Task $task)
     {
         $this->task = $task;
+        if ($this->task->recurring['type'] == 'One time') {
+            $this->oneTimeTask($task);
+
+            return;
+        }
         $dates = match ($this->task->recurring['type']) {
             'Daily' => $this->dailyRecurring(),
             'Weekly' => $this->weeklyRecurring(),