ZsgsDesign / NOJ

app/Models/Eloquent/User.php

Spacing +18 added lines, -18 removed lines

@@ -180,27 +180,27 @@ 
         return $socialites;
     }
 
-    public function problems_latest_submission($problems, $contestID = null, Carbon $till = null, $verdictFilter = [])
+    public function problems_latest_submission($problems, $contestID=null, Carbon $till=null, $verdictFilter=[])
     {
         if (filled($contestID)) {
-            $endedAt = Carbon::parse(Contest::findOrFail($contestID)->endedAt);
+            $endedAt=Carbon::parse(Contest::findOrFail($contestID)->endedAt);
         }
 
-        $lastRecordSubQuery = $this->submissions()->select('pid', DB::raw('MAX(submission_date) as submission_date'))->whereIntegerInRaw('pid', $problems)->where('cid', $contestID)->groupBy('pid');
+        $lastRecordSubQuery=$this->submissions()->select('pid', DB::raw('MAX(submission_date) as submission_date'))->whereIntegerInRaw('pid', $problems)->where('cid', $contestID)->groupBy('pid');
 
         if (filled($contestID)) {
-            $lastRecordSubQuery = $lastRecordSubQuery->where("submission_date", "<", $endedAt->timestamp);
+            $lastRecordSubQuery=$lastRecordSubQuery->where("submission_date", "<", $endedAt->timestamp);
         }
 
         if (filled($till)) {
-            $lastRecordSubQuery = $lastRecordSubQuery->where("submission_date", "<", $till->timestamp);
+            $lastRecordSubQuery=$lastRecordSubQuery->where("submission_date", "<", $till->timestamp);
         }
 
-        if(filled($verdictFilter)) {
-            $lastRecordSubQuery = $lastRecordSubQuery->whereIn('verdict', $verdictFilter);
+        if (filled($verdictFilter)) {
+            $lastRecordSubQuery=$lastRecordSubQuery->whereIn('verdict', $verdictFilter);
         }
 
-        $query = DB::table(DB::raw("({$lastRecordSubQuery->toSql()}) last_sub"))->leftJoinSub(Submission::toBase(), 'submissions', function ($join) {
+        $query=DB::table(DB::raw("({$lastRecordSubQuery->toSql()}) last_sub"))->leftJoinSub(Submission::toBase(), 'submissions', function($join) {
             $join->on('last_sub.submission_date', '=', 'submissions.submission_date')->on('last_sub.pid', '=', 'submissions.pid');
         })->select('sid', 'last_sub.submission_date as submission_date', 'last_sub.pid as pid', 'verdict', 'color')->orderBy('pid', 'ASC');
 
@@ -210,40 +210,40 @@ 
     public function getDojoStatistics()
     {
         try {
-            $statistics = [];
-            $problemIDArr = DojoProblem::select('problem_id')->distinct()->get()->pluck('problem_id');
+            $statistics=[];
+            $problemIDArr=DojoProblem::select('problem_id')->distinct()->get()->pluck('problem_id');
 
             foreach ($problemIDArr as $problemID) {
-                $statistics[$problemID] = [
+                $statistics[$problemID]=[
                     "icon" => "checkbox-blank-circle-outline",
                     "color" => "wemd-grey-text"
                 ];
             }
 
-            $problemCompleteIDArr = [];
+            $problemCompleteIDArr=[];
 
             foreach ($this->problems_latest_submission($problemIDArr->diff($problemCompleteIDArr), null, null, ['Accepted'])->get() as $acceptedRecord) {
-                $statistics[$acceptedRecord['pid']] = [
+                $statistics[$acceptedRecord['pid']]=[
                     "icon" => "checkbox-blank-circle",
                     "color" => $acceptedRecord['color']
                 ];
-                $problemCompleteIDArr[] = $acceptedRecord['pid'];
+                $problemCompleteIDArr[]=$acceptedRecord['pid'];
             }
 
             foreach ($this->problems_latest_submission($problemIDArr->diff($problemCompleteIDArr), null, null, ['Partially Accepted'])->get() as $acceptedRecord) {
-                $statistics[$acceptedRecord['pid']] = [
+                $statistics[$acceptedRecord['pid']]=[
                     "icon" => "cisco-webex",
                     "color" => $acceptedRecord['color']
                 ];
-                $problemCompleteIDArr[] = $acceptedRecord['pid'];
+                $problemCompleteIDArr[]=$acceptedRecord['pid'];
             }
 
             foreach ($this->problems_latest_submission($problemIDArr->diff($problemCompleteIDArr), null, null)->get() as $acceptedRecord) {
-                $statistics[$acceptedRecord['pid']] = [
+                $statistics[$acceptedRecord['pid']]=[
                     "icon" => "cisco-webex",
                     "color" => $acceptedRecord['color']
                 ];
-                $problemCompleteIDArr[] = $acceptedRecord['pid'];
+                $problemCompleteIDArr[]=$acceptedRecord['pid'];
             }
 
             return $statistics;