From 8626d7c6f2cf39fcf54cca441517f0a196d795e1 Mon Sep 17 00:00:00 2001 From: aspsptyd Date: Thu, 5 Feb 2026 22:13:47 +0700 Subject: [PATCH 01/10] Modify: eager loading dan paginate --- app/Http/Controllers/TaskmanController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/TaskmanController.php b/app/Http/Controllers/TaskmanController.php index a2c9db1..2676b60 100644 --- a/app/Http/Controllers/TaskmanController.php +++ b/app/Http/Controllers/TaskmanController.php @@ -42,7 +42,7 @@ public function goals($plan) } ]) ->orderBy('deadline', 'desc') - ->paginate(6); + ->paginate(8); $infoPlanAgenda = ModelPlan::findOrFail($plan); @@ -272,7 +272,8 @@ public function deleteItemTask(Request $request) public function listTaskByDate(Request $request) { - $tasks = ModelTask::whereDate('due', $request->date) + $tasks = ModelTask::with('user') // ๐Ÿ‘ˆ eager load user + ->whereDate('due', $request->date) ->orderBy('id') ->get(); From 28ddbb0ab8884c57a271b13c970f57f85b1076cf Mon Sep 17 00:00:00 2001 From: aspsptyd Date: Mon, 9 Feb 2026 00:04:23 +0700 Subject: [PATCH 02/10] Add: function initial name of month --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0b5a44c..c78f284 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,8 @@ "app/Helpers/DayLefted.php", "app/Helpers/GetNumberDate.php", "app/Helpers/TotalDays.php", - "app/Helpers/CheckTodaysInRange.php" + "app/Helpers/CheckTodaysInRange.php", + "app/Helpers/GetNameInitMonth.php" ] }, "autoload-dev": { From f15149c7bf4378282d6ef2caf035c095e2cd2c43 Mon Sep 17 00:00:00 2001 From: aspsptyd Date: Mon, 9 Feb 2026 00:04:32 +0700 Subject: [PATCH 03/10] Add: new function --- app/Helpers/GetNameInitMonth.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 app/Helpers/GetNameInitMonth.php diff --git a/app/Helpers/GetNameInitMonth.php b/app/Helpers/GetNameInitMonth.php new file mode 100644 index 0000000..04a7392 --- /dev/null +++ b/app/Helpers/GetNameInitMonth.php @@ -0,0 +1,16 @@ +translatedFormat('F'); // Januari + return strtoupper(mb_substr($bulan, 0, 1)); // J + } +} From 15ab485eb25494fad54854e394d51a55c22d6920 Mon Sep 17 00:00:00 2001 From: aspsptyd Date: Mon, 9 Feb 2026 00:04:52 +0700 Subject: [PATCH 04/10] Add: new routes --- app/Http/Controllers/TaskmanController.php | 39 ++++++++++++++++++++-- routes/web.php | 1 + 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/TaskmanController.php b/app/Http/Controllers/TaskmanController.php index 2676b60..34f8076 100644 --- a/app/Http/Controllers/TaskmanController.php +++ b/app/Http/Controllers/TaskmanController.php @@ -2,8 +2,6 @@ namespace App\Http\Controllers; -use App\Helpers\CheckTodaysInRange; -use App\Helpers\GetNumberDate; use App\Models\MonitorWeekly as ModelWeekly; use Illuminate\Http\Request; use App\Models\Taskman as ModelTaskman; @@ -280,4 +278,41 @@ public function listTaskByDate(Request $request) return response()->json($tasks); } + + public function addWeekly(Request $request) + { + $planAgenda = $request->input('id_plan_agn'); + $current_page = $request->input('current_page'); + + $data = [ + 'weekly' => $request->input('weeklyinit'), + 'start_date' => $request->input('start_date'), + 'end_date' => $request->input('end_date') + ]; + + if ($request->input('bufferStatus')) { + $bufferDays = max(0, (int) $request->input('bufferDays', 0)); + + $startBuffer = Carbon::parse($request->input('end_date')) + ->addDay() + ->format('Y-m-d'); + + $endBuffer = Carbon::parse($startBuffer) + ->addDays($bufferDays) + ->format('Y-m-d'); + + $data['buffer_start'] = $startBuffer; + $data['buffer_end'] = $endBuffer; + } + + if (str_contains(strtolower($request->input('weeklyinit')), 'ext')) { + $data['extention'] = 1; + } else { + $data['extention'] = 0; + } + + ModelWeekly::create($data); + + return redirect()->route('taskman.goals', [$planAgenda, 'page' => $current_page])->with('success', 'Yay, Data weekly berhasil dibuat.'); + } } diff --git a/routes/web.php b/routes/web.php index 515a520..b128e85 100644 --- a/routes/web.php +++ b/routes/web.php @@ -32,6 +32,7 @@ // MODULE TASKMAN Route::get('/taskman', [TaskmanController::class, 'index'])->name('taskman.index'); Route::get('/taskman/goals/{id_plan}', [TaskmanController::class, 'goals'])->name('taskman.goals'); +Route::post('/taskman/add-weekly', [TaskmanController::class, 'addWeekly'])->name('taskman.addWeekly'); Route::post('/taskman/create-plan', [TaskmanController::class, 'createPlan'])->name('taskman.createPlan'); Route::get('/taskman/details', [TaskmanController::class, 'detailTask'])->name('taskman.detailTask'); Route::post('/taskman/store', [TaskmanController::class, 'store'])->name('taskman.store'); From 081ac057644661b41339e413eab83fc7e2834edc Mon Sep 17 00:00:00 2001 From: aspsptyd Date: Mon, 9 Feb 2026 00:05:12 +0700 Subject: [PATCH 05/10] Add: tambah weekly --- .../views/home/taskman/objective.blade.php | 172 ++++++++++++++++-- 1 file changed, 157 insertions(+), 15 deletions(-) diff --git a/resources/views/home/taskman/objective.blade.php b/resources/views/home/taskman/objective.blade.php index 4883390..60c3aca 100644 --- a/resources/views/home/taskman/objective.blade.php +++ b/resources/views/home/taskman/objective.blade.php @@ -503,7 +503,7 @@ class="bx bx-caret-right"> @endforelse + data-bs-toggle="modal" data-bs-target="#modalTambahWeekly">
Tambah Weekly Plan @@ -710,45 +710,110 @@ class="accordion-collapse collapse {{ $isToday ? 'show' : '' }}"
{{-- Modal Edit Objective Key --}} -