* #38 - wip * #38 - wip * #38 - fix * #38 - fix * #38 - fix * #38 - fix * Update resources/lang/pl.json Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl> * #38 - cr fix Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl> Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>
This commit is contained in:
parent
39b464388c
commit
17cdee38e0
@ -20,6 +20,12 @@ class HandleCreatedVacationRequest
|
|||||||
{
|
{
|
||||||
$vacationRequest = $event->vacationRequest;
|
$vacationRequest = $event->vacationRequest;
|
||||||
|
|
||||||
|
if ($vacationRequest->hasFlowSkipped()) {
|
||||||
|
$this->stateManager->approve($vacationRequest);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if ($this->configRetriever->needsTechnicalApproval($vacationRequest->type)) {
|
if ($this->configRetriever->needsTechnicalApproval($vacationRequest->type)) {
|
||||||
$this->stateManager->waitForTechnical($vacationRequest);
|
$this->stateManager->waitForTechnical($vacationRequest);
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@ namespace Toby\Domain\Listeners;
|
|||||||
|
|
||||||
use Toby\Domain\Events\VacationRequestCreated;
|
use Toby\Domain\Events\VacationRequestCreated;
|
||||||
use Toby\Domain\Notifications\VacationRequestCreatedNotification;
|
use Toby\Domain\Notifications\VacationRequestCreatedNotification;
|
||||||
|
use Toby\Domain\Notifications\VacationRequestCreatedOnEmployeeBehalf;
|
||||||
|
|
||||||
class SendCreatedVacationRequestNotification
|
class SendCreatedVacationRequestNotification
|
||||||
{
|
{
|
||||||
@ -15,6 +16,12 @@ class SendCreatedVacationRequestNotification
|
|||||||
|
|
||||||
public function handle(VacationRequestCreated $event): void
|
public function handle(VacationRequestCreated $event): void
|
||||||
{
|
{
|
||||||
$event->vacationRequest->user->notify(new VacationRequestCreatedNotification($event->vacationRequest));
|
$vacationRequest = $event->vacationRequest;
|
||||||
|
|
||||||
|
if ($vacationRequest->creator->is($vacationRequest->user)) {
|
||||||
|
$vacationRequest->user->notify(new VacationRequestCreatedNotification($vacationRequest));
|
||||||
|
} else {
|
||||||
|
$vacationRequest->user->notify(new VacationRequestCreatedOnEmployeeBehalf($vacationRequest));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,74 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Toby\Domain\Notifications;
|
||||||
|
|
||||||
|
use Illuminate\Bus\Queueable;
|
||||||
|
use Illuminate\Notifications\Messages\MailMessage;
|
||||||
|
use Illuminate\Notifications\Notification;
|
||||||
|
use InvalidArgumentException;
|
||||||
|
use Toby\Eloquent\Models\VacationRequest;
|
||||||
|
|
||||||
|
class VacationRequestCreatedOnEmployeeBehalf extends Notification
|
||||||
|
{
|
||||||
|
use Queueable;
|
||||||
|
|
||||||
|
public function __construct(
|
||||||
|
protected VacationRequest $vacationRequest,
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
|
||||||
|
public function via(): array
|
||||||
|
{
|
||||||
|
return ["mail"];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @throws InvalidArgumentException
|
||||||
|
*/
|
||||||
|
public function toMail(): MailMessage
|
||||||
|
{
|
||||||
|
$url = route(
|
||||||
|
"vacation.requests.show",
|
||||||
|
[
|
||||||
|
"vacationRequest" => $this->vacationRequest,
|
||||||
|
],
|
||||||
|
);
|
||||||
|
return $this->buildMailMessage($url);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function buildMailMessage(string $url): MailMessage
|
||||||
|
{
|
||||||
|
$creator = $this->vacationRequest->creator->fullName;
|
||||||
|
$user = $this->vacationRequest->user->first_name;
|
||||||
|
$title = $this->vacationRequest->name;
|
||||||
|
$type = $this->vacationRequest->type->label();
|
||||||
|
$from = $this->vacationRequest->from->toDisplayDate();
|
||||||
|
$to = $this->vacationRequest->to->toDisplayDate();
|
||||||
|
$days = $this->vacationRequest->vacations()->count();
|
||||||
|
$appName = config("app.name");
|
||||||
|
|
||||||
|
return (new MailMessage())
|
||||||
|
->greeting(__("Hi :user!", [
|
||||||
|
"user" => $user,
|
||||||
|
]))
|
||||||
|
->subject(__("Vacation request :title has been created on your behalf", [
|
||||||
|
"title" => $title,
|
||||||
|
]))
|
||||||
|
->line(__("The vacation request :title has been created correctly by user :creator on your behalf in the :appName.", [
|
||||||
|
"title" => $title,
|
||||||
|
"appName" => $appName,
|
||||||
|
"creator" => $creator,
|
||||||
|
]))
|
||||||
|
->line(__("Vacation type: :type", [
|
||||||
|
"type" => $type,
|
||||||
|
]))
|
||||||
|
->line(__("From :from to :to (number of days: :days)", [
|
||||||
|
"from" => $from,
|
||||||
|
"to" => $to,
|
||||||
|
"days" => $days,
|
||||||
|
]))
|
||||||
|
->action(__("Click here for details"), $url);
|
||||||
|
}
|
||||||
|
}
|
@ -58,6 +58,11 @@ class User extends Authenticatable
|
|||||||
return $this->hasMany(VacationRequest::class);
|
return $this->hasMany(VacationRequest::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function createdVacationRequests(): HasMany
|
||||||
|
{
|
||||||
|
return $this->hasMany(VacationRequest::class, "creator_id");
|
||||||
|
}
|
||||||
|
|
||||||
public function vacations(): HasMany
|
public function vacations(): HasMany
|
||||||
{
|
{
|
||||||
return $this->hasMany(Vacation::class);
|
return $this->hasMany(Vacation::class);
|
||||||
|
@ -22,7 +22,9 @@ use Toby\Domain\Enums\VacationType;
|
|||||||
* @property Carbon $from
|
* @property Carbon $from
|
||||||
* @property Carbon $to
|
* @property Carbon $to
|
||||||
* @property string $comment
|
* @property string $comment
|
||||||
|
* @property bool $flow_skipped
|
||||||
* @property User $user
|
* @property User $user
|
||||||
|
* @property User $creator
|
||||||
* @property YearPeriod $yearPeriod
|
* @property YearPeriod $yearPeriod
|
||||||
* @property Collection $activities
|
* @property Collection $activities
|
||||||
* @property Collection $vacations
|
* @property Collection $vacations
|
||||||
@ -47,6 +49,11 @@ class VacationRequest extends Model
|
|||||||
return $this->belongsTo(User::class);
|
return $this->belongsTo(User::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function creator(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(User::class, "creator_id");
|
||||||
|
}
|
||||||
|
|
||||||
public function yearPeriod(): BelongsTo
|
public function yearPeriod(): BelongsTo
|
||||||
{
|
{
|
||||||
return $this->belongsTo(YearPeriod::class);
|
return $this->belongsTo(YearPeriod::class);
|
||||||
@ -69,6 +76,11 @@ class VacationRequest extends Model
|
|||||||
$this->save();
|
$this->save();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function hasFlowSkipped(): bool
|
||||||
|
{
|
||||||
|
return $this->flow_skipped;
|
||||||
|
}
|
||||||
|
|
||||||
public function scopeStates(Builder $query, array $states): Builder
|
public function scopeStates(Builder $query, array $states): Builder
|
||||||
{
|
{
|
||||||
return $query->whereIn("state", $states);
|
return $query->whereIn("state", $states);
|
||||||
|
@ -15,8 +15,10 @@ use Toby\Domain\VacationDaysCalculator;
|
|||||||
use Toby\Domain\VacationRequestStateManager;
|
use Toby\Domain\VacationRequestStateManager;
|
||||||
use Toby\Domain\Validation\VacationRequestValidator;
|
use Toby\Domain\Validation\VacationRequestValidator;
|
||||||
use Toby\Eloquent\Helpers\YearPeriodRetriever;
|
use Toby\Eloquent\Helpers\YearPeriodRetriever;
|
||||||
|
use Toby\Eloquent\Models\User;
|
||||||
use Toby\Eloquent\Models\VacationRequest;
|
use Toby\Eloquent\Models\VacationRequest;
|
||||||
use Toby\Infrastructure\Http\Requests\VacationRequestRequest;
|
use Toby\Infrastructure\Http\Requests\VacationRequestRequest;
|
||||||
|
use Toby\Infrastructure\Http\Resources\UserResource;
|
||||||
use Toby\Infrastructure\Http\Resources\VacationRequestActivityResource;
|
use Toby\Infrastructure\Http\Resources\VacationRequestActivityResource;
|
||||||
use Toby\Infrastructure\Http\Resources\VacationRequestResource;
|
use Toby\Infrastructure\Http\Resources\VacationRequestResource;
|
||||||
|
|
||||||
@ -61,8 +63,14 @@ class VacationRequestController extends Controller
|
|||||||
|
|
||||||
public function create(): Response
|
public function create(): Response
|
||||||
{
|
{
|
||||||
|
$users = User::query()
|
||||||
|
->orderBy("last_name")
|
||||||
|
->orderBy("first_name")
|
||||||
|
->get();
|
||||||
|
|
||||||
return inertia("VacationRequest/Create", [
|
return inertia("VacationRequest/Create", [
|
||||||
"vacationTypes" => VacationType::casesToSelect(),
|
"vacationTypes" => VacationType::casesToSelect(),
|
||||||
|
"users" => UserResource::collection($users),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -73,7 +81,7 @@ class VacationRequestController extends Controller
|
|||||||
VacationDaysCalculator $vacationDaysCalculator,
|
VacationDaysCalculator $vacationDaysCalculator,
|
||||||
): RedirectResponse {
|
): RedirectResponse {
|
||||||
/** @var VacationRequest $vacationRequest */
|
/** @var VacationRequest $vacationRequest */
|
||||||
$vacationRequest = $request->user()->vacationRequests()->make($request->data());
|
$vacationRequest = $request->user()->createdVacationRequests()->make($request->data());
|
||||||
$vacationRequestValidator->validate($vacationRequest);
|
$vacationRequestValidator->validate($vacationRequest);
|
||||||
|
|
||||||
$vacationRequest->save();
|
$vacationRequest->save();
|
||||||
|
@ -16,9 +16,11 @@ class VacationRequestRequest extends FormRequest
|
|||||||
public function rules(): array
|
public function rules(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
|
"user" => ["required", "exists:users,id"],
|
||||||
"type" => ["required", new Enum(VacationType::class)],
|
"type" => ["required", new Enum(VacationType::class)],
|
||||||
"from" => ["required", "date_format:Y-m-d", new YearPeriodExists()],
|
"from" => ["required", "date_format:Y-m-d", new YearPeriodExists()],
|
||||||
"to" => ["required", "date_format:Y-m-d", new YearPeriodExists()],
|
"to" => ["required", "date_format:Y-m-d", new YearPeriodExists()],
|
||||||
|
"flowSkipped" => ["nullable", "boolean"],
|
||||||
"comment" => ["nullable"],
|
"comment" => ["nullable"],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@ -28,11 +30,13 @@ class VacationRequestRequest extends FormRequest
|
|||||||
$from = $this->get("from");
|
$from = $this->get("from");
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
"user_id" => $this->get("user"),
|
||||||
"type" => $this->get("type"),
|
"type" => $this->get("type"),
|
||||||
"from" => $from,
|
"from" => $from,
|
||||||
"to" => $this->get("to"),
|
"to" => $this->get("to"),
|
||||||
"year_period_id" => YearPeriod::findByYear(Carbon::create($from)->year)->id,
|
"year_period_id" => YearPeriod::findByYear(Carbon::create($from)->year)->id,
|
||||||
"comment" => $this->get("comment"),
|
"comment" => $this->get("comment"),
|
||||||
|
"flow_skipped" => $this->boolean("flowSkipped"),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,8 +24,9 @@ class VacationRequestFactory extends Factory
|
|||||||
|
|
||||||
return [
|
return [
|
||||||
"user_id" => User::factory(),
|
"user_id" => User::factory(),
|
||||||
|
"creator_id" => fn(array $attributes): int => $attributes["user_id"],
|
||||||
"year_period_id" => YearPeriod::factory(),
|
"year_period_id" => YearPeriod::factory(),
|
||||||
"name" => fn(array $attributes) => $this->generateName($attributes),
|
"name" => fn(array $attributes): string => $this->generateName($attributes),
|
||||||
"type" => $this->faker->randomElement(VacationType::cases()),
|
"type" => $this->faker->randomElement(VacationType::cases()),
|
||||||
"state" => $this->faker->randomElement(VacationRequestState::cases()),
|
"state" => $this->faker->randomElement(VacationRequestState::cases()),
|
||||||
"from" => $from,
|
"from" => $from,
|
||||||
|
@ -14,6 +14,7 @@ return new class() extends Migration {
|
|||||||
Schema::create("vacation_requests", function (Blueprint $table): void {
|
Schema::create("vacation_requests", function (Blueprint $table): void {
|
||||||
$table->id();
|
$table->id();
|
||||||
$table->string("name");
|
$table->string("name");
|
||||||
|
$table->foreignIdFor(User::class, "creator_id")->constrained("users")->cascadeOnDelete();
|
||||||
$table->foreignIdFor(User::class)->constrained()->cascadeOnDelete();
|
$table->foreignIdFor(User::class)->constrained()->cascadeOnDelete();
|
||||||
$table->foreignIdFor(YearPeriod::class)->constrained()->cascadeOnDelete();
|
$table->foreignIdFor(YearPeriod::class)->constrained()->cascadeOnDelete();
|
||||||
$table->string("type");
|
$table->string("type");
|
||||||
@ -21,6 +22,7 @@ return new class() extends Migration {
|
|||||||
$table->date("from");
|
$table->date("from");
|
||||||
$table->date("to");
|
$table->date("to");
|
||||||
$table->text("comment")->nullable();
|
$table->text("comment")->nullable();
|
||||||
|
$table->boolean("flow_skipped")->default(false);
|
||||||
$table->timestamps();
|
$table->timestamps();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -77,6 +77,7 @@ class DatabaseSeeder extends Seeder
|
|||||||
VacationRequest::factory()
|
VacationRequest::factory()
|
||||||
->count(10)
|
->count(10)
|
||||||
->for($user)
|
->for($user)
|
||||||
|
->for($user, "creator")
|
||||||
->sequence(fn() => [
|
->sequence(fn() => [
|
||||||
"year_period_id" => $yearPeriods->random()->id,
|
"year_period_id" => $yearPeriods->random()->id,
|
||||||
])
|
])
|
||||||
|
12
resources/js/Composables/yearPeriodInfo.js
Normal file
12
resources/js/Composables/yearPeriodInfo.js
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
import {computed} from 'vue'
|
||||||
|
import {usePage} from '@inertiajs/inertia-vue3'
|
||||||
|
|
||||||
|
export default function useCurrentYearPeriodInfo() {
|
||||||
|
const minDate = computed(() => new Date(usePage().props.value.years.current, 0, 1))
|
||||||
|
const maxDate = computed(() => new Date(usePage().props.value.years.current, 11, 31))
|
||||||
|
|
||||||
|
return {
|
||||||
|
minDate,
|
||||||
|
maxDate,
|
||||||
|
}
|
||||||
|
}
|
@ -48,6 +48,7 @@
|
|||||||
id="date"
|
id="date"
|
||||||
v-model="form.date"
|
v-model="form.date"
|
||||||
placeholder="Wybierz datę"
|
placeholder="Wybierz datę"
|
||||||
|
:config="{minDate, maxDate}"
|
||||||
class="block w-full max-w-lg shadow-sm rounded-md sm:text-sm"
|
class="block w-full max-w-lg shadow-sm rounded-md sm:text-sm"
|
||||||
:class="{ 'border-red-300 text-red-900 focus:outline-none focus:ring-red-500 focus:border-red-500': form.errors.date, 'focus:ring-blumilk-500 focus:border-blumilk-500 sm:text-sm border-gray-300': !form.errors.date }"
|
:class="{ 'border-red-300 text-red-900 focus:outline-none focus:ring-red-500 focus:border-red-500': form.errors.date, 'focus:ring-blumilk-500 focus:border-blumilk-500 sm:text-sm border-gray-300': !form.errors.date }"
|
||||||
/>
|
/>
|
||||||
@ -81,8 +82,9 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { useForm } from '@inertiajs/inertia-vue3'
|
import {useForm} from '@inertiajs/inertia-vue3'
|
||||||
import FlatPickr from 'vue-flatpickr-component'
|
import FlatPickr from 'vue-flatpickr-component'
|
||||||
|
import useCurrentYearPeriodInfo from '@/Composables/yearPeriodInfo'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'HolidayCreate',
|
name: 'HolidayCreate',
|
||||||
@ -95,7 +97,13 @@ export default {
|
|||||||
date: null,
|
date: null,
|
||||||
})
|
})
|
||||||
|
|
||||||
return { form }
|
const {minDate, maxDate} = useCurrentYearPeriodInfo()
|
||||||
|
|
||||||
|
return {
|
||||||
|
form,
|
||||||
|
minDate,
|
||||||
|
maxDate,
|
||||||
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
createHoliday() {
|
createHoliday() {
|
||||||
|
@ -28,6 +28,76 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<Listbox
|
||||||
|
v-model="form.user"
|
||||||
|
as="div"
|
||||||
|
class="sm:grid sm:grid-cols-3 py-4 items-center"
|
||||||
|
>
|
||||||
|
<ListboxLabel class="block text-sm font-medium text-gray-700">
|
||||||
|
Osoba składająca wniosek
|
||||||
|
</ListboxLabel>
|
||||||
|
<div class="mt-1 relative sm:mt-0 sm:col-span-2">
|
||||||
|
<ListboxButton
|
||||||
|
class="bg-white relative w-full max-w-lg border rounded-md shadow-sm pl-3 pr-10 py-2 text-left cursor-default sm:text-sm focus:ring-1"
|
||||||
|
:class="{ 'border-red-300 text-red-900 focus:outline-none focus:ring-red-500 focus:border-red-500': form.errors.type, 'focus:ring-blumilk-500 focus:border-blumilk-500 sm:text-sm border-gray-300': !form.errors.type }"
|
||||||
|
>
|
||||||
|
<span class="flex items-center">
|
||||||
|
<img
|
||||||
|
:src="form.user.avatar"
|
||||||
|
class="flex-shrink-0 h-6 w-6 rounded-full"
|
||||||
|
>
|
||||||
|
<span class="ml-3 block truncate">{{ form.user.name }}</span>
|
||||||
|
</span>
|
||||||
|
<span class="absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">
|
||||||
|
<SelectorIcon class="h-5 w-5 text-gray-400" />
|
||||||
|
</span>
|
||||||
|
</ListboxButton>
|
||||||
|
|
||||||
|
<transition
|
||||||
|
leave-active-class="transition ease-in duration-100"
|
||||||
|
leave-from-class="opacity-100"
|
||||||
|
leave-to-class="opacity-0"
|
||||||
|
>
|
||||||
|
<ListboxOptions
|
||||||
|
class="absolute z-10 mt-1 w-full max-w-lg bg-white shadow-lg max-h-60 rounded-md py-1 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm"
|
||||||
|
>
|
||||||
|
<ListboxOption
|
||||||
|
v-for="user in users.data"
|
||||||
|
:key="user.id"
|
||||||
|
v-slot="{ active, selected }"
|
||||||
|
as="template"
|
||||||
|
:value="user"
|
||||||
|
>
|
||||||
|
<li :class="[active ? 'text-white bg-blumilk-600' : 'text-gray-900', 'cursor-default select-none relative py-2 pl-3 pr-9']">
|
||||||
|
<div class="flex items-center">
|
||||||
|
<img
|
||||||
|
:src="user.avatar"
|
||||||
|
alt=""
|
||||||
|
class="flex-shrink-0 h-6 w-6 rounded-full"
|
||||||
|
>
|
||||||
|
<span :class="[selected ? 'font-semibold' : 'font-normal', 'ml-3 block truncate']">
|
||||||
|
{{ user.name }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<span
|
||||||
|
v-if="selected"
|
||||||
|
:class="[active ? 'text-white' : 'text-blumilk-600', 'absolute inset-y-0 right-0 flex items-center pr-4']"
|
||||||
|
>
|
||||||
|
<CheckIcon class="h-5 w-5" />
|
||||||
|
</span>
|
||||||
|
</li>
|
||||||
|
</ListboxOption>
|
||||||
|
</ListboxOptions>
|
||||||
|
</transition>
|
||||||
|
<p
|
||||||
|
v-if="form.errors.type"
|
||||||
|
class="mt-2 text-sm text-red-600"
|
||||||
|
>
|
||||||
|
{{ form.errors.type }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</Listbox>
|
||||||
<Listbox
|
<Listbox
|
||||||
v-model="form.type"
|
v-model="form.type"
|
||||||
as="div"
|
as="div"
|
||||||
@ -161,6 +231,25 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="sm:grid sm:grid-cols-3 py-4 items-center">
|
||||||
|
<label
|
||||||
|
for="flowSkipped"
|
||||||
|
class="block text-sm font-medium text-gray-700"
|
||||||
|
>
|
||||||
|
Natychmiastowo zatwierdź wniosek
|
||||||
|
</label>
|
||||||
|
<div class="mt-1 sm:mt-0 sm:col-span-2">
|
||||||
|
<Switch
|
||||||
|
id="flowSkipped"
|
||||||
|
v-model="form.flowSkipped"
|
||||||
|
:class="[form.flowSkipped ? 'bg-blumilk-500' : 'bg-gray-200', 'relative inline-flex flex-shrink-0 h-6 w-11 border-2 border-transparent rounded-full cursor-pointer transition-colors ease-in-out duration-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blumilk-500']"
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
:class="[form.flowSkipped ? 'translate-x-5' : 'translate-x-0', 'pointer-events-none inline-block h-5 w-5 rounded-full bg-white shadow transform ring-0 transition ease-in-out duration-200']"
|
||||||
|
/>
|
||||||
|
</Switch>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="flex justify-end py-3">
|
<div class="flex justify-end py-3">
|
||||||
<div class="space-x-3">
|
<div class="space-x-3">
|
||||||
<InertiaLink
|
<InertiaLink
|
||||||
@ -183,16 +272,18 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import {useForm, usePage} from '@inertiajs/inertia-vue3'
|
import {useForm} 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, Switch} from '@headlessui/vue'
|
||||||
import {CheckIcon, SelectorIcon, XCircleIcon} from '@heroicons/vue/solid'
|
import {CheckIcon, SelectorIcon, XCircleIcon} from '@heroicons/vue/solid'
|
||||||
import {reactive, ref, computed} from 'vue'
|
import {reactive, ref} from 'vue'
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
|
import useCurrentYearPeriodInfo from '@/Composables/yearPeriodInfo'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'VacationRequestCreate',
|
name: 'VacationRequestCreate',
|
||||||
components: {
|
components: {
|
||||||
|
Switch,
|
||||||
FlatPickr,
|
FlatPickr,
|
||||||
Listbox,
|
Listbox,
|
||||||
ListboxButton,
|
ListboxButton,
|
||||||
@ -204,6 +295,14 @@ export default {
|
|||||||
XCircleIcon,
|
XCircleIcon,
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
|
auth: {
|
||||||
|
type: Object,
|
||||||
|
default: () => null,
|
||||||
|
},
|
||||||
|
users: {
|
||||||
|
type: Object,
|
||||||
|
default: () => null,
|
||||||
|
},
|
||||||
vacationTypes: {
|
vacationTypes: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => null,
|
default: () => null,
|
||||||
@ -215,15 +314,16 @@ export default {
|
|||||||
},
|
},
|
||||||
setup(props) {
|
setup(props) {
|
||||||
const form = useForm({
|
const form = useForm({
|
||||||
|
user: props.users.data.find(user => user.id === props.auth.user.id),
|
||||||
from: null,
|
from: null,
|
||||||
to: null,
|
to: null,
|
||||||
type: props.vacationTypes[0],
|
type: props.vacationTypes[0],
|
||||||
comment: null,
|
comment: null,
|
||||||
|
flowSkipped: false,
|
||||||
})
|
})
|
||||||
|
|
||||||
const estimatedDays = ref([])
|
const estimatedDays = ref([])
|
||||||
const minDate = computed(() => new Date(usePage().props.value.years.current, 0, 1))
|
const {minDate, maxDate} = useCurrentYearPeriodInfo()
|
||||||
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),
|
||||||
@ -254,6 +354,7 @@ export default {
|
|||||||
.transform(data => ({
|
.transform(data => ({
|
||||||
...data,
|
...data,
|
||||||
type: data.type.value,
|
type: data.type.value,
|
||||||
|
user: data.user.id,
|
||||||
}))
|
}))
|
||||||
.post('/vacation-requests')
|
.post('/vacation-requests')
|
||||||
},
|
},
|
||||||
|
@ -48,9 +48,9 @@
|
|||||||
"Sum:": "Suma:",
|
"Sum:": "Suma:",
|
||||||
"Date": "Data",
|
"Date": "Data",
|
||||||
"Day of week": "Dzień tygodnia",
|
"Day of week": "Dzień tygodnia",
|
||||||
"Start date": "Data rozpoczecia",
|
"Start date": "Data rozpoczęcia",
|
||||||
"End date": "Data zakończenia",
|
"End date": "Data zakończenia",
|
||||||
"Worked hours": "Ilość godzin",
|
"Worked hours": "Liczba godzin",
|
||||||
"Hi :user!": "Cześć :user!",
|
"Hi :user!": "Cześć :user!",
|
||||||
"The vacation request :title has changed state to :state.": "Wniosek urlopowy :title zmienił status na :state.",
|
"The vacation request :title has changed state to :state.": "Wniosek urlopowy :title zmienił status na :state.",
|
||||||
"Vacation request :title": "Wniosek urlopowy :title",
|
"Vacation request :title": "Wniosek urlopowy :title",
|
||||||
@ -68,7 +68,9 @@
|
|||||||
"Vacation request :title has been approved": "Wniosek urlopowy :title został zatwierdzony",
|
"Vacation request :title has been approved": "Wniosek urlopowy :title został zatwierdzony",
|
||||||
"The vacation request :title for user :requester has been approved.": "Wniosek urlopowy :title od użytkownika :requester został zatwierdzony.",
|
"The vacation request :title for user :requester has been approved.": "Wniosek urlopowy :title od użytkownika :requester został zatwierdzony.",
|
||||||
"Vacation request :title has been cancelled": "Wniosek urlopowy :title został anulowany",
|
"Vacation request :title has been cancelled": "Wniosek urlopowy :title został anulowany",
|
||||||
"The vacation request :title for user :requester has been cancelled.": "Wniosek urlopowy :title od użytkownika :requester został anulowany.",
|
"The vacation request :title for user :requester has been cancelled.": "Wniosek urlopowy :title od użytkownika :requester został anulowany.",
|
||||||
"Vacation request :title has been rejected": "Wniosek urlopowy :title został odrzucony",
|
"Vacation request :title has been rejected": "Wniosek urlopowy :title został odrzucony",
|
||||||
"The vacation request :title for user :requester has been rejected.": "Wniosek urlopowy :title od użytkownika :requester został odrzucony."
|
"The vacation request :title for user :requester has been rejected.": "Wniosek urlopowy :title od użytkownika :requester został odrzucony.",
|
||||||
|
"Vacation request :title has been created on your behalf": "Wniosek urlopowy :title został utworzony w Twoim imieniu",
|
||||||
|
"The vacation request :title has been created correctly by user :creator on your behalf in the :appName.": "W systemie :appName został poprawnie utworzony wniosek urlopowy :title w Twoim imieniu przez użytkownika :creator."
|
||||||
}
|
}
|
||||||
|
@ -13,6 +13,7 @@ use Toby\Domain\Enums\VacationRequestState;
|
|||||||
use Toby\Domain\Enums\VacationType;
|
use Toby\Domain\Enums\VacationType;
|
||||||
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\VacationRequestRejected;
|
use Toby\Domain\Events\VacationRequestRejected;
|
||||||
use Toby\Domain\PolishHolidaysRetriever;
|
use Toby\Domain\PolishHolidaysRetriever;
|
||||||
use Toby\Eloquent\Models\User;
|
use Toby\Eloquent\Models\User;
|
||||||
@ -69,6 +70,7 @@ class VacationRequestTest extends FeatureTestCase
|
|||||||
|
|
||||||
$this->actingAs($user)
|
$this->actingAs($user)
|
||||||
->post("/vacation-requests", [
|
->post("/vacation-requests", [
|
||||||
|
"user" => $user->id,
|
||||||
"type" => VacationType::Vacation->value,
|
"type" => VacationType::Vacation->value,
|
||||||
"from" => Carbon::create($currentYearPeriod->year, 2, 7)->toDateString(),
|
"from" => Carbon::create($currentYearPeriod->year, 2, 7)->toDateString(),
|
||||||
"to" => Carbon::create($currentYearPeriod->year, 2, 11)->toDateString(),
|
"to" => Carbon::create($currentYearPeriod->year, 2, 11)->toDateString(),
|
||||||
@ -88,6 +90,83 @@ class VacationRequestTest extends FeatureTestCase
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testUserCanCreateVacationRequestOnEmployeeBehalf(): void
|
||||||
|
{
|
||||||
|
$creator = User::factory()->createQuietly();
|
||||||
|
$user = User::factory()->createQuietly();
|
||||||
|
|
||||||
|
$currentYearPeriod = YearPeriod::current();
|
||||||
|
|
||||||
|
VacationLimit::factory([
|
||||||
|
"days" => 20,
|
||||||
|
])
|
||||||
|
->for($user)
|
||||||
|
->for($currentYearPeriod)
|
||||||
|
->create();
|
||||||
|
|
||||||
|
$this->actingAs($creator)
|
||||||
|
->post("/vacation-requests", [
|
||||||
|
"user" => $user->id,
|
||||||
|
"type" => VacationType::Vacation->value,
|
||||||
|
"from" => Carbon::create($currentYearPeriod->year, 2, 7)->toDateString(),
|
||||||
|
"to" => Carbon::create($currentYearPeriod->year, 2, 11)->toDateString(),
|
||||||
|
"comment" => "Comment for the vacation request.",
|
||||||
|
])
|
||||||
|
->assertSessionHasNoErrors();
|
||||||
|
|
||||||
|
$this->assertDatabaseHas("vacation_requests", [
|
||||||
|
"user_id" => $user->id,
|
||||||
|
"creator_id" => $creator->id,
|
||||||
|
"year_period_id" => $currentYearPeriod->id,
|
||||||
|
"name" => "1/" . $currentYearPeriod->year,
|
||||||
|
"type" => VacationType::Vacation->value,
|
||||||
|
"state" => VacationRequestState::WaitingForTechnical,
|
||||||
|
"from" => Carbon::create($currentYearPeriod->year, 2, 7)->toDateString(),
|
||||||
|
"to" => Carbon::create($currentYearPeriod->year, 2, 11)->toDateString(),
|
||||||
|
"comment" => "Comment for the vacation request.",
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testUserCanCreateVacationRequestOnEmployeeBehalfAndSkipAcceptanceFlow(): void
|
||||||
|
{
|
||||||
|
Event::fake(VacationRequestApproved::class);
|
||||||
|
|
||||||
|
$creator = User::factory()->createQuietly();
|
||||||
|
$user = User::factory()->createQuietly();
|
||||||
|
|
||||||
|
$currentYearPeriod = YearPeriod::current();
|
||||||
|
|
||||||
|
VacationLimit::factory([
|
||||||
|
"days" => 20,
|
||||||
|
])
|
||||||
|
->for($user)
|
||||||
|
->for($currentYearPeriod)
|
||||||
|
->create();
|
||||||
|
|
||||||
|
$this->actingAs($creator)
|
||||||
|
->post("/vacation-requests", [
|
||||||
|
"user" => $user->id,
|
||||||
|
"type" => VacationType::Vacation->value,
|
||||||
|
"from" => Carbon::create($currentYearPeriod->year, 2, 7)->toDateString(),
|
||||||
|
"to" => Carbon::create($currentYearPeriod->year, 2, 11)->toDateString(),
|
||||||
|
"comment" => "Comment for the vacation request.",
|
||||||
|
"flowSkipped" => true,
|
||||||
|
])
|
||||||
|
->assertSessionHasNoErrors();
|
||||||
|
|
||||||
|
$this->assertDatabaseHas("vacation_requests", [
|
||||||
|
"user_id" => $user->id,
|
||||||
|
"creator_id" => $creator->id,
|
||||||
|
"year_period_id" => $currentYearPeriod->id,
|
||||||
|
"name" => "1/" . $currentYearPeriod->year,
|
||||||
|
"type" => VacationType::Vacation->value,
|
||||||
|
"state" => VacationRequestState::Approved,
|
||||||
|
"from" => Carbon::create($currentYearPeriod->year, 2, 7)->toDateString(),
|
||||||
|
"to" => Carbon::create($currentYearPeriod->year, 2, 11)->toDateString(),
|
||||||
|
"comment" => "Comment for the vacation request.",
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
public function testTechnicalApproverCanApproveVacationRequest(): void
|
public function testTechnicalApproverCanApproveVacationRequest(): void
|
||||||
{
|
{
|
||||||
Event::fake(VacationRequestAcceptedByTechnical::class);
|
Event::fake(VacationRequestAcceptedByTechnical::class);
|
||||||
@ -178,6 +257,7 @@ class VacationRequestTest extends FeatureTestCase
|
|||||||
|
|
||||||
$this->actingAs($user)
|
$this->actingAs($user)
|
||||||
->post("/vacation-requests", [
|
->post("/vacation-requests", [
|
||||||
|
"user" => $user->id,
|
||||||
"type" => VacationType::Vacation->value,
|
"type" => VacationType::Vacation->value,
|
||||||
"from" => Carbon::create($currentYearPeriod->year, 2, 7)->toDateString(),
|
"from" => Carbon::create($currentYearPeriod->year, 2, 7)->toDateString(),
|
||||||
"to" => Carbon::create($currentYearPeriod->year, 2, 11)->toDateString(),
|
"to" => Carbon::create($currentYearPeriod->year, 2, 11)->toDateString(),
|
||||||
@ -202,6 +282,7 @@ class VacationRequestTest extends FeatureTestCase
|
|||||||
|
|
||||||
$this->actingAs($user)
|
$this->actingAs($user)
|
||||||
->post("/vacation-requests", [
|
->post("/vacation-requests", [
|
||||||
|
"user" => $user->id,
|
||||||
"type" => VacationType::Vacation->value,
|
"type" => VacationType::Vacation->value,
|
||||||
"from" => Carbon::create($currentYearPeriod->year, 2, 5)->toDateString(),
|
"from" => Carbon::create($currentYearPeriod->year, 2, 5)->toDateString(),
|
||||||
"to" => Carbon::create($currentYearPeriod->year, 2, 6)->toDateString(),
|
"to" => Carbon::create($currentYearPeriod->year, 2, 6)->toDateString(),
|
||||||
@ -233,6 +314,7 @@ class VacationRequestTest extends FeatureTestCase
|
|||||||
|
|
||||||
$this->actingAs($user)
|
$this->actingAs($user)
|
||||||
->post("/vacation-requests", [
|
->post("/vacation-requests", [
|
||||||
|
"user" => $user->id,
|
||||||
"type" => VacationType::Vacation->value,
|
"type" => VacationType::Vacation->value,
|
||||||
"from" => Carbon::create($currentYearPeriod->year, 4, 18)->toDateString(),
|
"from" => Carbon::create($currentYearPeriod->year, 4, 18)->toDateString(),
|
||||||
"to" => Carbon::create($currentYearPeriod->year, 4, 18)->toDateString(),
|
"to" => Carbon::create($currentYearPeriod->year, 4, 18)->toDateString(),
|
||||||
@ -268,6 +350,7 @@ class VacationRequestTest extends FeatureTestCase
|
|||||||
|
|
||||||
$this->actingAs($user)
|
$this->actingAs($user)
|
||||||
->post("/vacation-requests", [
|
->post("/vacation-requests", [
|
||||||
|
"user" => $user->id,
|
||||||
"type" => VacationType::Vacation->value,
|
"type" => VacationType::Vacation->value,
|
||||||
"from" => Carbon::create($currentYearPeriod->year, 2, 1)->toDateString(),
|
"from" => Carbon::create($currentYearPeriod->year, 2, 1)->toDateString(),
|
||||||
"to" => Carbon::create($currentYearPeriod->year, 2, 4)->toDateString(),
|
"to" => Carbon::create($currentYearPeriod->year, 2, 4)->toDateString(),
|
||||||
@ -304,6 +387,7 @@ class VacationRequestTest extends FeatureTestCase
|
|||||||
|
|
||||||
$this->actingAs($user)
|
$this->actingAs($user)
|
||||||
->post("/vacation-requests", [
|
->post("/vacation-requests", [
|
||||||
|
"user" => $user->id,
|
||||||
"type" => VacationType::Vacation->value,
|
"type" => VacationType::Vacation->value,
|
||||||
"from" => Carbon::create($currentYearPeriod->year, 2, 1)->toDateString(),
|
"from" => Carbon::create($currentYearPeriod->year, 2, 1)->toDateString(),
|
||||||
"to" => Carbon::create($currentYearPeriod->year, 2, 4)->toDateString(),
|
"to" => Carbon::create($currentYearPeriod->year, 2, 4)->toDateString(),
|
||||||
@ -320,6 +404,7 @@ class VacationRequestTest extends FeatureTestCase
|
|||||||
$currentYearPeriod = YearPeriod::current();
|
$currentYearPeriod = YearPeriod::current();
|
||||||
$this->actingAs($user)
|
$this->actingAs($user)
|
||||||
->post("/vacation-requests", [
|
->post("/vacation-requests", [
|
||||||
|
"user" => $user->id,
|
||||||
"type" => VacationType::Vacation->value,
|
"type" => VacationType::Vacation->value,
|
||||||
"from" => Carbon::create($currentYearPeriod->year, 2, 7)->toDateString(),
|
"from" => Carbon::create($currentYearPeriod->year, 2, 7)->toDateString(),
|
||||||
"to" => Carbon::create($currentYearPeriod->year, 2, 6)->toDateString(),
|
"to" => Carbon::create($currentYearPeriod->year, 2, 6)->toDateString(),
|
||||||
@ -337,6 +422,7 @@ class VacationRequestTest extends FeatureTestCase
|
|||||||
$nextYearPeriod = $this->createYearPeriod(Carbon::now()->year + 1);
|
$nextYearPeriod = $this->createYearPeriod(Carbon::now()->year + 1);
|
||||||
$this->actingAs($user)
|
$this->actingAs($user)
|
||||||
->post("/vacation-requests", [
|
->post("/vacation-requests", [
|
||||||
|
"user" => $user->id,
|
||||||
"type" => VacationType::Vacation->value,
|
"type" => VacationType::Vacation->value,
|
||||||
"from" => Carbon::create($currentYearPeriod->year, 12, 27)->toDateString(),
|
"from" => Carbon::create($currentYearPeriod->year, 12, 27)->toDateString(),
|
||||||
"to" => Carbon::create($nextYearPeriod->year, 1, 2)->toDateString(),
|
"to" => Carbon::create($nextYearPeriod->year, 1, 2)->toDateString(),
|
||||||
|
@ -6,6 +6,7 @@ namespace Tests\Unit;
|
|||||||
|
|
||||||
use Illuminate\Foundation\Testing\DatabaseMigrations;
|
use Illuminate\Foundation\Testing\DatabaseMigrations;
|
||||||
use Illuminate\Support\Carbon;
|
use Illuminate\Support\Carbon;
|
||||||
|
use Illuminate\Support\Facades\Notification;
|
||||||
use Tests\TestCase;
|
use Tests\TestCase;
|
||||||
use Tests\Traits\InteractsWithYearPeriods;
|
use Tests\Traits\InteractsWithYearPeriods;
|
||||||
use Toby\Domain\Enums\VacationRequestState;
|
use Toby\Domain\Enums\VacationRequestState;
|
||||||
@ -26,6 +27,8 @@ class VacationRequestStatesTest extends TestCase
|
|||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
|
Notification::fake();
|
||||||
|
|
||||||
$this->stateManager = $this->app->make(VacationRequestStateManager::class);
|
$this->stateManager = $this->app->make(VacationRequestStateManager::class);
|
||||||
|
|
||||||
$this->createCurrentYearPeriod();
|
$this->createCurrentYearPeriod();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user