@@ -1,21 +1,21 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Created by PhpStorm. |
|
| 4 | - * User: Claudio Cardinale <[email protected]> |
|
| 5 | - * Date: 24/11/15 |
|
| 6 | - * Time: 21.58 |
|
| 7 | - * This program is free software; you can redistribute it and/or |
|
| 8 | - * modify it under the terms of the GNU General Public License |
|
| 9 | - * as published by the Free Software Foundation; either version 2 |
|
| 10 | - * of the License, or (at your option) any later version. |
|
| 11 | - * This program is distributed in the hope that it will be useful, |
|
| 12 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 13 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 14 | - * GNU General Public License for more details. |
|
| 15 | - * You should have received a copy of the GNU General Public License |
|
| 16 | - * along with this program; if not, write to the Free Software |
|
| 17 | - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
| 18 | - */ |
|
| 3 | + * Created by PhpStorm. |
|
| 4 | + * User: Claudio Cardinale <[email protected]> |
|
| 5 | + * Date: 24/11/15 |
|
| 6 | + * Time: 21.58 |
|
| 7 | + * This program is free software; you can redistribute it and/or |
|
| 8 | + * modify it under the terms of the GNU General Public License |
|
| 9 | + * as published by the Free Software Foundation; either version 2 |
|
| 10 | + * of the License, or (at your option) any later version. |
|
| 11 | + * This program is distributed in the hope that it will be useful, |
|
| 12 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 13 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 14 | + * GNU General Public License for more details. |
|
| 15 | + * You should have received a copy of the GNU General Public License |
|
| 16 | + * along with this program; if not, write to the Free Software |
|
| 17 | + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
| 18 | + */ |
|
| 19 | 19 | |
| 20 | 20 | namespace plunner; |
| 21 | 21 | |
@@ -1,21 +1,21 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Created by PhpStorm. |
|
| 4 | - * User: Claudio Cardinale <[email protected]> |
|
| 5 | - * Date: 03/12/15 |
|
| 6 | - * Time: 2.33 |
|
| 7 | - * This program is free software; you can redistribute it and/or |
|
| 8 | - * modify it under the terms of the GNU General Public License |
|
| 9 | - * as published by the Free Software Foundation; either version 2 |
|
| 10 | - * of the License, or (at your option) any later version. |
|
| 11 | - * This program is distributed in the hope that it will be useful, |
|
| 12 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 13 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 14 | - * GNU General Public License for more details. |
|
| 15 | - * You should have received a copy of the GNU General Public License |
|
| 16 | - * along with this program; if not, write to the Free Software |
|
| 17 | - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
| 18 | - */ |
|
| 3 | + * Created by PhpStorm. |
|
| 4 | + * User: Claudio Cardinale <[email protected]> |
|
| 5 | + * Date: 03/12/15 |
|
| 6 | + * Time: 2.33 |
|
| 7 | + * This program is free software; you can redistribute it and/or |
|
| 8 | + * modify it under the terms of the GNU General Public License |
|
| 9 | + * as published by the Free Software Foundation; either version 2 |
|
| 10 | + * of the License, or (at your option) any later version. |
|
| 11 | + * This program is distributed in the hope that it will be useful, |
|
| 12 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 13 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 14 | + * GNU General Public License for more details. |
|
| 15 | + * You should have received a copy of the GNU General Public License |
|
| 16 | + * along with this program; if not, write to the Free Software |
|
| 17 | + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
| 18 | + */ |
|
| 19 | 19 | |
| 20 | 20 | namespace plunner\Console\Commands\SyncCaldav; |
| 21 | 21 | |
@@ -90,10 +90,11 @@ discard block |
||
| 90 | 90 | |
| 91 | 91 | //insert new timeslots |
| 92 | 92 | foreach ($events as $event) { |
| 93 | - if (!($event = $this->parseEvent($event))) |
|
| 94 | - \Event::fire(new ErrorEvent($this->calendar, 'problem during the parsing an event')); |
|
| 95 | - else |
|
| 96 | - $calendarMain->timeslots()->create($event); |
|
| 93 | + if (!($event = $this->parseEvent($event))) { |
|
| 94 | + \Event::fire(new ErrorEvent($this->calendar, 'problem during the parsing an event')); |
|
| 95 | + } else { |
|
| 96 | + $calendarMain->timeslots()->create($event); |
|
| 97 | + } |
|
| 97 | 98 | } |
| 98 | 99 | \Event::fire(new OkEvent($this->calendar)); |
| 99 | 100 | } |
@@ -110,8 +111,9 @@ discard block |
||
| 110 | 111 | $caldavClient = new SimpleCaldavAdapter(); |
| 111 | 112 | $caldavClient->connect($this->calendar->url, $this->calendar->username, \Crypt::decrypt($this->calendar->password)); |
| 112 | 113 | $calendars = $caldavClient->findCalendars(); |
| 113 | - if(!isset($calendars[$this->calendar->calendar_name])) |
|
| 114 | - throw new CaldavException("calendar inserted doesn't exist"); |
|
| 114 | + if(!isset($calendars[$this->calendar->calendar_name])) { |
|
| 115 | + throw new CaldavException("calendar inserted doesn't exist"); |
|
| 116 | + } |
|
| 115 | 117 | $caldavClient->setCalendar($calendars[$this->calendar->calendar_name]);//TODO error if the calendar name is wrong |
| 116 | 118 | /** |
| 117 | 119 | * 26 hours before to avoid tiemezone problems and dst problems |
@@ -128,17 +130,20 @@ discard block |
||
| 128 | 130 | { |
| 129 | 131 | $pattern = "/^((DTSTART;)|(DTEND;))(.*)\$/m"; |
| 130 | 132 | if (preg_match_all($pattern, $event->getData(), $matches)) { |
| 131 | - if (!isset($matches[4]) || count($matches[4]) != 2) |
|
| 132 | - return null; |
|
| 133 | + if (!isset($matches[4]) || count($matches[4]) != 2) { |
|
| 134 | + return null; |
|
| 135 | + } |
|
| 133 | 136 | $ret = []; |
| 134 | - if ($tmp = $this->parseDate($matches[4][0])) |
|
| 135 | - $ret['time_start'] = $tmp; |
|
| 136 | - else |
|
| 137 | - return null; |
|
| 138 | - if ($tmp = $this->parseDate($matches[4][1])) |
|
| 139 | - $ret['time_end'] = $tmp; |
|
| 140 | - else |
|
| 141 | - return null; |
|
| 137 | + if ($tmp = $this->parseDate($matches[4][0])) { |
|
| 138 | + $ret['time_start'] = $tmp; |
|
| 139 | + } else { |
|
| 140 | + return null; |
|
| 141 | + } |
|
| 142 | + if ($tmp = $this->parseDate($matches[4][1])) { |
|
| 143 | + $ret['time_end'] = $tmp; |
|
| 144 | + } else { |
|
| 145 | + return null; |
|
| 146 | + } |
|
| 142 | 147 | return $ret; |
| 143 | 148 | } |
| 144 | 149 | return null; |
@@ -1,21 +1,21 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Created by PhpStorm. |
|
| 4 | - * User: Claudio Cardinale <[email protected]> |
|
| 5 | - * Date: 07/12/15 |
|
| 6 | - * Time: 21.24 |
|
| 7 | - * This program is free software; you can redistribute it and/or |
|
| 8 | - * modify it under the terms of the GNU General Public License |
|
| 9 | - * as published by the Free Software Foundation; either version 2 |
|
| 10 | - * of the License, or (at your option) any later version. |
|
| 11 | - * This program is distributed in the hope that it will be useful, |
|
| 12 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 13 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 14 | - * GNU General Public License for more details. |
|
| 15 | - * You should have received a copy of the GNU General Public License |
|
| 16 | - * along with this program; if not, write to the Free Software |
|
| 17 | - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
| 18 | - */ |
|
| 3 | + * Created by PhpStorm. |
|
| 4 | + * User: Claudio Cardinale <[email protected]> |
|
| 5 | + * Date: 07/12/15 |
|
| 6 | + * Time: 21.24 |
|
| 7 | + * This program is free software; you can redistribute it and/or |
|
| 8 | + * modify it under the terms of the GNU General Public License |
|
| 9 | + * as published by the Free Software Foundation; either version 2 |
|
| 10 | + * of the License, or (at your option) any later version. |
|
| 11 | + * This program is distributed in the hope that it will be useful, |
|
| 12 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 13 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 14 | + * GNU General Public License for more details. |
|
| 15 | + * You should have received a copy of the GNU General Public License |
|
| 16 | + * along with this program; if not, write to the Free Software |
|
| 17 | + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
| 18 | + */ |
|
| 19 | 19 | |
| 20 | 20 | namespace plunner\Console\Commands\Optimise; |
| 21 | 21 | |
@@ -1,21 +1,21 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Created by PhpStorm. |
|
| 4 | - * User: Claudio Cardinale <[email protected]> |
|
| 5 | - * Date: 18/12/15 |
|
| 6 | - * Time: 15.20 |
|
| 7 | - * This program is free software; you can redistribute it and/or |
|
| 8 | - * modify it under the terms of the GNU General Public License |
|
| 9 | - * as published by the Free Software Foundation; either version 2 |
|
| 10 | - * of the License, or (at your option) any later version. |
|
| 11 | - * This program is distributed in the hope that it will be useful, |
|
| 12 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 13 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 14 | - * GNU General Public License for more details. |
|
| 15 | - * You should have received a copy of the GNU General Public License |
|
| 16 | - * along with this program; if not, write to the Free Software |
|
| 17 | - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
| 18 | - */ |
|
| 3 | + * Created by PhpStorm. |
|
| 4 | + * User: Claudio Cardinale <[email protected]> |
|
| 5 | + * Date: 18/12/15 |
|
| 6 | + * Time: 15.20 |
|
| 7 | + * This program is free software; you can redistribute it and/or |
|
| 8 | + * modify it under the terms of the GNU General Public License |
|
| 9 | + * as published by the Free Software Foundation; either version 2 |
|
| 10 | + * of the License, or (at your option) any later version. |
|
| 11 | + * This program is distributed in the hope that it will be useful, |
|
| 12 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 13 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 14 | + * GNU General Public License for more details. |
|
| 15 | + * You should have received a copy of the GNU General Public License |
|
| 16 | + * along with this program; if not, write to the Free Software |
|
| 17 | + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
| 18 | + */ |
|
| 19 | 19 | |
| 20 | 20 | namespace plunner\Console\Commands\Optimise; |
| 21 | 21 | |
@@ -50,12 +50,16 @@ discard block |
||
| 50 | 50 | { |
| 51 | 51 | $path = new Path(tempnam(sys_get_temp_dir(), 'OPT')); //TODO check the return in case of errors this return false on failure |
| 52 | 52 | unlink($path->getPath()); //remove file to create a dir |
| 53 | - if (file_exists($path->getPath())) |
|
| 54 | - throw new OptimiseException('problem during creation of tmp dir (the directory already exists)'); |
|
| 55 | - if (!@mkdir($path->getPath())) |
|
| 56 | - throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');; |
|
| 57 | - if (!is_dir($path->getPath())) |
|
| 58 | - throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)'); |
|
| 53 | + if (file_exists($path->getPath())) { |
|
| 54 | + throw new OptimiseException('problem during creation of tmp dir (the directory already exists)'); |
|
| 55 | + } |
|
| 56 | + if (!@mkdir($path->getPath())) { |
|
| 57 | + throw new OptimiseException('problem during creation of tmp dir (mkdir problem)'); |
|
| 58 | + } |
|
| 59 | + ; |
|
| 60 | + if (!is_dir($path->getPath())) { |
|
| 61 | + throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)'); |
|
| 62 | + } |
|
| 59 | 63 | return $path; |
| 60 | 64 | } |
| 61 | 65 | |
@@ -80,8 +84,9 @@ discard block |
||
| 80 | 84 | */ |
| 81 | 85 | public function __destruct() |
| 82 | 86 | { |
| 83 | - if ($this->path && is_dir($this->path) && !self::delTree($this->path)) |
|
| 84 | - throw new OptimiseException('problems during removing of path directory'); |
|
| 87 | + if ($this->path && is_dir($this->path) && !self::delTree($this->path)) { |
|
| 88 | + throw new OptimiseException('problems during removing of path directory'); |
|
| 89 | + } |
|
| 85 | 90 | } |
| 86 | 91 | |
| 87 | 92 | /** |
@@ -1,21 +1,21 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Created by PhpStorm. |
|
| 4 | - * User: Claudio Cardinale <[email protected]> |
|
| 5 | - * Date: 24/12/15 |
|
| 6 | - * Time: 22.53 |
|
| 7 | - * This program is free software; you can redistribute it and/or |
|
| 8 | - * modify it under the terms of the GNU General Public License |
|
| 9 | - * as published by the Free Software Foundation; either version 2 |
|
| 10 | - * of the License, or (at your option) any later version. |
|
| 11 | - * This program is distributed in the hope that it will be useful, |
|
| 12 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 13 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 14 | - * GNU General Public License for more details. |
|
| 15 | - * You should have received a copy of the GNU General Public License |
|
| 16 | - * along with this program; if not, write to the Free Software |
|
| 17 | - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
| 18 | - */ |
|
| 3 | + * Created by PhpStorm. |
|
| 4 | + * User: Claudio Cardinale <[email protected]> |
|
| 5 | + * Date: 24/12/15 |
|
| 6 | + * Time: 22.53 |
|
| 7 | + * This program is free software; you can redistribute it and/or |
|
| 8 | + * modify it under the terms of the GNU General Public License |
|
| 9 | + * as published by the Free Software Foundation; either version 2 |
|
| 10 | + * of the License, or (at your option) any later version. |
|
| 11 | + * This program is distributed in the hope that it will be useful, |
|
| 12 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 13 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 14 | + * GNU General Public License for more details. |
|
| 15 | + * You should have received a copy of the GNU General Public License |
|
| 16 | + * along with this program; if not, write to the Free Software |
|
| 17 | + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
| 18 | + */ |
|
| 19 | 19 | |
| 20 | 20 | namespace plunner\Http\Middleware; |
| 21 | 21 | |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | \JWTFactory::setTTL(43200); |
| 35 | 35 | //config(['jwt.ttl' =>'43200']); //30 days |
| 36 | 36 | } |
| 37 | - }catch(JWTException $e) |
|
| 37 | + } catch(JWTException $e) |
|
| 38 | 38 | {} |
| 39 | 39 | |
| 40 | 40 | //this to add the remember me mode field in the new token, but we have the custom check that is an useless |
@@ -1,10 +1,10 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Created by PhpStorm. |
|
| 4 | - * User: claudio |
|
| 5 | - * Date: 12/12/15 |
|
| 6 | - * Time: 15.41 |
|
| 7 | - */ |
|
| 3 | + * Created by PhpStorm. |
|
| 4 | + * User: claudio |
|
| 5 | + * Date: 12/12/15 |
|
| 6 | + * Time: 15.41 |
|
| 7 | + */ |
|
| 8 | 8 | |
| 9 | 9 | namespace plunner\Console\Commands\Optimise; |
| 10 | 10 | |
@@ -158,11 +158,12 @@ discard block |
||
| 158 | 158 | $solver = $this->setData($solver); |
| 159 | 159 | $solver = $solver->solve(); |
| 160 | 160 | $this->solver = $solver; |
| 161 | - }catch(OptimiseException $e) { |
|
| 162 | - if(!$e->isEmpty()) |
|
| 163 | - \Event::fire(new ErrorEvent($this->company, $e->getMessage())); |
|
| 161 | + } catch(OptimiseException $e) { |
|
| 162 | + if(!$e->isEmpty()) { |
|
| 163 | + \Event::fire(new ErrorEvent($this->company, $e->getMessage())); |
|
| 164 | + } |
|
| 164 | 165 | throw $e; |
| 165 | - }catch (\Exception $e) { |
|
| 166 | + } catch (\Exception $e) { |
|
| 166 | 167 | //TODO use the correct exceptions to avoid to share private data |
| 167 | 168 | \Event::fire(new ErrorEvent($this->company, $e->getMessage())); |
| 168 | 169 | throw new OptimiseException('Optimising error', 0, $e); |
@@ -207,8 +208,9 @@ discard block |
||
| 207 | 208 | { |
| 208 | 209 | //since we consider busy timeslots, we need to get all users |
| 209 | 210 | $users = $this->company->employees->pluck('id')->toArray(); |
| 210 | - if(count($users) == 0) |
|
| 211 | - throw ((new OptimiseException("No users for this company"))->withEmpty(true)); |
|
| 211 | + if(count($users) == 0) { |
|
| 212 | + throw ((new OptimiseException("No users for this company"))->withEmpty(true)); |
|
| 213 | + } |
|
| 212 | 214 | return $solver->setUsers($users); |
| 213 | 215 | } |
| 214 | 216 | |
@@ -223,8 +225,9 @@ discard block |
||
| 223 | 225 | * @var $meetings \Illuminate\Support\Collection |
| 224 | 226 | */ |
| 225 | 227 | $meetings = collect($this->company->getMeetingsTimeSlots($this->startTime, $this->endTime)); |
| 226 | - if($meetings->count() == 0) |
|
| 227 | - throw ((new OptimiseException("No meetings for this week"))->withEmpty(true)); |
|
| 228 | + if($meetings->count() == 0) { |
|
| 229 | + throw ((new OptimiseException("No meetings for this week"))->withEmpty(true)); |
|
| 230 | + } |
|
| 228 | 231 | $timeslots = $meetings->groupBy('id')->map(function ($item) { //convert timeslots |
| 229 | 232 | return $this->durationConverter($this->timeSlotsConverter($item)); |
| 230 | 233 | }); |
@@ -298,8 +301,9 @@ discard block |
||
| 298 | 301 | { |
| 299 | 302 | $ret = []; |
| 300 | 303 | foreach ($ids as $id) { |
| 301 | - if(isset($timeSlots[$id])) |
|
| 302 | - $ret = self::fillTimeSlots($ret, $id, $timeSlots[$id], $free ? '1' : '0'); |
|
| 304 | + if(isset($timeSlots[$id])) { |
|
| 305 | + $ret = self::fillTimeSlots($ret, $id, $timeSlots[$id], $free ? '1' : '0'); |
|
| 306 | + } |
|
| 303 | 307 | $ret = self::fillRow($ret, $id, $timeslotsN, $free ? '0' : '1'); |
| 304 | 308 | } |
| 305 | 309 | |
@@ -316,8 +320,9 @@ discard block |
||
| 316 | 320 | static private function fillTimeSlots(array $array, $id, \Illuminate\Support\Collection $timeSlots, $fill = '0') |
| 317 | 321 | { |
| 318 | 322 | foreach ($timeSlots as $timeSlot) { |
| 319 | - if (!isset($array[$id])) |
|
| 320 | - $array[$id] = []; |
|
| 323 | + if (!isset($array[$id])) { |
|
| 324 | + $array[$id] = []; |
|
| 325 | + } |
|
| 321 | 326 | $array[$id] = self::arrayPadInterval($array[$id], $timeSlot->time_start, $timeSlot->time_end, $fill); |
| 322 | 327 | } |
| 323 | 328 | return $array; |
@@ -332,8 +337,9 @@ discard block |
||
| 332 | 337 | */ |
| 333 | 338 | static private function arrayPadInterval(array $array, $from, $to, $pad = '0') |
| 334 | 339 | { |
| 335 | - for ($i = $from; $i < $to; $i++) |
|
| 336 | - $array[$i] = $pad; |
|
| 340 | + for ($i = $from; $i < $to; $i++) { |
|
| 341 | + $array[$i] = $pad; |
|
| 342 | + } |
|
| 337 | 343 | return $array; |
| 338 | 344 | } |
| 339 | 345 | |
@@ -346,8 +352,9 @@ discard block |
||
| 346 | 352 | static private function fillRow(array $array, $id, $until, $fill = '0') |
| 347 | 353 | { |
| 348 | 354 | for ($i = 1; $i <= $until; $i++) { |
| 349 | - if (!isset($array[$id][$i])) |
|
| 350 | - $array[$id][$i] = $fill; |
|
| 355 | + if (!isset($array[$id][$i])) { |
|
| 356 | + $array[$id][$i] = $fill; |
|
| 357 | + } |
|
| 351 | 358 | } |
| 352 | 359 | |
| 353 | 360 | return $array; |
@@ -386,8 +393,9 @@ discard block |
||
| 386 | 393 | * @var $usersMeetings \Illuminate\Support\Collection |
| 387 | 394 | */ |
| 388 | 395 | $usersMeetings = collect($this->company->getUsersMeetings($users, $meetings))->groupBy('employee_id'); |
| 389 | - if($usersMeetings->count() == 0) |
|
| 390 | - throw ((new OptimiseException("No users for any meeting"))->withEmpty(true)); |
|
| 396 | + if($usersMeetings->count() == 0) { |
|
| 397 | + throw ((new OptimiseException("No users for any meeting"))->withEmpty(true)); |
|
| 398 | + } |
|
| 391 | 399 | |
| 392 | 400 | return $solver->setUsersMeetings(self::getUsersMeetingsArray($users, $meetings, $usersMeetings)); |
| 393 | 401 | } |
@@ -464,8 +472,10 @@ discard block |
||
| 464 | 472 | { |
| 465 | 473 | $ret = clone $this->startTime; |
| 466 | 474 | //TODO check, because the meetings cannot have this date available -> this to avoid errors if we don't have a date for a meeting |
| 467 | - if ($timeslot <= 1) //false == 0 |
|
| 475 | + if ($timeslot <= 1) { |
|
| 476 | + //false == 0 |
|
| 468 | 477 | return $ret; |
| 478 | + } |
|
| 469 | 479 | return $ret->add(new \DateInterval('PT' . (($timeslot - 1) * config('app.timeslots.duration')) . 'S')); |
| 470 | 480 | } |
| 471 | 481 | |
@@ -1,21 +1,21 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Created by PhpStorm. |
|
| 4 | - * User: Claudio Cardinale <[email protected]> |
|
| 5 | - * Date: 07/12/15 |
|
| 6 | - * Time: 21.18 |
|
| 7 | - * This program is free software; you can redistribute it and/or |
|
| 8 | - * modify it under the terms of the GNU General Public License |
|
| 9 | - * as published by the Free Software Foundation; either version 2 |
|
| 10 | - * of the License, or (at your option) any later version. |
|
| 11 | - * This program is distributed in the hope that it will be useful, |
|
| 12 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 13 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 14 | - * GNU General Public License for more details. |
|
| 15 | - * You should have received a copy of the GNU General Public License |
|
| 16 | - * along with this program; if not, write to the Free Software |
|
| 17 | - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
| 18 | - */ |
|
| 3 | + * Created by PhpStorm. |
|
| 4 | + * User: Claudio Cardinale <[email protected]> |
|
| 5 | + * Date: 07/12/15 |
|
| 6 | + * Time: 21.18 |
|
| 7 | + * This program is free software; you can redistribute it and/or |
|
| 8 | + * modify it under the terms of the GNU General Public License |
|
| 9 | + * as published by the Free Software Foundation; either version 2 |
|
| 10 | + * of the License, or (at your option) any later version. |
|
| 11 | + * This program is distributed in the hope that it will be useful, |
|
| 12 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 13 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 14 | + * GNU General Public License for more details. |
|
| 15 | + * You should have received a copy of the GNU General Public License |
|
| 16 | + * along with this program; if not, write to the Free Software |
|
| 17 | + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
| 18 | + */ |
|
| 19 | 19 | |
| 20 | 20 | namespace plunner\Console\Commands\Optimise; |
| 21 | 21 | |
@@ -104,8 +104,9 @@ discard block |
||
| 104 | 104 | */ |
| 105 | 105 | static private function checkGlpsol() |
| 106 | 106 | { |
| 107 | - if (!(`which glpsol`)) |
|
| 108 | - throw new OptimiseException('glpsol is not installed'); |
|
| 107 | + if (!(`which glpsol`)) { |
|
| 108 | + throw new OptimiseException('glpsol is not installed'); |
|
| 109 | + } |
|
| 109 | 110 | } |
| 110 | 111 | |
| 111 | 112 | /** |
@@ -193,8 +194,9 @@ discard block |
||
| 193 | 194 | */ |
| 194 | 195 | public function setTimeSlots($timeSlots) |
| 195 | 196 | { |
| 196 | - if (!is_int($timeSlots) || $timeSlots <= 0) |
|
| 197 | - throw new OptimiseException($timeSlots . ' is not integer or it is not >0'); |
|
| 197 | + if (!is_int($timeSlots) || $timeSlots <= 0) { |
|
| 198 | + throw new OptimiseException($timeSlots . ' is not integer or it is not >0'); |
|
| 199 | + } |
|
| 198 | 200 | |
| 199 | 201 | $this->timeSlots = $timeSlots; |
| 200 | 202 | return $this; |
@@ -215,8 +217,9 @@ discard block |
||
| 215 | 217 | */ |
| 216 | 218 | public function setMaxTimeSlots($maxTimeSlots) |
| 217 | 219 | { |
| 218 | - if (!is_int($maxTimeSlots) || $maxTimeSlots <= 0) |
|
| 219 | - throw new OptimiseException($maxTimeSlots . ' is not integer or it is not >0'); |
|
| 220 | + if (!is_int($maxTimeSlots) || $maxTimeSlots <= 0) { |
|
| 221 | + throw new OptimiseException($maxTimeSlots . ' is not integer or it is not >0'); |
|
| 222 | + } |
|
| 220 | 223 | |
| 221 | 224 | $this->maxTimeSlots = $maxTimeSlots; |
| 222 | 225 | return $this; |
@@ -238,13 +241,15 @@ discard block |
||
| 238 | 241 | public function setMeetingsAvailability($meetingsAvailability) |
| 239 | 242 | { |
| 240 | 243 | $meetings = array_keys($meetingsAvailability); |
| 241 | - if (array_diff($meetings, $this->meetings)) |
|
| 242 | - throw new OptimiseException('meetings different from meetings set'); |
|
| 244 | + if (array_diff($meetings, $this->meetings)) { |
|
| 245 | + throw new OptimiseException('meetings different from meetings set'); |
|
| 246 | + } |
|
| 243 | 247 | foreach ($meetingsAvailability as $key => $meetingsAvailabilityS) { |
| 244 | 248 | $timeSlots = array_keys($meetingsAvailabilityS);//TODO this is useless, we can use directly $usersAvailabilityS |
| 245 | 249 | //TODO check if keys are sequential and the last is the same with $this->timeSlots |
| 246 | - if (count($timeSlots) != $this->timeSlots) |
|
| 247 | - throw new OptimiseException('timeSlots different from timeSlots set'); |
|
| 250 | + if (count($timeSlots) != $this->timeSlots) { |
|
| 251 | + throw new OptimiseException('timeSlots different from timeSlots set'); |
|
| 252 | + } |
|
| 248 | 253 | $meetingsAvailability[$key] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0); |
| 249 | 254 | } |
| 250 | 255 | |
@@ -261,8 +266,9 @@ discard block |
||
| 261 | 266 | static private function arrayPad(array $array, $len, $pad) |
| 262 | 267 | { |
| 263 | 268 | $len = $len - count($array); |
| 264 | - for ($i = 0; $i < $len; $i++) |
|
| 265 | - $array[] = $pad; |
|
| 269 | + for ($i = 0; $i < $len; $i++) { |
|
| 270 | + $array[] = $pad; |
|
| 271 | + } |
|
| 266 | 272 | return $array; |
| 267 | 273 | } |
| 268 | 274 | |
@@ -287,8 +293,9 @@ discard block |
||
| 287 | 293 | } |
| 288 | 294 | foreach ($meetingsDuration as $duration) { |
| 289 | 295 | $duration = (int)$duration; //TODO fix this (fix for optimise) |
| 290 | - if (!is_int($duration) || $duration <= 0) |
|
| 291 | - throw new OptimiseException('duration is not integer or it is not >0'); |
|
| 296 | + if (!is_int($duration) || $duration <= 0) { |
|
| 297 | + throw new OptimiseException('duration is not integer or it is not >0'); |
|
| 298 | + } |
|
| 292 | 299 | } |
| 293 | 300 | |
| 294 | 301 | $this->meetingsDuration = $meetingsDuration; |
@@ -311,12 +318,14 @@ discard block |
||
| 311 | 318 | public function setUsersAvailability($usersAvailability) |
| 312 | 319 | { |
| 313 | 320 | $users = array_keys($usersAvailability); |
| 314 | - if (array_diff($users, $this->users)) |
|
| 315 | - throw new OptimiseException('users different from users set'); |
|
| 321 | + if (array_diff($users, $this->users)) { |
|
| 322 | + throw new OptimiseException('users different from users set'); |
|
| 323 | + } |
|
| 316 | 324 | foreach ($usersAvailability as $key => $usersAvailabilityS) { |
| 317 | 325 | $timeSlots = array_keys($usersAvailabilityS);//TODO this is useless, we can use directly $usersAvailabilityS |
| 318 | - if (count($timeSlots) != $this->timeSlots) |
|
| 319 | - throw new OptimiseException('timeSlots different from timeSlots set'); |
|
| 326 | + if (count($timeSlots) != $this->timeSlots) { |
|
| 327 | + throw new OptimiseException('timeSlots different from timeSlots set'); |
|
| 328 | + } |
|
| 320 | 329 | |
| 321 | 330 | $usersAvailability[$key] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0); |
| 322 | 331 | } |
@@ -341,12 +350,14 @@ discard block |
||
| 341 | 350 | public function setUsersMeetings($usersMeetings) |
| 342 | 351 | { |
| 343 | 352 | $users = array_keys($usersMeetings); |
| 344 | - if (array_diff($users, $this->users)) |
|
| 345 | - throw new OptimiseException('users different from users set'); |
|
| 353 | + if (array_diff($users, $this->users)) { |
|
| 354 | + throw new OptimiseException('users different from users set'); |
|
| 355 | + } |
|
| 346 | 356 | foreach ($usersMeetings as $usersMeetingsS) { |
| 347 | 357 | $meetings = array_keys($usersMeetingsS); |
| 348 | - if (array_diff($meetings, $this->meetings)) |
|
| 349 | - throw new OptimiseException('meetings different from meetings set'); |
|
| 358 | + if (array_diff($meetings, $this->meetings)) { |
|
| 359 | + throw new OptimiseException('meetings different from meetings set'); |
|
| 360 | + } |
|
| 350 | 361 | } |
| 351 | 362 | |
| 352 | 363 | $this->usersMeetings = $usersMeetings; |
@@ -363,8 +374,9 @@ discard block |
||
| 363 | 374 | $this->writeModelFile(); |
| 364 | 375 | $event = $this->schedule->exec('glpsol --math ' . $this->path->getModelPath())->sendOutputTo($this->path->getOutputPath())->after(function () { |
| 365 | 376 | }); //this just to execute in foreground |
| 366 | - if ($event->isDue($this->laravel)) |
|
| 367 | - $event->run($this->laravel); |
|
| 377 | + if ($event->isDue($this->laravel)) { |
|
| 378 | + $event->run($this->laravel); |
|
| 379 | + } |
|
| 368 | 380 | //TODO catch glpsol errors |
| 369 | 381 | return $this; |
| 370 | 382 | } |
@@ -398,9 +410,10 @@ discard block |
||
| 398 | 410 | */ |
| 399 | 411 | private function checkArrayProprieties($proprieties) |
| 400 | 412 | { |
| 401 | - foreach ($proprieties as $propriety) |
|
| 402 | - if (count($this->$propriety) == 0) |
|
| 413 | + foreach ($proprieties as $propriety) { |
|
| 414 | + if (count($this->$propriety) == 0) |
|
| 403 | 415 | throw new OptimiseException($propriety . ' property is not set correctly'); |
| 416 | + } |
|
| 404 | 417 | } |
| 405 | 418 | |
| 406 | 419 | /** |
@@ -409,9 +422,10 @@ discard block |
||
| 409 | 422 | */ |
| 410 | 423 | private function checkIntProprieties($proprieties) |
| 411 | 424 | { |
| 412 | - foreach ($proprieties as $propriety) |
|
| 413 | - if (!is_int($this->$propriety) || $this->$propriety <= 0) |
|
| 425 | + foreach ($proprieties as $propriety) { |
|
| 426 | + if (!is_int($this->$propriety) || $this->$propriety <= 0) |
|
| 414 | 427 | throw new OptimiseException($propriety . ' property is not set correctly'); |
| 428 | + } |
|
| 415 | 429 | } |
| 416 | 430 | |
| 417 | 431 | /** |
@@ -448,8 +462,9 @@ discard block |
||
| 448 | 462 | static private function writeCSV($file, $data, $heading, \Closure $writer) |
| 449 | 463 | { |
| 450 | 464 | $fp = @fopen($file, 'w'); |
| 451 | - if (!$fp) |
|
| 452 | - throw new OptimiseException('problem during creation of a file'); |
|
| 465 | + if (!$fp) { |
|
| 466 | + throw new OptimiseException('problem during creation of a file'); |
|
| 467 | + } |
|
| 453 | 468 | |
| 454 | 469 | fputcsv($fp, $heading); |
| 455 | 470 | |
@@ -511,8 +526,9 @@ discard block |
||
| 511 | 526 | { |
| 512 | 527 | $f = function ($fp, $data) { |
| 513 | 528 | foreach ($data as $key => $field) { |
| 514 | - foreach ($field as $key2 => $field2) |
|
| 515 | - fputcsv($fp, [$key, $key2, $field2]); |
|
| 529 | + foreach ($field as $key2 => $field2) { |
|
| 530 | + fputcsv($fp, [$key, $key2, $field2]); |
|
| 531 | + } |
|
| 516 | 532 | } |
| 517 | 533 | }; |
| 518 | 534 | |
@@ -543,8 +559,9 @@ discard block |
||
| 543 | 559 | $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}'); |
| 544 | 560 | $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()); |
| 545 | 561 | $f = @fopen($this->path->getModelPath(), "w"); |
| 546 | - if (!$f) |
|
| 547 | - throw new OptimiseException('problem during creation of a file'); |
|
| 562 | + if (!$f) { |
|
| 563 | + throw new OptimiseException('problem during creation of a file'); |
|
| 564 | + } |
|
| 548 | 565 | fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__ . "/model.stub"))); |
| 549 | 566 | fclose($f); |
| 550 | 567 | } |
@@ -565,12 +582,14 @@ discard block |
||
| 565 | 582 | */ |
| 566 | 583 | static private function readCSVFile($file) |
| 567 | 584 | { |
| 568 | - if (!file_exists($file) || !filesize($file)) |
|
| 569 | - throw new OptimiseException('no results file'); |
|
| 585 | + if (!file_exists($file) || !filesize($file)) { |
|
| 586 | + throw new OptimiseException('no results file'); |
|
| 587 | + } |
|
| 570 | 588 | |
| 571 | 589 | $handle = @fopen($file, "r"); |
| 572 | - if (!$handle) |
|
| 573 | - throw new OptimiseException('problems during reading the file'); |
|
| 590 | + if (!$handle) { |
|
| 591 | + throw new OptimiseException('problems during reading the file'); |
|
| 592 | + } |
|
| 574 | 593 | |
| 575 | 594 | $ret = []; |
| 576 | 595 | fgetcsv($handle); //skip head |
@@ -603,8 +622,9 @@ discard block |
||
| 603 | 622 | */ |
| 604 | 623 | public function getOutput() |
| 605 | 624 | { |
| 606 | - if (!($data = file_get_contents($this->path->getOutputPath()))) |
|
| 607 | - throw new OptimiseException('problems during reading the file'); |
|
| 625 | + if (!($data = file_get_contents($this->path->getOutputPath()))) { |
|
| 626 | + throw new OptimiseException('problems during reading the file'); |
|
| 627 | + } |
|
| 608 | 628 | return $data; |
| 609 | 629 | } |
| 610 | 630 | } |
| 611 | 631 | \ No newline at end of file |
@@ -59,10 +59,11 @@ discard block |
||
| 59 | 59 | { |
| 60 | 60 | // |
| 61 | 61 | $calendarId = $this->argument('calendarId'); |
| 62 | - if (is_numeric($calendarId)) |
|
| 63 | - $this->makeForeground(Caldav::findOrFail($calendarId)); |
|
| 64 | - else |
|
| 65 | - $this->syncAll(); |
|
| 62 | + if (is_numeric($calendarId)) { |
|
| 63 | + $this->makeForeground(Caldav::findOrFail($calendarId)); |
|
| 64 | + } else { |
|
| 65 | + $this->syncAll(); |
|
| 66 | + } |
|
| 66 | 67 | } |
| 67 | 68 | |
| 68 | 69 | /** |
@@ -82,13 +83,15 @@ discard block |
||
| 82 | 83 | if ($this->option('background')) { |
| 83 | 84 | \Log::debug(self::BACKGROUND_MOD_MEX); |
| 84 | 85 | $this->info(self::BACKGROUND_MOD_MEX); |
| 85 | - foreach ($calendars as $calendar) |
|
| 86 | - $this->makeBackground($calendar); |
|
| 86 | + foreach ($calendars as $calendar) { |
|
| 87 | + $this->makeBackground($calendar); |
|
| 88 | + } |
|
| 87 | 89 | \Log::debug(self::BACKGROUND_COMPLETED_MEX); |
| 88 | 90 | $this->info(self::BACKGROUND_COMPLETED_MEX); |
| 89 | - } else |
|
| 90 | - foreach ($calendars as $calendar) |
|
| 91 | + } else { |
|
| 92 | + foreach ($calendars as $calendar) |
|
| 91 | 93 | $this->makeForeground($calendar); |
| 94 | + } |
|
| 92 | 95 | } |
| 93 | 96 | |
| 94 | 97 | /** |
@@ -98,7 +101,8 @@ discard block |
||
| 98 | 101 | private function makeBackground(Caldav $calendar) |
| 99 | 102 | { |
| 100 | 103 | $event = $this->schedule->command('sync:caldav ' . $calendar->calendar_id)->withoutOverlapping(); |
| 101 | - if ($event->isDue($this->laravel)) |
|
| 102 | - $event->run($this->laravel); |
|
| 104 | + if ($event->isDue($this->laravel)) { |
|
| 105 | + $event->run($this->laravel); |
|
| 106 | + } |
|
| 103 | 107 | } |
| 104 | 108 | } |
@@ -97,14 +97,16 @@ |
||
| 97 | 97 | public function getEmailForPasswordReset() |
| 98 | 98 | { |
| 99 | 99 | list(, $caller) = debug_backtrace(false); |
| 100 | - if (isset($caller['class'])) |
|
| 101 | - $caller = explode('\\', $caller['class']); |
|
| 102 | - else |
|
| 103 | - $caller = ''; |
|
| 100 | + if (isset($caller['class'])) { |
|
| 101 | + $caller = explode('\\', $caller['class']); |
|
| 102 | + } else { |
|
| 103 | + $caller = ''; |
|
| 104 | + } |
|
| 104 | 105 | |
| 105 | 106 | //check if this function is called by email sender |
| 106 | - if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == '')) |
|
| 107 | - return $this->email; |
|
| 107 | + if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == '')) { |
|
| 108 | + return $this->email; |
|
| 109 | + } |
|
| 108 | 110 | //return unique identify for token repository |
| 109 | 111 | return $this->email . $this->company->id; |
| 110 | 112 | } |