@@ -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 | |
@@ -39,6 +39,6 @@ |
||
| 39 | 39 | */ |
| 40 | 40 | public function broadcastOn() |
| 41 | 41 | { |
| 42 | - return []; |
|
| 42 | + return [ ]; |
|
| 43 | 43 | } |
| 44 | 44 | } |
@@ -39,6 +39,6 @@ |
||
| 39 | 39 | */ |
| 40 | 40 | public function broadcastOn() |
| 41 | 41 | { |
| 42 | - return []; |
|
| 42 | + return [ ]; |
|
| 43 | 43 | } |
| 44 | 44 | } |
@@ -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 | |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | if (file_exists($path->getPath())) |
| 54 | 54 | throw new OptimiseException('problem during creation of tmp dir (the directory already exists)'); |
| 55 | 55 | if (!@mkdir($path->getPath())) |
| 56 | - throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');; |
|
| 56 | + throw new OptimiseException('problem during creation of tmp dir (mkdir problem)'); ; |
|
| 57 | 57 | if (!is_dir($path->getPath())) |
| 58 | 58 | throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)'); |
| 59 | 59 | return $path; |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | */ |
| 105 | 105 | public function getModelPath() |
| 106 | 106 | { |
| 107 | - return $this->path . '/model.mod'; |
|
| 107 | + return $this->path.'/model.mod'; |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | /** |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | */ |
| 113 | 113 | public function getUsersPath() |
| 114 | 114 | { |
| 115 | - return $this->path . '/Users.csv'; |
|
| 115 | + return $this->path.'/Users.csv'; |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | /** |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | */ |
| 121 | 121 | public function getMeetingsPath() |
| 122 | 122 | { |
| 123 | - return $this->path . '/Meeting.csv'; |
|
| 123 | + return $this->path.'/Meeting.csv'; |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | /** |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | */ |
| 129 | 129 | public function getMeetingsDurationPath() |
| 130 | 130 | { |
| 131 | - return $this->path . '/MeetingsDuration.csv'; |
|
| 131 | + return $this->path.'/MeetingsDuration.csv'; |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | /** |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | */ |
| 137 | 137 | public function getMeetingsAvailabilityPath() |
| 138 | 138 | { |
| 139 | - return $this->path . '/MeetingsAvailability.csv'; |
|
| 139 | + return $this->path.'/MeetingsAvailability.csv'; |
|
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | /** |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | */ |
| 145 | 145 | public function getUsersAvailabilityPath() |
| 146 | 146 | { |
| 147 | - return $this->path . '/UsersAvailability.csv'; |
|
| 147 | + return $this->path.'/UsersAvailability.csv'; |
|
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | /** |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | */ |
| 153 | 153 | public function getUsersMeetingsPath() |
| 154 | 154 | { |
| 155 | - return $this->path . '/UsersMeetings.csv'; |
|
| 155 | + return $this->path.'/UsersMeetings.csv'; |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | /** |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | */ |
| 161 | 161 | public function getXPath() |
| 162 | 162 | { |
| 163 | - return $this->path . '/x.csv'; |
|
| 163 | + return $this->path.'/x.csv'; |
|
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | /** |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | */ |
| 169 | 169 | public function getYPath() |
| 170 | 170 | { |
| 171 | - return $this->path . '/y.csv'; |
|
| 171 | + return $this->path.'/y.csv'; |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | /** |
@@ -176,6 +176,6 @@ discard block |
||
| 176 | 176 | */ |
| 177 | 177 | public function getOutputPath() |
| 178 | 178 | { |
| 179 | - return $this->path . '/out.txt'; |
|
| 179 | + return $this->path.'/out.txt'; |
|
| 180 | 180 | } |
| 181 | 181 | } |
| 182 | 182 | \ No newline at end of file |
@@ -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 | |
| 35 | 35 | //this to add the remember me mode field in the new token, but we have the custom check that is an useless |
| 36 | 36 | //overhead |
| 37 | - $custom = $custom . ';remember-' . $remember == 'true' ? 'true' : 'false'; |
|
| 37 | + $custom = $custom.';remember-'.$remember == 'true' ? 'true' : 'false'; |
|
| 38 | 38 | return parent::handle($request, $next, $custom); |
| 39 | 39 | } |
| 40 | 40 | |
@@ -32,14 +32,14 @@ |
||
| 32 | 32 | * |
| 33 | 33 | * @var array |
| 34 | 34 | */ |
| 35 | - protected $fillable = ['time_start', 'time_end']; |
|
| 35 | + protected $fillable = [ 'time_start', 'time_end' ]; |
|
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * The attributes excluded from the model's JSON form. |
| 39 | 39 | * |
| 40 | 40 | * @var array |
| 41 | 41 | */ |
| 42 | - protected $hidden = ['pivot', 'meeting']; |
|
| 42 | + protected $hidden = [ 'pivot', 'meeting' ]; |
|
| 43 | 43 | |
| 44 | 44 | /** |
| 45 | 45 | * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
@@ -21,8 +21,8 @@ |
||
| 21 | 21 | */ |
| 22 | 22 | public function __construct() |
| 23 | 23 | { |
| 24 | - config(['auth.model' => \plunner\Employee::class]); |
|
| 25 | - config(['jwt.user' => \plunner\Employee::class]); |
|
| 24 | + config([ 'auth.model' => \plunner\Employee::class ]); |
|
| 25 | + config([ 'jwt.user' => \plunner\Employee::class ]); |
|
| 26 | 26 | $this->middleware('jwt.authandrefresh:mode-en'); |
| 27 | 27 | } |
| 28 | 28 | |
@@ -36,8 +36,9 @@ |
||
| 36 | 36 | $calendar = Calendar::findOrFail($calendarId); |
| 37 | 37 | $this->authorize($calendar); |
| 38 | 38 | $timeslots = $calendar->timeslots(); |
| 39 | - if ($request->query('current')) |
|
| 40 | - $timeslots->where('time_start', '>=', new \DateTime()); |
|
| 39 | + if ($request->query('current')) { |
|
| 40 | + $timeslots->where('time_start', '>=', new \DateTime()); |
|
| 41 | + } |
|
| 41 | 42 | return $timeslots->get(); |
| 42 | 43 | } |
| 43 | 44 | |
@@ -33,14 +33,14 @@ |
||
| 33 | 33 | * |
| 34 | 34 | * @var array |
| 35 | 35 | */ |
| 36 | - protected $fillable = ['time_start', 'time_end']; |
|
| 36 | + protected $fillable = [ 'time_start', 'time_end' ]; |
|
| 37 | 37 | |
| 38 | 38 | /** |
| 39 | 39 | * The attributes excluded from the model's JSON form. |
| 40 | 40 | * |
| 41 | 41 | * @var array |
| 42 | 42 | */ |
| 43 | - protected $hidden = ['pivot', 'calendar']; |
|
| 43 | + protected $hidden = [ 'pivot', 'calendar' ]; |
|
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | 46 | * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
@@ -2,11 +2,9 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace plunner\Http\Controllers\Employees\Planners; |
| 4 | 4 | |
| 5 | -use Illuminate\Http\Request; |
|
| 6 | 5 | use Illuminate\Support\Facades\Response; |
| 7 | 6 | use plunner\Group; |
| 8 | 7 | use plunner\Http\Controllers\Controller; |
| 9 | -use plunner\Http\Requests; |
|
| 10 | 8 | use plunner\Http\Requests\Employees\Meeting\MeetingTimeslotRequest; |
| 11 | 9 | use plunner\Meeting; |
| 12 | 10 | use plunner\MeetingTimeslot; |
@@ -16,8 +16,8 @@ discard block |
||
| 16 | 16 | { |
| 17 | 17 | public function __construct() |
| 18 | 18 | { |
| 19 | - config(['auth.model' => \plunner\Planner::class]); |
|
| 20 | - config(['jwt.user' => \plunner\Planner::class]); |
|
| 19 | + config([ 'auth.model' => \plunner\Planner::class ]); |
|
| 20 | + config([ 'jwt.user' => \plunner\Planner::class ]); |
|
| 21 | 21 | $this->middleware('jwt.authandrefresh:mode-en'); |
| 22 | 22 | } |
| 23 | 23 | |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | |
| 36 | 36 | if ($meeting->group_id == $groupId) |
| 37 | 37 | return $meeting->timeslots; |
| 38 | - return Response::json(['error' => 'meeting->group_id <> groupId'], 403); |
|
| 38 | + return Response::json([ 'error' => 'meeting->group_id <> groupId' ], 403); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | /** |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId) |
| 59 | 59 | return $timeslot; |
| 60 | - return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403); |
|
| 60 | + return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | /** |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | $meeting = Meeting::findOrFail($meetingId); |
| 74 | 74 | $this->authorize($meeting); |
| 75 | 75 | if ($meeting->start_time != NULL) |
| 76 | - return Response::json(['error' => 'the meeting is already planned'], 422); |
|
| 76 | + return Response::json([ 'error' => 'the meeting is already planned' ], 422); |
|
| 77 | 77 | |
| 78 | 78 | $input = $request->all(); |
| 79 | 79 | |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | $timeslot = $meeting->timeslots()->create($input); |
| 82 | 82 | return $timeslot; |
| 83 | 83 | } |
| 84 | - return Response::json(['error' => 'meeting->group_id <> groupId'], 403); |
|
| 84 | + return Response::json([ 'error' => 'meeting->group_id <> groupId' ], 403); |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | /** |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | $meeting = Meeting::findOrFail($meetingId); |
| 98 | 98 | $this->authorize($meeting); |
| 99 | 99 | if ($meeting->start_time != NULL) |
| 100 | - return Response::json(['error' => 'the meeting is already planned'], 422); |
|
| 100 | + return Response::json([ 'error' => 'the meeting is already planned' ], 422); |
|
| 101 | 101 | $timeslot = MeetingTimeslot::findOrFail($timeslotId); |
| 102 | 102 | $this->authorize($timeslot); |
| 103 | 103 | |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | $timeslot->update($input); |
| 108 | 108 | return $timeslot; |
| 109 | 109 | } |
| 110 | - return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403); |
|
| 110 | + return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403); |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | /** |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | $meeting = Meeting::findOrFail($meetingId); |
| 126 | 126 | $this->authorize($meeting); |
| 127 | 127 | if ($meeting->start_time != NULL) |
| 128 | - return Response::json(['error' => 'the meeting is already planned'], 422); |
|
| 128 | + return Response::json([ 'error' => 'the meeting is already planned' ], 422); |
|
| 129 | 129 | $timeslot = MeetingTimeslot::findOrFail($timeslotId); |
| 130 | 130 | $this->authorize($timeslot); |
| 131 | 131 | |
@@ -133,6 +133,6 @@ discard block |
||
| 133 | 133 | $timeslot->delete(); |
| 134 | 134 | return $timeslot; |
| 135 | 135 | } |
| 136 | - return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403); |
|
| 136 | + return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403); |
|
| 137 | 137 | } |
| 138 | 138 | } |
@@ -33,8 +33,9 @@ discard block |
||
| 33 | 33 | $meeting = Meeting::findOrFail($meetingId); |
| 34 | 34 | $this->authorize($meeting); |
| 35 | 35 | |
| 36 | - if ($meeting->group_id == $groupId) |
|
| 37 | - return $meeting->timeslots; |
|
| 36 | + if ($meeting->group_id == $groupId) { |
|
| 37 | + return $meeting->timeslots; |
|
| 38 | + } |
|
| 38 | 39 | return Response::json(['error' => 'meeting->group_id <> groupId'], 403); |
| 39 | 40 | } |
| 40 | 41 | |
@@ -55,8 +56,9 @@ discard block |
||
| 55 | 56 | $timeslot = MeetingTimeslot::findOrFail($timeslotId); |
| 56 | 57 | $this->authorize($timeslot); |
| 57 | 58 | |
| 58 | - if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId) |
|
| 59 | - return $timeslot; |
|
| 59 | + if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId) { |
|
| 60 | + return $timeslot; |
|
| 61 | + } |
|
| 60 | 62 | return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403); |
| 61 | 63 | } |
| 62 | 64 | |
@@ -72,8 +74,9 @@ discard block |
||
| 72 | 74 | $this->authorize($group); |
| 73 | 75 | $meeting = Meeting::findOrFail($meetingId); |
| 74 | 76 | $this->authorize($meeting); |
| 75 | - if ($meeting->start_time != NULL) |
|
| 76 | - return Response::json(['error' => 'the meeting is already planned'], 422); |
|
| 77 | + if ($meeting->start_time != NULL) { |
|
| 78 | + return Response::json(['error' => 'the meeting is already planned'], 422); |
|
| 79 | + } |
|
| 77 | 80 | |
| 78 | 81 | $input = $request->all(); |
| 79 | 82 | |
@@ -96,8 +99,9 @@ discard block |
||
| 96 | 99 | $this->authorize($group); |
| 97 | 100 | $meeting = Meeting::findOrFail($meetingId); |
| 98 | 101 | $this->authorize($meeting); |
| 99 | - if ($meeting->start_time != NULL) |
|
| 100 | - return Response::json(['error' => 'the meeting is already planned'], 422); |
|
| 102 | + if ($meeting->start_time != NULL) { |
|
| 103 | + return Response::json(['error' => 'the meeting is already planned'], 422); |
|
| 104 | + } |
|
| 101 | 105 | $timeslot = MeetingTimeslot::findOrFail($timeslotId); |
| 102 | 106 | $this->authorize($timeslot); |
| 103 | 107 | |
@@ -124,8 +128,9 @@ discard block |
||
| 124 | 128 | $this->authorize($group); |
| 125 | 129 | $meeting = Meeting::findOrFail($meetingId); |
| 126 | 130 | $this->authorize($meeting); |
| 127 | - if ($meeting->start_time != NULL) |
|
| 128 | - return Response::json(['error' => 'the meeting is already planned'], 422); |
|
| 131 | + if ($meeting->start_time != NULL) { |
|
| 132 | + return Response::json(['error' => 'the meeting is already planned'], 422); |
|
| 133 | + } |
|
| 129 | 134 | $timeslot = MeetingTimeslot::findOrFail($timeslotId); |
| 130 | 135 | $this->authorize($timeslot); |
| 131 | 136 | |