JandL_gitea/jandl-taskmanager-app
1
0 Fork 0
mirror of https://bitbucket.org/studiotem/jandl-taskmanager-app.git synced 2026-10-21 14:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

adding draft subtask logic to backend

Browse Source
This commit is contained in:
StudioTem committed 2025-12-03 09:57:12 +01:00
1 parent 570e29e5c4
commit 21ad81cee7
5 files changed
+136 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

be/routes/api.php
+5 -3
View File
@@ -79,7 +79,7 @@ Route::middleware(['auth:sanctum', 'abilities:full-access'])->group(function ()
Route::delete('/v1/mastertasks/{id}', MasterTaskController::class . '@delete');
Route::get('/v1/mastertasks/{id}/subtasks', function ($id) {
return new SubTaskCollection( SubTask::whereHas('mastertask', function ($query) use ($id) {
return new SubTaskCollection( SubTask::published()->whereHas('mastertask', function ($query) use ($id) {
$query->where('id', $id);
})->get());
});
@@ -88,7 +88,7 @@ Route::middleware(['auth:sanctum', 'abilities:full-access'])->group(function ()
Route::put('/v1/subtasks/{id}', SubTaskController::class . '@update');
Route::get('/v1/subtasks/{id}', function ($id) {
return new SubTaskResource( SubTask::find($id));
return new SubTaskResource( SubTask::published()->find($id));
});
Route::post('/v1/subtasks/{id}/timesheet', SubTaskController::class . '@submitTimesheet');
@@ -117,7 +117,9 @@ Route::middleware(['auth:sanctum', 'abilities:full-access'])->group(function ()
$q->whereIn('user_id', $userIDs);
})->orWhere('name', 'like', '%' . $search . '%' )->get();
$mastertasks = MasterTask::with('subtasks')->where('title', 'like', '%' . $search . '%')->orWhereIn('project_id', $projectIDs)->orWhereIn('team_id', $teams->pluck('id'))->get();
$mastertasks = MasterTask::with(['subtasks' => function($query) {
$query->where('is_draft', false);
}])->where('title', 'like', '%' . $search . '%')->orWhereIn('project_id', $projectIDs)->orWhereIn('team_id', $teams->pluck('id'))->get();
$subtasks = $mastertasks->pluck('subtasks')->flatten();