dsd-meetme / backend

app/Console/Commands/Optimise/Optimise.php

Doc Comments +6 added lines, -5 removed lines

@@ -303,10 +303,10 @@ 
     }
 
     /**
-     * @param array $users
-     * @param array $meetings
+     * @param string[] $users
+     * @param string[] $meetings
      * @param \Illuminate\Support\Collection $usersMeetings
-     * @return array
+     * @return \string[]
      */
     static private function getUsersMeetingsArray($users, $meetings, \Illuminate\Support\Collection $usersMeetings)
     {
@@ -338,8 +338,9 @@ 
 
     /**
      * @param \Illuminate\Support\Collection $timeSlots
-     * @param bool|true $free if true the array is filled with 1 for timeslots values else with 0 for timeslots values
-     * @return array
+     * @param boolean $free if true the array is filled with 1 for timeslots values else with 0 for timeslots values
+     * @param integer $timeslotsN
+     * @return \string[]
      */
     static private function getAvailabilityArray(\Illuminate\Support\Collection $timeSlots, $timeslotsN, $free=true)
     {

Unused Use Statements +1 added lines, -1 removed lines

@@ -9,8 +9,8 @@
 namespace plunner\Console\Commands\Optimise;
 
 use Illuminate\Console\Scheduling\Schedule;
-use plunner\company;
 use plunner\Events\Optimise\ErrorEvent;
+use plunner\company;
 
 /**
  * Class Optimise

Indentation +8 added lines, -8 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * Created by PhpStorm.
- * User: claudio
- * Date: 12/12/15
- * Time: 15.41
- */
+     * Created by PhpStorm.
+     * User: claudio
+     * Date: 12/12/15
+     * Time: 15.41
+     */
 
 namespace plunner\Console\Commands\Optimise;
 
@@ -45,8 +45,8 @@ 
     private $company;
 
     /**
-    * @var Schedule laravel schedule object needed to perform command in background
-    */
+     * @var Schedule laravel schedule object needed to perform command in background
+     */
     private $schedule;
 
     /**
@@ -413,7 +413,7 @@ 
         $diff = explode(':',$diff->format('%R:%d:%h:%i:%s'));
         $diff = $diff[1]*86400 + $diff[2]*3600 + $diff[3]*60 + $diff[4];
         //if($diff[0] != '-' && $diff != 0)
-          //  throw new OptimiseException('timeslot time <= startTime');
+            //  throw new OptimiseException('timeslot time <= startTime');
         //TODO fix check
         //TODO check if diff makes sense
         //TODO check upper limit

Braces +12 added lines, -9 removed lines

@@ -156,7 +156,7 @@ 
             $solver = $this->setData($solver);
             $solver = $solver->solve();
             $this->solver = $solver;
-        }catch(\Exception $e)
+        } catch(\Exception $e)
         {
             \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
             throw new OptimiseException('Optimising error', 0, $e);
@@ -180,7 +180,7 @@ 
         try {
             $this->saveMeetings($this->solver);
             $this->saveEmployeesMeetings($this->solver);
-        }catch(\Exception $e)
+        } catch(\Exception $e)
         {
             \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
             throw new OptimiseException('Optimising error', 0, $e);
@@ -327,7 +327,7 @@ 
             foreach($meetings as $meeting){
                 if($usersMeetingsTmp->contains('meeting_id', $meeting)){
                     $ret[$user][$meeting] = 1;
-                }else{
+                } else{
                     $ret[$user][$meeting] = 0;
                 }
             }
@@ -373,8 +373,9 @@ 
     static private function fillTimeSlots(array $array, $id, \Illuminate\Support\Collection $timeSlots, $fill = '0')
     {
         foreach($timeSlots as $timeSlot) {
-            if(!isset($array[$id]))
-                $array[$id] = [];
+            if(!isset($array[$id])) {
+                            $array[$id] = [];
+            }
             $array[$id] = self::arrayPadInterval($array[$id], $timeSlot->time_start, $timeSlot->time_end, $fill);
         }
         return $array;
@@ -389,8 +390,9 @@ 
     static private function fillRow(array $array, $id, $until, $fill = '0')
     {
         for($i = 1; $i <= $until; $i++){
-            if(!isset($array[$id][$i]))
-                $array[$id][$i] = $fill;
+            if(!isset($array[$id][$i])) {
+                            $array[$id][$i] = $fill;
+            }
         }
 
         return $array;
@@ -405,8 +407,9 @@ 
      */
     static private function arrayPadInterval(array $array, $from, $to, $pad = '0')
     {
-        for($i = $from; $i<$to; $i++)
-            $array[$i] = $pad;
+        for($i = $from; $i<$to; $i++) {
+                    $array[$i] = $pad;
+        }
         return $array;
     }
 

Spacing +38 added lines, -38 removed lines

@@ -24,7 +24,7 @@ 
     //TODo max timeslots can be an environment var
     const TIME_SLOT_DURATION = 900; //seconds -> 15 minutes
     const DEFAULT_MAX_TIME_SLOTS = 20; //max duration of a meeting in term of timeslots //20
-    const DEFAULT_TIME_SLOTS = 672;  //total amount of timeslots that must be optimised -> one week 4*24*7 = 672
+    const DEFAULT_TIME_SLOTS = 672; //total amount of timeslots that must be optimised -> one week 4*24*7 = 672
 
     private $max_time_slots = self::DEFAULT_MAX_TIME_SLOTS;
     private $time_slots = self::DEFAULT_TIME_SLOTS;
@@ -85,7 +85,7 @@ 
     {
         $this->startTime = clone $startTime;
         $this->endTime = clone $this->startTime;
-        $this->endTime->add(new \DateInterval('PT'.(($this->max_time_slots+$this->time_slots)*self::TIME_SLOT_DURATION).'S'));
+        $this->endTime->add(new \DateInterval('PT'.(($this->max_time_slots + $this->time_slots) * self::TIME_SLOT_DURATION).'S'));
     }
 
     /**
@@ -156,7 +156,7 @@ 
             $solver = $this->setData($solver);
             $solver = $solver->solve();
             $this->solver = $solver;
-        }catch(\Exception $e)
+        } catch (\Exception $e)
         {
             \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
             throw new OptimiseException('Optimising error', 0, $e);
@@ -170,7 +170,7 @@ 
      */
     public function save()
     {
-        if(!($this->solver instanceof Solver)) {
+        if (!($this->solver instanceof Solver)) {
             \Event::fire(new ErrorEvent($this->company, 'solver is not an instace of Solver'));
             throw new OptimiseException('solver is not an instance of Solver');
             return;
@@ -180,7 +180,7 @@ 
         try {
             $this->saveMeetings($this->solver);
             $this->saveEmployeesMeetings($this->solver);
-        }catch(\Exception $e)
+        } catch (\Exception $e)
         {
             \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
             throw new OptimiseException('Optimising error', 0, $e);
@@ -197,8 +197,8 @@ 
     private function saveMeetings(Solver $solver)
     {
         $meetings = $solver->getYResults();
-        foreach($meetings as $id=>$meeting){
-            $meetingO = \plunner\Meeting::findOrFail($id);//TODO catch error
+        foreach ($meetings as $id=>$meeting) {
+            $meetingO = \plunner\Meeting::findOrFail($id); //TODO catch error
             $meetingO->start_time = $this->toDateTime(array_search('1', $meeting));
             $meetingO->save();
         }
@@ -210,11 +210,11 @@ 
     private function saveEmployeesMeetings(Solver $solver)
     {
         $employeesMeetings = $solver->getXResults();
-        foreach($employeesMeetings as $eId =>$employeeMeetings)
+        foreach ($employeesMeetings as $eId =>$employeeMeetings)
         {
             $employee = \plunner\Employee::findOrFail($eId);
             $employeeMeetings = collect($employeeMeetings);
-            $employeeMeetings = $employeeMeetings->filter(function ($item) {
+            $employeeMeetings = $employeeMeetings->filter(function($item) {
                 return $item == 1;
             });
             $employee->meetings()->attach($employeeMeetings->keys()->toArray());
@@ -272,7 +272,7 @@ 
                 return $this->durationConverter($this->timeSlotsConverter($item));
             });
         return $solver->setMeetings($timeslots->keys()->toArray())
-            ->setMeetingsDuration($meetings->pluck('duration','id')->toArray())
+            ->setMeetingsDuration($meetings->pluck('duration', 'id')->toArray())
             ->setMeetingsAvailability(self::getAvailabilityArray($timeslots, $this->time_slots));
     }
 
@@ -318,15 +318,15 @@ 
      */
     static private function getUsersMeetingsArray($users, $meetings, \Illuminate\Support\Collection $usersMeetings)
     {
-        $ret = [];
-        foreach($users as $user)
+        $ret = [ ];
+        foreach ($users as $user)
         {
             $usersMeetingsTmp = $usersMeetings->get($user);
-            foreach($meetings as $meeting){
-                if($usersMeetingsTmp->contains('meeting_id', $meeting)){
-                    $ret[$user][$meeting] = 1;
-                }else{
-                    $ret[$user][$meeting] = 0;
+            foreach ($meetings as $meeting) {
+                if ($usersMeetingsTmp->contains('meeting_id', $meeting)) {
+                    $ret[ $user ][ $meeting ] = 1;
+                } else {
+                    $ret[ $user ][ $meeting ] = 0;
                 }
             }
         }
@@ -340,7 +340,7 @@ 
      */
     private function durationConverter($item)
     {
-        return $item->each(function($item2){
+        return $item->each(function($item2) {
             $item2->duration = $this->convertDuration((int) $item2->duration);
             return $item2;
             //TODO try catch
@@ -353,7 +353,7 @@ 
      */
     private function timeSlotsConverter($item)
     {
-        return $item->each(function($item2){
+        return $item->each(function($item2) {
             $item2->time_start = $this->toTimeSlot($item2->time_start);
             $item2->time_end = $this->toTimeSlot($item2->time_end);
             return $item2;
@@ -366,13 +366,13 @@ 
      * @param bool|true $free if true the array is filled with 1 for timeslots values else with 0 for timeslots values
      * @return array
      */
-    static private function getAvailabilityArray(\Illuminate\Support\Collection $timeSlots, $timeslotsN, $free=true)
+    static private function getAvailabilityArray(\Illuminate\Support\Collection $timeSlots, $timeslotsN, $free = true)
     {
-        $ret = [];
-        foreach($timeSlots as $id=>$timeSlots2)
+        $ret = [ ];
+        foreach ($timeSlots as $id=>$timeSlots2)
         {
-            $ret = self::fillTimeSlots($ret, $id, $timeSlots2, $free?'1':'0');
-            $ret = self::fillRow($ret, $id, $timeslotsN, $free?'0':'1');
+            $ret = self::fillTimeSlots($ret, $id, $timeSlots2, $free ? '1' : '0');
+            $ret = self::fillRow($ret, $id, $timeslotsN, $free ? '0' : '1');
         }
 
         return $ret;
@@ -387,10 +387,10 @@ 
      */
     static private function fillTimeSlots(array $array, $id, \Illuminate\Support\Collection $timeSlots, $fill = '0')
     {
-        foreach($timeSlots as $timeSlot) {
-            if(!isset($array[$id]))
-                $array[$id] = [];
-            $array[$id] = self::arrayPadInterval($array[$id], $timeSlot->time_start, $timeSlot->time_end, $fill);
+        foreach ($timeSlots as $timeSlot) {
+            if (!isset($array[ $id ]))
+                $array[ $id ] = [ ];
+            $array[ $id ] = self::arrayPadInterval($array[ $id ], $timeSlot->time_start, $timeSlot->time_end, $fill);
         }
         return $array;
     }
@@ -403,9 +403,9 @@ 
      */
     static private function fillRow(array $array, $id, $until, $fill = '0')
     {
-        for($i = 1; $i <= $until; $i++){
-            if(!isset($array[$id][$i]))
-                $array[$id][$i] = $fill;
+        for ($i = 1; $i <= $until; $i++) {
+            if (!isset($array[ $id ][ $i ]))
+                $array[ $id ][ $i ] = $fill;
         }
 
         return $array;
@@ -420,8 +420,8 @@ 
      */
     static private function arrayPadInterval(array $array, $from, $to, $pad = '0')
     {
-        for($i = $from; $i<$to; $i++)
-            $array[$i] = $pad;
+        for ($i = $from; $i < $to; $i++)
+            $array[ $i ] = $pad;
         return $array;
     }
 
@@ -435,14 +435,14 @@ 
     {
         $dateTime = new \DateTime($time);
         $diff = $dateTime->diff($this->startTime);
-        $diff = explode(':',$diff->format('%R:%d:%h:%i:%s'));
-        $diff = $diff[1]*86400 + $diff[2]*3600 + $diff[3]*60 + $diff[4];
+        $diff = explode(':', $diff->format('%R:%d:%h:%i:%s'));
+        $diff = $diff[ 1 ] * 86400 + $diff[ 2 ] * 3600 + $diff[ 3 ] * 60 + $diff[ 4 ];
         //if($diff[0] != '-' && $diff != 0)
           //  throw new OptimiseException('timeslot time <= startTime');
         //TODO fix check
         //TODO check if diff makes sense
         //TODO check upper limit
-        return (int)(round($diff/self::TIME_SLOT_DURATION)+1); //TODO can round cause overlaps?
+        return (int) (round($diff / self::TIME_SLOT_DURATION) + 1); //TODO can round cause overlaps?
     }
 
     /**
@@ -452,7 +452,7 @@ 
     private function toDateTime($timeslot)
     {
         $ret = clone $this->startTime;
-        return $ret->add(new \DateInterval('PT'.(($timeslot-1)*self::TIME_SLOT_DURATION).'S'));
+        return $ret->add(new \DateInterval('PT'.(($timeslot - 1) * self::TIME_SLOT_DURATION).'S'));
     }
 
     /**
@@ -461,6 +461,6 @@ 
      */
     static private function convertDuration($duration)
     {
-        return (int)ceil($duration/self::TIME_SLOT_DURATION);
+        return (int) ceil($duration / self::TIME_SLOT_DURATION);
     }
 }
\ No newline at end of file

app/Console/Commands/Optimise/Solver.php

Doc Comments +15 added lines, -13 removed lines

@@ -119,7 +119,7 @@ 
 
     /**
      * remove a no empty dir
-     * @param $dir
+     * @param string $dir
      * @return bool
      */
     private static function delTree($dir) {
@@ -173,7 +173,7 @@ 
     }
 
     /**
-     * @return \string[]
+     * @return string[]
      */
     public function getUsers()
     {
@@ -191,7 +191,7 @@ 
     }
 
     /**
-     * @return \string[]
+     * @return string[]
      */
     public function getMeetings()
     {
@@ -253,7 +253,7 @@ 
     }
 
     /**
-     * @return \string[]
+     * @return string[]
      */
     public function getMeetingsAvailability()
     {
@@ -282,7 +282,7 @@ 
     }
 
     /**
-     * @return \string[]
+     * @return string[]
      */
     public function getMeetingsDuration()
     {
@@ -312,7 +312,7 @@ 
     }
 
     /**
-     * @return \string[]
+     * @return string[]
      */
     public function getUsersAvailability()
     {
@@ -342,7 +342,7 @@ 
     }
 
     /**
-     * @return \string[]
+     * @return string[]
      */
     public function getUsersMeetings()
     {
@@ -419,7 +419,7 @@ 
 
     /**
      * @param string $file
-     * @param array $data
+     * @param string[] $data
      * @throws OptimiseException
      */
     static private function writeCSVArrayNoKey($file, $data)
@@ -435,7 +435,7 @@ 
 
     /**
      * @param string $file
-     * @param array $data
+     * @param string[] $data
      * @param string $name
      * @throws OptimiseException
      */
@@ -452,7 +452,7 @@ 
 
     /**
      * @param string $file
-     * @param array $data
+     * @param string[] $data
      * @param string $name
      * @throws OptimiseException
      */
@@ -471,7 +471,7 @@ 
     /**
      * @param string $file
      * @param array $data
-     * @param array $heading
+     * @param string[] $heading
      * @param \Closure $writer
      * @throws OptimiseException
      */
@@ -682,7 +682,7 @@ 
     }
 
     /**
-     * @param $proprieties
+     * @param string[] $proprieties
      * @throws OptimiseException
      */
     private function checkArrayProprieties($proprieties)
@@ -693,7 +693,7 @@ 
     }
 
     /**
-     * @param $proprieties
+     * @param string[] $proprieties
      * @throws OptimiseException
      */
     private function checkIntProprieties($proprieties)
@@ -707,6 +707,8 @@ 
      * implementation of arraypad that doesn't change original keys<br/>
      * <strong>CAUTION: Only positive $len</strong>
      * @param array $array
+     * @param integer $len
+     * @param integer $pad
      * @return array
      */
     static private function arrayPad(array $array, $len, $pad)

Indentation +18 added lines, -18 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 /**
- * Created by PhpStorm.
- * User: Claudio Cardinale <cardi@thecsea.it>
- * Date: 07/12/15
- * Time: 21.18
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
+     * Created by PhpStorm.
+     * User: Claudio Cardinale <cardi@thecsea.it>
+     * Date: 07/12/15
+     * Time: 21.18
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 2
+     * of the License, or (at your option) any later version.
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+     */
 
 namespace plunner\Console\Commands\Optimise;
 
@@ -69,8 +69,8 @@ 
     private $usersMeetings;
 
     /**
-    * @var Schedule laravel schedule object needed to perform command in background
-    */
+     * @var Schedule laravel schedule object needed to perform command in background
+     */
     private $schedule;
 
     /**

Spacing +51 added lines, -51 removed lines

@@ -113,7 +113,7 @@ 
      */
     static private function checkGlpsol()
     {
-        if(!(`which glpsol`))
+        if (!(`which glpsol`))
             throw new OptimiseException('glpsol is not installed');
     }
 
@@ -123,7 +123,7 @@ 
      * @return bool
      */
     private static function delTree($dir) {
-        $files = array_diff(scandir($dir), array('.','..'));
+        $files = array_diff(scandir($dir), array('.', '..'));
         foreach ($files as $file) {
             (is_dir("$dir/$file")) ? delTree("$dir/$file") : unlink("$dir/$file");
         }
@@ -138,11 +138,11 @@ 
     {
         $this->path = tempnam(sys_get_temp_dir(), 'OPT'); //TODO check the return in case of errors this return false on failure
         unlink($this->path); //remove file to create a dir
-        if(file_exists($this->path))
+        if (file_exists($this->path))
             throw new OptimiseException('problem during creation of tmp dir (the directory already exists)');
-        if(!@mkdir($this->path))
-            throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');;
-        if(! is_dir($this->path))
+        if (!@mkdir($this->path))
+            throw new OptimiseException('problem during creation of tmp dir (mkdir problem)'); ;
+        if (!is_dir($this->path))
             throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)');
     }
 
@@ -223,7 +223,7 @@ 
      */
     public function setTimeSlots($timeSlots)
     {
-        if(!is_int($timeSlots) || $timeSlots <=0)
+        if (!is_int($timeSlots) || $timeSlots <= 0)
             throw new OptimiseException('$timeSlots is not integer or it is not >0');
 
         $this->timeSlots = $timeSlots;
@@ -245,7 +245,7 @@ 
      */
     public function setMaxTimeSlots($maxTimeSlots)
     {
-        if(!is_int($maxTimeSlots) || $maxTimeSlots <=0)
+        if (!is_int($maxTimeSlots) || $maxTimeSlots <= 0)
             throw new OptimiseException('$maxTimeSlots is not integer or it is not >0');
 
         $this->maxTimeSlots = $maxTimeSlots;
@@ -268,13 +268,13 @@ 
     public function setMeetingsAvailability($meetingsAvailability)
     {
         $meetings = array_keys($meetingsAvailability);
-        if(array_diff($meetings, $this->meetings))
+        if (array_diff($meetings, $this->meetings))
             throw new OptimiseException('meetings different from meetings set');
-        foreach($meetingsAvailability as $key=>$meetingsAvailabilityS) {
+        foreach ($meetingsAvailability as $key=>$meetingsAvailabilityS) {
             $timeSlots = array_keys($meetingsAvailabilityS);
-            if(count($timeSlots) != $this->timeSlots)
+            if (count($timeSlots) != $this->timeSlots)
                 throw new OptimiseException('timeSlots different from timeSlots set');
-            $meetingsAvailability[$key] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
+            $meetingsAvailability[ $key ] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
         }
 
         $this->meetingsAvailability = $meetingsAvailability;
@@ -297,13 +297,13 @@ 
     public function setMeetingsDuration($meetingsDuration)
     {
         $meetings = array_keys($meetingsDuration);
-        if(array_diff($meetings, $this->meetings)) {
+        if (array_diff($meetings, $this->meetings)) {
             print "";
             throw new OptimiseException('meetings different from meetings set');
         }
-        foreach($meetingsDuration as $duration) {
+        foreach ($meetingsDuration as $duration) {
             $duration = (int) $duration; //TODO fix this (fix for optimise)
-            if(!is_int($duration) || $duration <=0)
+            if (!is_int($duration) || $duration <= 0)
                 throw new OptimiseException('duration is not integer or it is not >0');
         }
 
@@ -327,14 +327,14 @@ 
     public function setUsersAvailability($usersAvailability)
     {
         $users = array_keys($usersAvailability);
-        if(array_diff($users, $this->users))
+        if (array_diff($users, $this->users))
             throw new OptimiseException('users different from users set');
-        foreach($usersAvailability as $key=>$usersAvailabilityS) {
+        foreach ($usersAvailability as $key=>$usersAvailabilityS) {
             $timeSlots = array_keys($usersAvailabilityS);
-            if(count($timeSlots) != $this->timeSlots)
+            if (count($timeSlots) != $this->timeSlots)
                 throw new OptimiseException('timeSlots different from timeSlots set');
 
-            $usersAvailability[$key] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
+            $usersAvailability[ $key ] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
         }
 
         $this->usersAvailability = $usersAvailability;
@@ -357,11 +357,11 @@ 
     public function setUsersMeetings($usersMeetings)
     {
         $users = array_keys($usersMeetings);
-        if(array_diff($users, $this->users))
+        if (array_diff($users, $this->users))
             throw new OptimiseException('users different from users set');
-        foreach($usersMeetings as $usersMeetingsS) {
+        foreach ($usersMeetings as $usersMeetingsS) {
             $meetings = array_keys($usersMeetingsS);
-            if(array_diff($meetings, $this->meetings))
+            if (array_diff($meetings, $this->meetings))
                 throw new OptimiseException('meetings different from meetings set');
         }
 
@@ -424,13 +424,13 @@ 
      */
     static private function writeCSVArrayNoKey($file, $data)
     {
-        $f = function ($fp, $data){
+        $f = function($fp, $data) {
             foreach ($data as $field) {
-                fputcsv($fp, [$field]);
+                fputcsv($fp, [ $field ]);
             }
         };
 
-        self::writeCSV($file, $data, ['i'], $f);
+        self::writeCSV($file, $data, [ 'i' ], $f);
     }
 
     /**
@@ -441,13 +441,13 @@ 
      */
     static private function writeCSVArray($file, $data, $name)
     {
-        $f = function ($fp, $data){
+        $f = function($fp, $data) {
             foreach ($data as $key=>$field) {
-                fputcsv($fp, [$key, $field]);
+                fputcsv($fp, [ $key, $field ]);
             }
         };
 
-        self::writeCSV($file, $data, ['i', $name], $f);
+        self::writeCSV($file, $data, [ 'i', $name ], $f);
     }
 
     /**
@@ -458,14 +458,14 @@ 
      */
     static private function writeCSVMatrix($file, $data, $name)
     {
-        $f = function ($fp, $data){
+        $f = function($fp, $data) {
             foreach ($data as $key=>$field) {
                 foreach ($field as $key2=>$field2)
-                    fputcsv($fp, [$key, $key2, $field2]);
+                    fputcsv($fp, [ $key, $key2, $field2 ]);
             }
         };
 
-        self::writeCSV($file, $data, ['i', 'j', $name], $f);
+        self::writeCSV($file, $data, [ 'i', 'j', $name ], $f);
     }
 
     /**
@@ -478,7 +478,7 @@ 
     static private function writeCSV($file, $data, $heading, \Closure $writer)
     {
         $fp = @fopen($file, 'w');
-        if(!$fp)
+        if (!$fp)
             throw new OptimiseException('problem during creation of a file');
 
         fputcsv($fp, $heading);
@@ -498,8 +498,8 @@ 
     {
         $this->writeData();
         $this->writeModelFile();
-        $event = $this->schedule->exec('glpsol --math '.$this->getModelPath())->sendOutputTo($this->getOutputPath())->after(function () { }); //this just to execute in foreground
-        if($event->isDue($this->laravel))
+        $event = $this->schedule->exec('glpsol --math '.$this->getModelPath())->sendOutputTo($this->getOutputPath())->after(function() { }); //this just to execute in foreground
+        if ($event->isDue($this->laravel))
             $event->run($this->laravel);
         //TODO catch glpsol errors
         return $this;
@@ -513,9 +513,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->getUsersPath(), $this->getMeetingsPath(), $this->getUsersAvailabilityPath(), $this->getMeetingsAvailabilityPath(), $this->getUsersMeetingsPath(), $this->getMeetingsDurationPath(), $this->timeSlots, $this->maxTimeSlots, $this->getXPath(), $this->getYPath());
         $f = @fopen($this->getModelPath(), "w");
-        if(!$f)
+        if (!$f)
             throw new OptimiseException('problem during creation of a file');
-        fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__ . "/model.stub")));
+        fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__."/model.stub")));
         fclose($f);
     }
 
@@ -543,7 +543,7 @@ 
      */
     public function getOutput()
     {
-        if(!($data = file_get_contents($this->getOutputPath())))
+        if (!($data = file_get_contents($this->getOutputPath())))
             throw new OptimiseException('problems during reading the file');
         return $data;
     }
@@ -555,22 +555,22 @@ 
      */
     static private function readCSVFile($file)
     {
-        if(!file_exists($file) || !filesize($file))
+        if (!file_exists($file) || !filesize($file))
             throw new OptimiseException('no results file');
 
-        $handle = @fopen($file,"r");
-        if(!$handle)
+        $handle = @fopen($file, "r");
+        if (!$handle)
             throw new OptimiseException('problems during reading the file');
 
-        $ret = [];
+        $ret = [ ];
         fgetcsv($handle); //skip head
         while (($data = fgetcsv($handle)) !== FALSE) {
-            if(count($data) != 3) {
+            if (count($data) != 3) {
                 fclose($handle);
                 throw new OptimiseException('problems during parsing the file');
             }
 
-            $ret[$data[0]][$data[1]] = $data[2];
+            $ret[ $data[ 0 ] ][ $data[ 1 ] ] = $data[ 2 ];
         }
 
         fclose($handle);
@@ -677,8 +677,8 @@ 
      */
     private function checkData()
     {
-        $this->checkArrayProprieties(['users', 'meetings', 'meetingsAvailability', 'meetingsDuration', 'usersAvailability', 'usersMeetings']);
-        $this->checkIntProprieties(['timeSlots', 'maxTimeSlots']);
+        $this->checkArrayProprieties([ 'users', 'meetings', 'meetingsAvailability', 'meetingsDuration', 'usersAvailability', 'usersMeetings' ]);
+        $this->checkIntProprieties([ 'timeSlots', 'maxTimeSlots' ]);
     }
 
     /**
@@ -687,8 +687,8 @@ 
      */
     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.' is not set correctly');
     }
 
@@ -698,8 +698,8 @@ 
      */
     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.' is not set correctly');
     }
 
@@ -712,8 +712,8 @@ 
     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;
     }
 }
\ No newline at end of file

Braces +73 added lines, -48 removed lines

@@ -104,8 +104,9 @@ 
      */
     function __destruct()
     {
-        if ($this->path && is_dir($this->path) && !self::delTree($this->path))
-            throw new OptimiseException('problems during removing of path directory');
+        if ($this->path && is_dir($this->path) && !self::delTree($this->path)) {
+                    throw new OptimiseException('problems during removing of path directory');
+        }
     }
 
     /**
@@ -113,8 +114,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');
+        }
     }
 
     /**
@@ -138,12 +140,16 @@ 
     {
         $this->path = tempnam(sys_get_temp_dir(), 'OPT'); //TODO check the return in case of errors this return false on failure
         unlink($this->path); //remove file to create a dir
-        if(file_exists($this->path))
-            throw new OptimiseException('problem during creation of tmp dir (the directory already exists)');
-        if(!@mkdir($this->path))
-            throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');;
-        if(! is_dir($this->path))
-            throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)');
+        if(file_exists($this->path)) {
+                    throw new OptimiseException('problem during creation of tmp dir (the directory already exists)');
+        }
+        if(!@mkdir($this->path)) {
+                    throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');
+        }
+        ;
+        if(! is_dir($this->path)) {
+                    throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)');
+        }
     }
 
     /**
@@ -223,8 +229,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;
@@ -245,8 +252,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;
@@ -268,12 +276,14 @@ 
     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);
-            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);
         }
 
@@ -303,8 +313,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;
@@ -327,12 +338,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);
-            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);
         }
@@ -357,12 +370,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;
@@ -460,8 +475,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]);
+                }
             }
         };
 
@@ -478,8 +494,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);
 
@@ -499,8 +516,9 @@ 
         $this->writeData();
         $this->writeModelFile();
         $event = $this->schedule->exec('glpsol --math '.$this->getModelPath())->sendOutputTo($this->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;
     }
@@ -513,8 +531,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->getUsersPath(), $this->getMeetingsPath(), $this->getUsersAvailabilityPath(), $this->getMeetingsAvailabilityPath(), $this->getUsersMeetingsPath(), $this->getMeetingsDurationPath(), $this->timeSlots, $this->maxTimeSlots, $this->getXPath(), $this->getYPath());
         $f = @fopen($this->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);
     }
@@ -543,8 +562,9 @@ 
      */
     public function getOutput()
     {
-        if(!($data = file_get_contents($this->getOutputPath())))
-            throw new OptimiseException('problems during reading the file');
+        if(!($data = file_get_contents($this->getOutputPath()))) {
+                    throw new OptimiseException('problems during reading the file');
+        }
         return $data;
     }
 
@@ -555,12 +575,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
@@ -687,9 +709,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.' is not set correctly');
+        }
     }
 
     /**
@@ -698,9 +721,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.' is not set correctly');
+        }
     }
 
     /**
@@ -712,8 +736,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;
     }
 }
\ No newline at end of file

app/Listeners/Optimise/ErrorListener.php

Unused Use Statements -2 removed lines

@@ -3,8 +3,6 @@
 namespace plunner\Listeners;
 
 use plunner\Events\CaldavErrorEvent;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
 
 class CaldavErrorListener
 {

app/Listeners/Optimise/OkListener.php

Unused Use Statements -2 removed lines

@@ -3,8 +3,6 @@
 namespace plunner\Listeners;
 
 use plunner\Events\CaldavErrorEvent;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
 
 class CaldavErrorListener
 {

app/Console/Commands/Optimise/OptimiseCommand.php

Indentation +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
     protected $description = 'Optimise meetings';
 
     /**
-    * @var Schedule laravel schedule object needed to perform command in background
-    */
+     * @var Schedule laravel schedule object needed to perform command in background
+     */
     private $schedule;
 
     /**

Spacing +7 added lines, -7 removed lines

@@ -62,7 +62,7 @@ 
 
         //TODO try...catch with destruct
         $companyId = $this->argument('companyId');
-        if(is_numeric($companyId))
+        if (is_numeric($companyId))
             $this->makeForeground(Company::findOrFail($companyId));
         else
             $this->syncAll();
@@ -71,15 +71,15 @@ 
     private function syncAll()
     {
         $calendars = Caldav::all();
-        if($this->option('background')) {
+        if ($this->option('background')) {
             \Log::debug(self::BACKGROUND_MOD_MEX);
             $this->info(self::BACKGROUND_MOD_MEX);
             foreach ($calendars as $calendar)
                 $this->makeBackground($calendar);
             \Log::debug(self::BACKGROUND_COMPLETED_MEX);
             $this->info(self::BACKGROUND_COMPLETED_MEX);
-        }else
-            foreach($calendars as $calendar)
+        } else
+            foreach ($calendars as $calendar)
                 $this->makeForeground($calendar);
     }
 
@@ -90,7 +90,7 @@ 
     private function makeBackground(Company $company)
     {
         $event = $this->schedule->command('optimise:meetings '.$company->id)->withoutOverlapping();
-        if($event->isDue($this->laravel))
+        if ($event->isDue($this->laravel))
             $event->run($this->laravel);
     }
 
@@ -100,8 +100,8 @@ 
      */
     private function makeForeground(Company $company)
     {
-        $this->info('Optimisation company '. $company->id.' started');
+        $this->info('Optimisation company '.$company->id.' started');
         (new Optimise($company))->optimise()->save();
-        $this->info('Optimisation '. $company->id.' completed');
+        $this->info('Optimisation '.$company->id.' completed');
     }
 }

Braces +14 added lines, -10 removed lines

@@ -62,10 +62,11 @@ 
 
         //TODO try...catch with destruct
         $companyId = $this->argument('companyId');
-        if(is_numeric($companyId))
-            $this->makeForeground(Company::findOrFail($companyId));
-        else
-            $this->syncAll();
+        if(is_numeric($companyId)) {
+                    $this->makeForeground(Company::findOrFail($companyId));
+        } else {
+                    $this->syncAll();
+        }
     }
 
     private function syncAll()
@@ -74,13 +75,15 @@ 
         if($this->option('background')) {
             \Log::debug(self::BACKGROUND_MOD_MEX);
             $this->info(self::BACKGROUND_MOD_MEX);
-            foreach ($calendars as $calendar)
-                $this->makeBackground($calendar);
+            foreach ($calendars as $calendar) {
+                            $this->makeBackground($calendar);
+            }
             \Log::debug(self::BACKGROUND_COMPLETED_MEX);
             $this->info(self::BACKGROUND_COMPLETED_MEX);
-        }else
-            foreach($calendars as $calendar)
+        } else {
+                    foreach($calendars as $calendar)
                 $this->makeForeground($calendar);
+        }
     }
 
     /**
@@ -90,8 +93,9 @@ 
     private function makeBackground(Company $company)
     {
         $event = $this->schedule->command('optimise:meetings '.$company->id)->withoutOverlapping();
-        if($event->isDue($this->laravel))
-            $event->run($this->laravel);
+        if($event->isDue($this->laravel)) {
+                    $event->run($this->laravel);
+        }
     }
 
     /**

app/Console/Commands/Optimise/OptimiseException.php

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Claudio Cardinale <cardi@thecsea.it>
- * Date: 07/12/15
- * Time: 21.24
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
+     * Created by PhpStorm.
+     * User: Claudio Cardinale <cardi@thecsea.it>
+     * Date: 07/12/15
+     * Time: 21.24
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 2
+     * of the License, or (at your option) any later version.
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+     */
 
 namespace plunner\Console\Commands\Optimise;
 

app/Events/Optimise/OkEvent.php

Spacing +1 added lines, -1 removed lines

@@ -39,6 +39,6 @@
      */
     public function broadcastOn()
     {
-        return [];
+        return [ ];
     }
 }

app/Events/Optimise/ErrorEvent.php

Spacing +1 added lines, -1 removed lines

@@ -39,6 +39,6 @@
      */
     public function broadcastOn()
     {
-        return [];
+        return [ ];
     }
 }

app/Company.php

Spacing +9 added lines, -9 removed lines

@@ -48,14 +48,14 @@ 
      *
      * @var array
      */
-    protected $fillable = ['name', 'email', 'password'];
+    protected $fillable = [ 'name', 'email', 'password' ];
 
     /**
      * The attributes excluded from the model's JSON form.
      *
      * @var array
      */
-    protected $hidden = ['password', 'remember_token'];
+    protected $hidden = [ 'password', 'remember_token' ];
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
@@ -120,8 +120,8 @@ 
             ->where('calendars.enabled', '=', '1')
             ->where('timeslots.time_start', '>=', $from)
             ->where('timeslots.time_end', '<=', $to)
-            ->where('employees.company_id','=', $this->id)
-            ->select('employees.id','timeslots.time_start','timeslots.time_end')
+            ->where('employees.company_id', '=', $this->id)
+            ->select('employees.id', 'timeslots.time_start', 'timeslots.time_end')
             ->get();
     }
 
@@ -137,9 +137,9 @@ 
             ->join('meeting_timeslots', 'meetings.id', '=', 'meeting_timeslots.meeting_id')
             ->where('meeting_timeslots.time_start', '>=', $from)
             ->where('meeting_timeslots.time_end', '<=', $to)
-            ->where('groups.company_id','=', $this->id)
-            ->where('meetings.start_time','=', NULL)
-            ->select('meetings.id', 'meetings.duration','meeting_timeslots.time_start','meeting_timeslots.time_end')
+            ->where('groups.company_id', '=', $this->id)
+            ->where('meetings.start_time', '=', NULL)
+            ->select('meetings.id', 'meetings.duration', 'meeting_timeslots.time_start', 'meeting_timeslots.time_end')
             ->get();
     }
 
@@ -151,8 +151,8 @@ 
             ->join('employees', 'employee_group.employee_id', '=', 'employees.id')
             ->whereIn('employees.id', $users)
             ->whereIn('meetings.id', $meetings)
-            ->where('groups.company_id','=', $this->id) //this is not needed
-            ->where('employees.company_id','=', $this->id) //this is not needed
+            ->where('groups.company_id', '=', $this->id) //this is not needed
+            ->where('employees.company_id', '=', $this->id) //this is not needed
             ->select('employees.id as employee_id', 'meetings.id as meeting_id')
             ->get();
     }