@@ -2,11 +2,11 @@ |
||
2 | 2 | |
3 | 3 | namespace plunner\Http\Controllers\Companies\Auth; |
4 | 4 | |
5 | -use plunner\Company; |
|
6 | -use Validator; |
|
7 | -use plunner\Http\Controllers\Controller; |
|
8 | 5 | use Tymon\JWTAuth\Support\auth\AuthenticatesAndRegistersUsers; |
9 | 6 | use Tymon\JWTAuth\Support\auth\ThrottlesLogins; |
7 | +use Validator; |
|
8 | +use plunner\Company; |
|
9 | +use plunner\Http\Controllers\Controller; |
|
10 | 10 | |
11 | 11 | class AuthController extends Controller |
12 | 12 | { |
@@ -3,13 +3,12 @@ |
||
3 | 3 | namespace plunner\Http\Controllers\Employees\Auth; |
4 | 4 | |
5 | 5 | use Illuminate\Http\Request; |
6 | -use plunner\Company; |
|
7 | -use plunner\employee; |
|
8 | -use Validator; |
|
9 | -use plunner\Http\Controllers\Controller; |
|
10 | 6 | use Tymon\JWTAuth\Support\auth\AuthenticatesAndRegistersUsers; |
11 | 7 | use Tymon\JWTAuth\Support\auth\ThrottlesLogins; |
12 | -use Log; |
|
8 | +use Validator; |
|
9 | +use plunner\Company; |
|
10 | +use plunner\Http\Controllers\Controller; |
|
11 | +use plunner\employee; |
|
13 | 12 | |
14 | 13 | class AuthController extends Controller |
15 | 14 | { |
@@ -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 |
@@ -3,8 +3,8 @@ |
||
3 | 3 | namespace plunner\Http\Controllers\Companies\Groups; |
4 | 4 | |
5 | 5 | use Illuminate\Support\Facades\Response; |
6 | -use plunner\Group; |
|
7 | 6 | use plunner\Employee; |
7 | +use plunner\Group; |
|
8 | 8 | use plunner\Http\Controllers\Controller; |
9 | 9 | use plunner\Http\Requests\Companies\Groups\EmployeeRequest; |
10 | 10 |
@@ -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 |
@@ -82,7 +82,7 @@ |
||
82 | 82 | { |
83 | 83 | $event = $this->schedule->command('sync:caldav '.$calendar->calendar_id)->withoutOverlapping(); |
84 | 84 | if($event->isDue($this->laravel)) |
85 | - $event->run($this->laravel); |
|
85 | + $event->run($this->laravel); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | /** |
@@ -3,8 +3,6 @@ |
||
3 | 3 | namespace plunner\Listeners; |
4 | 4 | |
5 | 5 | use plunner\Events\CaldavErrorEvent; |
6 | -use Illuminate\Queue\InteractsWithQueue; |
|
7 | -use Illuminate\Contracts\Queue\ShouldQueue; |
|
8 | 6 | |
9 | 7 | class CaldavErrorListener |
10 | 8 | { |
@@ -9,8 +9,8 @@ |
||
9 | 9 | namespace plunner\Console\Commands\Optimise; |
10 | 10 | |
11 | 11 | use Illuminate\Console\Scheduling\Schedule; |
12 | -use plunner\company; |
|
13 | 12 | use plunner\Events\Optimise\ErrorEvent; |
13 | +use plunner\company; |
|
14 | 14 | |
15 | 15 | /** |
16 | 16 | * Class Optimise |
@@ -1,10 +1,10 @@ discard block |
||
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 | |
@@ -45,8 +45,8 @@ discard block |
||
45 | 45 | private $company; |
46 | 46 | |
47 | 47 | /** |
48 | - * @var Schedule laravel schedule object needed to perform command in background |
|
49 | - */ |
|
48 | + * @var Schedule laravel schedule object needed to perform command in background |
|
49 | + */ |
|
50 | 50 | private $schedule; |
51 | 51 | |
52 | 52 | /** |
@@ -413,7 +413,7 @@ discard block |
||
413 | 413 | $diff = explode(':',$diff->format('%R:%d:%h:%i:%s')); |
414 | 414 | $diff = $diff[1]*86400 + $diff[2]*3600 + $diff[3]*60 + $diff[4]; |
415 | 415 | //if($diff[0] != '-' && $diff != 0) |
416 | - // throw new OptimiseException('timeslot time <= startTime'); |
|
416 | + // throw new OptimiseException('timeslot time <= startTime'); |
|
417 | 417 | //TODO fix check |
418 | 418 | //TODO check if diff makes sense |
419 | 419 | //TODO check upper limit |
@@ -3,8 +3,6 @@ |
||
3 | 3 | namespace plunner\Listeners; |
4 | 4 | |
5 | 5 | use plunner\Events\CaldavErrorEvent; |
6 | -use Illuminate\Queue\InteractsWithQueue; |
|
7 | -use Illuminate\Contracts\Queue\ShouldQueue; |
|
8 | 6 | |
9 | 7 | class CaldavErrorListener |
10 | 8 | { |