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

Update dashboard

Browse Source
This commit is contained in:
Mathieu Lagace
2020-07-30 18:42:43 -04:00
parent 4c5d635d5b
commit 65876e5b78
7 changed files with 81 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
app/Http/Controllers/EventController.php
View File

@@ -2,6 +2,7 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Course;
use App\Event; use App\Event;
use App\EventType; use App\EventType;
use App\GoogleDriveFile; use App\GoogleDriveFile;
@@ -86,7 +87,7 @@ class EventController extends Controller
else else
{ {
$event->use_weekly_msg = 0; $event->use_weekly_msg = 0;
$event->weekly_msg_publication_time = null; $event->weekly_msg_publication_time = "";
$event->msg = ""; $event->msg = "";
} }
@@ -267,7 +268,7 @@ class EventController extends Controller
else else
{ {
$event->use_weekly_msg = 0; $event->use_weekly_msg = 0;
$event->weekly_msg_publication_time = null; $event->weekly_msg_publication_time = "";
$event->msg = ""; $event->msg = "";
} }
@@ -315,6 +316,10 @@ class EventController extends Controller
for ($p=1; $p < $nbPeriode; $p++) { for ($p=1; $p < $nbPeriode; $p++) {
$course = $event->course($p,$l); $course = $event->course($p,$l);
if ($course == null)
{
$course = new Course();
}
$users = \App\User::all(); $users = \App\User::all();
$instructor = request('instruc_n'.$l.'_p'.$p); $instructor = request('instruc_n'.$l.'_p'.$p);
@@ -325,7 +330,6 @@ class EventController extends Controller
$instructor = $user->id; $instructor = $user->id;
} }
} }
$course->user_id = $instructor; $course->user_id = $instructor;
$course->location = request('location_n'.$l.'_p'.$p); $course->location = request('location_n'.$l.'_p'.$p);
$course->periode = $p; $course->periode = $p;
@@ -391,28 +395,30 @@ class EventController extends Controller
$event = Event::findOrFail($id); $event = Event::findOrFail($id);
$model = $event->schedule; $model = $event->schedule;
$default_value = []; $default_value = [];
foreach ($model['periodes'] as $periode_index => $periode) 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); $niveau_array = [];
$use_course = "on"; foreach ($model['niveaux'] as $niveau_index => $niveau)
if ($course->name == null) { {
$use_course = "off"; $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($niveau_array,[ array_push($default_value,$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;
} }
$model['default_value'] = $default_value;
$event->schedule_model = $model; $event->schedule_model = $model;
return $event->toArray(); return $event->toArray();
} }

6
app/News.php
View File

@@ -3,6 +3,7 @@
namespace App; namespace App;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Date;
/** /**
* App\News * App\News
@@ -63,7 +64,10 @@ class News extends Model
{ {
if($event->use_weekly_msg == 1) if($event->use_weekly_msg == 1)
{ {
$news->push(self::getWeeklyMsg($event)); if (strtotime($event->weekly_msg_publication_time) <= time())
{
$news->push(self::getWeeklyMsg($event));
}
} }
} }

2
config/version.yml
View File

@@ -5,7 +5,7 @@ current:
major: 3 major: 3
minor: 2 minor: 2
patch: 5 patch: 5
prerelease: 10-g8d22092e prerelease: 11-g4c5d635d
buildmetadata: '' buildmetadata: ''
commit: 41845 commit: 41845
timestamp: timestamp:

6
resources/views/admin/dashboard.blade.php
View File

@@ -21,7 +21,11 @@
<div class="card my-3"> <div class="card my-3">
<div class="card-body"> <div class="card-body">
<h4> <h4>
<strong>{{$course->ocom}} - {{$course->name}}</strong> @if($course->name != null)
<strong>{{$course->ocom}} - {{$course->name}}</strong>
@else
<strong>{{$course->desc}}</strong>
@endif
@if($course->lessonPlan) @if($course->lessonPlan)
@if($course->lessonPlan->approved == 1) @if($course->lessonPlan->approved == 1)
<span class="float-right"><i class="fas fa-check-circle text-success" data-toggle="tooltip" data-placement="top" title="Plan de cours remis et vérifié"></i></span> <span class="float-right"><i class="fas fa-check-circle text-success" data-toggle="tooltip" data-placement="top" title="Plan de cours remis et vérifié"></i></span>

17
resources/views/admin/event_type/create.blade.php
View File

@@ -14,13 +14,13 @@
<div class="col-md-5"> <div class="col-md-5">
<div class="form-group"> <div class="form-group">
<label class="label-control">Nom</label> <label class="label-control">Nom</label>
<input type="text" class="form-control" name="name" /> <input type="text" class="form-control" name="name" required/>
</div> </div>
</div> </div>
<div class="col-md-5"> <div class="col-md-5">
<div class="form-group"> <div class="form-group">
<label class="label-control">Emplacement</label> <label class="label-control">Emplacement</label>
<input type="text" class="form-control" name="location" /> <input type="text" class="form-control" name="location" required/>
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
@@ -35,20 +35,20 @@
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<label class="label-control">Heure de début</label> <label class="label-control">Heure de début</label>
<input name="begin_time" type="time" class="form-control"/> <input name="begin_time" type="time" class="form-control" required/>
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<label class="label-control">Heure de fin</label> <label class="label-control">Heure de fin</label>
<input name="end_time" type="time" class="form-control"/> <input name="end_time" type="time" class="form-control" required/>
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group iconpicker-container"> <div class="form-group iconpicker-container">
<label for="type">Icone</label> <label for="type">Icone</label>
<div class="input-group iconpicker-container"> <div class="input-group iconpicker-container">
<input id="calendar_icon" name="calendar_icon" data-placement="bottomRight" class="form-control icp icp-auto iconpicker-element iconpicker-input" type="text"> <input id="calendar_icon" name="calendar_icon" data-placement="bottomRight" class="form-control icp icp-auto iconpicker-element iconpicker-input" type="text" required>
<span class="input-group-addon"><i id="calendar_icon_display" class="fas fa-assistive-listening-systems"></i></span> <span class="input-group-addon"><i id="calendar_icon_display" class="fas fa-assistive-listening-systems"></i></span>
</div> </div>
</div> </div>
@@ -57,7 +57,7 @@
<div class="form-group"> <div class="form-group">
<label for="type">Couleur</label> <label for="type">Couleur</label>
<div class="input-group iconpicker-container"> <div class="input-group iconpicker-container">
<input class="form-control" type="text" name="calendar_color" id="calendar_color" onclick="pickr.show()"> <input class="form-control" type="text" name="calendar_color" id="calendar_color" onclick="pickr.show()" required>
<span class="color-picker"></span> <span class="color-picker"></span>
</div> </div>
</div> </div>
@@ -94,11 +94,6 @@
<option value="-2weeks">-2 Semaines</option> <option value="-2weeks">-2 Semaines</option>
</select> </select>
</div> </div>
<label class="mb-0 mt-4">Message par défaut</label>
<div class="form-group mt-0">
<textarea name="weekly_msg" class="form-control richeditor" name="admin_desc" id="admin_desc" rows="6">
</textarea>
</div>
</div> </div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">

72
resources/views/layouts/admin/sidebar.blade.php
View File

@@ -35,12 +35,12 @@ $sidebar = [
'perm' => 'course_see_all', 'perm' => 'course_see_all',
'child' => null 'child' => null
], ],
'Fichier' => [ //'Fichier' => [
'route' => 'admin.instruction.files', // 'route' => 'admin.instruction.files',
'icon' => 'fas fa-folder', // 'icon' => 'fas fa-folder',
'perm' => null, // 'perm' => null,
'child' => null // 'child' => null
], //],
'Statistiques' => [ 'Statistiques' => [
'route' => 'admin.stats.instruction', 'route' => 'admin.stats.instruction',
'icon' => 'fas fa-chart-line', 'icon' => 'fas fa-chart-line',
@@ -54,30 +54,30 @@ $sidebar = [
'icon' => 'recent_actors', 'icon' => 'recent_actors',
'perm' => null, 'perm' => null,
'child' => [ 'child' => [
'Articles' => [ //'Articles' => [
'route' => 'admin.article', // 'route' => 'admin.article',
'icon' => 'fas fa-newspaper', // 'icon' => 'fas fa-newspaper',
'perm' => 'article_see', // 'perm' => 'article_see',
'child' => null // 'child' => null
], //],
'Images' => [ //'Images' => [
'route' => 'admin.picture', // 'route' => 'admin.picture',
'icon' => 'fas fa-images', // 'icon' => 'fas fa-images',
'perm' => 'picture_see', // 'perm' => 'picture_see',
'child' => null // 'child' => null
], //],
'Utilisateurs' => [ 'Utilisateurs' => [
'route' => 'admin.users', 'route' => 'admin.users',
'icon' => 'fas fa-users', 'icon' => 'fas fa-users',
'perm' => 'user_see', 'perm' => 'user_see',
'child' => null 'child' => null
], ],
'Liste nominative' => [ //'Liste nominative' => [
'route' => 'admin.users', // 'route' => 'admin.users',
'icon' => 'fas fa-address-book', // 'icon' => 'fas fa-address-book',
'perm' => 'cadet_list_see', // 'perm' => 'cadet_list_see',
'child' => null // 'child' => null
], //],
'Logs' => [ 'Logs' => [
'route' => 'admin.stats.log', 'route' => 'admin.stats.log',
'icon' => 'fas fa-stream', 'icon' => 'fas fa-stream',
@@ -86,12 +86,12 @@ $sidebar = [
], ],
] ]
], ],
'Fichiers' => [ //'Fichiers' => [
'route' => null, // 'route' => null,
'icon' => 'folder', // 'icon' => 'folder',
'perm' => 'file_see', // 'perm' => 'file_see',
'child' => \App\GoogleDriveFile::getSidebarFile(), // 'child' => \App\GoogleDriveFile::getSidebarFile(),
], //],
'Configuration' => [ 'Configuration' => [
'route' => null, 'route' => null,
'icon' => 'menu_book', 'icon' => 'menu_book',
@@ -127,12 +127,12 @@ $sidebar = [
'perm' => 'config_edit_job', 'perm' => 'config_edit_job',
'child' => null 'child' => null
], ],
'Fichier' => [ //'Fichier' => [
'route' => 'admin.config.files', // 'route' => 'admin.config.files',
'icon' => 'fas fa-folder', // 'icon' => 'fas fa-folder',
'perm' => 'config_edit_files', // 'perm' => 'config_edit_files',
'child' => null // 'child' => null
], //],
'Apparence' => [ 'Apparence' => [
'route' => 'admin.config.customisation', 'route' => 'admin.config.customisation',
'icon' => 'fas fa-palette', 'icon' => 'fas fa-palette',

2
resources/views/layouts/modal/schedule/show.blade.php
View File

@@ -14,7 +14,7 @@
@if(\Auth::user()->p('schedule_edit') == 1) @if(\Auth::user()->p('schedule_edit') == 1)
<a class="btn btn-primary btn-fab btn-fab-mini btn-round" href="/admin/schedule/edit/{{$event->id}}" data-toggle="tooltip" data-placement="bottom" title="Modifier"><i class="material-icons">edit</i></a> <a class="btn btn-primary btn-fab btn-fab-mini btn-round" href="/admin/schedule/edit/{{$event->id}}" data-toggle="tooltip" data-placement="bottom" title="Modifier"><i class="material-icons">edit</i></a>
@endif @endif
<a class="btn btn-primary btn-fab btn-fab-mini btn-round" href="/admin/schedule/pdf/event/{{$event->id}}" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Imprimer"><i class="material-icons">print</i></a> {{-- <a class="btn btn-primary btn-fab btn-fab-mini btn-round" href="/admin/schedule/pdf/event/{{$event->id}}" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Imprimer"><i class="material-icons">print</i></a>--}}
@if(\Auth::user()->p('schedule_delete') == 1) @if(\Auth::user()->p('schedule_delete') == 1)
<button class="btn btn-danger btn-fab btn-fab-mini btn-round" data-toggle="tooltip" data-placement="bottom" title="Supprimer" onclick="deleteEvent({{$event->id}})"><i class="material-icons">close</i></button> <button class="btn btn-danger btn-fab btn-fab-mini btn-round" data-toggle="tooltip" data-placement="bottom" title="Supprimer" onclick="deleteEvent({{$event->id}})"><i class="material-icons">close</i></button>
@endif @endif