#479 - number of working hours (#480)

* #479 - feat: added working hours for specific month on calendar view * #479 - fix: fixed user method * #479 - feat: added config for employment contract working hours
blumilksoftware · Aug 8, 2024 · a0d1e48 · a0d1e48
1 parent d20d356
commit a0d1e48
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 16 deletions.
diff --git a/app/Domain/MonthWorkingHoursCalculator.php b/app/Domain/MonthWorkingHoursCalculator.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Domain;
+
+use Toby\Enums\VacationType;
+use Toby\Models\User;
+
+class MonthWorkingHoursCalculator
+{
+    public function calculateHours(array $calendar, User $user): int
+    {
+        return collect($calendar)
+            ->filter(
+                fn(array $day): bool => !$day["isWeekend"]
+                    && !$day["isHoliday"]
+                    && ((
+                        isset($day["vacations"][$user->id])
+                            && in_array($day["vacations"][$user->id]["type"]->value, [VacationType::RemoteWork->value, VacationType::Delegation->value], true)
+                    ) || !isset($day["vacations"][$user->id])),
+            )
+            ->count();
+    }
+}
diff --git a/app/Http/Controllers/VacationCalendarController.php b/app/Http/Controllers/VacationCalendarController.php
@@ -9,6 +9,7 @@
 use Illuminate\Support\Carbon;
 use Inertia\Response;
 use Toby\Domain\CalendarGenerator;
+use Toby\Domain\MonthWorkingHoursCalculator;
 use Toby\Enums\Month;
 use Toby\Helpers\YearPeriodRetriever;
 use Toby\Http\Resources\SimpleUserResource;
@@ -21,6 +22,7 @@ public function index(
         Request $request,
         YearPeriodRetriever $yearPeriodRetriever,
         CalendarGenerator $calendarGenerator,
+        MonthWorkingHoursCalculator $monthWorkingHoursCalculator,
         ?string $month = null,
         ?int $year = null,
     ): Response|RedirectResponse {
@@ -29,6 +31,7 @@ public function index(
         }
 
         $month = Month::fromNameOrCurrent((string)$month);
+        /** @var User $currentUser */
         $currentUser = $request->user();
         $withTrashedUsers = $currentUser->canSeeInactiveUsers();
 
@@ -53,9 +56,13 @@ public function index(
         $users->prepend($currentUser);
 
         $calendar = $calendarGenerator->generate($carbonMonth);
+        $workingHours = $currentUser->isEmployedOnEmploymentForm()
+            ? $monthWorkingHoursCalculator->calculateHours($calendar, $currentUser) * config("toby.number_of_hours_on_employment_contract.full_time")
+            : null;
 
         return inertia("Calendar", [
             "calendar" => $calendar,
+            "workingHours" => $workingHours,
             "currentMonth" => Month::current(),
             "currentYear" => Carbon::now()->year,
             "selectedMonth" => $month->value,

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -17,6 +17,7 @@
 use Illuminate\Support\Facades\DB;
 use Laravel\Sanctum\HasApiTokens;
 use Spatie\Permission\Traits\HasRoles;
+use Toby\Enums\EmploymentForm;
 use Toby\Enums\Role;
 use Toby\Enums\UserHistoryType;
 use Toby\Notifications\Notifiable as NotifiableInterface;
@@ -257,6 +258,11 @@ public function isWorkAnniversaryToday(): bool
         return $workAnniversary?->isToday() ?? false;
     }
 
+    public function isEmployedOnEmploymentForm(EmploymentForm $employmentForm = EmploymentForm::EmploymentContract): bool
+    {
+        return $this->profile->employment_form === $employmentForm;
+    }
+
     protected static function newFactory(): UserFactory
     {
         return UserFactory::new();

diff --git a/config/toby.php b/config/toby.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    "number_of_hours_on_employment_contract" => [
+        "full_time" => 8,
+    ],
+];
diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue
@@ -1,5 +1,12 @@
 <script setup>
-import { ChevronLeftIcon, ChevronRightIcon, ChevronDoubleRightIcon, ChevronDoubleLeftIcon, ChevronUpDownIcon, ArrowUturnLeftIcon } from '@heroicons/vue/24/solid'
+import {
+  ArrowUturnLeftIcon,
+  ChevronDoubleLeftIcon,
+  ChevronDoubleRightIcon,
+  ChevronLeftIcon,
+  ChevronRightIcon,
+  ChevronUpDownIcon,
+} from '@heroicons/vue/24/solid'
 import { computed, ref, watch } from 'vue'
 import { useMonthInfo } from '@/Composables/monthInfo.js'
 import VacationTypeCalendarIcon from '@/Shared/VacationTypeCalendarIcon.vue'
@@ -13,6 +20,7 @@ const props = defineProps({
   users: Object,
   auth: Object,
   calendar: Object,
+  workingHours: Number,
   currentMonth: String,
   currentYear: Number,
   selectedMonth: String,
@@ -173,23 +181,33 @@ function linkVacationRequest(user) {
           </InertiaLink>
         </div>
       </div>
-      <div
-        class="flex mt-3 sm:mt-0"
-      >
-        <a
-          v-if="auth.can.manageRequestsAsAdministrativeApprover"
-          :href="`/vacation/timesheet/${selectedMonth.value}`"
-          class="block py-3 px-4 sm: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"
+      <div class="flex-row">
+        <div
+          class="flex items-center mt-3 sm:mt-0"
         >
-          Pobierz plik Excel
-        </a>
-        <a
-          v-if="auth.can.manageOvertimeAsAdministrativeApprover"
-          :href="`/overtime/timesheet/${selectedMonth.value}`"
-          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"
+          <a
+            v-if="auth.can.manageRequestsAsAdministrativeApprover"
+            :href="`/vacation/timesheet/${selectedMonth.value}`"
+            class="block py-3 px-4 sm: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
+          </a>
+          <a
+            v-if="auth.can.manageOvertimeAsAdministrativeApprover"
+            :href="`/overtime/timesheet/${selectedMonth.value}`"
+            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 nadgodziny
+          </a>
+        </div>
+        <div
+          v-if="workingHours !== null"
+          class="flex items-center justify-start sm:justify-end mt-3 sm:mt-1"
         >
-          Pobierz nadgodziny
-        </a>
+          <p>
+            Liczba przepracowanych godzin: <span class="font-bold">{{ workingHours }}</span>
+          </p>
+        </div>
       </div>
     </div>
     <div class="overflow-x-auto">