Merge branch 'main' into #496-fix-employment-history

blumilksoftware · Oct 25, 2024 · f9fa837 · f9fa837
2 parents 924d041 + ccc7740
commit f9fa837
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
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 = [

diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue
@@ -60,11 +60,11 @@ function unsetActiveDay() {
 }
 
 function linkParameters(user, day) {
-  return props.auth.can.createRequestsOnBehalfOfEmployee ? { user: user.id, from_date: day.date } : { from_date: day.date }
+  return auth.value.can.createRequestsOnBehalfOfEmployee ? { user: user.id, from_date: day.date } : { from_date: day.date }
 }
 
 function linkVacationRequest(user) {
-  return props.auth.user.id === user.id || props.auth.can.manageRequestsAsTechnicalApprover || props.auth.can.manageRequestsAsAdministrativeApprover
+  return auth.value.user.id === user.id || auth.value.can.manageRequestsAsTechnicalApprover || auth.value.can.manageRequestsAsAdministrativeApprover
 }
 </script>
 

diff --git a/resources/js/Pages/Equipment/Edit.vue b/resources/js/Pages/Equipment/Edit.vue
@@ -5,6 +5,7 @@ import { Listbox, ListboxButton, ListboxLabel, ListboxOption, ListboxOptions, Sw
 import { CheckIcon, ChevronUpDownIcon } from '@heroicons/vue/24/solid'
 import MultipleCombobox from '@/Shared/Forms/MultipleCombobox.vue'
 import InertiaLink from '@/Shared/InertiaLink.vue'
+import AppLayout from '@/Shared/Layout/AppLayout.vue'
 
 const props = defineProps({
   equipmentItem: Object,