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

Big Calendar/Schedule update

Browse Source
This commit is contained in:
Mathieu Lagace
2019-08-18 17:26:49 -04:00
parent 3546298a08
commit cf5f7effbf
40 changed files with 33844 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,7 +107,7 @@ class ComplementaryActivityController extends Controller
$activity->begin_time = request('begin_time');
$activity->end_time = request('end_time');
$activity->location = request('location');
if(request('is_mandatory') == 'on')
if(request('is_mandatory') == 'true')
{
$activity->is_mandatory = true;
}
@@ -115,7 +115,7 @@ class ComplementaryActivityController extends Controller
{
$activity->is_mandatory = false;
}
if(request('is_promoted') == 'on')
if(request('is_promoted') == 'true')
{
$activity->is_promoted = true;
}

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

@@ -69,17 +69,20 @@ class ConfigController extends Controller
*/
public function update()
{
$config = Config::all()->where('name',request('perm'))->first();
$configs = [
'is_schedule_public',
'is_schedule_build',
];
if (request('value') == "true") {
$config->data = ["true"];
} else {
$config->data = ["false"];
foreach ($configs as $config) {
$c = \App\Config::all()->where('name',$config)->first();
$c->data = [request($config)];
$c->save();
}
$config->save();
\App\Log::saveLog('Modification de la configuration du site');
return redirect('/admin/config')->with('success','Modification sauvegarder avec succès !');
}
/**

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

@@ -33,9 +33,53 @@ class EventController extends Controller
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
public function store()
{
//
$event = new Event();
$event->name = request('name');
$event->date_begin = request('begin');
$event->date_end = request('end');
$event->type = request('type');
$event->user_id = \Auth::user()->id;
$event->location = request('location');
$event->is_mandatory = request('is_mandatory');
$event->desc = request('desc');
$event->save();
if ($event->type == 1) {
for ($l=1; $l <= \App\Config::getData('admin_level_in_schedule_nb'); $l++) {
for ($p=1; $p <= \App\Config::getData('admin_periode_nb'); $p++) {
$course = new \App\Course();
$users = \App\User::all();
$instructor = "";
foreach ($users as $user) {
if($user->fullname() == request('instruc_n'.$l.'_p'.$p))
{
$instructor = $user->id;
}
}
$course->name = request('name_n'.$l.'_p'.$p);
$course->user_id = $instructor;
$course->ocom = request('ocom_n'.$l.'_p'.$p);
$course->location = request('loc_n'.$l.'_p'.$p);
$course->periode = $p;
$course->level = $l;
$course->comment = "";
$course->event_id = $event->id;
$course->save();
}
}
}
return redirect('/admin/calendar')->with('success','Evenement ajouter a l\'horaire');
}
/**

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

@@ -53,13 +53,13 @@ class ScheduleController extends Controller
$temp->data = $new_admin_periode_end;
$temp->save();
return redirect('/admin/config/schedule')->with('success','Modification sauvegarder avec succes !');
return redirect('/admin/config/schedule')->with('success','Modification sauvegarder avec succès !');
}
public function apiIndex()
{
$start = substr(request()->start,0,10);
$end = substr(request()->end,0,10);
$start = strtotime(request()->start);
$end = strtotime(request()->end);
$allschedules = Schedule::all();
$allevents = \App\Event::all();
@@ -68,16 +68,16 @@ class ScheduleController extends Controller
$schedules = [];
foreach ($allschedules as $schedule) {
if($schedule->date >= $start && $schedule->date <= $end) {
if(strtotime($schedule->date) >= $start && strtotime($schedule->date) <= $end) {
array_push($schedules,$schedule);
}
}
foreach ($allevents as $event) {
if($event->date_begin >= $start && $event->date_begin <= $end) {
if(strtotime($event->date_begin) >= $start && strtotime($event->date_begin) <= $end) {
array_push($events,$event);
}
else if($event->date_end >= $start && $event->date_end <= $end) {
else if(strtotime($event->date_end) >= $start && strtotime($event->date_end) <= $end) {
array_push($events,$event);
}
}
@@ -104,8 +104,8 @@ class ScheduleController extends Controller
$myevent = [
'title' => $event->name,
'start' => $event->date_begin,
'end' => $event->date_end,
'start' => date('c',strtotime($event->date_begin)),
'end' => date('c',strtotime($event->date_end)),
'color' => $color,
'extraParams' => [
'db_type' => 'event'],
@@ -199,4 +199,23 @@ class ScheduleController extends Controller
$pdf = PDF::loadView('admin.schedule.modal.show',['event' => $event]);
return $pdf->download($event->date_begin.'.pdf');
}
public function create($date)
{
$date = str_replace('/','-',$date);
return view('admin.schedule.event.add',['date' => $date]);
}
public function loadModalDefautType($type,$date)
{
$activity = \App\ComplementaryActivity::find($type);
$begin_time = $date." ".$activity->begin_time;
$end_time = $date." ".$activity->end_time;
return view('admin.schedule.modal.add',[
'activity' => \App\ComplementaryActivity::find($type),
'begin_time' => $begin_time,
'end_time' => $end_time
]);
}
}

15
app/Http/Controllers/UserController.php
View File

@@ -5,6 +5,8 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\User;
use function GuzzleHttp\json_encode;
class UserController extends Controller
{
/**
@@ -247,4 +249,17 @@ class UserController extends Controller
return back()->with('success', 'Modification enregistré');
}
public function apiList()
{
$users = \App\User::all();
$name = [];
foreach ($users as $user) {
array_push($name, $user->fullname());
}
return json_encode($name);
}
}