diff --git a/app/Http/Controllers/CalendarController.php b/app/Http/Controllers/CalendarController.php index 46dd73e6..8088ca00 100644 --- a/app/Http/Controllers/CalendarController.php +++ b/app/Http/Controllers/CalendarController.php @@ -440,6 +440,8 @@ class CalendarController extends Controller /** Logs and Notification */ Log::saveLog("Ajout de l'activité, ".$schedule->event_name." à l'horaire le ".$schedule->event_date); + + return redirect('/admin/calendar'); } @@ -507,9 +509,8 @@ class CalendarController extends Controller $schedule->save(); - $check = Schedule::find($id); + return redirect('/admin/calendar'); - dd($check); } public function delete() diff --git a/app/Http/Controllers/MessageController.php b/app/Http/Controllers/MessageController.php index cdba1aec..4fbbfdfe 100644 --- a/app/Http/Controllers/MessageController.php +++ b/app/Http/Controllers/MessageController.php @@ -66,6 +66,8 @@ class MessageController extends Controller $msg->save(); \App\Log::savelog("Publication du message : ".request('msg_title')); + + return redirect('/admin/message'); } /** diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 3259f082..6b6b69ac 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -26,7 +26,10 @@ class UserController extends Controller */ public function create() { - // + $jobs = \App\Job::all(); + $ranks = \App\Rank::all(); + + return view('admin.user.add', ['JobsList' => $jobs, 'RankList' => $ranks]); } /** @@ -35,9 +38,41 @@ class UserController extends Controller * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ - public function store(Request $request) + public function store() { - // + $user = new User; + + $user->firstname = request('firstname'); + $user->lastname = request('lastname'); + $user->email = request('email'); + + if (request('adresse') == null) { + $user->adress = "unknown"; + } else { + $user->adress = request('adresse'); + } + + if (request('telephone') == null) { + $user->telephone = "unknown"; + } else { + $user->telephone = request('telephone'); + } + + $user->sexe = request('sexe'); + + if (request('age') == null) { + $user->age = "unknown"; + } else { + $user->age = request('age'); + } + + $user->rank = request('rank'); + $user->job = request('job'); + $user->password = bcrypt(request('psw')); + + $user->save(); + + return redirect('/admin/user'); } /** diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 85278a53..c862dc88 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -20,28 +20,28 @@ class CreateUsersTable extends Migration $table->string('email')->unique(); $table->string('password'); $table->string('rank')->default(1); - $table->string('adress')->default('null'); - $table->string('telephone')->default('null'); + $table->string('adress')->default('unknown'); + $table->string('telephone')->default('unknown'); $table->string('age'); - $table->string('avatar')->default('null'); + $table->string('avatar')->default('1'); $table->string('sexe'); $table->string('job')->default(6); - $table->integer('acces_level')->default(0); - $table->string('schedule_see')->default(0); - $table->string('schedule_edit')->default(0); - $table->string('schedule_notify')->default(0); - $table->string('message_see')->default(0); - $table->string('message_edit')->default(0); - $table->string('message_notify')->default(0); - $table->string('paper_edit')->default(0); - $table->string('paper_publish')->default(0); - $table->string('paper_notify')->default(0); - $table->string('inventory_see')->default(0); - $table->string('inventory_edit')->default(0); - $table->string('inventory_notify')->default(0); - $table->string('user_see')->default(0); - $table->string('user_edit')->default(0); - $table->string('user_notify')->default(0); + $table->string('acces_level')->default('unknown'); + $table->string('schedule_see')->default('unknown'); + $table->string('schedule_edit')->default('unknown'); + $table->string('schedule_notify')->default('unknown'); + $table->string('message_see')->default('unknown'); + $table->string('message_edit')->default('unknown'); + $table->string('message_notify')->default('unknown'); + $table->string('paper_edit')->default('unknown'); + $table->string('paper_publish')->default('unknown'); + $table->string('paper_notify')->default('unknown'); + $table->string('inventory_see')->default('unknown'); + $table->string('inventory_edit')->default('unknown'); + $table->string('inventory_notify')->default('unknown'); + $table->string('user_see')->default('unknown'); + $table->string('user_edit')->default('unknown'); + $table->string('user_notify')->default('unknown'); $table->string('api_token', 60)->unique()->default(str_random(60)); $table->rememberToken(); $table->timestamps(); diff --git a/public/assets/admin/assets/js/user.js b/public/assets/admin/assets/js/user.js new file mode 100644 index 00000000..9684b699 --- /dev/null +++ b/public/assets/admin/assets/js/user.js @@ -0,0 +1,29 @@ +function checkPassword() { + var psw = document.getElementById("psw"); + var pswc = document.getElementById("pswc"); + var psw_alert = document.getElementById("psw_alert"); + var submit = document.getElementById("submit"); + + if (psw.value == pswc.value) { + psw_alert.style.display = "none"; + submit.removeAttribute("disabled"); + } else { + psw_alert.style.display = "block"; + submit.setAttribute("disabled", "disabled"); + } +} + +function checkEmail() { + var email = document.getElementById("email"); + var emailc = document.getElementById("emailc"); + var email_alert = document.getElementById("email_alert"); + var submit = document.getElementById("submit"); + + if (email.value == emailc.value) { + email_alert.style.display = "none"; + submit.removeAttribute("disabled"); + } else { + email_alert.style.display = "block"; + submit.setAttribute("disabled", "disabled"); + } +} \ No newline at end of file diff --git a/resources/views/admin/calendar/calendar_edit.blade.php b/resources/views/admin/calendar/calendar_edit.blade.php index a1f432a9..127db4bc 100644 --- a/resources/views/admin/calendar/calendar_edit.blade.php +++ b/resources/views/admin/calendar/calendar_edit.blade.php @@ -79,7 +79,8 @@
{{trans('calendar.add_form_event_desc_help')}}
- + + @if ($RequestSchedule->type == "regular") + @endif
+ +
+ + +@endsection + +@section('breadcrumb') +
+
+
+
+

Ajouter un utilisateur

+
+
+
+
+
+
+
    +
  1. utilisateur/Ajouter
    2. +
+
+
+
+
+@endsection + +@section('custom_scripts') + +@endsection diff --git a/routes/api.php b/routes/api.php index 14c0fcdb..be75d0d2 100644 --- a/routes/api.php +++ b/routes/api.php @@ -28,9 +28,9 @@ Route::middleware('auth:api')->group(function () { /** User Route */ Route::post('/user/delete', 'UserController@destroy'); -}); + Route::get('/user/perm/{id}', function($id) { + $user = \App\User::find($id); + return $user->getPerm("schedule_edit"); + }); -Route::get('/user/perm/{id}', function($id) { - $user = \App\User::find($id); - return $user->getPerm("schedule_edit"); }); diff --git a/routes/web.php b/routes/web.php index 68145c28..6ca6ec88 100644 --- a/routes/web.php +++ b/routes/web.php @@ -22,27 +22,34 @@ Route::get('/', function () { Route::middleware(['auth','admin'])->group(function () { /* Espace Administration Route */ - Route::get('/admin', 'AdminController@index')->name('admin'); - Route::get('/admin/update', 'AdminController@update'); - Route::get('/admin/calendar', 'CalendarController@index'); + /** Dashboard & General */ + Route::get('/admin', 'AdminController@index')->name('admin'); + Route::get('/admin/update', 'AdminController@update'); - Route::get('/admin/calendar/add/{date}', ['uses' =>'CalendarController@add']); - Route::get('/admin/calendar/edit/{id}', ['uses' =>'CalendarController@edit']); + /** Calendar */ + Route::get('/admin/calendar', 'CalendarController@index'); + Route::get('/admin/calendar/add/{date}', ['uses' =>'CalendarController@add']); + Route::get('/admin/calendar/edit/{id}', ['uses' =>'CalendarController@edit']); + Route::post('/admin/calendar/add', 'CalendarController@store'); + Route::patch('/admin/calendar/edit/{id}', ['uses' =>'CalendarController@patch']); - Route::post('/admin/calendar/add', 'CalendarController@store'); - Route::patch('/admin/calendar/edit/{id}', ['uses' =>'CalendarController@patch']); + /** Statistique */ + Route::get('/admin/stats/log' , 'LogController@index'); - Route::get('/admin/stats/log' , 'LogController@index'); + /** Message */ + Route::get('/admin/message' , 'MessageController@index'); + Route::get('/admin/message/add' , 'MessageController@create'); + Route::post('/admin/message/add' , 'MessageController@store'); + Route::get('/admin/message/{id}', ['uses' =>'MessageController@show']); - Route::get('/admin/message' , 'MessageController@index'); - Route::get('/admin/message/add' , 'MessageController@create'); - Route::post('/admin/message/add' , 'MessageController@store'); - Route::get('/admin/message/{id}', ['uses' =>'MessageController@show']); + /** User */ + Route::get('/admin/user' , 'UserController@index'); + Route::get('/admin/user/add' , 'UserController@create'); + Route::post('/admin/user/add' , 'UserController@store'); - Route::get('/admin/user' , 'UserController@index'); - - Route::get('/admin/config/job' , 'JobController@index'); + /** Config */ + Route::get('/admin/config/job' , 'JobController@index'); });