From 08da9f9776be16b4019828c31f6edb7dd7f862b3 Mon Sep 17 00:00:00 2001 From: Olivier Legat Date: Sat, 18 Dec 2021 16:46:50 +0100 Subject: [PATCH] loading modale, getting user selections --- app/Enums/Planning/ActivityType.php | 12 + app/Http/Controllers/ScheduleController.php | 13 +- config/app.php | 1 + resources/js/components/ScheduleComponent.vue | 279 ++++++++++++++---- resources/views/schedule/index.blade.php | 125 ++++---- 5 files changed, 315 insertions(+), 115 deletions(-) diff --git a/app/Enums/Planning/ActivityType.php b/app/Enums/Planning/ActivityType.php index 1fe2346..76bc307 100644 --- a/app/Enums/Planning/ActivityType.php +++ b/app/Enums/Planning/ActivityType.php @@ -30,4 +30,16 @@ class ActivityType extends BaseEnumRoutable 'absence' => trans('Absence'), ]; } + + public static function colors(): array + { + return [ + 'support' => '#c6e0b4', + 'rnd' => '#b4c6e7', + 'dev' => '#00b0f0', + 'projects' => '#ffe699', + 'management' => '#f4b084', + 'absence' => '#aeaaaa' + ]; + } } diff --git a/app/Http/Controllers/ScheduleController.php b/app/Http/Controllers/ScheduleController.php index d14ac4f..61e0479 100644 --- a/app/Http/Controllers/ScheduleController.php +++ b/app/Http/Controllers/ScheduleController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Enums\Planning\ActivityType; use App\Enums\Role; use App\Models\Schedule; use App\Models\User; @@ -45,6 +46,11 @@ class ScheduleController extends Controller $prevDate = null; $prevSlot = null; foreach ($schedules as $schedule) { + if (isset($schedule->relatedModel->name)) { + $id_lie = array('label'=>$schedule->relatedModel->name, 'value'=>$schedule->id_lie); + } else { + $id_lie = array('label'=>'Ticket '.$schedule->id_lie, 'value'=>$schedule->id_lie); + } if ($prevUserId != $schedule->user_id) { //nouveau user $arSchedules[$schedule->user_id] = array( @@ -53,7 +59,7 @@ class ScheduleController extends Controller 'id' => $schedule->id, 'type' => $schedule->activity, 'text' => $schedule->description, - 'id_lie' => $schedule->id_lie, + 'id_lie' => $id_lie, //$schedule->id_lie, 'model_lie' => $schedule->model_lie, ), ) @@ -67,7 +73,7 @@ class ScheduleController extends Controller 'id' => $schedule->id, 'type' => $schedule->activity, 'text' => $schedule->description, - 'id_lie' => $schedule->id_lie, + 'id_lie' => $id_lie, //$schedule->id_lie, 'model_lie' => $schedule->model_lie, ), ); @@ -79,7 +85,7 @@ class ScheduleController extends Controller 'id' => $schedule->id, 'type' => $schedule->activity, 'text' => $schedule->description, - 'id_lie' => $schedule->id_lie, + 'id_lie' => $id_lie, //$schedule->id_lie, 'model_lie' => $schedule->model_lie, ); } else { @@ -102,7 +108,6 @@ class ScheduleController extends Controller ); } - return view('schedule.index', compact('users', 'date', 'weekCells', 'arSchedules')); } } diff --git a/config/app.php b/config/app.php index 3602bed..bb31bde 100644 --- a/config/app.php +++ b/config/app.php @@ -236,6 +236,7 @@ return [ 'LoadLevel' => App\Enums\LoadLevel::class, 'CellModel' => App\Enums\Planning\CellModel::class, 'CellType' => App\Enums\Planning\CellType::class, + 'ActivityType' => App\Enums\Planning\ActivityType::class, 'TableRow' => App\Enums\Planning\TableRow::class, 'Carbon' => 'Carbon\Carbon' ], diff --git a/resources/js/components/ScheduleComponent.vue b/resources/js/components/ScheduleComponent.vue index c79e35c..1e6b26a 100644 --- a/resources/js/components/ScheduleComponent.vue +++ b/resources/js/components/ScheduleComponent.vue @@ -12,26 +12,26 @@ - + S {{item.num}} - {{item.month}} {{item.year}} - + {{day.day}} {{day.num}}