From f755e1e0dbf8391d35c37114187cd76c17701e4a Mon Sep 17 00:00:00 2001 From: Kamil Niemczycki Date: Tue, 14 Jun 2022 19:12:03 +0200 Subject: [PATCH 1/5] #152 - updated calendar --- resources/js/Pages/Calendar.vue | 37 +++++++++++++++++++++++---------- tailwind.config.js | 8 +++++++ 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue index 871df95..28fd1c4 100644 --- a/resources/js/Pages/Calendar.vue +++ b/resources/js/Pages/Calendar.vue @@ -55,18 +55,20 @@
- +
- - - - - - - @@ -381,6 +347,8 @@ const props = defineProps({ types: Object, }) +const headers = ['Numer', 'Pracownik', 'Rodzaj wniosku', 'Od', 'Do', 'Dni urlopu', 'Status'] + const statuses = [ { name: 'Wszystkie', From 8dc487a133ef8bf0a9c9bd734192813bb28efa11 Mon Sep 17 00:00:00 2001 From: Kamil Niemczycki Date: Mon, 20 Jun 2022 10:57:28 +0200 Subject: [PATCH 3/5] #152 - updated MonthlyUsage --- resources/js/Pages/MonthlyUsage.vue | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/resources/js/Pages/MonthlyUsage.vue b/resources/js/Pages/MonthlyUsage.vue index 0db17f2..fb8c50a 100644 --- a/resources/js/Pages/MonthlyUsage.vue +++ b/resources/js/Pages/MonthlyUsage.vue @@ -9,11 +9,11 @@
-
+
+
- {{ selectedMonth.name }} {{ years.selected.year }} + {{ selectedMonth.name }}
@@ -84,22 +86,28 @@ v-for="user in users.data" :key="user.id" > - +
- + -
-
- {{ user.name }} -
+
+ + {{ split }} +
+ + diff --git a/tailwind.config.js b/tailwind.config.js index 9493ebe..c425e8f 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,4 +1,5 @@ const defaultTheme = require('tailwindcss/defaultTheme') +const plugin = require('tailwindcss/plugin') module.exports = { content: [ @@ -31,5 +32,12 @@ module.exports = { require('@tailwindcss/forms'), require('@tailwindcss/typography'), require('@tailwindcss/line-clamp'), + plugin(function({ addVariant, e }) { + addVariant('second', ({ modifySelectors, separator }) => { + modifySelectors(({ className }) => { + return `.${e(`second${separator}${className}`)}:nth-child(2)` + }) + }) + }), ], } From 5f0d6b5af333bdc779ea968e737c796081492645 Mon Sep 17 00:00:00 2001 From: Kamil Niemczycki Date: Tue, 14 Jun 2022 21:37:16 +0200 Subject: [PATCH 2/5] #152 - updated header in calendar --- .../VacationRequest/IndexForApprovers.vue | 42 +++---------------- 1 file changed, 5 insertions(+), 37 deletions(-) diff --git a/resources/js/Pages/VacationRequest/IndexForApprovers.vue b/resources/js/Pages/VacationRequest/IndexForApprovers.vue index d4303af..fc93ca4 100644 --- a/resources/js/Pages/VacationRequest/IndexForApprovers.vue +++ b/resources/js/Pages/VacationRequest/IndexForApprovers.vue @@ -242,46 +242,12 @@
- Numer - - Pracownik - - Rodzaj wniosku - - Od - - Do - - Dni urlopu - - Status + {{ head }}
- From e6f4d0e78c5692795e5f9203f968a9b90deb73d2 Mon Sep 17 00:00:00 2001 From: Kamil Niemczycki Date: Tue, 21 Jun 2022 13:11:58 +0200 Subject: [PATCH 4/5] #152 - updated calendar view --- resources/js/Pages/Calendar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue index 28fd1c4..95cc189 100644 --- a/resources/js/Pages/Calendar.vue +++ b/resources/js/Pages/Calendar.vue @@ -90,7 +90,7 @@ class="p-2 border-y border-gray-300 bg-white sticky left-0 sticky-border" >
-
@@ -52,8 +52,8 @@ :key="item.id" class="hover:bg-blumilk-25" > -
+ Pracownik - +
-
-
+ - {{ item.user.name }} -
+ {{ split }} +
ImiÄ™ i nazwisko -
+
+
-

- {{ item.user.name }} +

+ + {{ split }} +

-

+