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

fix exam exit

Browse Source
This commit is contained in:
xiaomlove
2023-04-29 03:46:14 +08:00
parent 10cd69852c
commit bc926b798f
7 changed files with 114 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/Models/Exam.php
View File

@@ -12,7 +12,7 @@ class Exam extends NexusModel
public $timestamps = true;
protected $casts = [
'filters' => 'object',
'filters' => 'array',
'indexes' => 'array',
];
@@ -116,25 +116,27 @@ class Exam extends NexusModel
$currentFilters = $this->filters;
$arr = [];
$filter = self::FILTER_USER_CLASS;
if (!empty($currentFilters->{$filter})) {
$classes = collect(User::$classes)->only($currentFilters->{$filter});
if (!empty($currentFilters[$filter])) {
$classes = collect(User::$classes)->only($currentFilters[$filter]);
$arr[] = sprintf('%s: %s', nexus_trans("exam.filters.$filter"), $classes->pluck('text')->implode(', '));
}
$filter = self::FILTER_USER_REGISTER_TIME_RANGE;
if (!empty($currentFilters->{$filter})) {
$range = $currentFilters->{$filter};
$arr[] = sprintf(
"%s: <br/>%s ~ %s",
nexus_trans("exam.filters.$filter"),
$range[0] ? Carbon::parse($range[0])->toDateTimeString() : '--',
$range[1] ? Carbon::parse($range[1])->toDateTimeString() : '--'
);
if (!empty($currentFilters[$filter])) {
$range = $currentFilters[$filter];
if (!empty($range[0]) || !empty($range[1])) {
$arr[] = sprintf(
"%s: <br/>%s ~ %s",
nexus_trans("exam.filters.$filter"),
$range[0] ? Carbon::parse($range[0])->toDateTimeString() : '--',
$range[1] ? Carbon::parse($range[1])->toDateTimeString() : '--'
);
}
}
$filter = self::FILTER_USER_DONATE;
if (!empty($currentFilters->{$filter})) {
$donateStatus = $classes = collect(User::$donateStatus)->only($currentFilters->{$filter});
if (!empty($currentFilters[$filter])) {
$donateStatus = collect(User::$donateStatus)->only($currentFilters[$filter]);
$arr[] = sprintf('%s: %s', nexus_trans("exam.filters.$filter"), $donateStatus->pluck('text')->implode(', '));
}