76 Commits

Author SHA1 Message Date
f05b8f460b
#152 - updated vacation stats 2022-07-07 11:49:18 +02:00
62c3c11ebf
#152 - change layout 2022-07-07 10:23:55 +02:00
af25d80d2e
Merge branch '#152-dashboard-calendar-widget' into #152-dashboard-v2 2022-07-07 10:23:44 +02:00
0ddbec1499
- small improvements 2022-07-07 10:02:31 +02:00
94350f8a82
#152 - updated style and added icons 2022-07-07 00:15:06 +02:00
0398b44141
- updated style 2022-07-06 21:33:56 +02:00
783586d3ed
- improved calendar responsiveness 2022-07-06 16:28:33 +02:00
1d7b4da903
- added new line in file 2022-07-04 10:45:14 +02:00
94f433de6e
#152 - added redirections 2022-07-04 10:16:40 +02:00
a9c476cb8e
wip 2022-07-04 10:16:36 +02:00
5c3833d4cb
- component renamed 2022-07-04 10:16:23 +02:00
6e627d11c8
#152 - added vacations 2022-07-04 10:16:19 +02:00
eb644fa494
#152 - added holidays 2022-07-04 10:16:08 +02:00
4392b666e1
#152 - small corrections 2022-07-01 14:57:38 +02:00
e7c1028da1
#152 - updated style 2022-07-01 14:56:55 +02:00
a7bc4695a7 #152 - final support for weeks 2022-06-24 11:20:18 +02:00
4e16f363ac #152 - optimization 2022-06-24 11:11:09 +02:00
7893282385 #152 - wip 2022-06-24 10:22:51 +02:00
db874d4395 #152 - wip 2022-06-24 10:08:48 +02:00
dcc3808428 #152 - wip 2022-06-24 10:00:36 +02:00
2a3e65ed5f #152 - calendar template added 2022-06-24 09:58:21 +02:00
643f546142
#173 - button behaviour in creating request (#174)
#173 - improved button behaviour
2022-06-20 09:33:30 +02:00
Krzysztof Rewak
2f9ef0ff12
- phrasing (#169)
* - removing "vacations" word

* - styling childcare vacations label
2022-06-14 10:29:55 +02:00
77d3b4df0d
#153 - button behaviour in form editing (#164)
* #153 - behaviour of buttons has been changed

* #153 - changed the gray background to opacity

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>

* #153 - added for created forms

* #153 - default value for downloaded types is set

* #153 - removed hover for disabled buttons

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-06-10 12:44:24 +02:00
2fb2415203
#157 - more interactive calendar (#162)
* #157 - added support for the date parameter

* #157 - prepared clikable days

* removed line with consol log

* lint

* #157 - prepared clikable days for calendar of holidays

* #157 - added a privilege check

* #157 - added support for the user id parameter

* improved loading of selected date

* updated calendar

* #157 - added the request class and improved the request parameters

* csf

* Apply suggestions from code review

Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>

* Apply suggestion

Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>

* icon has been renamed

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>

* selection of previous days restored

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>

* changes for the controller have been withdrawn

Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>

* wip

* Update resources/js/Composables/vacationTypeInfo.js

Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>

* #157 - updated cursor type for weekened

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>

Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
2022-06-08 11:02:37 +02:00
fe639f264d
- fix to empty states (#163)
* #150 - changed the default colour for empty states

* #150 - added empty states for user requests

* #31 - amended text for empty states - employee
2022-06-07 12:43:38 +02:00
dependabot[bot]
4b06e6c02b
#5 - (js) Bump vue from 3.2.21 to 3.2.36 (#159)
* #5 - (js) Bump vue from 3.2.21 to 3.2.36

Bumps [vue](https://github.com/vuejs/core) from 3.2.21 to 3.2.36.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/compare/v3.2.21...v3.2.36)

---
updated-dependencies:
- dependency-name: vue
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* #5 - June 2022 composer and npm packages update

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dawidrudnik <dawid.rudnik@blumilk.pl>
2022-06-03 13:39:10 +02:00
4309e8104b
#150 - empty states (#160)
* #150 - added base for empty states

* #150 - added empty states to subpages

* #150 - added empty states for the widget: vacation requests

disabled "see more" button when no results are available

* Update resources/js/Pages/Holidays/Index.vue

Removed emoji from text

Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>

* #150 - added empty state for key page

* #150 - added empty state for user vacation request widget

* #31 - title corrected

Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>
2022-06-02 10:37:41 +02:00
Adrian Hopek
431262dfb7
#134 - fill users data for resume (#144)
* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* lint fixes

* missing empty lines

* translations

* fix vue version

* #134 - fixes

* fix

* fix

* #134 - fix

* fix

* fix

* #134 - added tests

* #134 - fix to translations

* #134 - tests

* #134 - fix

* Update database/factories/ResumeFactory.php

Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>

* #134 - fix

* #134 - fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>
2022-05-18 08:50:41 +02:00
Adrian Hopek
74f33d6c0b
- vacation type filter (#146)
* vacation type filter

* fix

* fix
2022-05-11 14:58:30 +02:00
Krzysztof Rewak
88b1543071
- adding day of week to upcoming holidays (#143) 2022-05-10 09:41:30 +02:00
Ewelina Lasowy
f4d928c6ae
- UX fixes (#142)
* - changed homeoffice icon color

* - improved list of request on dashboard

* - hide holidays if no data

* - fix to holidays

* - fix

* - made forms looks better

* - hide chart when user has no vacation limit

* - linter fix

* - fix to pdf attachment for vacation request
2022-05-06 12:29:06 +02:00
Adrian Hopek
06863b854a
#138 - fix tables on safari (#139) 2022-04-29 09:22:02 +02:00
Adrian Hopek
6b2556c1da
#126 - vacation request reminders (#130)
* #126 - vacation request reminders

* #126 - fix workdays

* #126 - changes

* #126 - cs fix

* #5 - bump codestyle

* #126 - fix

* #126 - fix

* #126 - fix

* #126 - fix

* #126 - tests

* #126 - fix

* #126 - fix

* #126 - fix seeders

* #126 - fix

* #126 - tests

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-04-27 15:26:55 +02:00
Adrian Hopek
c69866bb52
#116 - integration with slack (#129)
* wip

* wip

* wip

* wip

* fix

* wip

* wip

* fix

* fix

* cs fix

* #116 - fix

* #116 - changed home-office icon

* Apply suggestions from code review

Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>

* #116 - cr fix

* #116 - cs fix

* #116 - cs fix

* Apply suggestions from code review

Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>

* #5 - bump codestyle

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
2022-04-27 09:57:13 +02:00
Adrian Hopek
d60dc75f99
#118 - keys (#128)
* #118 - wip

* #118 - keys

* #118 - fix

* #118 - fix menu

* #118 - fix to policies and added translations

* #118 - wip

* #118 - tests

* #118 - fix

* #118 - fix

* #118 - fix

* Update resources/lang/pl.json

Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>

* #118 - cr fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
2022-04-21 08:16:31 +02:00
Adrian Hopek
c95d08c861
#120 - remote work (#127)
* #120 - wip

* #120 - add icon to home office

* #120 - wip

* #120 - wip

* #120 - wip

* #120 - wip

* #120 - wip

* #120 - ui fixes

* #120 - fix

* #120 - fix

* #120 - fix

* #120 - fix

* #120 - translation fix

* #120 - fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-04-21 07:44:22 +02:00
Adrian Hopek
cc981b02b4
#90 - user profile (#125)
* fix css focuses

* #90 - wip

* #90 - fix to generate PDF

* #90 - wip

* #90 - wip

* #90 - wip

* #90 - wip

* #90 - fix to calendar

* #90 - wip

* #90 - fix

* #90 - fix lint

* #90 - fix

* Apply suggestions from code review

Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>

* #90 - cr fixes

* #90 - fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
2022-04-14 11:58:45 +02:00
Adrian Hopek
ff8d6aade6
#71 - annual summary (#113)
* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* fix

* lint fix

* cr fix

* fix
2022-04-07 14:33:15 +02:00
Adrian Hopek
6af4380fe6
#108 - types of vacation request (#110)
* #108 - wip

* #108 - add icon to absence

* #108 - wip

* #108 - fix

* #108 - fix title

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-04-06 15:13:54 +02:00
Ewelina Lasowy
fa244b96cd
- Change logo to svg (#109)
* - sidebar logo fix

* - change icon

* - change logo to svg

* #108 - change icon color
2022-04-06 10:59:26 +02:00
Adrian Hopek
b49fcadbba
#99 - ui changes (#100)
* #99 - ui changes

* #99 - logo fix

* #99 - tailwind plugin for eslint

* #99 - fix

* #99 - fix

* #99 - fix pagination

* #99 - fix logo

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-03-31 10:12:33 +02:00
Adrian Hopek
08421b8a69
- small changes (#98)
* - added some test

* - cr fix

* wip

* wip

* Update resources/js/Shared/MainMenu.vue

Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>

* fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
2022-03-30 10:33:18 +02:00
Ewelina Lasowy
fdbc374d7e
#93 - custom error pages (#94)
* #93 - wip

* #93 - wip

* #93 - fix if statement

* #93 - wip

* #93 - added default error page

* #93 - fix to error page

* #93 - fix linter

* #93 - delete unnecessary file

* #93 - added EOL

* #93 - fix

* #93 - cr fix

Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>
2022-03-30 09:06:25 +02:00
Adrian Hopek
720d2c4e7b
#95 - unavailable days (#96)
* #95 - unavailable days

* #95 - fix

* #95 - fix
2022-03-28 14:05:59 +02:00
Adrian Hopek
957b07b3eb
#44 - vacation summary of all employees (#92)
* #44 - ui for summary

* #44 - vacation monthly usage

* #44 - fix

* #44 - fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-03-24 10:33:34 +01:00
Adrian Hopek
dcda8c6255
- vue composition api (#91)
* wip

* fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-03-22 15:03:42 +01:00
Adrian Hopek
a0e60a3160
#74 - vacation calendar (#87)
* - polishing calendar

* wip

* wip

* #74 - wip

* #74 - wip

* #74 - wip

* #74 - fix icons

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-03-21 11:57:32 +01:00
Adrian Hopek
8c1819aa01
#85 - google calendar improvements (#86)
* google calendar improvements

* fix

* change vacation request name

* #85 - google calendar improvements

* #85 - fix

* #85 - fix

* #85 - fix
2022-03-18 08:11:34 +01:00
Adrian Hopek
afb1a5e9ff
#73 - cancel vacation request (#83)
* #73 - cancel vacation request

* #73 - fix

* #73 - changed text for cancelling vacation request

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-03-17 09:33:29 +01:00