exam_user add status: avoid

This commit is contained in:
xiaomlove
2021-06-10 02:16:08 +08:00
parent f3417e9653
commit a0b56222b2
7 changed files with 38 additions and 1 deletions

View File

@@ -92,4 +92,11 @@ class ExamUserController extends Controller
return $this->success($result, 'Remove user exam success!');
}
public function avoid(Request $request)
{
$request->validate(['id' => 'required']);
$result = $this->repository->avoidExamUser($request->id);
return $this->success($result, 'Avoid user exam success!');
}
}

View File

@@ -10,10 +10,12 @@ class ExamUser extends NexusModel
const STATUS_NORMAL = 0;
const STATUS_FINISHED = 1;
const STATUS_AVOIDED = -1;
public static $status = [
self::STATUS_NORMAL => ['text' => 'Normal'],
self::STATUS_FINISHED => ['text' => 'Finished'],
self::STATUS_AVOIDED => ['text' => 'Avoided'],
];
const IS_DONE_YES = 1;

View File

@@ -355,6 +355,7 @@ class ExamRepository extends BaseRepository
}
$examUsers = $query->get();
if ($examUsers->isEmpty()) {
do_log("$logPrefix, no examUser, query: " . last_query());
return null;
}
if ($examUsers->count() > 1) {
@@ -454,6 +455,13 @@ class ExamRepository extends BaseRepository
return $result;
}
public function avoidExamUser(int $examUserId)
{
$examUser = ExamUser::query()->findOrFail($examUserId);
$result = $examUser->update(['status' => ExamUser::STATUS_AVOIDED]);
return $result;
}
public function cronjonAssign()
{
$exams = $this->listValid(null, Exam::DISCOVERED_YES);

View File

@@ -37,7 +37,7 @@ class UserRepository extends BaseRepository
$baseInfo = $userResource->response()->getData(true)['data'];
$examRep = new ExamRepository();
$examProgress = $examRep->getUserExamProgress($id, ExamUser::STATUS_NORMAL, ['exam']);
$examProgress = $examRep->getUserExamProgress($id, null, ['exam']);
if ($examProgress) {
$examResource = new ExamUserResource($examProgress);
$examInfo = $examResource->response()->getData(true)['data'];