#443 - fix: fixes after code review - fixed validation and edit view

blumilksoftware · Jun 26, 2024 · f283321 · f283321
1 parent 1e8b1f6
commit f283321
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/app/Http/Requests/UserHistoryRequest.php b/app/Http/Requests/UserHistoryRequest.php
@@ -15,7 +15,7 @@ public function rules(): array
     {
         return [
             "from" => ["required", "date"],
-            "to" => ["date", "after:from"],
+            "to" => ["nullable", "date", "after:from", "required_if:type," . UserHistoryType::MedicalExam->value . "," . UserHistoryType::OhsTraining->value],
             "comment" => ["nullable", "string", "max:255"],
             "type" => ["required", new Enum(UserHistoryType::class)],
             "employmentForm" => [new Enum(EmploymentForm::class), "required_if:type," . UserHistoryType::Employment->value],

diff --git a/app/Http/Resources/UserResource.php b/app/Http/Resources/UserResource.php
@@ -26,10 +26,10 @@ public function toArray($request): array
             "lastActiveAt" => $this->last_active_at?->toDateTimeString(),
             "employmentForm" => $this->profile->employment_form->label(),
             "employmentDate" => $this->profile->employment_date->toDisplayString(),
-            "lastMedicalExamDate" => $lastMedicalExam?->from->toDisplayString(),
-            "nextMedicalExamDate" => $lastMedicalExam?->to->toDisplayString(),
-            "lastOhsTrainingDate" => $lastOhsTraining?->from->toDisplayString(),
-            "nextOhsTrainingDate" => $lastOhsTraining?->to->toDisplayString(),
+            "lastMedicalExamDate" => $lastMedicalExam?->from?->toDisplayString(),
+            "nextMedicalExamDate" => $lastMedicalExam?->to?->toDisplayString(),
+            "lastOhsTrainingDate" => $lastOhsTraining?->from?->toDisplayString(),
+            "nextOhsTrainingDate" => $lastOhsTraining?->to?->toDisplayString(),
         ];
     }
 }
diff --git a/lang/pl/validation.php b/lang/pl/validation.php
@@ -186,6 +186,9 @@
         "employmentForm" => [
             "required_if" => "Forma zatrudnienia jest wymagana.",
         ],
+        "to" => [
+            "required_if" => "Data zakończenia jest wymagana.",
+        ],
     ],
     "attributes" => [
         "to" => "do",

diff --git a/resources/js/Pages/UserHistory/Create.vue b/resources/js/Pages/UserHistory/Create.vue
@@ -41,6 +41,7 @@ function createForm() {
           Dodaj wpis
         </h2>
       </div>
+      {{ form }}
       <form
         class="px-6 h-full border-t border-gray-200"
         @submit.prevent="createForm"

diff --git a/resources/js/Pages/UserHistory/Edit.vue b/resources/js/Pages/UserHistory/Edit.vue
@@ -16,7 +16,7 @@ const form = useForm({
   to: props.history.to,
   comment: props.history.comment,
   type: props.types.find(type => type.value === props.history.type),
-  employmentForm: props.employmentForms.find(employmentForm => employmentForm.value === props.history.employmentForm),
+  employmentForm: props.employmentForms.find(employmentForm => employmentForm.value === props.history.employmentForm) ?? '',
 })
 
 function updateForm() {
@@ -154,7 +154,7 @@ function updateForm() {
                       v-for="employmentForm in employmentForms"
                       :key="employmentForm.value"
                       v-slot="{ active, selected }"
-                      :value="form"
+                      :value="employmentForm"
                       as="template"
                     >
                       <li :class="[active ? 'bg-gray-100' : 'text-gray-900', 'cursor-default select-none relative py-2 pl-3 pr-9']">