diff --git a/app/Domain/CalendarGenerator.php b/app/Domain/CalendarGenerator.php index 96c0667..f1d72f2 100644 --- a/app/Domain/CalendarGenerator.php +++ b/app/Domain/CalendarGenerator.php @@ -73,7 +73,7 @@ class CalendarGenerator { return Vacation::query() ->whereBetween("date", [$period->start, $period->end]) - ->whereRelation("vacationRequest", "state", VacationRequestState::APPROVED->value) + ->whereRelation("vacationRequest", "state", VacationRequestState::Approved->value) ->get() ->groupBy(fn(Vacation $vacation) => $vacation->date->toDateString()); } diff --git a/app/Domain/Enums/EmploymentForm.php b/app/Domain/Enums/EmploymentForm.php index cdaa241..625b801 100644 --- a/app/Domain/Enums/EmploymentForm.php +++ b/app/Domain/Enums/EmploymentForm.php @@ -6,10 +6,10 @@ namespace Toby\Domain\Enums; enum EmploymentForm: string { - case EMPLOYMENT_CONTRACT = "employment_contract"; - case COMMISSION_CONTRACT = "commission_contract"; - case B2B_CONTRACT = "b2b_contract"; - case BOARD_MEMBER_CONTRACT = "board_member_contract"; + case EmploymentContract = "employment_contract"; + case ComissionContract = "commission_contract"; + case B2bContract = "b2b_contract"; + case BoardMemberContract = "board_member_contract"; public function label(): string { diff --git a/app/Domain/Enums/Role.php b/app/Domain/Enums/Role.php index 7f6a996..f4be8b9 100644 --- a/app/Domain/Enums/Role.php +++ b/app/Domain/Enums/Role.php @@ -6,10 +6,10 @@ namespace Toby\Domain\Enums; enum Role: string { - case EMPLOYEE = "employee"; - case ADMINISTRATOR = "administrator"; - case TECHNICAL_APPROVER = "technical_approver"; - case ADMINISTRATIVE_APPROVER = "administrative_approver"; + case Employee = "employee"; + case Administrator = "administrator"; + case TechnicalApprover = "technical_approver"; + case AdministrativeApprover = "administrative_approver"; public function label(): string { diff --git a/app/Domain/Enums/VacationRequestState.php b/app/Domain/Enums/VacationRequestState.php index fe9fee3..7fcbae5 100644 --- a/app/Domain/Enums/VacationRequestState.php +++ b/app/Domain/Enums/VacationRequestState.php @@ -6,14 +6,14 @@ namespace Toby\Domain\Enums; enum VacationRequestState: string { - case CREATED = "created"; - case CANCELED = "canceled"; - case REJECTED = "rejected"; - case APPROVED = "approved"; - case WAITING_FOR_TECHNICAL = "waiting_for_technical"; - case WAITING_FOR_ADMINISTRATIVE = "waiting_for_administrative"; - case ACCEPTED_BY_TECHNICAL = "accepted_by_technical"; - case ACCEPTED_BY_ADMINISTRATIVE = "accepted_by_administrative"; + case Created = "created"; + case Canceled = "canceled"; + case Rejected = "rejected"; + case Approved = "approved"; + case WaitingForTechnical = "waiting_for_technical"; + case WaitingForAdministrative = "waiting_for_administrative"; + case AcceptedByTechnical = "accepted_by_technical"; + case AcceptedByAdministrative = "accepted_by_administrative"; public function label(): string { @@ -23,24 +23,24 @@ enum VacationRequestState: string public static function pendingStates(): array { return [ - self::CREATED, - self::WAITING_FOR_TECHNICAL, - self::WAITING_FOR_ADMINISTRATIVE, - self::ACCEPTED_BY_TECHNICAL, - self::ACCEPTED_BY_ADMINISTRATIVE, + self::Created, + self::WaitingForTechnical, + self::WaitingForAdministrative, + self::AcceptedByTechnical, + self::AcceptedByAdministrative, ]; } public static function successStates(): array { - return [self::APPROVED]; + return [self::Approved]; } public static function failedStates(): array { return [ - self::REJECTED, - self::CANCELED, + self::Rejected, + self::Canceled, ]; } diff --git a/app/Domain/Enums/VacationType.php b/app/Domain/Enums/VacationType.php index c3502c8..63e2858 100644 --- a/app/Domain/Enums/VacationType.php +++ b/app/Domain/Enums/VacationType.php @@ -6,15 +6,15 @@ namespace Toby\Domain\Enums; enum VacationType: string { - case VACATION = "vacation"; - case VACATION_ON_REQUEST = "vacation_on_request"; - case SPECIAL_VACATION = "special_vacation"; - case CHILDCARE_VACATION = "childcare_vacation"; - case TRAINING_VACATION = "training_vacation"; - case UNPAID_VACATION = "unpaid_vacation"; - case VOLUNTEERING_VACATION = "volunteering_vacation"; - case TIME_IN_LIEU = "time_in_lieu"; - case SICK_VACATION = "sick_vacation"; + case Vacation = "vacation"; + case OnRequest = "vacation_on_request"; + case Special = "special_vacation"; + case Childcare = "childcare_vacation"; + case Training = "training_vacation"; + case Unpaid = "unpaid_vacation"; + case Volunteering = "volunteering_vacation"; + case TimeInLieu = "time_in_lieu"; + case Sick = "sick_vacation"; public function label(): string { diff --git a/app/Domain/VacationRequestStateManager.php b/app/Domain/VacationRequestStateManager.php index 3827670..7de8484 100644 --- a/app/Domain/VacationRequestStateManager.php +++ b/app/Domain/VacationRequestStateManager.php @@ -23,50 +23,50 @@ class VacationRequestStateManager public function markAsCreated(VacationRequest $vacationRequest): void { - $this->changeState($vacationRequest, VacationRequestState::CREATED); + $this->changeState($vacationRequest, VacationRequestState::Created); $this->dispatcher->dispatch(new VacationRequestCreated($vacationRequest)); } public function approve(VacationRequest $vacationRequest): void { - $this->changeState($vacationRequest, VacationRequestState::APPROVED); + $this->changeState($vacationRequest, VacationRequestState::Approved); $this->dispatcher->dispatch(new VacationRequestApproved($vacationRequest)); } public function reject(VacationRequest $vacationRequest): void { - $this->changeState($vacationRequest, VacationRequestState::REJECTED); + $this->changeState($vacationRequest, VacationRequestState::Rejected); } public function cancel(VacationRequest $vacationRequest): void { - $this->changeState($vacationRequest, VacationRequestState::CANCELED); + $this->changeState($vacationRequest, VacationRequestState::Canceled); } public function acceptAsTechnical(VacationRequest $vacationRequest): void { - $this->changeState($vacationRequest, VacationRequestState::ACCEPTED_BY_TECHNICAL); + $this->changeState($vacationRequest, VacationRequestState::AcceptedByTechnical); $this->dispatcher->dispatch(new VacationRequestAcceptedByTechnical($vacationRequest)); } public function acceptAsAdministrative(VacationRequest $vacationRequest): void { - $this->changeState($vacationRequest, VacationRequestState::ACCEPTED_BY_ADMINISTRATIVE); + $this->changeState($vacationRequest, VacationRequestState::AcceptedByAdministrative); $this->dispatcher->dispatch(new VacationRequestAcceptedByAdministrative($vacationRequest)); } public function waitForTechnical(VacationRequest $vacationRequest): void { - $this->changeState($vacationRequest, VacationRequestState::WAITING_FOR_TECHNICAL); + $this->changeState($vacationRequest, VacationRequestState::WaitingForTechnical); } public function waitForAdministrative(VacationRequest $vacationRequest): void { - $this->changeState($vacationRequest, VacationRequestState::WAITING_FOR_ADMINISTRATIVE); + $this->changeState($vacationRequest, VacationRequestState::WaitingForAdministrative); } protected function changeState(VacationRequest $vacationRequest, VacationRequestState $state): void diff --git a/app/Infrastructure/Http/Controllers/HolidayController.php b/app/Infrastructure/Http/Controllers/HolidayController.php index e69a8ff..fe256dd 100644 --- a/app/Infrastructure/Http/Controllers/HolidayController.php +++ b/app/Infrastructure/Http/Controllers/HolidayController.php @@ -35,7 +35,7 @@ class HolidayController extends Controller return redirect() ->route("holidays.index") - ->with("success", __("Holiday has been created")); + ->with("success", __("Holiday has been created.")); } public function edit(Holiday $holiday): Response @@ -51,7 +51,7 @@ class HolidayController extends Controller return redirect() ->route("holidays.index") - ->with("success", __("Holiday has been updated")); + ->with("success", __("Holiday has been updated.")); } public function destroy(Holiday $holiday): RedirectResponse @@ -60,6 +60,6 @@ class HolidayController extends Controller return redirect() ->route("holidays.index") - ->with("success", __("Holiday has been deleted")); + ->with("success", __("Holiday has been deleted.")); } } diff --git a/app/Infrastructure/Http/Controllers/SelectYearPeriodController.php b/app/Infrastructure/Http/Controllers/SelectYearPeriodController.php index 14b95e7..75b3cd3 100644 --- a/app/Infrastructure/Http/Controllers/SelectYearPeriodController.php +++ b/app/Infrastructure/Http/Controllers/SelectYearPeriodController.php @@ -17,6 +17,6 @@ class SelectYearPeriodController extends Controller return redirect() ->back() - ->with("success", __("Selected year period has been changed")); + ->with("success", __("Selected year period has been changed.")); } } diff --git a/app/Infrastructure/Http/Controllers/UserController.php b/app/Infrastructure/Http/Controllers/UserController.php index 113657a..a49e9ee 100644 --- a/app/Infrastructure/Http/Controllers/UserController.php +++ b/app/Infrastructure/Http/Controllers/UserController.php @@ -46,7 +46,7 @@ class UserController extends Controller return redirect() ->route("users.index") - ->with("success", __("User has been created")); + ->with("success", __("User has been created.")); } public function edit(User $user): Response @@ -64,7 +64,7 @@ class UserController extends Controller return redirect() ->route("users.index") - ->with("success", __("User has been updated")); + ->with("success", __("User has been updated.")); } public function destroy(User $user): RedirectResponse @@ -73,7 +73,7 @@ class UserController extends Controller return redirect() ->route("users.index") - ->with("success", __("User has been deleted")); + ->with("success", __("User has been deleted.")); } public function restore(User $user): RedirectResponse @@ -82,6 +82,6 @@ class UserController extends Controller return redirect() ->route("users.index") - ->with("success", __("User has been restored")); + ->with("success", __("User has been restored.")); } } diff --git a/app/Infrastructure/Http/Controllers/VacationLimitController.php b/app/Infrastructure/Http/Controllers/VacationLimitController.php index 7d207d6..2762b7d 100644 --- a/app/Infrastructure/Http/Controllers/VacationLimitController.php +++ b/app/Infrastructure/Http/Controllers/VacationLimitController.php @@ -35,6 +35,6 @@ class VacationLimitController extends Controller return redirect() ->back() - ->with("success", __("Vacation limits have been updated")); + ->with("success", __("Vacation limits have been updated.")); } } diff --git a/app/Infrastructure/Http/Controllers/VacationRequestController.php b/app/Infrastructure/Http/Controllers/VacationRequestController.php index 814b35d..060afd6 100644 --- a/app/Infrastructure/Http/Controllers/VacationRequestController.php +++ b/app/Infrastructure/Http/Controllers/VacationRequestController.php @@ -95,7 +95,8 @@ class VacationRequestController extends Controller $stateManager->markAsCreated($vacationRequest); return redirect() - ->route("vacation.requests.index"); + ->route("vacation.requests.show", $vacationRequest) + ->with("success", __("Vacation request has been created.")); } public function reject( @@ -104,7 +105,8 @@ class VacationRequestController extends Controller ): RedirectResponse { $stateManager->reject($vacationRequest); - return redirect()->back(); + return redirect()->back() + ->with("success", __("Vacation request has been rejected.")); } public function cancel( @@ -113,7 +115,8 @@ class VacationRequestController extends Controller ): RedirectResponse { $stateManager->cancel($vacationRequest); - return redirect()->back(); + return redirect()->back() + ->with("success", __("Vacation request has been canceled.")); } public function acceptAsTechnical( @@ -122,7 +125,8 @@ class VacationRequestController extends Controller ): RedirectResponse { $stateManager->acceptAsTechnical($vacationRequest); - return redirect()->back(); + return redirect()->back() + ->with("success", __("Vacation request has been accepted.")); } public function acceptAsAdministrative( @@ -131,6 +135,7 @@ class VacationRequestController extends Controller ): RedirectResponse { $stateManager->acceptAsAdministrative($vacationRequest); - return redirect()->back(); + return redirect()->back() + ->with("success", __("Vacation request has been accepted.")); } } diff --git a/config/vacation_types.php b/config/vacation_types.php index 5039dfe..45a5900 100644 --- a/config/vacation_types.php +++ b/config/vacation_types.php @@ -6,55 +6,55 @@ use Toby\Domain\Enums\VacationType; use Toby\Domain\VacationTypeConfigRetriever; return [ - VacationType::VACATION->value => [ + VacationType::Vacation->value => [ VacationTypeConfigRetriever::KEY_TECHNICAL_APPROVAL => true, VacationTypeConfigRetriever::KEY_ADMINISTRATIVE_APPROVAL => true, VacationTypeConfigRetriever::KEY_BILLABLE => true, VacationTypeConfigRetriever::KEY_HAS_LIMIT => true, ], - VacationType::VACATION_ON_REQUEST->value => [ + VacationType::OnRequest->value => [ VacationTypeConfigRetriever::KEY_TECHNICAL_APPROVAL => true, VacationTypeConfigRetriever::KEY_ADMINISTRATIVE_APPROVAL => true, VacationTypeConfigRetriever::KEY_BILLABLE => true, VacationTypeConfigRetriever::KEY_HAS_LIMIT => true, ], - VacationType::TIME_IN_LIEU->value => [ + VacationType::TimeInLieu->value => [ VacationTypeConfigRetriever::KEY_TECHNICAL_APPROVAL => false, VacationTypeConfigRetriever::KEY_ADMINISTRATIVE_APPROVAL => false, VacationTypeConfigRetriever::KEY_BILLABLE => true, VacationTypeConfigRetriever::KEY_HAS_LIMIT => false, ], - VacationType::SICK_VACATION->value => [ + VacationType::Sick->value => [ VacationTypeConfigRetriever::KEY_TECHNICAL_APPROVAL => false, VacationTypeConfigRetriever::KEY_ADMINISTRATIVE_APPROVAL => true, VacationTypeConfigRetriever::KEY_BILLABLE => true, VacationTypeConfigRetriever::KEY_HAS_LIMIT => false, ], - VacationType::UNPAID_VACATION->value => [ + VacationType::Unpaid->value => [ VacationTypeConfigRetriever::KEY_TECHNICAL_APPROVAL => true, VacationTypeConfigRetriever::KEY_ADMINISTRATIVE_APPROVAL => true, VacationTypeConfigRetriever::KEY_BILLABLE => false, VacationTypeConfigRetriever::KEY_HAS_LIMIT => false, ], - VacationType::SPECIAL_VACATION->value => [ + VacationType::Special->value => [ VacationTypeConfigRetriever::KEY_TECHNICAL_APPROVAL => true, VacationTypeConfigRetriever::KEY_ADMINISTRATIVE_APPROVAL => true, VacationTypeConfigRetriever::KEY_BILLABLE => false, VacationTypeConfigRetriever::KEY_HAS_LIMIT => false, ], - VacationType::CHILDCARE_VACATION->value => [ + VacationType::Childcare->value => [ VacationTypeConfigRetriever::KEY_TECHNICAL_APPROVAL => true, VacationTypeConfigRetriever::KEY_ADMINISTRATIVE_APPROVAL => true, VacationTypeConfigRetriever::KEY_BILLABLE => false, VacationTypeConfigRetriever::KEY_HAS_LIMIT => false, ], - VacationType::TRAINING_VACATION->value => [ + VacationType::Training->value => [ VacationTypeConfigRetriever::KEY_TECHNICAL_APPROVAL => true, VacationTypeConfigRetriever::KEY_ADMINISTRATIVE_APPROVAL => true, VacationTypeConfigRetriever::KEY_BILLABLE => true, VacationTypeConfigRetriever::KEY_HAS_LIMIT => false, ], - VacationType::VOLUNTEERING_VACATION->value => [ + VacationType::Volunteering->value => [ VacationTypeConfigRetriever::KEY_TECHNICAL_APPROVAL => true, VacationTypeConfigRetriever::KEY_ADMINISTRATIVE_APPROVAL => true, VacationTypeConfigRetriever::KEY_BILLABLE => true, diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index c6a5d93..23f0ea4 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -23,7 +23,7 @@ class UserFactory extends Factory "email" => $this->faker->unique()->safeEmail(), "employment_form" => $this->faker->randomElement(EmploymentForm::cases()), "position" => $this->faker->jobTitle(), - "role" => Role::EMPLOYEE, + "role" => Role::Employee, "employment_date" => Carbon::createFromInterface($this->faker->dateTimeBetween("2020-10-27"))->toDateString(), "remember_token" => Str::random(10), ]; diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 5f09111..7b3f574 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -16,7 +16,7 @@ return new class() extends Migration { $table->string("last_name"); $table->string("email")->unique(); $table->string("avatar")->nullable(); - $table->string("role")->default(Role::EMPLOYEE->value); + $table->string("role")->default(Role::Employee->value); $table->string("position"); $table->string("employment_form"); $table->date("employment_date"); diff --git a/package-lock.json b/package-lock.json index 7795438..958999c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,8 @@ "vue": "^3.2.26", "vue-echarts": "^6.0.2", "vue-flatpickr-component": "^9.0.5", - "vue-loader": "^17.0.0" + "vue-loader": "^17.0.0", + "vue-toastification": "^2.0.0-rc.5" }, "devDependencies": { "eslint": "^8.6.0", @@ -8943,6 +8944,14 @@ "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=" }, + "node_modules/vue-toastification": { + "version": "2.0.0-rc.5", + "resolved": "https://registry.npmjs.org/vue-toastification/-/vue-toastification-2.0.0-rc.5.tgz", + "integrity": "sha512-q73e5jy6gucEO/U+P48hqX+/qyXDozAGmaGgLFm5tXX4wJBcVsnGp4e/iJqlm9xzHETYOilUuwOUje2Qg1JdwA==", + "peerDependencies": { + "vue": "^3.0.2" + } + }, "node_modules/watchpack": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz", @@ -16100,6 +16109,12 @@ } } }, + "vue-toastification": { + "version": "2.0.0-rc.5", + "resolved": "https://registry.npmjs.org/vue-toastification/-/vue-toastification-2.0.0-rc.5.tgz", + "integrity": "sha512-q73e5jy6gucEO/U+P48hqX+/qyXDozAGmaGgLFm5tXX4wJBcVsnGp4e/iJqlm9xzHETYOilUuwOUje2Qg1JdwA==", + "requires": {} + }, "watchpack": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz", diff --git a/package.json b/package.json index c69812f..9588eff 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,8 @@ "vue": "^3.2.26", "vue-echarts": "^6.0.2", "vue-flatpickr-component": "^9.0.5", - "vue-loader": "^17.0.0" + "vue-loader": "^17.0.0", + "vue-toastification": "^2.0.0-rc.5" }, "devDependencies": { "eslint": "^8.6.0", diff --git a/resources/css/app.css b/resources/css/app.css index 350af46..3c5c746 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -1,4 +1,5 @@ @import 'flatpickr/dist/themes/light.css'; +@import 'vue-toastification/dist/index.css'; @tailwind base; @tailwind components; diff --git a/resources/js/Composables/monthInfo.js b/resources/js/Composables/monthInfo.js new file mode 100644 index 0000000..3d7af0a --- /dev/null +++ b/resources/js/Composables/monthInfo.js @@ -0,0 +1,60 @@ +const months = [ + { + 'name': 'Styczeń', + 'value': 'january', + }, + { + 'name': 'Luty', + 'value': 'february', + }, + { + 'name': 'Marzec', + 'value': 'march', + }, + { + 'name': 'Kwiecień', + 'value': 'april', + }, + { + 'name': 'Maj', + 'value': 'may', + }, + { + 'name': 'Czerwiec', + 'value': 'june', + }, + { + 'name': 'Lipiec', + 'value': 'july', + }, + { + 'name': 'Sierpień', + 'value': 'august', + }, + { + 'name': 'Wrzesień', + 'value': 'september', + }, + { + 'name': 'Październik', + 'value': 'october', + }, + { + 'name': 'Listopad', + 'value': 'november', + }, + { + 'name': 'Grudzień', + 'value': 'december', + }, +] + +export function useMonthInfo() { + const getMonths = () => months + const findMonth = value => months.find(month => month.value === value) + + return { + getMonths, + findMonth, + } +} diff --git a/resources/js/Composables/statusInfo.js b/resources/js/Composables/statusInfo.js index 1d73c5a..94026d7 100644 --- a/resources/js/Composables/statusInfo.js +++ b/resources/js/Composables/statusInfo.js @@ -31,7 +31,7 @@ const statuses = [ }, }, { - text: 'Czeka na akceptację od technicznego', + text: 'Czeka na akceptację od przełożonego technicznego', value: 'waiting_for_technical', outline: { icon: OutlineClockIcon, @@ -44,7 +44,7 @@ const statuses = [ }, }, { - text: 'Czeka na akceptację od administracyjnego', + text: 'Czeka na akceptację od przełożonego administracyjnego', value: 'waiting_for_administrative', outline: { icon: OutlineClockIcon, @@ -70,7 +70,7 @@ const statuses = [ }, }, { - text: 'Zaakceptowany przez technicznego', + text: 'Zaakceptowany przez przełożonego technicznego', value: 'accepted_by_technical', outline: { icon: OutlineThumbUpIcon, @@ -83,7 +83,7 @@ const statuses = [ }, }, { - text: 'Zaakceptowany przez administracyjnego', + text: 'Zaakceptowany przez przełożonego administracyjnego', value: 'accepted_by_administrative', outline: { icon: OutlineThumbUpIcon, diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue index ca0c8e5..1415b0a 100644 --- a/resources/js/Pages/Calendar.vue +++ b/resources/js/Pages/Calendar.vue @@ -126,6 +126,7 @@ import {Menu, MenuButton, MenuItem, MenuItems} from '@headlessui/vue' import {CheckIcon, ChevronDownIcon} from '@heroicons/vue/solid' import {computed} from 'vue' +import {useMonthInfo} from '@/Composables/monthInfo' export default { name: 'VacationCalendar', @@ -152,58 +153,10 @@ export default { }, }, setup(props) { - const months = [ - { - 'name': 'Styczeń', - 'value': 'january', - }, - { - 'name': 'Luty', - 'value': 'february', - }, - { - 'name': 'Marzec', - 'value': 'march', - }, - { - 'name': 'Kwiecień', - 'value': 'april', - }, - { - 'name': 'Maj', - 'value': 'may', - }, - { - 'name': 'Czerwiec', - 'value': 'june', - }, - { - 'name': 'Lipiec', - 'value': 'july', - }, - { - 'name': 'Sierpień', - 'value': 'august', - }, - { - 'name': 'Wrzesień', - 'value': 'september', - }, - { - 'name': 'Październik', - 'value': 'october', - }, - { - 'name': 'Listopad', - 'value': 'november', - }, - { - 'name': 'Grudzień', - 'value': 'december', - }, - ] + const {getMonths, findMonth} = useMonthInfo() + const months = getMonths() - const selectedMonth = computed(() => months.find(month => month.value === props.currentMonth)) + const selectedMonth = computed(() => findMonth(props.currentMonth)) return { months, diff --git a/resources/js/Pages/Login.vue b/resources/js/Pages/Login.vue index 324fd4e..e73c659 100644 --- a/resources/js/Pages/Login.vue +++ b/resources/js/Pages/Login.vue @@ -15,7 +15,7 @@
{{ errors.oauth }}
diff --git a/resources/js/Pages/VacationRequest/Show.vue b/resources/js/Pages/VacationRequest/Show.vue index 1c4f519..1e46a04 100644 --- a/resources/js/Pages/VacationRequest/Show.vue +++ b/resources/js/Pages/VacationRequest/Show.vue @@ -126,6 +126,7 @@ :href="`/vacation-requests/${request.id}/accept-as-technical`" method="post" as="button" + preserve-scroll class="inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-blumilk-600 hover:bg-blumilk-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blumilk-500" > Zaakceptuj wniosek @@ -148,6 +149,7 @@ :href="`/vacation-requests/${request.id}/accept-as-administrative`" method="post" as="button" + preserve-scroll class="inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-blumilk-600 hover:bg-blumilk-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blumilk-500" > Zaakceptuj wniosek @@ -170,6 +172,7 @@ :href="`/vacation-requests/${request.id}/reject`" method="post" as="button" + preserve-scroll class="inline-flex items-center justify-center px-4 py-2 border border-transparent font-medium rounded-md text-red-700 bg-red-100 hover:bg-red-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:text-sm" > Odrzuć wniosek @@ -192,6 +195,7 @@ :href="`/vacation-requests/${request.id}/cancel`" method="post" as="button" + preserve-scroll class="inline-flex items-center justify-center px-4 py-2 border border-transparent font-medium rounded-md text-red-700 bg-red-100 hover:bg-red-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:text-sm" > Anuluj wniosek diff --git a/resources/js/Shared/Layout/AppLayout.vue b/resources/js/Shared/Layout/AppLayout.vue index 7ad4df4..3d68e57 100644 --- a/resources/js/Shared/Layout/AppLayout.vue +++ b/resources/js/Shared/Layout/AppLayout.vue @@ -11,9 +11,36 @@ diff --git a/resources/js/Shared/Layout/GuestLayout.vue b/resources/js/Shared/Layout/GuestLayout.vue index 5c2589c..50ad393 100644 --- a/resources/js/Shared/Layout/GuestLayout.vue +++ b/resources/js/Shared/Layout/GuestLayout.vue @@ -1,4 +1,3 @@ -Proszę o {{ mb_strtolower($vacationRequest->type->label()) }} w okresie od dnia {{ $vacationRequest->from->format("d.m.Y") }} - do dnia {{ $vacationRequest->to->format("d.m.Y") }} włącznie tj. {{ $vacationRequest->estimated_days }} dni roboczych za rok {{ $vacationRequest->yearPeriod->year }}. + do dnia {{ $vacationRequest->to->format("d.m.Y") }} włącznie tj. {{ $vacationRequest->vacations()->count() }} dni roboczych za rok {{ $vacationRequest->yearPeriod->year }}.