ALPHA 3.0.3

This commit is contained in:
TheGamecraft
2018-09-08 12:39:49 -04:00
parent d5fe4d6eb6
commit 7fe13ae0a7
88 changed files with 13952 additions and 112 deletions

View File

@@ -258,6 +258,7 @@ class CalendarController extends Controller
<tr style="border:none;">
<td style="border:none; width:80%">'.User::find($date->data['n1_p1_instructor'])->fullname().'</td>
<td style="border:none;">'.$isdone_n1_p1.'</td>
<td style="border:none;"><a href="/admin/inventory/'.$date->id.'/1/1" type="button" class="btn btn-info"><i class="fa fa-archive" style="color:white;"></i></a></td>
</tr>
<tr style="border:none;">
<td style="border:none;width:80%">'.$date->data['n1_p1_ocom'].' - '.$date->data['n1_p1_name'].'</td>
@@ -272,6 +273,7 @@ class CalendarController extends Controller
<tr style="border:none;">
<td style="border:none;width:80%">'.User::find($date->data['n1_p2_instructor'])->fullname().'</td>
<td style="border:none;">'.$isdone_n1_p2.'</td>
<td style="border:none;"><a href="/admin/inventory/'.$date->id.'/2/1" type="button" class="btn btn-info"><i class="fa fa-archive" style="color:white;"></i></a></td>
</tr>
<tr style="border:none;">
<td style="border:none;width:80%">'.$date->data['n1_p2_ocom'].' - '.$date->data['n1_p2_name'].'</td>
@@ -289,6 +291,7 @@ class CalendarController extends Controller
<tr style="border:none;">
<td style="border:none;width:80%">'.User::find($date->data['n2_p1_instructor'])->fullname().'</td>
<td style="border:none;">'.$isdone_n2_p1.'</td>
<td style="border:none;"><a href="/admin/inventory/'.$date->id.'/1/2" type="button" class="btn btn-info"><i class="fa fa-archive" style="color:white;"></i></a></td>
</tr>
<tr style="border:none;">
<td style="border:none;width:80%">'.$date->data['n2_p1_ocom'].' - '.$date->data['n2_p1_name'].'</td>
@@ -303,6 +306,7 @@ class CalendarController extends Controller
<tr style="border:none;">
<td style="border:none;width:80%">'.User::find($date->data['n2_p2_instructor'])->fullname().'</td>
<td style="border:none;">'.$isdone_n2_p2.'</td>
<td style="border:none;"><a href="/admin/inventory/'.$date->id.'/2/2" type="button" class="btn btn-info"><i class="fa fa-archive" style="color:white;"></i></a></td>
</tr>
<tr style="border:none;">
<td style="border:none;width:80%">'.$date->data['n2_p2_ocom'].' - '.$date->data['n2_p2_name'].'</td>
@@ -320,6 +324,7 @@ class CalendarController extends Controller
<tr style="border:none;">
<td style="border:none;width:80%">'.User::find($date->data['n3_p1_instructor'])->fullname().'</td>
<td style="border:none;">'.$isdone_n3_p1.'</td>
<td style="border:none;"><a href="/admin/inventory/'.$date->id.'/1/3" type="button" class="btn btn-info"><i class="fa fa-archive" style="color:white;"></i></a></td>
</tr>
<tr style="border:none;">
<td style="border:none;width:80%">'.$date->data['n3_p1_ocom'].' - '.$date->data['n3_p1_name'].'</td>
@@ -334,6 +339,7 @@ class CalendarController extends Controller
<tr style="border:none;">
<td style="border:none;width:80%">'.User::find($date->data['n3_p2_instructor'])->fullname().'</td>
<td style="border:none;">'.$isdone_n3_p2.'</td>
<td style="border:none;"><a href="/admin/inventory/'.$date->id.'/2/3" type="button" class="btn btn-info"><i class="fa fa-archive" style="color:white;"></i></a></td>
</tr>
<tr style="border:none;">
<td style="border:none;width:80%">'.$date->data['n3_p2_ocom'].' - '.$date->data['n3_p2_name'].'</td>

View File

@@ -0,0 +1,154 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Item;
use App\Schedule;
class InventoryController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
$items = Item::all();
return view('admin.inventory.index',[ 'items' => $items]);
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
//
}
public function booking()
{
$items = Item::all();
$schedules = Schedule::all()->where('type','regular')->sortBy('date');
$filtered = collect();
foreach ($schedules as $day) {
if ($day->date >= date('Y-m-d')) {
$filtered->push($day);
}
}
return view('admin.inventory.booking',[ 'items' => $items, 'schedules' => $filtered]);
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store($id,$periode,$niveau)
{
$schedule = Schedule::find($id);
$periode_item = 'n'.$niveau.'_p'.$periode.'_item';
if (isset($schedule->$periode_item)) {
$array_items = explode("-",$schedule->$periode_item);
array_push($array_items,request('add'));
} else {
$array_items = [];
array_push($array_items,request('add'));
}
$final_items = implode("-",$array_items);
$schedule->$periode_item = $final_items;
$schedule->save();
return redirect('/admin/inventory/'.$id.'/'.$periode.'/'.$niveau);
}
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show($id,$periode,$niveau)
{
$schedule = Schedule::find($id);
$periode_item = 'n'.$niveau.'_p'.$periode.'_item';
$items = collect();
if (isset($schedule->$periode_item)) {
$items_array = explode("-",$schedule->$periode_item);
foreach ($items_array as $item_array) {
if ($item_array != "") {
$items->push(Item::find($item_array));
}
}
}
return view('admin.inventory.show',['schedule' => $schedule, 'periode' => $periode, 'niveau' => $niveau, 'items' => $items, 'dispo_item' => $schedule->getInventory($periode)]);
}
/**
* Show the form for editing the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function edit($id)
{
if (!isset($schedule->data[$periode])) {
dd('Null');
} else {
dd($schedule->data[$periode]);
}
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
{
//
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function destroy($id,$periode,$niveau)
{
$schedule = Schedule::find($id);
$remove = [request('remove')];
$periode_item = 'n'.$niveau.'_p'.$periode.'_item';
if (isset($schedule->$periode_item)) {
$array_items = explode("-",$schedule->$periode_item);
$array_items = array_diff($array_items,$remove);
} else {
$array_items = [];
$array_items = array_diff($array_items,$remove);
}
$final_items = implode("-",$array_items);
$schedule->$periode_item = $final_items;
$schedule->save();
return redirect('/admin/inventory/'.$id.'/'.$periode.'/'.$niveau);
}
}

View File

@@ -0,0 +1,103 @@
<?php
namespace App\Http\Controllers;
use App\Item;
use Illuminate\Http\Request;
class ItemController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
//
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
return view('admin.item.add');
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
$item = new Item;
$item->name = request('name');
$item->desc = request('desc');
$item->save();
return redirect('/admin/inventory');
}
/**
* Display the specified resource.
*
* @param \App\Item $item
* @return \Illuminate\Http\Response
*/
public function show(Item $item)
{
//
}
/**
* Show the form for editing the specified resource.
*
* @param \App\Item $item
* @return \Illuminate\Http\Response
*/
public function edit($id)
{
$item = Item::find($id);
return view('admin.item.edit',['item' => $item]);
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\Item $item
* @return \Illuminate\Http\Response
*/
public function update($id)
{
$item = Item::find($id);
$item->name = request('name');
$item->desc = request('desc');
$item->save();
return redirect('/admin/inventory');
}
/**
* Remove the specified resource from storage.
*
* @param \App\Item $item
* @return \Illuminate\Http\Response
*/
public function destroy()
{
$item = Item::find(request('id'));
$item->delete();
}
}

View File

@@ -30,7 +30,7 @@ class JobController extends Controller
*/
public function create()
{
//
return view('admin.job.add');
}
/**
@@ -41,7 +41,92 @@ class JobController extends Controller
*/
public function store(Request $request)
{
//
$job = new Job;
$job->name = request('name');
$job->acces_level = request('acces_level');
$job->desc = request('desc');
if (null !==(request('schedule_see'))) {
$job->schedule_see = request('schedule_see');
} else {
$job->schedule_see = false;
}
if (null !==(request('schedule_edit'))) {
$job->schedule_edit = 1;
} else {
$job->schedule_edit = false;
}
if (null !==(request('schedule_notify'))) {
$job->schedule_notify = 1;
} else {
$job->schedule_notify = false;
}
if (null !==(request('message_see'))) {
$job->message_see = 1;
} else {
$job->message_see = false;
}
if (null !==(request('message_edit'))) {
$job->message_edit = 1;
} else {
$job->message_edit = false;
}
if (null !==(request('message_notify'))) {
$job->message_notify = 1;
} else {
$job->message_notify = false;
}
if (null !==(request('paper_edit'))) {
$job->paper_edit = 1;
} else {
$job->paper_edit = false;
}
if (null !==(request('paper_publish'))) {
$job->paper_publish = 1;
} else {
$job->paper_publish = false;
}
if (null !==(request('paper_notify'))) {
$job->paper_notify = 1;
} else {
$job->paper_notify = false;
}
if (null !==(request('inventory_see'))) {
$job->inventory_see = 1;
} else {
$job->inventory_see = false;
}
if (null !==(request('inventory_edit'))) {
$job->inventory_edit = 1;
} else {
$job->inventory_edit = false;
}
if (null !==(request('inventory_notify'))) {
$job->inventory_notify = 1;
} else {
$job->inventory_notify = false;
}
if (null !==(request('user_see'))) {
$job->user_see = 1;
} else {
$job->user_see = false;
}
if (null !==(request('user_edit'))) {
$job->user_edit = 1;
} else {
$job->user_edit = false;
}
if (null !==(request('user_notify'))) {
$job->user_notify = 1;
} else {
$job->user_notify = false;
}
$job->save();
return redirect('/admin/config/job/'.$job->id);
}
/**
@@ -50,9 +135,11 @@ class JobController extends Controller
* @param \App\Job $job
* @return \Illuminate\Http\Response
*/
public function show(Job $job)
public function show($id)
{
//
$job = Job::find($id);
return view('admin.job.show', ['job' => $job]);
}
/**
@@ -61,9 +148,11 @@ class JobController extends Controller
* @param \App\Job $job
* @return \Illuminate\Http\Response
*/
public function edit(Job $job)
public function edit($id)
{
//
$job = Job::find($id);
return view('admin.job.edit', ['job' => $job]);
}
/**

View File

@@ -0,0 +1,87 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Local;
class LocalController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
$locals = Local::all();
return view('admin.local.index',[ 'locals' => $locals]);
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
//
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
//
}
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show($id)
{
//
}
/**
* Show the form for editing the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function edit($id)
{
//
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
{
//
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
//
}
}

View File

@@ -47,13 +47,13 @@ class UserController extends Controller
$user->email = request('email');
if (request('adresse') == null) {
$user->adress = "unknown";
$user->adress = "Inconnu";
} else {
$user->adress = request('adresse');
}
if (request('telephone') == null) {
$user->telephone = "unknown";
$user->telephone = "Inconnu";
} else {
$user->telephone = request('telephone');
}
@@ -61,14 +61,16 @@ class UserController extends Controller
$user->sexe = request('sexe');
if (request('age') == null) {
$user->age = "unknown";
$user->age = "Inconnu";
} else {
$user->age = request('age');
}
$user->avatar = rand(1,16);
$user->rank = request('rank');
$user->job = request('job');
$user->password = bcrypt(request('psw'));
$user->api_token = str_random(60);
$user->save();
@@ -94,7 +96,12 @@ class UserController extends Controller
*/
public function edit($id)
{
//
$jobs = \App\Job::all();
$ranks = \App\Rank::all();
$user = \App\User::find($id);
return view('admin.user.edit', ['JobsList' => $jobs, 'RankList' => $ranks, 'user' => $user]);
}
/**
@@ -104,9 +111,44 @@ class UserController extends Controller
* @param int $id
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
public function update(Request $request)
{
//
$user = User::where('email', request('email'))->first();
$user->firstname = request('firstname');
$user->lastname = request('lastname');
$user->email = request('email');
if (request('adresse') == null) {
$user->adress = "Inconnu";
} else {
$user->adress = request('adresse');
}
if (request('telephone') == null) {
$user->telephone = "Inconnu";
} else {
$user->telephone = request('telephone');
}
$user->sexe = request('sexe');
if (request('age') == null) {
$user->age = "Inconnu";
} else {
$user->age = request('age');
}
$user->rank = request('rank');
$user->job = request('job');
if (request('psw') != null) {
$user->password = bcrypt(request('psw'));
}
$user->api_token = str_random(60);
$user->save();
return redirect('/admin/user');
}
/**