diff --git a/app/Domain/CalendarGenerator.php b/app/Domain/CalendarGenerator.php new file mode 100644 index 0000000..96c0667 --- /dev/null +++ b/app/Domain/CalendarGenerator.php @@ -0,0 +1,80 @@ +year, $this->monthNameToNumber($month)); + $period = CarbonPeriod::create($date->startOfMonth(), $date->endOfMonth()); + $holidays = $yearPeriod->holidays()->pluck("date"); + + return $this->generateCalendar($period, $holidays); + } + + protected function monthNameToNumber($name): int + { + return match ($name) { + default => CarbonInterface::JANUARY, + "february" => CarbonInterface::FEBRUARY, + "march" => CarbonInterface::MARCH, + "april" => CarbonInterface::APRIL, + "may" => CarbonInterface::MAY, + "june" => CarbonInterface::JUNE, + "july" => CarbonInterface::JULY, + "august" => CarbonInterface::AUGUST, + "september" => CarbonInterface::SEPTEMBER, + "october" => CarbonInterface::OCTOBER, + "november" => CarbonInterface::NOVEMBER, + "december" => CarbonInterface::DECEMBER, + }; + } + + protected function generateCalendar(CarbonPeriod $period, Collection $holidays): array + { + $calendar = []; + $vacations = $this->getVacationsForPeriod($period); + + foreach ($period as $day) { + $vacationsForDay = $vacations[$day->toDateString()] ?? new Collection(); + + $calendar[] = [ + "date" => $day->toDateString(), + "dayOfMonth" => $day->translatedFormat("j"), + "dayOfWeek" => $day->translatedFormat("D"), + "isToday" => $day->isToday(), + "isWeekend" => $day->isWeekend(), + "isHoliday" => $holidays->contains($day), + "vacations" => $vacationsForDay->pluck("user_id"), + ]; + } + + return $calendar; + } + + protected function getVacationsForPeriod(CarbonPeriod $period): Collection + { + return Vacation::query() + ->whereBetween("date", [$period->start, $period->end]) + ->whereRelation("vacationRequest", "state", VacationRequestState::APPROVED->value) + ->get() + ->groupBy(fn(Vacation $vacation) => $vacation->date->toDateString()); + } +} diff --git a/app/Domain/Validation/Rules/DoesNotExceedLimitRule.php b/app/Domain/Validation/Rules/DoesNotExceedLimitRule.php index c9c4148..c8c9ab5 100644 --- a/app/Domain/Validation/Rules/DoesNotExceedLimitRule.php +++ b/app/Domain/Validation/Rules/DoesNotExceedLimitRule.php @@ -4,23 +4,64 @@ declare(strict_types=1); namespace Toby\Domain\Validation\Rules; +use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Collection; +use Toby\Domain\Enums\VacationRequestState; +use Toby\Domain\Enums\VacationType; +use Toby\Domain\VacationDaysCalculator; use Toby\Domain\VacationTypeConfigRetriever; +use Toby\Eloquent\Models\User; use Toby\Eloquent\Models\VacationRequest; +use Toby\Eloquent\Models\YearPeriod; class DoesNotExceedLimitRule implements VacationRequestRule { public function __construct( protected VacationTypeConfigRetriever $configRetriever, + protected VacationDaysCalculator $vacationDaysCalculator, ) { } public function check(VacationRequest $vacationRequest): bool { - return true; + if (!$this->configRetriever->hasLimit($vacationRequest->type)) { + return true; + } + + $limit = $this->getUserVacationLimit($vacationRequest->user, $vacationRequest->yearPeriod); + $vacationDays = $this->getVacationDaysWithLimit($vacationRequest->user, $vacationRequest->yearPeriod); + $estimatedDays = $this->vacationDaysCalculator->calculateDays($vacationRequest->yearPeriod, $vacationRequest->from, $vacationRequest->to)->count(); + + return $limit >= ($vacationDays + $estimatedDays); } public function errorMessage(): string { - return __("You have exceeded your vacation limit."); + return __("Vacation limit has been exceeded."); + } + + protected function getUserVacationLimit(User $user, YearPeriod $yearPeriod): int + { + return $user->vacationLimits()->where("year_period_id", $yearPeriod->id)->first()->days ?? 0; + } + + protected function getVacationDaysWithLimit(User $user, YearPeriod $yearPeriod): int + { + return $user->vacations() + ->where("year_period_id", $yearPeriod->id) + ->whereRelation( + "vacationRequest", + fn(Builder $query) => $query + ->whereIn("type", $this->getLimitableVacationTypes()) + ->noStates(VacationRequestState::failedStates()), + ) + ->count(); + } + + protected function getLimitableVacationTypes(): Collection + { + $types = new Collection(VacationType::cases()); + + return $types->filter(fn(VacationType $type) => $this->configRetriever->hasLimit($type)); } } diff --git a/app/Eloquent/Models/Vacation.php b/app/Eloquent/Models/Vacation.php index e359926..c22cf76 100644 --- a/app/Eloquent/Models/Vacation.php +++ b/app/Eloquent/Models/Vacation.php @@ -14,6 +14,7 @@ use Illuminate\Support\Carbon; * @property Carbon $date * @property User $user * @property VacationRequest $vacationRequest + * @property YearPeriod $yearPeriod */ class Vacation extends Model { @@ -34,4 +35,9 @@ class Vacation extends Model { return $this->belongsTo(VacationRequest::class); } + + public function yearPeriod(): BelongsTo + { + return $this->belongsTo(YearPeriod::class); + } } diff --git a/app/Eloquent/Models/VacationRequest.php b/app/Eloquent/Models/VacationRequest.php index 7b84a07..f8d29b9 100644 --- a/app/Eloquent/Models/VacationRequest.php +++ b/app/Eloquent/Models/VacationRequest.php @@ -21,7 +21,6 @@ use Toby\Domain\Enums\VacationType; * @property VacationRequestState $state * @property Carbon $from * @property Carbon $to - * @property int $estimated_days * @property string $comment * @property User $user * @property YearPeriod $yearPeriod @@ -75,6 +74,11 @@ class VacationRequest extends Model return $query->whereIn("state", $states); } + public function scopeNoStates(Builder $query, array $states): Builder + { + return $query->whereNotIn("state", $states); + } + public function scopeOverlapsWith(Builder $query, self $vacationRequest): Builder { return $query->where("from", "<=", $vacationRequest->to) diff --git a/app/Infrastructure/Http/Controllers/VacationCalendarController.php b/app/Infrastructure/Http/Controllers/VacationCalendarController.php index 1b8ef75..d37cce6 100644 --- a/app/Infrastructure/Http/Controllers/VacationCalendarController.php +++ b/app/Infrastructure/Http/Controllers/VacationCalendarController.php @@ -4,81 +4,35 @@ declare(strict_types=1); namespace Toby\Infrastructure\Http\Controllers; -use Carbon\CarbonImmutable; -use Carbon\CarbonInterface; -use Carbon\CarbonPeriod; use Illuminate\Http\Request; +use Illuminate\Support\Carbon; +use Illuminate\Support\Str; use Inertia\Response; -use Toby\Domain\Enums\VacationRequestState; +use Toby\Domain\CalendarGenerator; use Toby\Eloquent\Helpers\YearPeriodRetriever; use Toby\Eloquent\Models\User; -use Toby\Eloquent\Models\Vacation; use Toby\Infrastructure\Http\Resources\UserResource; class VacationCalendarController extends Controller { - public function index(Request $request, YearPeriodRetriever $yearPeriodRetriever): Response - { - $month = $request->query("month", "february"); + public function index( + Request $request, + YearPeriodRetriever $yearPeriodRetriever, + CalendarGenerator $calendarGenerator, + ): Response { + $month = Str::lower($request->query("month", Carbon::now()->englishMonth)); $yearPeriod = $yearPeriodRetriever->selected(); - $date = CarbonImmutable::create($yearPeriod->year, $this->monthNameToNumber($month)); - $period = CarbonPeriod::create($date->startOfMonth(), $date->endOfMonth()); - $holidays = $yearPeriod->holidays()->pluck("date"); $users = User::query() - ->with([ - "vacations" => fn($query) => $query - ->whereBetween("date", [$period->start, $period->end]) - ->whereRelation("vacationRequest", "state", VacationRequestState::APPROVED->value), - ]) ->orderBy("last_name") ->orderBy("first_name") ->get(); - $calendar = []; - - foreach ($period as $day) { - $calendar[] = [ - "date" => $day->toDateString(), - "dayOfMonth" => $day->translatedFormat("j"), - "dayOfWeek" => $day->translatedFormat("D"), - "isToday" => $day->isToday(), - "isWeekend" => $day->isWeekend(), - "isHoliday" => $holidays->contains($day), - ]; - } - - $userVacations = []; - - /** @var User $user */ - foreach ($users as $user) { - $userVacations[] = [ - "user" => new UserResource($user), - "vacations" => $user->vacations->map(fn(Vacation $vacation) => $vacation->date->toDateString()), - ]; - } + $calendar = $calendarGenerator->generate($yearPeriod, $month); return inertia("Calendar", [ "calendar" => $calendar, "currentMonth" => $month, - "userVacations" => $userVacations, + "users" => UserResource::collection($users), ]); } - - protected function monthNameToNumber(?string $name): int - { - return match ($name) { - default => CarbonInterface::JANUARY, - "february" => CarbonInterface::FEBRUARY, - "march" => CarbonInterface::MARCH, - "april" => CarbonInterface::APRIL, - "may" => CarbonInterface::MAY, - "june" => CarbonInterface::JUNE, - "july" => CarbonInterface::JULY, - "august" => CarbonInterface::AUGUST, - "september" => CarbonInterface::SEPTEMBER, - "october" => CarbonInterface::OCTOBER, - "november" => CarbonInterface::NOVEMBER, - "december" => CarbonInterface::DECEMBER, - }; - } } diff --git a/app/Infrastructure/Http/Controllers/VacationRequestController.php b/app/Infrastructure/Http/Controllers/VacationRequestController.php index 739a1da..814b35d 100644 --- a/app/Infrastructure/Http/Controllers/VacationRequestController.php +++ b/app/Infrastructure/Http/Controllers/VacationRequestController.php @@ -75,6 +75,7 @@ class VacationRequestController extends Controller /** @var VacationRequest $vacationRequest */ $vacationRequest = $request->user()->vacationRequests()->make($request->data()); $vacationRequestValidator->validate($vacationRequest); + $vacationRequest->save(); $days = $vacationDaysCalculator->calculateDays( @@ -86,7 +87,8 @@ class VacationRequestController extends Controller foreach ($days as $day) { $vacationRequest->vacations()->create([ "date" => $day, - "user_id" => $vacationRequest->user_id, + "user_id" => $vacationRequest->user->id, + "year_period_id" => $vacationRequest->yearPeriod->id, ]); } diff --git a/database/factories/VacationFactory.php b/database/factories/VacationFactory.php index baa180d..d70c43d 100644 --- a/database/factories/VacationFactory.php +++ b/database/factories/VacationFactory.php @@ -8,15 +8,8 @@ use Illuminate\Database\Eloquent\Factories\Factory; class VacationFactory extends Factory { - /** - * Define the model's default state. - * - * @return array - */ - public function definition() + public function definition(): array { - return [ - // - ]; + return []; } } diff --git a/database/migrations/2022_02_07_133018_create_vacations_table.php b/database/migrations/2022_02_07_133018_create_vacations_table.php index 713806d..648be3c 100644 --- a/database/migrations/2022_02_07_133018_create_vacations_table.php +++ b/database/migrations/2022_02_07_133018_create_vacations_table.php @@ -7,6 +7,7 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; use Toby\Eloquent\Models\User; use Toby\Eloquent\Models\VacationRequest; +use Toby\Eloquent\Models\YearPeriod; return new class() extends Migration { public function up(): void @@ -15,6 +16,7 @@ return new class() extends Migration { $table->id(); $table->foreignIdFor(User::class)->constrained()->cascadeOnDelete(); $table->foreignIdFor(VacationRequest::class)->constrained()->cascadeOnDelete(); + $table->foreignIdFor(YearPeriod::class)->constrained()->cascadeOnDelete(); $table->date("date"); }); } diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 0788740..614d712 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -91,6 +91,7 @@ class DatabaseSeeder extends Seeder $vacationRequest->vacations()->create([ "date" => $day, "user_id" => $vacationRequest->user->id, + "year_period_id" => $vacationRequest->yearPeriod->id, ]); } }) diff --git a/resources/js/Composables/statusInfo.js b/resources/js/Composables/statusInfo.js new file mode 100644 index 0000000..1d73c5a --- /dev/null +++ b/resources/js/Composables/statusInfo.js @@ -0,0 +1,128 @@ +import { + CheckIcon as OutlineCheckIcon, + ClockIcon as OutlineClockIcon, + DocumentTextIcon as OutlineDocumentTextIcon, + ThumbDownIcon as OutlineThumbDownIcon, + ThumbUpIcon as OutlineThumbUpIcon, + XIcon as OutlineXIcon, +} from '@heroicons/vue/outline' + +import { + CheckIcon as SolidCheckIcon, + ClockIcon as SolidClockIcon, + DocumentTextIcon as SolidDocumentTextIcon, + ThumbDownIcon as SolidThumbDownIcon, + ThumbUpIcon as SolidThumbUpIcon, + XIcon as SolidXIcon, +} from '@heroicons/vue/solid' + +const statuses = [ + { + text: 'Utworzony', + value: 'created', + outline: { + icon: OutlineDocumentTextIcon, + foreground: 'text-white', + background: 'bg-gray-400', + }, + solid: { + icon: SolidDocumentTextIcon, + color: 'text-gray-400', + }, + }, + { + text: 'Czeka na akceptację od technicznego', + value: 'waiting_for_technical', + outline: { + icon: OutlineClockIcon, + foreground: 'text-white', + background: 'bg-amber-400', + }, + solid: { + icon: SolidClockIcon, + color: 'text-amber-400', + }, + }, + { + text: 'Czeka na akceptację od administracyjnego', + value: 'waiting_for_administrative', + outline: { + icon: OutlineClockIcon, + foreground: 'text-white', + background: 'bg-amber-400', + }, + solid: { + icon: SolidClockIcon, + color: 'text-amber-400', + }, + }, + { + text: 'Odrzucony', + value: 'rejected', + outline: { + icon: OutlineThumbDownIcon, + foreground: 'text-white', + background: 'bg-rose-600', + }, + solid: { + icon: SolidThumbDownIcon, + color: 'text-rose-600', + }, + }, + { + text: 'Zaakceptowany przez technicznego', + value: 'accepted_by_technical', + outline: { + icon: OutlineThumbUpIcon, + foreground: 'text-white', + background: 'bg-green-500', + }, + solid: { + icon: SolidThumbUpIcon, + color: 'text-green-500', + }, + }, + { + text: 'Zaakceptowany przez administracyjnego', + value: 'accepted_by_administrative', + outline: { + icon: OutlineThumbUpIcon, + foreground: 'text-white', + background: 'bg-green-500', + }, + solid: { + icon: SolidThumbUpIcon, + color: 'text-green-500', + }, + }, + { + text: 'Zatwierdzony', + value: 'approved', + outline: { + icon: OutlineCheckIcon, + foreground: 'text-white', + background: 'bg-blumilk-500', + }, + solid: { + icon: SolidCheckIcon, + color: 'text-blumilk-500', + }, + }, + { + text: 'Anulowany', + value: 'canceled', + outline: { + icon: OutlineXIcon, + foreground: 'text-white', + background: 'bg-gray-900', + }, + solid: { + icon: SolidXIcon, + color: 'text-gray-900', + }, + }, +] + +export function useStatusInfo(status) { + return statuses.find(statusInfo => statusInfo.value === status) +} diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue index 6511e6b..ca0c8e5 100644 --- a/resources/js/Pages/Calendar.vue +++ b/resources/js/Pages/Calendar.vue @@ -62,7 +62,7 @@ v-for="day in calendar" :key="day.dayOfMonth" class="border border-gray-300 text-lg font-semibold text-gray-900 py-4 px-2" - :class="{ 'text-blumilk-600 bg-blumilk-25 font-black': day.isToday}" + :class="{ 'text-blumilk-600 bg-blumilk-25 font-black': day.isToday }" >
{{ day.dayOfMonth }} @@ -75,21 +75,20 @@
- {{ userVacation.user.name }} + {{ user.name }}
@@ -98,10 +97,10 @@ v-for="day in calendar" :key="day.dayOfMonth" class="border border-gray-300" - :class="{'bg-gray-100': day.isWeekend, 'bg-green-100': day.isHoliday, 'bg-blumilk-500': userVacation.vacations.includes(day.date) }" + :class="{'bg-red-100': day.isWeekend || day.isHoliday, 'bg-blumilk-500': day.vacations.includes(user.id) }" >
null, }, diff --git a/resources/js/Pages/Dashboard.vue b/resources/js/Pages/Dashboard.vue index 6fbe513..9051660 100644 --- a/resources/js/Pages/Dashboard.vue +++ b/resources/js/Pages/Dashboard.vue @@ -257,7 +257,7 @@ import {computed} from 'vue' import {usePage} from '@inertiajs/inertia-vue3' export default { - name: 'Dashboard', + name: 'DashboardPage', setup() { const user = computed(() => usePage().props.value.auth.user) const stats = [ diff --git a/resources/js/Pages/VacationRequest/Show.vue b/resources/js/Pages/VacationRequest/Show.vue index 3f1a28e..1c4f519 100644 --- a/resources/js/Pages/VacationRequest/Show.vue +++ b/resources/js/Pages/VacationRequest/Show.vue @@ -18,6 +18,14 @@ {{ request.name }}
+
+
+ Pracownik +
+
+ {{ request.user.name }} +
+
Rodzaj urlopu diff --git a/resources/js/Shared/Activity.vue b/resources/js/Shared/Activity.vue index 8b74fc2..050889c 100644 --- a/resources/js/Shared/Activity.vue +++ b/resources/js/Shared/Activity.vue @@ -6,9 +6,9 @@ />
- + @@ -32,8 +32,8 @@