Merge branch 'dev' into 'master'

Dev

See merge request TheGamecraft/c-cms!108

.env.example

@@ -33,8 +33,8 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
-NEXMO_KEY=4587feffd # Votre Clé Nexmo API
-NEXMO_SECRET=54dasf4e8fa4s4fd4f5s # Votre Mot de passe Nexmo API
+NEXMO_KEY= # Votre Clé Nexmo API
+NEXMO_SECRET= # Votre Mot de passe Nexmo API
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=

.gitlab-ci.yml

@@ -4,15 +4,25 @@ services:
   - mysql:5.7
 
 variables:
-  MYSQL_DATABASE: homestead
-  MYSQL_ROOT_PASSWORD: secret
+  MYSQL_DATABASE: ddb
+  MYSQL_ROOT_PASSWORD: password
   DB_HOST: mysql
   DB_USERNAME: root
 
 stages:
   - build
+  - test
   - deploy
-  - deploy
+
+unit_test:
+  stage: test
+  script:
+    - cp .env.example .env
+    - composer install
+    - php artisan key:generate
+    - php artisan migrate
+    - php artisan db:seed
+    - vendor/bin/phpunit
 
 build:
   stage: build

.phpunit.result.cache

@@ -0,0 +1 @@
+C:37:"PHPUnit\Runner\DefaultTestResultCache":273:{a:2:{s:7:"defects";a:2:{s:32:"Tests\Feature\AdminTest::testUrl";i:3;s:30:"Tests\Feature\ECCTest::testUrl";i:3;}s:5:"times";a:3:{s:32:"Tests\Feature\AdminTest::testUrl";d:0.099;s:30:"Tests\Feature\ECCTest::testUrl";d:0.014;s:33:"Tests\Feature\PublicTest::testUrl";d:0.031;}}}

Dockerfile

@@ -1,11 +1,11 @@
 # Set the base image for subsequent instructions
-FROM php:7.2
+FROM php:7.4
 
 # Update packages
 RUN apt-get update
 
 # Install PHP and composer dependencies
-RUN apt-get install -qq git curl libmcrypt-dev libjpeg-dev libpng-dev libfreetype6-dev libbz2-dev autoconf libc-dev pkg-config
+RUN apt-get install -qq git curl libmcrypt-dev libjpeg-dev libpng-dev libfreetype6-dev libbz2-dev autoconf libc-dev pkg-config libzip-dev
 
 # Clear out the local repository of retrieved package files
 RUN apt-get clean
@@ -14,7 +14,7 @@ RUN apt-get clean
 # Here you can install any other extension that you need during the test and deployment process
 RUN docker-php-ext-install pdo_mysql zip
 
-RUN pecl install mcrypt-1.0.1
+RUN pecl install mcrypt
 
 # Install Composer
 RUN curl --silent --show-error https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer

Envoy.blade.php

@@ -41,6 +41,7 @@
     clone_repository_dev
     run_composer_dev
     update_symlinks_dev
+    remove_old_release_dev
 @endstory
 
 @story('deploy_227')
@@ -66,7 +67,9 @@
 @task('run_composer_697')
     echo "Starting deployment ({{ $release }})"
     cd {{ $new_release_dir_697 }}
-    composer install --prefer-dist --no-scripts -q -o
+    composer install --prefer-dist --no-scripts -q -o --no-dev
+    npm install
+    npm run production
 @endtask
 
 @task('update_symlinks_697')
@@ -85,8 +88,8 @@
 
     echo 'Migrate DB'
     cd {{ $app_dir_697 }}/current/
-    php artisan migrate
-    php artisan db:seed --class=ConfigsTableSeeder
+    yes|php artisan migrate
+    yes|php artisan db:seed --class=ConfigsTableSeeder
 
 @endtask
 
@@ -101,7 +104,9 @@
 @task('run_composer_736')
     echo "Starting deployment ({{ $release }})"
     cd {{ $new_release_dir_736 }}
-    composer install --prefer-dist --no-scripts -q -o
+    composer install --prefer-dist --no-scripts -q -o --no-dev
+    npm install
+    npm run production
 @endtask
 
 @task('update_symlinks_736')
@@ -120,8 +125,8 @@
 
     echo 'Migrate DB'
     cd {{ $app_dir_736 }}/current/
-    php artisan migrate
-    php artisan db:seed --class=ConfigsTableSeeder
+    yes|php artisan migrate
+    yes|php artisan db:seed --class=ConfigsTableSeeder
 
 @endtask
 
@@ -136,7 +141,9 @@
 @task('run_composer_dev')
     echo "Starting deployment ({{ $release }})"
     cd {{ $new_release_dir_dev }}
-    composer install --prefer-dist --no-scripts -q -o
+    composer install --prefer-dist --no-scripts -q -o --no-dev
+    npm install
+    npm run production
 @endtask
 
 @task('update_symlinks_dev')
@@ -155,11 +162,16 @@
 
     echo 'Migrate DB'
     cd {{ $app_dir_dev }}/current/
-    php artisan migrate
-    php artisan db:seed --class=ConfigsTableSeeder
+    yes|php artisan migrate
+    yes|php artisan db:seed --class=ConfigsTableSeeder
 
 @endtask
 
+@task('remove_old_release_dev')
+    cd {{ $releases_dir_dev }}
+    rm -fr $(ls -t1 | tail -n +3)
+@endtask
+
 @task('clone_repository_227')
 echo 'Cloning repository'
 [ -d {{ $releases_dir_227 }} ] || mkdir {{ $releases_dir_227 }}
@@ -171,7 +183,9 @@ git reset --hard {{ $commit }}
 @task('run_composer_227')
 echo "Starting deployment ({{ $release }})"
 cd {{ $new_release_dir_227 }}
-composer install --prefer-dist --no-scripts -q -o
+composer install --prefer-dist --no-scripts -q -o --no-dev
+npm install
+npm run production
 @endtask
 
 @task('update_symlinks_227')
@@ -190,8 +204,8 @@ chmod -R 777 {{ $app_dir_227 }}/current/bootstrap/
 
 echo 'Migrate DB'
 cd {{ $app_dir_227 }}/current/
-php artisan migrate
-php artisan db:seed --class=ConfigsTableSeeder
+    yes|php artisan migrate
+    yes|php artisan db:seed --class=ConfigsTableSeeder
 
 @endtask
 
@@ -206,7 +220,9 @@ git reset --hard {{ $commit }}
 @task('run_composer_117')
 echo "Starting deployment ({{ $release }})"
 cd {{ $new_release_dir_117 }}
-composer install --prefer-dist --no-scripts -q -o
+composer install --prefer-dist --no-scripts -q -o --no-dev
+npm install
+npm run production
 @endtask
 
 @task('update_symlinks_117')
@@ -225,7 +241,7 @@ chmod -R 777 {{ $app_dir_117 }}/current/bootstrap/
 
 echo 'Migrate DB'
 cd {{ $app_dir_117 }}/current/
-php artisan migrate
-php artisan db:seed --class=ConfigsTableSeeder
+    yes|php artisan migrate
+    yes|php artisan db:seed --class=ConfigsTableSeeder
 
 @endtask

app/Booking.php

@@ -4,6 +4,37 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Booking
+ *
+ * @property int $id
+ * @property int $item_id
+ * @property int $amount
+ * @property int $bookable_id
+ * @property string $bookable_type
+ * @property int $user_id
+ * @property string $comment
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $bookable
+ * @property-read \App\Item $item
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Log[] $logs
+ * @property-read int|null $logs_count
+ * @property-read \App\User $user
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Booking newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Booking newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Booking query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Booking whereAmount($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Booking whereBookableId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Booking whereBookableType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Booking whereComment($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Booking whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Booking whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Booking whereItemId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Booking whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Booking whereUserId($value)
+ * @mixin \Eloquent
+ */
 class Booking extends Model
 {
     public function bookable()

app/ComplementaryActivity.php

@@ -4,6 +4,46 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\ComplementaryActivity
+ *
+ * @property int $id
+ * @property string $name
+ * @property string $public_body
+ * @property string $public_slogan
+ * @property string $public_header_picture
+ * @property string $admin_desc
+ * @property string $calendar_color
+ * @property string $calendar_icon
+ * @property string $begin_time
+ * @property string $end_time
+ * @property string $location
+ * @property int $is_mandatory
+ * @property int $is_promoted
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Picture[] $pictures
+ * @property-read int|null $pictures_count
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ComplementaryActivity newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ComplementaryActivity newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ComplementaryActivity query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ComplementaryActivity whereAdminDesc($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ComplementaryActivity whereBeginTime($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ComplementaryActivity whereCalendarColor($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ComplementaryActivity whereCalendarIcon($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ComplementaryActivity whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ComplementaryActivity whereEndTime($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ComplementaryActivity whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ComplementaryActivity whereIsMandatory($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ComplementaryActivity whereIsPromoted($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ComplementaryActivity whereLocation($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ComplementaryActivity whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ComplementaryActivity wherePublicBody($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ComplementaryActivity wherePublicHeaderPicture($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ComplementaryActivity wherePublicSlogan($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ComplementaryActivity whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class ComplementaryActivity extends Model
 {
     public function pictures()

app/Config.php

@@ -4,6 +4,28 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Config
+ *
+ * @property int $id
+ * @property string $name
+ * @property int $state
+ * @property array $data
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Log[] $logs
+ * @property-read int|null $logs_count
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Config newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Config newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Config query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Config whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Config whereData($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Config whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Config whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Config whereState($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Config whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class Config extends Model
 {
     protected $casts = [
@@ -24,4 +46,9 @@ class Config extends Model
     {
         return $this->morphMany('App\Log', 'logable');
     }
+
+    public static function find($name)
+    {
+        return Config::where('name',$name)->first();
+    }
 }

app/Course.php

@@ -4,6 +4,47 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Course
+ *
+ * @property int $id
+ * @property string $name
+ * @property string $ocom
+ * @property int $periode
+ * @property int $level
+ * @property string $location
+ * @property string $desc
+ * @property string $comment
+ * @property string $comment_officer
+ * @property int $event_id
+ * @property string $user_id
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Booking[] $bookings
+ * @property-read int|null $bookings_count
+ * @property-read \App\Event $event
+ * @property-read \App\LessonPlan|null $lessonPlan
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Log[] $logs
+ * @property-read int|null $logs_count
+ * @property-read \App\User $user
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Course newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Course newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Course query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Course whereComment($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Course whereCommentOfficer($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Course whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Course whereDesc($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Course whereEventId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Course whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Course whereLevel($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Course whereLocation($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Course whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Course whereOcom($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Course wherePeriode($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Course whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Course whereUserId($value)
+ * @mixin \Eloquent
+ */
 class Course extends Model
 {
     public function bookings()
@@ -16,6 +57,30 @@ class Course extends Model
         return $this->belongsTo('App\User');
     }
 
+    public function instructor()
+    {
+        if (\App\User::find($this->user_id)) {
+            return \App\User::find($this->user_id)->fullname();
+        } else {
+            if (is_numeric($this->user_id)) {
+                return 'Utilisateur inconnu';
+            } else {
+                return $this->user_id;
+            }
+        }
+    }
+
+    public function ocom()
+    {
+        if ($this->ocom != null) {
+            $ocom = \App\OCOM::findByOCOM($this->ocom);
+            if ($ocom != null) {
+                return $ocom;
+            }
+        }
+        return null;
+    }
+
     public function event()
     {
         return $this->belongsTo('App\Event');
@@ -25,4 +90,75 @@ class Course extends Model
     {
         return $this->morphMany('App\Log', 'logable');
     }
+
+    public function use_course()
+    {
+        return $this->name == "" && $this->ocom == "";
+    }
+
+    public function lessonPlan()
+    {
+        return $this->hasOne('App\LessonPlan');
+    }
+
+    public static function allFuture()
+    {
+        $courses = Course::all();
+        foreach ($courses as $key => $course) {
+            if (date('c', strtotime($course->event->date_begin)) <= date('c')) {
+                $courses->forget($key);
+            }
+        }
+        return $courses;
+    }
+
+    public static function allThisYear()
+    {
+        $courses = Course::all();
+        foreach ($courses as $key => $course) {
+            if (date('c', strtotime($course->event->date_begin)) <= date('c', strtotime(\App\Config::getData('instruction_year_begin')))) {
+                $courses->forget($key);
+            }
+            if (date('c', strtotime($course->event->date_begin)) >= date('c', strtotime(\App\Config::getData('instruction_year_end')))) {
+                $courses->forget($key);
+            }
+        }
+        return $courses;
+    }
+
+    public static function allForUser($user_id)
+    {
+        $courses = Course::all();
+        foreach ($courses as $key => $course) {
+            if ($course->user_id != $user_id) {
+                $courses->forget($key);
+            }
+        }
+        return $courses;
+    }
+
+    public static function allForAuthUser()
+    {
+        return self::allForUser(\Auth::user()->id);
+    }
+
+    public static function allFutureForUser($user_id)
+    {
+        $courses = Course::all();
+        foreach ($courses as $key => $course) {
+            if (date('c', strtotime($course->event->date_begin)) <= date('c')) {
+                $courses->forget($key);
+            }
+            if ($course->user_id != $user_id) {
+                $courses->forget($key);
+            }
+        }
+        return $courses;
+    }
+
+    public static function allFutureForAuthUser()
+    {
+        return self::allFutureForUser(\Auth::user()->id);
+    }
+
 }

app/Event.php

@@ -4,8 +4,65 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Event
+ *
+ * @property int $id
+ * @property string $name
+ * @property string $date_begin
+ * @property string $date_end
+ * @property string $type
+ * @property string $user_id
+ * @property string $location
+ * @property int $is_mandatory
+ * @property int $use_weekly_msg
+ * @property int $use_schedule
+ * @property string $desc
+ * @property array $msg
+ * @property array $weekly_msg_file
+ * @property array $schedule
+ * @property string $calendar_color
+ * @property string $calendar_icon
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Booking[] $bookings
+ * @property-read int|null $bookings_count
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Course[] $courses
+ * @property-read int|null $courses_count
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Log[] $logs
+ * @property-read int|null $logs_count
+ * @property-read \App\User $user
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event whereCalendarColor($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event whereCalendarIcon($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event whereDateBegin($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event whereDateEnd($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event whereDesc($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event whereIsMandatory($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event whereLocation($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event whereMsg($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event whereSchedule($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event whereType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event whereUseSchedule($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event whereUseWeeklyMsg($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event whereUserId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Event whereWeeklyMsgFile($value)
+ * @mixin \Eloquent
+ */
 class Event extends Model
 {
+    protected $casts = [
+        'schedule' => 'array',
+        'msg' => 'array',
+        'weekly_msg_file' => 'array'
+    ];
+
     public function bookings()
     {
         return $this->morphMany('App\Booking', 'bookable');
@@ -16,6 +73,11 @@ class Event extends Model
         return $this->hasMany('App\Course');
     }
 
+    public function type()
+    {
+        return \App\EventType::find($this->type);
+    }
+
     public function user()
     {
         return $this->belongsTo('App\User');
@@ -54,4 +116,31 @@ class Event extends Model
         }
         return $events;
     }
+
+    public static function allThisYear()
+    {
+        $events = Event::all();
+        foreach ($events as $key => $event)
+        {
+            if (date('c',strtotime($event->date_begin)) <= date('c',strtotime(\App\Config::getData('instruction_year_begin'))))
+            {
+                $events->forget($key);
+            }
+            if (date('c',strtotime($event->date_begin)) >= date('c',strtotime(\App\Config::getData('instruction_year_end'))))
+            {
+                $events->forget($key);
+            }
+        }
+        return $events;
+    }
+
+    public function nbPeriode()
+    {
+        return (count($this->schedule["periodes"]));
+    }
+
+    public function nbNiveau()
+    {
+        return count($this->schedule["niveaux"]);
+    }
 }

app/EventType.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * App\EventType
+ *
+ * @property int $id
+ * @property string $name
+ * @property string $admin_desc
+ * @property string $calendar_color
+ * @property string $calendar_icon
+ * @property string $begin_time
+ * @property string $end_time
+ * @property string $location
+ * @property int $is_mandatory
+ * @property int $use_weekly_msg
+ * @property string $weekly_msg_publication_time
+ * @property int $use_schedule
+ * @property array $schedule_model
+ * @property int $is_promoted
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\EventType newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\EventType newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\EventType query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\EventType whereAdminDesc($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\EventType whereBeginTime($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\EventType whereCalendarColor($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\EventType whereCalendarIcon($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\EventType whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\EventType whereEndTime($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\EventType whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\EventType whereIsMandatory($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\EventType whereIsPromoted($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\EventType whereLocation($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\EventType whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\EventType whereScheduleModel($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\EventType whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\EventType whereUseSchedule($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\EventType whereUseWeeklyMsg($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\EventType whereWeeklyMsgPublicationTime($value)
+ * @mixin \Eloquent
+ */
+class EventType extends Model
+{
+    protected $casts = [
+        'schedule_model' => 'array',
+    ];
+
+    public function getScheduleModelData($level,$periode)
+    {
+        if (isset($this->schedule_model['default_value']))
+        {
+            dd($this->schedule_model ['default_value']);
+            return $this->schedule_model['default_value'][$periode-1][$level-1];
+        }
+        else
+        {
+            return [
+                'ocom' => 'M103.03',
+                'name' => 'Super cours',
+                'location' => 'Bic',
+                'instructor' => 'Math',
+                'desc' => ''
+            ];
+        }
+    }
+
+    public function nbLevel()
+    {
+        return count($this->schedule_model['niveaux']);
+    }
+
+    public function nbPeriode()
+    {
+        return count($this->schedule_model['periodes']);
+    }
+}

app/Exceptions/Handler.php

@@ -2,7 +2,7 @@
 
 namespace App\Exceptions;
 
-use Exception;
+use Throwable;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler
@@ -32,7 +32,7 @@ class Handler extends ExceptionHandler
      * @param  \Exception  $exception
      * @return void
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         parent::report($exception);
     }
@@ -44,7 +44,7 @@ class Handler extends ExceptionHandler
      * @param  \Exception  $exception
      * @return \Illuminate\Http\Response
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         return parent::render($request, $exception);
     }

app/GoogleDriveFile.php

@@ -0,0 +1,444 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Storage;
+use League\Flysystem\FileNotFoundException;
+use mysql_xdevapi\Exception;
+
+/**
+ * App\GoogleDriveFile
+ *
+ * @property string $id
+ * @property string $type
+ * @property string $name
+ * @property string $path
+ * @property array $rank_permission
+ * @property array $job_permission
+ * @property array $user_permission
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\GoogleDriveFile newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\GoogleDriveFile newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\GoogleDriveFile query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\GoogleDriveFile whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\GoogleDriveFile whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\GoogleDriveFile whereJobPermission($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\GoogleDriveFile whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\GoogleDriveFile wherePath($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\GoogleDriveFile whereRankPermission($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\GoogleDriveFile whereType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\GoogleDriveFile whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\GoogleDriveFile whereUserPermission($value)
+ * @mixin \Eloquent
+ */
+class GoogleDriveFile extends Model
+{
+    protected $primaryKey = 'id'; // or null
+
+    public $incrementing = false;
+
+    // In Laravel 6.0+ make sure to also set $keyType
+    protected $keyType = 'string';
+
+    protected $casts = [
+        'rank_permission' => 'array',
+        'job_permission' => 'array',
+        'user_permission' => 'array',
+    ];
+
+    public static function icon($extension)
+    {
+        $icon = "fas fa-file";
+        switch ($extension)
+        {
+            case 'pdf':
+                $icon = 'fas fa-file-pdf text-pdf';
+                break;
+            case 'php':
+                $icon = 'fas fa-file-code text-code';
+                break;
+            case 'pptx':
+                $icon = 'fas fa-file-powerpoint text-powerpoint';
+                break;
+            case 'docx':
+            case 'odt':
+                $icon = 'fas fa-file-word text-word';
+                break;
+            case 'ods':
+            case 'xlsx':
+                $icon = 'fas fa-file-excel text-excel';
+                break;
+            case 'png':
+            case 'PNG':
+            case 'jpg':
+            case 'jpeg':
+                $icon = 'fas fa-file-image text-image';
+                break;
+        }
+        return $icon;
+    }
+
+    public static function checkConfig()
+    {
+        $configNull = (\Crypt::decryptString(\App\Config::getData('GOOGLE_DRIVE_CLIENT_ID')) != "" && \Crypt::decryptString(\App\Config::getData('GOOGLE_DRIVE_CLIENT_SECRET')) != "" && \Crypt::decryptString(\App\Config::getData('GOOGLE_DRIVE_REFRESH_TOKEN')) != "" && \Crypt::decryptString(\App\Config::getData('GOOGLE_DRIVE_FOLDER_ID')) != "");
+        $configOk = true;
+
+        if ($configNull)
+        {
+            try {
+                \Storage::cloud()->listContents("/", false);
+            }
+            catch (\Exception $e)
+            {
+                $configOk = false;
+            }
+        }
+
+        return $configNull && $configOk;
+    }
+
+    public static function findByName($name)
+    {
+        return GoogleDriveFile::where('name','=',$name)->get()->first();
+    }
+
+    public static function findByPath($path)
+    {
+        return GoogleDriveFile::where('path','=',$path)->get()->first();
+    }
+
+    public static function findByPathInDrive($path,$current_directory = '/')
+    {
+        if ($path != "")
+        {
+            $exploded_path = explode('/',$path);
+            if ($exploded_path[0] == "")
+            {
+                array_splice($exploded_path,0,1);
+            }
+            $contents = collect(Storage::cloud()->listContents($current_directory, false));
+
+            $dir = $contents->where('type', '=', 'dir')
+                ->where('name', '=', $exploded_path[0])
+                ->first();
+
+            if ( ! $dir)
+            {
+                return false;
+            }
+            else
+            {
+                array_splice($exploded_path,0,1);
+                $newPath = implode('/',$exploded_path);
+                if ($newPath == "")
+                {
+                    return $dir['basename'];
+                }
+                else
+                {
+                    return GoogleDriveFile::findByPathInDrive($newPath,$dir['basename']);
+                }
+            }
+        }
+        return true;
+    }
+
+    public static function createByPathInDrive($path,$current_directory = '/')
+    {
+        if ($path != "")
+        {
+            $exploded_path = explode('/',$path);
+            $size = count($exploded_path);
+            if ($size > 1)
+            {
+                $parent = self::findByName($exploded_path[$size-2]);
+                \Storage::cloud()->createDir($parent->id.'/'.$exploded_path[$size-1]);
+            }
+            else
+            {
+                \Storage::cloud()->createDir('/'.$exploded_path[$size-1]);
+            }
+            return self::findByPathInDrive($path);
+        }
+        return false;
+    }
+
+    public function setPermission($subject, $value)
+    {
+        $explodedSubject = explode('.',$subject);
+        $subject = $explodedSubject[0];
+        $id = $explodedSubject[1];
+
+        $permission = null;
+        if ($subject == 'rank')
+        {
+            $permission = $this->rank_permission;
+        }
+        elseif ($subject == 'job')
+        {
+            $permission = $this->job_permission;
+        }
+        elseif ($subject == 'user')
+        {
+            $permission = $this->user_permission;
+        }
+
+         [$id] = $value;
+
+        if ($subject == 'rank')
+        {
+            $this->rank_permission = $permission;
+        }
+        elseif ($subject == 'job')
+        {
+            $this->job_permission = $permission;
+        }
+        elseif ($subject == 'user')
+        {
+            $this->user_permission = $permission;
+        }
+        $this->save();
+    }
+
+    public function getAllPermission($subject)
+    {
+        $permission = null;
+        if ($subject == 'rank')
+        {
+            $permission = $this->rank_permission;
+        }
+        elseif ($subject == 'job')
+        {
+            $permission = $this->job_permission;
+        }
+        elseif ($subject == 'user')
+        {
+            $permission = $this->user_permission;
+        }
+
+        return $permission;
+    }
+
+    public function getPermission($subject)
+    {
+        $explodedSubject = explode('.',$subject);
+        $subject = $explodedSubject[0];
+        $id = $explodedSubject[1];
+
+        if (isset($this->getAllPermission($subject)[$id]))
+        {
+            return $this->getAllPermission($subject)[$id];
+        }
+        else
+        {
+            return '';
+        }
+    }
+
+    public function canUser($user, $permission = 'r')
+    {
+        if (strpos($this->getPermission('rank.0'),$permission) !== false)
+        {
+            return true;
+        }
+        if (strpos($this->getPermission('user.'.$user->id),$permission) === false)
+        {
+            if (strpos($this->getPermission('job.'.$user->job->id),$permission) === false)
+            {
+                if (strpos($this->getPermission('rank.'.$user->rank->id),$permission) === false)
+                {
+                    return false;
+                }
+
+            }
+        }
+        return true;
+    }
+
+    public function canAuthUser($perm = 'r')
+    {
+        return $this->canUser(\Auth::user(),$perm);
+    }
+
+    public static function getPermForUser($folder,$user,$perm = 'r')
+    {
+        if ($folder == '' || $folder == "root")
+        {
+            if ($user->p('file_manage') == 1)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        $dir = \App\GoogleDriveFile::find($folder);
+        if ($dir == null)
+        {
+            $path = GoogleDriveFile::getPathFolder($folder);
+            $exploderPath = explode('/',$path);
+            for ($i = count($exploderPath)-1; $i >= 0; $i--)
+            {
+                $dir = \App\GoogleDriveFile::find($exploderPath[$i]);
+                if ($dir != null)
+                {
+                    $metaData = \Storage::cloud()->getMetadata($folder);
+                    $googleDriveFile = new GoogleDriveFile();
+                    $googleDriveFile->id = $folder;
+                    $googleDriveFile->type = 'directory';
+                    $googleDriveFile->name = $metaData['name'];
+                    $googleDriveFile->path = self::recreatePath($folder);
+                    $googleDriveFile->rank_permission = $dir->rank_permission;
+                    $googleDriveFile->job_permission = $dir->job_permission;
+                    $googleDriveFile->user_permission = $dir->user_permission;
+                    $googleDriveFile->save();
+                    return $dir->canUser($user,$perm);
+                }
+            }
+            return false;
+        }
+        else
+        {
+            return $dir->canUser($user,$perm);
+        }
+    }
+
+    public static function getPermForAuthUser($folder,$perm = 'r')
+    {
+        return self::getPermForUser($folder,\Auth::user(),$perm);
+    }
+
+    public static function getPathFolder($folder)
+    {
+        $allDir = \Storage::cloud()->allDirectories();
+        foreach ($allDir as $dir)
+        {
+            $exploderDir = explode('/',$dir);
+            if ($exploderDir[count($exploderDir)-1] == $folder)
+            {
+                return $dir;
+            }
+        }
+    }
+
+    public static function recreatePath($folder)
+    {
+        $path = [];
+        $name = [];
+        $directories = collect(json_decode(self::getPathArray(),true));
+        foreach ($directories as $dir)
+        {
+            $path[$dir['basename']] = $dir['dirname'];
+            $name[$dir['basename']] = $dir['name'];
+        }
+        $realPath = $name[$folder];
+        $foo = $folder;
+        while ($foo != "")
+        {
+            $bar = explode('/',$path[$foo]);
+            $foo = $bar[count($bar)-1];
+            if ($foo != "")
+            {
+                $realPath = $name[$foo].'/'.$realPath;
+            }
+        }
+        return $realPath;
+    }
+
+    public static function getPathArray()
+    {
+        $contents = collect(Storage::cloud()->listContents('/', true));
+        return json_encode($contents->where('type', '=', 'dir'));
+    }
+
+    public static function getSidebarFile()
+    {
+        if (!\App\GoogleDriveFile::checkConfig())
+        {
+            return [];
+        }
+        $user = \Auth::user();
+        $sidebarArray = [];
+        $dirList = \App\GoogleDriveFile::all();
+        $temp = $dirList->where('path','=','.Privé/.Cadet')->first();
+        if ($temp != null)
+        {
+            if ($dirList->where('path','=','.Privé/.Cadet')->first()->canAuthUser())
+            {
+                $sidebarArray['Cadet'] = [
+                    'route' => 'admin.files.cadet',
+                    'icon' => 'fas fa-folder-open',
+                    'perm' => null,
+                    'child' => null
+                ];
+            }
+        }
+
+        $temp = $dirList->where('path','=','.Privé/.Staff')->first();
+        if ($temp != null)
+        {
+            if ($dirList->where('path','=','.Privé/.Staff')->first()->canAuthUser())
+            {
+                $sidebarArray['Staff'] = [
+                    'route' => 'admin.files.staff',
+                    'icon' => 'fas fa-folder-open',
+                    'perm' => null,
+                    'child' => null
+                ];
+            }
+        }
+
+        $temp = $dirList->where('path','=','.Privé/.ETAMAS')->first();
+        if ($temp != null)
+        {
+            if ($dirList->where('path','=','.Privé/.ETAMAS')->first()->canAuthUser())
+            {
+                $sidebarArray['ETAMAS'] = [
+                    'route' => 'admin.files.etamas',
+                    'icon' => 'fas fa-folder-open',
+                    'perm' => null,
+                    'child' => null
+                ];
+            }
+        }
+
+        $temp = $dirList->where('path','=','.Privé/.Officier')->first();
+        if ($temp != null)
+        {
+            if ($dirList->where('path','=','.Privé/.Officier')->first()->canAuthUser())
+            {
+                $sidebarArray['Officier'] = [
+                    'route' => 'admin.files.officier',
+                    'icon' => 'fas fa-folder-open',
+                    'perm' => null,
+                    'child' => null
+                ];
+            }
+        }
+        $sidebarArray['Publique'] = [
+            'route' => 'admin.files.publique',
+            'icon' => 'fas fa-folder-open',
+            'perm' => null,
+            'child' => null
+        ];
+        if (\Auth::user()->p('drive_see') == 1)
+        {
+            $sidebarArray['Google Drive'] = [
+                'route' => 'admin.drive',
+                'icon' => 'fab fa-google-drive',
+                'perm' => null,
+                'child' => null
+            ];
+        }
+        return $sidebarArray;
+    }
+
+    public static function getDownloadURL($path,$file)
+    {
+        $dir = urlencode(\App\GoogleDriveFile::findByPath($path)->id);
+        return '/file/get?d='.$dir.'&f='.urlencode($file);
+    }
+}

app/Http/Controllers/AdminController.php

@@ -2,8 +2,11 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\Request;
 use \App\Log;
+use Illuminate\View\View;
 
 class AdminController extends Controller
 {
@@ -20,13 +23,46 @@ class AdminController extends Controller
     /**
      * Show the application dashboard.
      *
-     * @return \Illuminate\Http\Response
+     * @return Application|Factory|View
      */
     public function index()
     {
         clog('navigate','success','consulte le tableau de bord');
 
-        return view('admin.dashboard',['futureEvent' => \App\Event::future()->take(3),'userClasse' => \Auth::User()->getClasse()->forPage(1,6)]);
+        return view('admin.dashboard',['futureEvent' => \App\Event::future()->take(3),'userClasse' => \Auth::user()->futureCourses()->forPage(1,6)]);
+    }
+
+    public function setup()
+    {
+        if (\Auth::user()->use_default_psw == true)
+        {
+            return view('admin.user.profil.setup');
+        }
+        return redirect('/admin');
+    }
+
+    public function saveSetup()
+    {
+        $user = \Auth::user();
+        $user->firstname = \request('firstname');
+        $user->lastname = \request('lastname');
+        $user->password = bcrypt(request('psw'));
+
+        if (\request('address') != null)
+        {
+            $user->adress = \request('address');
+        }
+        if (\request('telephone') != null)
+        {
+            $user->telephone = \request('telephone');
+        }
+        if (\request('sexe') != null)
+        {
+            $user->sexe = \request('sexe');
+        }
+        $user->use_default_psw = false;
+        $user->save();
+        return redirect('/admin');
     }
 
     public function update()
@@ -36,4 +72,15 @@ class AdminController extends Controller
         return view('admin.update');
     }
 
+    public function status()
+    {
+        $alerts = \App\Event::checkForError();
+        return view('admin.status.index',['alerts' => $alerts]);
+    }
+
+    public function instruction()
+    {
+
+    }
+
 }

app/Http/Controllers/ConfigController.php

@@ -4,9 +4,11 @@ namespace App\Http\Controllers;
 
 use App\Config;
 use Illuminate\Http\Request;
+use phpDocumentor\Reflection\Types\Boolean;
 
 class ConfigController extends Controller
 {
+
     /**
      * Display a listing of the resource.
      *
@@ -132,18 +134,52 @@ class ConfigController extends Controller
 
     public function showfilesConfig()
     {
-        return view('admin.configs.file',['configs' => Config::all()]);
+        $error = [];
+        return view('admin.configs.file',['configs' => Config::all(),'error' => $error]);
     }
 
     public function editfilesConfig()
     {
-        $config = \App\Config::all()->where('name','cadet_list')->first();
+        $configList = [
+            'cadet_list',
+        ];
 
-        $config->data = [\request('cadet_list')];
+        $configListEncrypt = [
+            'GOOGLE_DRIVE_CLIENT_ID',
+            'GOOGLE_DRIVE_CLIENT_SECRET',
+            'GOOGLE_DRIVE_REFRESH_TOKEN',
+            'GOOGLE_DRIVE_FOLDER_ID'
+        ];
 
+        if (\request('is_active') == 'on')
+        {
+            $config = \App\Config::find('is_Google_Drive_enabled');
+            $config->data = ['true'];
             $config->save();
+        }
+        else
+        {
+            $config = \App\Config::find('is_Google_Drive_enabled');
+            $config->data = ['false'];
+            $config->save();
+        }
 
-        clog('edit','success','a modifié la configuration');
+
+        foreach ($configList as $configName)
+        {
+            $config = \App\Config::find($configName);
+            $config->data = [\request($configName)];
+            $config->save();
+        }
+
+        foreach ($configListEncrypt as $configName)
+        {
+            $config = \App\Config::find($configName);
+            $config->data = [\Crypt::encryptString(\request($configName))];
+            $config->save();
+        }
+
+        clog('edit','success','a modifié la configuration des fichiers');
         return redirect('/admin/config/files')->with('success','Modification sauvegarder avec succès !');
     }
 }

app/Http/Controllers/CourseController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Course;
+use App\GoogleDriveFile;
 use Illuminate\Http\Request;
 
 class CourseController extends Controller
@@ -14,7 +15,24 @@ class CourseController extends Controller
      */
     public function index()
     {
-        //
+        $mode = 'future';
+        if (\request('all'))
+        {
+            $courses = Course::all();
+            $mode = 'all';
+        }
+        else
+        {
+            $courses = Course::allFuture();
+        }
+        foreach ($courses as $course)
+        {
+            if($course->ocom() != null)
+            {
+                $course->ocom()->updateWasGiven();
+            }
+        }
+        return view('admin.course.index',['courses' => $courses,'mode' => $mode]);
     }
 
     /**
@@ -41,18 +59,25 @@ class CourseController extends Controller
     /**
      * Display the specified resource.
      *
-     * @param  \App\Course  $course
-     * @return \Illuminate\Http\Response
+     * @param $id
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function show(Course $course)
+    public function show($id)
     {
-        //
+        $course = Course::find($id);
+        $user = \App\User::find($course->user_id);
+        $name = $course->user_id;
+        if ($user != null)
+        {
+            $name = $user->fullname();
+        }
+        return view('admin.course.show',['course' => $course,'username' => $name,'lessonPlanDir' => \App\GoogleDriveFile::findByPath('.Systeme/.Fichier/.PlanDeCours')->id]);
     }
 
     /**
      * Show the form for editing the specified resource.
      *
-     * @param  \App\Course  $course
+     * @param Course $course
      * @return \Illuminate\Http\Response
      */
     public function edit(Course $course)
@@ -64,7 +89,7 @@ class CourseController extends Controller
      * Update the specified resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \App\Course  $course
+     * @param Course $course
      * @return \Illuminate\Http\Response
      */
     public function update(Request $request, Course $course)
@@ -72,14 +97,105 @@ class CourseController extends Controller
         //
     }
 
+    public function updateCommentOfficer(Request $request, $id)
+    {
+        $course = Course::findOrFail($id);
+
+        $course->comment_officer = $request->comment_officer;
+        $course->save();
+        return redirect()->back()->with('success','Modification enregisté avec succès');
+    }
+
+    public function updateComment(Request $request, $id)
+    {
+        $course = Course::findOrFail($id);
+
+        $course->comment = $request->comment;
+        $course->save();
+        return redirect()->back()->with('success','Modification enregisté avec succès');
+    }
+
+    public function updateCommentOfficerPlan(Request $request, $id)
+    {
+        $course = Course::findOrFail($id);
+
+        $course->lessonPlan->comment = $request->comment_officer;
+        $course->lessonPlan->save();
+        return redirect()->back()->with('success','Modification enregisté avec succès');
+    }
+
+    public function updateCommentPlan(Request $request, $id)
+    {
+        $course = Course::findOrFail($id);
+
+        $course->lessonPlan->desc = $request->comment;
+        $course->lessonPlan->save();
+        return redirect()->back()->with('success','Modification enregisté avec succès');
+    }
+
+    public function updateLessonPlan(Request $request, $id)
+    {
+        $course = Course::findOrFail($id);
+        $name = $course->ocom.'_'.$course->instructor().'_'.$course->event->date_begin.'_'.'v'.date('c').'.'.\request()->file('file')->getClientOriginalExtension();
+        $name = urlencode($name);
+        $dirID = \App\GoogleDriveFile::findByPath('.Systeme/.Fichier/.PlanDeCours')->id;
+
+        if ($course->lessonPlan != null)
+        {
+            $lessonPlan = $course->lessonPlan;
+            $contents = collect(\Storage::cloud()->listContents($dirID, false));
+
+            $file = $contents
+                ->where('type', '=', 'file')
+                ->where('filename', '=', pathinfo($course->lessonPlan->file, PATHINFO_FILENAME))
+                ->where('extension', '=', pathinfo($course->lessonPlan->file, PATHINFO_EXTENSION))
+                ->first(); // there can be duplicate file names!
+            \Storage::cloud()->delete($file['path']);
+        }
+        else
+        {
+            $lessonPlan = new \App\LessonPlan();
+        }
+        \Storage::cloud()->putFileAs($dirID,\request()->file('file'),$name);
+        $metadata = \Storage::cloud()->getMetadata($dirID.'/'.$name);
+
+        $lessonPlan->user_id = \Auth::user()->id;
+        $lessonPlan->file = $metadata['name'];
+        $lessonPlan->course_id = $course->id;
+        $lessonPlan->desc = "";
+        $lessonPlan->comment = "";
+        $lessonPlan->save();
+
+        return redirect()->back();
+    }
+
     /**
      * Remove the specified resource from storage.
      *
-     * @param  \App\Course  $course
+     * @param Course $course
      * @return \Illuminate\Http\Response
      */
     public function destroy(Course $course)
     {
         //
     }
+
+    public function validatePlan($id)
+    {
+        $course = Course::findOrFail($id);
+        if ($course->lessonPlan)
+        {
+            if ($course->lessonPlan->approved)
+            {
+                $course->lessonPlan->approved = false;
+            }
+            else
+            {
+                $course->lessonPlan->approved = true;
+            }
+            $course->lessonPlan->save();
+            return strval($course->lessonPlan->approved);
+        }
+        return abort(500);
+    }
 }

app/Http/Controllers/EventController.php

@@ -2,7 +2,10 @@
 
 namespace App\Http\Controllers;
 
+use App\Course;
 use App\Event;
+use App\EventType;
+use App\GoogleDriveFile;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
@@ -38,39 +41,98 @@ class EventController extends Controller
     {
         $event = new Event();
 
+        if (\App\GoogleDriveFile::checkConfig())
+        {
+            if (\request()->hasFile('files'))
+            {
+                $dir = \App\GoogleDriveFile::findByPath('.Systeme/.Fichier/.MessageDeLaSemaine');
+                $files = [];
+                foreach (\request()->file('files') as $f)
+                {
+                    $name = urlencode(pathinfo($f->getClientOriginalName())['filename'].'_'.uniqid().'.'.$f->getClientOriginalExtension());
+                    \Storage::cloud()->putFileAs($dir->id,$f,$name);
+                    array_push($files,$name);
+                }
+                $event->weekly_msg_file = $files;
+            }
+            else
+            {
+                $event->weekly_msg_file = [''];
+            }
+        } else {
+            $event->weekly_msg_file = [''];
+        }
+
         $event->name = request('name');
-        $event->date_begin = request('begin');
-        $event->date_end = request('end');
+        $event->date_begin = request('begin_time');
+        $event->date_end = request('end_time');
         $event->type = request('type');
         $event->user_id = \Auth::user()->id;
         $event->location = request('location');
+
         if(request('is_mandatory') != null){
             $event->is_mandatory = 1;
         } else {
             $event->is_mandatory  = 0;
         }
-        $event->desc = request('desc');
-        if(\request('msg'))
+
+        $event->desc = \request('admin_desc');
+
+        if(\request("use_weekly_msg"))
         {
-            $event->msg = request('msg');
+            $event->use_weekly_msg = 1;
+            $event->weekly_msg_publication_time = \request('date_msg');
+            $event->msg = request('admin_desc');
         }
         else
         {
+            $event->use_weekly_msg = 0;
+            $event->weekly_msg_publication_time = "";
             $event->msg = "";
         }
-        if(\request('date_msg'))
+
+        if(\request("use_schedule"))
         {
-            $event->date_msg = request('date_msg');
+            $event->use_schedule = 1;
         }
         else
         {
-            $event->date_msg = "";
+            $event->use_schedule = 0;
         }
+
+        $event->calendar_color = \request('calendar_color');
+        $event->calendar_icon = \request('calendar_icon');
+
+        $nbLevel = 1;
+        $niveaux = [];
+        while (\request('level_name_'.$nbLevel))
+        {
+            array_push($niveaux,['name' => \request('level_name_'.$nbLevel)]);
+            $nbLevel++;
+        }
+
+        $nbPeriode = 1;
+        $periodes = [];
+        while (\request('periode_name_'.$nbPeriode))
+        {
+            array_push($periodes,[
+                'name' => \request('periode_name_'.$nbPeriode),
+                'begin_time' => \request('periode_begin_time_'.$nbPeriode),
+                'end_time' => \request('periode_end_time_'.$nbPeriode)
+            ]);
+            $nbPeriode++;
+        }
+        $event->schedule = [
+            'periodes' => $periodes,
+            'niveaux' => $niveaux,
+            'courses' => []
+        ];
+
         $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++) { 
+        if ($event->use_schedule) {
+            for ($l=1; $l < $nbLevel; $l++) {
+                for ($p=1; $p < $nbPeriode; $p++) {
 
                     $course = new \App\Course();
 
@@ -84,17 +146,47 @@ class EventController extends Controller
                         }
                     }
 
-                    $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);
+                    if (request('location_n'.$l.'_p'.$p) != null) {
+                        $course->location = request('location_n'.$l.'_p'.$p);
+                    } else {
+                        $course->location = "";
+                    }
                     $course->periode = $p;
                     $course->level = $l;
 
-                    $course->comment = "";
                     $course->event_id = $event->id;
 
+                    if(\request("use_course_n".$l."_p".$p) == 'on')
+                    {
+                        $course->name = request('name_n'.$l.'_p'.$p);
+                        $course->ocom = request('ocom_n'.$l.'_p'.$p);
+                        $course->desc = "";
+                    }
+                    else
+                    {
+                        $course->name = "";
+                        $course->ocom = "";
+                        if (request('desc_n'.$l.'_p'.$p) == null)
+                        {
+                            $course->desc = "";
+                        }
+                        else
+                        {
+                            $course->desc = request('desc_n'.$l.'_p'.$p);
+                        }
+                    }
+                    $course->comment_officer = "";
+                    $course->comment = "";
                     $course->save();
+
+                    $ocom = \App\OCOM::where('ocom','=',request('ocom_n'.$l.'_p'.$p))->first();
+                    if ($ocom != null)
+                    {
+                        $foo = $ocom->courses();
+                        $foo->push($course);
+                        $ocom->saveCourses($foo);
+                    }
                 }
             }   
         }
@@ -121,7 +213,7 @@ class EventController extends Controller
      */
     public function edit($id)
     {
-        return view('admin.schedule.event.edit',['activity' => \App\Event::find($id)]);
+        return view('admin.schedule.event.edit',['event' => \App\Event::find($id)]);
     }
 
     /**
@@ -133,51 +225,104 @@ class EventController extends Controller
      */
     public function update($id)
     {
-        $event = Event::find($id);
+        $event = Event::findOrFail($id);
+
+//        if (\App\GoogleDriveFile::checkConfig())
+//        {
+//            if (\request()->hasFile('files'))
+//            {
+//                $dir = \App\GoogleDriveFile::findByPath('.Systeme/.Fichier/.MessageDeLaSemaine');
+//                $files = [];
+//                foreach (\request()->file('files') as $f)
+//                {
+//                    $name = urlencode(pathinfo($f->getClientOriginalName())['filename'].'_'.uniqid().'.'.$f->getClientOriginalExtension());
+//                    \Storage::cloud()->putFileAs($dir->id,$f,$name);
+//                    array_push($files,$name);
+//                }
+//                $event->weekly_msg_file = $files;
+//            }
+//            else
+//            {
+//                $event->weekly_msg_file = [''];
+//            }
+//        } else {
+//            $event->weekly_msg_file = [''];
+//        }
 
         $event->name = request('name');
-        $event->date_begin = request('begin');
-        $event->date_end = request('end');
+        $event->date_begin = request('begin_time');
+        $event->date_end = request('end_time');
+        $event->user_id = \Auth::user()->id;
         $event->location = request('location');
+
         if(request('is_mandatory') != null){
             $event->is_mandatory = 1;
         } else {
             $event->is_mandatory  = 0;
         }
-        $event->desc = request('desc');
-        if(\request('msg'))
+
+        $event->desc = \request('admin_desc');
+
+        if(\request("use_weekly_msg"))
         {
-            $event->msg = request('msg');
+            $event->use_weekly_msg = 1;
+            $event->weekly_msg_publication_time = \request('date_msg');
+            $event->msg = request('admin_desc');
         }
         else
         {
+            $event->use_weekly_msg = 0;
+            $event->weekly_msg_publication_time = "";
             $event->msg = "";
         }
-        if(\request('date_msg'))
+
+        if(\request("use_schedule"))
         {
-            $event->date_msg = request('date_msg');
+            $event->use_schedule = 1;
         }
         else
         {
-            $event->date_msg = "";
+            $event->use_schedule = 0;
         }
+
+        $event->calendar_color = \request('calendar_color');
+        $event->calendar_icon = \request('calendar_icon');
+
+        $nbLevel = 1;
+        $niveaux = [];
+        while (\request('level_name_'.$nbLevel))
+        {
+            array_push($niveaux,['name' => \request('level_name_'.$nbLevel)]);
+            $nbLevel++;
+        }
+
+        $nbPeriode = 1;
+        $periodes = [];
+        while (\request('periode_name_'.$nbPeriode))
+        {
+            array_push($periodes,[
+                'name' => \request('periode_name_'.$nbPeriode),
+                'begin_time' => \request('periode_begin_time_'.$nbPeriode),
+                'end_time' => \request('periode_end_time_'.$nbPeriode)
+            ]);
+            $nbPeriode++;
+        }
+        $event->schedule = [
+            'periodes' => $periodes,
+            'niveaux' => $niveaux,
+            'courses' => []
+        ];
+
         $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++) {
+        if ($event->use_schedule) {
+            for ($l=1; $l < $nbLevel; $l++) {
+                for ($p=1; $p < $nbPeriode; $p++) {
 
-                    $course = new \App\Course();
-
-                    foreach ($event->courses as $c)
+                    $course = $event->course($p,$l);
+                    if ($course == null)
                     {
-                        if ($c->periode == $p)
-                        {
-                            if ($c->level == $l)
-                            {
-                                $course = $c;
-                            }
-                        }
+                        $course = new Course();
                     }
 
                     $users = \App\User::all();
@@ -189,23 +334,48 @@ class EventController extends Controller
                             $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->location = request('location_n'.$l.'_p'.$p);
                     $course->periode = $p;
                     $course->level = $l;
 
-                    $course->comment = "";
                     $course->event_id = $event->id;
 
+                    if(\request("use_course_n".$l."_p".$p) == 'on')
+                    {
+                        $course->name = request('name_n'.$l.'_p'.$p);
+                        $course->ocom = request('ocom_n'.$l.'_p'.$p);
+                        $course->desc = "";
+                    }
+                    else
+                    {
+                        $course->name = "";
+                        $course->ocom = "";
+                        if (request('desc_n'.$l.'_p'.$p) == null)
+                        {
+                            $course->desc = "";
+                        }
+                        else
+                        {
+                            $course->desc = request('desc_n'.$l.'_p'.$p);
+                        }
+                    }
+                    $course->comment_officer = "";
+                    $course->comment = "";
                     $course->save();
+
+                    $ocom = \App\OCOM::where('ocom','=',request('ocom_n'.$l.'_p'.$p))->first();
+                    if ($ocom != null)
+                    {
+                        $foo = $ocom->courses();
+                        $foo->push($course);
+                        $ocom->saveCourses($foo);
                     }
                 }
             }
-        clog('edit','success','a modifié un évènement',null,'App\Event',$event->id);
-        return redirect('/admin/schedule')->with('success','Modification à l\'événement sauvegarder à l\'horaire');
+        }
+        clog('add','success','a modifier un évènement',null,'App\Event',$event->id);
+        return redirect('/admin/schedule')->with('success','Événement modifier à l\'horaire');
     }
 
     /**
@@ -218,4 +388,42 @@ class EventController extends Controller
     {
         //
     }
+
+    public function checkEvent()
+    {
+        //
+    }
+
+    public function toJson($id)
+    {
+        $event = Event::findOrFail($id);
+        $model = $event->schedule;
+        $default_value = [];
+        if ($event->use_schedule == 1) {
+            foreach ($model['periodes'] as $periode_index => $periode)
+            {
+                $niveau_array = [];
+                foreach ($model['niveaux'] as $niveau_index => $niveau)
+                {
+                    $course = $event->course($periode_index+1,$niveau_index+1);
+                    $use_course = "on";
+                    if ($course->name == null) {
+                        $use_course = "off";
+                    }
+                    array_push($niveau_array,[
+                        'ocom' => $course->ocom,
+                        'name' => $course->name,
+                        'location' => $course->location,
+                        'instructor' => $course->instructor(),
+                        'desc' => $course->desc,
+                        'use_course' => $use_course
+                    ]);
+                }
+                array_push($default_value,$niveau_array);
+            }
+            $model['default_value'] = $default_value;
+        }
+        $event->schedule_model = $model;
+        return $event->toArray();
+    }
 }

app/Http/Controllers/EventTypeController.php

@@ -0,0 +1,245 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\EventType;
+use Illuminate\Http\Request;
+
+class EventTypeController 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()
+    {
+        return view('admin.event_type.create');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $eventType = new EventType();
+        $eventType->name = $request->name;
+        $eventType->location = $request->location;
+        $eventType->begin_time = $request->begin_time;
+        $eventType->end_time = $request->end_time;
+        $eventType->calendar_icon = $request->calendar_icon;
+        $eventType->calendar_color = $request->calendar_color;
+        $eventType->admin_desc = $request->admin_desc;
+
+        if ($request->use_weekly_msg == 'on')
+        {
+            $eventType->use_weekly_msg = 1;
+            $eventType->weekly_msg_publication_time = $request->weekly_msg_publication_time;
+        }
+        else
+        {
+            $eventType->use_weekly_msg = 0;
+            $eventType->weekly_msg_publication_time = '';
+        }
+        if ($request->use_schedule == 'on')
+        {
+            $eventType->use_schedule = 1;
+        }
+        else
+        {
+            $eventType->use_schedule = 0;
+        }
+        if ($request->is_mandatory == 'on')
+        {
+            $eventType->is_mandatory = 1;
+        }
+        else
+        {
+            $eventType->is_mandatory = 0;
+        }
+
+        $nbOfLevel = 1;
+        while (\request('level_name_'.$nbOfLevel))
+        {
+            $nbOfLevel++;
+        }
+        $nbOfLevel = $nbOfLevel-1;
+
+        $nbOfPeriode = 1;
+        while (\request('periode_name_'.$nbOfPeriode))
+        {
+            $nbOfPeriode++;
+        }
+        $nbOfPeriode = $nbOfPeriode -1;
+
+        $model = [];
+        for ($x = 1; $x <= $nbOfPeriode; $x++) {
+            $model['periodes'][$x-1] = [
+                'name' => \Request('periode_name_'.$x),
+                'begin_time' => \Request('periode_begin_time_'.$x),
+                'end_time' => \Request('periode_end_time_'.$x)
+            ];
+        }
+        for ($i = 1; $i <= $nbOfLevel; $i++) {
+            $model['niveaux'][$i-1] = [
+                'name' => \Request('level_name_'.$i)
+            ];
+
+            for ($x = 1; $x <= $nbOfPeriode; $x++) {
+                $model['default_value'][$x-1][$i-1] = [
+                    'ocom' => \Request('ocom_n'.$i.'_p'.$x),
+                    'name' => \Request('name_n'.$i.'_p'.$x),
+                    'location' => \Request('location_n'.$i.'_p'.$x),
+                    'instructor' => \Request('instruc_n'.$i.'_p'.$x),
+                    'desc' => \Request('desc_n'.$i.'_p'.$x),
+                    'use_course' => \Request('use_course_n'.$i.'_p'.$x),
+                ];
+            }
+        }
+        $eventType->schedule_model = $model;
+        $eventType->save();
+        return redirect('/admin/config/instruction')->with('success','Type d\'évenement ajouté avec succès');
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\EventType  $eventType
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        $event_type = EventType::findOrFail($id);
+        return view('admin.event_type.show',['event_type' => $event_type]);
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\EventType  $eventType
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(EventType $eventType)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\EventType  $eventType
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $eventType = EventType::findOrFail($id);
+
+        $eventType->name = $request->name;
+        $eventType->location = $request->location;
+        $eventType->begin_time = $request->begin_time;
+        $eventType->end_time = $request->end_time;
+        $eventType->calendar_icon = $request->calendar_icon;
+        $eventType->calendar_color = $request->calendar_color;
+        $eventType->admin_desc = $request->admin_desc;
+
+        if ($request->use_weekly_msg == 'on')
+        {
+            $eventType->use_weekly_msg = 1;
+            $eventType->weekly_msg_publication_time = $request->weekly_msg_publication_time;
+        }
+        else
+        {
+            $eventType->use_weekly_msg = 0;
+            $eventType->weekly_msg_publication_time = '';
+        }
+        if ($request->use_schedule == 'on')
+        {
+            $eventType->use_schedule = 1;
+        }
+        else
+        {
+            $eventType->use_schedule = 0;
+        }
+        if ($request->is_mandatory == 'on')
+        {
+            $eventType->is_mandatory = 1;
+        }
+        else
+        {
+            $eventType->is_mandatory = 0;
+        }
+
+        $nbOfLevel = 1;
+        while (\request('level_name_'.$nbOfLevel))
+        {
+            $nbOfLevel++;
+        }
+        $nbOfLevel = $nbOfLevel-1;
+
+        $nbOfPeriode = 1;
+        while (\request('periode_name_'.$nbOfPeriode))
+        {
+            $nbOfPeriode++;
+        }
+        $nbOfPeriode = $nbOfPeriode -1;
+
+        $model = [];
+        for ($x = 1; $x <= $nbOfPeriode; $x++) {
+            $model['periodes'][$x-1] = [
+                'name' => \Request('periode_name_'.$x),
+                'begin_time' => \Request('periode_begin_time_'.$x),
+                'end_time' => \Request('periode_end_time_'.$x)
+            ];
+        }
+        for ($i = 1; $i <= $nbOfLevel; $i++) {
+            $model['niveaux'][$i-1] = [
+                'name' => \Request('level_name_'.$i)
+            ];
+
+            for ($x = 1; $x <= $nbOfPeriode; $x++) {
+                $model['default_value'][$x-1][$i-1] = [
+                    'ocom' => \Request('ocom_n'.$i.'_p'.$x),
+                    'name' => \Request('name_n'.$i.'_p'.$x),
+                    'location' => \Request('location_n'.$i.'_p'.$x),
+                    'instructor' => \Request('instruc_n'.$i.'_p'.$x),
+                    'desc' => \Request('desc_n'.$i.'_p'.$x),
+                    'use_course' => \Request('use_course_n'.$i.'_p'.$x),
+                ];
+            }
+        }
+        $eventType->schedule_model = $model;
+        $eventType->save();
+        return redirect()->back()->with('success','Modification sauvegardé avec succès');
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\EventType  $eventType
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        $e = EventType::findOrFail($id);
+        $e->delete();
+    }
+
+    public function toJson($id)
+    {
+        return EventType::findOrFail($id)->toArray();
+    }
+}

app/Http/Controllers/FilesController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\GoogleDriveFile;
 use Illuminate\Http\Request;
 
 class FilesController extends Controller
@@ -84,6 +85,67 @@ class FilesController extends Controller
 
     public function guide()
     {
-        return view('admin.files.guide');
+        if (\App\GoogleDriveFile::checkConfig())
+        {
+            $dirID = \App\GoogleDriveFile::findByPath('.Privé/.Staff/.Guide');
+            $dir = collect(\Storage::cloud()->listContents($dirID->id,false))->sortBy('name');
+            return view('admin.files.guide',['dir' => $dir]);
+        }
+        return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
+    }
+
+    public function instruction()
+    {
+        if (\App\GoogleDriveFile::checkConfig())
+        {
+            return view('admin.files.Google Drive.index',['folder' => \App\GoogleDriveFile::where('path','=','.Privé/.Staff/.Instruction')->first()->id, 'mode' => 'folder']);
+        }
+        return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
+
+    }
+
+    public function cadet()
+    {
+        if (!\App\GoogleDriveFile::checkConfig())
+        {
+            return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
+        }
+        return view('admin.files.Google Drive.index',['folder' => \App\GoogleDriveFile::where('path','=','.Privé/.Cadet')->first()->id, 'mode' => 'folder']);
+    }
+
+    public function staff()
+    {
+        if (!\App\GoogleDriveFile::checkConfig())
+        {
+            return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
+        }
+        return view('admin.files.Google Drive.index',['folder' => \App\GoogleDriveFile::where('path','=','.Privé/.Staff')->first()->id, 'mode' => 'folder']);
+    }
+
+    public function etamas()
+    {
+        if (!\App\GoogleDriveFile::checkConfig())
+        {
+            return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
+        }
+        return view('admin.files.Google Drive.index',['folder' => \App\GoogleDriveFile::where('path','=','.Privé/.ETAMAS')->first()->id, 'mode' => 'folder']);
+    }
+
+    public function officier()
+    {
+        if (!\App\GoogleDriveFile::checkConfig())
+        {
+            return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
+        }
+        return view('admin.files.Google Drive.index',['folder' => \App\GoogleDriveFile::where('path','=','.Privé/.Officier')->first()->id, 'mode' => 'folder']);
+    }
+
+    public function publique()
+    {
+        if (!\App\GoogleDriveFile::checkConfig())
+        {
+            return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
+        }
+        return view('admin.files.Google Drive.index',['folder' => \App\GoogleDriveFile::where('path','=','.Publique')->first()->id, 'mode' => 'folder']);
     }
 }

app/Http/Controllers/GoogleDriveController.php

@@ -0,0 +1,635 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\GoogleDriveFile;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use Psy\Util\Str;
+use Symfony\Component\Console\Input\Input;
+
+class GoogleDriveController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @param string $dir
+     * @param bool $recursive
+     * @return \Illuminate\Http\Response
+     */
+    public function index($folder = '')
+    {
+        return view('admin.files.Google Drive.index',['folder' => $folder]);
+    }
+
+    public function indexFolder($folder = '')
+    {
+        return view('admin.files.Google Drive.index',['folder' => $folder,'mode' => 'folder']);
+    }
+
+    /**
+     * Show the form for creating a new file.
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function createFile()
+    {
+        Storage::cloud()->put(\request('currentDir'.'/'.\request('name')), '');
+        return back()->with('success','Fichier créer avec succès');
+    }
+
+    public function createFolder()
+    {
+        Storage::cloud()->makeDirectory(\request('currentDir').'/'.\request('name'));
+        return back()->with('success','Dossier créer avec succès');
+    }
+
+    public function uploadFile()
+    {
+        Storage::cloud()->putFileAs(\request('currentDir'),\request()->file('fichier'),\request()->file('fichier')->getClientOriginalName());
+        return back()->with('success','Fichier téléversé avec succès');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return bool
+     */
+    public function store(Request $request)
+    {
+        $path = Storage::cloud()->makeDirectory('Test Dir');
+        dd($path);
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param $filename
+     * @return \Illuminate\Http\Response
+     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
+     */
+    public function show()
+    {
+        $filename = \request('file');
+        $contents = collect(Storage::cloud()->listContents('/1nEe35-GvLX598RketTI-UoaOxIMNxfka', true));
+
+        $file = $contents
+            ->where('type', '=', 'file')
+            ->where('filename', '=', pathinfo($filename, PATHINFO_FILENAME))
+            ->where('extension', '=', pathinfo($filename, PATHINFO_EXTENSION))
+            ->first(); // there can be duplicate file names!
+
+        //return $file; // array with file info
+
+        $rawData = Storage::cloud()->get($file['path']);
+
+        return response($rawData, 200)
+            ->header('ContentType', $file['mimetype'])
+            ->header('Content-Disposition', "attachment; filename='$filename'");
+    }
+
+    public function showMetadata($dir,$file)
+    {
+        if ($dir == 'root')
+        {
+            $dir = '/';
+        }
+        $contents = collect(Storage::cloud()->listContents($dir, true));
+
+        $file = $contents
+            ->where('type', '=', 'file')
+            ->where('filename', '=', pathinfo($file, PATHINFO_FILENAME))
+            ->where('extension', '=', pathinfo($file, PATHINFO_EXTENSION))
+            ->first(); // there can be duplicate file names!
+
+        return $file;
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        //
+    }
+
+    public function getPathArray()
+    {
+        $contents = collect(Storage::cloud()->listContents('/', true));
+        return json_encode($contents->where('type', '=', 'dir'));
+    }
+
+    public function getPath($folder)
+    {
+        $contents = collect(Storage::cloud()->listContents('/', true));
+        $dir = collect($contents->where('type', '=', 'dir'));
+        foreach ($dir as $d)
+        {
+            if($d['basename'] == $folder)
+            {
+                return $d['dirname'];
+            }
+        }
+    }
+
+    public function getFile()
+    {
+        if(\request('f'))
+        {
+            $dir = '/';
+            if (\request('d') && urldecode(\request('d')) != '')
+            {
+                $dir = \request('d');
+            }
+            $filename = urldecode(\request('f'));
+
+            $recursive = false; // Get subdirectories also?
+            $contents = collect(Storage::cloud()->listContents($dir, $recursive));
+
+            $file = $contents
+                ->where('type', '=', 'file')
+                ->where('filename', '=', pathinfo($filename, PATHINFO_FILENAME))
+                ->first(); // there can be duplicate file names!
+            if ($file == null)
+            {
+                $filename = \request('f');
+                $file = $contents
+                    ->where('type', '=', 'file')
+                    ->where('filename', '=', pathinfo($filename, PATHINFO_FILENAME))
+                    ->first(); // there can be duplicate file names!
+            }
+
+            $rawData = Storage::cloud()->get($file['path']);
+            $filename = urlencode($filename);
+            return response($rawData, 200)
+                ->header('Content-Type', $file['mimetype'])
+                ->header('Content-Disposition', "attachment; filename=$filename");
+        }
+        else
+        {
+            abort(404);
+        }
+    }
+
+    public function deleteFile()
+    {
+        if(\request('f'))
+        {
+            $dir = '/';
+            if (\request('d') && urldecode(\request('d')) != '')
+            {
+                $dir = \request('d');
+            }
+            $filename = urldecode(\request('f'));
+
+            $recursive = false; // Get subdirectories also?
+            $contents = collect(Storage::cloud()->listContents($dir, $recursive));
+
+            $file = $contents
+                ->where('type', '=', 'file')
+                ->where('filename', '=', pathinfo($filename, PATHINFO_FILENAME))
+                ->where('extension', '=', pathinfo($filename, PATHINFO_EXTENSION))
+                ->first(); // there can be duplicate file names!
+
+            Storage::cloud()->delete($file['path']);
+
+            return back()->with('success','Fichier supprimé avec succès');
+        }
+        else
+        {
+            abort(404);
+        }
+    }
+
+    public function deleteDir()
+    {
+        $directoryID = \request('d');
+
+        // Now find that directory and use its ID (path) to delete it
+        $dir = '/';
+        $recursive = false; // Get subdirectories also?
+        $contents = collect(Storage::cloud()->listContents($dir, $recursive));
+
+        $directory = $contents
+            ->where('type', '=', 'dir')
+            ->where('basename', '=', $directoryID)
+            ->first();
+
+        Storage::cloud()->deleteDirectory($directory['path']);
+
+        return back()->with('success','Dossier supprimé avec succès');
+    }
+
+    public function list($folder = 'root')
+    {
+        $recursive = false; // Get subdirectories also?
+        $perm = ['r' => GoogleDriveFile::getPermForAuthUser($folder,'r'),'w' => GoogleDriveFile::getPermForAuthUser($folder,'w'),'p' => GoogleDriveFile::getPermForAuthUser($folder,'p')];
+        if ($folder == 'root')
+        {
+            $contents = collect(Storage::cloud()->listContents('/', $recursive));
+        }
+        else
+        {
+            $contents = collect(Storage::cloud()->listContents($folder, $recursive));
+        }
+
+        return view('admin.files.Google Drive.explorer',[
+            'directories' => $contents->where('type', '=', 'dir')->sortByDesc('name'),
+            'files' => $contents->where('type', '=', 'file'),
+            'currentDir' => $folder,
+            'permission' => $perm]);
+    }
+
+    public function checkFileSystem()
+    {
+        $error = [];
+        if(\App\Config::getData('is_Google_Drive_enabled') == "true")
+        {
+            if (GoogleDriveFile::checkConfig())
+            {
+                $structure = $this->getFileStructure();
+                $this->checkStructure($structure,'/','/',$error);
+            }
+            else
+            {
+                $error = ['Il y a un probleme avec vos configurations'];
+            }
+        }
+        else
+        {
+            $error = ['Google Drive n\'est pas actif'];
+        }
+        return $error;
+    }
+
+    public function checkStructure()
+    {
+        $structure = $this->getFileStructure();
+
+        foreach ($structure as $directory => $value)
+        {
+            $basename = GoogleDriveFile::findByPathInDrive($directory);
+            if ($basename == false)
+            {
+                $basename = GoogleDriveFile::createByPathInDrive($directory);
+            }
+
+            $googleDriveFile = GoogleDriveFile::findByPath($directory);
+            if ($googleDriveFile == null)
+            {
+                $googleDriveFile = new GoogleDriveFile();
+                $googleDriveFile->id = $basename;
+                $googleDriveFile->type = 'directory';
+                $googleDriveFile->rank_permission = $value['rank'];
+                $googleDriveFile->job_permission = [];
+                $googleDriveFile->user_permission = [];
+                $googleDriveFile->path = $directory;
+                $name = explode('/',$directory);
+                $googleDriveFile->name = $name[count($name)-1];
+                $googleDriveFile->save();
+            }
+            else
+            {
+                if ($googleDriveFile->id != $basename)
+                {
+                    $googleDriveFile->id = $basename;
+                    $googleDriveFile->save();
+                }
+            }
+        }
+    }
+
+    public function editPermission($folder)
+    {
+        $f = GoogleDriveFile::find($folder);
+        if ($f == null)
+        {
+            $metadata = \Storage::cloud()->getMetadata($folder);
+            $f = new GoogleDriveFile();
+            $f->id = $folder;
+            $f->type = 'directory';
+            $f->name = $metadata['name'];
+            $f->rank_permission = [1 => 'rwp'];
+            $f->job_permission = [];
+            $f->user_permission = [];
+            $f->path = $this->recreatePath($folder);
+            $f->save();
+        }
+        return view('admin.files.Google Drive.permission',['dir' => $f]);
+    }
+
+    public function getFileStructure()
+    {
+        return collect([
+            '.Systeme' => [
+                'rank' => [1 => 'rwp'],
+                'job' => [],
+                'user' => []
+            ],
+            '.Systeme/.Fichier' => [
+                'rank' => [1 => 'rwp'],
+                'job' => [],
+                'user' => []
+            ],
+            '.Systeme/.Fichier/.MessageDeLaSemaine' => [
+                'rank' => [1 => 'rwp',0 => 'r'],
+                'job' => [],
+                'user' => []
+            ],
+            '.Systeme/.Fichier/.PlanDeCours' => [
+                'rank' => [1 => 'rwp'],
+                'job' => [],
+                'user' => []
+            ],
+            '.Privé' => [
+                'rank' => [1 => 'rwp'],
+                'job' => [],
+                'user' => []
+            ],
+            '.Privé/.Cadet' => [
+                'rank' => [1 => 'rwp'],
+                'job' => [],
+                'user' => []
+            ],
+            '.Privé/.ETAMAS' => [
+                'rank' => [1 => 'rwp'],
+                'job' => [],
+                'user' => []
+            ],
+            '.Privé/.Officier' => [
+                'rank' => [1 => 'rwp'],
+                'job' => [],
+                'user' => []
+            ],
+            '.Privé/.Staff' => [
+                'rank' => [1 => 'rwp'],
+                'job' => [],
+                'user' => []
+            ],
+            '.Privé/.Staff/.Guide' => [
+                'rank' => [1 => 'rwp'],
+                'job' => [],
+                'user' => []
+            ],
+            '.Privé/.Staff/.Instruction' => [
+                'rank' => [1 => 'rwp'],
+                'job' => [],
+                'user' => []
+            ],
+            '.Publique' => [
+                'rank' => [1 => 'rwp',0 => 'r'],
+                'job' => [],
+                'user' => []
+            ],
+            '.Publique/.Fichier' => [
+                'rank' => [1 => 'rwp',0 => 'r'],
+                'job' => [],
+                'user' => []
+            ],
+            '.Publique/.Image' => [
+                'rank' => [1 => 'rwp',0 => 'r'],
+                'job' => [],
+                'user' => []
+            ],
+        ]);
+    }
+
+    public function listLockDirectory($d)
+    {
+        $contents = collect(\Storage::cloud()->listContents($d, false));
+        $dir = $contents->where('type', '=', 'dir');
+        $dir = $dir->where('filename','=','');
+
+        return $dir;
+    }
+
+    public function recreatePath($folder)
+    {
+        $path = [];
+        $name = [];
+        $directories = collect(json_decode($this->getPathArray(),true));
+        foreach ($directories as $dir)
+        {
+            $path[$dir['basename']] = $dir['dirname'];
+            $name[$dir['basename']] = $dir['name'];
+        }
+        $realPath = $name[$folder];
+        $foo = $folder;
+        while ($foo != "")
+        {
+            $bar = explode('/',$path[$foo]);
+            $foo = $bar[count($bar)-1];
+            if ($foo != "")
+            {
+                $realPath = $name[$foo].'/'.$realPath;
+            }
+        }
+        return $realPath;
+    }
+
+    public function editPermissionModal($folder,$subject,$id)
+    {
+        $dir = GoogleDriveFile::find($folder);
+        $foo = null;
+        $perm = null;
+        if ($subject == 'rank')
+        {
+            if ($id == 0)
+            {
+                $foo = new \App\Rank();
+                $foo->name = "Utilisateur non authentifié";
+                $foo->id = 0;
+                if (isset($dir->rank_permission[$id]))
+                {
+                    $perm = $dir->rank_permission[$id];
+                }
+                else
+                {
+                    $perm = "";
+                }
+            }
+            else
+            {
+                $foo = \App\Rank::find($id);
+                $perm = $dir->rank_permission[$id];
+            }
+        }
+        elseif ($subject == 'job')
+        {
+            $foo = \App\Job::find($id);
+            $perm = $dir->job_permission[$id];
+        }
+        else
+        {
+            $foo = \App\User::find($id);
+            $perm = $dir->user_permission[$id];
+        }
+        return view('admin.files.Google Drive.permission.edit',['folder' => $dir,'subject' => $foo,'perm' => $perm,'s' => $subject]);
+    }
+
+    public function addPermissionModal($folder,$subject)
+    {
+        $dir = GoogleDriveFile::find($folder);
+        $list = null;
+        if ($subject == 'rank')
+        {
+            $list = \App\Rank::all();
+        }
+        elseif ($subject == 'job')
+        {
+            $list = \App\Job::all();
+        }
+        else
+        {
+            $list = \App\User::all();
+        }
+        return view('admin.files.Google Drive.permission.add',['folder' => $dir,'list' => $list,'s' => $subject]);
+    }
+
+    public function patchPermission(Request $request,$folder,$subject,$id)
+    {
+        $f = GoogleDriveFile::find($folder);
+        $permstring = '';
+        if (isset($request->read))
+        {
+            if ($request->read == 'on')
+            {
+                $permstring = $permstring.'r';
+            }
+        }
+        if (isset($request->write))
+        {
+            if ($request->write == 'on')
+            {
+                $permstring = $permstring.'w';
+            }
+        }
+        if (isset($request->perm))
+        {
+            if ($request->perm == 'on')
+            {
+                $permstring = $permstring.'p';
+            }
+        }
+        if ($subject == 'rank')
+        {
+            $temp = $f->rank_permission;
+            $temp[$id] = $permstring;
+            $f->rank_permission = $temp;
+        }
+        if ($subject == 'job')
+        {
+            $temp = $f->job_permission;
+            $temp[$id] = $permstring;
+            $f->job_permission = $temp;
+        }
+        if ($subject == 'user')
+        {
+            $temp = $f->user_permission;
+            $temp[$id] = $permstring;
+            $f->user_permission = $temp;
+        }
+        $f->save();
+        return redirect()->back()->with('success','Modification enregistré avec succès');
+    }
+
+    public function addPermission(Request $request,$folder,$subject)
+    {
+        $f = GoogleDriveFile::find($folder);
+        $permstring = '';
+        if (isset($request->read))
+        {
+            if ($request->read == 'on')
+            {
+                $permstring = $permstring.'r';
+            }
+        }
+        if (isset($request->write))
+        {
+            if ($request->write == 'on')
+            {
+                $permstring = $permstring.'w';
+            }
+        }
+        if (isset($request->perm))
+        {
+            if ($request->perm == 'on')
+            {
+                $permstring = $permstring.'p';
+            }
+        }
+        if ($subject == 'rank')
+        {
+            $temp = $f->rank_permission;
+            $temp[$request->id] = $permstring;
+            $f->rank_permission = $temp;
+        }
+        if ($subject == 'job')
+        {
+            $temp = $f->job_permission;
+            $temp[$request->id] = $permstring;
+            $f->job_permission = $temp;
+        }
+        if ($subject == 'user')
+        {
+            $temp = $f->user_permission;
+            $temp[$request->id] = $permstring;
+            $f->user_permission = $temp;
+        }
+        $f->save();
+        return redirect()->back()->with('success','Modification enregistré avec succès');
+    }
+
+    public function deletePermission($folder,$subject,$id)
+    {
+        $f = GoogleDriveFile::find($folder);
+        if ($subject == 'rank')
+        {
+            $temp = $f->rank_permission;
+            unset($temp[$id]);
+            $f->rank_permission = $temp;
+        }
+        if ($subject == 'job')
+        {
+            $temp = $f->job_permission;
+            unset($temp[$id]);
+            $f->job_permission = $temp;
+        }
+        if ($subject == 'user')
+        {
+            $temp = $f->user_permission;
+            unset($temp[$id]);
+            $f->user_permission = $temp;
+        }
+        $f->save();
+        return redirect()->back()->with('success','Modification enregistré avec succès');
+    }
+
+}

app/Http/Controllers/LessonPlanController.php

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

app/Http/Controllers/NotificationController.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Notifications\DatabaseNotification;
+
+class NotificationController extends Controller
+{
+    public function markAsRead($id)
+    {
+        $n = DatabaseNotification::find($id);
+        $n->read_at = date('Y-m-d h:i:s');
+        $n->save();
+    }
+
+    public function markAllAsRead()
+    {
+        $notifications = \Auth::user()->unreadNotifications;
+        foreach ($notifications as $n)
+        {
+            $n->read_at = date('Y-m-d h:i:s');
+            $n->save();
+        }
+        return $notifications;
+    }
+}

app/Http/Controllers/OCOMController.php

@@ -0,0 +1,320 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\OCOM;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Redirector;
+use function GuzzleHttp\json_encode;
+use function GuzzleHttp\Psr7\str;
+
+class OCOMController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function index()
+    {
+        OCOM::wasUpdateGivenAll();
+        return view('admin.ocom.index',['ocoms' => OCOM::all()]);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        return view('admin.ocom.add');
+    }
+
+    public function generate()
+    {
+        $file = fopen(\request()->file('file'),'r');
+        $data = fread($file,filesize(\request()->file('file')));
+        fclose($file);
+        $data = str_replace(["\r","\n"],'',$data);
+
+        // Detection et nettoyage des ORENs
+        preg_match_all('/[MX\d][X\d]\d+,[^,]+/',$data,$matches_orens);
+        foreach ($matches_orens[0] as $key => $oren) {
+            $oren = str_replace('"','',$oren);
+            $matches_orens[0][$key] = $oren;
+        }
+        $orens_pass_2 = collect($matches_orens[0])->unique();
+        $orens = [];
+        foreach ($orens_pass_2 as $oren)
+        {
+            $foo = explode(',',$oren);
+            $orens[$foo[0]] = $foo[1];
+        }
+
+        // Detection et nettoyage des OCOMs
+        preg_match_all('/[MC][X\d]\d{2}\.\d{2}\w?,[^,]+,\d/',$data,$matches_ocom);
+        foreach ($matches_ocom[0] as $key => $ocom) {
+            $ocom = str_replace('"','',$ocom);
+            $matches_ocom[0][$key] = $ocom;
+        }
+        $ocoms_pass_2 = collect($matches_ocom[0])->unique();
+
+        foreach ($ocoms_pass_2 as $ocom_pass_2)
+        {
+            $foo = explode(',',$ocom_pass_2);
+
+            if (OCOM::findByOCOM($foo[0]) == null)
+            {
+                preg_match('/[X\d]\d{2}/',$ocom_pass_2,$matches);
+                $oren = $matches[0];
+                $complementary = false;
+                if ($foo[0][0] == "C")
+                {
+                    $complementary = true;
+                }
+                $nocom = new OCOM();
+                $nocom->ocom = $foo[0];
+                $nocom->objectif_competence = $foo[1];
+                $nocom->nbPeriode = $foo[2];
+                $nocom->objectif_rendement = $orens[$oren];
+                $nocom->oren = $oren;
+                $nocom->complementary = $complementary;
+                $nocom->course_id = '';
+
+                $nocom->save();
+            }
+        }
+
+        $this->updateOCOMDB();
+        return redirect('/admin/ocom')->with('success','Base de donnée des cours générée avec succès!');
+    }
+
+    public function g()
+    {
+        OCOM::truncate();
+
+        $matches = [];
+        $orens = [];
+        preg_match_all('/[X\d]\d\d,[^,]*/',\request('text'),$matches);
+        foreach ($matches[0] as $match)
+        {
+            $match = str_replace('"',"",$match);
+            $match = trim(preg_replace('/\s\s+/', ' ', $match));
+            $oren = "";
+            preg_match('/[X\d]\d\d/',$match,$oren);
+            $value = preg_replace('/[X\d]\d\d,/','',$match);
+            if($value != "")
+            {
+                $orens[$oren[0]] = preg_replace('/[X\d]\d\d,/','',$match);
+            }
+        }
+
+        preg_match_all('/[MC]\S\d\d.\d\d[A-Z]?,[^,]*,\d/',$text,$matches);
+
+        foreach ($matches[0] as $match)
+        {
+            $newocom = new OCOM();
+
+            $match = str_replace('"',"",$match);
+
+            $ocom = "";
+            preg_match('/[MC]\S\d\d.\d\d[A-Z]?/',$match,$ocom);
+
+            if(!OCOM::where('ocom',$ocom)->first())
+            {
+                $oren = "";
+                preg_match('/[X\d]\d\d/',$ocom[0],$oren);
+
+                $obj_competence = str_replace($ocom[0].",","",$match);
+                $obj_competence = trim(preg_replace('/\s\s+/', ' ', $obj_competence));
+                $obj_competence = trim($obj_competence,"\\");
+
+                $nbPeriode = preg_replace('/[MC]\S\d\d.\d\d[A-Z]?,[^,]*,/','',$match);
+                $newocom->nbPeriode = $nbPeriode;
+
+                $obj_competence = str_replace(",".$nbPeriode,'',$obj_competence);
+
+                $newocom->ocom = $ocom[0];
+                $newocom->oren = $oren[0];
+
+                if ($newocom->ocom[0] == 'C' || $newocom->ocom[0] == 'c')
+                {
+                    $newocom->complementary = true;
+                }
+                else
+                {
+                    $newocom->complementary = false;
+                }
+
+                $newocom->course_id = '';
+
+                $newocom->objectif_competence = $obj_competence;
+                $newocom->objectif_rendement = $orens[$oren[0]];
+                $newocom->objectif_rendement = trim($newocom->objectif_rendement,"\\");
+                $newocom->save();
+            }
+        }
+        return redirect('/admin/ocom')->with('success','Base de donnée des cours générée avec succès!');
+    }
+
+    public function showgenerate()
+    {
+        return view('admin.ocom.generate');
+    }
+
+    public function updateOCOMDB()
+    {
+        $ocoms = OCOM::all();
+
+        $from = strtotime(\App\Config::getData('instruction_year_begin'));
+        $to = strtotime(\App\Config::getData('instruction_year_end'));
+        $allEvent = \App\Event::all();
+        $events = collect();
+
+        foreach ($allEvent as $e)
+        {
+            if ($e->use_schedule == 1)
+            {
+                if (strtotime($e->date_begin) >= $from)
+                {
+                    if (strtotime($e->date_begin) <= $to)
+                    {
+                        $events->push($e);
+                        foreach ($e->courses as $c)
+                        {
+                            $r = $ocoms->where('ocom',$c->ocom)->first();
+                            if ($r != null)
+                            {
+                                $r->saveCourse($c);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        foreach ($ocoms as $o)
+        {
+            $o->save();
+        }
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param Request $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $ocom = new OCOM();
+        $ocom->ocom = $request->ocom;
+        $ocom->objectif_competence = $request->objectif_competence;
+        $ocom->nbPeriode = $request->nbPeriode;
+        $ocom->objectif_rendement = $request->objectif_rendement;
+        $ocom->oren = $request->oren;
+
+        if ($ocom->ocom[0] == 'C' || $ocom->ocom[0] == 'c')
+        {
+            $ocom->complementary = true;
+        }
+        else
+        {
+            $ocom->complementary = false;
+        }
+        $ocom->course_id = "";
+        $ocom->save();
+        clog('add','success','a ajouter un ocom',\Auth::User()->id);
+        return redirect('/admin/ocom/'.$ocom->id);
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param $OCOM
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function show($OCOM)
+    {
+        return view('admin.ocom.show',['ocom' => OCOM::find($OCOM)]);
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        return view('admin.ocom.edit',['ocom' => OCOM::find($id)]);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param Request $request
+     * @param $id
+     * @return RedirectResponse|Redirector
+     */
+    public function update(Request $request,$id)
+    {
+        $ocom = OCOM::find($id);
+        $ocom->ocom = $request->ocom;
+        $ocom->objectif_competence = $request->objectif_competence;
+        $ocom->nbPeriode = $request->nbPeriode;
+        $ocom->objectif_rendement = $request->objectif_rendement;
+        $ocom->oren = $request->oren;
+
+        if ($ocom->ocom[0] == 'C' || $ocom->ocom[0] == 'c')
+        {
+            $ocom->complementary = true;
+        }
+        else
+        {
+            $ocom->complementary = false;
+        }
+
+        $ocom->save();
+        clog('edit','success','a modifié un ocom',\Auth::User()->id);
+        return redirect('/admin/ocom/'.$id);
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param OCOM $oCOM
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        OCOM::find($id)->delete();
+    }
+
+    public function jsonList()
+    {
+        $ocoms = OCOM::all();
+
+        $name = [];
+
+        foreach ($ocoms as $ocom) {
+            array_push($name, $ocom->ocom);
+        }
+
+        return json_encode($name);
+    }
+
+    public function getName(string $ocom)
+    {
+        $foo = OCOM::all()->where('ocom','=',$ocom)->first();
+        if($foo != null)
+        {
+            return $foo->objectif_competence;
+        }
+        else
+        {
+            return null;
+        }
+    }
+}

app/Http/Controllers/ProfilController.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class ProfilController extends Controller
+{
+    public function courses()
+    {
+        $mode = 'future';
+        if (\request('all'))
+        {
+            $courses = \App\Course::allForAuthUser();
+            $mode = 'all';
+        }
+        else
+        {
+            $courses = \App\Course::allFutureForAuthUser();
+        }
+        return view('admin.user.profil.courses',['courses' => $courses,'mode' => $mode]);
+    }
+}

app/Http/Controllers/ScheduleController.php

@@ -11,49 +11,21 @@ class ScheduleController extends Controller
 {
     public function index()
     {
-        return view('admin.configs.schedule',['configs' => \App\Config::all()]);
+        return view('admin.configs.schedule',['configs' => \App\Config::all(),'events_type' => \App\EventType::all()]);
     }
 
-    public function update()
+    public function update(Request $request)
     {
-        $configs = ['admin_periode_nb'];
+        $instruction_year_begin = \App\Config::find('instruction_year_begin');
+        $instruction_year_end = \App\Config::find('instruction_year_end');
 
-        foreach ($configs as $config) {
-            $c = \App\Config::all()->where('name',$config)->first();
-            $c->data = [request($config)];
-            $c->save();
-        }
+        $instruction_year_begin->data = [date('Y-m-d',strtotime($request->instruction_year_begin))];
+        $instruction_year_end->data = [date('Y-m-d',strtotime($request->instruction_year_end))];
 
-        $new_admin_periode_begin = [];
-        $new_admin_periode_end = [];
-        for ($i=1; $i <= request('admin_periode_nb'); $i++) { 
-            if(request('admin_periode_begin_'.$i))
-            {
-                $new_admin_periode_begin[$i] = request('admin_periode_begin_'.$i);
-            }
-            else 
-            {
-                $new_admin_periode_begin[$i] = "00:00";
-            }
-            if(request('admin_periode_end_'.$i))
-            {
-                $new_admin_periode_end[$i] = request('admin_periode_end_'.$i);
-            }
-            else
-            {
-                $new_admin_periode_end[$i] = "00:00";
-            }
-        }
+        $instruction_year_begin->save();
+        $instruction_year_end->save();
 
-        $temp = \App\Config::all()->where('name','admin_periode_begin')->first();
-        $temp->data = $new_admin_periode_begin;
-        $temp->save();
-
-        $temp = \App\Config::all()->where('name','admin_periode_end')->first();
-        $temp->data = $new_admin_periode_end;
-        $temp->save();
-
-        return redirect('/admin/config/schedule')->with('success','Modification sauvegarder avec succès !');
+        return redirect('/admin/config/instruction')->with('success','Modification sauvegarder avec succès !');
     }
 
     public function apiIndex()
@@ -89,8 +61,8 @@ class ScheduleController extends Controller
             
             $event = [
                 'title' => $schedule->data['event_name'],
-                'start' => $schedule->date.'T'.$schedule->data['event_begin_time'],
-                'end' => $schedule->date.'T'.$schedule->data['event_end_time'],
+                'start' => date('c',strtotime($schedule->date.'T'.$schedule->data['event_begin_time'])),
+                'end' => date('c',strtotime($schedule->date.'T'.$schedule->data['event_end_time'])),
                 'color' => $color,
                 'source' => 'schedule',
                 'id' => $schedule->id
@@ -100,7 +72,23 @@ class ScheduleController extends Controller
 
         foreach ($events as $event) {
 
+            if($event->calendar_color == null)
+            {
                 $color = $this->getColor($event->type);
+            }
+            else
+            {
+                $color = $event->calendar_color;
+            }
+
+            if($event->calendar_icon == null)
+            {
+                $icon = "";
+            }
+            else
+            {
+                $icon = $event->calendar_icon;
+            }
 
             $myevent = [
                 'title' => $event->name,
@@ -109,7 +97,8 @@ class ScheduleController extends Controller
                 'color' => $color,
                 'extraParams' => [
                     'db_type' => 'event'],
-                'id' => $event->id
+                'id' => $event->id,
+                'icon' => $icon
             ];
             array_push($jsonevents,$myevent);
         }
@@ -227,7 +216,10 @@ class ScheduleController extends Controller
     public function delete($id)
     {
         $event  = \App\Event::find($id);
-
+        foreach ($event->courses as $course)
+        {
+            $course->delete();
+        }
         $event->delete();
     }
 }

app/Http/Controllers/ScheduleEditorController.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class ScheduleEditorController extends Controller
+{
+    public function getCourse(int $id = null)
+    {
+        return view('admin.schedule.editor.course');
+    }
+
+    public function getCourseEmpty(int $niveau,int $periode,$event_type = 1)
+    {
+        $eventType = \App\EventType::findOrFail($event_type);
+        $data = $eventType->getScheduleModelData($niveau,$periode);
+        $ocom = $data['ocom'];
+        $name = $data['name'];
+        $location = $data['location'];
+        $instructor = $data['instructor'];
+        $desc = $data['desc'];
+
+        return view('admin.schedule.editor.course',[
+            'periode' => $periode,
+            'niveau' => $niveau,
+            'ocom' => $ocom,
+            'name' => $name,
+            'location' => $location,
+            'instructor' => $instructor,
+            'desc' => $desc]);
+    }
+
+    public function getTemplate(int $id)
+    {
+        return view('admin.schedule.editor.template',["eventType" => \App\EventType::find($id)]);
+    }
+
+    public function getEventTemplate(int $id)
+    {
+        $eventType = \App\EventType::find($id);
+
+        return json_encode($eventType);
+    }
+
+    public function getEmptyPeriode(int $id)
+    {
+        return view('admin.schedule.editor.periode',[
+            'periode_name' => 'Periode '.$id,
+            'periode_begin_time' => '00:00',
+            'periode_end_time' => '00:00',
+            'periode_id' => $id,
+            'nbLevel' => request('nblevel')
+        ]);
+    }
+
+    public function getEmptyLevel(int $id)
+    {
+        return view('admin.schedule.editor.level',['periode_id' => \request('nbPeriode'),'level_id' => $id]);
+    }
+
+    public function getLevelHeader(int $id)
+    {
+        return view('admin.schedule.editor.levelHeader',['level_id' => $id,'level_name' => 'Niveau '.$id]);
+    }
+}

app/Http/Controllers/StatsController.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use phpDocumentor\Reflection\Types\Collection;
+
+class StatsController extends Controller
+{
+    public function instruction()
+    {
+        $instructorUTTD = collect();
+
+        $coursesTY = \App\Course::allThisYear();
+        $nbCoursePlanDoneTY = 0;
+        $nbCoursePlanDoneAndCheckTY = 0;
+        foreach ($coursesTY as $course)
+        {
+            if ($course->lessonPlan)
+            {
+                if ($course->lessonPlan->approved)
+                {
+                    $nbCoursePlanDoneAndCheckTY++;
+                }
+                else
+                {
+                    $nbCoursePlanDoneTY++;
+                }
+            }
+        }
+
+        $coursesUTTD = clone $coursesTY;
+        $nbCoursePlanDoneUTDP = 0;
+        $nbCoursePlanDoneAndCheckUTDP = 0;
+        foreach ($coursesUTTD as $key => $course)
+        {
+            if (date('c',strtotime($course->event->date_begin)) >= date('c'))
+            {
+                $coursesUTTD->forget($key);
+            }
+            else
+            {
+                $instructorUTTD->push($course->instructor());
+                if ($course->lessonPlan)
+                {
+                    if ($course->lessonPlan->approved)
+                    {
+                        $nbCoursePlanDoneAndCheckUTDP++;
+                    }
+                    else
+                    {
+                        $nbCoursePlanDoneUTDP++;
+                    }
+                }
+            }
+        }
+        $instructorUTTD = $instructorUTTD->unique();
+        $eventTY = \App\Event::allThisYear();
+        $eventUTTD = clone $eventTY;
+        foreach ($eventUTTD as $key => $event)
+        {
+            if (date('c',strtotime($event->date_begin)) >= date('c'))
+            {
+                $eventUTTD->forget($key);
+            }
+        }
+
+        return view('admin.stats.instruction',[
+            'nbCourseThisYear' => count($coursesTY),
+            'nbInstructorUpToThisDay' => count($instructorUTTD),
+            'nbEventThisYear' => count($eventTY),
+            'nbEventUpToThisDay' => count($eventUTTD),
+            'nbCourseUpToThisDay' => count($coursesUTTD),
+            'nbCoursePlanDoneUTDP' => $nbCoursePlanDoneUTDP,
+            'nbCoursePlanDoneTY' => $nbCoursePlanDoneTY,
+            'nbCoursePlanDoneAndCheckUTDP' => $nbCoursePlanDoneAndCheckUTDP,
+            'nbCoursePlanDoneAndCheckTY' => $nbCoursePlanDoneAndCheckTY,
+            'nbCourseInDB' => count(\App\OCOM::all()),
+        ]);
+    }
+}

app/Http/Controllers/UserController.php

@@ -49,13 +49,13 @@ class UserController extends Controller
         $user->email = request('email');
 
         if (request('adresse') == null) {
-            $user->adress = "Inconnu";
+            $user->adress = "";
         } else {
             $user->adress = request('adresse');
         }
 
         if (request('telephone') == null) {
-            $user->telephone = "Inconnu";
+            $user->telephone = "";
         } else {
             $user->telephone = request('telephone');
         }
@@ -63,7 +63,7 @@ class UserController extends Controller
         $user->sexe = request('sexe');
 
         if (request('age') == null) {
-            $user->age = "Inconnu";
+            $user->age = "";
         } else {
             $user->age = request('age');
         }
@@ -122,13 +122,13 @@ class UserController extends Controller
         $user->email = request('email');
 
         if (request('adresse') == null) {
-            $user->adress = "Inconnu";
+            $user->adress = "";
         } else {
             $user->adress = request('adresse');
         }
 
         if (request('telephone') == null) {
-            $user->telephone = "Inconnu";
+            $user->telephone = "";
         } else {
             $user->telephone = request('telephone');
         }
@@ -136,7 +136,7 @@ class UserController extends Controller
         $user->sexe = request('sexe');
 
         if (request('age') == null) {
-            $user->age = "Inconnu";
+            $user->age = "";
         } else {
             $user->age = request('age');
         }
@@ -262,4 +262,19 @@ class UserController extends Controller
 
         return json_encode($name);
     }
+
+    public function showCourses($id)
+    {
+        return view('admin.user.courses',['courses' => User::find($id)->courses]);
+    }
+
+    public function showCourse($id,$course_id)
+    {
+        return view('admin.user.course',['courses' => User::find($id)->courses]);
+    }
+
+    public function userNotification()
+    {
+        return view('admin.user.profil.notifications',['notifications' => \Auth::user()->notifications]);
+    }
 }

app/Http/Kernel.php

@@ -62,5 +62,8 @@ class Kernel extends HttpKernel
         'staff' => \App\Http\Middleware\AccesStaff::class,
         'admin' => \App\Http\Middleware\AccesAdmin::class,
         'perm' => \App\Http\Middleware\CheckPerm::class,
+        'fileperm' => \App\Http\Middleware\CheckFilePerm::class,
+        'courseperm' => \App\Http\Middleware\CheckCoursePerm::class,
+        'firstlogin' => \App\Http\Middleware\FirstLogin::class
     ];
 }

app/Http/Middleware/CheckCoursePerm.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class CheckCoursePerm
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next,$perm = 'see')
+    {
+        $course = \App\Course::findOrFail($request->id);
+
+        if (\Auth::user()->id == $course->user_id)
+        {
+            if ($perm == 'see' || $perm == 'edit')
+            {
+                return $next($request);
+            }
+        }
+
+        if (\Auth::user()->p('course_'.$perm.'_all') == 1)
+        {
+            return $next($request);
+        }
+        if (\Auth::user()->p('course_'.$perm) == 1)
+        {
+            return $next($request);
+        }
+        if ($perm == 'validate_plan')
+        {
+            abort(401);
+        }
+        clog('navigate','danger','L\'utilisateur n\'est pas autorisé à effectuer cette action',\Auth::user()->id);
+        return redirect('/admin')->with('error','Vous n\'êtes pas autorisé à effectuer cette action');
+    }
+}

app/Http/Middleware/CheckFilePerm.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\User;
+use Closure;
+use \App\GoogleDriveFile;
+use \App\Config;
+
+class CheckFilePerm
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next,$type,$permission = 'r')
+    {
+        if (GoogleDriveFile::checkConfig() && Config::getData('is_Google_Drive_enabled') == 'true')
+        {
+            // Get folder
+            if (isset($request->folder))
+            {
+                $folder = $request->folder;
+            }
+            else
+            {
+                $folder = $request->d;
+            }
+            $dir = GoogleDriveFile::find($folder);
+
+            // Check if $folder is root directory or $dir is null
+            if ($folder == "" || $dir == null)
+            {
+                if (\Auth::check())
+                {
+                    if ($permission == 'r')
+                    {
+                        return $next($request);
+                    }
+                    else
+                    {
+                        if (\Auth::user()->p('file_manage') === 1)
+                        {
+                            return $next($request);
+                        }
+                    }
+                }
+                abort(401,'Pas connecter');
+            }
+
+            // Check for specific folder permission
+            if ($dir != null)
+            {
+                if (\Auth::check())
+                {
+                    if (!$dir->canAuthUser($permission))
+                    {
+                        clog('navigate','danger','Vous n\'avez pas la permission d\'accéder',\Auth::user()->id);
+                        return redirect('/admin')->with('error','Vous n\'avez pas la permission d\'accéder');
+                    }
+                }
+                else
+                {
+                    if (strpos($dir->getPermission('rank.0'),$permission) === false)
+                    {
+                        clog('navigate','danger','Un utilisateur non authentifié tente d\'accéder a un dossier privé','0');
+                        abort(401,'Vous n\'avez pas la permission d\'accéder');
+                    }
+                }
+                return $next($request);
+            }
+        }
+        else
+        {
+            clog('navigate','danger','Google Drive n\'est pas activé ou les identifiants sont incorrect',\Auth::user()->id);
+            return redirect('/admin')->with('error','Google Drive n\'est pas activé ou les identifiants sont incorrect');
+        }
+        return abort(500,'Wow... Aucune idée comment ce qui viens d\'arriver');
+    }
+}

app/Http/Middleware/FirstLogin.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+
+class FirstLogin
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if ($request->isMethod('get'))
+        {
+            if (\Auth::user()->use_default_psw == true)
+            {
+                return redirect('/admin/setup');
+            }
+        }
+        return $next($request);
+    }
+}

app/Http/helpers.php

@@ -48,6 +48,7 @@ function clog(string $type,string $result,string $event,$user_id = null,$obj_typ
         $log->user_id = \Auth::User()->id;
     }
 
+
     if ($obj_type != null)
     {
         $log->logable_type = $obj_type;
@@ -73,3 +74,35 @@ function clogNav($event)
 {
     clog('navigate','success',$event);
 }
+
+function GetSizeName($octet)
+{
+    // Array contenant les differents unités
+    $unite = array('octet','ko','mo','go');
+
+    if ($octet < 1000) // octet
+    {
+        return $octet.' '.$unite[0];
+    }
+    else
+    {
+        if ($octet < 1000000) // ko
+        {
+            $ko = round($octet/1024,2);
+            return $ko.' '.$unite[1];
+        }
+        else // Mo ou Go
+        {
+            if ($octet < 1000000000) // Mo
+            {
+                $mo = round($octet/(1024*1024),2);
+                return $mo.' '.$unite[2];
+            }
+            else // Go
+            {
+                $go = round($octet/(1024*1024*1024),2);
+                return $go.' '.$unite[3];
+            }
+        }
+    }
+}

app/Item.php

@@ -6,6 +6,34 @@ use Illuminate\Database\Eloquent\Model;
 use mysql_xdevapi\Collection;
 use function foo\func;
 
+/**
+ * App\Item
+ *
+ * @property int $id
+ * @property int $category_id
+ * @property int $quantity
+ * @property string $name
+ * @property string $official_number
+ * @property string $desc
+ * @property array $metadata
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Booking[] $bookings
+ * @property-read int|null $bookings_count
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Item newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Item newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Item query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Item whereCategoryId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Item whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Item whereDesc($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Item whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Item whereMetadata($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Item whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Item whereOfficialNumber($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Item whereQuantity($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Item whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class Item extends Model
 {
     public static function explodeItems($items)

app/ItemCategory.php

@@ -4,6 +4,32 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\ItemCategory
+ *
+ * @property int $id
+ * @property string $name
+ * @property string $desc
+ * @property int $is_training
+ * @property int $is_op_appro
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Item[] $items
+ * @property-read int|null $items_count
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Log[] $logs
+ * @property-read int|null $logs_count
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ItemCategory newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ItemCategory newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ItemCategory query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ItemCategory whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ItemCategory whereDesc($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ItemCategory whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ItemCategory whereIsOpAppro($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ItemCategory whereIsTraining($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ItemCategory whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\ItemCategory whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class ItemCategory extends Model
 {
     public function items()

app/Job.php

@@ -4,6 +4,26 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Job
+ *
+ * @property int $id
+ * @property string $name
+ * @property string $desc
+ * @property string $permissions
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Job newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Job newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Job query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Job whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Job whereDesc($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Job whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Job whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Job wherePermissions($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Job whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class Job extends Model
 {
     public function permissions()

app/LessonPlan.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * App\LessonPlan
+ *
+ * @property int $id
+ * @property int $user_id
+ * @property string $file
+ * @property int|null $course_id
+ * @property string|null $desc
+ * @property string|null $comment
+ * @property int $approved
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Course|null $course
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\LessonPlan newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\LessonPlan newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\LessonPlan query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\LessonPlan whereApproved($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\LessonPlan whereComment($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\LessonPlan whereCourseId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\LessonPlan whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\LessonPlan whereDesc($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\LessonPlan whereFile($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\LessonPlan whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\LessonPlan whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\LessonPlan whereUserId($value)
+ * @mixin \Eloquent
+ */
+class LessonPlan extends Model
+{
+    public function course()
+    {
+        return $this->belongsTo('App\Course');
+    }
+}

app/Local.php

@@ -4,6 +4,24 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Local
+ *
+ * @property int $id
+ * @property string $name
+ * @property string $desc
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Local newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Local newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Local query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Local whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Local whereDesc($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Local whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Local whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Local whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class Local extends Model
 {
     //

app/Log.php

@@ -4,6 +4,34 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Log
+ *
+ * @property int $id
+ * @property string $type
+ * @property string $result
+ * @property string $event
+ * @property int $user_id
+ * @property string $logable_type
+ * @property int $logable_id
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $logable
+ * @property-read \App\User $user
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Log newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Log newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Log query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Log whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Log whereEvent($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Log whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Log whereLogableId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Log whereLogableType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Log whereResult($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Log whereType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Log whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Log whereUserId($value)
+ * @mixin \Eloquent
+ */
 class Log extends Model
 {
     public function user()

app/Message.php

@@ -4,6 +4,34 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Message
+ *
+ * @property int $id
+ * @property string $title
+ * @property string $body
+ * @property int $publish
+ * @property int $private
+ * @property int $user_id
+ * @property array $data
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Log[] $logs
+ * @property-read int|null $logs_count
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Message newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Message newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Message query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Message whereBody($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Message whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Message whereData($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Message whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Message wherePrivate($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Message wherePublish($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Message whereTitle($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Message whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Message whereUserId($value)
+ * @mixin \Eloquent
+ */
 class Message extends Model
 {
     protected $casts = [

app/News.php

@@ -3,7 +3,37 @@
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Date;
 
+/**
+ * App\News
+ *
+ * @property int $id
+ * @property string $title
+ * @property string $body
+ * @property int $user_id
+ * @property int $publish
+ * @property array $tags
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Log[] $logs
+ * @property-read int|null $logs_count
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Picture[] $pictures
+ * @property-read int|null $pictures_count
+ * @property-read \App\User $user
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\News newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\News newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\News query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\News whereBody($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\News whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\News whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\News wherePublish($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\News whereTags($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\News whereTitle($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\News whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\News whereUserId($value)
+ * @mixin \Eloquent
+ */
 class News extends Model
 {
     protected $casts = [
@@ -30,11 +60,11 @@ class News extends Model
 
         $news = \App\News::all();
 
-        foreach (\App\Event::future() as $event)
+        foreach (\App\Event::all() as $event)
         {
-            if($event->type == 1 && $event->msg != "")
+            if($event->use_weekly_msg == 1)
             {
-                if (date('U',strtotime($event->date_msg)) <= time())
+                if (strtotime($event->weekly_msg_publication_time) <= time())
                 {
                     $news->push(self::getWeeklyMsg($event));
                 }
@@ -50,13 +80,16 @@ class News extends Model
 
         $n->event_id = $event->id;
         $n->title = 'Message de la semaine du '.date('Y-m-d',strtotime($event->date_begin));
-        $n->body = $event->msg;
+        $n->body = $event->desc;
         $n->user_id = $event->user_id;
         $n->publish = 1;
         $n->created_at = $event->created_at;
         $n->updated_at = $event->updated_at;
         $n->tags = ['message de la semaine','Important'];
-
+        if ($event->weekly_msg_file != null)
+        {
+            $n->files = $event->weekly_msg_file;
+        }
         return $n;
     }
 }

app/Notifications/Alert.php

@@ -3,6 +3,7 @@
 namespace App\Notifications;
 
 use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Messages\BroadcastMessage;
 use Illuminate\Notifications\Notification;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
@@ -13,6 +14,7 @@ class Alert extends Notification
 
     protected $fromUser;
     protected $myNotification;
+    private $myUrl;
 
     /**
      * Create a new notification instance.
@@ -34,7 +36,7 @@ class Alert extends Notification
      */
     public function via($notifiable)
     {
-        return ['database'];
+        return ['database','broadcast'];
     }
 
     /**
@@ -51,4 +53,18 @@ class Alert extends Notification
             'url' => $this->myUrl,
         ];
     }
+
+    public function toBroadcast($notifiable)
+    {
+        return new BroadcastMessage([
+            'from' => $this->fromUser,
+            'msg' => $this->myNotification,
+            'url' => $this->myUrl,
+        ]);
+    }
+
+    public function broadcastType()
+    {
+        return 'notification.alert';
+    }
 }

app/Notifications/ScheduleNotification.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Notifications;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class ScheduleNotification extends Notification
+{
+    use Queueable;
+
+    protected String $name;
+    protected String $msg;
+    protected String $url;
+    protected String $icon;
+
+    /**
+     * Create a new notification instance.
+     *
+     * @param String $name
+     * @param String $msg
+     * @param String $url
+     */
+    public function __construct(String $name,String $msg,String $url)
+    {
+        $this->name = $name;
+        $this->msg = $msg;
+        $this->url = $url;
+        $this->icon = '<i class="far fa-calendar"></i>';
+    }
+
+    /**
+     * Get the notification's delivery channels.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function via($notifiable)
+    {
+        return ['database','broadcast'];
+    }
+
+    /**
+     * Get the array representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function toArray($notifiable)
+    {
+        return [
+            'name' => $this->name,
+            'msg' => $this->msg,
+            'url' => $this->url,
+            'icon' => $this->icon
+        ];
+    }
+
+    public function broadcastType()
+    {
+        return 'notification.schedule';
+    }
+}

app/Notifications/SystemNotification.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Notifications;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class SystemNotification extends Notification
+{
+    use Queueable;
+
+    /**
+     * Create a new notification instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Get the notification's delivery channels.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function via($notifiable)
+    {
+        return ['mail'];
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail($notifiable)
+    {
+        return (new MailMessage)
+                    ->line('The introduction to the notification.')
+                    ->action('Notification Action', url('/'))
+                    ->line('Thank you for using our application!');
+    }
+
+    /**
+     * Get the array representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function toArray($notifiable)
+    {
+        return [
+            //
+        ];
+    }
+}

app/OCOM.php

@@ -0,0 +1,119 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+use function GuzzleHttp\Promise\all;
+
+/**
+ * App\OCOM
+ *
+ * @property int $id
+ * @property string $ocom
+ * @property string $objectif_competence
+ * @property string $nbPeriode
+ * @property string $objectif_rendement
+ * @property string $oren
+ * @property int $complementary
+ * @property string $course_id
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\OCOM newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\OCOM newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\OCOM query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\OCOM whereComplementary($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\OCOM whereCourseId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\OCOM whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\OCOM whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\OCOM whereNbPeriode($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\OCOM whereObjectifCompetence($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\OCOM whereObjectifRendement($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\OCOM whereOcom($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\OCOM whereOren($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\OCOM whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
+class OCOM extends Model
+{
+    public function courses()
+    {
+        $courses_id = explode(',',$this->course_id);
+        $courses = collect();
+        foreach ($courses_id as $course_id)
+        {
+            $courses->push(\App\Course::find($course_id));
+        }
+        return $courses;
+    }
+
+    public function saveCourses($courses)
+    {
+        $courses_id = explode(',',$this->course_id);
+        foreach ($courses as $cours)
+        {
+            if ($cours != null){
+                array_push($courses_id,$cours->id);
+            }
+        }
+        $courses_id = array_unique($courses_id);
+        $courses_id = array_filter($courses_id);
+        $this->course_id = implode(',',$courses_id);
+        $this->save();
+    }
+
+    public function saveCourse($course)
+    {
+        $courses_id = explode(',',$this->course_id);
+        array_push($courses_id,$course->id);
+        $courses_id = array_unique($courses_id);
+        $courses_id = array_filter($courses_id);
+        $this->course_id = implode(',',$courses_id);
+        $this->save();
+    }
+
+    public function wasGiven()
+    {
+        $courses = Course::where('ocom',$this->ocom)->get();
+        $result = collect();
+        $from = strtotime(\App\Config::getData('instruction_year_begin'));
+        $to = strtotime(\App\Config::getData('instruction_year_end'));
+
+        foreach ($courses as $course)
+        {
+            $event = $course->event;
+            if (strtotime($event->date_begin) >= $from)
+            {
+                if (strtotime($event->date_begin) <= $to)
+                {
+                    $result->push($course->id);
+                }
+            }
+        }
+        return $result;
+    }
+
+    public function updateWasGiven()
+    {
+        $this->course_id = implode(",",$this->wasGiven()->toArray());
+        $this->save();
+    }
+
+    public static function wasUpdateGivenAll()
+    {
+        $ocoms = OCOM::all();
+        foreach ($ocoms as $o)
+        {
+            $o->updateWasGiven();
+        }
+    }
+
+    public static function findByOCOM($ocom)
+    {
+        return OCOM::where('ocom','=',$ocom)->first();
+    }
+
+    public function getDurationInMin()
+    {
+        return $this->nbPeriode * 30;
+    }
+}

app/Permission.php

@@ -5,6 +5,14 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Arr;
 
+/**
+ * App\Permission
+ *
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Permission newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Permission newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Permission query()
+ * @mixin \Eloquent
+ */
 class Permission extends Model
 {
     const PERMISSIONS = [
@@ -38,36 +46,6 @@ class Permission extends Model
                 'valeur' => 0
             ]
         ],
-        'message' => [
-            'msg_see' => [
-                'ckey' => 'msg_see',
-                'communName' => 'Voir les messages',
-                'desc' => 'L\'utilisateur peut-il consulter les messages de la semaine',
-                'icon' => 'fa-eye',
-                'valeur' => 0
-            ],
-            'msg_add' => [
-                'ckey' => 'msg_add',
-                'communName' => 'Ajouter un message',
-                'desc' => 'L\'utilisateur peut-il ajouter un message de la semaine',
-                'icon' => 'fa-eye',
-                'valeur' => 0
-            ],
-            'msg_edit' => [
-                'ckey' => 'msg_edit',
-                'communName' => 'Modifier un message',
-                'desc' => 'L\'utilisateur peut-il modifier les messages de la semaine',
-                'icon' => 'fa-eye',
-                'valeur' => 0
-            ],
-            'msg_delete' => [
-                'ckey' => 'msg_delete',
-                'communName' => 'Supprimer un message',
-                'desc' => 'L\'utilisateur peut-il supprimer un message de la semaine',
-                'icon' => 'fa-eye',
-                'valeur' => 0
-            ]
-        ],
         'inventory' => [
             'inventory_see' => [
                 'ckey' => 'inventory_see',
@@ -98,36 +76,6 @@ class Permission extends Model
                 'valeur' => 0
             ],
         ],
-        'booking' => [
-            'booking_see' => [
-                'ckey' => 'booking_see',
-                'communName' => 'Voir les réservations',
-                'desc' => 'L\'utilisateur peut-il consulter la liste des réservations',
-                'icon' => 'fa-eye',
-                'valeur' => 0
-            ],
-            'booking_add' => [
-                'ckey' => 'booking_add',
-                'communName' => 'Ajouter une réservation',
-                'desc' => 'L\'utilisateur peut-il ajouter une réservation',
-                'icon' => 'fa-eye',
-                'valeur' => 0
-            ],
-            'booking_edit' => [
-                'ckey' => 'booking_edit',
-                'communName' => 'Modifier une réservation',
-                'desc' => 'L\'utilisateur peut-il modifier une réservation',
-                'icon' => 'fa-eye',
-                'valeur' => 0
-            ],
-            'booking_delete' => [
-                'ckey' => 'booking_delete',
-                'communName' => 'Supprimer une réservation',
-                'desc' => 'L\'utilisateur peut-il supprimer une réservation',
-                'icon' => 'fa-eye',
-                'valeur' => 0
-            ]
-        ],
         'user' => [
             'user_see' => [
                 'ckey' => 'user_see',
@@ -183,7 +131,81 @@ class Permission extends Model
                 'valeur' => 0
             ]
         ],
-        'schedule' => [
+        'Instruction' => [
+            'instruction_guide_see' => [
+                'ckey' => 'instruction_guide_see',
+                'communName' => 'Voir les guides pédagogiques et normes de qualifications',
+                'desc' => 'L\'utilisateur peut-il consulter les guides pédagogiques et normes de qualifications',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'instruction_db_ocom_see' => [
+                'ckey' => 'instruction_db_ocom_see',
+                'communName' => 'Voir la base de donnée de cours',
+                'desc' => 'L\'utilisateur peut-il consulter la base de donnée des cours',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'instruction_db_ocom_add' => [
+                'ckey' => 'instruction_db_ocom_add',
+                'communName' => 'Ajouter à la base de donnée de cours',
+                'desc' => 'L\'utilisateur peut-il ajouter à la base de donnée des cours',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'instruction_db_ocom_edit' => [
+                'ckey' => 'instruction_db_ocom_edit',
+                'communName' => 'Modifier la base de donnée de cours',
+                'desc' => 'L\'utilisateur peut-il modifier la base de donnée des cours',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'instruction_db_ocom_delete' => [
+                'ckey' => 'instruction_db_ocom_delete',
+                'communName' => 'Supprimer de la base de donnée de cours',
+                'desc' => 'L\'utilisateur peut-il supprimer de la base de donnée des cours',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'course_see_all' => [
+                'ckey' => 'course_see_all',
+                'communName' => 'Voir les cours de tous les utilisateurs',
+                'desc' => 'L\'utilisateur peut-il voir les cours de tous les utilisateurs',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'course_comment_officer' => [
+                'ckey' => 'course_comment_officer',
+                'communName' => 'Ajouter un commentaire sur n\'importe quel cours',
+                'desc' => 'L\'utilisateur peut-il ajouter un commentaire sur n\'importe quel cours',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'course_validate_plan' => [
+                'ckey' => 'course_validate_plan',
+                'communName' => 'Valider n\'importe quel plan de cours',
+                'desc' => 'L\'utilisateur peut-il valider n\'importe quel plan de cours',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'course_comment_plan_officer' => [
+                'ckey' => 'course_comment_plan_officer',
+                'communName' => 'Ajouter un commentaire sur n\'importe quel plan de cours',
+                'desc' => 'L\'utilisateur peut-il ajouter un commentaire sur n\'importe quel plan de cours',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+        ],
+        'Administration' => [
+            'cadet_list_see' => [
+                'ckey' => 'cadet_list_see',
+                'communName' => 'Voir la liste nominative',
+                'desc' => 'L\'utilisateur peut-il voir la liste nominative',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+        ],
+        'Horaire' => [
             'schedule_see' => [
                 'ckey' => 'schedule_see',
                 'communName' => 'Voir l\'horaire',
@@ -272,6 +294,22 @@ class Permission extends Model
                 'icon' => 'fa-eye',
                 'valeur' => 0
             ],
+        ],
+        'file' => [
+            'file_see' => [
+                'ckey' => 'file_see',
+                'communName' => 'Voir les fichiers publiques',
+                'desc' => 'L\'utilisateur peut-il consulter les fichiers publiques',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'drive_see' => [
+                'ckey' => 'drive_see',
+                'communName' => 'Voir l\'explorateur de fichier',
+                'desc' => 'L\'utilisateur peut-il consulter l\'explorateur de fichier',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
         ]
     ];
 

app/Picture.php

@@ -4,6 +4,33 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Picture
+ *
+ * @property int $id
+ * @property string $url
+ * @property string $title
+ * @property string $desc
+ * @property int $pictureable_id
+ * @property string $pictureable_type
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Log[] $logs
+ * @property-read int|null $logs_count
+ * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $pictureable
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Picture newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Picture newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Picture query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Picture whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Picture whereDesc($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Picture whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Picture wherePictureableId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Picture wherePictureableType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Picture whereTitle($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Picture whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Picture whereUrl($value)
+ * @mixin \Eloquent
+ */
 class Picture extends Model
 {
     public function pictureable()

app/Providers/AppServiceProvider.php

@@ -6,6 +6,7 @@ use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Collection;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Facades\Blade;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -40,6 +41,14 @@ class AppServiceProvider extends ServiceProvider
                 ]
             );
         });
+
+        Blade::directive('loaderDot', function () {
+               return '<div class="text-center"><div class="lds-ellipsis"><div></div><div></div><div></div><div></div></div></div>';
+        });
+
+        Blade::directive('loaderRipple', function () {
+            return '<div class="lds-ripple"><div></div><div></div></div>';
+        });
     }
 
     /**

app/Providers/GoogleDriveServiceProvider.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\ServiceProvider;
+use Hypweb\Flysystem\GoogleDrive\GoogleDriveAdapter;
+
+class GoogleDriveServiceProvider extends ServiceProvider
+{
+    /**
+     * Register services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        //
+    }
+
+    /**
+     * Bootstrap services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        \Storage::extend('google', function($app, $config) {
+            $client = new \Google_Client();
+            $client->setClientId(\Crypt::decryptString(\App\Config::getData('GOOGLE_DRIVE_CLIENT_ID')));
+            $client->setClientSecret(\Crypt::decryptString(\App\Config::getData('GOOGLE_DRIVE_CLIENT_SECRET')));
+            $client->refreshToken(\Crypt::decryptString(\App\Config::getData('GOOGLE_DRIVE_REFRESH_TOKEN')));
+            $service = new \Google_Service_Drive($client);
+
+            $options = [];
+            if(isset($config['teamDriveId'])) {
+                $options['teamDriveId'] = $config['teamDriveId'];
+            }
+
+            $adapter = new GoogleDriveAdapter($service, \Crypt::decryptString(\App\Config::getData('GOOGLE_DRIVE_FOLDER_ID')), $options);
+
+            return new \League\Flysystem\Filesystem($adapter);
+        });
+    }
+}

app/Providers/TelescopeServiceProvider.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\Facades\Gate;
+use Laravel\Telescope\IncomingEntry;
+use Laravel\Telescope\Telescope;
+use Laravel\Telescope\TelescopeApplicationServiceProvider;
+
+class TelescopeServiceProvider extends TelescopeApplicationServiceProvider
+{
+    /**
+     * Register any application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        // Telescope::night();
+
+        $this->hideSensitiveRequestDetails();
+
+        Telescope::filter(function (IncomingEntry $entry) {
+            if ($this->app->environment('local')) {
+                return true;
+            }
+
+            return $entry->isReportableException() ||
+                   $entry->isFailedRequest() ||
+                   $entry->isFailedJob() ||
+                   $entry->isScheduledTask() ||
+                   $entry->hasMonitoredTag();
+        });
+    }
+
+    /**
+     * Prevent sensitive request details from being logged by Telescope.
+     *
+     * @return void
+     */
+    protected function hideSensitiveRequestDetails()
+    {
+        if ($this->app->environment('local')) {
+            return;
+        }
+
+        Telescope::hideRequestParameters(['_token']);
+
+        Telescope::hideRequestHeaders([
+            'cookie',
+            'x-csrf-token',
+            'x-xsrf-token',
+        ]);
+    }
+
+    /**
+     * Register the Telescope gate.
+     *
+     * This gate determines who can access Telescope in non-local environments.
+     *
+     * @return void
+     */
+    protected function gate()
+    {
+        Gate::define('viewTelescope', function ($user) {
+            return in_array($user->email, [
+                'admin@exvps.ca'
+            ]);
+        });
+    }
+}

app/Rank.php

@@ -4,6 +4,28 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Rank
+ *
+ * @property int $id
+ * @property string $name
+ * @property string $desc
+ * @property string $acces_level
+ * @property string $permissions
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Rank newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Rank newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Rank query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Rank whereAccesLevel($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Rank whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Rank whereDesc($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Rank whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Rank whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Rank wherePermissions($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Rank whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class Rank extends Model
 {
     public function permissions()

app/Schedule.php

@@ -5,6 +5,38 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Item;
 
+/**
+ * App\Schedule
+ *
+ * @property int $id
+ * @property string $date
+ * @property string $type
+ * @property string $n1_p1_item
+ * @property string $n1_p2_item
+ * @property string $n2_p1_item
+ * @property string $n2_p2_item
+ * @property string $n3_p1_item
+ * @property string $n3_p2_item
+ * @property array $data
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Schedule newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Schedule newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Schedule query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Schedule whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Schedule whereData($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Schedule whereDate($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Schedule whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Schedule whereN1P1Item($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Schedule whereN1P2Item($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Schedule whereN2P1Item($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Schedule whereN2P2Item($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Schedule whereN3P1Item($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Schedule whereN3P2Item($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Schedule whereType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Schedule whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class Schedule extends Model
 {
     protected $casts = [

app/Task.php

@@ -4,6 +4,27 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Task
+ *
+ * @property int $id
+ * @property int $priority
+ * @property string $body
+ * @property int $completed
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Task incomplete()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Task newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Task newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Task query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Task whereBody($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Task whereCompleted($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Task whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Task whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Task wherePriority($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Task whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class Task extends Model
 {
     public function scopeIncomplete($query)

app/User.php

@@ -2,9 +2,67 @@
 
 namespace App;
 
+use Carbon\Carbon;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Foundation\Auth\User as Authenticatable;
+use phpDocumentor\Reflection\Types\Collection;
 
+/**
+ * App\User
+ *
+ * @property int $id
+ * @property string $firstname
+ * @property string $lastname
+ * @property string $email
+ * @property string $password
+ * @property string $rank_id
+ * @property string $adress
+ * @property string $telephone
+ * @property string $age
+ * @property string $avatar
+ * @property string $sexe
+ * @property string $job_id
+ * @property string $api_token
+ * @property string|null $remember_token
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Booking[] $bookings
+ * @property-read int|null $bookings_count
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Course[] $courses
+ * @property-read int|null $courses_count
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Event[] $events
+ * @property-read int|null $events_count
+ * @property-read \App\Job $job
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Log[] $logs
+ * @property-read int|null $logs_count
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Message[] $messages
+ * @property-read int|null $messages_count
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\News[] $news
+ * @property-read int|null $news_count
+ * @property-read \Illuminate\Notifications\DatabaseNotificationCollection|\Illuminate\Notifications\DatabaseNotification[] $notifications
+ * @property-read int|null $notifications_count
+ * @property-read \App\Rank $rank
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\User newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\User newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\User query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereAdress($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereAge($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereApiToken($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereAvatar($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereEmail($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereFirstname($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereJobId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereLastname($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\User wherePassword($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereRankId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereRememberToken($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereSexe($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereTelephone($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class User extends Authenticatable
 {
     use Notifiable;
@@ -77,18 +135,7 @@ class User extends Authenticatable
 
     public function futureCourses()
     {
-        $filterCourse = collect();
-        foreach (\Auth::user()->courses as $course)
-        {
-            if($course->event)
-            {
-                if(date('U',strtotime($course->event->date_begin)) >= date('U'))
-                {
-                    $filterCourse->push($course);
-                }
-            }
-        }
-        return $filterCourse;
+        return \App\Course::allFutureForUser($this->id);
     }
 
     public function routeNotificationForNexmo($notification)
@@ -310,6 +357,10 @@ class User extends Authenticatable
     {
         if ($this->job->permission($perm) == 0)
         {
+            if ($this->rank->id == 1)
+            {
+                return 1;
+            }
             return $this->rank->permission($perm);
         }
         else
@@ -322,4 +373,18 @@ class User extends Authenticatable
     {
         return $this->permission($perm);
     }
+
+    public function getNotificationByDay()
+    {
+        return \Auth::user()->notifications->groupBy(function ($val) {
+            return Carbon::parse($val->created_at)->format('Y-m-d');
+        });
+    }
+
+    public function getNotificationForUI(int $number = 8)
+    {
+        return \Auth::user()->notifications->take($number)->groupBy(function ($val) {
+            return Carbon::parse($val->created_at)->format('Y-m-d');
+        });
+    }
 }

composer.json

@@ -5,21 +5,32 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.4",
         "barryvdh/laravel-dompdf": "^0.8.4",
-        "barryvdh/laravel-ide-helper": "v2.6.2",
+        "barryvdh/laravel-ide-helper": "2.7.0",
+        "davejamesmiller/laravel-breadcrumbs": "5.3.2",
+        "facade/ignition": "^2.0",
         "fideloper/proxy": "^4.0",
         "guzzlehttp/guzzle": "^6.3",
-        "laravel/framework": "5.6.*",
-        "laravel/tinker": "^1.0",
-        "nexmo/client": "^1.4"
+        "laravel/framework": "^7.0",
+        "laravel/helpers": "^1.1",
+        "laravel/nexmo-notification-channel": "^2.2",
+        "laravel/telescope": "^3.5",
+        "laravel/tinker": "^2.0",
+        "laravel/ui": "^2.0",
+        "nao-pon/flysystem-google-drive": "^1.1",
+        "nexmo/client": "^2.0",
+        "pragmarx/version": "^1.2",
+        "pusher/pusher-php-server": "~4.0"
     },
     "require-dev": {
         "filp/whoops": "^2.0",
         "fzaninotto/faker": "^1.4",
+        "laravel/dusk": "^5.6",
         "mockery/mockery": "^1.0",
-        "nunomaduro/collision": "^2.0",
-        "phpunit/phpunit": "^7.0"
+        "nunomaduro/collision": "^4.1",
+        "phpunit/phpunit": "^8.5",
+        "staudenmeir/dusk-updater": "^1.1"
     },
     "autoload": {
         "classmap": [
@@ -51,7 +62,8 @@
         ],
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-            "@php artisan package:discover"
+            "@php artisan package:discover",
+            "@php artisan version"
         ]
     },
     "config": {

config/app.php

@@ -63,7 +63,7 @@ return [
     |
     */
 
-    'version' => "3.0.2b",
+    'version' => "3.2.5.",
 
     /*
     |--------------------------------------------------------------------------
@@ -170,9 +170,11 @@ return [
          */
         App\Providers\AppServiceProvider::class,
         App\Providers\AuthServiceProvider::class,
-        // App\Providers\BroadcastServiceProvider::class,
+        App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
+        App\Providers\TelescopeServiceProvider::class,
+        App\Providers\GoogleDriveServiceProvider::class,
 
     ],
 

config/breadcrumbs.php

@@ -0,0 +1,75 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | View Name
+    |--------------------------------------------------------------------------
+    |
+    | Choose a view to display when Breadcrumbs::render() is called.
+    | Built in templates are:
+    |
+    | - 'breadcrumbs::bootstrap4'  - Bootstrap 4
+    | - 'breadcrumbs::bootstrap3'  - Bootstrap 3
+    | - 'breadcrumbs::bootstrap2'  - Bootstrap 2
+    | - 'breadcrumbs::bulma'       - Bulma
+    | - 'breadcrumbs::foundation6' - Foundation 6
+    | - 'breadcrumbs::materialize' - Materialize
+    | - 'breadcrumbs::uikit'       - UIkit
+    | - 'breadcrumbs::json-ld'     - JSON-LD Structured Data
+    |
+    | Or a custom view, e.g. '_partials/breadcrumbs'.
+    |
+    */
+
+    'view' => 'breadcrumbs::bootstrap4',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Breadcrumbs File(s)
+    |--------------------------------------------------------------------------
+    |
+    | The file(s) where breadcrumbs are defined. e.g.
+    |
+    | - base_path('routes/breadcrumbs.php')
+    | - glob(base_path('breadcrumbs/*.php'))
+    |
+    */
+
+    'files' => base_path('routes/breadcrumbs.php'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Exceptions
+    |--------------------------------------------------------------------------
+    |
+    | Determine when to throw an exception.
+    |
+    */
+
+    // When route-bound breadcrumbs are used but the current route doesn't have a name (UnnamedRouteException)
+    'unnamed-route-exception' => false,
+
+    // When route-bound breadcrumbs are used and the matching breadcrumb doesn't exist (InvalidBreadcrumbException)
+    'missing-route-bound-breadcrumb-exception' => false,
+
+    // When a named breadcrumb is used but doesn't exist (InvalidBreadcrumbException)
+    'invalid-named-breadcrumb-exception' => true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Classes
+    |--------------------------------------------------------------------------
+    |
+    | Subclass the default classes for more advanced customisations.
+    |
+    */
+
+    // Manager
+    'manager-class' => DaveJamesMiller\Breadcrumbs\BreadcrumbsManager::class,
+
+    // Generator
+    'generator-class' => DaveJamesMiller\Breadcrumbs\BreadcrumbsGenerator::class,
+
+];

config/filesystems.php

@@ -26,7 +26,7 @@ return [
     |
     */
 
-    'cloud' => env('FILESYSTEM_CLOUD', 's3'),
+    'cloud' => env('FILESYSTEM_CLOUD', 'google'),
 
     /*
     |--------------------------------------------------------------------------
@@ -55,13 +55,13 @@ return [
             'visibility' => 'public',
         ],
 
-        's3' => [
-            'driver' => 's3',
-            'key' => env('AWS_ACCESS_KEY_ID'),
-            'secret' => env('AWS_SECRET_ACCESS_KEY'),
-            'region' => env('AWS_DEFAULT_REGION'),
-            'bucket' => env('AWS_BUCKET'),
-            'url' => env('AWS_URL'),
+        'google' => [
+            'driver' => 'google',
+            'clientId' => '',
+            'clientSecret' => '',
+            'refreshToken' => '',
+            'folderId' => '',
+            // 'teamDriveId' => env('GOOGLE_DRIVE_TEAM_DRIVE_ID'),
         ],
 
     ],

config/session.php

@@ -164,7 +164,7 @@ return [
     |
     */
 
-    'secure' => env('SESSION_SECURE_COOKIE', false),
+    'secure' => env('SESSION_SECURE_COOKIE', null),
 
     /*
     |--------------------------------------------------------------------------

config/telescope.php

@@ -0,0 +1,164 @@
+<?php
+
+use Laravel\Telescope\Http\Middleware\Authorize;
+use Laravel\Telescope\Watchers;
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Telescope Domain
+    |--------------------------------------------------------------------------
+    |
+    | This is the subdomain where Telescope will be accessible from. If the
+    | setting is null, Telescope will reside under the same domain as the
+    | application. Otherwise, this value will be used as the subdomain.
+    |
+    */
+
+    'domain' => env('TELESCOPE_DOMAIN', null),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Telescope Path
+    |--------------------------------------------------------------------------
+    |
+    | This is the URI path where Telescope will be accessible from. Feel free
+    | to change this path to anything you like. Note that the URI will not
+    | affect the paths of its internal API that aren't exposed to users.
+    |
+    */
+
+    'path' => env('TELESCOPE_PATH', 'admin/telescope'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Telescope Storage Driver
+    |--------------------------------------------------------------------------
+    |
+    | This configuration options determines the storage driver that will
+    | be used to store Telescope's data. In addition, you may set any
+    | custom options as needed by the particular driver you choose.
+    |
+    */
+
+    'driver' => env('TELESCOPE_DRIVER', 'database'),
+
+    'storage' => [
+        'database' => [
+            'connection' => env('DB_CONNECTION', 'mysql'),
+            'chunk' => 1000,
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Telescope Master Switch
+    |--------------------------------------------------------------------------
+    |
+    | This option may be used to disable all Telescope watchers regardless
+    | of their individual configuration, which simply provides a single
+    | and convenient way to enable or disable Telescope data storage.
+    |
+    */
+
+    'enabled' => env('TELESCOPE_ENABLED', false),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Telescope Route Middleware
+    |--------------------------------------------------------------------------
+    |
+    | These middleware will be assigned to every Telescope route, giving you
+    | the chance to add your own middleware to this list or change any of
+    | the existing middleware. Or, you can simply stick with this list.
+    |
+    */
+
+    'middleware' => [
+        'web',
+        'auth',
+        Authorize::class,
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Ignored Paths & Commands
+    |--------------------------------------------------------------------------
+    |
+    | The following array lists the URI paths and Artisan commands that will
+    | not be watched by Telescope. In addition to this list, some Laravel
+    | commands, like migrations and queue commands, are always ignored.
+    |
+    */
+
+    'ignore_paths' => [
+        'nova-api*',
+    ],
+
+    'ignore_commands' => [
+        //
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Telescope Watchers
+    |--------------------------------------------------------------------------
+    |
+    | The following array lists the "watchers" that will be registered with
+    | Telescope. The watchers gather the application's profile data when
+    | a request or task is executed. Feel free to customize this list.
+    |
+    */
+
+    'watchers' => [
+        Watchers\CacheWatcher::class => env('TELESCOPE_CACHE_WATCHER', true),
+
+        Watchers\CommandWatcher::class => [
+            'enabled' => env('TELESCOPE_COMMAND_WATCHER', true),
+            'ignore' => [],
+        ],
+
+        Watchers\DumpWatcher::class => env('TELESCOPE_DUMP_WATCHER', true),
+
+        Watchers\EventWatcher::class => [
+            'enabled' => env('TELESCOPE_EVENT_WATCHER', true),
+            'ignore' => [],
+        ],
+
+        Watchers\ExceptionWatcher::class => env('TELESCOPE_EXCEPTION_WATCHER', true),
+        Watchers\JobWatcher::class => env('TELESCOPE_JOB_WATCHER', true),
+        Watchers\LogWatcher::class => env('TELESCOPE_LOG_WATCHER', true),
+        Watchers\MailWatcher::class => env('TELESCOPE_MAIL_WATCHER', true),
+
+        Watchers\ModelWatcher::class => [
+            'enabled' => env('TELESCOPE_MODEL_WATCHER', true),
+            'events' => ['eloquent.*'],
+        ],
+
+        Watchers\NotificationWatcher::class => env('TELESCOPE_NOTIFICATION_WATCHER', true),
+
+        Watchers\QueryWatcher::class => [
+            'enabled' => env('TELESCOPE_QUERY_WATCHER', true),
+            'ignore_packages' => true,
+            'slow' => 100,
+        ],
+
+        Watchers\RedisWatcher::class => env('TELESCOPE_REDIS_WATCHER', true),
+
+        Watchers\RequestWatcher::class => [
+            'enabled' => env('TELESCOPE_REQUEST_WATCHER', true),
+            'size_limit' => env('TELESCOPE_RESPONSE_SIZE_LIMIT', 64),
+        ],
+
+        Watchers\GateWatcher::class => [
+            'enabled' => env('TELESCOPE_GATE_WATCHER', true),
+            'ignore_abilities' => [],
+            'ignore_packages' => true,
+        ],
+
+        Watchers\ScheduleWatcher::class => env('TELESCOPE_SCHEDULE_WATCHER', true),
+
+        Watchers\ViewWatcher::class => env('TELESCOPE_VIEW_WATCHER', true),
+    ],
+];

config/version.yml

@@ -0,0 +1,59 @@
+mode: absorb
+blade-directive: version
+current:
+  label: ''
+  major: 3
+  minor: 2
+  patch: 5
+  prerelease: 14-g039b09b6
+  buildmetadata: ''
+  commit: 41845
+  timestamp:
+    year: 2020
+    month: 6
+    day: 21
+    hour: 18
+    minute: 44
+    second: 55
+    timezone: America/New_York
+commit:
+  mode: git-local
+  length: 6
+  increment-by: 1
+git:
+  from: local
+  commit:
+    local: 'git rev-parse --verify HEAD'
+    remote: 'git ls-remote {$repository}'
+  branch: refs/heads/master
+  repository: ''
+  version:
+    local: 'git describe'
+    remote: 'git ls-remote {$repository} | grep tags/ | grep -v {} | cut -d / -f 3 | sort --version-sort | tail -1'
+    matcher: '/^(?P<label>[v|V]*[er]*[sion]*)[\.|\s]*(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/'
+  timestamp:
+    local: 'git show -s --format=%ci'
+    remote: 'git show -s --format=%ci origin/master'
+format:
+  regex:
+    optional_bracket: '\[(?P<prefix>.*?)(?P<spaces>\s*)(?P<delimiter>\?\=)(?P<optional>.*?)\]'
+  label: '{$label}'
+  major: '{$major}'
+  minor: '{$minor}'
+  patch: '{$patch}'
+  prerelease: '{$prerelease}'
+  buildmetadata: '{$buildmetadata}'
+  commit: '{$commit}'
+  version: 'v {$major}.{$minor}.{$patch} (commit {$commit})'
+  version-only: 'version {$major}.{$minor}.{$patch}'
+  full: '{$version-only}[.?={$prerelease}][+?={$buildmetadata}] (commit {$commit})'
+  compact: 'v{$major}.{$minor}.{$patch}-{$commit}'
+  timestamp-year: '{$timestamp.year}'
+  timestamp-month: '{$timestamp.month}'
+  timestamp-day: '{$timestamp.day}'
+  timestamp-hour: '{$timestamp.hour}'
+  timestamp-minute: '{$timestamp.minute}'
+  timestamp-second: '{$timestamp.second}'
+  timestamp-timezone: '{$timestamp.timezone}'
+  timestamp-datetime: '{$timestamp.year}-{$timestamp.month}-{$timestamp.day} {$timestamp.hour}:{$timestamp.minute}:{$timestamp.second}'
+  timestamp-full: '{$timestamp.year}-{$timestamp.month}-{$timestamp.day} {$timestamp.hour}:{$timestamp.minute}:{$timestamp.second} {$timestamp.timezone}'

database/migrations/2014_10_12_000000_create_users_table.php

@@ -20,12 +20,13 @@ class CreateUsersTable extends Migration
             $table->string('email')->unique();
             $table->string('password');
             $table->string('rank_id')->default(1);
-            $table->string('adress')->default('unknown');
-            $table->string('telephone')->default('unknown');
+            $table->string('adress')->default('');
+            $table->string('telephone')->default('');
             $table->string('age');
             $table->string('avatar')->default('1');
             $table->string('sexe');
             $table->string('job_id')->default(6);
+            $table->boolean('use_default_psw')->default(true);
             $table->string('api_token', 60)->unique()->default(str_shuffle(str_random(60)));
             $table->rememberToken();
             $table->timestamps();

database/migrations/2019_08_17_102431_create_events_table.php

@@ -22,9 +22,15 @@ class CreateEventsTable extends Migration
             $table->string('user_id');
             $table->string('location');
             $table->boolean('is_mandatory');
+            $table->boolean('use_weekly_msg');
+            $table->boolean('use_schedule');
             $table->text('desc');
             $table->text('msg');
-            $table->string('date_msg');
+            $table->string('weekly_msg_file');
+            $table->text('schedule');
+            $table->string('calendar_color');
+            $table->string('calendar_icon');
+            $table->string('weekly_msg_publication_time')->default('-5day');
             $table->timestamps();
         });
     }

database/migrations/2019_08_17_102836_create_courses_table.php

@@ -20,9 +20,11 @@ class CreateCoursesTable extends Migration
             $table->integer('periode');
             $table->integer('level');
             $table->string('location');
+            $table->text('desc');
             $table->text('comment');
+            $table->text('comment_officer');
             $table->integer('event_id');
-            $table->integer('user_id');
+            $table->string('user_id');
             $table->timestamps();
         });
     }

database/migrations/2019_12_21_165529_create_o_c_o_m_s_table.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateOCOMSTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('o_c_o_m_s', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('ocom');
+            $table->string('objectif_competence');
+            $table->string('nbPeriode');
+            $table->string('objectif_rendement');
+            $table->string('oren');
+            $table->boolean('complementary');
+            $table->string('course_id');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('o_c_o_m_s');
+    }
+}

database/migrations/2019_12_22_145445_create_event_types_table.php

@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateEventTypesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('event_types', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('name');
+            $table->text('admin_desc');
+            $table->string('calendar_color')->default('#FFFFFF');
+            $table->string('calendar_icon')->default('fa fa-question-circle');
+            $table->string('begin_time')->default('12:00');
+            $table->string('end_time')->default('13:00');
+            $table->string('location')->default('Escadron');
+            $table->boolean('is_mandatory')->default(false);
+            $table->boolean('use_weekly_msg')->default(false);
+            $table->string('weekly_msg_publication_time')->default('-5day');
+            $table->boolean('use_schedule')->default(false);
+            $table->text('schedule_model');
+            $table->boolean('is_promoted')->default(false);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('event_types');
+    }
+}

database/migrations/2020_03_17_163558_create_google_drive_file_table.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateGoogleDriveFileTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('google_drive_files', function (Blueprint $table) {
+            $table->string('id');
+            $table->index('id');
+            $table->string('type');
+            $table->string('name');
+            $table->string('path')->default('');
+            $table->string('rank_permission');
+            $table->string('job_permission');
+            $table->string('user_permission');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('google_drive_files');
+    }
+}

database/migrations/2020_04_06_142322_create_lesson_plans_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateLessonPlansTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('lesson_plans', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->integer('user_id');
+            $table->string('file');
+            $table->integer('course_id')->nullable();
+            $table->text('desc')->nullable();
+            $table->text('comment')->nullable();
+            $table->boolean('approved')->default(false);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('lesson_plans');
+    }
+}

database/migrations/2020_06_28_154026_create_websockets_statistics_entries_table.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateWebSocketsStatisticsEntriesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::create('websockets_statistics_entries', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('app_id');
+            $table->integer('peak_connection_count');
+            $table->integer('websocket_message_count');
+            $table->integer('api_message_count');
+            $table->nullableTimestamps();
+        });
+    }
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::dropIfExists('websockets_statistics_entries');
+    }
+}

database/seeds/ConfigsTableSeeder.php

@@ -231,6 +231,41 @@ class ConfigsTableSeeder extends Seeder
                 'name' => 'cadet_list',
                 'state' => 0,
                 'data' => '["#"]'
+            ],
+            [
+                'name' => 'GOOGLE_DRIVE_CLIENT_ID',
+                'state' => 0,
+                'data' => '["'.\Crypt::encryptString('').'"]'
+            ],
+            [
+                'name' => 'GOOGLE_DRIVE_CLIENT_SECRET',
+                'state' => 0,
+                'data' => '["'.\Crypt::encryptString('').'"]'
+            ],
+            [
+                'name' => 'GOOGLE_DRIVE_REFRESH_TOKEN',
+                'state' => 0,
+                'data' => '["'.\Crypt::encryptString('').'"]'
+            ],
+            [
+                'name' => 'GOOGLE_DRIVE_FOLDER_ID',
+                'state' => 0,
+                'data' => '["'.\Crypt::encryptString('null').'"]'
+            ],
+            [
+                'name' => 'is_Google_Drive_enabled',
+                'state' => 0,
+                'data' => '["false"]'
+            ],
+            [
+                'name' => 'instruction_year_begin',
+                'state' => 0,
+                'data' => '["2019-08-1"]'
+            ],
+            [
+                'name' => 'instruction_year_end',
+                'state' => 0,
+                'data' => '["2020-05-31"]'
             ]
         ];
 

database/seeds/DatabaseSeeder.php

@@ -17,6 +17,7 @@ class DatabaseSeeder extends Seeder
             ConfigsTableSeeder::class,
             UsersTableSeeder::class,
             ComplementaryActivitiesSeeder::class,
+            EventTypeSeeder::class,
         ]);
     }
 }

database/seeds/EventTypeSeeder.php

@@ -0,0 +1,47 @@
+<?php
+
+use Illuminate\Database\Seeder;
+
+class EventTypeSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        DB::table('event_types')->insert([
+            [
+                'name' => 'Par défault',
+                'calendar_color' => '#A4A4A4',
+                'calendar_icon' => 'fas fa-book',
+                'begin_time' => '18:30',
+                'end_time' => '21:45',
+                'Location' => 'Escadron',
+                'is_mandatory' => '0',
+                'use_weekly_msg' => '0',
+                'weekly_msg_publication_time' => '-5days',
+                'use_schedule' => '0',
+                'schedule_model' => '{"periodes":[{"name":"Periode 1","begin_time":"19:00","end_time":"20:10"},{"name":"Pause","begin_time":"20:10","end_time":"20:30"},{"name":"Periode 2","begin_time":"20:30","end_time":"21:20"}],"niveaux":[{"name":"Niveau 1"},{"name":"Niveau 2"},{"name":"Niveau 3"}]}',
+                'is_promoted' => '0',
+                'admin_desc' => 'Veuillez modifier la description admin par défaut',
+            ],
+            [
+                'name' => 'Soirée d\'instruction régulière',
+                'calendar_color' => 'orange',
+                'calendar_icon' => 'fas fa-book',
+                'begin_time' => '18:30',
+                'end_time' => '21:45',
+                'Location' => 'Escadron',
+                'is_mandatory' => '1',
+                'use_weekly_msg' => '1',
+                'admin_desc' => '<p><strong>/* Nom de l\'évènement */</strong></p><p>Heure (Cadets):</p><p>Lieu:</p><p>Tenue:</p><p>Matériel:</p><p>/* Commentaire */</p>',
+                'weekly_msg_publication_time' => '-5days',
+                'use_schedule' => '1',
+                'schedule_model' => '{"periodes":[{"name":"Periode 1","begin_time":"19:00","end_time":"20:10"},{"name":"Pause","begin_time":"20:10","end_time":"20:30"},{"name":"Periode 2","begin_time":"20:30","end_time":"21:20"}],"niveaux":[{"name":"Niveau 1"},{"name":"Niveau 2"},{"name":"Niveau 3"}]}',
+                'is_promoted' => '0',
+            ]
+        ]);
+    }
+}

database/seeds/UsersTableSeeder.php

@@ -18,7 +18,7 @@ class UsersTableSeeder extends Seeder
                 'email' => 'visiteur@exvps.ca',
                 'password' => bcrypt('f329er8kl2jHJGHdEj12567'),
                 'rank_id' => '1',
-                'adress' => 'Inconnu',
+                'adress' => '',
                 'age' => '99',
                 'avatar' => '3',
                 'sexe' => 'm',
@@ -31,7 +31,7 @@ class UsersTableSeeder extends Seeder
                 'email' => 'admin@exvps.ca',
                 'password' => bcrypt('SuperAdmin'),
                 'rank_id' => '1',
-                'adress' => 'Inconnu',
+                'adress' => '',
                 'age' => '99',
                 'avatar' => '3',
                 'sexe' => 'm',

package.json

@@ -10,16 +10,19 @@
         "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
     },
     "devDependencies": {
-        "axios": "^0.18",
-        "bootstrap": "^4.0.0",
-        "popper.js": "^1.12",
-        "cross-env": "^5.1",
-        "jquery": "^3.2",
-        "laravel-mix": "^2.0",
-        "lodash": "^4.17.4",
-        "vue": "^2.5.7"
+        "axios": "^0.18.1",
+        "bootstrap": "^4.5.0",
+        "cross-env": "^5.2.1",
+        "jquery": "^3.5.1",
+        "laravel-mix": "^2.1.14",
+        "lodash": "^4.17.15",
+        "popper.js": "^1.16.1",
+        "vue": "^2.6.11"
     },
     "dependencies": {
-        "sweetalert2": "^7.26.11"
+        "ajv": "^6.12.2",
+        "laravel-echo": "^1.8.0",
+        "pusher-js": "^6.0.3",
+        "sweetalert2": "^7.33.1"
     }
 }

phpunit.dusk.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false">
+    <testsuites>
+        <testsuite name="Browser Test Suite">
+            <directory suffix="Test.php">./tests/Browser</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./app</directory>
+        </whitelist>
+    </filter>
+</phpunit>

public/assets/fullcalendar/core/locales/fr-ca.js

@@ -14,7 +14,7 @@
             month: "Mois",
             week: "Semaine",
             day: "Jour",
-            list: "Mon planning"
+            list: "Liste"
         },
         weekLabel: "Sem.",
         allDayHtml: "Toute la<br/>journée",

public/css/Chart.min.css

@@ -0,0 +1 @@
+@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}

public/css/contextLoader.min.css

@@ -0,0 +1 @@
+.timeline-item{background: #fff;border: 1px solid;border-color: #e5e6e9 #dfe0e4 #d0d1d5;border-radius: 3px;padding: 2%;margin: 0 auto;width: 100%;height: 100%;}@keyframes placeHolderShimmer{0%{ background-position: -468px 0;}  100%{background-position: 468px 0;}}.animated-background{animation-duration: 1s;animation-fill-mode: forwards;animation-iteration-count: infinite;animation-name: placeHolderShimmer;animation-timing-function: linear;background: #f6f7f8;background: linear-gradient(to right, #eeeeee 8%, #dddddd 18%, #eeeeee 33%);background-size: 800px 104px;height: 96px;position: relative;}.background-masker{background: #fff;position: absolute;}.background-masker.header-top,.background-masker.header-bottom,.background-masker.subheader-bottom{top: 0;left: 40px;right: 0px;height: 10px;}.background-masker.header-left,.background-masker.subheader-left,.background-masker.header-right,.background-masker.subheader-right{top: 10px;left: 40px;height: 8px;width: 10px;}.background-masker.header-bottom{top: 18px;height: 6px;}.background-masker.subheader-left,.background-masker.subheader-right{top: 24px;height: 6px;}.background-masker.header-right,.background-masker.subheader-right{width: auto;left: 300px;right: 0px;}.background-masker.subheader-right{left: 230px;}.background-masker.subheader-bottom{top: 30px;height: 10px;}.background-masker.content-top,.background-masker.content-second-line,.background-masker.content-third-line,.background-masker.content-second-end,.background-masker.content-third-end,.background-masker.content-first-end{top: 40px;left: 0;right: 0;height: 6px;}.background-masker.content-top{height: 20px;}.background-masker.content-first-end,.background-masker.content-second-end,.background-masker.content-third-end{width: auto;left: 380px;right: 0;top: 60px;height: 8px;}.background-masker.content-second-line{top: 68px;}.background-masker.content-second-end{left: 420px;top: 74px;}.background-masker.content-third-line{top: 82px;}.background-masker.content-third-end{left: 300px;top: 88px;}

public/css/custom.css

@@ -1,8 +1,181 @@
+.text-excel {
+  color: #0f9d58;
+}
+
+.text-word {
+  color: #4b87e4;
+}
+
+.text-image {
+  color: #d93025;
+}
+
+.text-pdf {
+  color: #ea4335;
+}
+
+.text-powerpoint {
+  color: #fd7541;
+}
+
+.text-code {
+  color: #e16156;
+}
+
+.swal2-title {
+  text-transform: none !important;
+}
+
+.hover-spin:hover {
+  -webkit-animation: rotation 2s infinite linear;
+}
+
+.active-spin:active {
+  -webkit-animation: rotation 2s infinite linear;
+  border: none;
+  outline: none !important;
+}
+
+.explorerType {
+  width: 2rem !important;
+}
+
+.no-outline {
+  outline: none !important;
+}
+
+@-webkit-keyframes rotation {
+  from {
+    -webkit-transform: rotate(0deg);
+  }
+  to {
+    -webkit-transform: rotate(359deg);
+  }
+}
+
+.dropdown-notification {
+  min-width: 300px !important;
+}
+.dropdown-notification .card-header {
+  padding: 0.4rem !important;
+}
+
+.notification-success {
+  border-left: solid #4caf50 3px !important;
+}
+
+.notification-success svg {
+  color: #4caf50;
+}
+
+.notification-table td {
+  padding: 10px !important;
+  margin: 5px !important;
+}
+
+.cursor {
+  cursor: pointer;
+}
+
+.no-cursor {
+  cursor: default;
+}
+
 .word-wrap {
   white-space: normal;
   word-break: break-word;
 }
 
+.lds-ellipsis {
+  display: inline-block;
+  position: relative;
+  width: 80px;
+  height: 80px;
+}
+.lds-ellipsis div {
+  position: absolute;
+  top: 33px;
+  width: 13px;
+  height: 13px;
+  border-radius: 50%;
+  background: #dee2e6;
+  animation-timing-function: cubic-bezier(0, 1, 1, 0);
+}
+.lds-ellipsis div:nth-child(1) {
+  left: 8px;
+  animation: lds-ellipsis1 0.6s infinite;
+}
+.lds-ellipsis div:nth-child(2) {
+  left: 8px;
+  animation: lds-ellipsis2 0.6s infinite;
+}
+.lds-ellipsis div:nth-child(3) {
+  left: 32px;
+  animation: lds-ellipsis2 0.6s infinite;
+}
+.lds-ellipsis div:nth-child(4) {
+  left: 56px;
+  animation: lds-ellipsis3 0.6s infinite;
+}
+
+@keyframes lds-ellipsis1 {
+  0% {
+    transform: scale(0);
+  }
+  100% {
+    transform: scale(1);
+  }
+}
+@keyframes lds-ellipsis3 {
+  0% {
+    transform: scale(1);
+  }
+  100% {
+    transform: scale(0);
+  }
+}
+@keyframes lds-ellipsis2 {
+  0% {
+    transform: translate(0, 0);
+  }
+  100% {
+    transform: translate(24px, 0);
+  }
+}
+
+.lds-ripple {
+  display: inline-block;
+  position: relative;
+  width: 80px;
+  height: 80px;
+}
+.lds-ripple div {
+  position: absolute;
+  border: 4px solid #fff;
+  opacity: 1;
+  border-radius: 50%;
+  animation: lds-ripple 1s cubic-bezier(0, 0.2, 0.8, 1) infinite;
+}
+.lds-ripple div:nth-child(2) {
+  animation-delay: -0.5s;
+}
+@keyframes lds-ripple {
+  0% {
+    top: 36px;
+    left: 36px;
+    width: 0;
+    height: 0;progress-bar
+    opacity: 1;
+  }
+  100% {
+    top: 0px;
+    left: 0px;
+    width: 72px;
+    height: 72px;
+    opacity: 0;
+  }
+}
+
 .container-fluid {
   padding: 0px;
 }
@@ -16,7 +189,7 @@
 }
 
 .news-tags {
-  height: 1.5rem;
+  height: 2.8rem;
 }
 
 .news-body-small {
@@ -1022,13 +1195,17 @@ a.fc-more:hover {
 .fc-toolbar {
   text-align: center;
   margin-bottom: 1em;
+  flex-wrap: wrap;
 }
 
 .fc-toolbar .fc-left {
   float: left;
-h2{
-  color: rgba(0, 0, 0, 0.87);
-  font-weight: 300;
+}
+
+@media (max-width: 576px) {
+  .fc-left {
+    float: none !important;
+    width: 100%;
   }
 }
 
@@ -1667,3 +1844,67 @@ td{
 h2 {
   text-transform: capitalize !important;
 }
+
+.breadcrumb {
+  margin: auto;
+  background-color: transparent;
+}
+
+.navbar-wrapper {
+  max-width: 75%;
+}
+.progress-bar-top {
+  margin-bottom: -4px;
+  border-radius: 6px 6px 0px 0px;
+}
+
+.no-hover:hover {
+  background-color: initial;
+}
+
+tfoot > tr {
+  width: 100%;
+}
+
+.iconpicker-popover {
+  z-index: 15 !important;
+}
+
+.schedule-level-header {
+  border-right: 1px solid #dddddd;
+}
+
+.schedule-periode-container  {
+  border: 1px solid #dddddd;
+}
+
+.schedule-body>.row:nth-of-type(odd) {
+  background-color: #f2f2f2;
+}
+
+.schedule-course-container {
+  border-right: 1px solid #dddddd;
+  margin-left: -2px;
+}
+
+.schedule-container {
+  min-width: 1500px;
+}
+
+.overflow-auto {
+  overflow: auto;
+}
+
+.parsley-errors-list {
+  list-style: none;
+  padding: 0px;
+  color: #f44336;
+}
+
+.form-control {
+  padding-top: 15px;
+}
+
+.bootstrap-select {
+  margin-top: -12px;
+}

public/css/jquery.contextMenu.css

@@ -0,0 +1,309 @@
+@charset "UTF-8";
+/*!
+ * jQuery contextMenu - Plugin for simple contextMenu handling
+ *
+ * Version: v2.9.0
+ *
+ * Authors: Björn Brala (SWIS.nl), Rodney Rehm, Addy Osmani (patches for FF)
+ * Web: http://swisnl.github.io/jQuery-contextMenu/
+ *
+ * Copyright (c) 2011-2019 SWIS BV and contributors
+ *
+ * Licensed under
+ *   MIT License http://www.opensource.org/licenses/mit-license
+ *
+ * Date: 2019-10-13T13:09:56.297Z
+ */
+@-webkit-keyframes cm-spin {
+  0% {
+    -webkit-transform: translateY(-50%) rotate(0deg);
+            transform: translateY(-50%) rotate(0deg);
+  }
+  100% {
+    -webkit-transform: translateY(-50%) rotate(359deg);
+            transform: translateY(-50%) rotate(359deg);
+  }
+}
+@-o-keyframes cm-spin {
+  0% {
+    -webkit-transform: translateY(-50%) rotate(0deg);
+         -o-transform: translateY(-50%) rotate(0deg);
+            transform: translateY(-50%) rotate(0deg);
+  }
+  100% {
+    -webkit-transform: translateY(-50%) rotate(359deg);
+         -o-transform: translateY(-50%) rotate(359deg);
+            transform: translateY(-50%) rotate(359deg);
+  }
+}
+@keyframes cm-spin {
+  0% {
+    -webkit-transform: translateY(-50%) rotate(0deg);
+         -o-transform: translateY(-50%) rotate(0deg);
+            transform: translateY(-50%) rotate(0deg);
+  }
+  100% {
+    -webkit-transform: translateY(-50%) rotate(359deg);
+         -o-transform: translateY(-50%) rotate(359deg);
+            transform: translateY(-50%) rotate(359deg);
+  }
+}
+
+@font-face {
+  font-family: "context-menu-icons";
+  font-style: normal; 
+  font-weight: normal;
+
+  src: url("font/context-menu-icons.eot?4f0ru");
+  src: url("font/context-menu-icons.eot?4f0ru#iefix") format("embedded-opentype"), url("font/context-menu-icons.woff2?4f0ru") format("woff2"), url("font/context-menu-icons.woff?4f0ru") format("woff"), url("font/context-menu-icons.ttf?4f0ru") format("truetype");
+}
+
+.context-menu-icon-add:before {
+  content: "\EA01";
+}
+
+.context-menu-icon-copy:before {
+  content: "\EA02";
+}
+
+.context-menu-icon-cut:before {
+  content: "\EA03";
+}
+
+.context-menu-icon-delete:before {
+  content: "\EA04";
+}
+
+.context-menu-icon-edit:before {
+  content: "\EA05";
+}
+
+.context-menu-icon-loading:before {
+  content: "\EA06";
+}
+
+.context-menu-icon-paste:before {
+  content: "\EA07";
+}
+
+.context-menu-icon-quit:before {
+  content: "\EA08";
+}
+
+.context-menu-icon::before {
+  position: absolute;
+  top: 50%;
+  left: 0;
+  width: 2em; 
+  font-family: "context-menu-icons";
+  font-size: 1em;
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1;
+  color: #2980b9;
+  text-align: center;
+  -webkit-transform: translateY(-50%);
+      -ms-transform: translateY(-50%);
+       -o-transform: translateY(-50%);
+          transform: translateY(-50%);
+
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.context-menu-icon.context-menu-hover:before {
+  color: #fff;
+}
+
+.context-menu-icon.context-menu-disabled::before {
+  color: #bbb;
+}
+
+.context-menu-icon.context-menu-icon-loading:before {
+  -webkit-animation: cm-spin 2s infinite;
+       -o-animation: cm-spin 2s infinite;
+          animation: cm-spin 2s infinite;
+}
+
+.context-menu-icon.context-menu-icon--fa {
+  display: list-item;
+  font-family: inherit;
+  line-height: inherit;
+}
+.context-menu-icon.context-menu-icon--fa::before {
+  position: absolute;
+  top: 50%;
+  left: 0;
+  width: 2em; 
+  font-family: FontAwesome;
+  font-size: 1em;
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1;
+  color: #2980b9;
+  text-align: center;
+  -webkit-transform: translateY(-50%);
+      -ms-transform: translateY(-50%);
+       -o-transform: translateY(-50%);
+          transform: translateY(-50%);
+
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+.context-menu-icon.context-menu-icon--fa.context-menu-hover:before {
+  color: #fff;
+}
+.context-menu-icon.context-menu-icon--fa.context-menu-disabled::before {
+  color: #bbb;
+}
+
+.context-menu-icon.context-menu-icon--fa5 {
+  display: list-item;
+  font-family: inherit;
+  line-height: inherit;
+}
+.context-menu-icon.context-menu-icon--fa5 i, .context-menu-icon.context-menu-icon--fa5 svg {
+  position: absolute;
+  top: .3em; 
+  left: .5em;
+  color: #2980b9;
+}
+.context-menu-icon.context-menu-icon--fa5.context-menu-hover > i, .context-menu-icon.context-menu-icon--fa5.context-menu-hover > svg {
+  color: #fff;
+}
+.context-menu-icon.context-menu-icon--fa5.context-menu-disabled i, .context-menu-icon.context-menu-icon--fa5.context-menu-disabled svg {
+  color: #bbb;
+}
+
+.context-menu-list {
+  position: absolute; 
+  display: inline-block;
+  min-width: 13em;
+  max-width: 26em;
+  padding: .25em 0;
+  margin: .3em;
+  font-family: inherit;
+  font-size: inherit;
+  list-style-type: none;
+  background: #fff;
+  border: 1px solid #bebebe;
+  border-radius: .2em;
+  -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, .5);
+          box-shadow: 0 2px 5px rgba(0, 0, 0, .5);
+}
+
+.context-menu-item {
+  position: relative;
+  -webkit-box-sizing: content-box;
+     -moz-box-sizing: content-box;
+          box-sizing: content-box;
+  padding: .2em 2em;
+  color: #2f2f2f;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none; 
+  background-color: #fff;
+}
+
+.context-menu-separator {
+  padding: 0; 
+  margin: .35em 0;
+  border-bottom: 1px solid #e6e6e6;
+}
+
+.context-menu-item > label > input,
+.context-menu-item > label > textarea {
+  -webkit-user-select: text;
+     -moz-user-select: text;
+      -ms-user-select: text;
+          user-select: text;
+}
+
+.context-menu-item.context-menu-hover {
+  color: #fff;
+  cursor: pointer; 
+  background-color: #2980b9;
+}
+
+.context-menu-item.context-menu-disabled {
+  color: #bbb;
+  cursor: default; 
+  background-color: #fff;
+}
+
+.context-menu-input.context-menu-hover {
+  color: #2f2f2f; 
+  cursor: default;
+}
+
+.context-menu-submenu:after {
+  position: absolute;
+  top: 50%;
+  right: .5em;
+  z-index: 1; 
+  width: 0;
+  height: 0;
+  content: '';
+  border-color: transparent transparent transparent #2f2f2f;
+  border-style: solid;
+  border-width: .25em 0 .25em .25em;
+  -webkit-transform: translateY(-50%);
+      -ms-transform: translateY(-50%);
+       -o-transform: translateY(-50%);
+          transform: translateY(-50%);
+}
+
+/**
+ * Inputs
+ */
+.context-menu-item.context-menu-input {
+  padding: .3em .6em;
+}
+
+/* vertically align inside labels */
+.context-menu-input > label > * {
+  vertical-align: top;
+}
+
+/* position checkboxes and radios as icons */
+.context-menu-input > label > input[type="checkbox"],
+.context-menu-input > label > input[type="radio"] {
+  position: relative;
+  top: .12em; 
+  margin-right: .4em;
+}
+
+.context-menu-input > label {
+  margin: 0;
+}
+
+.context-menu-input > label,
+.context-menu-input > label > input[type="text"],
+.context-menu-input > label > textarea,
+.context-menu-input > label > select {
+  display: block;
+  width: 100%; 
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+.context-menu-input > label > textarea {
+  height: 7em;
+}
+
+.context-menu-item > .context-menu-list {
+  top: .3em; 
+  /* re-positioned by js */
+  right: -.3em;
+  display: none;
+}
+
+.context-menu-item.context-menu-visible > .context-menu-list {
+  display: block;
+}
+
+.context-menu-accesskey {
+  text-decoration: underline;
+}