- add separate permission to download working hours summary and overtime summary

app/Http/Controllers/OvertimeTimesheetController.php

@@ -15,7 +15,7 @@ class OvertimeTimesheetController extends Controller
 {
     public function __invoke(?string $month = null): BinaryFileResponse
     {
-        $this->authorize("manageRequestsAsAdministrativeApprover");
+        $this->authorize("downloadOvertimeSummary");
 
         $month = Carbon::canBeCreatedFromFormat($month, "m-Y")
             ? Carbon::createFromFormat("d-m-Y", "01-$month")

app/Http/Controllers/TimesheetController.php

@@ -17,7 +17,7 @@ class TimesheetController extends Controller
 {
     public function __invoke(VacationTypeConfigRetriever $configRetriever, ?string $month = null): BinaryFileResponse
     {
-        $this->authorize("manageRequestsAsAdministrativeApprover");
+        $this->authorize("downloadWorkHoursSummary");
 
         $month = Carbon::canBeCreatedFromFormat($month, "m-Y")
             ? Carbon::createFromFormat("d-m-Y", "01-$month")

config/permission.php

@@ -64,6 +64,8 @@
         "receiveBenefitsReportCreationNotification",
         "manageEquipment",
         "receiveOvertimeRequestsSummaryNotification",
+        "downloadWorkHoursSummary",
+        "downloadOvertimeSummary",
     ],
     "permission_roles" => [
         Role::Administrator->value => [
@@ -90,6 +92,8 @@
             "receiveVacationRequestStatusChangedNotification",
             "manageEquipment",
             "receiveOvertimeRequestsSummaryNotification",
+            "downloadWorkHoursSummary",
+            "downloadOvertimeSummary",
         ],
         Role::AdministrativeApprover->value => [
             "managePermissions",
@@ -114,6 +118,8 @@
             "receiveVacationRequestStatusChangedNotification",
             "receiveBenefitsReportCreationNotification",
             "manageEquipment",
+            "downloadWorkHoursSummary",
+            "downloadOvertimeSummary",
         ],
         Role::TechnicalApprover->value => [
             "manageTechnologies",

resources/js/Composables/permissionInfo.js

@@ -84,6 +84,11 @@ const permissionsInfo = [
     'value': 'skipRequestFlow',
     'section': 'Urlopy',
   },
+  {
+    'name': 'Pobieranie podsumowania godzin pracy',
+    'value': 'downloadWorkHoursSummary',
+    'section': 'Urlopy',
+  },
   {
     'name': 'Zarządzanie wnioskami jako przełożony administracyjny',
     'value': 'manageOvertimeAsAdministrativeApprover',
@@ -99,6 +104,11 @@ const permissionsInfo = [
     'value': 'listAllOvertimeRequests',
     'section': 'Nadgodziny',
   },
+  {
+    'name': 'Pobieranie podsumowania nadgodzin',
+    'value': 'downloadOvertimeSummary',
+    'section': 'Nadgodziny',
+  },
   {
     'name': 'Nadchodzące i zaległe badania medycyny pracy',
     'value': 'receiveUpcomingAndOverdueMedicalExamsNotification',

resources/js/Pages/Calendar.vue

@@ -144,14 +144,14 @@ function resetSettings() {
               </span>
             </button>
             <a
-              v-if="auth.can.manageRequestsAsAdministrativeApprover"
+              v-if="auth.can.downloadWorkHoursSummary"
               :href="`/vacation/timesheet/${selectedMonth.toFormat('LL-yyyy')}`"
               class="block py-3 px-4 text-sm font-medium leading-4 text-center text-white bg-blumilk-600 hover:bg-blumilk-700 rounded-md border border-transparent focus:outline-none focus:ring-2 focus:ring-blumilk-500 focus:ring-offset-2 shadow-sm"
             >
-              Pobierz plik Excel
+              Pobierz podsumowanie godzin
             </a>
             <a
-              v-if="auth.can.manageOvertimeAsAdministrativeApprover"
+              v-if="auth.can.downloadOvertimeSummary"
               :href="`/overtime/timesheet/${selectedMonth.toFormat('LL-yyyy')}`"
               class="block py-3 px-4 text-sm font-medium leading-4 text-center text-white bg-blumilk-600 hover:bg-blumilk-700 rounded-md border border-transparent focus:outline-none focus:ring-2 focus:ring-blumilk-500 focus:ring-offset-2 shadow-sm"
             >

resources/js/Pages/OvertimeRequest/ApproversIndex.vue

@@ -78,14 +78,14 @@ watch(form, debounce(() => {
           </h2>
         </div>
         <div
-          v-if="auth.can.manageRequestsAsAdministrativeApprover"
+          v-if="auth.can.downloadOvertimeSummary"
           class="flex"
         >
           <a
             :href="`/overtime/timesheet/${filters.month}`"
             class="block py-3 px-4 ml-3 text-sm font-medium leading-4 text-center text-white bg-blumilk-600 hover:bg-blumilk-700 rounded-md border border-transparent focus:outline-none focus:ring-2 focus:ring-blumilk-500 focus:ring-offset-2 shadow-sm"
           >
-            Pobierz plik Excel
+            Pobierz nadgodziny
           </a>
         </div>
       </div>

tests/Feature/PermissionTest.php

@@ -52,7 +52,9 @@ public function testAdminCanSeeEditEmployeePermissionsForm(): void
                             ->where("receiveVacationRequestWaitsForApprovalNotification", false)
                             ->where("receiveVacationRequestStatusChangedNotification", false)
                             ->where("manageEquipment", false)
-                            ->where("receiveOvertimeRequestsSummaryNotification", false),
+                            ->where("receiveOvertimeRequestsSummaryNotification", false)
+                            ->where("downloadWorkHoursSummary", false)
+                            ->where("downloadOvertimeSummary", false),
                     ),
             );
     }
@@ -96,7 +98,9 @@ public function testAdminCanSeeEditTechnicalApproverPermissionsForm(): void
                             ->where("receiveVacationRequestWaitsForApprovalNotification", true)
                             ->where("receiveVacationRequestStatusChangedNotification", true)
                             ->where("manageEquipment", false)
-                            ->where("receiveOvertimeRequestsSummaryNotification", true),
+                            ->where("receiveOvertimeRequestsSummaryNotification", true)
+                            ->where("downloadWorkHoursSummary", false)
+                            ->where("downloadOvertimeSummary", false),
                     ),
             );
     }
@@ -140,7 +144,9 @@ public function testAdminCanSeeEditAdministrativeApproverPermissionsForm(): void
                             ->where("receiveVacationRequestWaitsForApprovalNotification", true)
                             ->where("receiveVacationRequestStatusChangedNotification", true)
                             ->where("manageEquipment", true)
-                            ->where("receiveOvertimeRequestsSummaryNotification", false),
+                            ->where("receiveOvertimeRequestsSummaryNotification", false)
+                            ->where("downloadWorkHoursSummary", true)
+                            ->where("downloadOvertimeSummary", true),
                     ),
             );
     }