#37 - cancel vacation request

This commit is contained in:
Adrian Hopek 2022-02-17 12:04:05 +01:00
parent 026dd87a44
commit a87f85713f
7 changed files with 98 additions and 16 deletions

View File

@ -8,12 +8,14 @@ use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvi
use Toby\Domain\Events\VacationRequestAcceptedByAdministrative; use Toby\Domain\Events\VacationRequestAcceptedByAdministrative;
use Toby\Domain\Events\VacationRequestAcceptedByTechnical; use Toby\Domain\Events\VacationRequestAcceptedByTechnical;
use Toby\Domain\Events\VacationRequestApproved; use Toby\Domain\Events\VacationRequestApproved;
use Toby\Domain\Events\VacationRequestCanceled;
use Toby\Domain\Events\VacationRequestCreated; use Toby\Domain\Events\VacationRequestCreated;
use Toby\Domain\Events\VacationRequestStateChanged; use Toby\Domain\Events\VacationRequestStateChanged;
use Toby\Domain\Listeners\CreateVacationRequestActivity; use Toby\Domain\Listeners\CreateVacationRequestActivity;
use Toby\Domain\Listeners\HandleAcceptedByAdministrativeVacationRequest; use Toby\Domain\Listeners\HandleAcceptedByAdministrativeVacationRequest;
use Toby\Domain\Listeners\HandleAcceptedByTechnicalVacationRequest; use Toby\Domain\Listeners\HandleAcceptedByTechnicalVacationRequest;
use Toby\Domain\Listeners\HandleApprovedVacationRequest; use Toby\Domain\Listeners\HandleApprovedVacationRequest;
use Toby\Domain\Listeners\HandleCanceledVacationRequest;
use Toby\Domain\Listeners\HandleCreatedVacationRequest; use Toby\Domain\Listeners\HandleCreatedVacationRequest;
class EventServiceProvider extends ServiceProvider class EventServiceProvider extends ServiceProvider
@ -24,5 +26,6 @@ class EventServiceProvider extends ServiceProvider
VacationRequestAcceptedByTechnical::class => [HandleAcceptedByTechnicalVacationRequest::class], VacationRequestAcceptedByTechnical::class => [HandleAcceptedByTechnicalVacationRequest::class],
VacationRequestAcceptedByAdministrative::class => [HandleAcceptedByAdministrativeVacationRequest::class], VacationRequestAcceptedByAdministrative::class => [HandleAcceptedByAdministrativeVacationRequest::class],
VacationRequestApproved::class => [HandleApprovedVacationRequest::class], VacationRequestApproved::class => [HandleApprovedVacationRequest::class],
VacationRequestCanceled::class => [HandleCanceledVacationRequest::class],
]; ];
} }

View File

@ -0,0 +1,20 @@
<?php
declare(strict_types=1);
namespace Toby\Domain\Events;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels;
use Toby\Eloquent\Models\VacationRequest;
class VacationRequestCanceled
{
use Dispatchable;
use SerializesModels;
public function __construct(
public VacationRequest $vacationRequest,
) {
}
}

View File

@ -5,16 +5,10 @@ declare(strict_types=1);
namespace Toby\Domain\Listeners; namespace Toby\Domain\Listeners;
use Toby\Domain\Events\VacationRequestApproved; use Toby\Domain\Events\VacationRequestApproved;
use Toby\Domain\VacationTypeConfigRetriever;
use Toby\Infrastructure\Jobs\SendVacationRequestDaysToGoogleCalendar; use Toby\Infrastructure\Jobs\SendVacationRequestDaysToGoogleCalendar;
class HandleApprovedVacationRequest class HandleApprovedVacationRequest
{ {
public function __construct(
protected VacationTypeConfigRetriever $configRetriever,
) {
}
public function handle(VacationRequestApproved $event): void public function handle(VacationRequestApproved $event): void
{ {
SendVacationRequestDaysToGoogleCalendar::dispatch($event->vacationRequest); SendVacationRequestDaysToGoogleCalendar::dispatch($event->vacationRequest);

View File

@ -0,0 +1,16 @@
<?php
declare(strict_types=1);
namespace Toby\Domain\Listeners;
use Toby\Domain\Events\VacationRequestCanceled;
use Toby\Infrastructure\Jobs\ClearVacationRequestDaysInGoogleCalendar;
class HandleCanceledVacationRequest
{
public function handle(VacationRequestCanceled $event): void
{
ClearVacationRequestDaysInGoogleCalendar::dispatch($event->vacationRequest);
}
}

View File

@ -10,6 +10,7 @@ use Toby\Domain\Enums\VacationRequestState;
use Toby\Domain\Events\VacationRequestAcceptedByAdministrative; use Toby\Domain\Events\VacationRequestAcceptedByAdministrative;
use Toby\Domain\Events\VacationRequestAcceptedByTechnical; use Toby\Domain\Events\VacationRequestAcceptedByTechnical;
use Toby\Domain\Events\VacationRequestApproved; use Toby\Domain\Events\VacationRequestApproved;
use Toby\Domain\Events\VacationRequestCanceled;
use Toby\Domain\Events\VacationRequestCreated; use Toby\Domain\Events\VacationRequestCreated;
use Toby\Eloquent\Models\VacationRequest; use Toby\Eloquent\Models\VacationRequest;
@ -43,6 +44,8 @@ class VacationRequestStateManager
public function cancel(VacationRequest $vacationRequest): void public function cancel(VacationRequest $vacationRequest): void
{ {
$this->changeState($vacationRequest, VacationRequestState::Canceled); $this->changeState($vacationRequest, VacationRequestState::Canceled);
$this->dispatcher->dispatch(new VacationRequestCanceled($vacationRequest));
} }
public function acceptAsTechnical(VacationRequest $vacationRequest): void public function acceptAsTechnical(VacationRequest $vacationRequest): void

View File

@ -0,0 +1,39 @@
<?php
declare(strict_types=1);
namespace Toby\Infrastructure\Jobs;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Spatie\GoogleCalendar\Event;
use Toby\Eloquent\Models\Vacation;
use Toby\Eloquent\Models\VacationRequest;
class ClearVacationRequestDaysInGoogleCalendar implements ShouldQueue
{
use Dispatchable;
use Queueable;
public function __construct(
protected VacationRequest $vacationRequest,
) {
}
public function handle(): void
{
$vacations = $this->vacationRequest->vacations()
->whereNotNull("event_id")
->get();
/** @var Vacation $vacation */
foreach ($vacations as $vacation) {
Event::find($vacation->event_id)->delete();
$vacation->update([
"event_id" => null,
]);
}
}
}

View File

@ -62,7 +62,9 @@
as="template" as="template"
:value="type" :value="type"
> >
<li :class="[active ? 'text-white bg-blumilk-600' : 'text-gray-900', 'cursor-default select-none relative py-2 pl-3 pr-9']"> <li
:class="[active ? 'text-white bg-blumilk-600' : 'text-gray-900', 'cursor-default select-none relative py-2 pl-3 pr-9']"
>
<span :class="[selected ? 'font-semibold' : 'font-normal', 'block truncate']"> <span :class="[selected ? 'font-semibold' : 'font-normal', 'block truncate']">
{{ type.label }} {{ type.label }}
</span> </span>
@ -137,7 +139,9 @@
</div> </div>
<div class="sm:grid sm:grid-cols-3 py-4 items-center"> <div class="sm:grid sm:grid-cols-3 py-4 items-center">
<span class="block text-sm font-medium text-gray-700 sm:mt-px">Liczba dni urlopu</span> <span class="block text-sm font-medium text-gray-700 sm:mt-px">Liczba dni urlopu</span>
<div class="mt-1 sm:mt-0 sm:col-span-2 w-full max-w-lg bg-gray-50 border border-gray-300 rounded-md px-4 py-2 inline-flex items-center text-gray-500 sm:text-sm"> <div
class="mt-1 sm:mt-0 sm:col-span-2 w-full max-w-lg bg-gray-50 border border-gray-300 rounded-md px-4 py-2 inline-flex items-center text-gray-500 sm:text-sm"
>
{{ estimatedDays.length }} {{ estimatedDays.length }}
</div> </div>
</div> </div>
@ -179,11 +183,11 @@
</template> </template>
<script> <script>
import {useForm} from '@inertiajs/inertia-vue3' import {useForm, usePage} from '@inertiajs/inertia-vue3'
import FlatPickr from 'vue-flatpickr-component' import FlatPickr from 'vue-flatpickr-component'
import {Listbox, ListboxButton, ListboxLabel, ListboxOption, ListboxOptions} from '@headlessui/vue' import {Listbox, ListboxButton, ListboxLabel, ListboxOption, ListboxOptions} from '@headlessui/vue'
import {CheckIcon, SelectorIcon, XCircleIcon} from '@heroicons/vue/solid' import {CheckIcon, SelectorIcon, XCircleIcon} from '@heroicons/vue/solid'
import {reactive, ref} from 'vue' import {reactive, ref, computed} from 'vue'
import axios from 'axios' import axios from 'axios'
export default { export default {
@ -218,18 +222,23 @@ export default {
}) })
const estimatedDays = ref([]) const estimatedDays = ref([])
const minDate = computed(() => new Date(usePage().props.value.years.current, 0, 1))
const maxDate = computed(() => new Date(usePage().props.value.years.current, 11, 31))
const disableDates = [ const disableDates = [
date => (date.getDay() === 0 || date.getDay() === 6), date => (date.getDay() === 0 || date.getDay() === 6),
] ]
const fromInputConfig = reactive({ const fromInputConfig = reactive({
maxDate: null, minDate: minDate,
maxDate: maxDate,
disable: disableDates, disable: disableDates,
}) })
const toInputConfig = reactive({ const toInputConfig = reactive({
minDate: null, minDate: minDate,
maxDate: maxDate,
disable: disableDates, disable: disableDates,
}) })
@ -250,13 +259,11 @@ export default {
.post('/vacation-requests') .post('/vacation-requests')
}, },
onFromChange(selectedDates, dateStr) { onFromChange(selectedDates, dateStr) {
this.toInputConfig.minDate = dateStr this.form.to = dateStr
this.refreshEstimatedDays(this.form.from, this.form.to) this.refreshEstimatedDays(this.form.from, this.form.to)
}, },
onToChange(selectedDates, dateStr) { onToChange() {
this.fromInputConfig.maxDate = dateStr
this.refreshEstimatedDays(this.form.from, this.form.to) this.refreshEstimatedDays(this.form.from, this.form.to)
}, },
refreshEstimatedDays(from, to) { refreshEstimatedDays(from, to) {