diff --git a/app/Booking.php b/app/Booking.php
new file mode 100644
index 00000000..bf30ebc7
--- /dev/null
+++ b/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');
+    }
+}
diff --git a/app/Course.php b/app/Course.php
new file mode 100644
index 00000000..f4af73f0
--- /dev/null
+++ b/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');
+    }
+}
diff --git a/app/Event.php b/app/Event.php
new file mode 100644
index 00000000..1d534b48
--- /dev/null
+++ b/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');
+    }
+}
diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
new file mode 100644
index 00000000..078761c0
--- /dev/null
+++ b/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)
+    {
+        //
+    }
+}
diff --git a/app/Http/Controllers/CourseController.php b/app/Http/Controllers/CourseController.php
new file mode 100644
index 00000000..6e495f85
--- /dev/null
+++ b/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)
+    {
+        //
+    }
+}
diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php
new file mode 100644
index 00000000..d41d63be
--- /dev/null
+++ b/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)
+    {
+        //
+    }
+}
diff --git a/app/Http/Controllers/ScheduleController.php b/app/Http/Controllers/ScheduleController.php
index 5a9a3cf6..bb32771c 100644
--- a/app/Http/Controllers/ScheduleController.php
+++ b/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;
+    }
 }
diff --git a/app/Item.php b/app/Item.php
index 8f6d7da0..de83e594 100644
--- a/app/Item.php
+++ b/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');
+    }
 }
diff --git a/app/User.php b/app/User.php
index 69657d4c..6fe3f330 100644
--- a/app/User.php
+++ b/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;
diff --git a/database/migrations/2019_08_17_102431_create_events_table.php b/database/migrations/2019_08_17_102431_create_events_table.php
new file mode 100644
index 00000000..6149cb20
--- /dev/null
+++ b/database/migrations/2019_08_17_102431_create_events_table.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateEventsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('events', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('date_begin');
+            $table->string('date_end');
+            $table->string('type');
+            $table->string('user_id');
+            $table->string('location');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('events');
+    }
+}
diff --git a/database/migrations/2019_08_17_102836_create_courses_table.php b/database/migrations/2019_08_17_102836_create_courses_table.php
new file mode 100644
index 00000000..16314a66
--- /dev/null
+++ b/database/migrations/2019_08_17_102836_create_courses_table.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateCoursesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('courses', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('ocom');
+            $table->integer('periode');
+            $table->integer('level');
+            $table->string('location');
+            $table->text('comment');
+            $table->integer('event_id');
+            $table->integer('user_id');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('courses');
+    }
+}
diff --git a/database/migrations/2019_08_17_102916_create_bookings_table.php b/database/migrations/2019_08_17_102916_create_bookings_table.php
new file mode 100644
index 00000000..7763b376
--- /dev/null
+++ b/database/migrations/2019_08_17_102916_create_bookings_table.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateBookingsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('bookings', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('item_id');
+            $table->integer('amount');
+            $table->integer('bookable_id');
+            $table->string('bookable_type');
+            $table->integer('user_id');
+            $table->text('comment');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('bookings');
+    }
+}
diff --git a/public/js/calendar.js b/public/js/calendar.js
new file mode 100644
index 00000000..cb65f195
--- /dev/null
+++ b/public/js/calendar.js
@@ -0,0 +1,41 @@
+function initFullCalendar(authToken) {
+    document.addEventListener('DOMContentLoaded', function () {
+        var calendarEl = document.getElementById('fullCalendar');
+
+        var calendar = new FullCalendar.Calendar(calendarEl, {
+            plugins: ['dayGrid','interaction'],
+            locale: 'fr-ca',
+            header: {
+                left: 'title',
+                center: '',
+                right: 'prev,next'
+            },
+            events: '/api/schedule/events',
+            eventClick: function (info) {
+                console.log(info.event.id)
+                $.get("/api/schedule/full/events/" + info.event.id + "/modal?api_token="+authToken, function (data) {
+                    $("#modal-content").html(data);
+                });
+                $('#schedulemodal').modal('toggle')
+            },
+            dateClick: function (info) {
+                var date = moment(info.date).format("YYYY-MM-DD");
+                Swal.fire({
+                    title: 'Ajouter un evenement?',
+                    text: "Voulez vous ajouter un evenement le "+date,
+                    type: 'warning',
+                    showCancelButton: true,
+                    confirmButtonText: 'Oui',
+                    cancelButtonText: 'Non',
+                  }).then((result) => {
+                    if (result.value) {
+                        window.location.href = '/admin/schedule/add/'+date;
+                    }
+                  })
+            }
+        });
+
+        calendar.render();
+    });
+
+}
\ No newline at end of file
diff --git a/resources/views/admin/calendar/calendar_display.blade.php b/resources/views/admin/calendar/calendar_display.blade.php
index 77af26b2..912f32ba 100644
--- a/resources/views/admin/calendar/calendar_display.blade.php
+++ b/resources/views/admin/calendar/calendar_display.blade.php
@@ -4,14 +4,7 @@
     <div class="col-sm-12 col-lg-12">
         <div class="card">
             <div class="card-body pb-0">
-                <div class="dropdown float-right">
-                    <button class="btn bg-transparent dropdown-toggle theme-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown">
-                        <i class="fa fa-cog"></i>
-                    </button>
-                    <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                    </div>
-                </div>
-                <div class="calendar"></div>
+                <div id="fullCalendar"></div>
             </div>
         </div>
     </div>
@@ -61,8 +54,14 @@
 @endsection
 
 @section('custom_scripts')
-   <div class="log"></div>
+    <script src='/assets/fullcalendar/core/main.js'></script>
+    <script src='/assets/fullcalendar/daygrid/main.js'></script>
+    <script src='/assets/fullcalendar/interaction/main.js'></script>
+    <script src="/js/calendar.js"></script>
+    <div class="log"></div>
    <script>
+       initFullCalendar(api_token)
+
        function deleteEvent(pid){
             swal({
                 title: 'Êtes vous certain ?',
@@ -97,4 +96,10 @@
                 })
        }
     </script>
+    <div class="modal fade" id="schedulemodal" tabindex="-1" role="dialog" aria-labelledby="schedulemodal" aria-hidden="true">
+            <div class="modal-dialog" role="document">
+                <div class="modal-content" id="modal-content">
+                </div>
+            </div>
+        </div>
 @endsection
\ No newline at end of file
diff --git a/resources/views/admin/schedule/modal/show.blade.php b/resources/views/admin/schedule/modal/show.blade.php
new file mode 100644
index 00000000..c07d4808
--- /dev/null
+++ b/resources/views/admin/schedule/modal/show.blade.php
@@ -0,0 +1,5 @@
+@extends('layouts.modal.schedule.show')
+
+@section('content')
+Test
+@endsection
\ No newline at end of file
diff --git a/resources/views/layouts/admin/head.blade.php b/resources/views/layouts/admin/head.blade.php
index ce0451c7..eb925755 100644
--- a/resources/views/layouts/admin/head.blade.php
+++ b/resources/views/layouts/admin/head.blade.php
@@ -20,5 +20,9 @@
 <!-- Material Dashboard CSS -->
 <link href="/css/material-dashboard.css" rel="stylesheet">
 
+<!-- Plugin CSS -->
+<link href='/assets/fullcalendar/core/main.css' rel='stylesheet' />
+<link href='/assets/fullcalendar/daygrid/main.css' rel='stylesheet' />
+
 <!-- Custom CSS -->
-<link rel="stylesheet" href="/css/custom.css">
+<link rel="stylesheet" href="/css/custom.css">
\ No newline at end of file
diff --git a/resources/views/layouts/admin/scripts.blade.php b/resources/views/layouts/admin/scripts.blade.php
index d6efd62d..313a20c7 100644
--- a/resources/views/layouts/admin/scripts.blade.php
+++ b/resources/views/layouts/admin/scripts.blade.php
@@ -13,8 +13,6 @@
 <script src="/js/plugins/bootstrap-datetimepicker.min.js"></script>
 <!--  DataTables.net Plugin, full documentation here: https://datatables.net/    -->
 <script src="/js/plugins/jquery.dataTables.min.js"></script>
-<!--  Full Calendar Plugin, full documentation here: https://github.com/fullcalendar/fullcalendar    -->
-<script src="/js/plugins/fullcalendar.min.js"></script>
 <!--  Plugin for the Sliders, full documentation here: http://refreshless.com/nouislider/ -->
 <script src="/js/plugins/nouislider.min.js" ></script>
 <!-- Include a polyfill for ES6 Promises (optional) for IE11, UC Browser and Android browser support SweetAlert -->
diff --git a/resources/views/layouts/modal/schedule/show.blade.php b/resources/views/layouts/modal/schedule/show.blade.php
new file mode 100644
index 00000000..5ab1d000
--- /dev/null
+++ b/resources/views/layouts/modal/schedule/show.blade.php
@@ -0,0 +1,14 @@
+<div class="modal-header">
+    <h5 class="modal-title" id="exampleModalLabel">{{$event->data['event_name']}}</h5>
+    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+    <span aria-hidden="true">&times;</span>
+    </button>
+</div>
+<div class="modal-body">
+    
+    @yield('content')
+
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+</div>
diff --git a/routes/api.php b/routes/api.php
index ea942809..dc7ab4a4 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -26,6 +26,8 @@ Route::middleware('auth:api')->group(function () {
     Route::post('/calendar/loadDay', 'CalendarController@show');
     Route::post('/calendar/delete', 'CalendarController@delete');
 
+    Route::get('/schedule/full/events/{id}/modal','ScheduleController@loadModalFull');
+
     /** Message Route */
     Route::post('/message/delete', 'MessageController@destroy');
 
diff --git a/routes/web.php b/routes/web.php
index 1eb5c16d..2820d325 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -36,7 +36,7 @@ Route::middleware(['auth','admin'])->group(function () {
 
         /** Calendar */
         Route::get('/admin/calendar', 'CalendarController@index');
-        Route::get('/admin/calendar/add/{type}/{date}', ['uses' =>'CalendarController@add']);
+        Route::get('/admin/calendar/add/{date}', ['uses' =>'CalendarController@add']);
         Route::get('/admin/calendar/edit/{id}', ['uses' =>'CalendarController@edit']);
         Route::post('/admin/calendar/add', 'CalendarController@store');
         Route::patch('/admin/calendar/edit/{id}', ['uses' =>'CalendarController@patch']);