Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/scorll board #251

Merged
merged 5 commits into from Aug 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions app/Http/Controllers/Ajax/ContestAdminController.php
Expand Up @@ -11,6 +11,7 @@
use App\Jobs\ProcessSubmission;
use Auth;
use Cache;
use App\Http\Middleware\ContestAccount;

class ContestAdminController extends Controller
{
Expand Down Expand Up @@ -239,4 +240,21 @@ public function generateContestAccount(Request $request)
Cache::tags(['contest', 'account'])->put($all_data["cid"], $cache_data);
return ResponseModel::success(200, null, $ret);
}

public function getScrollBoardData(Request $request)
{
$request->validate([
'cid' => 'required|integer',
]);
$cid = $request->input('cid');
$contestModel = new ContestModel();
if($contestModel->judgeClearance($cid,Auth::user()->id) != 3){
return ResponseModel::err(2001);
}
if($contestModel->remainingTime($cid) >= 0){
return ResponseModel::err(4008);
}
$data = $contestModel->getScrollBoardData($cid);
return ResponseModel::success(200, null, $data);
}
}
17 changes: 17 additions & 0 deletions app/Http/Controllers/Contest/AdminController.php
Expand Up @@ -33,6 +33,7 @@ public function admin($cid)
$basicInfo=$contestModel->basic($cid);
$contest_accounts=$accountModel->getContestAccount($cid);
$gcode=$contestModel->gcode($cid);
$isEnd = $contestModel->remainingTime($cid) < 0;
return view('contest.board.admin', [
'page_title'=>"Admin",
'navigation' => "Contest",
Expand All @@ -45,6 +46,7 @@ public function admin($cid)
'verified'=>$verified,
'gcode'=>$gcode,
'basic'=>$basicInfo,
'is_end'=>$isEnd,
]);
}

Expand Down Expand Up @@ -80,4 +82,19 @@ public function refreshContestRank($cid){
}
return Redirect::route('contest.rank', ['cid' => $cid]);
}

public function scrollBoard($cid){
$contestModel=new ContestModel();
$clearance=$contestModel->judgeClearance($cid, Auth::user()->id);
if ($clearance <= 2) {
return Redirect::route('contest_detail', ['cid' => $cid]);
}
$basicInfo=$contestModel->basic($cid);
return view('contest.board.scrollBoard', [
'page_title'=>"ScrollBoard",
'navigation' => "Contest",
'site_title' => config("app.name"),
'basic_info' => $basicInfo,
]);
}
}
34 changes: 33 additions & 1 deletion app/Models/ContestModel.php
Expand Up @@ -974,6 +974,7 @@ public function issueAnnouncement($cid, $title, $content, $uid, $remote_code=nul
public function remoteAnnouncement($remote_code) {
return DB::table("contest_clarification")->where("remote_code", $remote_code)->get()->first();
}

public function isContestEnded($cid)
{
return DB::table("contest")->where("cid", $cid)->where("end_time", "<", date("Y-m-d H:i:s"))->count();
Expand Down Expand Up @@ -1845,7 +1846,8 @@ public function getContestAccount($cid)
return Cache::tags(['contest', 'account'])->get($cid);
}

public function praticeAnalysis($cid){
public function praticeAnalysis($cid)
{
$gid = DB::table('contest')
->where('cid',$cid)
->first()['gid'];
Expand Down Expand Up @@ -1908,4 +1910,34 @@ public function isVerified($cid)
{
return DB::table('contest')->where('cid','=',$cid)->pluck('verified')->first();
}

public function getScrollBoardData($cid)
{
$members = DB::table("submission")
->join('users','users.id','=','submission.uid')
->join('contest', 'contest.cid', '=', 'submission.cid')
->join('group_member', 'users.id', '=', 'group_member.uid')
->where('submission.cid', $cid)->select('users.id as uid','users.name as name','group_member.nick_name as nick_name')
->groupBy('uid')->get()->all();
$submissions = DB::table("submission")
->where('cid', $cid)
->select('sid', 'verdict', 'submission_date', 'pid', 'uid')
->orderBy('submission_date')
->get()->all();
$problems = DB::table('contest_problem')
->where('cid', $cid)
->select('ncode','pid')
->orderBy('ncode')
->get()->all();
$contest = DB::table('contest')
->where('cid',$cid)
->select('begin_time','end_time','froze_length')
->first();
return [
'members' => $members,
'submissions' => $submissions,
'problems' => $problems,
'contest' => $contest,
];
}
}
1 change: 1 addition & 0 deletions app/Models/ResponseModel.php
Expand Up @@ -79,6 +79,7 @@ private static function desc($errCode)
'4005' => "Registration Denied",
'4006' => "AlreadyRegistered",
'4007' => "A contest cannot be both a public and a practice contest",
'4008' => "The contest is not over.",

'5000' => "Status-Related Error",
'5001' => "Status Not Found",
Expand Down
5 changes: 5 additions & 0 deletions resources/views/contest/board/admin.blade.php
Expand Up @@ -122,6 +122,11 @@
<ul class="list-group bmd-list-group p-0">
<a href="/contest/{{$cid}}/admin/refreshContestRank" class="list-group-item admin-tab-text wemd-white wemd-lighten-4"> Refresh Contest Rank</a>
</ul>
@if($is_end)
<ul class="list-group bmd-list-group p-0">
<a href="/contest/{{$cid}}/scrollBoard" class="list-group-item admin-tab-text wemd-white wemd-lighten-4"> Scroll Board</a>
</ul>
@endif
</div>

<div class="col-9 pt-3">
Expand Down