From 204068d8647adeffdba8fd1cca9c9e294b9b27ed Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 19 Apr 2023 13:26:06 +0800
Subject: [PATCH] fix bug date error in update announcement function in
 settings page

---
 .../ControllersLogic/CreateAnnouncementLogic.php          | 6 +++---
 .../ControllersLogic/UpdateAnnouncementLogic.php          | 6 +++---
 app/Http/Resources/AnnouncementResource.php               | 4 ++--
 .../settings/forms/AnnouncementFormComponent.vue          | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/Classes/Modules/Announcements/ControllersLogic/CreateAnnouncementLogic.php b/app/Classes/Modules/Announcements/ControllersLogic/CreateAnnouncementLogic.php
index 9c740601..319931bf 100644
--- a/app/Classes/Modules/Announcements/ControllersLogic/CreateAnnouncementLogic.php
+++ b/app/Classes/Modules/Announcements/ControllersLogic/CreateAnnouncementLogic.php
@@ -11,7 +11,7 @@ use App\Classes\Modules\Announcements\Services\CreatesAnnouncement;
 use App\Classes\Modules\Announcements\Processors\AssignAnnouncementToSegmentProcessor;
 
 use App\Http\Resources\AnnouncementResource;
-
+use Carbon\Carbon;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -67,8 +67,8 @@ class CreateAnnouncementLogic extends AbstractControllerLogic
         $annoucement_object = new AnnouncementObject(
             $request->input('title'),
             $request->input('description'),
-            $request->input('starting_on'),
-            $request->input('ending_on')
+            Carbon::createFromFormat('d-m-Y', $request->input('starting_on'))->format('Y-m-d H:i:s'),
+            Carbon::createFromFormat('d-m-Y', $request->input('ending_on'))->format('Y-m-d H:i:s')
         );
 
         $this->canCreateAnnouncement->passes($annoucement_object);
diff --git a/app/Classes/Modules/Announcements/ControllersLogic/UpdateAnnouncementLogic.php b/app/Classes/Modules/Announcements/ControllersLogic/UpdateAnnouncementLogic.php
index 4fac4144..fc1f4359 100644
--- a/app/Classes/Modules/Announcements/ControllersLogic/UpdateAnnouncementLogic.php
+++ b/app/Classes/Modules/Announcements/ControllersLogic/UpdateAnnouncementLogic.php
@@ -10,7 +10,7 @@ use App\Classes\Modules\Announcements\Services\FetchesAnnouncement;
 use App\Classes\Modules\Announcements\Services\UpdatesAnnouncement;
 
 use App\Http\Resources\AnnouncementResource;
-
+use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -66,8 +66,8 @@ class UpdateAnnouncementLogic extends AbstractControllerLogic
         $annoucement_object = new AnnouncementObject(
             $request->input('title'),
             $request->input('description'),
-            $request->input('starting_on'),
-            $request->input('ending_on')
+            Carbon::createFromFormat('d-m-Y', $request->input('starting_on'))->format('Y-m-d H:i:s'),
+            Carbon::createFromFormat('d-m-Y', $request->input('ending_on'))->format('Y-m-d H:i:s')
         );
 
         $this->canUpdateAnnouncement->passes($annoucement_object);
diff --git a/app/Http/Resources/AnnouncementResource.php b/app/Http/Resources/AnnouncementResource.php
index 26e1c2f9..2e6048e0 100644
--- a/app/Http/Resources/AnnouncementResource.php
+++ b/app/Http/Resources/AnnouncementResource.php
@@ -20,8 +20,8 @@ class AnnouncementResource extends JsonResource
             'title' => $this->title,
             'description' => $this->description,
             'segments' => $this->segments,
-            'starting_on' => Carbon::parse($this->starting_on)->format('Y-m-d'),
-            'ending_on' => Carbon::parse($this->ending_on)->format('Y-m-d'),
+            'starting_on' => Carbon::parse($this->starting_on)->format('d-m-Y'),
+            'ending_on' => Carbon::parse($this->ending_on)->format('d-m-Y'),
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'),
         ];
     }
diff --git a/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue b/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue
index a2408fc3..8fbe7de1 100644
--- a/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue
+++ b/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue
@@ -32,16 +32,16 @@
                     </div>
 
                     <div class="row m-b-20">
-                        <div class="col-6">
+                        <div class="col-6 p-r-0">
                             <validation-wrapper-component :validator="$v.parameters.starting_on">
                                 <label>Start Date</label>
-                                <input type="date" v-model="parameters.starting_on">
+                                <date-picker-component v-model="parameters.starting_on"></date-picker-component>
                             </validation-wrapper-component>
                         </div>
-                        <div class="col-6">
+                        <div class="col-6 p-l-0">
                             <validation-wrapper-component :validator="$v.parameters.ending_on">
                                 <label>End Date</label>
-                                <input type="date" v-model="parameters.ending_on">
+                                <date-picker-component v-model="parameters.ending_on"></date-picker-component>
                             </validation-wrapper-component>
                         </div>
                     </div>