mirror of
https://gitlab.com/TheGamecraft/c-cms.git
synced 2026-04-21 02:39:10 -04:00
Big Calendar/Schedule update
This commit is contained in:
@@ -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
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user