@@ -33,7 +33,7 @@ |
||
33 | 33 | * Store a newly created resource in storage. |
34 | 34 | * |
35 | 35 | * @param \Illuminate\Http\Request $request |
36 | - * @return \Illuminate\Http\Response |
|
36 | + * @return \Illuminate\Http\RedirectResponse |
|
37 | 37 | */ |
38 | 38 | public function store(Request $request) |
39 | 39 | { |
@@ -3,11 +3,9 @@ |
||
3 | 3 | namespace App\Http\Controllers; |
4 | 4 | |
5 | 5 | use Illuminate\Http\Request; |
6 | -use App\Http\Requests; |
|
7 | 6 | use App\Http\Controllers\Controller; |
8 | 7 | use App\Departments; |
9 | 8 | use App\Department_members; |
10 | -use Mail; |
|
11 | 9 | use App\User; |
12 | 10 | |
13 | 11 | class DepartmentsController extends Controller |
@@ -50,7 +50,7 @@ |
||
50 | 50 | $manager->userid = $request->get('department_manager'); |
51 | 51 | $manager->save(); |
52 | 52 | |
53 | - \Session::flash('message', "New department has been saved"); |
|
53 | + \Session::flash('message', "New department has been saved"); |
|
54 | 54 | return redirect('staff/departments'); |
55 | 55 | } |
56 | 56 |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace App\Http\Controllers; |
4 | 4 | |
5 | 5 | use Illuminate\Http\Request; |
6 | -use App\Http\Requests; |
|
7 | 6 | use App\Http\Controllers\Controller; |
8 | 7 | |
9 | 8 | class HomeController extends Controller |
@@ -41,7 +41,7 @@ |
||
41 | 41 | * Store a newly created resource in storage. |
42 | 42 | * |
43 | 43 | * @param \Illuminate\Http\Request $request |
44 | - * @return \Illuminate\Http\Response |
|
44 | + * @return \Illuminate\Http\RedirectResponse |
|
45 | 45 | */ |
46 | 46 | public function store(Request $request) |
47 | 47 | { |
@@ -3,9 +3,7 @@ |
||
3 | 3 | namespace App\Http\Controllers; |
4 | 4 | |
5 | 5 | use Illuminate\Http\Request; |
6 | -use App\Http\Requests; |
|
7 | 6 | use App\Http\Controllers\Controller; |
8 | -use App\Sick; |
|
9 | 7 | use App\User; |
10 | 8 | |
11 | 9 | class SickController extends Controller |
@@ -10,12 +10,12 @@ discard block |
||
10 | 10 | |
11 | 11 | class SickController extends Controller |
12 | 12 | { |
13 | - public function __construct() |
|
14 | - { |
|
13 | + public function __construct() |
|
14 | + { |
|
15 | 15 | $this->middleware('auth'); |
16 | - } |
|
16 | + } |
|
17 | 17 | |
18 | - /** |
|
18 | + /** |
|
19 | 19 | * Display a listing of the resource. |
20 | 20 | * |
21 | 21 | * @return \Illuminate\Http\Response |
@@ -46,18 +46,18 @@ discard block |
||
46 | 46 | public function store(Request $request) |
47 | 47 | { |
48 | 48 | $this->validate($request, [ |
49 | - 'type' => 'required', |
|
50 | - 'start_date' => 'required', |
|
51 | - 'stop_date' => 'required', |
|
52 | - 'employee' => 'required', |
|
53 | - ]); |
|
49 | + 'type' => 'required', |
|
50 | + 'start_date' => 'required', |
|
51 | + 'stop_date' => 'required', |
|
52 | + 'employee' => 'required', |
|
53 | + ]); |
|
54 | 54 | |
55 | 55 | $matchThese = ['user_id' => $request->get('employee'), 'start_date' => $request->get('start_date')]; |
56 | 56 | $verify = sick::where($matchThese)->first(); |
57 | 57 | if ($verify === null) { |
58 | 58 | // user doesn't exist |
59 | 59 | |
60 | - $data = new sick; |
|
60 | + $data = new sick; |
|
61 | 61 | $data->type = $request->get('type'); |
62 | 62 | $data->start_date = $request->get('start_date'); |
63 | 63 | $data->end_date = $request->get('stop_date'); |
@@ -71,7 +71,7 @@ |
||
71 | 71 | |
72 | 72 | \Session::flash('message', "Information has been saved to the database"); |
73 | 73 | \Mail::send('emails.new_sick', ['data' => $data], |
74 | - function ($m) use ($mailbox, $subject) { |
|
74 | + function($m) use ($mailbox, $subject) { |
|
75 | 75 | $m->from($mailbox); |
76 | 76 | $m->to("[email protected]")->subject("$subject"); |
77 | 77 | }); |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace App\Http\Controllers; |
4 | 4 | |
5 | 5 | use Illuminate\Http\Request; |
6 | -use App\Http\Requests; |
|
7 | 6 | use App\Http\Controllers\Controller; |
8 | 7 | use Spatie\Permission\Models\Role as Role; |
9 | 8 | use Spatie\Permission\Models\Permission; |
@@ -59,9 +59,9 @@ discard block |
||
59 | 59 | $mail_password = $request->get('password'); |
60 | 60 | \Session::flash('message', "New employee has been added to the application"); |
61 | 61 | \Mail::send('emails.new_user', ['user' => $user, 'password' => $mail_password], function ($m) use ($user, $mailbox) { |
62 | - $m->from($mailbox); |
|
63 | - $m->to($user->email)->subject('Your user credentials!'); |
|
64 | - }); |
|
62 | + $m->from($mailbox); |
|
63 | + $m->to($user->email)->subject('Your user credentials!'); |
|
64 | + }); |
|
65 | 65 | return redirect('staff'); |
66 | 66 | } |
67 | 67 | |
@@ -105,9 +105,9 @@ discard block |
||
105 | 105 | { |
106 | 106 | \Session::flash('message', 'New user role has been created'); |
107 | 107 | return redirect('staff/policies'); |
108 | - }else { |
|
108 | + }else { |
|
109 | 109 | return "Mislukt"; |
110 | - } |
|
110 | + } |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | public function editpolicies($id) |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | public function save_permission(Request $request) |
162 | 162 | { |
163 | 163 | // $permission_name = $request->get('permission_name'); |
164 | - $permission = Permission::create(['name' => $request->get('permission_name')]); |
|
164 | + $permission = Permission::create(['name' => $request->get('permission_name')]); |
|
165 | 165 | \Session::flash('message', "The new permission has been added to the database"); |
166 | 166 | return redirect('staff/permissions'); |
167 | 167 | } |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | $mailbox = env('MAIL_USERNAME'); |
59 | 59 | $mail_password = $request->get('password'); |
60 | 60 | \Session::flash('message', "New employee has been added to the application"); |
61 | - \Mail::send('emails.new_user', ['user' => $user, 'password' => $mail_password], function ($m) use ($user, $mailbox) { |
|
61 | + \Mail::send('emails.new_user', ['user' => $user, 'password' => $mail_password], function($m) use ($user, $mailbox) { |
|
62 | 62 | $m->from($mailbox); |
63 | 63 | $m->to($user->email)->subject('Your user credentials!'); |
64 | 64 | }); |
@@ -101,11 +101,11 @@ discard block |
||
101 | 101 | foreach ($request->get('permissions') as $permission) { |
102 | 102 | $role->givePermissionTo($permission); |
103 | 103 | } |
104 | - if($assign_role) |
|
104 | + if ($assign_role) |
|
105 | 105 | { |
106 | 106 | \Session::flash('message', 'New user role has been created'); |
107 | 107 | return redirect('staff/policies'); |
108 | - }else { |
|
108 | + } else { |
|
109 | 109 | return "Mislukt"; |
110 | 110 | } |
111 | 111 | } |
@@ -105,7 +105,7 @@ |
||
105 | 105 | { |
106 | 106 | \Session::flash('message', 'New user role has been created'); |
107 | 107 | return redirect('staff/policies'); |
108 | - }else { |
|
108 | + } else { |
|
109 | 109 | return "Mislukt"; |
110 | 110 | } |
111 | 111 | } |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace App\Http\Controllers; |
4 | 4 | |
5 | 5 | use Illuminate\Http\Request; |
6 | -use App\Http\Requests; |
|
7 | 6 | use App\Http\Controllers\Controller; |
8 | 7 | use App\User; |
9 | 8 | use App\Teams; |
@@ -6,13 +6,13 @@ |
||
6 | 6 | |
7 | 7 | class Department_members extends Model |
8 | 8 | { |
9 | - public function members() |
|
10 | - { |
|
11 | - return $this->belongsToMany('App\Department_members'); |
|
12 | - } |
|
9 | + public function members() |
|
10 | + { |
|
11 | + return $this->belongsToMany('App\Department_members'); |
|
12 | + } |
|
13 | 13 | |
14 | - public function teams() |
|
15 | - { |
|
16 | - return $this->belongsToMany('App\Teams'); |
|
17 | - } |
|
14 | + public function teams() |
|
15 | + { |
|
16 | + return $this->belongsToMany('App\Teams'); |
|
17 | + } |
|
18 | 18 | } |
@@ -25,6 +25,6 @@ |
||
25 | 25 | protected function schedule(Schedule $schedule) |
26 | 26 | { |
27 | 27 | $schedule->command('inspire') |
28 | - ->hourly(); |
|
28 | + ->hourly(); |
|
29 | 29 | } |
30 | 30 | } |
@@ -37,7 +37,7 @@ |
||
37 | 37 | */ |
38 | 38 | public function map(Router $router) |
39 | 39 | { |
40 | - $router->group(['namespace' => $this->namespace], function ($router) { |
|
40 | + $router->group(['namespace' => $this->namespace], function($router) { |
|
41 | 41 | require app_path('Http/routes.php'); |
42 | 42 | }); |
43 | 43 | } |