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

Merge branch 'dev' into 'master'

Browse Source 
3.0.7

See merge request TheGamecraft/c-cms!26
This commit is contained in:
Mathieu Lagace
2018-12-03 22:22:50 +00:00
parent 07e409a922 9dc4d1103f
commit 1679252930
8 changed files with 190 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -320,4 +320,9 @@ class ECCController extends Controller
{
return view('ecc.list');
}
public function files()
{
return view('ecc.files');
}
}

10
app/Schedule.php
View File

@@ -119,13 +119,16 @@ class Schedule extends Model
{
$schedule = Schedule::all();
$warning = collect();
$today = date('U');
foreach ($schedule as $activity) {
if ($activity->type == "regular") {
for ($niv=1; $niv < 3; $niv++) {
for ($pe=1; $pe < 2; $pe++) {
$time = date('U',strtotime($activity->date));
if ($time >= $today) {
for ($niv=1; $niv <= 3; $niv++) {
for ($pe=1; $pe <= 2; $pe++) {
/** Check name */
if ($activity->data['n'.$niv."_p".$pe."_name"] == "") {
@@ -137,7 +140,7 @@ class Schedule extends Model
$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) {
if (preg_match($regex,trim($activity->data['n'.$niv."_p".$pe."_ocom"])) == 0 && $activity->data['n'.$niv."_p".$pe."_ocom"] != "S.O") {
$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]);
}
}
@@ -155,6 +158,7 @@ class Schedule extends Model
}
}
}
}
return $warning;
}

14
resources/views/ecc/dashboard.blade.php
View File

@@ -93,22 +93,26 @@
<div class="row">
<div class="text-center">
<div class="col-sm-6" style="padding:3rem;">
<p>Guide pédagogique du niveau 1<br><br><a href="https://onedrive.live.com/?cid=45233BF612A4E12B&id=45233BF612A4E12B%214130&parId=45233BF612A4E12B%212163&o=OneUp" target="_blank" class="btn btn-block btn-info">Télécharger</a></p>
<p>Guide pédagogique et de qualification du niveau 1<br><br><div class="row"><div class="col-sm-12">
<a href="https://drive.google.com/uc?export=download&id=1tZhDqCvMor9p6lXxYek7Q0Xc8c2o5pG7" target="_blank" class="btn btn-block btn-info">Guide pédagogique</a></div></div></p>
</div>
<div class="col-sm-6" style="padding:3rem;">
<p>Guide pédagogique du niveau 2<br><br><a href="https://onedrive.live.com/?cid=45233BF612A4E12B&id=45233BF612A4E12B%214132&parId=45233BF612A4E12B%212163&o=OneUp" target="_blank" class="btn btn-block btn-info">Télécharger</a></p>
<p>Guide pédagogique et de qualification du niveau 2<br><br><div class="row"><div class="col-sm-12">
<a href="https://drive.google.com/uc?export=download&id=1oLTavI1AQsXMdhZ4QqEkbecfV4j1LKDx" target="_blank" class="btn btn-block btn-success">Guide pédagogique</a></div></div></p>
</div>
<div class="col-sm-6" style="padding:3rem;">
<p>Guide pédagogique du niveau 3<br><br><a href="https://onedrive.live.com/?cid=45233BF612A4E12B&id=45233BF612A4E12B%214135&parId=45233BF612A4E12B%212163&o=OneUp" target="_blank" class="btn btn-block btn-info">Télécharger</a></p>
<p>Guide pédagogique et de qualification du niveau 3<br><br><div class="row"><div class="col-sm-12">
<a href="https://drive.google.com/uc?export=download&id=1FrczHmiGCeONlHCuuxHNx-BZ-qEfEBK8" target="_blank" class="btn btn-block btn-warning">Guide pédagogique</a></div></div></p>
</div>
<div class="col-sm-6" style="padding:3rem;">
<p>Guide pédagogique du niveau 4<br><br><a href="https://onedrive.live.com/?cid=45233BF612A4E12B&id=45233BF612A4E12B%216679&parId=45233BF612A4E12B%212163&o=OneUp" target="_blank" class="btn btn-block btn-info">Télécharger</a></p>
<p>Guide pédagogique et de qualification du niveau 4<br><br><div class="row"><div class="col-sm-12">
<a href="https://drive.google.com/uc?export=download&id=1EeibjlytdzEpRdzs-eg0pGL8TBv_ZCsu" target="_blank" class="btn btn-block btn-secondary">Guide pédagogique</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" class="btn btn-block btn-info">Télécharger</a>
<a href="https://drive.google.com/uc?export=download&id=1i1a0sjI8I3nzt4mlcLvznjqYF-12JgfQ" target="_blank" class="btn btn-block btn-info">Télécharger</a>
</div>
</div>
</div>

130
resources/views/ecc/files.blade.php Normal file
View File

@@ -0,0 +1,130 @@
@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>Fichiers</p>
</div>
</div>
</div>
<div class="content table-responsive table-full-width">
<table class="table table-striped">
<thead>
<th style="width:85%;">Fichier</th>
<th></th>
</tr></thead>
<tbody>
<tr>
<td><strong>Ordre d'opération</strong><hr></td>
<td></td>
</tr>
<tr>
<td>Mini Ordre Operation Projet Soirée Journée Vierge</td>
<td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&id=1sqkeUp-djZDjltitGvjR0efMQgyB_sos">Télécharger</a></td>
</tr>
<tr>
<td>Mini Ordre Operation Vierge</td>
<td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&id=1RjSSwK9NIVUFbHKlu0hbkK5IeTnAFWq9">Télécharger</a></td>
</tr>
<tr>
<td><strong>Tenues</strong><hr></td>
<td></td>
</tr>
<tr>
<td>Liste des tenues</td>
<td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&id=1JUXaPQhHGJffE7CTnB1BAkqwM8g9t8ef">Télécharger</a></td>
</tr>
<tr>
<td><strong>Énoncé de fonction</strong><hr></td>
<td></td>
</tr>
<tr>
<td>Cadet commandant</td>
<td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&id=1DdI9eOptKarpApsUdO-6gkDFYtD6DHi8">Télécharger</a></td>
</tr>
<tr>
<td>Cadet commandant adjoint</td>
<td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&id=1jDuKQzY3Dam0J9mSGDWiv2I1agDYacRm">Télécharger</a></td>
</tr>
<tr>
<td>Chef entrainement</td>
<td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&id=12p8rGhSZloPFurD--RZO9KQVoRmXAEnE">Télécharger</a></td>
</tr>
<tr>
<td>Instructeur sénior</td>
<td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&id=13fNufhR2hYhKgeiHUo0W_V-vF_W8SPkC">Télécharger</a></td>
</tr>
<tr>
<td>Instructeur</td>
<td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&id=1Y1gEsNP7mz2SmJPwxi7YUfpxgioJKvR0">Télécharger</a></td>
</tr>
<tr>
<td>Assistant Instructeur</td>
<td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&id=1BxKj0J20QZ5hVQ1womwS8GUWvuq-VsJy">Télécharger</a></td>
</tr>
<tr>
<td>Commandant de section</td>
<td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&id=1jOmyNFZ2rSOwCFjcoABx6VFcvEMKCf73">Télécharger</a></td>
</tr>
<tr>
<td>Commandant de la garde</td>
<td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&id=18T3rQQ-RN551meOGGPD8Ni2wbpvKNfYz">Télécharger</a></td>
</tr>
<tr>
<td>Commandant adjoint de section</td>
<td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&id=1A5NkPhSJ5E-bIPiLRwa7VAOXQrrHIzn6">Télécharger</a></td>
</tr>
<tr>
<td>Commandant adjoint de garde</td>
<td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&id=1ncphhTpBm9uhq0isGFNzDs_-TRPrxfKw">Télécharger</a></td>
</tr>
<tr>
<td>Cadet cadre de la logistique</td>
<td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&id=1PcmlegtAqmdX2ufGQMubkNxfkrCcSIge">Télécharger</a></td>
</tr>
<tr>
<td>Cadet cadre de l'administration</td>
<td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&id=1haEG9jSabp10VtI7EV2OyLctn9-63T8G">Télécharger</a></td>
</tr>
<tr>
<td>Commandant adjoint de section</td>
<td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&id=1A5NkPhSJ5E-bIPiLRwa7VAOXQrrHIzn6">Télécharger</a></td>
</tr>
<tr>
<td><strong>Divers</strong><hr></td>
<td></td>
</tr>
<tr>
<td>Information NECPC</td>
<td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&id=1KG0IoPxpqctqqVwCfM0WyKq4y6RDBtUJ">Télécharger</a></td>
</tr>
<tr>
<td>Évaluation pratique sur la coordination d’un ordre d’opération sur le terrain</td>
<td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&id=1AAPB7IdpIw8UGJwIoTNQZ3cg9ODfWrAp">Télécharger</a></td>
</tr>
<tr>
<td>RENCONTRE PRÉILIMINAIRE D’INSTRUCTION</td>
<td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&id=16lT4YzNjGWd2SFmgSbmj1LcPG9cDkkyo">Télécharger</a></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
@endsection
@section('active_page')
<?php $active_page = "files" ?>
@endsection

20
resources/views/ecc/guide.blade.php
View File

@@ -2,7 +2,7 @@
@section('content')
<div class="row">
<div class="col-md-10 offset-md-4">
<div class="col-md-12 offset-md-4">
<div class="card">
<div class="content">
<div class="row">
@@ -20,22 +20,30 @@
<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>
<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://drive.google.com/uc?export=download&id=1tZhDqCvMor9p6lXxYek7Q0Xc8c2o5pG7" target="_blank" class="btn btn-block btn-info">Guide pédagogique</a></div><div class="col-md-6 col-sm-12">
<a href="https://drive.google.com/uc?export=download&id=1MK6Lgr_qgP8vwBIiTyIveQu9p2rh1mXj" 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>
<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://drive.google.com/uc?export=download&id=1oLTavI1AQsXMdhZ4QqEkbecfV4j1LKDx" target="_blank" class="btn btn-block btn-success">Guide pédagogique</a></div><div class="col-md-6 col-sm-12">
<a href="https://drive.google.com/uc?export=download&id=1YzIqyVEfCiGVEI_hKB-ZHt0pAgh-QRxe" 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>
<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://drive.google.com/uc?export=download&id=1FrczHmiGCeONlHCuuxHNx-BZ-qEfEBK8" target="_blank" class="btn btn-block btn-warning">Guide pédagogique</a></div><div class="col-md-6 col-sm-12">
<a href="https://drive.google.com/uc?export=download&id=1S-NFjqlixzC9GNZSqZ1_PqBDFcm-LS1t" 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>
<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://drive.google.com/uc?export=download&id=1EeibjlytdzEpRdzs-eg0pGL8TBv_ZCsu" target="_blank" class="btn btn-block btn-secondary">Guide pédagogique</a></div><div class="col-md-6 col-sm-12">
<a href="https://drive.google.com/uc?export=download&id=1VmVL4wb6llIc09HkWfzL8YOQYo3ygx86" 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>
<a href="https://drive.google.com/uc?export=download&id=1i1a0sjI8I3nzt4mlcLvznjqYF-12JgfQ" target="_blank" class="btn btn-block btn-info">Télécharger</a>
</div>
</div>
</div>

14
resources/views/ecc/list.blade.php
View File

@@ -20,22 +20,10 @@
<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>
<p>Liste nominative des cadets<br><br><div class="row"><div class="col-md-6 col-sm-12"><a href="#" target="_blank" class="btn btn-block btn-info">Télécharger</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>

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

@@ -16,7 +16,7 @@
<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
@if ($warning['niveau'] == 1) niveau 1 @elseif($warning['niveau'] == 2) niveau 2 @else niveau 3 @endif
: {{$warning['warning']}}
</div>
@php

1
routes/web.php
View File

@@ -109,6 +109,7 @@ Route::middleware(['auth','staff'])->group(function () {
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');
Route::get('/ecc/files','ECCController@files');
});
/* Other Route */