dsd-meetme / backend

app/Console/Commands/Optimise/Solver.php

Braces +60 added lines, -40 removed lines

@@ -104,8 +104,9 @@ 
      */
     static private function checkGlpsol()
     {
-        if (!(`which glpsol`))
-            throw new OptimiseException('glpsol is not installed');
+        if (!(`which glpsol`)) {
+                    throw new OptimiseException('glpsol is not installed');
+        }
     }
 
     /**
@@ -193,8 +194,9 @@ 
      */
     public function setTimeSlots($timeSlots)
     {
-        if (!is_int($timeSlots) || $timeSlots <= 0)
-            throw new OptimiseException($timeSlots . ' is not integer or it is not >0');
+        if (!is_int($timeSlots) || $timeSlots <= 0) {
+                    throw new OptimiseException($timeSlots . ' is not integer or it is not >0');
+        }
 
         $this->timeSlots = $timeSlots;
         return $this;
@@ -215,8 +217,9 @@ 
      */
     public function setMaxTimeSlots($maxTimeSlots)
     {
-        if (!is_int($maxTimeSlots) || $maxTimeSlots <= 0)
-            throw new OptimiseException($maxTimeSlots . ' is not integer or it is not >0');
+        if (!is_int($maxTimeSlots) || $maxTimeSlots <= 0) {
+                    throw new OptimiseException($maxTimeSlots . ' is not integer or it is not >0');
+        }
 
         $this->maxTimeSlots = $maxTimeSlots;
         return $this;
@@ -238,13 +241,15 @@ 
     public function setMeetingsAvailability($meetingsAvailability)
     {
         $meetings = array_keys($meetingsAvailability);
-        if (array_diff($meetings, $this->meetings))
-            throw new OptimiseException('meetings different from meetings set');
+        if (array_diff($meetings, $this->meetings)) {
+                    throw new OptimiseException('meetings different from meetings set');
+        }
         foreach ($meetingsAvailability as $key => $meetingsAvailabilityS) {
             $timeSlots = array_keys($meetingsAvailabilityS);//TODO this is useless, we can use directly $usersAvailabilityS
             //TODO check if keys are sequential and the last is the same with $this->timeSlots
-            if (count($timeSlots) != $this->timeSlots)
-                throw new OptimiseException('timeSlots different from timeSlots set');
+            if (count($timeSlots) != $this->timeSlots) {
+                            throw new OptimiseException('timeSlots different from timeSlots set');
+            }
             $meetingsAvailability[$key] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
         }
 
@@ -261,8 +266,9 @@ 
     static private function arrayPad(array $array, $len, $pad)
     {
         $len = $len - count($array);
-        for ($i = 0; $i < $len; $i++)
-            $array[] = $pad;
+        for ($i = 0; $i < $len; $i++) {
+                    $array[] = $pad;
+        }
         return $array;
     }
 
@@ -287,8 +293,9 @@ 
         }
         foreach ($meetingsDuration as $duration) {
             $duration = (int)$duration; //TODO fix this (fix for optimise)
-            if (!is_int($duration) || $duration <= 0)
-                throw new OptimiseException('duration is not integer or it is not >0');
+            if (!is_int($duration) || $duration <= 0) {
+                            throw new OptimiseException('duration is not integer or it is not >0');
+            }
         }
 
         $this->meetingsDuration = $meetingsDuration;
@@ -311,12 +318,14 @@ 
     public function setUsersAvailability($usersAvailability)
     {
         $users = array_keys($usersAvailability);
-        if (array_diff($users, $this->users))
-            throw new OptimiseException('users different from users set');
+        if (array_diff($users, $this->users)) {
+                    throw new OptimiseException('users different from users set');
+        }
         foreach ($usersAvailability as $key => $usersAvailabilityS) {
             $timeSlots = array_keys($usersAvailabilityS);//TODO this is useless, we can use directly $usersAvailabilityS
-            if (count($timeSlots) != $this->timeSlots)
-                throw new OptimiseException('timeSlots different from timeSlots set');
+            if (count($timeSlots) != $this->timeSlots) {
+                            throw new OptimiseException('timeSlots different from timeSlots set');
+            }
 
             $usersAvailability[$key] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
         }
@@ -341,12 +350,14 @@ 
     public function setUsersMeetings($usersMeetings)
     {
         $users = array_keys($usersMeetings);
-        if (array_diff($users, $this->users))
-            throw new OptimiseException('users different from users set');
+        if (array_diff($users, $this->users)) {
+                    throw new OptimiseException('users different from users set');
+        }
         foreach ($usersMeetings as $usersMeetingsS) {
             $meetings = array_keys($usersMeetingsS);
-            if (array_diff($meetings, $this->meetings))
-                throw new OptimiseException('meetings different from meetings set');
+            if (array_diff($meetings, $this->meetings)) {
+                            throw new OptimiseException('meetings different from meetings set');
+            }
         }
 
         $this->usersMeetings = $usersMeetings;
@@ -363,8 +374,9 @@ 
         $this->writeModelFile();
         $event = $this->schedule->exec('glpsol --math ' . $this->path->getModelPath())->sendOutputTo($this->path->getOutputPath())->after(function () {
         }); //this just to execute in foreground
-        if ($event->isDue($this->laravel))
-            $event->run($this->laravel);
+        if ($event->isDue($this->laravel)) {
+                    $event->run($this->laravel);
+        }
         //TODO catch glpsol errors
         return $this;
     }
@@ -398,9 +410,10 @@ 
      */
     private function checkArrayProprieties($proprieties)
     {
-        foreach ($proprieties as $propriety)
-            if (count($this->$propriety) == 0)
+        foreach ($proprieties as $propriety) {
+                    if (count($this->$propriety) == 0)
                 throw new OptimiseException($propriety . ' property is not set correctly');
+        }
     }
 
     /**
@@ -409,9 +422,10 @@ 
      */
     private function checkIntProprieties($proprieties)
     {
-        foreach ($proprieties as $propriety)
-            if (!is_int($this->$propriety) || $this->$propriety <= 0)
+        foreach ($proprieties as $propriety) {
+                    if (!is_int($this->$propriety) || $this->$propriety <= 0)
                 throw new OptimiseException($propriety . ' property is not set correctly');
+        }
     }
 
     /**
@@ -448,8 +462,9 @@ 
     static private function writeCSV($file, $data, $heading, \Closure $writer)
     {
         $fp = @fopen($file, 'w');
-        if (!$fp)
-            throw new OptimiseException('problem during creation of a file');
+        if (!$fp) {
+                    throw new OptimiseException('problem during creation of a file');
+        }
 
         fputcsv($fp, $heading);
 
@@ -511,8 +526,9 @@ 
     {
         $f = function ($fp, $data) {
             foreach ($data as $key => $field) {
-                foreach ($field as $key2 => $field2)
-                    fputcsv($fp, [$key, $key2, $field2]);
+                foreach ($field as $key2 => $field2) {
+                                    fputcsv($fp, [$key, $key2, $field2]);
+                }
             }
         };
 
@@ -543,8 +559,9 @@ 
         $strReplaceS = array('{USERS_PATH}', '{MEETINGS_PATH}', '{USER_AVAILABILITY_PATH}', '{MEETINGS_AVAILABILITY_PATH}', '{USER_MEETINGS_PATH}', '{MEETINGS_DURATION_PATH}', '{TIME_SLOTS}', '{MAX_TIME_SLOTS}', '{X_OUT_PATH}', '{Y_OUT_PATH}');
         $strReplaceR = array($this->path->getUsersPath(), $this->path->getMeetingsPath(), $this->path->getUsersAvailabilityPath(), $this->path->getMeetingsAvailabilityPath(), $this->path->getUsersMeetingsPath(), $this->path->getMeetingsDurationPath(), $this->timeSlots, $this->maxTimeSlots, $this->path->getXPath(), $this->path->getYPath());
         $f = @fopen($this->path->getModelPath(), "w");
-        if (!$f)
-            throw new OptimiseException('problem during creation of a file');
+        if (!$f) {
+                    throw new OptimiseException('problem during creation of a file');
+        }
         fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__ . "/model.stub")));
         fclose($f);
     }
@@ -565,12 +582,14 @@ 
      */
     static private function readCSVFile($file)
     {
-        if (!file_exists($file) || !filesize($file))
-            throw new OptimiseException('no results file');
+        if (!file_exists($file) || !filesize($file)) {
+                    throw new OptimiseException('no results file');
+        }
 
         $handle = @fopen($file, "r");
-        if (!$handle)
-            throw new OptimiseException('problems during reading the file');
+        if (!$handle) {
+                    throw new OptimiseException('problems during reading the file');
+        }
 
         $ret = [];
         fgetcsv($handle); //skip head
@@ -603,8 +622,9 @@ 
      */
     public function getOutput()
     {
-        if (!($data = file_get_contents($this->path->getOutputPath())))
-            throw new OptimiseException('problems during reading the file');
+        if (!($data = file_get_contents($this->path->getOutputPath()))) {
+                    throw new OptimiseException('problems during reading the file');
+        }
         return $data;
     }
 }
\ No newline at end of file

app/Console/Commands/MeetingsList.php

Braces +5 added lines, -4 removed lines

@@ -39,10 +39,11 @@
     {
         //
         $companyId = $this->argument('companyId');
-        if (is_numeric($companyId))
-            print_r(Company::with(self::withFilter())->findOrFail($companyId)->toArray());
-        else
-            print_r(Company::with(self::withFilter())->select('id')->get()->toArray());
+        if (is_numeric($companyId)) {
+                    print_r(Company::with(self::withFilter())->findOrFail($companyId)->toArray());
+        } else {
+                    print_r(Company::with(self::withFilter())->select('id')->get()->toArray());
+        }
     }
 
     private static function withFilter()

app/Http/Controllers/Employees/Planners/MeetingsController.php

Braces +8 added lines, -5 removed lines

@@ -32,9 +32,11 @@ 
         $group = Group::findOrFail($groupId);
         $this->authorize($group);
         $meetings = $group->meetings();
-        if ($request->query('current'))
-            $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
-                $query->where('start_time', '=', NULL);//to be planned
+        if ($request->query('current')) {
+                    $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
+                $query->where('start_time', '=', NULL);
+        }
+        //to be planned
                 //datetime to consider timezone, don't use mysql NOW()
                 $query->orWhere('start_time', '>=', new \DateTime());//planned
             });
@@ -91,8 +93,9 @@ 
         $meeting = Meeting::findOrFail($meetingId);
         $this->authorize($meeting);
         $input = $request->all();
-        if ($meeting->start_time != NULL && $meeting->duration != $input['duration'])
-            return Response::json(['error' => 'the meeting is already planned, you cannot change the duration'], 422);
+        if ($meeting->start_time != NULL && $meeting->duration != $input['duration']) {
+                    return Response::json(['error' => 'the meeting is already planned, you cannot change the duration'], 422);
+        }
         $meeting->update($input);
         return $meeting;
     }