mirror of
https://github.com/lkddi/nexusphp.git
synced 2026-04-24 12:07:23 +08:00
fix recurring exam assign
This commit is contained in:
@@ -1112,6 +1112,16 @@ class ExamRepository extends BaseRepository
|
|||||||
do_log("$currentLogPrefix, [is_done]");
|
do_log("$currentLogPrefix, [is_done]");
|
||||||
$subjectTransKey = 'exam.checkout_pass_message_subject';
|
$subjectTransKey = 'exam.checkout_pass_message_subject';
|
||||||
$msgTransKey = 'exam.checkout_pass_message_content';
|
$msgTransKey = 'exam.checkout_pass_message_content';
|
||||||
|
if (!empty($exam->recurring) && $this->isExamMatchUser($exam, $examUser->user)) {
|
||||||
|
$examUserToInsert[] = [
|
||||||
|
'uid' => $examUser->user->id,
|
||||||
|
'exam_id' => $exam->id,
|
||||||
|
'begin' => $exam->getBeginForUser(),
|
||||||
|
'end' => $exam->getEndForUser(),
|
||||||
|
'created_at' => $now,
|
||||||
|
'updated_at' => $now,
|
||||||
|
];
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
do_log("$currentLogPrefix, [will be banned]");
|
do_log("$currentLogPrefix, [will be banned]");
|
||||||
clear_user_cache($examUser->user->id, $examUser->user->passkey);
|
clear_user_cache($examUser->user->id, $examUser->user->passkey);
|
||||||
@@ -1149,16 +1159,6 @@ class ExamRepository extends BaseRepository
|
|||||||
'subject' => $subject,
|
'subject' => $subject,
|
||||||
'msg' => $msg
|
'msg' => $msg
|
||||||
];
|
];
|
||||||
if (!empty($exam->recurring) && $this->isExamMatchUser($exam, $examUser->user)) {
|
|
||||||
$examUserToInsert[] = [
|
|
||||||
'uid' => $examUser->user->id,
|
|
||||||
'exam_id' => $exam->id,
|
|
||||||
'begin' => $exam->getBeginForUser(),
|
|
||||||
'end' => $exam->getEndForUser(),
|
|
||||||
'created_at' => $now,
|
|
||||||
'updated_at' => $now,
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
DB::transaction(function () use ($uidToDisable, $messageToSend, $examUserIdArr, $examUserToInsert, $userBanLog, $userModcommentUpdate, $userTable, $logPrefix) {
|
DB::transaction(function () use ($uidToDisable, $messageToSend, $examUserIdArr, $examUserToInsert, $userBanLog, $userModcommentUpdate, $userTable, $logPrefix) {
|
||||||
ExamUser::query()->whereIn('id', $examUserIdArr)->update(['status' => ExamUser::STATUS_FINISHED]);
|
ExamUser::query()->whereIn('id', $examUserIdArr)->update(['status' => ExamUser::STATUS_FINISHED]);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.12');
|
defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.12');
|
||||||
defined('RELEASE_DATE') || define('RELEASE_DATE', '2024-05-09');
|
defined('RELEASE_DATE') || define('RELEASE_DATE', '2024-05-10');
|
||||||
defined('IN_TRACKER') || define('IN_TRACKER', false);
|
defined('IN_TRACKER') || define('IN_TRACKER', false);
|
||||||
defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
|
defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
|
||||||
defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");
|
defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");
|
||||||
|
|||||||
Reference in New Issue
Block a user