New Model for Event,Booking and Course

app/Booking.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Booking extends Model
+{
+    public function bookable()
+    {
+        return $this->morphTo();
+    }
+
+    public function user()
+    {
+    return $this->belongsTo('App\User');
+    }
+}

app/Course.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Course extends Model
+{
+    public function bookings()
+    {
+        return $this->morphMany('App\Booking', 'bookable');
+    }
+
+    public function user()
+    {
+    return $this->belongsTo('App\User');
+    }
+
+    public function event()
+    {
+    return $this->belongsTo('App\Event');
+    }
+}

app/Event.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Event extends Model
+{
+    public function bookings()
+    {
+        return $this->morphMany('App\Booking', 'bookable');
+    }
+
+    public function courses()
+    {
+        return $this->hasMany('App\Course');
+    }
+
+    public function user()
+    {
+    return $this->belongsTo('App\User');
+    }
+}

app/Http/Controllers/BookingController.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Booking;
+use Illuminate\Http\Request;
+
+class BookingController 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()
+    {
+        //
+    }
+
+    /**
+     * 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  \App\Booking  $booking
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Booking $booking)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\Booking  $booking
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(Booking $booking)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Booking  $booking
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, Booking $booking)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Booking  $booking
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Booking $booking)
+    {
+        //
+    }
+}

app/Http/Controllers/CourseController.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Course;
+use Illuminate\Http\Request;
+
+class CourseController 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()
+    {
+        //
+    }
+
+    /**
+     * 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  \App\Course  $course
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Course $course)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\Course  $course
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(Course $course)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Course  $course
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, Course $course)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Course  $course
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Course $course)
+    {
+        //
+    }
+}

app/Http/Controllers/EventController.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Event;
+use Illuminate\Http\Request;
+
+class EventController 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()
+    {
+        //
+    }
+
+    /**
+     * 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  \App\Event  $event
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Event $event)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\Event  $event
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(Event $event)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Event  $event
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, Event $event)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Event  $event
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Event $event)
+    {
+        //
+    }
+}

app/Http/Controllers/ScheduleController.php

@@ -57,56 +57,34 @@ class ScheduleController extends Controller
 
     public function apiIndex()
     {
-        $schedules = Schedule::all();
-        $activity = \App\ComplementaryActivity::all();
+        $start = substr(request()->start,0,10);
+        $end = substr(request()->end,0,10);
+        $allschedules = Schedule::all();
 
+        $allevents = \App\Event::all();
         $events = [];
+        $jsonevents = [];
+        $schedules = [];
+
+        foreach ($allschedules as $schedule) {
+            if($schedule->date >= $start && $schedule->date <= $end) {
+                array_push($schedules,$schedule);
+            }
+        }
+
+        foreach ($allevents as $event) {
+            if($event->date_begin >= $start && $event->date_begin <= $end) {
+                array_push($events,$event);
+            }
+            if($event->date_end >= $start && $event->date_end <= $end) {
+                array_push($events,$event);
+            }
+        }
+        
 
         foreach ($schedules as $schedule) {
-            $color = 'blue';
-            switch ($schedule->type) {
-                case 'regular':
-                    $color = 'orange';
-                    break;
-                
-                case 'pilotage':
-                   $color = '#58D3F7';
-                   break;
-                
-                case 'drill':
-                    $color = 'blue';
-                    break;
-                
-                case 'music':
-                    $color = 'green';
-                    break;
-                
-                case 'biathlon':
-                    $color = 'red';
-                    break;
-                
-                case 'marksmanship':
-                    $color = 'grey';
-                    break;
-                
-                case 'founding':
-                    $color = '#00FF40';
-                    break;
-                
-                case 'volunteer':
-                    $color = '#DF0174';
-                    break;
-                    
-                case 'other':
-                    $color = '#DF0174';
-                    break;
-                
-                default:
-                    if ($activity->find($schedule->type)) {
-                        $color = $activity->find($schedule->type)->calendar_color;
-                    }
-                    break;
-            };
+            
+            $color = $this->getColor($schedule->type);
             
             $event = [
                 'title' => $schedule->data['event_name'],
@@ -115,14 +93,83 @@ class ScheduleController extends Controller
                 'color' => $color,
                 'id' => $schedule->id
             ];
-            array_push($events,$event);
+            array_push($jsonevents,$event);
         }
 
-        return json_encode($events);
+        foreach ($events as $event) {
+            
+            $color = $this->getColor($event->type);
+            
+            $myevent = [
+                'title' => $event->name,
+                'start' => $event->date_begin,
+                'end' => $event->date_end,
+                'color' => $color,
+                'id' => $event->id
+            ];
+            array_push($jsonevents,$myevent);
+        }
+
+        return json_encode($jsonevents);
     }
 
     public function loadModal($id)
     {
         return view('public.modal.schedule',['event' => \App\Schedule::find($id)]);
     }
+
+    public function loadModalFull($id)
+    {
+        return view('admin.schedule.modal.show',['event' => \App\Schedule::find($id)]);
+    }
+
+    public function getColor($type)
+    {
+        $activity = \App\ComplementaryActivity::all();
+        $color = 'blue';
+        switch ($type) {
+            case 'regular':
+                $color = 'orange';
+                break;
+            
+            case 'pilotage':
+               $color = '#58D3F7';
+               break;
+            
+            case 'drill':
+                $color = 'blue';
+                break;
+            
+            case 'music':
+                $color = 'green';
+                break;
+            
+            case 'biathlon':
+                $color = 'red';
+                break;
+            
+            case 'marksmanship':
+                $color = 'grey';
+                break;
+            
+            case 'founding':
+                $color = '#00FF40';
+                break;
+            
+            case 'volunteer':
+                $color = '#DF0174';
+                break;
+                
+            case 'other':
+                $color = '#DF0174';
+                break;
+            
+            default:
+                if ($activity->find($type)) {
+                    $color = $activity->find($type)->calendar_color;
+                }
+                break;
+        };
+        return $color;
+    }
 }

app/Item.php

@@ -17,4 +17,9 @@ class Item extends Model
         $col_items->forget(0);
         return $col_items;
     }
+
+    public function bookings()
+    {
+        return $this->hasMany('App\Booking');
+    }
 }

app/User.php

@@ -50,6 +50,21 @@ class User extends Authenticatable
         return $this->hasMany(Message::class);
     }
 
+    public function events()
+    {
+        return $this->hasMany('App\Event');
+    }
+
+    public function bookings()
+    {
+        return $this->hasMany('App\Booking');
+    }
+
+    public function courses()
+    {
+        return $this->hasMany('App\Course');
+    }
+
     public function routeNotificationForNexmo($notification)
     {
         return $this->telephone;