@@ -321,9 +321,9 @@ discard block |
||
321 | 321 | public function createHomework(Request $request) |
322 | 322 | { |
323 | 323 | try { |
324 | - $all = $request->all(); |
|
325 | - $all['currently_at'] = strtotime('now'); |
|
326 | - $validator = Validator::make($all, [ |
|
324 | + $all=$request->all(); |
|
325 | + $all['currently_at']=strtotime('now'); |
|
326 | + $validator=Validator::make($all, [ |
|
327 | 327 | 'title' => 'required|string|min:1|max:100', |
328 | 328 | 'description' => 'required|string|min:1|max:65535', |
329 | 329 | 'ended_at' => 'required|date|after:currently_at', |
@@ -342,29 +342,29 @@ discard block |
||
342 | 342 | throw new Exception($validator->errors()->first()); |
343 | 343 | } |
344 | 344 | |
345 | - if (count($request->problems) > 26) { |
|
345 | + if (count($request->problems)>26) { |
|
346 | 346 | throw new Exception('Please include no more than 26 problems.'); |
347 | 347 | } |
348 | 348 | |
349 | - if (count($request->problems) < 1) { |
|
349 | + if (count($request->problems)<1) { |
|
350 | 350 | throw new Exception('Please include at least one problem.'); |
351 | 351 | } |
352 | 352 | |
353 | - $proceedProblems = $request->problems; |
|
354 | - $proceedProblemCodes = []; |
|
353 | + $proceedProblems=$request->problems; |
|
354 | + $proceedProblemCodes=[]; |
|
355 | 355 | |
356 | 356 | foreach ($proceedProblems as &$problem) { |
357 | 357 | if (!is_array($problem)) { |
358 | 358 | throw new Exception('Each problem object must be an array.'); |
359 | 359 | } |
360 | 360 | |
361 | - $problem['pcode'] = mb_strtoupper(trim($problem['pcode'])); |
|
361 | + $problem['pcode']=mb_strtoupper(trim($problem['pcode'])); |
|
362 | 362 | |
363 | - if(array_search($problem['pcode'], $proceedProblemCodes) !== false) { |
|
363 | + if (array_search($problem['pcode'], $proceedProblemCodes)!==false) { |
|
364 | 364 | throw new Exception("Duplicate Problem"); |
365 | 365 | } |
366 | 366 | |
367 | - $validator = Validator::make($problem, [ |
|
367 | + $validator=Validator::make($problem, [ |
|
368 | 368 | 'pcode' => 'required|string|min:1|max:100', |
369 | 369 | // 'alias' => 'required|string|min:0|max:100|nullable', |
370 | 370 | // 'points' => 'required|integer|gte:1', |
@@ -378,17 +378,17 @@ discard block |
||
378 | 378 | throw new Exception($validator->errors()->first()); |
379 | 379 | } |
380 | 380 | |
381 | - $proceedProblemCodes[] = $problem['pcode']; |
|
381 | + $proceedProblemCodes[]=$problem['pcode']; |
|
382 | 382 | } |
383 | 383 | |
384 | 384 | unset($problem); |
385 | 385 | |
386 | - $problemsDict = Problem::whereIn('pcode', $proceedProblemCodes)->select('pid', 'pcode')->get()->pluck('pid', 'pcode'); |
|
386 | + $problemsDict=Problem::whereIn('pcode', $proceedProblemCodes)->select('pid', 'pcode')->get()->pluck('pid', 'pcode'); |
|
387 | 387 | |
388 | 388 | try { |
389 | - foreach($proceedProblems as &$proceedProblem) { |
|
390 | - $proceedProblem['pid'] = $problemsDict[$proceedProblem['pcode']]; |
|
391 | - if(blank($proceedProblem['pid'])) { |
|
389 | + foreach ($proceedProblems as &$proceedProblem) { |
|
390 | + $proceedProblem['pid']=$problemsDict[$proceedProblem['pcode']]; |
|
391 | + if (blank($proceedProblem['pid'])) { |
|
392 | 392 | throw new Exception(); |
393 | 393 | } |
394 | 394 | } |
@@ -407,14 +407,14 @@ discard block |
||
407 | 407 | ], 422); |
408 | 408 | } |
409 | 409 | |
410 | - $groupModel = new GroupModel(); |
|
411 | - $clearance = $groupModel->judgeClearance($request->gid, Auth::user()->id); |
|
412 | - if ($clearance < 2) { |
|
410 | + $groupModel=new GroupModel(); |
|
411 | + $clearance=$groupModel->judgeClearance($request->gid, Auth::user()->id); |
|
412 | + if ($clearance<2) { |
|
413 | 413 | return ResponseModel::err(2001); |
414 | 414 | } |
415 | 415 | |
416 | 416 | try { |
417 | - $homeworkInstance = Group::find($request->gid)->addHomework($request->title, $request->description, Carbon::parse($request->ended_at), $proceedProblems); |
|
417 | + $homeworkInstance=Group::find($request->gid)->addHomework($request->title, $request->description, Carbon::parse($request->ended_at), $proceedProblems); |
|
418 | 418 | } catch (Exception $e) { |
419 | 419 | return ResponseModel::err(7009); |
420 | 420 | } |
@@ -13,8 +13,8 @@ discard block |
||
13 | 13 | class Message extends Model |
14 | 14 | { |
15 | 15 | use SoftDeletes; |
16 | - protected $table = 'message'; |
|
17 | - public $levelMapping = [ |
|
16 | + protected $table='message'; |
|
17 | + public $levelMapping=[ |
|
18 | 18 | 0 => 'default', |
19 | 19 | 1 => 'info', |
20 | 20 | 2 => 'warning', |
@@ -112,9 +112,9 @@ discard block |
||
112 | 112 | */ |
113 | 113 | public static function read($mid) |
114 | 114 | { |
115 | - $message = static::with('sender_user')->find($mid); |
|
115 | + $message=static::with('sender_user')->find($mid); |
|
116 | 116 | if (filled($message)) { |
117 | - $message->unread = false; |
|
117 | + $message->unread=false; |
|
118 | 118 | $message->save(); |
119 | 119 | } |
120 | 120 | return $message; |
@@ -158,17 +158,17 @@ discard block |
||
158 | 158 | */ |
159 | 159 | public static function remove($messages) |
160 | 160 | { |
161 | - $del_count = 0; |
|
161 | + $del_count=0; |
|
162 | 162 | if (is_array($messages)) { |
163 | 163 | foreach ($messages as $mid) { |
164 | - $message = static::find($mid); |
|
164 | + $message=static::find($mid); |
|
165 | 165 | if (filled($message)) { |
166 | 166 | $message->delete(); |
167 | 167 | $del_count++; |
168 | 168 | } |
169 | 169 | } |
170 | 170 | } else { |
171 | - $message = static::find($messages); |
|
171 | + $message=static::find($messages); |
|
172 | 172 | if (filled($message)) { |
173 | 173 | $message->delete(); |
174 | 174 | $del_count++; |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | public function getContentAttribute($value) |
190 | 190 | { |
191 | 191 | if (filled($this->type)) { |
192 | - $data = json_decode($this->data, true); |
|
192 | + $data=json_decode($this->data, true); |
|
193 | 193 | |
194 | 194 | switch (intval($this->type)) { |
195 | 195 | case 1: |
@@ -33,17 +33,17 @@ discard block |
||
33 | 33 | |
34 | 34 | public function getStatisticsAttribute() |
35 | 35 | { |
36 | - $cachedStatistics = Cache::tags(['homework', 'statistics'])->get($this->id); |
|
36 | + $cachedStatistics=Cache::tags(['homework', 'statistics'])->get($this->id); |
|
37 | 37 | |
38 | 38 | if (blank($cachedStatistics)) { |
39 | - $cachedStatistics = $this->cacheStatistics(); |
|
39 | + $cachedStatistics=$this->cacheStatistics(); |
|
40 | 40 | } |
41 | 41 | |
42 | - if ($cachedStatistics === false) { |
|
42 | + if ($cachedStatistics===false) { |
|
43 | 43 | return null; |
44 | 44 | } |
45 | 45 | |
46 | - $cachedStatistics['timestamp'] = Carbon::createFromTimestamp($cachedStatistics['timestamp']); |
|
46 | + $cachedStatistics['timestamp']=Carbon::createFromTimestamp($cachedStatistics['timestamp']); |
|
47 | 47 | |
48 | 48 | return $cachedStatistics; |
49 | 49 | } |
@@ -51,25 +51,25 @@ discard block |
||
51 | 51 | public function cacheStatistics() |
52 | 52 | { |
53 | 53 | try { |
54 | - $statistics = []; |
|
55 | - $homeworkProblems = $this->problems->sortBy('order_index'); |
|
56 | - $users = $this->group->members()->where('role', '>=', 1)->get(); |
|
57 | - $userIDArr = $users->pluck('uid'); |
|
58 | - $defaultVerdict = []; |
|
54 | + $statistics=[]; |
|
55 | + $homeworkProblems=$this->problems->sortBy('order_index'); |
|
56 | + $users=$this->group->members()->where('role', '>=', 1)->get(); |
|
57 | + $userIDArr=$users->pluck('uid'); |
|
58 | + $defaultVerdict=[]; |
|
59 | 59 | |
60 | 60 | foreach ($homeworkProblems as $homeworkProblem) { |
61 | - $statistics['problems'][] = [ |
|
61 | + $statistics['problems'][]=[ |
|
62 | 62 | 'pid' => $homeworkProblem->problem_id, |
63 | 63 | 'readable_name' => $homeworkProblem->problem->readable_name, |
64 | 64 | ]; |
65 | - $defaultVerdict[$homeworkProblem->problem_id] = [ |
|
65 | + $defaultVerdict[$homeworkProblem->problem_id]=[ |
|
66 | 66 | "icon" => "checkbox-blank-circle-outline", |
67 | 67 | "color" => "wemd-grey-text" |
68 | 68 | ]; |
69 | 69 | } |
70 | 70 | |
71 | 71 | foreach ($users as $user) { |
72 | - $statistics['data'][$user->uid] = [ |
|
72 | + $statistics['data'][$user->uid]=[ |
|
73 | 73 | 'name' => $user->user->name, |
74 | 74 | 'nick_name' => blank($user->nick_name) ? null : $user->nick_name, |
75 | 75 | 'solved' => 0, |
@@ -78,44 +78,44 @@ discard block |
||
78 | 78 | ]; |
79 | 79 | } |
80 | 80 | |
81 | - $endedAt = Carbon::parse($this->ended_at); |
|
81 | + $endedAt=Carbon::parse($this->ended_at); |
|
82 | 82 | |
83 | 83 | foreach ($homeworkProblems as $homeworkProblem) { |
84 | - $userProbIDArr = []; |
|
84 | + $userProbIDArr=[]; |
|
85 | 85 | |
86 | 86 | foreach ($homeworkProblem->problem->users_latest_submission($userIDArr->diff($userProbIDArr), null, $endedAt, ['Accepted'])->get() as $acceptedRecord) { |
87 | - $statistics['data'][$acceptedRecord['uid']]['verdict'][$homeworkProblem->problem_id] = [ |
|
87 | + $statistics['data'][$acceptedRecord['uid']]['verdict'][$homeworkProblem->problem_id]=[ |
|
88 | 88 | "icon" => "checkbox-blank-circle", |
89 | 89 | "color" => $acceptedRecord['color'] |
90 | 90 | ]; |
91 | 91 | $statistics['data'][$acceptedRecord['uid']]['solved']++; |
92 | - $userProbIDArr[] = $acceptedRecord['uid']; |
|
92 | + $userProbIDArr[]=$acceptedRecord['uid']; |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | foreach ($homeworkProblem->problem->users_latest_submission($userIDArr->diff($userProbIDArr), null, $endedAt, ['Partially Accepted'])->get() as $acceptedRecord) { |
96 | - $statistics['data'][$acceptedRecord['uid']]['verdict'][$homeworkProblem->problem_id] = [ |
|
96 | + $statistics['data'][$acceptedRecord['uid']]['verdict'][$homeworkProblem->problem_id]=[ |
|
97 | 97 | "icon" => "cisco-webex", |
98 | 98 | "color" => $acceptedRecord['color'] |
99 | 99 | ]; |
100 | 100 | $statistics['data'][$acceptedRecord['uid']]['attempted']++; |
101 | - $userProbIDArr[] = $acceptedRecord['uid']; |
|
101 | + $userProbIDArr[]=$acceptedRecord['uid']; |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | foreach ($homeworkProblem->problem->users_latest_submission($userIDArr->diff($userProbIDArr), null, $endedAt)->get() as $acceptedRecord) { |
105 | - $statistics['data'][$acceptedRecord['uid']]['verdict'][$homeworkProblem->problem_id] = [ |
|
105 | + $statistics['data'][$acceptedRecord['uid']]['verdict'][$homeworkProblem->problem_id]=[ |
|
106 | 106 | "icon" => "cisco-webex", |
107 | 107 | "color" => $acceptedRecord['color'] |
108 | 108 | ]; |
109 | 109 | $statistics['data'][$acceptedRecord['uid']]['attempted']++; |
110 | - $userProbIDArr[] = $acceptedRecord['uid']; |
|
110 | + $userProbIDArr[]=$acceptedRecord['uid']; |
|
111 | 111 | } |
112 | 112 | } |
113 | 113 | |
114 | - usort($statistics['data'], function ($a, $b) { |
|
115 | - return $b["solved"] == $a["solved"] ? $b["attempted"] <=> $a["attempted"] : $b["solved"] <=> $a["solved"]; |
|
114 | + usort($statistics['data'], function($a, $b) { |
|
115 | + return $b["solved"]==$a["solved"] ? $b["attempted"] <=> $a["attempted"] : $b["solved"] <=> $a["solved"]; |
|
116 | 116 | }); |
117 | 117 | |
118 | - $statistics['timestamp'] = time(); |
|
118 | + $statistics['timestamp']=time(); |
|
119 | 119 | Cache::tags(['homework', 'statistics'])->put($this->id, $statistics, 360); |
120 | 120 | return $statistics; |
121 | 121 | } catch (Exception $e) { |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | { |
129 | 129 | DB::beginTransaction(); |
130 | 130 | try { |
131 | - foreach($this->group->members()->where('role', '>', '0')->get() as $member) { |
|
131 | + foreach ($this->group->members()->where('role', '>', '0')->get() as $member) { |
|
132 | 132 | sendMessage([ |
133 | 133 | 'sender' => config('app.official_sender'), |
134 | 134 | 'receiver' => $member->uid, |
@@ -8,21 +8,21 @@ discard block |
||
8 | 8 | { |
9 | 9 | public static function sendSolutionPassedMessageToUser($config) |
10 | 10 | { |
11 | - $message = Message::where([ |
|
11 | + $message=Message::where([ |
|
12 | 12 | 'receiver' => $config['receiver'], |
13 | 13 | 'type' => $config['type'], |
14 | 14 | 'unread' => true |
15 | 15 | ])->first(); |
16 | 16 | |
17 | 17 | if (filled($message)) { |
18 | - $data = json_decode($message->data, true); |
|
18 | + $data=json_decode($message->data, true); |
|
19 | 19 | foreach ($data['problem'] as $problem) { |
20 | - if($problem['pcode'] != $config['data']['problem'][0]['pcode']) { |
|
20 | + if ($problem['pcode']!=$config['data']['problem'][0]['pcode']) { |
|
21 | 21 | array_push($data['problem'], $config['data']['problem'][0]); |
22 | 22 | } |
23 | 23 | } |
24 | - $message->data = json_encode($data); |
|
25 | - $message->level = $config['level']; |
|
24 | + $message->data=json_encode($data); |
|
25 | + $message->level=$config['level']; |
|
26 | 26 | $message->save(); |
27 | 27 | return true; |
28 | 28 | } |
@@ -32,23 +32,23 @@ discard block |
||
32 | 32 | |
33 | 33 | private static function proceedUserAndGroupInfo($data) |
34 | 34 | { |
35 | - $problemList = []; |
|
35 | + $problemList=[]; |
|
36 | 36 | |
37 | 37 | foreach ($data['problem'] as $problem) { |
38 | - $pcode = $problem['pcode']; |
|
39 | - $title = $problem['title']; |
|
40 | - $url = route('problem.detail', ['pcode' => $pcode]); |
|
41 | - $problemList[] = "[$pcode $title]($url)"; |
|
38 | + $pcode=$problem['pcode']; |
|
39 | + $title=$problem['title']; |
|
40 | + $url=route('problem.detail', ['pcode' => $pcode]); |
|
41 | + $problemList[]="[$pcode $title]($url)"; |
|
42 | 42 | } |
43 | 43 | |
44 | - $problemString = implode(__('message.delimiter'), $problemList); |
|
44 | + $problemString=implode(__('message.delimiter'), $problemList); |
|
45 | 45 | |
46 | 46 | return [$problemString]; |
47 | 47 | } |
48 | 48 | |
49 | 49 | public static function formatSolutionPassedMessageToUser($data) |
50 | 50 | { |
51 | - [$problemString] = self::proceedUserAndGroupInfo($data); |
|
51 | + [$problemString]=self::proceedUserAndGroupInfo($data); |
|
52 | 52 | |
53 | 53 | return self::formatUniversalMessage('message.solution.accepted.desc', [ |
54 | 54 | 'problemList' => $problemString |
@@ -57,21 +57,21 @@ discard block |
||
57 | 57 | |
58 | 58 | public static function sendSolutionRejectedMessageToUser($config) |
59 | 59 | { |
60 | - $message = Message::where([ |
|
60 | + $message=Message::where([ |
|
61 | 61 | 'receiver' => $config['receiver'], |
62 | 62 | 'type' => $config['type'], |
63 | 63 | 'unread' => true |
64 | 64 | ])->first(); |
65 | 65 | |
66 | 66 | if (filled($message)) { |
67 | - $data = json_decode($message->data, true); |
|
67 | + $data=json_decode($message->data, true); |
|
68 | 68 | foreach ($data['problem'] as $problem) { |
69 | - if($problem['pcode'] != $config['data']['problem'][0]['pcode']) { |
|
69 | + if ($problem['pcode']!=$config['data']['problem'][0]['pcode']) { |
|
70 | 70 | array_push($data['problem'], $config['data']['problem'][0]); |
71 | 71 | } |
72 | 72 | } |
73 | - $message->data = json_encode($data); |
|
74 | - $message->level = $config['level']; |
|
73 | + $message->data=json_encode($data); |
|
74 | + $message->level=$config['level']; |
|
75 | 75 | $message->save(); |
76 | 76 | return true; |
77 | 77 | } |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | |
82 | 82 | public static function formatSolutionRejectedMessageToUser($data) |
83 | 83 | { |
84 | - [$problemString] = self::proceedUserAndGroupInfo($data); |
|
84 | + [$problemString]=self::proceedUserAndGroupInfo($data); |
|
85 | 85 | |
86 | 86 | return self::formatUniversalMessage('message.solution.declined.desc', [ |
87 | 87 | 'problemList' => $problemString |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | { |
9 | 9 | public static function sendApplyJoinMessageToLeader($config) |
10 | 10 | { |
11 | - $messages = Message::where([ |
|
11 | + $messages=Message::where([ |
|
12 | 12 | 'receiver' => $config['receiver'], |
13 | 13 | 'type' => $config['type'], |
14 | 14 | 'unread' => true |
@@ -16,11 +16,11 @@ discard block |
||
16 | 16 | |
17 | 17 | if (filled($messages)) { |
18 | 18 | foreach ($messages as $message) { |
19 | - $data = json_decode($message->data, true); |
|
20 | - if ($data['group']['gcode'] == $config['data']['group']['gcode']) { |
|
19 | + $data=json_decode($message->data, true); |
|
20 | + if ($data['group']['gcode']==$config['data']['group']['gcode']) { |
|
21 | 21 | array_push($data['user'], $config['data']['user'][0]); |
22 | - $message->data = json_encode($data); |
|
23 | - $message->level = $config['level']; |
|
22 | + $message->data=json_encode($data); |
|
23 | + $message->level=$config['level']; |
|
24 | 24 | $message->save(); |
25 | 25 | return true; |
26 | 26 | } |
@@ -32,25 +32,25 @@ discard block |
||
32 | 32 | |
33 | 33 | private static function proceedUserAndGroupInfo($data) |
34 | 34 | { |
35 | - $userList = []; |
|
35 | + $userList=[]; |
|
36 | 36 | |
37 | 37 | foreach ($data['user'] as $user) { |
38 | - $uid = $user['uid']; |
|
39 | - $name = $user['name']; |
|
40 | - $url = route('user.view', ['uid' => $uid]); |
|
41 | - $userList[] = "[$name]($url)"; |
|
38 | + $uid=$user['uid']; |
|
39 | + $name=$user['name']; |
|
40 | + $url=route('user.view', ['uid' => $uid]); |
|
41 | + $userList[]="[$name]($url)"; |
|
42 | 42 | } |
43 | 43 | |
44 | - $userString = implode(__('message.delimiter'), $userList); |
|
45 | - $groupName = $data['group']['name']; |
|
46 | - $groupURL = route('group.detail', ['gcode' => $data['group']['gcode']]); |
|
44 | + $userString=implode(__('message.delimiter'), $userList); |
|
45 | + $groupName=$data['group']['name']; |
|
46 | + $groupURL=route('group.detail', ['gcode' => $data['group']['gcode']]); |
|
47 | 47 | |
48 | 48 | return [$userString, $groupName, $groupURL]; |
49 | 49 | } |
50 | 50 | |
51 | 51 | public static function formatApplyJoinMessageToLeader($data) |
52 | 52 | { |
53 | - [$userString, $groupName, $groupURL] = self::proceedUserAndGroupInfo($data); |
|
53 | + [$userString, $groupName, $groupURL]=self::proceedUserAndGroupInfo($data); |
|
54 | 54 | |
55 | 55 | return self::formatUniversalMessage('message.group.applied.desc', [ |
56 | 56 | 'userList' => $userString, |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | |
61 | 61 | public static function sendAgreedJoinMessageToLeader($config) |
62 | 62 | { |
63 | - $messages = Message::where([ |
|
63 | + $messages=Message::where([ |
|
64 | 64 | 'receiver' => $config['receiver'], |
65 | 65 | 'type' => $config['type'], |
66 | 66 | 'unread' => true |
@@ -68,11 +68,11 @@ discard block |
||
68 | 68 | |
69 | 69 | if (filled($messages)) { |
70 | 70 | foreach ($messages as $message) { |
71 | - $data = json_decode($message->data, true); |
|
72 | - if ($data['group'] == $config['data']['group']) { |
|
71 | + $data=json_decode($message->data, true); |
|
72 | + if ($data['group']==$config['data']['group']) { |
|
73 | 73 | array_push($data['user'], $config['data']['user'][0]); |
74 | - $message->data = json_encode($data); |
|
75 | - $message->level = $config['level']; |
|
74 | + $message->data=json_encode($data); |
|
75 | + $message->level=$config['level']; |
|
76 | 76 | $message->save(); |
77 | 77 | return true; |
78 | 78 | } |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | public static function formatAgreedJoinMessageToLeader($data) |
86 | 86 | { |
87 | - [$userString, $groupName, $groupURL] = self::proceedUserAndGroupInfo($data); |
|
87 | + [$userString, $groupName, $groupURL]=self::proceedUserAndGroupInfo($data); |
|
88 | 88 | |
89 | 89 | return self::formatUniversalMessage('message.group.agreed.desc', [ |
90 | 90 | 'userList' => $userString, |
@@ -10,23 +10,23 @@ discard block |
||
10 | 10 | { |
11 | 11 | public static function sendRankInOutOneHundredMessageToUser($config) |
12 | 12 | { |
13 | - $message = Message::where([ |
|
13 | + $message=Message::where([ |
|
14 | 14 | 'receiver' => $config['receiver'], |
15 | 15 | 'type' => $config['type'], |
16 | 16 | 'unread' => true |
17 | 17 | ])->first(); |
18 | 18 | |
19 | 19 | if (filled($message)) { |
20 | - $data = json_decode($message->data, true); |
|
21 | - $data["currentRank"] = $config['data']["currentRank"]; |
|
20 | + $data=json_decode($message->data, true); |
|
21 | + $data["currentRank"]=$config['data']["currentRank"]; |
|
22 | 22 | |
23 | - if(SiteRank::isTopOneHundred($data["currentRank"]) === SiteRank::isTopOneHundred($data["originalRank"])) { |
|
23 | + if (SiteRank::isTopOneHundred($data["currentRank"])===SiteRank::isTopOneHundred($data["originalRank"])) { |
|
24 | 24 | $message->delete(); |
25 | 25 | return true; |
26 | 26 | } |
27 | 27 | |
28 | - $message->data = json_encode($data); |
|
29 | - $message->level = $config['level']; |
|
28 | + $message->data=json_encode($data); |
|
29 | + $message->level=$config['level']; |
|
30 | 30 | $message->save(); |
31 | 31 | return true; |
32 | 32 | } |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | |
38 | 38 | public static function formatRankInOutOneHundredMessageToUser($data) |
39 | 39 | { |
40 | - if(SiteRank::isTopOneHundred($data["currentRank"])) { |
|
40 | + if (SiteRank::isTopOneHundred($data["currentRank"])) { |
|
41 | 41 | return self::formatUniversalMessage('message.rank.up.desc', [ |
42 | 42 | 'originalRank' => SiteRank::getRankString($data['originalRank']), |
43 | 43 | 'currentRank' => SiteRank::getRankString($data['currentRank']), |
@@ -7,28 +7,28 @@ |
||
7 | 7 | |
8 | 8 | class UniversalMessager |
9 | 9 | { |
10 | - public static function sendUniversalMessage($config, $official = true) |
|
10 | + public static function sendUniversalMessage($config, $official=true) |
|
11 | 11 | { |
12 | - $message = new Message; |
|
13 | - $message->sender = $config['sender']; |
|
14 | - $message->receiver = $config['receiver']; |
|
15 | - $message->title = $config['title']; |
|
16 | - $message->level = $config['level']; |
|
12 | + $message=new Message; |
|
13 | + $message->sender=$config['sender']; |
|
14 | + $message->receiver=$config['receiver']; |
|
15 | + $message->title=$config['title']; |
|
16 | + $message->level=$config['level']; |
|
17 | 17 | if (isset($config['data']) && isset($config['type'])) { |
18 | - $message->type = $config['type'] ?? null; |
|
19 | - $message->data = json_encode($config['data']); |
|
18 | + $message->type=$config['type'] ?? null; |
|
19 | + $message->data=json_encode($config['data']); |
|
20 | 20 | } else { |
21 | - $message->content = $config['content']; |
|
21 | + $message->content=$config['content']; |
|
22 | 22 | } |
23 | - $message->official = $official; |
|
23 | + $message->official=$official; |
|
24 | 24 | $message->save(); |
25 | 25 | return true; |
26 | 26 | } |
27 | 27 | |
28 | - public static function formatUniversalMessage($key = null, $replace = [], $locale = null) |
|
28 | + public static function formatUniversalMessage($key=null, $replace=[], $locale=null) |
|
29 | 29 | { |
30 | - $replace['userName'] = Auth::guard('web')->user()->name; |
|
31 | - $replace['siteName'] = config('app.name'); |
|
30 | + $replace['userName']=Auth::guard('web')->user()->name; |
|
31 | + $replace['siteName']=config('app.name'); |
|
32 | 32 | return __($key, $replace, $locale); |
33 | 33 | } |
34 | 34 | } |
@@ -8,21 +8,21 @@ discard block |
||
8 | 8 | { |
9 | 9 | public static function sendNewHomeworkMessageToUser($config) |
10 | 10 | { |
11 | - $message = Message::where([ |
|
11 | + $message=Message::where([ |
|
12 | 12 | 'receiver' => $config['receiver'], |
13 | 13 | 'type' => $config['type'], |
14 | 14 | 'unread' => true |
15 | 15 | ])->first(); |
16 | 16 | |
17 | 17 | if (filled($message)) { |
18 | - $data = json_decode($message->data, true); |
|
18 | + $data=json_decode($message->data, true); |
|
19 | 19 | foreach ($data['homework'] as $homework) { |
20 | - if($homework['id'] != $config['data']['homework'][0]['id']) { |
|
20 | + if ($homework['id']!=$config['data']['homework'][0]['id']) { |
|
21 | 21 | array_push($data['homework'], $config['data']['homework'][0]); |
22 | 22 | } |
23 | 23 | } |
24 | - $message->data = json_encode($data); |
|
25 | - $message->level = $config['level']; |
|
24 | + $message->data=json_encode($data); |
|
25 | + $message->level=$config['level']; |
|
26 | 26 | $message->save(); |
27 | 27 | return true; |
28 | 28 | } |
@@ -32,27 +32,27 @@ discard block |
||
32 | 32 | |
33 | 33 | private static function proceedHomeworkAndGroupInfo($data) |
34 | 34 | { |
35 | - $homeworkList = []; |
|
35 | + $homeworkList=[]; |
|
36 | 36 | |
37 | 37 | foreach ($data['homework'] as $homework) { |
38 | - $id = $homework['id']; |
|
39 | - $title = $homework['title']; |
|
40 | - $gcode = $homework['gcode']; |
|
41 | - $url = route('group.homework', [ |
|
38 | + $id=$homework['id']; |
|
39 | + $title=$homework['title']; |
|
40 | + $gcode=$homework['gcode']; |
|
41 | + $url=route('group.homework', [ |
|
42 | 42 | 'gcode' => $gcode, |
43 | 43 | 'homework_id' => $id, |
44 | 44 | ]); |
45 | - $homeworkList[] = "* [$title]($url)"; |
|
45 | + $homeworkList[]="* [$title]($url)"; |
|
46 | 46 | } |
47 | 47 | |
48 | - $homeworkString = implode(PHP_EOL, $homeworkList); |
|
48 | + $homeworkString=implode(PHP_EOL, $homeworkList); |
|
49 | 49 | |
50 | 50 | return [$homeworkString]; |
51 | 51 | } |
52 | 52 | |
53 | 53 | public static function formatNewHomeworkMessageToUser($data) |
54 | 54 | { |
55 | - [$homeworkString] = self::proceedHomeworkAndGroupInfo($data); |
|
55 | + [$homeworkString]=self::proceedHomeworkAndGroupInfo($data); |
|
56 | 56 | |
57 | 57 | return __('message.homework.new.desc', [ |
58 | 58 | 'homeworkList' => $homeworkString |
@@ -18,9 +18,9 @@ discard block |
||
18 | 18 | { |
19 | 19 | parent::boot(); |
20 | 20 | static::updating(function($model) { |
21 | - $problem = Problem::findOrFail($model->pid); |
|
22 | - if($model->original['audit'] != $model->audit) { |
|
23 | - if($model->audit == 1) { |
|
21 | + $problem=Problem::findOrFail($model->pid); |
|
22 | + if ($model->original['audit']!=$model->audit) { |
|
23 | + if ($model->audit==1) { |
|
24 | 24 | // passed |
25 | 25 | sendMessage([ |
26 | 26 | 'sender' => config('app.official_sender'), |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | ]] |
36 | 36 | ] |
37 | 37 | ]); |
38 | - } elseif($model->audit == 2) { |
|
38 | + } elseif ($model->audit==2) { |
|
39 | 39 | // declined |
40 | 40 | sendMessage([ |
41 | 41 | 'sender' => config('app.official_sender'), |