@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | { |
18 | 18 | use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, Trackable; |
19 | 19 | |
20 | - public $tries = 1; |
|
20 | + public $tries=1; |
|
21 | 21 | protected $cid; |
22 | 22 | protected $config; |
23 | 23 | |
@@ -30,12 +30,12 @@ discard block |
||
30 | 30 | public function __construct($cid, $config) |
31 | 31 | { |
32 | 32 | $this->prepareStatus(); |
33 | - $this->cid = $cid; |
|
34 | - $default = [ |
|
33 | + $this->cid=$cid; |
|
34 | + $default=[ |
|
35 | 35 | 'cover' => false, |
36 | 36 | 'advice' => false, |
37 | 37 | ]; |
38 | - $this->config = array_merge($default, $config); |
|
38 | + $this->config=array_merge($default, $config); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | /** |
@@ -45,20 +45,20 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function handle() |
47 | 47 | { |
48 | - $cid = $this->cid; |
|
49 | - $config = $this->config; |
|
48 | + $cid=$this->cid; |
|
49 | + $config=$this->config; |
|
50 | 50 | |
51 | 51 | if (!is_dir(storage_path("app/contest/pdf/"))) { |
52 | 52 | mkdir(storage_path("app/contest/pdf/"), 0777, true); |
53 | 53 | } |
54 | 54 | |
55 | - $record = Contest::find($cid); |
|
55 | + $record=Contest::find($cid); |
|
56 | 56 | |
57 | 57 | // $headerPath = 'headers/'.Str::random(32).".html"; |
58 | 58 | |
59 | 59 | // Storage::disk("temp")->put('headers/'.Str::random(32).".html", "Generated by NOJ - https://github.com/ZsgsDesign/NOJ"); |
60 | 60 | |
61 | - $pdfContest = PDF::setOptions([ |
|
61 | + $pdfContest=PDF::setOptions([ |
|
62 | 62 | // 'footer-html' => storage_path("temp/$headerPath"), |
63 | 63 | 'header-left' => "Generated by NOJ - https://github.com/ZsgsDesign/NOJ", |
64 | 64 | 'header-line' => true, |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | |
117 | 117 | // $pdf->save(storage_path("app/contest/pdf/$cid.pdf")); |
118 | 118 | |
119 | - $record->pdf = 1; |
|
119 | + $record->pdf=1; |
|
120 | 120 | $record->save(); |
121 | 121 | } |
122 | 122 |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | if ($clearance<1) { |
180 | 180 | return Redirect::route('group.detail', ['gcode' => $gcode]); |
181 | 181 | } |
182 | - $homeworkInfo = GroupHomework::where(['id' => $homework_id, 'group_id' => $basic_info['gid']])->first(); |
|
182 | + $homeworkInfo=GroupHomework::where(['id' => $homework_id, 'group_id' => $basic_info['gid']])->first(); |
|
183 | 183 | if (blank($homeworkInfo)) { |
184 | 184 | return Redirect::route('group.detail', ['gcode' => $gcode]); |
185 | 185 | } |
@@ -195,13 +195,13 @@ discard block |
||
195 | 195 | |
196 | 196 | public function homeworkStatistics($gcode, $homework_id) |
197 | 197 | { |
198 | - $groupModel = new GroupModel(); |
|
199 | - $basic_info = $groupModel->details($gcode); |
|
200 | - $clearance = $groupModel->judgeClearance($basic_info["gid"], Auth::user()->id); |
|
201 | - if ($clearance < 2) { |
|
198 | + $groupModel=new GroupModel(); |
|
199 | + $basic_info=$groupModel->details($gcode); |
|
200 | + $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id); |
|
201 | + if ($clearance<2) { |
|
202 | 202 | return Redirect::route('group.detail', ['gcode' => $gcode]); |
203 | 203 | } |
204 | - $homeworkInfo = GroupHomework::where(['id' => $homework_id, 'group_id' => $basic_info['gid']])->first(); |
|
204 | + $homeworkInfo=GroupHomework::where(['id' => $homework_id, 'group_id' => $basic_info['gid']])->first(); |
|
205 | 205 | if (blank($homeworkInfo)) { |
206 | 206 | return Redirect::route('group.detail', ['gcode' => $gcode]); |
207 | 207 | } |
@@ -84,7 +84,7 @@ |
||
84 | 84 | public function problemExists(Request $request) |
85 | 85 | { |
86 | 86 | $request->validate(["pcode" => "required|string|max:100"]); |
87 | - $problem = Problem::where('pcode', $request->pcode)->first(); |
|
87 | + $problem=Problem::where('pcode', $request->pcode)->first(); |
|
88 | 88 | if (filled($problem)) { |
89 | 89 | return ResponseModel::success(200, null, $problem->only(["pcode", "title"])); |
90 | 90 | } else { |
@@ -319,9 +319,9 @@ discard block |
||
319 | 319 | public function createHomework(Request $request) |
320 | 320 | { |
321 | 321 | try { |
322 | - $all = $request->all(); |
|
323 | - $all['currently_at'] = strtotime('now'); |
|
324 | - $validator = Validator::make($all, [ |
|
322 | + $all=$request->all(); |
|
323 | + $all['currently_at']=strtotime('now'); |
|
324 | + $validator=Validator::make($all, [ |
|
325 | 325 | 'title' => 'required|string|min:1|max:100', |
326 | 326 | 'description' => 'required|string|min:1|max:65535', |
327 | 327 | 'ended_at' => 'required|date|after:currently_at', |
@@ -340,29 +340,29 @@ discard block |
||
340 | 340 | throw new Exception($validator->errors()->first()); |
341 | 341 | } |
342 | 342 | |
343 | - if (count($request->problems) > 26) { |
|
343 | + if (count($request->problems)>26) { |
|
344 | 344 | throw new Exception('Please include no more than 26 problems.'); |
345 | 345 | } |
346 | 346 | |
347 | - if (count($request->problems) < 1) { |
|
347 | + if (count($request->problems)<1) { |
|
348 | 348 | throw new Exception('Please include at least one problem.'); |
349 | 349 | } |
350 | 350 | |
351 | - $proceedProblems = $request->problems; |
|
352 | - $proceedProblemCodes = []; |
|
351 | + $proceedProblems=$request->problems; |
|
352 | + $proceedProblemCodes=[]; |
|
353 | 353 | |
354 | 354 | foreach ($proceedProblems as &$problem) { |
355 | 355 | if (!is_array($problem)) { |
356 | 356 | throw new Exception('Each problem object must be an array.'); |
357 | 357 | } |
358 | 358 | |
359 | - $problem['pcode'] = mb_strtoupper(trim($problem['pcode'])); |
|
359 | + $problem['pcode']=mb_strtoupper(trim($problem['pcode'])); |
|
360 | 360 | |
361 | - if(array_search($problem['pcode'], $proceedProblemCodes) !== false) { |
|
361 | + if (array_search($problem['pcode'], $proceedProblemCodes)!==false) { |
|
362 | 362 | throw new Exception("Duplicate Problem"); |
363 | 363 | } |
364 | 364 | |
365 | - $validator = Validator::make($problem, [ |
|
365 | + $validator=Validator::make($problem, [ |
|
366 | 366 | 'pcode' => 'required|string|min:1|max:100', |
367 | 367 | // 'alias' => 'required|string|min:0|max:100|nullable', |
368 | 368 | // 'points' => 'required|integer|gte:1', |
@@ -376,17 +376,17 @@ discard block |
||
376 | 376 | throw new Exception($validator->errors()->first()); |
377 | 377 | } |
378 | 378 | |
379 | - $proceedProblemCodes[] = $problem['pcode']; |
|
379 | + $proceedProblemCodes[]=$problem['pcode']; |
|
380 | 380 | } |
381 | 381 | |
382 | 382 | unset($problem); |
383 | 383 | |
384 | - $problemsDict = Problem::whereIn('pcode', $proceedProblemCodes)->select('pid', 'pcode')->get()->pluck('pid', 'pcode'); |
|
384 | + $problemsDict=Problem::whereIn('pcode', $proceedProblemCodes)->select('pid', 'pcode')->get()->pluck('pid', 'pcode'); |
|
385 | 385 | |
386 | 386 | try { |
387 | - foreach($proceedProblems as &$proceedProblem) { |
|
388 | - $proceedProblem['pid'] = $problemsDict[$proceedProblem['pcode']]; |
|
389 | - if(blank($proceedProblem['pid'])) { |
|
387 | + foreach ($proceedProblems as &$proceedProblem) { |
|
388 | + $proceedProblem['pid']=$problemsDict[$proceedProblem['pcode']]; |
|
389 | + if (blank($proceedProblem['pid'])) { |
|
390 | 390 | throw new Exception(); |
391 | 391 | } |
392 | 392 | } |
@@ -405,14 +405,14 @@ discard block |
||
405 | 405 | ], 422); |
406 | 406 | } |
407 | 407 | |
408 | - $groupModel = new GroupModel(); |
|
409 | - $clearance = $groupModel->judgeClearance($request->gid, Auth::user()->id); |
|
410 | - if ($clearance < 2) { |
|
408 | + $groupModel=new GroupModel(); |
|
409 | + $clearance=$groupModel->judgeClearance($request->gid, Auth::user()->id); |
|
410 | + if ($clearance<2) { |
|
411 | 411 | return ResponseModel::err(2001); |
412 | 412 | } |
413 | 413 | |
414 | 414 | try { |
415 | - $homeworkID = Group::find($request->gid)->addHomework($request->title, $request->description, Carbon::parse($request->ended_at), $proceedProblems); |
|
415 | + $homeworkID=Group::find($request->gid)->addHomework($request->title, $request->description, Carbon::parse($request->ended_at), $proceedProblems); |
|
416 | 416 | } catch (Exception $e) { |
417 | 417 | return ResponseModel::err(7009); |
418 | 418 | } |
@@ -87,7 +87,7 @@ |
||
87 | 87 | |
88 | 88 | $all_data=$request->all(); |
89 | 89 | $filter=$all_data['filter']; |
90 | - $filter=Arr::where($filter, function ($value, $key) { |
|
90 | + $filter=Arr::where($filter, function($value, $key) { |
|
91 | 91 | return in_array($value, [ |
92 | 92 | "Judge Error", |
93 | 93 | "System Error", |
@@ -10,7 +10,7 @@ |
||
10 | 10 | { |
11 | 11 | use HasFactory; |
12 | 12 | |
13 | - protected $with = ['problem']; |
|
13 | + protected $with=['problem']; |
|
14 | 14 | |
15 | 15 | public function homework() |
16 | 16 | { |
@@ -30,17 +30,17 @@ discard block |
||
30 | 30 | |
31 | 31 | public function getStatisticsAttribute() |
32 | 32 | { |
33 | - $cachedStatistics = Cache::tags(['homework', 'statistics'])->get($this->id); |
|
33 | + $cachedStatistics=Cache::tags(['homework', 'statistics'])->get($this->id); |
|
34 | 34 | |
35 | 35 | if (blank($cachedStatistics)) { |
36 | - $cachedStatistics = $this->cacheStatistics(); |
|
36 | + $cachedStatistics=$this->cacheStatistics(); |
|
37 | 37 | } |
38 | 38 | |
39 | - if ($cachedStatistics === false) { |
|
39 | + if ($cachedStatistics===false) { |
|
40 | 40 | return null; |
41 | 41 | } |
42 | 42 | |
43 | - $cachedStatistics['timestamp'] = Carbon::createFromTimestamp($cachedStatistics['timestamp']); |
|
43 | + $cachedStatistics['timestamp']=Carbon::createFromTimestamp($cachedStatistics['timestamp']); |
|
44 | 44 | |
45 | 45 | return $cachedStatistics; |
46 | 46 | } |
@@ -48,25 +48,25 @@ discard block |
||
48 | 48 | public function cacheStatistics() |
49 | 49 | { |
50 | 50 | try { |
51 | - $statistics = []; |
|
52 | - $homeworkProblems = $this->problems->sortBy('order_index'); |
|
53 | - $users = $this->group->members()->where('role', '>=', 1)->get(); |
|
54 | - $userIDArr = $users->pluck('uid'); |
|
55 | - $defaultVerdict = []; |
|
51 | + $statistics=[]; |
|
52 | + $homeworkProblems=$this->problems->sortBy('order_index'); |
|
53 | + $users=$this->group->members()->where('role', '>=', 1)->get(); |
|
54 | + $userIDArr=$users->pluck('uid'); |
|
55 | + $defaultVerdict=[]; |
|
56 | 56 | |
57 | 57 | foreach ($homeworkProblems as $homeworkProblem) { |
58 | - $statistics['problems'][] = [ |
|
58 | + $statistics['problems'][]=[ |
|
59 | 59 | 'pid' => $homeworkProblem->problem_id, |
60 | 60 | 'readable_name' => $homeworkProblem->problem->readable_name, |
61 | 61 | ]; |
62 | - $defaultVerdict[$homeworkProblem->problem_id] = [ |
|
62 | + $defaultVerdict[$homeworkProblem->problem_id]=[ |
|
63 | 63 | "icon" => "checkbox-blank-circle-outline", |
64 | 64 | "color" => "wemd-grey-text" |
65 | 65 | ]; |
66 | 66 | } |
67 | 67 | |
68 | 68 | foreach ($users as $user) { |
69 | - $statistics['data'][$user->uid] = [ |
|
69 | + $statistics['data'][$user->uid]=[ |
|
70 | 70 | 'name' => $user->user->name, |
71 | 71 | 'nick_name' => blank($user->nick_name) ? null : $user->nick_name, |
72 | 72 | 'solved' => 0, |
@@ -75,44 +75,44 @@ discard block |
||
75 | 75 | ]; |
76 | 76 | } |
77 | 77 | |
78 | - $endedAt = Carbon::parse($this->ended_at); |
|
78 | + $endedAt=Carbon::parse($this->ended_at); |
|
79 | 79 | |
80 | 80 | foreach ($homeworkProblems as $homeworkProblem) { |
81 | - $userProbIDArr = []; |
|
81 | + $userProbIDArr=[]; |
|
82 | 82 | |
83 | 83 | foreach ($homeworkProblem->problem->users_latest_submission($userIDArr->diff($userProbIDArr), null, $endedAt, ['Accepted'])->get() as $acceptedRecord) { |
84 | - $statistics['data'][$acceptedRecord['uid']]['verdict'][$homeworkProblem->problem_id] = [ |
|
84 | + $statistics['data'][$acceptedRecord['uid']]['verdict'][$homeworkProblem->problem_id]=[ |
|
85 | 85 | "icon" => "checkbox-blank-circle", |
86 | 86 | "color" => $acceptedRecord['color'] |
87 | 87 | ]; |
88 | 88 | $statistics['data'][$acceptedRecord['uid']]['solved']++; |
89 | - $userProbIDArr[] = $acceptedRecord['uid']; |
|
89 | + $userProbIDArr[]=$acceptedRecord['uid']; |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | foreach ($homeworkProblem->problem->users_latest_submission($userIDArr->diff($userProbIDArr), null, $endedAt, ['Partially Accepted'])->get() as $acceptedRecord) { |
93 | - $statistics['data'][$acceptedRecord['uid']]['verdict'][$homeworkProblem->problem_id] = [ |
|
93 | + $statistics['data'][$acceptedRecord['uid']]['verdict'][$homeworkProblem->problem_id]=[ |
|
94 | 94 | "icon" => "cisco-webex", |
95 | 95 | "color" => $acceptedRecord['color'] |
96 | 96 | ]; |
97 | 97 | $statistics['data'][$acceptedRecord['uid']]['attempted']++; |
98 | - $userProbIDArr[] = $acceptedRecord['uid']; |
|
98 | + $userProbIDArr[]=$acceptedRecord['uid']; |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | foreach ($homeworkProblem->problem->users_latest_submission($userIDArr->diff($userProbIDArr), null, $endedAt)->get() as $acceptedRecord) { |
102 | - $statistics['data'][$acceptedRecord['uid']]['verdict'][$homeworkProblem->problem_id] = [ |
|
102 | + $statistics['data'][$acceptedRecord['uid']]['verdict'][$homeworkProblem->problem_id]=[ |
|
103 | 103 | "icon" => "cisco-webex", |
104 | 104 | "color" => $acceptedRecord['color'] |
105 | 105 | ]; |
106 | 106 | $statistics['data'][$acceptedRecord['uid']]['attempted']++; |
107 | - $userProbIDArr[] = $acceptedRecord['uid']; |
|
107 | + $userProbIDArr[]=$acceptedRecord['uid']; |
|
108 | 108 | } |
109 | 109 | } |
110 | 110 | |
111 | - usort($statistics['data'], function ($a, $b) { |
|
112 | - return $b["solved"] == $a["solved"] ? $b["attempted"] <=> $a["attempted"] : $b["solved"] <=> $a["solved"]; |
|
111 | + usort($statistics['data'], function($a, $b) { |
|
112 | + return $b["solved"]==$a["solved"] ? $b["attempted"] <=> $a["attempted"] : $b["solved"] <=> $a["solved"]; |
|
113 | 113 | }); |
114 | 114 | |
115 | - $statistics['timestamp'] = time(); |
|
115 | + $statistics['timestamp']=time(); |
|
116 | 116 | Cache::tags(['homework', 'statistics'])->put($this->id, $statistics, 360); |
117 | 117 | return $statistics; |
118 | 118 | } catch (Exception $e) { |
@@ -66,21 +66,21 @@ |
||
66 | 66 | |
67 | 67 | // Create Homework Itself |
68 | 68 | |
69 | - $newHomework = new GroupHomework(); |
|
69 | + $newHomework=new GroupHomework(); |
|
70 | 70 | |
71 | - $newHomework->title = $title; |
|
72 | - $newHomework->description = $description; |
|
73 | - $newHomework->ended_at = $endedAt; |
|
74 | - $newHomework->is_simple = 1; |
|
71 | + $newHomework->title=$title; |
|
72 | + $newHomework->description=$description; |
|
73 | + $newHomework->ended_at=$endedAt; |
|
74 | + $newHomework->is_simple=1; |
|
75 | 75 | $this->homework()->save($newHomework); |
76 | 76 | |
77 | 77 | // Created Related Problem List |
78 | 78 | |
79 | - $problemIndex = 1; |
|
79 | + $problemIndex=1; |
|
80 | 80 | foreach ($problems as $problem) { |
81 | - $newProblem = new GroupHomeworkProblem(); |
|
82 | - $newProblem->problem_id = $problem['pid']; |
|
83 | - $newProblem->order_index = $problemIndex++; |
|
81 | + $newProblem=new GroupHomeworkProblem(); |
|
82 | + $newProblem->problem_id=$problem['pid']; |
|
83 | + $newProblem->order_index=$problemIndex++; |
|
84 | 84 | $newHomework->problems()->save($newProblem); |
85 | 85 | } |
86 | 86 |
@@ -11,13 +11,13 @@ discard block |
||
11 | 11 | |
12 | 12 | class Problem extends Model |
13 | 13 | { |
14 | - protected $table = 'problem'; |
|
15 | - protected $primaryKey = 'pid'; |
|
16 | - const UPDATED_AT = "update_date"; |
|
14 | + protected $table='problem'; |
|
15 | + protected $primaryKey='pid'; |
|
16 | + const UPDATED_AT="update_date"; |
|
17 | 17 | |
18 | 18 | public function getReadableNameAttribute() |
19 | 19 | { |
20 | - return $this->pcode . '. ' . $this->title; |
|
20 | + return $this->pcode.'. '.$this->title; |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | public function submissions() |
@@ -45,16 +45,16 @@ discard block |
||
45 | 45 | return $this->getProblemStatus(); |
46 | 46 | } |
47 | 47 | |
48 | - public function getProblemStatus($userID = null, $contestID = null, Carbon $till = null) |
|
48 | + public function getProblemStatus($userID=null, $contestID=null, Carbon $till=null) |
|
49 | 49 | { |
50 | 50 | if (blank($userID)) { |
51 | 51 | if (Auth::guard('web')->check()) { |
52 | - $userID = Auth::guard('web')->user()->id; |
|
52 | + $userID=Auth::guard('web')->user()->id; |
|
53 | 53 | } |
54 | 54 | } |
55 | 55 | |
56 | 56 | if (filled($userID)) { |
57 | - $probStatus = $this->getProblemStatusFromDB($userID, $contestID, $till); |
|
57 | + $probStatus=$this->getProblemStatusFromDB($userID, $contestID, $till); |
|
58 | 58 | if (blank($probStatus)) { |
59 | 59 | return [ |
60 | 60 | "icon" => "checkbox-blank-circle-outline", |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | ]; |
63 | 63 | } else { |
64 | 64 | return [ |
65 | - "icon" => $probStatus->verdict == "Accepted" ? "checkbox-blank-circle" : "cisco-webex", |
|
65 | + "icon" => $probStatus->verdict=="Accepted" ? "checkbox-blank-circle" : "cisco-webex", |
|
66 | 66 | "color" => $probStatus->color |
67 | 67 | ]; |
68 | 68 | } |
@@ -74,11 +74,11 @@ discard block |
||
74 | 74 | } |
75 | 75 | } |
76 | 76 | |
77 | - private function getProblemStatusFromDB($userID, $contestID = null, Carbon $till = null) |
|
77 | + private function getProblemStatusFromDB($userID, $contestID=null, Carbon $till=null) |
|
78 | 78 | { |
79 | 79 | if (filled($contestID)) { |
80 | 80 | try { |
81 | - $endedAt = Carbon::parse(Contest::findOrFail($contestID)->endedAt); |
|
81 | + $endedAt=Carbon::parse(Contest::findOrFail($contestID)->endedAt); |
|
82 | 82 | } catch (Exception $e) { |
83 | 83 | return null; |
84 | 84 | } |
@@ -86,41 +86,41 @@ discard block |
||
86 | 86 | |
87 | 87 | // Get the very first AC record |
88 | 88 | |
89 | - $acRecords = $this->submissions()->where([ |
|
89 | + $acRecords=$this->submissions()->where([ |
|
90 | 90 | 'uid' => $userID, |
91 | 91 | 'cid' => $contestID, |
92 | 92 | 'verdict' => 'Accepted' |
93 | 93 | ]); |
94 | 94 | if (filled($contestID)) { |
95 | - $acRecords = $acRecords->where("submission_date", "<", $endedAt->timestamp); |
|
95 | + $acRecords=$acRecords->where("submission_date", "<", $endedAt->timestamp); |
|
96 | 96 | } |
97 | 97 | if (filled($till)) { |
98 | - $acRecords = $acRecords->where("submission_date", "<", $till->timestamp); |
|
98 | + $acRecords=$acRecords->where("submission_date", "<", $till->timestamp); |
|
99 | 99 | } |
100 | - $acRecords = $acRecords->orderBy('submission_date', 'desc')->first(); |
|
100 | + $acRecords=$acRecords->orderBy('submission_date', 'desc')->first(); |
|
101 | 101 | if (blank($acRecords)) { |
102 | - $pacRecords = $this->submissions()->where([ |
|
102 | + $pacRecords=$this->submissions()->where([ |
|
103 | 103 | 'uid' => $userID, |
104 | 104 | 'cid' => $contestID, |
105 | 105 | 'verdict' => 'Partially Accepted' |
106 | 106 | ]); |
107 | 107 | if (filled($contestID)) { |
108 | - $pacRecords = $pacRecords->where("submission_date", "<", $endedAt->timestamp); |
|
108 | + $pacRecords=$pacRecords->where("submission_date", "<", $endedAt->timestamp); |
|
109 | 109 | } |
110 | 110 | if (filled($till)) { |
111 | - $pacRecords = $pacRecords->where("submission_date", "<", $till->timestamp); |
|
111 | + $pacRecords=$pacRecords->where("submission_date", "<", $till->timestamp); |
|
112 | 112 | } |
113 | - $pacRecords = $pacRecords->orderBy('submission_date', 'desc')->first(); |
|
113 | + $pacRecords=$pacRecords->orderBy('submission_date', 'desc')->first(); |
|
114 | 114 | if (blank($pacRecords)) { |
115 | - $otherRecords = $this->submissions()->where([ |
|
115 | + $otherRecords=$this->submissions()->where([ |
|
116 | 116 | 'uid' => $userID, |
117 | 117 | 'cid' => $contestID |
118 | 118 | ]); |
119 | 119 | if (filled($contestID)) { |
120 | - $otherRecords = $otherRecords->where("submission_date", "<", $endedAt->timestamp); |
|
120 | + $otherRecords=$otherRecords->where("submission_date", "<", $endedAt->timestamp); |
|
121 | 121 | } |
122 | 122 | if (filled($till)) { |
123 | - $otherRecords = $otherRecords->where("submission_date", "<", $till->timestamp); |
|
123 | + $otherRecords=$otherRecords->where("submission_date", "<", $till->timestamp); |
|
124 | 124 | } |
125 | 125 | return $otherRecords->orderBy('submission_date', 'desc')->first(); |
126 | 126 | } |
@@ -130,27 +130,27 @@ discard block |
||
130 | 130 | } |
131 | 131 | } |
132 | 132 | |
133 | - public function users_latest_submission($users, $contestID = null, Carbon $till = null, $verdictFilter = []) |
|
133 | + public function users_latest_submission($users, $contestID=null, Carbon $till=null, $verdictFilter=[]) |
|
134 | 134 | { |
135 | 135 | if (filled($contestID)) { |
136 | - $endedAt = Carbon::parse(Contest::findOrFail($contestID)->endedAt); |
|
136 | + $endedAt=Carbon::parse(Contest::findOrFail($contestID)->endedAt); |
|
137 | 137 | } |
138 | 138 | |
139 | - $lastRecordSubQuery = $this->submissions()->select('uid', DB::raw('MAX(submission_date) as submission_date'))->whereIntegerInRaw('uid', $users)->where('cid', $contestID)->groupBy('uid'); |
|
139 | + $lastRecordSubQuery=$this->submissions()->select('uid', DB::raw('MAX(submission_date) as submission_date'))->whereIntegerInRaw('uid', $users)->where('cid', $contestID)->groupBy('uid'); |
|
140 | 140 | |
141 | 141 | if (filled($contestID)) { |
142 | - $lastRecordSubQuery = $lastRecordSubQuery->where("submission_date", "<", $endedAt->timestamp); |
|
142 | + $lastRecordSubQuery=$lastRecordSubQuery->where("submission_date", "<", $endedAt->timestamp); |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | if (filled($till)) { |
146 | - $lastRecordSubQuery = $lastRecordSubQuery->where("submission_date", "<", $till->timestamp); |
|
146 | + $lastRecordSubQuery=$lastRecordSubQuery->where("submission_date", "<", $till->timestamp); |
|
147 | 147 | } |
148 | 148 | |
149 | - if(filled($verdictFilter)) { |
|
150 | - $lastRecordSubQuery = $lastRecordSubQuery->whereIn('verdict', $verdictFilter); |
|
149 | + if (filled($verdictFilter)) { |
|
150 | + $lastRecordSubQuery=$lastRecordSubQuery->whereIn('verdict', $verdictFilter); |
|
151 | 151 | } |
152 | 152 | |
153 | - $query = DB::table(DB::raw("({$lastRecordSubQuery->toSql()}) last_sub"))->leftJoinSub(Submission::toBase(), 'submissions', function ($join) { |
|
153 | + $query=DB::table(DB::raw("({$lastRecordSubQuery->toSql()}) last_sub"))->leftJoinSub(Submission::toBase(), 'submissions', function($join) { |
|
154 | 154 | $join->on('last_sub.submission_date', '=', 'submissions.submission_date')->on('last_sub.uid', '=', 'submissions.uid'); |
155 | 155 | })->select('sid', 'last_sub.submission_date as submission_date', 'last_sub.uid as uid', 'verdict', 'color')->orderBy('uid', 'ASC'); |
156 | 156 |