From cca74879da542e6a715cb280c8b64903483c29c2 Mon Sep 17 00:00:00 2001 From: EwelinaLasowy Date: Fri, 29 Apr 2022 11:02:12 +0200 Subject: [PATCH 01/11] - changed homeoffice icon color --- resources/js/Composables/vacationTypeInfo.js | 4 ++-- resources/js/Shared/Widgets/VacationStats.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/js/Composables/vacationTypeInfo.js b/resources/js/Composables/vacationTypeInfo.js index 65ec983..3bd73b9 100644 --- a/resources/js/Composables/vacationTypeInfo.js +++ b/resources/js/Composables/vacationTypeInfo.js @@ -85,8 +85,8 @@ const types = [ text: 'Praca zdalna', value: 'home_office', icon: HomeCityIcon, - color: 'text-blumilk-500', - border: 'border-blumilk-500', + color: 'text-lime-500', + border: 'border-lime-500', }, ] diff --git a/resources/js/Shared/Widgets/VacationStats.vue b/resources/js/Shared/Widgets/VacationStats.vue index 1dc2e5d..62307b1 100644 --- a/resources/js/Shared/Widgets/VacationStats.vue +++ b/resources/js/Shared/Widgets/VacationStats.vue @@ -61,7 +61,7 @@
-
+
{{ stats.homeOffice }}
-- 2.52.0 From aa2d05acfd959376390ec96a2a56ed831f82df2f Mon Sep 17 00:00:00 2001 From: EwelinaLasowy Date: Fri, 29 Apr 2022 11:12:04 +0200 Subject: [PATCH 02/11] - improved list of request on dashboard --- .../Widgets/PendingVacationRequests.vue | 15 +++++++--- .../Shared/Widgets/UserVacationRequests.vue | 29 +++++++++++-------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/resources/js/Shared/Widgets/PendingVacationRequests.vue b/resources/js/Shared/Widgets/PendingVacationRequests.vue index 8494e60..c643f38 100644 --- a/resources/js/Shared/Widgets/PendingVacationRequests.vue +++ b/resources/js/Shared/Widgets/PendingVacationRequests.vue @@ -14,18 +14,24 @@ class="py-5" >
+

- Wniosek o {{ findType(request.type).text.toLowerCase() }} - [{{ request.name }}] + Wniosek [{{ request.name }}]

-

- {{ request.from }} - {{ request.to }} +

+
+ {{ request.from }} - {{ request.to }} +
+
+
+

+

@@ -67,6 +73,7 @@ diff --git a/resources/js/Shared/Widgets/UserVacationRequests.vue b/resources/js/Shared/Widgets/UserVacationRequests.vue index 0f84d99..b942779 100644 --- a/resources/js/Shared/Widgets/UserVacationRequests.vue +++ b/resources/js/Shared/Widgets/UserVacationRequests.vue @@ -24,7 +24,7 @@ Wniosek [{{ request.name }}] -
+
{{ request.from }} - {{ request.to }}
@@ -56,7 +56,6 @@ -- 2.52.0 From aacffeaa65a79ae864e32ede963cba1d9d533a9c Mon Sep 17 00:00:00 2001 From: EwelinaLasowy Date: Fri, 6 May 2022 10:39:58 +0200 Subject: [PATCH 11/11] - fix to pdf attachment for vacation request --- resources/views/pdf/vacation-request.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/pdf/vacation-request.blade.php b/resources/views/pdf/vacation-request.blade.php index 61fccd3..0df1bab 100644 --- a/resources/views/pdf/vacation-request.blade.php +++ b/resources/views/pdf/vacation-request.blade.php @@ -71,7 +71,7 @@
-

Wniosek o urlop

+

Wniosek

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->vacations()->count() }} dni roboczych za rok {{ $vacationRequest->yearPeriod->year }}. -- 2.52.0