kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity

Merge branch 'main' into #42-global-notifications

Browse Source 
# Conflicts:
#	app/Domain/Enums/VacationRequestState.php
#	app/Domain/VacationRequestStateManager.php
#	app/Eloquent/Models/Vacation.php
#	app/Infrastructure/Http/Controllers/VacationCalendarController.php
#	app/Infrastructure/Http/Controllers/VacationRequestController.php
#	database/factories/VacationFactory.php
#	database/migrations/2022_02_07_133018_create_vacations_table.php
#	database/seeders/DatabaseSeeder.php
#	resources/js/Pages/Calendar.vue
#	resources/js/Shared/Activity.vue
#	resources/js/Shared/MainMenu.vue
#	resources/js/Shared/Status.vue
#	tailwind.config.js
#	tests/Feature/VacationRequestTest.php
#	tests/Unit/VacationRequestStatesTest.php
This commit is contained in:
EwelinaLasowy
2022-02-15 15:17:01 +01:00
parent 425d7c7608 6c352b629c
commit c301ab7c26
29 changed files with 545 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/js/Pages/VacationRequest/Show.vue
View File

@@ -18,6 +18,14 @@
{{ request.name }}
</dd>
</div>
<div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
<dt class="text-sm font-medium text-gray-500">
Pracownik
</dt>
<dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
{{ request.user.name }}
</dd>
</div>
<div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
<dt class="text-sm font-medium text-gray-500">
Rodzaj urlopu