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

ALPHA 3.0.6

Browse Source
This commit is contained in:
TheGamecraft
2018-11-08 12:16:01 -05:00
parent 87264660bc
commit 2b6bd17b8d
11 changed files with 193 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
app/Http/Controllers/CalendarController.php
View File

@@ -34,6 +34,8 @@ class CalendarController extends Controller
{
Log::saveLog("Affichage de l'horaire");
$this->listClass();
return view('admin.calendar.calendar_display');
}
@@ -95,11 +97,10 @@ class CalendarController extends Controller
if ($activityToday->isEmpty()) {
echo '<a class="calendar-container calendar-empty" name="'.$today.'" type="button" data-toggle="modal" data-target="#scrollmodal" id="calendar_'.$calendar[(($i*7) + $a)].'" class="btn btn-block btn-calendar" onclick="openCalendar(this.name)"><div class="calendar-date">'.date("j", strtotime($today)).'</div></a>';
} else {
echo '<a class="calendar-container" name="'.$today.'" type="button" data-toggle="modal" data-target="#scrollmodal" id="calendar_'.$calendar[(($i*7) + $a)].'" class="btn btn-block btn-calendar" onclick="openCalendar(this.name)">';
echo '<a class="calendar-container" name="'.$today.'" type="button" data-toggle="modal" data-target="#scrollmodal" id="calendar_'.$calendar[(($i*7) + $a)].'" class="btn btn-block btn-calendar" onclick="openCalendar(this.name)"><div class="calendar-date">'.date("j", strtotime($today)).'</div>';
$text = "";
foreach ($activityToday as $activity) {
echo '<div class="calendar-date">'.date("j", strtotime($today)).'</div>
<div class="calendar-text" style="width:90%;">';
echo '<div class="calendar-text" style="width:90%;height:3rem;">';
switch ($activity->type) {
case 'regular':
echo '<div class="row" style="color:orange;"><span class="fa-stack fa-lg col-md-2"><i class="fa fa-circle fa-stack-2x"></i><i class="fa fa-book fa-stack-1x fa-inverse"></i></span><div class="col-md-10 calendar_event_name">'.ucfirst($activity->data['event_name'])."</div></div>";
@@ -571,32 +572,32 @@ class CalendarController extends Controller
if ($schedule->type == "regular") {
/** Check Instructor */
if ($schedule->data['n1_p1_instructor'] != $original->data['n1_p1_instructor']) {
array_push($changes,"L'instructeur du niveau 1 pour la première période a été changé de ".$original->data['n1_p1_instructor']." à ".$schedule->data['n1_p1_instructor']);
array_push($changes,"L'instructeur du niveau 1 pour la première période a été changé de ".\App\User::find($original->data['n1_p1_instructor'])->fullname()." à ".\App\User::find($schedule->data['n1_p1_instructor'])->fullname());
\Notification::send(\App\User::find($original->data['n1_p1_instructor']), new mail(\Auth::User(),"Modification d'un de vos cours","Le cours ".$original->data['n1_p1_name']." du ".$original->date." vous a été retiré."));
\Notification::send(\App\User::find($schedule->data['n1_p1_instructor']), new mail(\Auth::User(),"Modification d'un de vos cours","Le cours ".$schedule->data['n1_p1_name']." du ".$schedule->date." vous a été ajouté."));
}
if ($schedule->data['n1_p2_instructor'] != $original->data['n1_p2_instructor']) {
array_push($changes,"L'instructeur du niveau 1 pour la deuxième période a été changé de ".$original->data['n1_p2_instructor']." à ".$schedule->data['n1_p2_instructor']);
array_push($changes,"L'instructeur du niveau 1 pour la deuxième période a été changé de ".\App\User::find($original->data['n1_p2_instructor'])->fullname()." à ".\App\User::find($schedule->data['n1_p2_instructor'])->fullname());
\Notification::send(\App\User::find($original->data['n1_p2_instructor']), new mail(\Auth::User(),"Modification d'un de vos cours","Le cours ".$original->data['n1_p2_name']." du ".$original->date." vous a été retiré."));
\Notification::send(\App\User::find($schedule->data['n1_p2_instructor']), new mail(\Auth::User(),"Modification d'un de vos cours","Le cours ".$schedule->data['n1_p2_name']." du ".$schedule->date." vous a été ajouté."));
}
if ($schedule->data['n2_p1_instructor'] != $original->data['n2_p1_instructor']) {
array_push($changes,"L'instructeur du niveau 2 pour la première période a été changé de ".$original->data['n2_p1_instructor']." à ".$schedule->data['n2_p1_instructor']);
array_push($changes,"L'instructeur du niveau 2 pour la première période a été changé de ".\App\User::find($original->data['n2_p1_instructor'])->fullname()." à ".\App\User::find($schedule->data['n2_p1_instructor'])->fullname());
\Notification::send(\App\User::find($original->data['n2_p1_instructor']), new mail(\Auth::User(),"Modification d'un de vos cours","Le cours ".$original->data['n2_p1_name']." du ".$original->date." vous a été retiré."));
\Notification::send(\App\User::find($schedule->data['n2_p1_instructor']), new mail(\Auth::User(),"Modification d'un de vos cours","Le cours ".$schedule->data['n2_p1_name']." du ".$schedule->date." vous a été ajouté."));
}
if ($schedule->data['n2_p2_instructor'] != $original->data['n2_p2_instructor']) {
array_push($changes,"L'instructeur du niveau 2 pour la deuxième période a été changé de ".$original->data['n2_p2_instructor']." à ".$schedule->data['n2_p2_instructor']);
array_push($changes,"L'instructeur du niveau 2 pour la deuxième période a été changé de ".\App\User::find($original->data['n2_p2_instructor'])->fullname()." à ".\App\User::find($schedule->data['n2_p2_instructor'])->fullname());
\Notification::send(\App\User::find($original->data['n2_p2_instructor']), new mail(\Auth::User(),"Modification d'un de vos cours","Le cours ".$original->data['n2_p2_name']." du ".$original->date." vous a été retiré."));
\Notification::send(\App\User::find($schedule->data['n2_p2_instructor']), new mail(\Auth::User(),"Modification d'un de vos cours","Le cours ".$schedule->data['n2_p2_name']." du ".$schedule->date." vous a été ajouté."));
}
if ($schedule->data['n3_p1_instructor'] != $original->data['n3_p1_instructor']) {
array_push($changes,"L'instructeur du niveau 3 pour la première période a été changé de ".$original->data['n3_p1_instructor']." à ".$schedule->data['n3_p1_instructor']);
array_push($changes,"L'instructeur du niveau 3 pour la première période a été changé de ".\App\User::find($original->data['n3_p1_instructor'])->fullname()." à ".\App\User::find($schedule->data['n3_p1_instructor'])->fullname());
\Notification::send(\App\User::find($original->data['n3_p1_instructor']), new mail(\Auth::User(),"Modification d'un de vos cours","Le cours ".$original->data['n3_p1_name']." du ".$original->date." vous a été retiré."));
\Notification::send(\App\User::find($schedule->data['n3_p1_instructor']), new mail(\Auth::User(),"Modification d'un de vos cours","Le cours ".$schedule->data['n3_p1_name']." du ".$schedule->date." vous a été ajouté."));
}
if ($schedule->data['n3_p2_instructor'] != $original->data['n3_p2_instructor']) {
array_push($changes,"L'instructeur du niveau 3 pour la deuxième période a été changé de ".$original->data['n3_p2_instructor']." à ".$schedule->data['n3_p2_instructor']);
array_push($changes,"L'instructeur du niveau 3 pour la deuxième période a été changé de ".\App\User::find($original->data['n3_p2_instructor'])->fullname()." à ".\App\User::find($schedule->data['n3_p2_instructor'])->fullname());
\Notification::send(\App\User::find($original->data['n3_p2_instructor']), new mail(\Auth::User(),"Modification d'un de vos cours","Le cours ".$original->data['n3_p2_name']." du ".$original->date." vous a été retiré."));
\Notification::send(\App\User::find($schedule->data['n3_p2_instructor']), new mail(\Auth::User(),"Modification d'un de vos cours","Le cours ".$schedule->data['n3_p2_name']." du ".$schedule->date." vous a été ajouté."));
}
@@ -683,6 +684,8 @@ class CalendarController extends Controller
\Notification::send($userToNotify, new mail(\Auth::User(),"Modification d'une activité a l'horaire",\Auth::User()->fullname()." à modifié l'activité, ".$schedule->data['event_name']." à l'horaire le ".$schedule->date."<br>".$string_Change));
}
Log::saveLog("Modification de l'activité, ".$schedule->data['event_name']." à l'horaire le ".$schedule->date);
return redirect('/admin/calendar');
}
@@ -694,5 +697,44 @@ class CalendarController extends Controller
$schedule = Schedule::find($id);
$schedule->delete();
\Notification::send($userToNotify, new Alert(\Auth::User()->id,"Suppresion de l'activité, ".$schedule->data['event_name']." à l'horaire le ".$schedule->date,"/admin/calendar"));
if(\App\Config::where('name','is_schedule_build')->first()->state == 1)
{
\Notification::send($userToNotify, new mail(\Auth::User(),"Suppression d'une activité a l'horaire",\Auth::User()->fullname()." à supprimé l'activité, ".$schedule->data['event_name']." à l'horaire le ".$schedule->date));
}
Log::saveLog("Suppression de l'activité, ".$schedule->data['event_name']." à l'horaire le ".$schedule->date);
}
private function listClass()
{
$schedules = \App\Schedule::all();
$filtered_schedules = collect();
$classes = [];
foreach($schedules as $schedule)
{
if($schedule->type == "regular")
{
$filtered_schedules->push($schedule);
}
}
foreach($filtered_schedules as $schedule)
{
array_push($classes,$schedule->data['n1_p1_ocom']);
array_push($classes,$schedule->data['n1_p2_ocom']);
array_push($classes,$schedule->data['n2_p1_ocom']);
array_push($classes,$schedule->data['n2_p2_ocom']);
array_push($classes,$schedule->data['n3_p1_ocom']);
array_push($classes,$schedule->data['n3_p2_ocom']);
}
$filtered_classes = array_unique($classes);
return $filtered_classes;
}
}

18
app/Http/Controllers/UserController.php
View File

@@ -174,6 +174,24 @@ class UserController extends Controller
return redirect(request('url'));
}
public function notificationmarkALL()
{
$notifications = \Auth::User()->unreadNotifications;
foreach($notifications as $notification)
{
$notification->delete();
}
return redirect()->back();
}
public function notificationmarkECC($id)
{
$notification = \Auth::User()->unreadNotifications->where('id',$id)->first();
$notification->delete();
return redirect('/ecc');
}
public function showUserProfil($id = 0)
{
if ($id == 0) {

6
public/assets/admin/assets/scss/style.css vendored
View File

@@ -2253,7 +2253,6 @@ header .form-inline {
vertical-align: middle !important;
border: solid 1px #d9d9d9 !important;
padding: 0px !important;
display: flex;
}
.calendar-date{
float: left;
@@ -2261,11 +2260,14 @@ header .form-inline {
}
.calendar-text{
float: right;
margin-top: 1.5rem;
}
.calendar-text > div {
text-align:start;
}
.calendar_event_name {
height: 3rem;
overflow: hidden;
}
@media only screen and (max-width: 800px) {
.calendar-container{
width: 100%;

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

@@ -7,6 +7,14 @@
Cours a venir
</div>
<div class="card-body">
@if(count($userClasse) == 0)
<div class="col-sm-12">
<div class="alert alert-info alert-with-icon">
<span data-notify="icon" class="ti-alert"></span>
<span data-notify="message">Aucun cours a venir</span>
</div>
</div>
@endif
@foreach ($userClasse as $classe)
<div class="col-sm-6">
@if ($classe['plan_done'] == "on")
@@ -52,13 +60,22 @@
<div class="col-sm-6 col-lg-6">
<div class="card">
<div class="card-header">
<span class="count">{{count($futureEvent)}}</span>
<div class="float-right">Activité a venir</div>
</div>
<div class="card-body">
<div class="row">
@if(count($futureEvent) == 0)
<div class="col-sm-12">
<div class="alert alert-infi alert-with-icon">
<span data-notify="icon" class="ti-alert"></span>
<span data-notify="message">Aucune activité a venir</span>
</div>
</div>
@endif
@foreach ($futureEvent as $event)
<i class="fa fa-star" aria-hidden="true" style="color:gold"></i> {{$event->data['event_name']}}<br>
<div class="col-md-6 col-sm-12"><i class="fa fa-star" aria-hidden="true" style="color:gold"></i> {{$event->data['event_name']}}</div>
@endforeach
</div>
<br>
<a href="/admin/calendar" type="button" class="btn btn-primary btn-lg btn-block">Afficher plus</a>
</div>

38
resources/views/admin/update.blade.php
View File

@@ -1,6 +1,44 @@
@extends('layouts.admin.main')
@section('content')
<!--/* ALPHA 3.0.5 */-->
<div class="card-header">
<strong class="card-title"><i class="fa fa-star" aria-hidden="true" style="color: gold"></i> ALPHA 3.0.6<small><span class="badge badge-success float-right mt-1">STABLE</span> <span class="badge badge-warning float-right mt-1">ALPHA</span></small></strong>
</div>
<div class="card-body">
<p>
Front-End
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-plus" aria-hidden="true" style="color: green;width:1.2rem;"></i> Ajout d'un bouton pour supprimer toute les notifications</li>
<li><i class="fa fa-exclamation" aria-hidden="true" style="color: orange;width:1.2rem;"></i> Modification de l'affichage des activités a venir</li>
<li><i class="fa fa-exclamation" aria-hidden="true" style="color: orange;width:1.2rem;"></i> Modification de l'affichage des cours a venir</li>
</ul>
</p>
<hr>
<p>
Back End & API
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Ajout des notifications par Email.</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Ajout des notifications pas SMS</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Ajout de la suppression massive de notifications</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Multiples autres ajouts</li>
</ul>
</p>
<hr>
<p>
Correction de bug
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de <a href="https://gitlab.com/TheGamecraft/c-cms/issues/26"> - Largeur colonne profil utilisateur - #26</a></li>
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de <a href="https://gitlab.com/TheGamecraft/c-cms/issues/25"> - Bug dans la création d'horaire - Message automatique qui reste lors de changement d'act. - #25</a></li>
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de <a href="https://gitlab.com/TheGamecraft/c-cms/issues/24"> - Email page d'accueil - #24</a></li>
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de <a href="https://gitlab.com/TheGamecraft/c-cms/issues/32"> - Notification Lu - #32</a></li>
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de <a href="https://gitlab.com/TheGamecraft/c-cms/issues/23"> - Message qui gosse dans l'horaire - #23</a></li>
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de multiple bug</li>
</ul>
</p>
<small><span class="badge badge-primary float-right mt-1">2018-11-08 12:30</span></small>
</div>
<!--/* ALPHA 3.0.5 */-->
<div class="card-header">
<strong class="card-title"><i class="fa fa-star" aria-hidden="true" style="color: gold"></i> ALPHA 3.0.5<small><span class="badge badge-success float-right mt-1">STABLE</span> <span class="badge badge-warning float-right mt-1">ALPHA</span></small></strong>

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

@@ -20,6 +20,14 @@
</div>
<hr>
<div class="row">
@if(count($AlluserClasse) == 0)
<div class="col-sm-12">
<div class="alert alert-info alert-with-icon">
<span data-notify="icon" class="ti-alert"></span>
<span data-notify="message">Aucun cours a venir</span>
</div>
</div>
@endif
@foreach ($userClasse as $classe)
<div class="col-sm-12">
@if ($classe['plan_done'] == "on")
@@ -85,22 +93,22 @@
<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><a class="btn btn-block btn-info">Télécharger</a></p>
<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>
</div>
<div class="col-sm-6" style="padding:3rem;">
<p>Guide pédagogique et de qualification du niveau 2<br><br><a class="btn btn-block btn-info">Télécharger</a></p>
<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>
</div>
<div class="col-sm-6" style="padding:3rem;">
<p>Guide pédagogique et de qualification du niveau 3<br><br><a class="btn btn-block btn-info">Télécharger</a></p>
<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>
</div>
<div class="col-sm-6" style="padding:3rem;">
<p>Guide pédagogique et de qualification du niveau 4<br><br><a class="btn btn-block btn-info">Télécharger</a></p>
<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>
</div>
</div>
</div>
<hr>
<p class="text-center">Plan de cours vierge</p>
<a href="#" class="btn btn-block btn-info">Télécharger</a>
<a href="https://onedrive.live.com/?id=45233BF612A4E12B%212758&cid=45233BF612A4E12B" class="btn btn-block btn-info">Télécharger</a>
</div>
</div>
</div>

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

@@ -20,22 +20,22 @@
<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><a 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-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><a 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-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><a 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-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><a 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-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="#" class="btn btn-block btn-info">Télécharger</a>
<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>

37
resources/views/ecc/update.blade.php
View File

@@ -2,6 +2,43 @@
@section('content')
<div class="row">
<div class="col-md-12">
<div class="card">
<div class="container">
<h5><i class="fa fa-star" aria-hidden="true" style="color:gold"></i> Mise a jour 3.0.6</h5>
<p>
Front-End
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-plus" aria-hidden="true" style="color: green;width:1.2rem;"></i> Ajout d'un bouton pour supprimer toute les notifications</li>
<li><i class="fa fa-exclamation" aria-hidden="true" style="color: orange;width:1.2rem;"></i> Modification de l'affichage des activités a venir</li>
<li><i class="fa fa-exclamation" aria-hidden="true" style="color: orange;width:1.2rem;"></i> Modification de l'affichage des cours a venir</li>
</ul>
</p>
<hr>
<p>
Back End & API
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Ajout des notifications par Email.</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Ajout des notifications pas SMS</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Ajout de la suppression massive de notifications</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Multiples autres ajouts</li>
</ul>
</p>
<hr>
<p>
Correction de bug
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de <a href="https://gitlab.com/TheGamecraft/c-cms/issues/26"> - Largeur colonne profil utilisateur - #26</a></li>
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de <a href="https://gitlab.com/TheGamecraft/c-cms/issues/25"> - Bug dans la création d'horaire - Message automatique qui reste lors de changement d'act. - #25</a></li>
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de <a href="https://gitlab.com/TheGamecraft/c-cms/issues/24"> - Email page d'accueil - #24</a></li>
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de <a href="https://gitlab.com/TheGamecraft/c-cms/issues/32"> - Notification Lu - #32</a></li>
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de <a href="https://gitlab.com/TheGamecraft/c-cms/issues/23"> - Message qui gosse dans l'horaire - #23</a></li>
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de multiple bug</li>
</ul>
</p>
</div>
</div>
</div>
<div class="col-md-12">
<div class="card">
<div class="container">

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

@@ -28,6 +28,8 @@ foreach (Auth::user()->unreadNotifications as $notification) {
<?php } ?>
</button>
<div class="dropdown-menu" aria-labelledby="notification">
<a class="btn btn-primary btn-block" href="/admin/notication/mark">Manquer toutes les notifications comme lu</a>
<hr>
<?php
foreach (Auth::user()->unreadNotifications as $notification) {
$fa_icon = "fa-info";

3
resources/views/layouts/ecc/header.blade.php
View File

@@ -24,8 +24,9 @@ foreach (Auth::user()->unreadNotifications as $notification) {
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="/ecc/notication/mark" class="btn btn-warning">Marquer toutes les notifications comme lue</a></li>
@foreach (Auth::user()->unreadNotifications as $notification)
<li><a href="#">{{$notification->data['msg']}}</a></li>
<li style="width:250px"><form method="post" action="/ecc/notication/mark/{{$notification->id}}">{{csrf_field()}}<button style="border:none;margin:5px;background-color:white" name="url" type="submit" value="{{$notification->data['url']}}"><p>{{$notification->data['msg']}}</p></button></form></li>
@endforeach
</ul>

3
routes/web.php
View File

@@ -74,7 +74,10 @@ Route::middleware(['auth','admin'])->group(function () {
Route::get('/admin/config/local' , 'LocalController@index');
/** Notification */
Route::get('/admin/notication/mark','UserController@notificationmarkALL');
Route::post('/admin/notication/mark/{id}','UserController@notificationmark');
Route::get('/ecc/notication/mark','UserController@notificationmarkALL');
Route::post('/ecc/notication/mark/{id}','UserController@notificationmarkECC');
/** Profil */
Route::get('/admin/profil/avatar' , 'UserController@UserAvatar');