Merge branch 'polishing-calendar' into #74-vacation-calendar

# Conflicts: # resources/js/Pages/Calendar.vue
2022-03-16 14:54:30 +01:00
parent e365de21cf 836408817f
commit de35711d6a
12 changed files with 316 additions and 21 deletions
--- a/app/Infrastructure/Http/Resources/VacationRequestResource.php
+++ b/app/Infrastructure/Http/Resources/VacationRequestResource.php
@@ -16,7 +16,7 @@ class VacationRequestResource extends JsonResource
            "id" => $this->id,
            "name" => $this->name,
            "user" => new UserResource($this->user),
-            "type" => $this->type->label(),
+            "type" => $this->type,
            "state" => $this->state,
            "from" => $this->from->toDisplayString(),
            "to" => $this->to->toDisplayString(),