mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 06:20:21 +00:00
subtask.title, timeblock is_finished
This commit is contained in:
1 parent
34514e44c1
commit
f3ed454d6f
5 files changed
+80
-1
No files matched your search
+14
-1
@@ -13,6 +13,7 @@ use App\Http\Resources\SubTaskCollection;
|
||||
use App\Http\Resources\SubTaskResource;
|
||||
use App\Http\Resources\TeamCollection;
|
||||
use App\Http\Resources\TeamResource;
|
||||
use App\Http\Resources\TimeblockResource;
|
||||
use App\Http\Resources\UserCollection;
|
||||
use App\Http\Resources\UserResource;
|
||||
use App\Models\Blocker;
|
||||
@@ -20,6 +21,7 @@ use App\Models\MasterTask;
|
||||
use App\Models\Project;
|
||||
use App\Models\SubTask;
|
||||
use App\Models\Team;
|
||||
use App\Models\Timeblock;
|
||||
use App\Models\User;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
use Illuminate\Http\Request;
|
||||
@@ -110,7 +112,7 @@ Route::middleware(['auth:sanctum', 'abilities:full-access'])->group(function ()
|
||||
$projectIDs = Project::where('name', 'like', '%' . $search . '%')->orWhere('code', 'like', '%' . $search . '%')->get()->pluck('id');
|
||||
|
||||
$userIDs = User::where('firstname', 'like', '%' . $search . '%')->orWhere('lastname', 'like', '%' . $search . '%')->get()->pluck('id');
|
||||
|
||||
|
||||
$teams = Team::whereHas('users', function($q) use($userIDs) {
|
||||
$q->whereIn('user_id', $userIDs);
|
||||
})->orWhere('name', 'like', '%' . $search . '%' )->get();
|
||||
@@ -125,6 +127,17 @@ Route::middleware(['auth:sanctum', 'abilities:full-access'])->group(function ()
|
||||
'subtasks' => new SubTaskCollection($subtasks),
|
||||
];
|
||||
});
|
||||
|
||||
Route::put('/v1/timeblocks/{id}', function ($id, Request $request) {
|
||||
$is_finished = $request->all()['data']['is_finished'];
|
||||
|
||||
$timeblock = Timeblock::find($id);
|
||||
|
||||
$timeblock->is_finished = $is_finished;
|
||||
$timeblock->save();
|
||||
|
||||
return new TimeblockResource($timeblock);
|
||||
});
|
||||
});
|
||||
|
||||
Route::middleware(['auth:sanctum', 'abilities:password-reset'])->group(function () {
|
||||
|
||||
Reference in new issue
Block a user