- Add info about benefits on list (#518)

* - add info about owning benefit on benefit list * - style icon * - fix calendar * - linter
blumilksoftware · Jan 17, 2025 · ebef1d6 · ebef1d6
1 parent f77422e
commit ebef1d6
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 7 deletions.
diff --git a/app/Domain/UserBenefitsRetriever.php b/app/Domain/UserBenefitsRetriever.php
@@ -41,6 +41,7 @@ public function getAssignedBenefits(User $user): array
                 "name" => $benefit["name"],
                 "employee" => $assignedBenefit["employee"],
                 "employer" => $assignedBenefit["employer"],
+                "isUsed" => true,
             ];
         }
 

diff --git a/app/Http/Controllers/BenefitController.php b/app/Http/Controllers/BenefitController.php
@@ -8,6 +8,7 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Inertia\Response;
+use Toby\Domain\UserBenefitsRetriever;
 use Toby\Http\Requests\BenefitRequest;
 use Toby\Http\Resources\BenefitResource;
 use Toby\Models\Benefit;
@@ -24,8 +25,17 @@ public function index(Request $request): Response
             ->paginate()
             ->withQueryString();
 
+        $userBenefitsRetriever = new UserBenefitsRetriever();
+        $userBenefits = $userBenefitsRetriever->getAssignedBenefits($request->user());
+        $userBenefitIds = collect($userBenefits)->pluck("id")->toArray();
+
         return inertia("Benefits/Benefits", [
-            "benefits" => BenefitResource::collection($benefits),
+            "benefits" => BenefitResource::collection($benefits->through(fn($benefit) => [
+                "id" => $benefit->id,
+                "name" => $benefit->name,
+                "companion" => $benefit->companion,
+                "isUsed" => in_array($benefit->id, $userBenefitIds, true),
+            ])),
         ]);
     }
 

diff --git a/app/Http/Resources/BenefitResource.php b/app/Http/Resources/BenefitResource.php
@@ -11,9 +11,10 @@ class BenefitResource extends JsonResource
     public function toArray($request): array
     {
         return [
-            "id" => $this->id,
-            "name" => $this->name,
-            "companion" => $this->companion,
+            "id" => $this->resource["id"] ?? $this->id,
+            "name" => $this->resource["name"] ?? $this->name,
+            "companion" => $this->resource["companion"] ?? $this->companion,
+            "isUsed" => $this->resource["isUsed"] ?? false,
         ];
     }
 }
diff --git a/resources/js/Pages/Benefits/Benefits.vue b/resources/js/Pages/Benefits/Benefits.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { EllipsisVerticalIcon, TrashIcon } from '@heroicons/vue/24/solid'
+import { EllipsisVerticalIcon, TrashIcon, ShieldCheckIcon } from '@heroicons/vue/24/solid'
 import { Menu, MenuButton, MenuItem, MenuItems } from '@headlessui/vue'
 import { ref } from 'vue'
 import { Dialog, DialogOverlay, DialogTitle, TransitionChild, TransitionRoot } from '@headlessui/vue'
@@ -80,7 +80,14 @@ function submitCreateBenefit() {
                 class="hover:bg-blumilk-25"
               >
                 <td class="px-4 py-2 text-sm text-gray-500 whitespace-nowrap">
-                  {{ benefit.name }}
+                  <div class="flex items-center gap-1 font-medium">
+                    {{ benefit.name }}
+                    <span v-if="benefit.isUsed"
+                          v-tooltip.right="'Posiadany benefit'"
+                    >
+                      <ShieldCheckIcon class="size-5 text-gray-500" />
+                    </span>
+                  </div>
                 </td>
                 <td class="px-4 py-2 text-sm text-gray-500 whitespace-nowrap">
                   <span

diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue
@@ -36,7 +36,7 @@ const currentDate = DateTime.now()
 const selectedMonth = ref(DateTime.fromISO(props.selectedDate))
 
 watch(selectedMonth, (value, oldValue) => {
-  if (!value || value.toFormat('LL-YYY') === oldValue?.toFormat('LL-YYY')) {
+  if (!value || value.toFormat('LL-yyyy') === oldValue?.toFormat('LL-yyyy')) {
     return
   }