c-cms/c-cms-legacy
1
0
Fork 0
mirror of https://gitlab.com/TheGamecraft/c-cms.git synced 2026-04-21 02:39:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

3.2.1

Browse Source
This commit is contained in:
Mathieu Lagace
2019-09-08 16:43:34 -04:00
parent 0bd86285ca
commit 133f430445
39 changed files with 789 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/AdminController.php
View File

@@ -24,7 +24,7 @@ class AdminController extends Controller
*/
public function index()
{
Log::saveLog('Affichage du tableau de bord');
clog('navigate','success','consulte le tableau de bord');
$futureEvent_to_filtered = \App\Event::all()->sortBy('date_begin');
$futureEvent_to_filtered_pass_1 = collect();
@@ -47,7 +47,7 @@ class AdminController extends Controller
public function update()
{
Log::saveLog('Affichage des notes de mise a jour');
clog('navigate','success','consulte les notes de mise à jours');
return view('admin.update');
}

5
app/Http/Controllers/ArticleController.php
View File

@@ -13,7 +13,7 @@ class ArticleController extends Controller
*/
public function index()
{
clogNav('consulte les articles');
return view('admin.article.index',['activity' => \App\ComplementaryActivity::all()]);
}
@@ -92,6 +92,7 @@ class ArticleController extends Controller
$a->public_header_picture = $request->public_header_picture;
$a->save();
clog('edit','success','a ajouté un article');
return redirect('/admin/article')->with('success','Article modifié avec succès');
}
@@ -127,7 +128,7 @@ class ArticleController extends Controller
$p->pictureable_type = "App\ComplementaryActivity";
$p->save();
clog('add','success','a ajouté une photo avec succès');
return redirect('/admin/article/activity/picture/'.$id)->with('success','Photo ajoutéé avec succès');
}
}

95
app/Http/Controllers/BookingController.php
View File

@@ -4,45 +4,91 @@ namespace App\Http\Controllers;
use App\Booking;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
class BookingController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
* @return Response
*/
public function index()
public function index($type, $id)
{
//
switch ($type)
{
case 'course':
$event = \App\Course::find($id);
$event->fulltime = $event->event->date_begin.', Niveau '.$event->level.', Période '.$event->periode;
$event->fulldesc = $event->ocom;
break;
case 'event':
$event = \App\Event::find($id);
$event->fulltime = $event->date_begin;
$event->fulldesc = $event->desc;
break;
default:
abort(500);
}
clogNav('consulte les réservations');
return view('admin.booking.index',['event' => $event,'event_type' => $type,'event_id' => $id]);
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
* @return Response
*/
public function create()
public function create($type,$id)
{
//
return view('admin.booking.create',['items' => \App\Item::training(),'event_type' => $type,'event_id' => $id]);
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
* @return Response
*/
public function store(Request $request)
public function store(Request $request,$type,$id)
{
//
$b = new Booking();
$b->item_id = $request->item_id;
$b->amount = $request->amount;
$b->bookable_id = $id;
$b->user_id = \Auth::user()->id;
if (!$request->comment == '')
{
$b->comment = $request->comment;
}
else
{
$b->comment = 'Aucun commentaire';
}
switch ($type)
{
case 'course':
$b->bookable_type = 'App\Course';
break;
case 'event':
$b->bookable_type = 'App\Event';
default:
$b->bookable_type = '';
}
$b->save();
clog('add','success','a ajouté une réservation avec succès',null,'App\Booking',$b->id);
return redirect('/admin/booking/course/'.$id)->with('success','Réservation ajouté avec succès');
}
/**
* Display the specified resource.
*
* @param \App\Booking $booking
* @return \Illuminate\Http\Response
* @return Response
*/
public function show(Booking $booking)
{
@@ -53,7 +99,7 @@ class BookingController extends Controller
* Show the form for editing the specified resource.
*
* @param \App\Booking $booking
* @return \Illuminate\Http\Response
* @return Response
*/
public function edit(Booking $booking)
{
@@ -65,21 +111,38 @@ class BookingController extends Controller
*
* @param \Illuminate\Http\Request $request
* @param \App\Booking $booking
* @return \Illuminate\Http\Response
* @return Response
*/
public function update(Request $request, Booking $booking)
{
//
$b = Booking::find($request->booking_id);
$b->amount = $request->amount;
$b->comment = $request->comment;
$b->save();
return back()->with('success','Modification sauvegardé avec succès');
}
/**
* Remove the specified resource from storage.
*
* @param \App\Booking $booking
* @return \Illuminate\Http\Response
* @return Response
*/
public function destroy(Booking $booking)
public function destroy(Request $request)
{
//
$b = Booking::find($request->id);
$b->delete();
}
public function modalItem($id)
{
return view('admin.booking.modal.create',['item' => \App\Item::find($id)]);
}
public function modalItemEdit($id)
{
return view('admin.booking.modal.edit',['booking' => \App\Booking::find($id)]);
}
}

8
app/Http/Controllers/CalendarController.php
View File

@@ -32,7 +32,6 @@ class CalendarController extends Controller
*/
public function index()
{
Log::saveLog("Affichage de l'horaire");
$this->listClass();
@@ -165,9 +164,6 @@ class CalendarController extends Controller
$url = str_replace("-","_", $Requestdate);
/** Dont work ... API stuff
* Log::saveLog("a consulté l'horaire du ".$date);
**/
$today = Schedule::where('date','=',$Requestdate)->get();
$isEmpty = $today->isEmpty();
@@ -450,8 +446,6 @@ class CalendarController extends Controller
$schedule->save();
/** Logs and Notification */
Log::saveLog("Ajout de l'activité, ".$schedule->data['event_name']." à l'horaire le ".$schedule->date);
$userToNotify = $schedule->getUserToNotify();
\Notification::send($userToNotify, new Alert(\Auth::User()->id,"Ajout de l'activité, ".$schedule->data['event_name']." à l'horaire le ".$schedule->date,"/admin/calendar"));
@@ -692,7 +686,6 @@ class CalendarController extends Controller
\Notification::send($userToNotify, new mail(\Auth::User(),"Modification d'une activité a l'horaire",\Auth::User()->fullname()." à modifié l'activité, ".$schedule->data['event_name']." à l'horaire le ".$schedule->date."<br>".$string_Change));
}
Log::saveLog("Modification de l'activité, ".$schedule->data['event_name']." à l'horaire le ".$schedule->date);
return redirect('/admin/calendar');
@@ -713,7 +706,6 @@ class CalendarController extends Controller
\Notification::send($userToNotify, new mail(\Auth::User(),"Suppression d'une activité a l'horaire",\Auth::User()->fullname()." à supprimé l'activité, ".$schedule->data['event_name']." à l'horaire le ".$schedule->date));
}
Log::saveLog("Suppression de l'activité, ".$schedule->data['event_name']." à l'horaire le ".$schedule->date);
}

8
app/Http/Controllers/ComplementaryActivityController.php
View File

@@ -14,6 +14,7 @@ class ComplementaryActivityController extends Controller
*/
public function index()
{
clogNav('consulte les configurations d\'activité');
return view('admin.configs.activity',['configs' => \App\Config::all(),'activities' => \App\ComplementaryActivity::all()]);
}
@@ -67,7 +68,7 @@ class ComplementaryActivityController extends Controller
}
$activity->save();
clog('add','success','a ajouté une activité',null,'App\ComplementaryActivity',$activity->id);
return redirect('/admin/config/activity')->with('success','Activité ajouté avec succes');
}
@@ -129,7 +130,7 @@ class ComplementaryActivityController extends Controller
}
$activity->save();
clog('edit','success','a modifié une activité',null,'App\ComplementaryActivity',$activity->id);
return redirect('/admin/config/activity')->with('success','Modification sauvegarder avec succes');
}
@@ -144,7 +145,8 @@ class ComplementaryActivityController extends Controller
$id = request('id');
$activity = ComplementaryActivity::find($id);
clog('delete','success','a supprimé une activité',null,'App\ComplementaryActivity',$id);
$activity->delete();
}
}

7
app/Http/Controllers/ConfigController.php
View File

@@ -14,6 +14,7 @@ class ConfigController extends Controller
*/
public function index()
{
clogNav('consulte les configurations');
return view ('admin.configs.general',['configs' => Config::all()]);
}
@@ -34,7 +35,7 @@ class ConfigController extends Controller
$c->save();
}
\App\Log::saveLog('Modification de la configuration du site');
clog('edit','success','a modifié la configuration');
return redirect('/admin/config/customisation')->with('success','Modification sauvegarder avec succès !');
}
@@ -114,9 +115,7 @@ class ConfigController extends Controller
$c->data = [request($config)];
$c->save();
}
\App\Log::saveLog('Modification de la configuration du site');
clog('edit','success','a modifié la configuration');
return redirect('/admin/config')->with('success','Modification sauvegarder avec succès !');
}

4
app/Http/Controllers/EventController.php
View File

@@ -83,7 +83,7 @@ class EventController extends Controller
}
}
}
clog('add','success','a ajouté un évènement',null,'App\Event',$event->id);
return redirect('/admin/calendar')->with('success','Événement ajouter à l\'horaire');
}
@@ -174,7 +174,7 @@ class EventController extends Controller
}
}
}
clog('edit','success','a modifié un évènement',null,'App\Event',$event->id);
return redirect('/admin/calendar')->with('success','Modification à l\'événement sauvegarder à l\'horaire');
}

3
app/Http/Controllers/InventoryController.php
View File

@@ -16,7 +16,7 @@ class InventoryController extends Controller
public function index()
{
$items = Item::all();
clogNav('consulte l\'inventaire');
return view('admin.inventory.index',[ 'items' => $items]);
}
@@ -32,6 +32,7 @@ class InventoryController extends Controller
public function management()
{
clogNav('consulte la gestion de l\'inventaire');
return view('admin.inventory.management');
}

6
app/Http/Controllers/ItemCategoryController.php
View File

@@ -15,6 +15,7 @@ class ItemCategoryController extends Controller
*/
public function index()
{
clogNav('consulte la gestion des catégories d\'inventaire');
return view('admin.itemcategory.index',['categories' => ItemCategory::all()]);
}
@@ -58,7 +59,7 @@ class ItemCategoryController extends Controller
}
$c->save();
clog('add','success','a ajouté une catégorie a l\'inventaire',null,'App\ItemCategory',$c->id);
return redirect('/admin/inventory/management/category/')->with('success','Catégorie ajouté avec succès');
}
@@ -115,7 +116,7 @@ class ItemCategoryController extends Controller
}
$c->save();
clog('edit','success','a modifié une catégorie de l\'inventaire',null,'App\ItemCategory',$c->id);
return redirect('/admin/inventory/management/category/')->with('success','Catégorie modifié avec succès');
}
@@ -130,5 +131,6 @@ class ItemCategoryController extends Controller
$c = ItemCategory::find($id);
$c->delete();
clog('delete','success','a supprimé une catégorie de l\'inventaire',null,'App\ItemCategory',$c->id);
}
}

5
app/Http/Controllers/ItemController.php
View File

@@ -45,7 +45,7 @@ class ItemController extends Controller
$item->category_id = request('category_id');
$item->save();
clog('add','success',"a ajouté un item à l'inventaire",null,"App\Item",$item->id);
return redirect('/admin/inventory')->with('success','Item sauvegardé avec succès');
}
@@ -92,7 +92,7 @@ class ItemController extends Controller
$item->category_id = request('category_id');
$item->save();
clog('edit','success',"a modifié un item à l'inventaire",null,"App\Item",$item->id);
return redirect('/admin/inventory')->with('success','Item sauvegardé avec succès');
}
@@ -107,5 +107,6 @@ class ItemController extends Controller
$item = Item::find(request('id'));
$item->delete();
clog('delete','success',"a supprimé un item à l'inventaire",null,"App\Item",$item->id);
}
}

6
app/Http/Controllers/MessageController.php
View File

@@ -25,6 +25,7 @@ class MessageController extends Controller
*/
public function index()
{
clogNav('consulte les messages');
return view('admin.message.index', ['messages' => \App\Message::all()]);
}
@@ -65,8 +66,7 @@ class MessageController extends Controller
$msg->save();
\App\Log::savelog("Publication du message : ".request('msg_title'));
clog('add','success','a ajouté un message',null,'App\Message',$msg->id);
return redirect('/admin/message');
}
@@ -79,6 +79,7 @@ class MessageController extends Controller
public function show($id)
{
\Auth::User()->seenMessage($id);
clog('see','success','a consulté un message',null,'App\Message',$id);
return view('admin.message.show', ['message' => Message::find($id)]);
}
@@ -118,5 +119,6 @@ class MessageController extends Controller
$msg = Message::find($id);
$msg->delete();
clog('delete','success','a supprimé un message',null,'App\Message',$id);
}
}

7
app/Http/Controllers/NewsController.php
View File

@@ -19,6 +19,7 @@ class NewsController extends Controller
public function indexAdmin()
{
clogNav('a consulté les nouvelles');
return view('admin.news.index',['news' => \App\News::paginate(9)]);
}
@@ -55,7 +56,7 @@ class NewsController extends Controller
$n->user_id = \Auth::user()->id;
$n->save();
clog('add','success','a ajouté une nouvelle',null,'App\News',$n->id);
return redirect('/admin/news')->with('success','Nouvelle ajouté avec succès');
}
@@ -68,6 +69,7 @@ class NewsController extends Controller
*/
public function show($id)
{
clog('see','success','a consulté une nouvelle',null,'App\News',$id);
return view('public.news', ['new' => \App\News::find($id)]);
}
@@ -106,7 +108,7 @@ class NewsController extends Controller
$n->user_id = \Auth::user()->id;
$n->save();
clog('edit','success','a modifié une nouvelle',null,'App\News',$id);
return redirect('/admin/news')->with('success','Nouvelle modifié avec succès');
}
@@ -121,5 +123,6 @@ class NewsController extends Controller
$news = News::find(request('id'));
$news->delete();
clog('delete','success','a supprimé une nouvelle',null,'App\News',$id);
}
}

7
app/Http/Controllers/PictureController.php
View File

@@ -19,6 +19,7 @@ class PictureController extends Controller
public function indexAdmin()
{
clogNav('consulte les images');
return view('admin.picture.index',['pictures' => \App\Picture::paginate(\App\Config::getData('text_public_picture_nb'))]);
}
/**
@@ -48,7 +49,7 @@ class PictureController extends Controller
$pic->pictureable_type = "";
$pic->save();
clog('add','success','a ajouté une image',null,'App\Picture',$pic->id);
return redirect('/admin/picture')->with('success','Image ajoutée avec succès');
}
@@ -61,6 +62,7 @@ class PictureController extends Controller
*/
public function show($id)
{
clog('see','success','a consulté une image',null,'App\Picture',$id);
return view('public.picture',['picture' => \App\Picture::find($id)]);
}
@@ -91,7 +93,7 @@ class PictureController extends Controller
$pic->desc = request('desc');
$pic->save();
clog('edit','success','a modifié une image',null,'App\Picture',$id);
if ($pic->pictureable_type == "App\ComplementaryActivity")
{
return redirect('admin/article/activity/picture/'.$pic->pictureable->id)->with('success','Image sauvegarder avec succès');
@@ -113,5 +115,6 @@ class PictureController extends Controller
$pic = Picture::find($id);
$pic->delete();
clog('delete','success','a supprimé une image',null,'App\Picture',$id);
}
}

2
app/Http/Controllers/ScheduleController.php
View File

@@ -196,7 +196,7 @@ class ScheduleController extends Controller
public function printtopdf($id)
{
$event = \App\Event::find($id);
$pdf = PDF::loadView('admin.schedule.modal.show',['event' => $event]);
$pdf = PDF::loadView('admin.schedule.print.event',['event' => $event]);
return $pdf->download($event->date_begin.'.pdf');
}

56
app/Http/helpers.php
View File

@@ -1,5 +1,10 @@
<?php
use App\Log;
/**
* @return bool
*/
function getStatus()
{
$client = new GuzzleHttp\Client();
@@ -16,4 +21,55 @@ function getStatus()
}
return $isBroken;
}
/**
* @param string $type
* @param string $result
* @param string $event
* @param int $user_id
* @param null $obj_type
* @param null $obj_id
*/
function clog(string $type,string $result,string $event,$user_id = null,$obj_type = null,$obj_id = null)
{
$log = new Log;
$log->result = $result;
$log->event = $event;
$log->type = $type;
if ($user_id != null)
{
$log->user_id = $user_id;
}
else
{
$log->user_id = \Auth::User()->id;
}
if ($obj_type != null)
{
$log->logable_type = $obj_type;
}
else
{
$log->logable_type = '';
}
if ($obj_id != null)
{
$log->logable_id = $obj_id;
}
else
{
$log->logable_id = 0;
}
$log->save();
}
function clogNav($event)
{
clog('navigate','success',$event);
}