Calendar Edit

app/Event.php

@@ -20,4 +20,19 @@ class Event extends Model
     {
     return $this->belongsTo('App\User');
     }
+
+    public function course($p,$l)
+    {
+        $courses = $this->courses;
+
+        foreach ($courses as $c)
+        {
+            if ($c->periode == $p && $c->level == $l)
+            {
+                return $c;
+            }
+        }
+
+        return false;
+    }
 }

app/Http/Controllers/AdminController.php

@@ -26,23 +26,23 @@ class AdminController extends Controller
     {
         Log::saveLog('Affichage du tableau de bord');
 
-        $futureEvent_to_filtered = \App\Schedule::all()->sortBy('date');
+        $futureEvent_to_filtered = \App\Event::all()->sortBy('date_begin');
         $futureEvent_to_filtered_pass_1 = collect();
         $futureEvent = collect();
 
         foreach ($futureEvent_to_filtered as $day) {
-            if ($day->date >= date('Y-m-d')) {
+            if (date('U',strtotime($day->date_begin)) >= date('U')) {
                 $futureEvent_to_filtered_pass_1->push($day);
             }
         }
         
         foreach ($futureEvent_to_filtered_pass_1 as $day) {
-            if ($day->date <= date('Y-m-d',strtotime("+2 week"))) {
+            if (date('U',strtotime($day->date_begin)) <= date('U',strtotime("+2 week"))) {
                 $futureEvent->push($day);
             }
         }
 
-        return view('admin.dashboard',['futureEvent' => $futureEvent,'userClasse' => \Auth::User()->getClasse()->forPage(1,6)]);
+        return view('admin.dashboard',['futureEvent' => $futureEvent->take(3),'userClasse' => \Auth::User()->getClasse()->forPage(1,6)]);
     }
 
     public function update()

app/Http/Controllers/ComplementaryActivityController.php

@@ -75,7 +75,7 @@ class ComplementaryActivityController extends Controller
      */
     public function show(ComplementaryActivity $complementaryActivity)
     {
-        //
+        return view('public.activity');
     }
 
     /**

app/Http/Controllers/EventController.php

@@ -4,13 +4,14 @@ namespace App\Http\Controllers;
 
 use App\Event;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 
 class EventController extends Controller
 {
     /**
      * Display a listing of the resource.
      *
-     * @return \Illuminate\Http\Response
+     * @return Response
      */
     public function index()
     {
@@ -20,7 +21,7 @@ class EventController extends Controller
     /**
      * Show the form for creating a new resource.
      *
-     * @return \Illuminate\Http\Response
+     * @return Response
      */
     public function create()
     {
@@ -31,7 +32,7 @@ class EventController extends Controller
      * Store a newly created resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return Response
      */
     public function store()
     {
@@ -43,7 +44,11 @@ class EventController extends Controller
         $event->type = request('type');
         $event->user_id = \Auth::user()->id;
         $event->location = request('location');
-        $event->is_mandatory = request('is_mandatory');
+        if($event->is_mandatory){
+            $event->is_mandatory = request('is_mandatory');
+        } else {
+            $event->is_mandatory  = 0;
+        }
         $event->desc = request('desc');
 
         $event->save();
@@ -55,7 +60,7 @@ class EventController extends Controller
                     $course = new \App\Course();
 
                     $users = \App\User::all();
-                    $instructor = "";
+                    $instructor = 1;
 
                     foreach ($users as $user) {
                         if($user->fullname() == request('instruc_n'.$l.'_p'.$p))
@@ -79,14 +84,14 @@ class EventController extends Controller
             }   
         }
 
-        return redirect('/admin/calendar')->with('success','Evenement ajouter a l\'horaire');
+        return redirect('/admin/calendar')->with('success','Événement ajouter à l\'horaire');
     }
 
     /**
      * Display the specified resource.
      *
      * @param  \App\Event  $event
-     * @return \Illuminate\Http\Response
+     * @return Response
      */
     public function show(Event $event)
     {
@@ -96,12 +101,12 @@ class EventController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param  \App\Event  $event
-     * @return \Illuminate\Http\Response
+     * @param $id
+     * @return Response
      */
-    public function edit(Event $event)
+    public function edit($id)
     {
-        //
+        return view('admin.schedule.event.edit',['activity' => \App\Event::find($id)]);
     }
 
     /**
@@ -109,18 +114,64 @@ class EventController extends Controller
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \App\Event  $event
-     * @return \Illuminate\Http\Response
+     * @return Response
      */
-    public function update(Request $request, Event $event)
+    public function update($id)
     {
-        //
+        $event = Event::find($id);
+
+        $event->name = request('name');
+        $event->date_begin = request('begin');
+        $event->date_end = request('end');
+        $event->location = request('location');
+        if($event->is_mandatory){
+            $event->is_mandatory = request('is_mandatory');
+        } else {
+            $event->is_mandatory  = 0;
+        }
+        $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 = 1;
+
+                    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','Modification à l\'événement sauvegarder à l\'horaire');
     }
 
     /**
      * Remove the specified resource from storage.
      *
      * @param  \App\Event  $event
-     * @return \Illuminate\Http\Response
+     * @return Response
      */
     public function destroy(Event $event)
     {

app/Http/Controllers/ScheduleController.php

@@ -218,4 +218,11 @@ class ScheduleController extends Controller
             'end_time' => $end_time
             ]);
     }
+
+    public function delete($id)
+    {
+        $event  = \App\Event::find($id);
+
+        $event->delete();
+    }
 }