Merge branch 'refs/heads/main' into #328-highlight-and-order-calendar

# Conflicts: # resources/js/Pages/Calendar.vue
blumilksoftware · Oct 25, 2024 · 3b25738 · 3b25738
2 parents 4d987c8 + ccc7740
commit 3b25738
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/Domain/EquipmentExport.php b/app/Domain/EquipmentExport.php
@@ -37,7 +37,7 @@ public function generator(): Generator
                 $equipmentItem->id_number,
                 $equipmentItem->name,
                 $equipmentItem->labels?->implode(", "),
-                $equipmentItem->is_mobile,
+                $equipmentItem->is_mobile ? "Tak" : "Nie",
                 $equipmentItem->assignee->profile->full_name ?? "",
                 $equipmentItem->assigned_at ? Date::dateTimeToExcel($equipmentItem->assigned_at) : "",
             ];

diff --git a/app/Models/EquipmentItem.php b/app/Models/EquipmentItem.php
@@ -30,6 +30,7 @@ class EquipmentItem extends Model
 
     protected $casts = [
         "assigned_at" => "date",
+        "is_mobile" => "boolean",
         "labels" => AsCollection::class,
     ];
     protected $fillable = [