lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-04-14 20:40:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix exam get begin and end

Browse Source
This commit is contained in:
xiaomlove
2024-04-13 03:17:50 +08:00
parent 6ea03a2515
commit cb4f91bee5
3 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/Exam.php
View File

@@ -164,14 +164,14 @@ class Exam extends NexusModel
return implode("<br/>", $arr);
}
public function begin(): Attribute
protected function beginForUser(): Attribute
{
return new Attribute(
get: fn ($value) => $value ? Carbon::parse($value) : Carbon::now()
);
}
public function end(): Attribute
protected function endForUser(): Attribute
{
return new Attribute(
get: function ($value, $attributes) {
@@ -180,8 +180,8 @@ class Exam extends NexusModel
}
if (!empty($attributes['duration'])) {
/** @var Carbon $begin */
$begin = $this->begin;
return $begin->addDays($attributes['duration']);
$begin = $this->begin_for_user;
return $begin->clone()->addDays($attributes['duration']);
}
throw new \RuntimeException("No specific end or duration");
}

23
app/Repositories/ExamRepository.php
View File

@@ -349,27 +349,12 @@ class ExamRepository extends BaseRepository
'exam_id' => $exam->id,
];
if (empty($begin)) {
if (!empty($exam->begin)) {
$begin = $exam->begin;
$logPrefix .= ", begin from exam->begin: $begin";
} else {
$begin = now();
$logPrefix .= ", begin from now: $begin";
}
$begin = $exam->begin_for_user;
} else {
$begin = Carbon::parse($begin);
}
if (empty($end)) {
if (!empty($exam->end)) {
$end = $exam->end;
$logPrefix .= ", end from exam->end: $end";
} elseif ($exam->duration > 0) {
$duration = $exam->duration;
$end = $begin->clone()->addDays($duration)->toDateTimeString();
$logPrefix .= ", end from begin + duration($duration): $end";
} else {
throw new \RuntimeException("No specific end or duration");
}
$end = $exam->end_for_user;
} else {
$end = Carbon::parse($end);
}
@@ -1018,8 +1003,8 @@ class ExamRepository extends BaseRepository
$size = 1000;
$minId = 0;
$result = 0;
$begin = $exam->begin;
$end = $exam->end;
$begin = $exam->begin_for_user;
$end = $exam->end_for_user;
while (true) {
$logPrefix = sprintf('[%s], exam: %s, size: %s', __FUNCTION__, $exam->id , $size);
$users = (clone $baseQuery)->where("$userTable.id", ">", $minId)->limit($size)->get();