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/Shared/Alerts/ErrorAlert.vue b/resources/js/Shared/Alerts/ErrorAlert.vue new file mode 100644 index 0000000..f507a11 --- /dev/null +++ b/resources/js/Shared/Alerts/ErrorAlert.vue @@ -0,0 +1,67 @@ + + + diff --git a/resources/js/Shared/Alerts/SuccessAlert.vue b/resources/js/Shared/Alerts/SuccessAlert.vue new file mode 100644 index 0000000..1a8fcaf --- /dev/null +++ b/resources/js/Shared/Alerts/SuccessAlert.vue @@ -0,0 +1,67 @@ + + + diff --git a/resources/js/Shared/FlashMessage.vue b/resources/js/Shared/FlashMessage.vue index 2498aed..f9a3ce4 100644 --- a/resources/js/Shared/FlashMessage.vue +++ b/resources/js/Shared/FlashMessage.vue @@ -8,7 +8,7 @@ leave-to-class="opacity-0" >
@@ -16,7 +16,7 @@

- {{ $page.props.flash.success }} + {{ message }}

@@ -35,38 +35,39 @@
-
-
-
-
- -

- {{ $page.props.flash.error }} -

-
-
- -
-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/js/Shared/Layout/AppLayout.vue b/resources/js/Shared/Layout/AppLayout.vue index 5ac204d..f576ff0 100644 --- a/resources/js/Shared/Layout/AppLayout.vue +++ b/resources/js/Shared/Layout/AppLayout.vue @@ -2,7 +2,14 @@
- + +
@@ -12,13 +19,21 @@ diff --git a/resources/views/pdf/vacation-request.blade.php b/resources/views/pdf/vacation-request.blade.php index 9300bf2..8561076 100644 --- a/resources/views/pdf/vacation-request.blade.php +++ b/resources/views/pdf/vacation-request.blade.php @@ -74,7 +74,7 @@

Wniosek o urlop

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 }}.