diff --git a/app/Http/Controllers/ECCController.php b/app/Http/Controllers/ECCController.php index f79e408d..555f4ba4 100644 --- a/app/Http/Controllers/ECCController.php +++ b/app/Http/Controllers/ECCController.php @@ -315,4 +315,9 @@ class ECCController extends Controller return redirect('/ecc/inventory/'.$id.'/'.$niveau.'/'.$periode); } + + public function list() + { + return view('ecc.list'); + } } diff --git a/app/Http/Controllers/ScheduleController.php b/app/Http/Controllers/ScheduleController.php index efa457a0..bbcb19cd 100644 --- a/app/Http/Controllers/ScheduleController.php +++ b/app/Http/Controllers/ScheduleController.php @@ -3,8 +3,9 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; +use \App\Schedule; class ScheduleController extends Controller { - // + // } diff --git a/app/Schedule.php b/app/Schedule.php index c438722f..38d3ab41 100644 --- a/app/Schedule.php +++ b/app/Schedule.php @@ -114,4 +114,48 @@ class Schedule extends Model return $users; } } + + public static function checkForWarning() + { + $schedule = Schedule::all(); + $warning = collect(); + + foreach ($schedule as $activity) { + + if ($activity->type == "regular") { + + for ($niv=1; $niv < 3; $niv++) { + for ($pe=1; $pe < 2; $pe++) { + + /** Check name */ + if ($activity->data['n'.$niv."_p".$pe."_name"] == "") { + $warning->push(['warning' => 'Il doit y avoir un nom pour le cours', 'niveau' => $niv, 'periode' => $pe,'date' => $activity->date]); + } + + /** Check OCOM */ + if ($activity->data['n'.$niv."_p".$pe."_ocom"] == "") { + $warning->push(['warning' => "Il doit y avoir un OCOM pour le cours", 'niveau' => $niv, 'periode' => $pe,'date' => $activity->date]); + } else { + $regex = '/[MC]['.$niv.']\d\d.\d\d/'; + if (preg_match($regex,trim($activity->data['n'.$niv."_p".$pe."_ocom"])) == 0) { + $warning->push(['warning' => "L'OCOM du cours de semble pas être valide", 'niveau' => $niv, 'periode' => $activity->data['n'.$niv."_p".$pe."_ocom"],'date' => $activity->date]); + } + } + + /** Check Instructor */ + if ($activity->data['n'.$niv."_p".$pe."_instructor"] == "") { + $warning->push(['warning' => "Il doit y avoir un instructeur pour le cours", 'niveau' => $niv, 'periode' => $pe,'date' => $activity->date]); + } + + /** Check local */ + if ($activity->data['n'.$niv."_p".$pe."_local"] == "") { + $warning->push(['warning' => "Il doit y avoir un local pour le cours", 'niveau' => $niv, 'periode' => $pe,'date' => $activity->date]); + } + } + } + } + } + + return $warning; + } } diff --git a/resources/views/ecc/list.blade.php b/resources/views/ecc/list.blade.php new file mode 100644 index 00000000..4acefd27 --- /dev/null +++ b/resources/views/ecc/list.blade.php @@ -0,0 +1,47 @@ +@extends('layouts.ecc.main') + +@section('content') +
+
+
+
+
+
+
+ +
+
+
+
+

Liste des cadets

+
+
+
+
+
+
+

Guide pédagogique et de qualification du niveau 1

Guide pédagogique
Guide qualification

+
+
+

Guide pédagogique et de qualification du niveau 2

Guide pédagogique
Guide qualification

+
+
+

Guide pédagogique et de qualification du niveau 3

Guide pédagogique
Guide qualification

+
+
+

Guide pédagogique et de qualification du niveau 4

Guide pédagogique
Guide qualification

+
+
+
+
+

Plan de cours vierge

+ Télécharger +
+
+
+
+@endsection + +@section('active_page') + +@endsection \ No newline at end of file diff --git a/resources/views/layouts/admin/alert.blade.php b/resources/views/layouts/admin/alert.blade.php index cc4fab0f..637421f4 100644 --- a/resources/views/layouts/admin/alert.blade.php +++ b/resources/views/layouts/admin/alert.blade.php @@ -2,8 +2,33 @@
@php $configs = \App\Config::all(); + $scheduleWarning = \App\Schedule::checkForWarning(); + $id_warning = 1; @endphp + @if (!$scheduleWarning->isEmpty()) + @if (\Auth::User()->getPerm('schedule_edit')) + + @endif + @endif + @if ($configs->where('name','is_schedule_public')->first()->state == 0) @if (\Auth::User()->getPerm('schedule_edit'))