[exam] finish assign and remove

This commit is contained in:
xiaomlove
2021-04-28 01:22:25 +08:00
parent d2e05c812e
commit 034d1c23fb
16 changed files with 988 additions and 34 deletions
+8 -3
View File
@@ -7,6 +7,7 @@ use App\Http\Resources\ExamUserResource;
use App\Http\Resources\UserResource;
use App\Repositories\ExamRepository;
use App\Repositories\UserRepository;
use Carbon\Carbon;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
@@ -44,9 +45,13 @@ class ExamUserController extends Controller
'uid' => 'required',
];
$request->validate($rules);
$result = $this->repository->assignToUser($request->uid, $request->exam_id, $request->begin, $request->end);
$resource = new ExamResource($result);
return $this->success($resource);
$timeRange = $request->get('time_range', []);
$begin = isset($timeRange[0]) ? Carbon::parse($timeRange[0])->toDateTimeString() : null;
$end = isset($timeRange[1])? Carbon::parse($timeRange[1])->toDateTimeString() : null;
$result = $this->repository->assignToUser($request->uid, $request->exam_id, $begin, $end);
$resource = new ExamUserResource($result);
return $this->success($resource, 'Assign exam success!');
}
/**
+5 -3
View File
@@ -114,11 +114,13 @@ class UserController extends Controller
return $this->success($resource);
}
public function matchExams()
public function matchExams(Request $request)
{
$id = Auth::id();
$request->validate([
'uid' => 'required',
]);
$examRepository = new ExamRepository();
$result = $examRepository->listMatchExam($id);
$result = $examRepository->listMatchExam($request->uid);
$resource = ExamResource::collection($result);
return $this->success($resource);
}