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

ALPHA 3.0.5

Browse Source
This commit is contained in:
TheGamecraft
2018-09-21 14:31:00 -04:00
parent 252ff658e0
commit 3b593297cd
33 changed files with 559 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
resources/views/admin/calendar/calendar_display.blade.php
View File

@@ -16,11 +16,6 @@
</div>
</div>
</div>
@if (!\App\Config::find(1)->state)
<div class="alert alert-danger" role="alert">
Attention ! L'horaire n'est présentement pas visible par le publique ! <a href="/admin/config#schedule_public">Cliquer ici pour accéder aux options</a>
</div>
@endif
<div class="calendar"></div>
</div>
</div>

70
resources/views/admin/configs/general.blade.php Normal file
View File

@@ -0,0 +1,70 @@
@extends('layouts.admin.main')
@section('content')
<div class="col-md-12">
<div class="card">
<div class="card-header">
Configuration Générale
</div>
<div class="card-body">
<div class="row form-group">
<div class="col-md-6">
<div class="col col-md-8"><label for="text-input" class=" form-control-label">Horaire publique</label><small class="form-text text-muted">L'horaire est t-il disponible publique sur la page d'accueil du site</small></div>
<div class="col col-md-4" style="margin: auto;">
<label for="disabled-input" class=" form-control-label"></label>
<label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input id="is_schedule_public" name="is_schedule_public" class="switch-input" @if($configs->where('name','is_schedule_public')->first()->state == 1) checked="true" @endif type="checkbox" onchange="saveChange('is_schedule_public')"><span class="switch-label"></span><span class="switch-handle"></span></label>
</div>
</div>
<div class="col-md-6">
<div class="col col-md-8"><label for="text-input" class=" form-control-label">Horaire complet</label><small class="form-text text-muted">L'horaire est t-il complet ? Si cette option est désactivé les utilisateurs ne reseverons pas de notification concernant l'horaire</small></div>
<div class="col col-md-4" style="margin: auto;">
<label for="disabled-input" class=" form-control-label"></label>
<label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input id="is_schedule_build" name="is_schedule_build" class="switch-input" @if($configs->where('name','is_schedule_build')->first()->state == 1) checked="true" @endif type="checkbox" onchange="saveChange('is_schedule_build')"><span class="switch-label"></span><span class="switch-handle"></span></label>
</div>
</div>
</div>
</div>
</div>
</div>
@endsection
@section('breadcrumb')
<div class="breadcrumbs">
<div class="col-sm-4">
<div class="page-header float-left">
<div class="page-title">
<h1>Configuration Générale</h1>
</div>
</div>
</div>
<div class="col-sm-8">
<div class="page-header float-right">
<div class="page-title">
<ol class="breadcrumb text-right">
<li class="active">Configuration/Générale</li>
</ol>
</div>
</div>
</div>
</div>
@endsection
@section('custom_scripts')
<script>
function saveChange(pPerm) {
(function($) {
var myswitch = document.getElementById(pPerm);
$.post('/api/config/general/save?api_token='+api_token, { value: myswitch.checked,perm: pPerm } , function(data) {
swal({
title: 'Modification enregistré !',
type: 'success',
}).then((result) => {
if (result.value) {
location.reload();
}
})
});
})(jQuery);
}
</script>
@endsection

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

@@ -1,33 +1,123 @@
@extends('layouts.admin.main')
@section('content')
<!--<div class="col-sm-6 col-lg-6">
<div class="card text-white bg-flat-color-3">
<div class="card-body pb-0">
<div class="dropdown float-right">
<button class="btn bg-transparent dropdown-toggle theme-toggle text-light" type="button" id="dropdownMenuButton" data-toggle="dropdown">
<i class="fa fa-cog"></i>
</button>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<div class="dropdown-menu-content">
<a class="dropdown-item" href="#">Action</a>
<a class="dropdown-item" href="#">Another action</a>
<a class="dropdown-item" href="#">Something else here</a>
</div>
</div>
</div>
<h4 class="mb-0">
<span class="count">10468</span>
</h4>
<p class="text-light">Members online</p>
</div>
<div class="chart-wrapper px-0" style="height:70px;" height="70">
<canvas id="widgetChart3"></canvas>
</div>
<div class="col-md-12">
<div class="card">
<div class="card-header">
Cours a venir
</div>
</div>-->
<div class="card-body">
@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 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">
@foreach ($futureEvent as $event)
<i class="fa fa-star" aria-hidden="true" style="color:gold"></i> {{$event->data['event_name']}}<br>
@endforeach
<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">
<span class="count">{{count(\App\Log::all())}}</span>
<div class="float-right">Activité sur le site</div>
</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 class="col-lg-8 col-md-12">
<div class="card">
<div class="card-header">
<span class="count">{{count(\App\Message::all())}}</span>
<div class="float-right">Message publié</div>
</div>
<div class="card-body">
<div class="row">
@foreach (\App\Message::all()->forPage(1,4); as $msg)
<div class="col-lg-6 text-center">
<div style="height:2rem;">{{$msg->title}}</div>
<br>
<div class="msg-body" style="height:12rem;overflow:hidden">
{!!$msg->body!!}
</div>
<br>
</div>
@endforeach
</div>
<br>
<a href="/admin/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">
<div class="card-body">
<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>
<hr>
<div class="card-text text-sm-center">
<a href="#">Profil</a>
</div>
</div>
</div>
</div>
@endsection
@section('breadcrumb')

24
resources/views/admin/inventory/booking.blade.php
View File

@@ -42,7 +42,7 @@
<table class="table float center" style="border:none; max-width:80%; margin:auto;">
<thead>
<tr style="border:none;">
<th style="border:none;">ID</th>
<th style="border:none;">Quantité</th>
<th style="border:none;">Item</th>
<th style="border:none;">Description</th>
</tr>
@@ -50,7 +50,7 @@
<tbody>
@foreach ($n1_p1_items as $item)
<tr style="border:none;">
<td style="border:none; width:10%">{{$item}}</td>
<td style="border:none; width:10%">@php $quantity = explode(":",$item); @endphp {{$quantity[1]}}</td>
<td style="border:none;">{{\App\Item::find($item)->name}}</td>
<td style="border:none;">{{\App\Item::find($item)->desc}}</td>
</tr>
@@ -76,7 +76,7 @@
<table class="table float center" style="border:none; max-width:80%; margin:auto;">
<thead>
<tr style="border:none;">
<th style="border:none;">ID</th>
<th style="border:none;">Quantité</th>
<th style="border:none;">Item</th>
<th style="border:none;">Description</th>
</tr>
@@ -84,7 +84,7 @@
<tbody>
@foreach ($n1_p2_items as $item)
<tr style="border:none;">
<td style="border:none; width:10%">{{$item}}</td>
<td style="border:none; width:10%">@php $quantity = explode(":",$item); @endphp {{$quantity[1]}}</td>
<td style="border:none;">{{\App\Item::find($item)->name}}</td>
<td style="border:none;">{{\App\Item::find($item)->desc}}</td>
</tr>
@@ -113,7 +113,7 @@
<table class="table float center" style="border:none; max-width:80%; margin:auto;">
<thead>
<tr style="border:none;">
<th style="border:none;">ID</th>
<th style="border:none;">Quantité</th>
<th style="border:none;">Item</th>
<th style="border:none;">Description</th>
</tr>
@@ -121,7 +121,7 @@
<tbody>
@foreach ($n2_p1_items as $item)
<tr style="border:none;">
<td style="border:none; width:10%">{{$item}}</td>
<td style="border:none; width:10%">@php $quantity = explode(":",$item); @endphp {{$quantity[1]}}</td>
<td style="border:none;">{{\App\Item::find($item)->name}}</td>
<td style="border:none;">{{\App\Item::find($item)->desc}}</td>
</tr>
@@ -147,7 +147,7 @@
<table class="table float center" style="border:none; max-width:80%; margin:auto;">
<thead>
<tr style="border:none;">
<th style="border:none;">ID</th>
<th style="border:none;">Quantité</th>
<th style="border:none;">Item</th>
<th style="border:none;">Description</th>
</tr>
@@ -155,7 +155,7 @@
<tbody>
@foreach ($n2_p2_items as $item)
<tr style="border:none;">
<td style="border:none; width:10%">{{$item}}</td>
<td style="border:none; width:10%">@php $quantity = explode(":",$item); @endphp {{$quantity[1]}}</td>
<td style="border:none;">{{\App\Item::find($item)->name}}</td>
<td style="border:none;">{{\App\Item::find($item)->desc}}</td>
</tr>
@@ -184,7 +184,7 @@
<table class="table float center" style="border:none; max-width:80%; margin:auto;">
<thead>
<tr style="border:none;">
<th style="border:none;">ID</th>
<th style="border:none;">Quantité</th>
<th style="border:none;">Item</th>
<th style="border:none;">Description</th>
</tr>
@@ -192,7 +192,7 @@
<tbody>
@foreach ($n3_p1_items as $item)
<tr style="border:none;">
<td style="border:none; width:10%">{{$item}}</td>
<td style="border:none; width:10%">@php $quantity = explode(":",$item); @endphp {{$quantity[1]}}</td>
<td style="border:none;">{{\App\Item::find($item)->name}}</td>
<td style="border:none;">{{\App\Item::find($item)->desc}}</td>
</tr>
@@ -218,7 +218,7 @@
<table class="table float center" style="border:none; max-width:80%; margin:auto;">
<thead>
<tr style="border:none;">
<th style="border:none;">ID</th>
<th style="border:none;">Quantité</th>
<th style="border:none;">Item</th>
<th style="border:none;">Description</th>
</tr>
@@ -226,7 +226,7 @@
<tbody>
@foreach ($n3_p2_items as $item)
<tr style="border:none;">
<td style="border:none; width:10%">{{$item}}</td>
<td style="border:none; width:10%">@php $quantity = explode(":",$item); @endphp {{$quantity[1]}}</td>
<td style="border:none;">{{\App\Item::find($item)->name}}</td>
<td style="border:none;">{{\App\Item::find($item)->desc}}</td>
</tr>

4
resources/views/admin/inventory/index.blade.php
View File

@@ -13,7 +13,7 @@
<table id="log-data" class="table table-striped table-bordered">
<thead>
<tr>
<th>ID </th>
<th>Quantité</th>
<th>Nom</th>
<th>Description</th>
<th></th>
@@ -22,7 +22,7 @@
<tbody>
@foreach ($items as $item)
<tr>
<td style="width:5%;">{{$item->id}}</td>
<td style="width:5%;">{{$item->quantity}}</td>
<td>{{$item->name}}</td>
<td>{{$item->desc}}</td>
<td style="width: 12%;"><a href="/admin/item/edit/{{$item->id}}" type="button" class="btn btn-secondary"><i class="fa fa-cog"></i>&nbsp; Modifier</a><a type="button" class="btn btn-danger" onclick="deleteEvent({{$item->id}});"><i class="fa fa-times-circle" style="color:white;"></i></a></td>

8
resources/views/admin/inventory/show.blade.php
View File

@@ -19,6 +19,7 @@
<tr>
<th>Nom</th>
<th>Description</th>
<th>Quantité</th>
<th></th>
</tr>
</thead>
@@ -28,7 +29,8 @@
<tr>
<td>{{$item->name}}</td>
<td>{{$item->desc}}</td>
<td style="width: 12%;"><form action="/admin/inventory/remove/{{$schedule->id}}/{{$periode}}/{{$niveau}}" method="post">{{ csrf_field() }}<button type="submit" name="remove" value="{{$item->id}}" class="btn btn-danger"><i class="fa fa-arrow-right" style="color:white;"></i></button></form></td>
<td>{{$item->quantity}}</td>
<td style="width: 12%;"><form action="/admin/inventory/remove/{{$schedule->id}}/{{$periode}}/{{$niveau}}" method="post">{{ csrf_field() }}<button type="submit" name="remove" value="{{$item->id}}:{{$item->quantity}}" class="btn btn-danger"><i class="fa fa-arrow-right" style="color:white;"></i></button></form></td>
</tr>
@endif
@endforeach
@@ -47,15 +49,17 @@
<th></th>
<th>Nom</th>
<th>Description</th>
<th>Quantité</th>
</tr>
</thead>
<tbody>
@foreach ($dispo_item as $item)
@if ($item !== null)
<tr>
<td style="width: 12%;"><form action="/admin/inventory/add/{{$schedule->id}}/{{$periode}}/{{$niveau}}" method="post">{{ csrf_field() }}<button type="submit" name="add" class="btn btn-success" value="{{$item->id}}"><i class="fa fa-arrow-left" style="color:white;"></i></button></form></td>
<td style="width: 12%;"><form action="/admin/inventory/add/{{$schedule->id}}/{{$periode}}/{{$niveau}}" method="post">{{ csrf_field() }}<button type="submit" name="add" class="btn btn-success" value="{{$item->id}}"><i class="fa fa-arrow-left" style="color:white;"></i></button></td>
<td>{{$item->name}}</td>
<td>{{$item->desc}}</td>
<td><input type="number" class="form-control" name="qt" id="qt" min="1" max="{{$item->quantity}}" value="{{$item->quantity}}"></div></form></td>
</tr>
@endif
@endforeach

9
resources/views/admin/item/add.blade.php
View File

@@ -18,6 +18,15 @@
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="form-group">
<label for="qt">Quantité</label>
<input type="number" class="form-control" name="qt" id="qt" aria-describedby="qthelp" placeholder="" required>
<small id="qthelp" class="form-text text-muted">Quantité disponible</small>
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="form-group">

9
resources/views/admin/item/edit.blade.php
View File

@@ -18,6 +18,15 @@
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="form-group">
<label for="qt">Quantité</label>
<input type="number" class="form-control" name="qt" id="qt" aria-describedby="qthelp" placeholder="" required value="{{$item->quantity}}">
<small id="qthelp" class="form-text text-muted">Quantité disponible</small>
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="form-group">

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

@@ -1,6 +1,73 @@
@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.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>
</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 quantité d'item dans l'inventaire.</li>
<li><i class="fa fa-exclamation" aria-hidden="true" style="color: orange;width:1.2rem;"></i> Modification de l'interface de la gestion d'inventaire pour accomoder l'ajout de quantité.</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green;width:1.2rem;"></i> Ajout d'un indicateur de status sur la page de connexion..</li>
<li><i class="fa fa-exclamation" aria-hidden="true" style="color: orange;width:1.2rem;"></i> Le rapport de bug est maintenant publique.</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green;width:1.2rem;"></i> Ajout du dashboard administrateur.</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green;width:1.2rem;"></i> Ajout d'option de configuration générale.'</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> Modification du model de réservation pour accomoder l'ajout de quantité.</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Ajout d'une quantité d'item a l'inventaire.</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Ajout d'un « Helper » pour connaitre le status des services.</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Ajout d'une section « Alerte » dans le modele de page Admin.</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/22"> - Bug avec les heures quand il s'agit d'une activité "Autre" - #22</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/21"> - Bug ECC" - #21</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-09-21 18:30</span></small>
</div>
<!--/* ALPHA 3.0.4 */-->
<div class="card-header">
<strong class="card-title"><i class="fa fa-star" aria-hidden="true" style="color: gold"></i> ALPHA 3.0.4<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 class="card-text">
Nouveauté
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Création de l'espace cadet cadre.</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout de nouveau type d'icones.</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"></i> Ajout de CSS spécifique au calendrier</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF"></i> Ajout d'un controller pour l'ECC</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"></i> Correction de multiple bug</li>
</ul>
</p>
<small><span class="badge badge-primary float-right mt-1">2018-09-14 18:30</span></small>
</div>
<!--/* ALPHA 3.0.3 */-->
<div class="card-header">

9
resources/views/ecc/booking.blade.php
View File

@@ -9,6 +9,7 @@
<table class="table" id="book">
<thead>
<tr>
<th>Quantité</th>
<th>Nom</th>
<th>Description</th>
<th></th>
@@ -17,9 +18,10 @@
<tbody>
@foreach ($items as $item)
<tr>
<td>{{$item->quantity}}</td>
<td scope="row">{{$item->name}}</td>
<td>{{$item->desc}}</td>
<td style="width:12%"><form action="/ecc/inventory/remove/{{$schedule->id}}/{{$periode}}/{{$niveau}}" method="post">{{ csrf_field() }}<button type="submit" name="remove" class="btn btn-danger" value="{{$item->id}}"><i class="fa fa-arrow-right"></i></button></form></td>
<td style="width:12%"><form action="/ecc/inventory/remove/{{$schedule->id}}/{{$periode}}/{{$niveau}}" method="post">{{ csrf_field() }}<button type="submit" name="remove" class="btn btn-danger" value="{{$item->id}}:{{$item->quantity}}"><i class="fa fa-arrow-right"></i></button></form></td>
</tr>
@endforeach
</tbody>
@@ -36,15 +38,16 @@
<th></th>
<th>Nom</th>
<th>Description</th>
<th>Quantité</th>
</tr>
</thead>
<tbody>
@foreach ($dispo_item as $item)
<tr>
<td style="width:12%"><form action="/ecc/inventory/add/{{$schedule->id}}/{{$periode}}/{{$niveau}}" method="post">{{ csrf_field() }}<button type="submit" name="add" class="btn btn-success" value="{{$item->id}}"><i class="fa fa-arrow-left"></i></button></form></td>
<td style="width:12%"><form action="/ecc/inventory/add/{{$schedule->id}}/{{$periode}}/{{$niveau}}" method="post">{{ csrf_field() }}<button type="submit" name="add" class="btn btn-success" value="{{$item->id}}"><i class="fa fa-arrow-left"></i></button></td>
<td scope="row">{{$item->name}}</td>
<td>{{$item->desc}}</td>
<td><input type="number" class="form-control" name="qt" id="qt" min="1" max="{{$item->quantity}}" value="{{$item->quantity}}"></form><td>
</tr>
@endforeach
</tbody>

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

@@ -29,7 +29,7 @@
@if ($classe['material'] != "")
- Vous avez réservé
@foreach (\App\Item::explodeItems($classe['material']) as $item)
@if (\App\Item::explodeItems($classe['material'])->last() == $item)
@if (\App\Item::explodeItems($classe['material'])->last() == $item && \App\Item::explodeItems($classe['material'])->first() != $item)
et
@endif
{{$item->name}}
@@ -46,7 +46,7 @@
@if ($classe['material'] != "")
- Vous avez réservé
@foreach (\App\Item::explodeItems($classe['material']) as $item)
@if (\App\Item::explodeItems($classe['material'])->last() == $item)
@if (\App\Item::explodeItems($classe['material'])->last() == $item && \App\Item::explodeItems($classe['material'])->first() != $item)
et
@endif
{{$item->name}}

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.5</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 quantité d'item dans l'inventaire.</li>
<li><i class="fa fa-exclamation" aria-hidden="true" style="color: orange;width:1.2rem;"></i> Modification de l'interface de la gestion d'inventaire pour accomoder l'ajout de quantité.</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green;width:1.2rem;"></i> Ajout d'un indicateur de status sur la page de connexion..</li>
<li><i class="fa fa-exclamation" aria-hidden="true" style="color: orange;width:1.2rem;"></i> Le rapport de bug est maintenant publique.</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green;width:1.2rem;"></i> Ajout du dashboard administrateur.</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green;width:1.2rem;"></i> Ajout d'option de configuration générale.'</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> Modification du model de réservation pour accomoder l'ajout de quantité.</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Ajout d'une quantité d'item a l'inventaire.</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Ajout d'un « Helper » pour connaitre le status des services.</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Ajout d'une section « Alerte » dans le modele de page Admin.</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/22"> - Bug avec les heures quand il s'agit d'une activité "Autre" - #22</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/21"> - Bug ECC" - #21</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">

23
resources/views/layouts/admin/alert.blade.php Normal file
View File

@@ -0,0 +1,23 @@
<div class="row">
<div class="col-md-12">
@php
$configs = \App\Config::all();
@endphp
@if ($configs->where('name','is_schedule_public')->first()->state == 0)
@if (\Auth::User()->getPerm('schedule_edit'))
<div class="alert alert-danger" role="alert">
Attention ! L'horaire n'est présentement pas visible par le publique ! <a href="/admin/config#schedule_public">Cliquer ici pour accéder aux options</a>
</div>
@endif
@endif
@if ($configs->where('name','is_schedule_build')->first()->state == 0)
@if (\Auth::User()->getPerm('schedule_edit'))
<div class="alert alert-primary" role="alert">
Attention ! L'horaire n'est pas marqué comme complet, les utilisateurs ne receverons pas de notification concernant l'horaire <a href="/admin/config#schedule_build">Cliquer ici pour accéder aux options</a>
</div>
@endif
@endif
</div>
</div>

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

@@ -55,8 +55,8 @@ foreach (Auth::user()->unreadNotifications as $notification) {
</a>
<div class="user-menu dropdown-menu">
<a class="nav-link" href="/admin/profil"><i class="fa fa-user"></i> {{ trans('admin/header.profil')}}</a>
<a class="nav-link" href="/admin/settings"><i class="fa fa-cog"></i> {{ trans('admin/header.settings')}}</a>
<!--<a class="nav-link" href="/admin/profil"><i class="fa fa-user"></i> {{ trans('admin/header.profil')}}</a>
<a class="nav-link" href="/admin/settings"><i class="fa fa-cog"></i> {{ trans('admin/header.settings')}}</a>-->
<a class="nav-link" href="/logout"><i class="fa fa-power-off"></i> {{ trans('admin/header.logout')}}</a>
</div>
</div>

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

@@ -30,6 +30,8 @@ use App\Notifications\Alert;
<!-- Yield Content -->
@include('layouts.admin.alert')
@yield('content')
</div>

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

@@ -71,7 +71,7 @@
<ul class="sub-menu children dropdown-menu">
<li><i class="menu-icon fa fa-plus"></i><a href="/admin/user/add">Ajouter un utilisateur</a></li>
<li><i class="menu-icon fa fa-list"></i><a href="/admin/user">Liste des utilisateurs</a></li>
<li><i class="menu-icon fa fa-user-secret"></i><a href="/admin/log">Activitées des utilisateurs</a></li>
<!--<li><i class="menu-icon fa fa-user-secret"></i><a href="/admin/log">Activitées des utilisateurs</a></li>-->
</ul>
</li>
@@ -79,9 +79,9 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-cogs"></i>Configuration</a>
<ul class="sub-menu children dropdown-menu">
<li><i class="menu-icon fa fa-cog"></i><a href="/admin/config">Général</a></li>
<li><i class="menu-icon fa fa-building"></i><a href="/admin/config/local">Locaux</a></li>
<!--<li><i class="menu-icon fa fa-building"></i><a href="/admin/config/local">Locaux</a></li>
<li><i class="menu-icon fa fa-briefcase"></i><a href="/admin/config/job">Poste</a></li>
<!--<li><i class="menu-icon fa fa-address-card"></i><a href="/admin/config/rank">Grade</a></li>-->
<li><i class="menu-icon fa fa-address-card"></i><a href="/admin/config/rank">Grade</a></li>-->
</ul>
</li>
<h3 class="menu-title">{{ trans('admin/sidebar.tools_title') }}</h3>

25
resources/views/layouts/app.blade.php
View File

@@ -16,17 +16,38 @@
<!-- Fonts -->
<link rel="dns-prefetch" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css?family=Raleway:300,400,600" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
<!-- Styles -->
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
<style>
.fa-beat {
margin-left:10px;
animation:fa-beat 2s ease infinite;
}
@keyframes fa-beat {
25% {
transform:scale(1);
}
50% {
transform:scale(1.4);
}
}
</style>
</head>
<body style="background-color: #343a40 !important">
<div id="app">
<nav class="navbar navbar-expand-md navbar-light navbar-laravel">
<nav class="navbar navbar-expand-md navbar-light navbar-laravel" style="background-color:rgb(39, 44, 51)">
<div class="container">
<a class="navbar-brand" href="{{ url('/') }}">
<a class="navbar-brand" href="{{ url('/') }}" style="color:white">
{{ config('squadron.fullname') }}
</a>
<div class="float-right" style="color: white;"><a href="https://status.c-cms.cf/" style="color:white">Status
@if (getStatus())
<i class="fas fa-circle fa-beat" style="color: red;"></i></a></div>
@else
<i class="fas fa-circle" style="color: green;"></i></a></div>
@endif
</div>
</nav>