c-cms/c-cms-legacy
1
0
Fork 0
mirror of https://gitlab.com/TheGamecraft/c-cms.git synced 2026-04-21 02:39:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'master'

Browse Source 
3.0.6i

See merge request TheGamecraft/c-cms!25
This commit is contained in:
Mathieu Lagace
2018-12-03 15:52:20 +00:00
parent 8bb9655c9f 0fddd138bf
commit 07e409a922
7 changed files with 130 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/ECCController.php
View File

@@ -315,4 +315,9 @@ class ECCController extends Controller
return redirect('/ecc/inventory/'.$id.'/'.$niveau.'/'.$periode);
}
public function list()
{
return view('ecc.list');
}
}

1
app/Http/Controllers/ScheduleController.php
View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use \App\Schedule;
class ScheduleController extends Controller
{

44
app/Schedule.php
View File

@@ -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;
}
}

47
resources/views/ecc/list.blade.php Normal file
View File

@@ -0,0 +1,47 @@
@extends('layouts.ecc.main')
@section('content')
<div class="row">
<div class="col-md-12 offset-md-4">
<div class="card">
<div class="content">
<div class="row">
<div class="col-xs-2">
<div class="icon-big icon-info text-center">
<i class="ti-list"></i>
</div>
</div>
<div class="col-xs-10">
<div class="numbers">
<p>Liste des cadets</p>
</div>
</div>
</div>
<div class="row">
<div class="text-center">
<div class="col-sm-6" style="padding:3rem;">
<p>Guide pédagogique et de qualification du niveau 1<br><br><div class="row"><div class="col-md-6 col-sm-12"><a href="https://onedrive.live.com/?cid=45233BF612A4E12B&id=45233BF612A4E12B%214130&parId=45233BF612A4E12B%212163&o=OneUp" target="_blank" class="btn btn-block btn-info">Guide pédagogique</a></div><div class="col-md-6 col-sm-12"><a href="https://onedrive.live.com/?cid=45233BF612A4E12B&id=45233BF612A4E12B%214128&parId=45233BF612A4E12B%212163&o=OneUp" target="_blank" class="btn btn-block btn-info">Guide qualification</a></div></div></p>
</div>
<div class="col-sm-6" style="padding:3rem;">
<p>Guide pédagogique et de qualification du niveau 2<br><br><div class="row"><div class="col-md-6 col-sm-12"><a href="https://onedrive.live.com/?cid=45233BF612A4E12B&id=45233BF612A4E12B%214132&parId=45233BF612A4E12B%212163&o=OneUp" target="_blank" class="btn btn-block btn-success">Guide pédagogique</a></div><div class="col-md-6 col-sm-12"><a href="https://onedrive.live.com/?cid=45233BF612A4E12B&id=45233BF612A4E12B%214129&parId=45233BF612A4E12B%212163&o=OneUp" target="_blank" class="btn btn-block btn-success">Guide qualification</a></div></div></p>
</div>
<div class="col-sm-6" style="padding:3rem;">
<p>Guide pédagogique et de qualification du niveau 3<br><br><div class="row"><div class="col-md-6 col-sm-12"><a href="https://onedrive.live.com/?cid=45233BF612A4E12B&id=45233BF612A4E12B%214135&parId=45233BF612A4E12B%212163&o=OneUp" target="_blank" class="btn btn-block btn-warning">Guide pédagogique</a></div><div class="col-md-6 col-sm-12"><a href="https://onedrive.live.com/?cid=45233BF612A4E12B&id=45233BF612A4E12B%214131&parId=45233BF612A4E12B%212163&o=OneUp" target="_blank" class="btn btn-block btn-warning">Guide qualification</a></div></div></p>
</div>
<div class="col-sm-6" style="padding:3rem;">
<p>Guide pédagogique et de qualification du niveau 4<br><br><div class="row"><div class="col-md-6 col-sm-12"><a href="https://onedrive.live.com/?cid=45233BF612A4E12B&id=45233BF612A4E12B%216679&parId=45233BF612A4E12B%212163&o=OneUp" target="_blank" class="btn btn-block btn-secondary">Guide pédagogique</a></div><div class="col-md-6 col-sm-12"><a href="https://onedrive.live.com/?cid=45233BF612A4E12B&id=45233BF612A4E12B%216678&parId=45233BF612A4E12B%212163&o=OneUp" target="_blank" class="btn btn-block btn-secondary">Guide qualification</a></div></div></p>
</div>
</div>
</div>
<hr>
<p class="text-center">Plan de cours vierge</p>
<a href="https://onedrive.live.com/?id=45233BF612A4E12B%212758&cid=45233BF612A4E12B" target="_blank" class="btn btn-block btn-info">Télécharger</a>
</div>
</div>
</div>
</div>
@endsection
@section('active_page')
<?php $active_page = "list" ?>
@endsection

25
resources/views/layouts/admin/alert.blade.php
View File

@@ -2,8 +2,33 @@
<div class="col-md-12">
@php
$configs = \App\Config::all();
$scheduleWarning = \App\Schedule::checkForWarning();
$id_warning = 1;
@endphp
@if (!$scheduleWarning->isEmpty())
@if (\Auth::User()->getPerm('schedule_edit'))
<div class="alert alert-warning" role="alert">
<a data-toggle="collapse" href="#schedulewarning" role="button" aria-expanded="false" aria-controls="schedulewarning"> Attention ! De potentiel erreur on été détecté dans l'horaire <span class="badge badge-warning">{{$scheduleWarning->count()}}</span> <i class="fa fa-caret-down" aria-hidden="true"></i></a>
<div class="collapse" id="schedulewarning">
<div class="ml-4 row">
@foreach ($scheduleWarning as $warning)
<div class="col-sm-12">
Le {{$warning['date']}} à la
@if ($warning['periode'] == 1) 1er période @else 2e période @endif du
@if ($warning['niveau'] == 1) niveau 1 @elseif($warning['niveau'] == 1) niveau 2 @else niveau 3 @endif
: {{$warning['warning']}}
</div>
@php
$id_warning = $id_warning + 1;
@endphp
@endforeach
</div>
</div>
</div>
@endif
@endif
@if ($configs->where('name','is_schedule_public')->first()->state == 0)
@if (\Auth::User()->getPerm('schedule_edit'))
<div class="alert alert-danger" role="alert">

0
resources/views/test.blade.php Normal file
View File

8
routes/web.php
View File

@@ -1,5 +1,6 @@
<?php
use \App\Notifications\sms;
use Illuminate\Support\Facades\Storage;
/*
|--------------------------------------------------------------------------
| Web Routes
@@ -107,11 +108,16 @@ Route::middleware(['auth','staff'])->group(function () {
Route::get('/ecc/inventory/{id}/{niveau}/{periode}' , 'ECCController@booking');
Route::post('/ecc/inventory/add/{id}/{periode}/{niveau}' , 'ECCController@booking_add');
Route::post('/ecc/inventory/remove/{id}/{periode}/{niveau}' , 'ECCController@booking_remove');
Route::get('/ecc/list','ECCController@list');
});
/* Other Route */
Route::get('/test', function () {
dd(getStatus());
$fileContents = "1234";
Storage::put('avatars/1', $fileContents);
return view('test');
});