#22 - vacation calendar (#51)

* change layout * change layout * #22 - wip * wip * wip * #22 - wip * #22 - wip * #22 - wip * #22 - wip * #22 - fix * #22 - wip * #22 - added some tests * #22 - wip * #22 - wip * #22 - fix * #22 - wip * #22 - wip * #22 - wip * #22 - fix * #22 - fix * #22 - fix * #22 - fix * #22 - fix * #22 - fix * #22 - cr fixes * #22 - cr fix Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-02-15 15:08:26 +01:00
parent b161981d5a
commit 6c352b629c
50 changed files with 1682 additions and 397 deletions
--- a/app/Infrastructure/Http/Resources/VacationRequestResource.php
+++ b/app/Infrastructure/Http/Resources/VacationRequestResource.php
@@ -17,11 +17,11 @@ class VacationRequestResource extends JsonResource
            "name" => $this->name,
            "user" => new UserResource($this->user),
            "type" => $this->type->label(),
-            "state" => $this->state->label(),
+            "state" => $this->state,
            "from" => $this->from->toDisplayString(),
            "to" => $this->to->toDisplayString(),
-            "estimatedDays" => $this->estimated_days,
            "comment" => $this->comment,
+            "days" => VacationResource::collection($this->vacations),
        ];
    }
 }