mirror of
https://gitlab.com/TheGamecraft/c-cms.git
synced 2026-04-21 02:39:10 -04:00
3.2.3
This commit is contained in:
Mathieu Lagace
@@ -24,8 +24,12 @@
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="btn-group w-100">
|
||||
<a href="/admin/article/activity/edit/{{$a->id}}" type="button" class="btn btn-secondary btn-block"><i class="fa fa-cog"></i> Modifier l'article</a>
|
||||
<a href="/admin/article/activity/picture/{{$a->id}}" type="button" class="btn btn-secondary btn-block"><i class="fa fa-picture-o"></i> Gérer les photos</a>
|
||||
@if(\Auth::user()->p('article_edit') == 1)
|
||||
<a href="/admin/article/activity/edit/{{$a->id}}" type="button" class="btn btn-secondary btn-block"><i class="fa fa-cog"></i> Modifier l'article</a>
|
||||
@endif
|
||||
@if(\Auth::user()->p('article_edit') == 1 && \Auth::user()->p('picture_add'))
|
||||
<a href="/admin/article/activity/picture/{{$a->id}}" type="button" class="btn btn-secondary btn-block"><i class="fa fa-picture-o"></i> Gérer les photos</a>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
|
||||
87
resources/views/admin/configs/ranks/add.blade.php
Normal file
87
resources/views/admin/configs/ranks/add.blade.php
Normal file
@@ -0,0 +1,87 @@
|
||||
@extends('layouts.admin.main')
|
||||
|
||||
@section('content')
|
||||
<div class="col-md-12">
|
||||
<div class="card">
|
||||
<div class="card-header card-header-primary">
|
||||
<h4>Ajouter un grade</h4>
|
||||
</div>
|
||||
<div class="card-body mt-5">
|
||||
<form method="post" action="/admin/config/ranks/add">
|
||||
@csrf
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="form-group">
|
||||
<label>Nom</label>
|
||||
<input class="form-control" type="text" name="name">
|
||||
<small class="form-text text-muted">Nom du grade</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="form-group">
|
||||
<label>Description</label>
|
||||
<textarea id="desc" name="desc"></textarea>
|
||||
<small class="form-text text-muted">Description du grade</small>
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="col-md-12">
|
||||
<h3>Permissions du Grade</h3>
|
||||
<p>
|
||||
Choisissez quels permissions doivent être associé avec ce grade.
|
||||
</p>
|
||||
<div id="accordion" role="tablist">
|
||||
@foreach(\App\Permission::allToArray() as $key => $cat)
|
||||
<div class="card card-collapse">
|
||||
<div class="card-header" role="tab" id="headingOne">
|
||||
<h5 class="mb-0">
|
||||
<a class="text-capitalize" data-toggle="collapse" href="#coll-{{$key}}" @if ($loop->first) aria-expanded="true" @endif aria-controls="collapseOne">
|
||||
{{$key}}
|
||||
<i class="material-icons">keyboard_arrow_down</i>
|
||||
</a>
|
||||
</h5>
|
||||
</div>
|
||||
|
||||
<div id="coll-{{$key}}" class="collapse @if ($loop->first) show @endif" role="tabpanel" aria-labelledby="headingOne" data-parent="#accordion">
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
@foreach($cat as $r)
|
||||
<div class="col text-center">
|
||||
<input class="d-none" type="text" id="{{$r['ckey']}}" name="{{$r['ckey']}}">
|
||||
<h5>{{$r['communName']}}</h5>
|
||||
<div class="btn-group">
|
||||
<button type="button" id="{{$r['ckey']}}-close" class="btn btn-just-icon btn-outline-danger" onclick="switchPermissionSwitch('{{$r['ckey']}}','close')"><i class="fa fa-close"></i></button>
|
||||
<!--<button type="button" id="{{$r['ckey']}}-slash" class="btn btn-just-icon btn-warning" onclick="switchPermissionSwitch('{{$r['ckey']}}','slash')"><i class="fa fa-slash"></i></button>-->
|
||||
<button type="button" id="{{$r['ckey']}}-plus" class="btn btn-just-icon btn-outline-success" onclick="switchPermissionSwitch('{{$r['ckey']}}','plus')"><i class="fa fa-plus"></i></button>
|
||||
</div>
|
||||
<p>
|
||||
<small>{{$r['desc']}}</small>
|
||||
</p>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12 mt-5">
|
||||
<button type="submit" class="btn btn-primary">Sauvegarder</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@section('custom_scripts')
|
||||
<script src="/js/permissions.js"></script>
|
||||
<script>
|
||||
$('#desc').trumbowyg({
|
||||
lang: 'fr'
|
||||
});
|
||||
</script>
|
||||
@endsection
|
||||
@@ -32,7 +32,7 @@
|
||||
Choisissez quels permissions doivent être associé avec ce grade.
|
||||
</p>
|
||||
<div id="accordion" role="tablist">
|
||||
@foreach(\App\Permission::all() as $key => $cat)
|
||||
@foreach(\App\Permission::allToArray() as $key => $cat)
|
||||
<div class="card card-collapse">
|
||||
<div class="card-header" role="tab" id="headingOne">
|
||||
<h5 class="mb-0">
|
||||
@@ -46,17 +46,17 @@
|
||||
<div id="coll-{{$key}}" class="collapse @if ($loop->first) show @endif" role="tabpanel" aria-labelledby="headingOne" data-parent="#accordion">
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
@foreach($cat as $rank)
|
||||
@foreach($cat as $r)
|
||||
<div class="col text-center">
|
||||
<input class="d-none" type="text" id="{{$rank['id']}}" name="{{$rank['id']}}" value="0">
|
||||
<h5>{{$rank['communName']}}</h5>
|
||||
<input class="d-none" type="text" id="{{$r['ckey']}}" name="{{$r['ckey']}}" value="{{$rank->p($r['ckey'])}}">
|
||||
<h5>{{$r['communName']}}</h5>
|
||||
<div class="btn-group">
|
||||
<button type="button" id="{{$rank['id']}}-close" class="btn btn-just-icon btn-outline-danger" onclick="switchPermissionSwitch('{{$rank['id']}}','close')"><i class="fa fa-close"></i></button>
|
||||
<button type="button" id="{{$rank['id']}}-slash" class="btn btn-just-icon btn-warning" onclick="switchPermissionSwitch('{{$rank['id']}}','slash')"><i class="fa fa-slash"></i></button>
|
||||
<button type="button" id="{{$rank['id']}}-plus" class="btn btn-just-icon btn-outline-success" onclick="switchPermissionSwitch('{{$rank['id']}}','plus')"><i class="fa fa-plus"></i></button>
|
||||
<button type="button" id="{{$r['ckey']}}-close" class="btn btn-just-icon @if($rank->p($r['ckey']) != -1) btn-outline-danger @else btn-danger @endif" onclick="switchPermissionSwitch('{{$r['ckey']}}','close')"><i class="fa fa-close"></i></button>
|
||||
<!--<button type="button" id="{{$r['ckey']}}-slash" class="btn btn-just-icon @if($rank->p($r['ckey']) == 0) btn-warning @else btn-outline-warning @endif" onclick="switchPermissionSwitch('{{$r['ckey']}}','slash')"><i class="fa fa-slash"></i></button>-->
|
||||
<button type="button" id="{{$r['ckey']}}-plus" class="btn btn-just-icon @if($rank->p($r['ckey']) != 1) btn-outline-success @else btn-success @endif" onclick="switchPermissionSwitch('{{$r['ckey']}}','plus')"><i class="fa fa-plus"></i></button>
|
||||
</div>
|
||||
<p>
|
||||
<small>{{$rank['desc']}}</small>
|
||||
<small>{{$r['desc']}}</small>
|
||||
</p>
|
||||
</div>
|
||||
@endforeach
|
||||
|
||||
@@ -1,162 +1,137 @@
|
||||
@extends('layouts.admin.main')
|
||||
|
||||
@section('content')
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="card">
|
||||
<div class="card-header card-header-primary">
|
||||
<h4 class="card-title"> Cours à venir</h4>
|
||||
</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 à venir</span>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@foreach ($userClasse as $classe)
|
||||
<div class="col-sm-6">
|
||||
@if ($classe['plan_done'] == "on")
|
||||
<div class="alert alert-success alert-with-icon">
|
||||
<span data-notify="icon" class="ti-crown"></span>
|
||||
<span data-notify="message">Le cours {{$classe['ocom']}} - {{$classe['name']}} du {{$classe['date']}} est remis.<br>
|
||||
@if ($classe['material'] != "")
|
||||
- Vous avez réservé
|
||||
@foreach (\App\Item::explodeItems($classe['material']) as $item)
|
||||
@if (\App\Item::explodeItems($classe['material'])->last() == $item && \App\Item::explodeItems($classe['material'])->first() != $item)
|
||||
et
|
||||
@endif
|
||||
{{$item->name}}
|
||||
@endforeach
|
||||
@else
|
||||
- Aucun matériel réservé
|
||||
@endif
|
||||
</span>
|
||||
</div>
|
||||
@else
|
||||
<div class="alert alert-warning alert-with-icon">
|
||||
<span data-notify="icon" class="ti-alert"></span>
|
||||
<span data-notify="message">Le cours {{$classe['ocom']}} - {{$classe['name']}} du {{$classe['date']}} n'est pas remis.<br>
|
||||
@if ($classe['material'] != "")
|
||||
- Vous avez réservé
|
||||
@foreach (\App\Item::explodeItems($classe['material']) as $item)
|
||||
@if (\App\Item::explodeItems($classe['material'])->last() == $item && \App\Item::explodeItems($classe['material'])->first() != $item)
|
||||
et
|
||||
@endif
|
||||
{{$item->name}}
|
||||
@endforeach
|
||||
@else
|
||||
- Aucun matériel réservé
|
||||
@endif
|
||||
</span>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-6 col-lg-6">
|
||||
<div class="card">
|
||||
<div class="card-header card-header-primary">
|
||||
<h4 class="card-title">Activité à venir</h4>
|
||||
</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é à venir</span>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@foreach ($futureEvent as $event)
|
||||
<div class="col-md-12">
|
||||
<div class="alert" style="background-color: {{\App\ComplementaryActivity::find($event->type)->calendar_color}}">
|
||||
<div class="row text-white">
|
||||
<div class="col-md-2 text-capitalize m-auto d-none d-md-flex">
|
||||
<h3 class="m-0 p-0" style="margin-top: -0.5rem !important;">{!! \App\ComplementaryActivity::find($event->type)->calendar_icon !!}</h3>
|
||||
</div>
|
||||
<div class="col-md">
|
||||
{{$event->name}}
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
{{$event->date_begin}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
<br>
|
||||
<a href="/admin/calendar" type="button" class="btn btn-primary btn-lg btn-block">Afficher plus</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-6 col-lg-6">
|
||||
<div class="card">
|
||||
<div class="card-header card-header-primary">
|
||||
<h4 class="card-title">Activité sur le site</h4>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
@foreach (\App\Log::all()->forPage(1,3); as $event)
|
||||
<i class="fa fa-arrow-right" aria-hidden="true"></i> {{$event->action}}<br>
|
||||
@endforeach
|
||||
<br>
|
||||
<a href="/admin/stats/log" type="button" class="btn btn-primary btn-lg btn-block text-white">Afficher plus</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-lg-8 col-md-12">
|
||||
<div class="card">
|
||||
<div class="card-header card-header-primary">
|
||||
<h4 class="card-title">Message publié</h4>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
@foreach (\App\Message::all()->forPage(1,4); as $msg)
|
||||
<div class="col-lg-6 text-center">
|
||||
<a href="/admin/message/{{$msg->id}}">
|
||||
<div style="height:2rem;">{{$msg->title}}</div>
|
||||
<br>
|
||||
<div class="msg-body" style="height:12rem;overflow:hidden">
|
||||
{!!$msg->body!!}
|
||||
</div>
|
||||
<br>
|
||||
</a>
|
||||
</div>
|
||||
@endforeach
|
||||
<div class="col-md-12">
|
||||
<div class="card">
|
||||
<div class="card-header card-header-primary">
|
||||
<h4 class="card-title"> Cours à venir</h4>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
@if(\Auth::user()->courses->isEmpty())
|
||||
<div class="col-sm-12 text-center">
|
||||
<h4 class="m-4">Aucun cours à venir</h4>
|
||||
</div>
|
||||
@endif
|
||||
@foreach (\Auth::user()->courses->take(6) as $course)
|
||||
<div class="col-sm-6">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h4><strong>{{$course->ocom}} - {{$course->name}}</strong></h4>
|
||||
<p class="float-left">{{date('Y-m-d',strtotime($course->event->date_begin))}}</p>
|
||||
<p class="float-right">Période {{$course->periode}}, Niveau {{$course->level}}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="card">
|
||||
<div class="card-header card-header-primary">
|
||||
<h4 class="card-title">Activité à venir</h4>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
@if(count($futureEvent) == 0)
|
||||
<div class="col-sm-12 text-center">
|
||||
<h4 class="m-4">Aucune activité à venir</h4>
|
||||
</div>
|
||||
@endif
|
||||
@foreach ($futureEvent as $event)
|
||||
<div class="col-md-12">
|
||||
<div class="alert" style="background-color: {{\App\ComplementaryActivity::find($event->type)->calendar_color}}">
|
||||
<div class="row text-white">
|
||||
<div class="col-md-2 text-capitalize m-auto d-none d-md-flex">
|
||||
<h3 class="m-0 p-0" style="margin-top: -0.5rem !important;">{!! \App\ComplementaryActivity::find($event->type)->calendar_icon !!}</h3>
|
||||
</div>
|
||||
<div class="col-md">
|
||||
{{$event->name}}
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
{{$event->date_begin}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
<br>
|
||||
<a href="/admin/schedule" type="button" class="btn btn-primary btn-lg btn-block">Afficher plus</a>
|
||||
</div>
|
||||
<br>
|
||||
<a href="/admin/message" type="button" class="btn btn-primary btn-lg btn-block text-white">Afficher plus</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-4 col-lg-4">
|
||||
<div class="card card-profile">
|
||||
<div class="card-avatar">
|
||||
<a>
|
||||
<img class="img" src="/assets/admin/images/avatar/user-{{\Auth::User()->avatar}}.jpg">
|
||||
</a>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="mx-auto d-block">
|
||||
<h5 class="text-sm-center mt-2 mb-1">{{\Auth::User()->fullname()}}</h5>
|
||||
<div class="location text-sm-center"><i class="fa fa-id-card-o" aria-hidden="true"></i> {{\App\Rank::find(\Auth::User()->rank)->name}}</div>
|
||||
<div class="col-lg-4">
|
||||
<div class="col-12">
|
||||
<div class="card card-profile">
|
||||
<div class="card-avatar">
|
||||
<a>
|
||||
<img class="img" src="/assets/admin/images/avatar/user-{{\Auth::User()->avatar}}.jpg">
|
||||
</a>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="card-text text-sm-center">
|
||||
<a class="btn btn-block btn-secondary" href="/admin/profil">Profil</a>
|
||||
<div class="card-body">
|
||||
<div class="mx-auto d-block">
|
||||
<h5 class="text-sm-center mt-2 mb-1">{{\Auth::User()->fullname()}}</h5>
|
||||
<div class="location text-sm-center"><i class="fa fa-id-card-o" aria-hidden="true"></i> {{\Auth::User()->rank->name}}</div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="card-text text-sm-center">
|
||||
<a class="btn btn-block btn-secondary" href="/admin/profil">Profil</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="card">
|
||||
<div class="card-header card-header-info">
|
||||
<h4 class="card-title">Nouvelles</h4>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
@foreach (\App\News::all()->forPage(1,4); as $msg)
|
||||
<div class="col-12 text-center">
|
||||
<a href="/admin/message/{{$msg->id}}">
|
||||
<div style="height:2rem;">{{$msg->title}}</div>
|
||||
<br>
|
||||
<div class="msg-body" style="height:12rem;overflow:hidden">
|
||||
{!!$msg->body!!}
|
||||
</div>
|
||||
<br>
|
||||
</a>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
<br>
|
||||
<a href="/admin/news" type="button" class="btn btn-primary btn-lg btn-block text-white">Afficher plus</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@if(\Auth::user()->p('stats_see') == 1)
|
||||
<div class="col-12">
|
||||
<div class="card">
|
||||
<div class="card-header card-header-primary">
|
||||
<h4 class="card-title">Activité sur le site</h4>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
@foreach (\App\Log::all()->forPage(1,3); as $log)
|
||||
<div class="row mt-3">
|
||||
<div class="col-lg-12 col-xl-3 mx-3 my-auto">
|
||||
<span class="badge badge-pill badge-{{$log->typeColor()}} mr-2">{{$log->type}}</span>
|
||||
</div>
|
||||
<div class="col">
|
||||
{{$log->user->fullname()}} - {{$log->event}}
|
||||
</div>
|
||||
</div>
|
||||
@endforeach
|
||||
<br>
|
||||
<a href="/admin/stats/log" type="button" class="btn btn-primary btn-lg btn-block text-white">Afficher plus</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@@ -9,7 +9,9 @@
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="btn-group btn-block">
|
||||
<a name="add" id="add" class="btn btn-primary btn-block" href="/admin/item/add" role="button">Ajouter un item</a>
|
||||
@if(\Auth::user()->p('inventory_add') == 1)
|
||||
<a name="add" id="add" class="btn btn-primary btn-block" href="/admin/item/add" role="button">Ajouter un item</a>
|
||||
@endif
|
||||
</div>
|
||||
<hr>
|
||||
<table id="log-data" class="table table-striped table-bordered">
|
||||
@@ -35,8 +37,12 @@
|
||||
<td>{!! $item->desc !!}</td>
|
||||
<td style="width: 12%;">
|
||||
<div class="btn-group">
|
||||
@if(\Auth::user()->p('inventory_edit') == 1)
|
||||
<a href="/admin/item/edit/{{$item->id}}" type="button" class="btn btn-secondary"><i class="fa fa-cog"></i> Modifier</a>
|
||||
<a type="button" class="btn btn-danger" onclick="deleteEvent({{$item->id}});"><i class="fa fa-times-circle" style="color:white;"></i></a>
|
||||
@endif
|
||||
@if(\Auth::user()->p('inventory_delete') == 1)
|
||||
<a type="button" class="btn btn-danger" onclick="deleteEvent({{$item->id}});"><i class="fa fa-times-circle" style="color:white;"></i></a>
|
||||
@endif
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -8,8 +8,6 @@
|
||||
</a></strong>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<button type="button" class="btn btn-primary btn-lg btn-block">Afficher toutes les activitées</button>
|
||||
<hr>
|
||||
<div class="material-datatables">
|
||||
<table id="log-data" class="table table-striped table-no-bordered table-hover dataTable dtr-inline">
|
||||
<thead>
|
||||
@@ -26,7 +24,7 @@
|
||||
<tr>
|
||||
<td>{{$item->created_at}}</td>
|
||||
<th><span class="badge badge-pill badge-{{$item->typeColor()}}">{{$item->type}}</span></th>
|
||||
<th><span class="badge badge-pill badge-{{$item->result}}">Success</span></th>
|
||||
<th><span class="badge badge-pill badge-{{$item->result}} text-uppercase">{{$item->result}}</span></th>
|
||||
<td>{{\App\User::find($item->user_id)->fullname()}}</td>
|
||||
<td><a href="">{{$item->event}}</a></td>
|
||||
</tr>
|
||||
|
||||
@@ -9,10 +9,17 @@
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="btn-group btn-block">
|
||||
<a name="add" id="add" class="btn btn-primary btn-block" href="/admin/news/add" role="button">Ajouter un nouvelle</a>
|
||||
@if(\Auth::user()->p('news_add') == 1)
|
||||
<a name="add" id="add" class="btn btn-primary btn-block" href="/admin/news/add" role="button">Ajouter un nouvelle</a>
|
||||
@endif
|
||||
</div>
|
||||
<hr>
|
||||
<div class="row">
|
||||
@if($news->isEmpty())
|
||||
<div class="col-md-12 text-center">
|
||||
<h4 class="m-4">Aucune nouvelle</h4>
|
||||
</div>
|
||||
@endif
|
||||
@foreach($news as $n)
|
||||
<div class="col-md-4">
|
||||
<div class="card">
|
||||
@@ -26,8 +33,12 @@
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<div class="btn-group">
|
||||
<a href="/admin/news/edit/{{$n->id}}" type="button" class="btn btn-secondary"><i class="fa fa-cog"></i> Modifier</a>
|
||||
<a type="button" class="btn btn-danger" onclick="deleteEvent({{$n->id}});"><i class="fa fa-times-circle" style="color:white;"></i></a>
|
||||
@if(\Auth::user()->p('news_edit') == 1)
|
||||
<a href="/admin/news/edit/{{$n->id}}" type="button" class="btn btn-secondary"><i class="fa fa-cog"></i> Modifier</a>
|
||||
@endif
|
||||
@if(\Auth::user()->p('news_delete') == 1)
|
||||
<a type="button" class="btn btn-danger" onclick="deleteEvent({{$n->id}});"><i class="fa fa-times-circle" style="color:white;"></i></a>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -2,6 +2,113 @@
|
||||
|
||||
@section('content')
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
<h3 class="card-title">3.2.3</h3>
|
||||
<p class="category">2019-09-13</p>
|
||||
</div>
|
||||
<div class="col-sm-6 text-right">
|
||||
<span class="badge badge-pill badge-success">STABLE</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="alert alert-danger" role="alert">
|
||||
<i class="fas fa-exclamation-triangle text-white fa-2x mr-3"></i>La gestion des postes est <strong>DÉSACTIVÉ</strong> le temps de moderniser la base de donnée
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<p>
|
||||
Nouveauté
|
||||
<ul class="list-group list-group-flush ml-3">
|
||||
<li class="list-group-item">
|
||||
<div class="row">
|
||||
<div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
|
||||
<i class="fas fa-coffee"></i>
|
||||
</div>
|
||||
<div class="col m-auto text-left">
|
||||
La gestion des grades est maintenant possible.
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
<li class="list-group-item">
|
||||
<div class="row">
|
||||
<div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
|
||||
<i class="fas fa-coffee"></i>
|
||||
</div>
|
||||
<div class="col m-auto text-left">
|
||||
Refonte du code responsable de la gestion des grades
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
<li class="list-group-item">
|
||||
<div class="row">
|
||||
<div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
|
||||
<i class="fas fa-coffee"></i>
|
||||
</div>
|
||||
<div class="col m-auto text-left">
|
||||
Modernisation de la base de données des grades
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li class="list-group-item">
|
||||
<div class="row">
|
||||
<div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
|
||||
<i class="fas fa-coffee"></i>
|
||||
</div>
|
||||
<div class="col m-auto text-left">
|
||||
Suppression de L'ECC au profit d'un nouveau systeme de permission. Le grade et les permissions du grade définissent ce que peux faire un utilisateur sur le site.
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
<li class="list-group-item">
|
||||
<div class="row">
|
||||
<div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
|
||||
<i class="fas fa-plus"></i>
|
||||
</div>
|
||||
<div class="col m-auto text-left">
|
||||
Ajout de la possibilité d'imprimer une activité depuis l'horaire
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
<li class="list-group-item">
|
||||
<div class="row">
|
||||
<div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
|
||||
<i class="fas fa-plus"></i>
|
||||
</div>
|
||||
<div class="col m-auto text-left">
|
||||
Ajout de la possibilité de réserver du matériel depuis l'horaire
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<p>
|
||||
Bug
|
||||
<ul class="list-group list-group-flush ml-3">
|
||||
<li class="list-group-item">
|
||||
<div class="row">
|
||||
<div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
|
||||
<i class="fas fa-bug"></i>
|
||||
</div>
|
||||
<div class="col m-auto text-left">
|
||||
Correction de <a href="https://op.exvps.ca/versions/8">4 bugs</a>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
|
||||
@@ -95,7 +95,7 @@
|
||||
<div class="form-group">
|
||||
<label for="rank">Grade</label>
|
||||
<select class="form-control" name="rank" id="rank" required>
|
||||
<option value={{$user->rank}}>{{\App\Rank::find($user->rank)->name}}</option>
|
||||
<option value={{$user->rank->id}}>{{$user->rank->name}}</option>
|
||||
@foreach ($RankList as $rank)
|
||||
<option value="{{$rank->id}}">{{$rank->name}}</option>
|
||||
@endforeach
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
<tr>
|
||||
<td style="width: 5%;">{{$item->id}}</td>
|
||||
<td>{{$item->fullname()}}</td>
|
||||
<td>{{\App\Rank::find($item->rank)->name}}</td>
|
||||
<td>{{$item->rank->name}}</td>
|
||||
<td>{{\App\Job::find($item->job)->name}}</td>
|
||||
<td class="td-actions text-right" style="width: 12%;">
|
||||
<a class="btn btn-info p-2 text-white" href="/admin/user/edit/{{$item->id}}"><i class="material-icons">edit</i></a>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<div class="mx-auto d-block">
|
||||
<img class="rounded-circle mx-auto d-block" src="/assets/admin/images/avatar/user-{{\Auth::User()->avatar}}.jpg" alt="Card image cap" style="height:12rem">
|
||||
<h5 class="text-sm-center mt-2 mb-1">{{\Auth::User()->fullname()}}</h5>
|
||||
<div class="location text-sm-center"><i class="fa fa-id-card-o" aria-hidden="true"></i> {{\App\Rank::find(\Auth::User()->rank)->name}}</div>
|
||||
<div class="location text-sm-center"><i class="fa fa-id-card-o" aria-hidden="true"></i> {{\Auth::User()->rank->name}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-6 text-center">
|
||||
|
||||
@@ -24,11 +24,11 @@
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="pws">Entrer votre nouveau mot de passe</label>
|
||||
<input type="password" class="form-control" name="psw" id="psw" placeholder="Mot de passe" onkeyup="checkPassword()">
|
||||
<input type="password" class="form-control" name="psw" id="psw" onkeyup="checkPassword()">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="pwsc">Confirmer votre nouveau mot de passe</label>
|
||||
<input type="password" class="form-control" name="pswc" id="pswc" placeholder="Mot de passe" onkeyup="checkPassword()">
|
||||
<input type="password" class="form-control" name="pswc" id="pswc" onkeyup="checkPassword()">
|
||||
</div>
|
||||
<button type="submit" id="submit" class="btn btn-primary" disabled>Enregistrer</button>
|
||||
</form>
|
||||
|
||||
Reference in New Issue
Block a user