ALPHA 3.0.2a

This commit is contained in:
TheGamecraft
2018-09-06 10:09:04 -04:00
parent 3d7c45c2b2
commit d5fe4d6eb6
9 changed files with 277 additions and 44 deletions

View File

@@ -440,6 +440,8 @@ class CalendarController extends Controller
/** Logs and Notification */ /** Logs and Notification */
Log::saveLog("Ajout de l'activité, ".$schedule->event_name." à l'horaire le ".$schedule->event_date); 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(); $schedule->save();
$check = Schedule::find($id); return redirect('/admin/calendar');
dd($check);
} }
public function delete() public function delete()

View File

@@ -66,6 +66,8 @@ class MessageController extends Controller
$msg->save(); $msg->save();
\App\Log::savelog("Publication du message : ".request('msg_title')); \App\Log::savelog("Publication du message : ".request('msg_title'));
return redirect('/admin/message');
} }
/** /**

View File

@@ -26,7 +26,10 @@ class UserController extends Controller
*/ */
public function create() 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 * @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response * @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');
} }
/** /**

View File

@@ -20,28 +20,28 @@ class CreateUsersTable extends Migration
$table->string('email')->unique(); $table->string('email')->unique();
$table->string('password'); $table->string('password');
$table->string('rank')->default(1); $table->string('rank')->default(1);
$table->string('adress')->default('null'); $table->string('adress')->default('unknown');
$table->string('telephone')->default('null'); $table->string('telephone')->default('unknown');
$table->string('age'); $table->string('age');
$table->string('avatar')->default('null'); $table->string('avatar')->default('1');
$table->string('sexe'); $table->string('sexe');
$table->string('job')->default(6); $table->string('job')->default(6);
$table->integer('acces_level')->default(0); $table->string('acces_level')->default('unknown');
$table->string('schedule_see')->default(0); $table->string('schedule_see')->default('unknown');
$table->string('schedule_edit')->default(0); $table->string('schedule_edit')->default('unknown');
$table->string('schedule_notify')->default(0); $table->string('schedule_notify')->default('unknown');
$table->string('message_see')->default(0); $table->string('message_see')->default('unknown');
$table->string('message_edit')->default(0); $table->string('message_edit')->default('unknown');
$table->string('message_notify')->default(0); $table->string('message_notify')->default('unknown');
$table->string('paper_edit')->default(0); $table->string('paper_edit')->default('unknown');
$table->string('paper_publish')->default(0); $table->string('paper_publish')->default('unknown');
$table->string('paper_notify')->default(0); $table->string('paper_notify')->default('unknown');
$table->string('inventory_see')->default(0); $table->string('inventory_see')->default('unknown');
$table->string('inventory_edit')->default(0); $table->string('inventory_edit')->default('unknown');
$table->string('inventory_notify')->default(0); $table->string('inventory_notify')->default('unknown');
$table->string('user_see')->default(0); $table->string('user_see')->default('unknown');
$table->string('user_edit')->default(0); $table->string('user_edit')->default('unknown');
$table->string('user_notify')->default(0); $table->string('user_notify')->default('unknown');
$table->string('api_token', 60)->unique()->default(str_random(60)); $table->string('api_token', 60)->unique()->default(str_random(60));
$table->rememberToken(); $table->rememberToken();
$table->timestamps(); $table->timestamps();

29
public/assets/admin/assets/js/user.js vendored Normal file
View File

@@ -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");
}
}

View File

@@ -79,7 +79,8 @@
<div class="col-12 col-md-9"><textarea name="event_desc" id="event_desc" rows="9" placeholder="{{ trans('calendar.add_form_event_desc_placeholder') }}" class="form-control">{{ $RequestSchedule->data['event_desc'] }}</textarea> <div class="col-12 col-md-9"><textarea name="event_desc" id="event_desc" rows="9" placeholder="{{ trans('calendar.add_form_event_desc_placeholder') }}" class="form-control">{{ $RequestSchedule->data['event_desc'] }}</textarea>
<small class="form-text text-muted"> {{trans('calendar.add_form_event_desc_help')}}</small></div> <small class="form-text text-muted"> {{trans('calendar.add_form_event_desc_help')}}</small></div>
</div> </div>
@if ($RequestSchedule->type == "regular")
<!-- Special section ONLY for regular event type --> <!-- Special section ONLY for regular event type -->
<div id="special_section" style="display: none"> <div id="special_section" style="display: none">
<div class="row form-group"> <div class="row form-group">
@@ -327,6 +328,7 @@
</div> </div>
</div> </div>
</div> </div>
@endif
<div class="card-footer"> <div class="card-footer">
<button type="submit" class="btn btn-primary btn-sm"> <button type="submit" class="btn btn-primary btn-sm">
<i class="fa fa-dot-circle-o"></i> Submit <i class="fa fa-dot-circle-o"></i> Submit

View File

@@ -0,0 +1,157 @@
@extends('layouts.admin.main')
@section('content')
<div class="col-md-12">
<div class="card">
<div class="card-header">
<strong class="card-title">Ajouter un utilisateur <a href="#"><i class="fa fa-question-circle" aria-hidden="true"></i>
</a></strong>
</div>
<div class="card-body">
<form action="/admin/user/add" method="post">
@csrf
<div class="row">
<div class="col-6">
<div class="form-group">
<label for="firstname">Prénom</label>
<input type="text" class="form-control" name="firstname" id="firstname" aria-describedby="helpId" placeholder="John" required>
<small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
</div>
</div>
<div class="col-6">
<div class="form-group">
<label for="lastname">Nom de famille</label>
<input type="text" class="form-control" name="lastname" id="lastname" aria-describedby="helpId" placeholder="Doe" required>
<small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
</div>
</div>
</div>
<div class="alert alert-warning" id="email_alert" role="alert" style="display:none;">
Les adresses email doivent être identique
</div>
<div class="row">
<div class="col-6">
<div class="form-group">
<label for="email">Email</label>
<input type="email" class="form-control" name="email" id="email" aria-describedby="emailHelp" placeholder="exemple@c-cms.cf" onkeyup="checkEmail()" required>
<small id="emailHelp" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
</div>
</div>
<div class="col-6">
<div class="form-group">
<label for="email">Confirmer l'addresse email</label>
<input type="email" class="form-control" name="emailc" id="emailc" aria-describedby="emailHelp" placeholder="exemple@c-cms.cf" onkeyup="checkEmail()" required>
<small id="emailHelp" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
</div>
</div>
</div>
<div class="row">
<div class="col-6">
<div class="form-group">
<label for="adresse">Adresse</label>
<input type="text" class="form-control" name="adresse" id="adresse" aria-describedby="helpId" placeholder="14 ave Des Rue, Rimouski">
<small id="helpId" class="form-text text-muted"></small>
</div>
</div>
<div class="col-6">
<div class="form-group">
<label for="telephone">Telephone</label>
<input type="tel"
class="form-control" name="telephone" id="telephone" aria-describedby="helpId" placeholder="(XXX) XXX-XXXX">
<small id="helpId" class="form-text text-muted"><span class="badge badge-info">Si vous souhaiter recevoir des notifications par SMS</span></small>
</div>
</div>
</div>
<div class="row">
<div class="col-3">
<div class="form-group">
<label for="sexe">Sexe</label>
<select class="form-control" name="sexe" id="sexe" required>
<option value="m">Homme</option>
<option value="f">Femme</option>
<option value="a">Autre</option>
</select>
<small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
</div>
</div>
<div class="col-3">
<div class="form-group">
<label for="age">Age</label>
<input type="number" class="form-control" name="age" id="age" aria-describedby="helpId" placeholder="Age" min="0" max="100">
<small id="helpId" class="form-text text-muted"></small>
</div>
</div>
<div class="col-3">
<div class="form-group">
<label for="rank">Grade</label>
<select class="form-control" name="rank" id="rank" required>
@foreach ($RankList as $rank)
<option value="{{$rank->id}}">{{$rank->name}}</option>
@endforeach
</select>
<small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
</div>
</div>
<div class="col-3">
<div class="form-group">
<label for="job">Poste</label>
<select class="form-control" name="job" id="job" required>
@foreach ($JobsList as $job)
<option value="{{$job->id}}">{{$job->name}}</option>
@endforeach
</select>
<small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
</div>
</div>
</div>
<hr>
<div class="alert alert-warning" id="psw_alert" role="alert" style="display:none;">
Les mot de passe doivent être identique
</div>
<div class="row">
<div class="col-6">
<div class="form-group">
<label for="psw">Mot de passe</label>
<input type="password" class="form-control" name="psw" id="psw" placeholder="Supermotdepasse" onkeyup="checkPassword()">
<small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
</div>
</div>
<div class="col-6">
<div class="form-group">
<label for="pswc">Confirmer le mot de passe</label>
<input type="password" class="form-control" name="pswc" id="pswc" placeholder="Supermotdepasse" onkeyup="checkPassword()">
<small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
</div>
</div>
</div>
<button type="submit" id="submit" class="btn btn-primary">Submit</button>
</form>
</div>
</div>
</div>
@endsection
@section('breadcrumb')
<div class="breadcrumbs">
<div class="col-sm-4">
<div class="page-header float-left">
<div class="page-title">
<h1>Ajouter un utilisateur</h1>
</div>
</div>
</div>
<div class="col-sm-8">
<div class="page-header float-right">
<div class="page-title">
<ol class="breadcrumb text-right">
<li class="active">utilisateur/Ajouter</li>
</ol>
</div>
</div>
</div>
</div>
@endsection
@section('custom_scripts')
<script src="/assets/admin/assets/js/user.js"></script>
@endsection

View File

@@ -28,9 +28,9 @@ Route::middleware('auth:api')->group(function () {
/** User Route */ /** User Route */
Route::post('/user/delete', 'UserController@destroy'); 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");
}); });

View File

@@ -22,27 +22,34 @@ Route::get('/', function () {
Route::middleware(['auth','admin'])->group(function () { Route::middleware(['auth','admin'])->group(function () {
/* Espace Administration Route */ /* 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']); /** Calendar */
Route::get('/admin/calendar/edit/{id}', ['uses' =>'CalendarController@edit']); 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'); /** Statistique */
Route::patch('/admin/calendar/edit/{id}', ['uses' =>'CalendarController@patch']); 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'); /** User */
Route::get('/admin/message/add' , 'MessageController@create'); Route::get('/admin/user' , 'UserController@index');
Route::post('/admin/message/add' , 'MessageController@store'); Route::get('/admin/user/add' , 'UserController@create');
Route::get('/admin/message/{id}', ['uses' =>'MessageController@show']); Route::post('/admin/user/add' , 'UserController@store');
Route::get('/admin/user' , 'UserController@index'); /** Config */
Route::get('/admin/config/job' , 'JobController@index');
Route::get('/admin/config/job' , 'JobController@index');
}); });