#377 - feat: added changing year from calendar buttons

blumilksoftware · Jul 17, 2024 · 6673202 · 6673202
1 parent 51f61ed
commit 6673202
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 8 deletions.
diff --git a/app/Http/Controllers/VacationCalendarController.php b/app/Http/Controllers/VacationCalendarController.php
@@ -4,14 +4,17 @@
 
 namespace Toby\Http\Controllers;
 
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Cache;
 use Inertia\Response;
 use Toby\Domain\CalendarGenerator;
 use Toby\Enums\Month;
 use Toby\Helpers\YearPeriodRetriever;
 use Toby\Http\Resources\SimpleUserResource;
 use Toby\Models\User;
+use Toby\Models\YearPeriod;
 
 class VacationCalendarController extends Controller
 {
@@ -20,12 +23,25 @@ public function index(
         YearPeriodRetriever $yearPeriodRetriever,
         CalendarGenerator $calendarGenerator,
         ?string $month = null,
-    ): Response {
+        ?int $year = null,
+    ): Response|RedirectResponse {
+        if ($year !== null) {
+            return $this->changeYearPeriod($request, $month, $year);
+        }
+
         $month = Month::fromNameOrCurrent((string)$month);
         $currentUser = $request->user();
         $withTrashedUsers = $currentUser->canSeeInactiveUsers();
 
         $yearPeriod = $yearPeriodRetriever->selected();
+        $previousYearPeriod = YearPeriod::query()
+            ->where("year", "<", $yearPeriod->year)
+            ->orderBy("year", "desc")
+            ->first();
+        $nextYearPeriod = YearPeriod::query()
+            ->where("year", ">", $yearPeriod->year)
+            ->orderBy("year")
+            ->first();
         $carbonMonth = Carbon::create($yearPeriod->year, $month->toCarbonNumber());
 
         $users = User::query()
@@ -42,9 +58,21 @@ public function index(
         return inertia("Calendar", [
             "calendar" => $calendar,
             "current" => Month::current(),
-            "selected" => $month->value,
+            "selectedMonth" => $month->value,
             "users" => SimpleUserResource::collection($users),
             "withBlockedUsers" => $withTrashedUsers,
+            "previousYearPeriod" => $previousYearPeriod,
+            "nextYearPeriod" => $nextYearPeriod,
         ]);
     }
+
+    private function changeYearPeriod(Request $request, string $month, int $year): RedirectResponse
+    {
+        $yearPeriod = YearPeriod::query()->where("year", $year)->firstOrFail();
+        $request->session()->put(YearPeriodRetriever::SESSION_KEY, $yearPeriod->id);
+        Cache::forget("selected_year_period");
+
+        return redirect()->route("calendar", ["month" => $month])
+            ->with("info", __("Year period changed."));
+    }
 }
diff --git a/lang/pl.json b/lang/pl.json
@@ -41,6 +41,7 @@
   "Holiday updated.": "Dzień wolny zaktualizowany.",
   "Holiday deleted.": "Dzień wolny usunięty.",
   "Selected year period changed.": "Wybrany rok zmieniony.",
+  "Year period changed.": "Zmieniono rok.",
   "Vacation limits updated.": "Limity urlopów zaktualizowane.",
   "Request created.": "Wniosek utworzony.",
   "Request accepted.": "Wniosek zaakceptowany.",

diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ChevronLeftIcon, ChevronRightIcon, ChevronUpDownIcon } from '@heroicons/vue/24/solid'
+import { ChevronLeftIcon, ChevronRightIcon, ChevronDoubleRightIcon, ChevronDoubleLeftIcon, ChevronUpDownIcon } from '@heroicons/vue/24/solid'
 import { computed, ref, watch } from 'vue'
 import { useMonthInfo } from '@/Composables/monthInfo.js'
 import VacationTypeCalendarIcon from '@/Shared/VacationTypeCalendarIcon.vue'
@@ -14,8 +14,10 @@ const props = defineProps({
   auth: Object,
   calendar: Object,
   current: String,
-  selected: String,
+  selectedMonth: String,
   years: Object,
+  previousYearPeriod: Object,
+  nextYearPeriod: Object,
 })
 
 let activeElement = ref(undefined)
@@ -25,7 +27,7 @@ const { getMonths, findMonth } = useMonthInfo()
 const months = getMonths()
 
 const form = useForm({
-  selectedMonth: months.find(month => month.value === props.selected),
+  selectedMonth: months.find(month => month.value === props.selectedMonth),
 })
 
 watch(() => form.selectedMonth, (value) => {
@@ -34,7 +36,7 @@ watch(() => form.selectedMonth, (value) => {
   }
 })
 
-const selectedMonth = computed(() => findMonth(props.selected))
+const selectedMonth = computed(() => findMonth(props.selectedMonth))
 const previousMonth = computed(() => months[months.indexOf(selectedMonth.value) - 1])
 const nextMonth = computed(() => months[months.indexOf(selectedMonth.value) + 1])
 
@@ -77,6 +79,14 @@ function linkVacationRequest(user) {
           >
             <ChevronLeftIcon class="w-5 h-5" />
           </InertiaLink>
+          <InertiaLink
+            v-else-if="previousYearPeriod"
+            :href="`/calendar/${months[11].value}/${previousYearPeriod.year}`"
+            as="button"
+            class="flex focus:relative justify-center items-center p-2 text-gray-400 hover:text-gray-500 bg-white rounded-l-md border border-r-0 border-gray-300 md:px-2 md:w-9 md:hover:bg-gray-50"
+          >
+            <ChevronDoubleLeftIcon class="w-5 h-5" />
+          </InertiaLink>
           <span
             v-else
             class="flex justify-center items-center text-gray-400 bg-gray-100 rounded-l-md border border-r-0 border-gray-300 md:px-2 md:w-9"
@@ -134,9 +144,17 @@ function linkVacationRequest(user) {
           >
             <ChevronRightIcon class="w-5 h-5" />
           </InertiaLink>
+          <InertiaLink
+            v-else-if="nextYearPeriod"
+            :href="`/calendar/${months[0].value}/${nextYearPeriod.year}`"
+            as="button"
+            class="flex focus:relative justify-center items-center p-2 text-gray-400 hover:text-gray-500 bg-white rounded-r-md border border-l-0 border-gray-300 focus:outline-blumilk-500 md:px-2 md:w-9 md:hover:bg-gray-50"
+          >
+            <ChevronDoubleRightIcon class="w-5 h-5" />
+          </InertiaLink>
           <span
             v-else
-            class="flex justify-center items-center p-2 text-gray-400 bg-gray-100 rounded-r-md border border-l-0 border-gray-300 md:px-2 md:w-9"
+            class="flex justify-center items-center text-gray-400 bg-gray-100 rounded-r-md border border-l-0 border-gray-300 md:px-2 md:w-9"
           >
             <ChevronRightIcon class="w-5 h-5" />
           </span>

diff --git a/routes/web.php b/routes/web.php
@@ -129,7 +129,7 @@
         ->whereNumber("yearPeriod")
         ->name("year-periods.select");
 
-    Route::get("/calendar/{month?}", [VacationCalendarController::class, "index"])
+    Route::get("/calendar/{month?}/{year?}", [VacationCalendarController::class, "index"])
         ->name("calendar");
 
     Route::prefix("/vacation")->as("vacation.")->group(function (): void {