@@ -14,14 +14,14 @@ discard block |
||
14 | 14 | * |
15 | 15 | * @var string |
16 | 16 | */ |
17 | - protected $signature = 'babel:require {extension : The package name of the extension} {--exception}'; |
|
17 | + protected $signature='babel:require {extension : The package name of the extension} {--exception}'; |
|
18 | 18 | |
19 | 19 | /** |
20 | 20 | * The console command description. |
21 | 21 | * |
22 | 22 | * @var string |
23 | 23 | */ |
24 | - protected $description = 'Download a given Babel Extension to NOJ'; |
|
24 | + protected $description='Download a given Babel Extension to NOJ'; |
|
25 | 25 | |
26 | 26 | /** |
27 | 27 | * Create a new command instance. |
@@ -40,9 +40,9 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public function handle() |
42 | 42 | { |
43 | - $extension = $this->argument('extension'); |
|
44 | - $exception = $this->option('exception'); |
|
45 | - $output = new BufferedOutput(); |
|
43 | + $extension=$this->argument('extension'); |
|
44 | + $exception=$this->option('exception'); |
|
45 | + $output=new BufferedOutput(); |
|
46 | 46 | if (is_dir(babel_path("Extension/$extension/"))) { |
47 | 47 | if (!$exception) { |
48 | 48 | $this->line("\n <bg=red;fg=white> Exception </> : <fg=yellow>An extension named <fg=green>$extension</> already took place, did you mean <fg=green>php artisan bable:update $extension</>?</>\n"); |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | mkdir(babel_path("Tmp/$extension/")); |
75 | 75 | } |
76 | 76 | try { |
77 | - $zipFile = new ZipFile(); |
|
77 | + $zipFile=new ZipFile(); |
|
78 | 78 | $zipFile->openFile(babel_path("Tmp/$filename"))->extractTo(babel_path("Tmp/$extension/"))->close(); |
79 | 79 | $babelPath=glob_recursive(babel_path("Tmp/$extension/babel.json")); |
80 | 80 | if (empty($babelPath)) { |
@@ -123,8 +123,8 @@ discard block |
||
123 | 123 | if (!is_dir($dir)) { |
124 | 124 | return; |
125 | 125 | } |
126 | - $it = new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS); |
|
127 | - $files = new \RecursiveIteratorIterator($it, \RecursiveIteratorIterator::CHILD_FIRST); |
|
126 | + $it=new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS); |
|
127 | + $files=new \RecursiveIteratorIterator($it, \RecursiveIteratorIterator::CHILD_FIRST); |
|
128 | 128 | foreach ($files as $file) { |
129 | 129 | if ($file->isDir()) { |
130 | 130 | rmdir($file->getRealPath()); |
@@ -12,14 +12,14 @@ discard block |
||
12 | 12 | * |
13 | 13 | * @var string |
14 | 14 | */ |
15 | - protected $signature = 'babel:uninstall {extension : The package name of the extension}'; |
|
15 | + protected $signature='babel:uninstall {extension : The package name of the extension}'; |
|
16 | 16 | |
17 | 17 | /** |
18 | 18 | * The console command description. |
19 | 19 | * |
20 | 20 | * @var string |
21 | 21 | */ |
22 | - protected $description = 'Uninstall a given Babel Extension to NOJ'; |
|
22 | + protected $description='Uninstall a given Babel Extension to NOJ'; |
|
23 | 23 | |
24 | 24 | /** |
25 | 25 | * Create a new command instance. |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | */ |
39 | 39 | public function handle() |
40 | 40 | { |
41 | - $extension = $this->argument('extension'); |
|
41 | + $extension=$this->argument('extension'); |
|
42 | 42 | $submitter=self::create($extension, $this); |
43 | 43 | if (!is_null($submitter)) { |
44 | 44 | $submitter->uninstall(); |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | } catch (ErrorException $e) { |
57 | 57 | } catch (Exception $e) { |
58 | 58 | } |
59 | - $className = "App\\Babel\\Extension\\$oj\\$installerProvider"; |
|
59 | + $className="App\\Babel\\Extension\\$oj\\$installerProvider"; |
|
60 | 60 | if (class_exists($className)) { |
61 | 61 | return new $className($class); |
62 | 62 | } else { |
@@ -20,22 +20,22 @@ discard block |
||
20 | 20 | 'cid' => 'required|integer', |
21 | 21 | 'uid' => 'required|integer' |
22 | 22 | ]); |
23 | - $cid = $request->input('cid'); |
|
24 | - $uid = $request->input('uid'); |
|
23 | + $cid=$request->input('cid'); |
|
24 | + $uid=$request->input('uid'); |
|
25 | 25 | |
26 | - $groupModel = new GroupModel(); |
|
27 | - $contestModel = new ContestModel(); |
|
26 | + $groupModel=new GroupModel(); |
|
27 | + $contestModel=new ContestModel(); |
|
28 | 28 | |
29 | - $contest_info = $contestModel->basic($cid); |
|
30 | - if($contestModel->judgeClearance($cid,Auth::user()->id) != 3){ |
|
29 | + $contest_info=$contestModel->basic($cid); |
|
30 | + if ($contestModel->judgeClearance($cid, Auth::user()->id)!=3) { |
|
31 | 31 | return ResponseModel::err(2001); |
32 | 32 | } |
33 | 33 | |
34 | - if($groupModel->judgeClearance($contest_info['gid'],$uid) < 2){ |
|
34 | + if ($groupModel->judgeClearance($contest_info['gid'], $uid)<2) { |
|
35 | 35 | return ResponseModel::err(7004); |
36 | 36 | } |
37 | 37 | |
38 | - $contestModel->assignMember($cid,$uid); |
|
38 | + $contestModel->assignMember($cid, $uid); |
|
39 | 39 | return ResponseModel::success(200); |
40 | 40 | } |
41 | 41 | |
@@ -44,30 +44,30 @@ discard block |
||
44 | 44 | $request->validate([ |
45 | 45 | 'cid' => 'required|integer', |
46 | 46 | ]); |
47 | - $cid = $request->input('cid'); |
|
47 | + $cid=$request->input('cid'); |
|
48 | 48 | |
49 | - $contestModel = new ContestModel(); |
|
50 | - $groupModel = new GroupModel(); |
|
49 | + $contestModel=new ContestModel(); |
|
50 | + $groupModel=new GroupModel(); |
|
51 | 51 | |
52 | - $contest_problems = $contestModel->problems($cid); |
|
53 | - $contest_detail = $contestModel->basic($cid); |
|
54 | - $contest_detail['problems'] = $contest_problems; |
|
55 | - $assign_uid = $contest_detail['assign_uid']; |
|
56 | - $clearance = $contestModel->judgeClearance($cid,Auth::user()->id); |
|
57 | - if($clearance != 3){ |
|
52 | + $contest_problems=$contestModel->problems($cid); |
|
53 | + $contest_detail=$contestModel->basic($cid); |
|
54 | + $contest_detail['problems']=$contest_problems; |
|
55 | + $assign_uid=$contest_detail['assign_uid']; |
|
56 | + $clearance=$contestModel->judgeClearance($cid, Auth::user()->id); |
|
57 | + if ($clearance!=3) { |
|
58 | 58 | return ResponseModel::err(2001); |
59 | 59 | } |
60 | - if($assign_uid != 0){ |
|
61 | - $assignee = $groupModel->userProfile($assign_uid,$contest_detail['gid']); |
|
62 | - }else{ |
|
63 | - $assignee = null; |
|
60 | + if ($assign_uid!=0) { |
|
61 | + $assignee=$groupModel->userProfile($assign_uid, $contest_detail['gid']); |
|
62 | + } else { |
|
63 | + $assignee=null; |
|
64 | 64 | } |
65 | - $ret = [ |
|
65 | + $ret=[ |
|
66 | 66 | 'contest_info' => $contest_detail, |
67 | 67 | 'assignee' => $assignee, |
68 | - 'is_admin' => $clearance == 3, |
|
68 | + 'is_admin' => $clearance==3, |
|
69 | 69 | ]; |
70 | - return ResponseModel::success(200,null,$ret); |
|
70 | + return ResponseModel::success(200, null, $ret); |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | public function rejudge(Request $request) |
@@ -101,15 +101,15 @@ discard block |
||
101 | 101 | 'end_time' => 'required|date|after:begin_time', |
102 | 102 | 'description' => 'string' |
103 | 103 | ]); |
104 | - $all_data = $request->all(); |
|
105 | - $cid = $all_data['cid']; |
|
104 | + $all_data=$request->all(); |
|
105 | + $cid=$all_data['cid']; |
|
106 | 106 | |
107 | - $contestModel = new ContestModel(); |
|
108 | - if($contestModel->judgeClearance($all_data['cid'],Auth::user()->id) != 3){ |
|
107 | + $contestModel=new ContestModel(); |
|
108 | + if ($contestModel->judgeClearance($all_data['cid'], Auth::user()->id)!=3) { |
|
109 | 109 | return ResponseModel::err(2001); |
110 | 110 | } |
111 | 111 | |
112 | - if($contestModel->remainingTime($cid) > 0){ |
|
112 | + if ($contestModel->remainingTime($cid)>0) { |
|
113 | 113 | $problems=explode(",", $all_data["problems"]); |
114 | 114 | if (count($problems)>26) { |
115 | 115 | return ResponseModel::err(4002); |
@@ -126,32 +126,32 @@ discard block |
||
126 | 126 | ]; |
127 | 127 | } |
128 | 128 | } |
129 | - $allow_update = ['name','description','begin_time','end_time']; |
|
129 | + $allow_update=['name', 'description', 'begin_time', 'end_time']; |
|
130 | 130 | |
131 | - foreach($all_data as $key => $value){ |
|
132 | - if(!in_array($key,$allow_update)){ |
|
131 | + foreach ($all_data as $key => $value) { |
|
132 | + if (!in_array($key, $allow_update)) { |
|
133 | 133 | unset($all_data[$key]); |
134 | 134 | } |
135 | 135 | } |
136 | - $contestModel->contestUpdate($cid,$all_data,$problemSet); |
|
136 | + $contestModel->contestUpdate($cid, $all_data, $problemSet); |
|
137 | 137 | return ResponseModel::success(200); |
138 | - }else{ |
|
139 | - $allow_update = ['name','description']; |
|
138 | + } else { |
|
139 | + $allow_update=['name', 'description']; |
|
140 | 140 | |
141 | - foreach($all_data as $key => $value){ |
|
142 | - if(!in_array($key,$allow_update)){ |
|
141 | + foreach ($all_data as $key => $value) { |
|
142 | + if (!in_array($key, $allow_update)) { |
|
143 | 143 | unset($all_data[$key]); |
144 | 144 | } |
145 | 145 | } |
146 | - $contestModel->contestUpdate($cid,$all_data,false); |
|
147 | - return ResponseModel::success(200,' |
|
146 | + $contestModel->contestUpdate($cid, $all_data, false); |
|
147 | + return ResponseModel::success(200, ' |
|
148 | 148 | Successful! However, only the name and description of the match can be changed for the match that has been finished. |
149 | 149 | '); |
150 | 150 | } |
151 | 151 | |
152 | 152 | } |
153 | 153 | |
154 | - public function issueAnnouncement(Request $request){ |
|
154 | + public function issueAnnouncement(Request $request) { |
|
155 | 155 | $request->validate([ |
156 | 156 | 'cid' => 'required|integer', |
157 | 157 | 'title' => 'required|string|max:250', |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | } |
172 | 172 | } |
173 | 173 | |
174 | - public function replyClarification(Request $request){ |
|
174 | + public function replyClarification(Request $request) { |
|
175 | 175 | $request->validate([ |
176 | 176 | 'cid' => 'required|integer', |
177 | 177 | 'ccid' => 'required|integer', |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | } |
192 | 192 | } |
193 | 193 | |
194 | - public function setClarificationPublic(Request $request){ |
|
194 | + public function setClarificationPublic(Request $request) { |
|
195 | 195 | $request->validate([ |
196 | 196 | 'cid' => 'required|integer', |
197 | 197 | 'ccid' => 'required|integer', |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | $groupModel=new GroupModel(); |
225 | 225 | $contestModel=new ContestModel(); |
226 | 226 | $verified=$contestModel->isVerified($all_data["cid"]); |
227 | - if(!$verified){ |
|
227 | + if (!$verified) { |
|
228 | 228 | return ResponseModel::err(2001); |
229 | 229 | } |
230 | 230 | $gid=$contestModel->gid($all_data["cid"]); |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | } |
61 | 61 | if($assign_uid != 0){ |
62 | 62 | $assignee = $groupModel->userProfile($assign_uid,$contest_detail['gid']); |
63 | - }else{ |
|
63 | + } else{ |
|
64 | 64 | $assignee = null; |
65 | 65 | } |
66 | 66 | $ret = [ |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | } |
221 | 221 | $contestModel->contestUpdate($cid,$all_data,$problemSet); |
222 | 222 | return ResponseModel::success(200); |
223 | - }else{ |
|
223 | + } else{ |
|
224 | 224 | $allow_update = ['name','description']; |
225 | 225 | |
226 | 226 | foreach($all_data as $key => $value){ |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | $all_data=$request->all(); |
42 | 42 | |
43 | 43 | $contestModel=new ContestModel(); |
44 | - return $contestModel->updateProfessionalRate($all_data["cid"])?ResponseModel::success(200):ResponseModel::err(1001); |
|
44 | + return $contestModel->updateProfessionalRate($all_data["cid"]) ?ResponseModel::success(200) : ResponseModel::err(1001); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | public function requestClarification(Request $request) |
@@ -77,16 +77,16 @@ discard block |
||
77 | 77 | $groupModel=new GroupModel(); |
78 | 78 | $basic=$contestModel->basic($all_data["cid"]); |
79 | 79 | |
80 | - if(!$basic["registration"]){ |
|
80 | + if (!$basic["registration"]) { |
|
81 | 81 | return ResponseModel::err(4003); |
82 | 82 | } |
83 | - if(strtotime($basic["registration_due"])<time()){ |
|
83 | + if (strtotime($basic["registration_due"])<time()) { |
|
84 | 84 | return ResponseModel::err(4004); |
85 | 85 | } |
86 | - if(!$basic["registant_type"]){ |
|
86 | + if (!$basic["registant_type"]) { |
|
87 | 87 | return ResponseModel::err(4005); |
88 | 88 | } |
89 | - if($basic["registant_type"]==1 && !$groupModel->isMember($basic["gid"], Auth::user()->id)){ |
|
89 | + if ($basic["registant_type"]==1 && !$groupModel->isMember($basic["gid"], Auth::user()->id)) { |
|
90 | 90 | return ResponseModel::err(4005); |
91 | 91 | } |
92 | 92 | |
@@ -100,13 +100,13 @@ discard block |
||
100 | 100 | $request->validate([ |
101 | 101 | 'cid' => 'required|integer' |
102 | 102 | ]); |
103 | - $cid = $request->input('cid'); |
|
103 | + $cid=$request->input('cid'); |
|
104 | 104 | |
105 | 105 | $contestModel=new ContestModel(); |
106 | 106 | $clearance=$contestModel->judgeClearance($cid, Auth::user()->id); |
107 | - if ($clearance < 1) { |
|
107 | + if ($clearance<1) { |
|
108 | 108 | return ResponseModel::err(7002); |
109 | 109 | } |
110 | - return ResponseModel::success(200,null,$contestModel->praticeAnalysis($cid)); |
|
110 | + return ResponseModel::success(200, null, $contestModel->praticeAnalysis($cid)); |
|
111 | 111 | } |
112 | 112 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | $contestModel=new ContestModel(); |
25 | 25 | $verified=$contestModel->isVerified($cid); |
26 | 26 | $clearance=$contestModel->judgeClearance($cid, Auth::user()->id); |
27 | - if ($clearance <= 2) { |
|
27 | + if ($clearance<=2) { |
|
28 | 28 | return Redirect::route('contest_detail', ['cid' => $cid]); |
29 | 29 | } |
30 | 30 | $contest_name=$contestModel->contestName($cid); |
@@ -52,30 +52,30 @@ discard block |
||
52 | 52 | { |
53 | 53 | $contestModel=new ContestModel(); |
54 | 54 | $clearance=$contestModel->judgeClearance($cid, Auth::user()->id); |
55 | - if ($clearance <= 2) { |
|
55 | + if ($clearance<=2) { |
|
56 | 56 | return Redirect::route('contest_detail', ['cid' => $cid]); |
57 | 57 | } |
58 | 58 | $account=$contestModel->getContestAccount($cid); |
59 | - if($account==null){ |
|
60 | - return ; |
|
61 | - }else{ |
|
59 | + if ($account==null) { |
|
60 | + return; |
|
61 | + } else { |
|
62 | 62 | $AccountExport=new AccountExport($account); |
63 | 63 | $filename="ContestAccount$cid"; |
64 | 64 | return Excel::download($AccountExport, $filename.'.xlsx'); |
65 | 65 | } |
66 | 66 | } |
67 | 67 | |
68 | - public function refreshContestRank($cid){ |
|
68 | + public function refreshContestRank($cid) { |
|
69 | 69 | $contestModel=new ContestModel(); |
70 | 70 | $clearance=$contestModel->judgeClearance($cid, Auth::user()->id); |
71 | - if ($clearance <= 2) { |
|
71 | + if ($clearance<=2) { |
|
72 | 72 | return Redirect::route('contest.detail', ['cid' => $cid]); |
73 | 73 | } |
74 | 74 | $contestRankRaw=$contestModel->contestRankCache($cid); |
75 | 75 | Cache::tags(['contest', 'rank'])->put($cid, $contestRankRaw); |
76 | 76 | Cache::tags(['contest', 'rank'])->put("contestAdmin$cid", $contestRankRaw); |
77 | 77 | $end_time=strtotime(DB::table("contest")->where(["cid"=>$cid])->select("end_time")->first()["end_time"]); |
78 | - if(time() > $end_time){ |
|
78 | + if (time()>$end_time) { |
|
79 | 79 | $contestModel->storeContestRankInMySQL($cid, $contestRankRaw); |
80 | 80 | } |
81 | 81 | return Redirect::route('contest.rank', ['cid' => $cid]); |
@@ -58,7 +58,7 @@ |
||
58 | 58 | $account=$contestModel->getContestAccount($cid); |
59 | 59 | if($account==null){ |
60 | 60 | return ; |
61 | - }else{ |
|
61 | + } else{ |
|
62 | 62 | $AccountExport=new AccountExport($account); |
63 | 63 | $filename="ContestAccount$cid"; |
64 | 64 | return Excel::download($AccountExport, $filename.'.xlsx'); |
@@ -27,7 +27,7 @@ |
||
27 | 27 | $filter["rated"]=isset($all_data["rated"]) ? $all_data["rated"] : null; |
28 | 28 | $filter["anticheated"]=isset($all_data["anticheated"]) ? $all_data["anticheated"] : null; |
29 | 29 | $filter["practice"]=isset($all_data["practice"]) ? $all_data["practice"] : null; |
30 | - $return_list=$contestModel->list($filter,Auth::check()?Auth::user()->id:0); |
|
30 | + $return_list=$contestModel->list($filter, Auth::check() ?Auth::user()->id : 0); |
|
31 | 31 | $featured=$contestModel->featured(); |
32 | 32 | if (is_null($return_list)) { |
33 | 33 | if (isset($all_data["page"]) && $all_data["page"]>1) { |
@@ -84,9 +84,9 @@ |
||
84 | 84 | $installed_timestamp=intval($info["compiler_timestamp"]); |
85 | 85 | } |
86 | 86 | $latest_timestamp=$installed_timestamp; |
87 | - $ConpilerConfig = glob(babel_path("Extension/$ocode/compiler/*.*")); |
|
87 | + $ConpilerConfig=glob(babel_path("Extension/$ocode/compiler/*.*")); |
|
88 | 88 | foreach ($ConpilerConfig as $file) { |
89 | - if (intval(basename($file)) > $installed_timestamp) { |
|
89 | + if (intval(basename($file))>$installed_timestamp) { |
|
90 | 90 | try { |
91 | 91 | $this->commitCompiler($file, json_decode(file_get_contents($file), true)); |
92 | 92 | $latest_timestamp=intval(basename($file)); |
@@ -413,7 +413,7 @@ discard block |
||
413 | 413 | ->where(['verdict'=>'Waiting']) |
414 | 414 | ->get() |
415 | 415 | ->all(); |
416 | - foreach($ret as &$r){ |
|
416 | + foreach ($ret as &$r) { |
|
417 | 417 | $r["ocode"]=DB::table("oj")->where(["oid"=>$r["oid"]])->first()["ocode"]; |
418 | 418 | } |
419 | 419 | return $ret; |
@@ -431,15 +431,15 @@ discard block |
||
431 | 431 | if (isset($sub['verdict'])) { |
432 | 432 | $sub["color"]=$this->colorScheme[$sub['verdict']]; |
433 | 433 | } |
434 | - $result = DB::table($this->tableName)->where(['sid'=>$sid])->update($sub); |
|
435 | - $contestModel = new ContestModel(); |
|
436 | - $submission_info = DB::table($this->tableName) -> where(['sid'=>$sid]) -> get() -> first(); |
|
437 | - if ($result==1 && $submission_info['cid'] && $contestModel->isContestRunning($submission_info['cid'])){ |
|
438 | - $sub['pid'] = $submission_info['pid']; |
|
439 | - $sub['uid'] = $submission_info['uid']; |
|
440 | - $sub['cid'] = $submission_info['cid']; |
|
441 | - $sub['sid'] = $sid; |
|
442 | - $contestModel->updateContestRankTable($submission_info['cid'],$sub); |
|
434 | + $result=DB::table($this->tableName)->where(['sid'=>$sid])->update($sub); |
|
435 | + $contestModel=new ContestModel(); |
|
436 | + $submission_info=DB::table($this->tableName) -> where(['sid'=>$sid]) -> get() -> first(); |
|
437 | + if ($result==1 && $submission_info['cid'] && $contestModel->isContestRunning($submission_info['cid'])) { |
|
438 | + $sub['pid']=$submission_info['pid']; |
|
439 | + $sub['uid']=$submission_info['uid']; |
|
440 | + $sub['cid']=$submission_info['cid']; |
|
441 | + $sub['sid']=$sid; |
|
442 | + $contestModel->updateContestRankTable($submission_info['cid'], $sub); |
|
443 | 443 | } |
444 | 444 | return $result; |
445 | 445 | } |
@@ -510,15 +510,15 @@ discard block |
||
510 | 510 | 'desc' |
511 | 511 | ); |
512 | 512 | |
513 | - if($filter["pcode"]){ |
|
513 | + if ($filter["pcode"]) { |
|
514 | 514 | $paginator=$paginator->where(["pcode"=>$filter["pcode"]]); |
515 | 515 | } |
516 | 516 | |
517 | - if($filter["result"]){ |
|
517 | + if ($filter["result"]) { |
|
518 | 518 | $paginator=$paginator->where(["verdict"=>$filter["result"]]); |
519 | 519 | } |
520 | 520 | |
521 | - if($filter["account"]){ |
|
521 | + if ($filter["account"]) { |
|
522 | 522 | $paginator=$paginator->where(["name"=>$filter["account"]]); |
523 | 523 | } |
524 | 524 |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | $groupModel=new GroupModel(); |
44 | 44 | $contestModel=new ContestModel(); |
45 | 45 | $basic_info=$groupModel->details($gcode); |
46 | - if(empty($basic_info)) return Redirect::route('group.index'); |
|
46 | + if (empty($basic_info)) return Redirect::route('group.index'); |
|
47 | 47 | $my_profile=$groupModel->userProfile(Auth::user()->id, $basic_info["gid"]); |
48 | 48 | $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id); |
49 | 49 | $member_list=$groupModel->userList($basic_info["gid"]); |
@@ -86,9 +86,9 @@ discard block |
||
86 | 86 | * |
87 | 87 | * @return Response |
88 | 88 | */ |
89 | - public function analysis($gcode){ |
|
90 | - $groupModel = new GroupModel(); |
|
91 | - $group_info = $groupModel->details($gcode); |
|
89 | + public function analysis($gcode) { |
|
90 | + $groupModel=new GroupModel(); |
|
91 | + $group_info=$groupModel->details($gcode); |
|
92 | 92 | return view('group.settings.analysis', [ |
93 | 93 | 'page_title'=>"Group Analysis", |
94 | 94 | 'site_title'=>"NOJ", |
@@ -98,13 +98,13 @@ discard block |
||
98 | 98 | ]); |
99 | 99 | } |
100 | 100 | |
101 | - public function analysisDownload($gcode,Request $request){ |
|
102 | - $all_data = $request->all(); |
|
103 | - $groupModel = new GroupModel(); |
|
104 | - $group_info = $groupModel->details($gcode); |
|
105 | - $mode = $all_data['mode'] ?? 'contest'; |
|
106 | - if($mode == 'contest'){ |
|
107 | - $data = $groupModel->groupMemberPracticeContestStat($group_info['gid']); |
|
101 | + public function analysisDownload($gcode, Request $request) { |
|
102 | + $all_data=$request->all(); |
|
103 | + $groupModel=new GroupModel(); |
|
104 | + $group_info=$groupModel->details($gcode); |
|
105 | + $mode=$all_data['mode'] ?? 'contest'; |
|
106 | + if ($mode=='contest') { |
|
107 | + $data=$groupModel->groupMemberPracticeContestStat($group_info['gid']); |
|
108 | 108 | return Excel::download( |
109 | 109 | new GroupAnalysisExport( |
110 | 110 | [ |
@@ -117,10 +117,10 @@ discard block |
||
117 | 117 | 'percent' => $all_data['percent'] ?? false, |
118 | 118 | ] |
119 | 119 | ), |
120 | - $gcode . '_Group_Contest_Analysis.xlsx' |
|
120 | + $gcode.'_Group_Contest_Analysis.xlsx' |
|
121 | 121 | ); |
122 | - }else{ |
|
123 | - $data = $groupModel->groupMemberPracticeTagStat($group_info['gid']); |
|
122 | + } else { |
|
123 | + $data=$groupModel->groupMemberPracticeTagStat($group_info['gid']); |
|
124 | 124 | return Excel::download( |
125 | 125 | new GroupAnalysisExport( |
126 | 126 | [ |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | 'percent' => $all_data['percent'] ?? false, |
134 | 134 | ] |
135 | 135 | ), |
136 | - $gcode . '_Group_Tag_Analysis.xlsx' |
|
136 | + $gcode.'_Group_Tag_Analysis.xlsx' |
|
137 | 137 | ); |
138 | 138 | } |
139 | 139 | } |
@@ -43,7 +43,9 @@ discard block |
||
43 | 43 | $groupModel=new GroupModel(); |
44 | 44 | $contestModel=new ContestModel(); |
45 | 45 | $basic_info=$groupModel->details($gcode); |
46 | - if(empty($basic_info)) return Redirect::route('group.index'); |
|
46 | + if(empty($basic_info)) { |
|
47 | + return Redirect::route('group.index'); |
|
48 | + } |
|
47 | 49 | $my_profile=$groupModel->userProfile(Auth::user()->id, $basic_info["gid"]); |
48 | 50 | $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id); |
49 | 51 | $member_list=$groupModel->userList($basic_info["gid"]); |
@@ -119,7 +121,7 @@ discard block |
||
119 | 121 | ), |
120 | 122 | $gcode . '_Group_Contest_Analysis.xlsx' |
121 | 123 | ); |
122 | - }else{ |
|
124 | + } else{ |
|
123 | 125 | $data = $groupModel->groupMemberPracticeTagStat($group_info['gid']); |
124 | 126 | return Excel::download( |
125 | 127 | new GroupAnalysisExport( |