From 3b593297cd89f1c7f2866a83735028540033b363 Mon Sep 17 00:00:00 2001 From: TheGamecraft Date: Fri, 21 Sep 2018 14:31:00 -0400 Subject: [PATCH] ALPHA 3.0.5 --- app/Http/Controllers/AdminController.php | 18 ++- app/Http/Controllers/CalendarController.php | 9 +- app/Http/Controllers/ConfigController.php | 16 +- app/Http/Controllers/ECCController.php | 28 +++- app/Http/Controllers/InventoryController.php | 28 +++- app/Http/Controllers/ItemController.php | 2 + app/Http/helpers.php | 19 +++ app/Schedule.php | 70 +++++++-- composer.json | 3 +- .../2018_09_07_104706_create_items_table.php | 1 + public/assets/js/calendar/calendar.js | 2 +- .../admin/calendar/calendar_display.blade.php | 5 - .../views/admin/configs/general.blade.php | 70 +++++++++ resources/views/admin/dashboard.blade.php | 142 ++++++++++++++---- .../views/admin/inventory/booking.blade.php | 24 +-- .../views/admin/inventory/index.blade.php | 4 +- .../views/admin/inventory/show.blade.php | 8 +- resources/views/admin/item/add.blade.php | 9 ++ resources/views/admin/item/edit.blade.php | 9 ++ resources/views/admin/update.blade.php | 67 +++++++++ resources/views/ecc/booking.blade.php | 9 +- resources/views/ecc/dashboard.blade.php | 4 +- resources/views/ecc/update.blade.php | 37 +++++ resources/views/layouts/admin/alert.blade.php | 23 +++ .../views/layouts/admin/header.blade.php | 4 +- resources/views/layouts/admin/main.blade.php | 2 + .../views/layouts/admin/sidebar.blade.php | 6 +- resources/views/layouts/app.blade.php | 25 ++- routes/api.php | 3 + routes/web.php | 6 +- vendor/composer/autoload_classmap.php | 1 + vendor/composer/autoload_files.php | 1 + vendor/composer/autoload_static.php | 2 + 33 files changed, 559 insertions(+), 98 deletions(-) create mode 100644 app/Http/helpers.php create mode 100644 resources/views/admin/configs/general.blade.php create mode 100644 resources/views/layouts/admin/alert.blade.php diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index cff7f589..0729f90b 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -26,7 +26,23 @@ class AdminController extends Controller { Log::saveLog('Affichage du tableau de bord'); - return view('admin.dashboard'); + $futureEvent_to_filtered = \App\Schedule::all()->sortBy('date'); + $futureEvent_to_filtered_pass_1 = collect(); + $futureEvent = collect(); + + foreach ($futureEvent_to_filtered as $day) { + if ($day->date >= date('Y-m-d')) { + $futureEvent_to_filtered_pass_1->push($day); + } + } + + foreach ($futureEvent_to_filtered_pass_1 as $day) { + if ($day->date <= date('Y-m-d',strtotime("+2 week"))) { + $futureEvent->push($day); + } + } + + return view('admin.dashboard',['futureEvent' => $futureEvent,'userClasse' => \Auth::User()->getClasse()->forPage(1,6)]); } public function update() diff --git a/app/Http/Controllers/CalendarController.php b/app/Http/Controllers/CalendarController.php index 93024b40..957259ff 100644 --- a/app/Http/Controllers/CalendarController.php +++ b/app/Http/Controllers/CalendarController.php @@ -191,9 +191,6 @@ class CalendarController extends Controller ''. ''. ''. - '

'. - "L'activité auras lieux a l'escadron entre 18h30 et 21h30". - '

'. '

'.$date->data['event_desc']. '

' ); @@ -445,14 +442,14 @@ class CalendarController extends Controller $schedule->save(); /** Logs and Notification */ - Log::saveLog("Ajout de l'activité, ".$schedule->name." à l'horaire le ".$schedule->date); + Log::saveLog("Ajout de l'activité, ".$schedule->data['event_name']." à l'horaire le ".$schedule->date); $userToNotify = $schedule->getUserToNotify(); - \Notification::send($userToNotify, new Alert(\Auth::User()->id,"Ajout de l'activité, ".$schedule->name." à l'horaire le ".$schedule->date,"/admin/calendar")); + \Notification::send($userToNotify, new Alert(\Auth::User()->id,"Ajout 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(),"Ajout d'une activité a l'horaire",\Auth::User()->fullname()." à ajouté l'activité, ".$schedule->name." à l'horaire le ".$schedule->date)); + \Notification::send($userToNotify, new mail(\Auth::User(),"Ajout d'une activité a l'horaire",\Auth::User()->fullname()." à ajouté l'activité, ".$schedule->data['event_name']." à l'horaire le ".$schedule->date)); } return redirect('/admin/calendar'); diff --git a/app/Http/Controllers/ConfigController.php b/app/Http/Controllers/ConfigController.php index 73dc2c2b..03597fc2 100644 --- a/app/Http/Controllers/ConfigController.php +++ b/app/Http/Controllers/ConfigController.php @@ -14,7 +14,7 @@ class ConfigController extends Controller */ public function index() { - // + return view ('admin.configs.general',['configs' => Config::all()]); } /** @@ -67,9 +67,19 @@ class ConfigController extends Controller * @param \App\Config $config * @return \Illuminate\Http\Response */ - public function update(Request $request, Config $config) + public function update() { - // + $config = Config::all()->where('name',request('perm'))->first(); + + if (request('value') == "true") { + $config->state = 1; + } else { + $config->state = 0; + } + + $config->save(); + + \App\Log::saveLog('Modification de la configuration du site'); } /** diff --git a/app/Http/Controllers/ECCController.php b/app/Http/Controllers/ECCController.php index 4b0e298d..f79e408d 100644 --- a/app/Http/Controllers/ECCController.php +++ b/app/Http/Controllers/ECCController.php @@ -247,25 +247,43 @@ class ECCController extends Controller foreach ($items_array as $item_array) { if ($item_array != "") { - $items->push(\App\Item::find($item_array)); + $item_array_ex = explode(":",$item_array); + $this_item = \App\Item::find($item_array_ex[0]); + $this_item->quantity = $item_array_ex[1]; + $items->push($this_item); } } } + return view('ecc.booking',['schedule' => $schedule, 'periode' => $periode, 'niveau' => $niveau, 'items' => $items, 'dispo_item' => $schedule->getInventory($periode)]); } public function booking_add($id,$periode,$niveau) { $schedule = Schedule::find($id); - + $id_to_modify = "passet"; + $qt_to_add = 0; $periode_item = 'n'.$niveau.'_p'.$periode.'_item'; if (isset($schedule->$periode_item)) { $array_items = explode("-",$schedule->$periode_item); - array_push($array_items,request('add')); + for ($i=0; $i < count($array_items); $i++) { + $array_item_id = explode(":",$array_items[$i]); + + if ($array_item_id[0] == request('add')) { + $id_to_modify = $i; + $qt_to_add = $array_item_id[1]; + } + } + if ($id_to_modify === "passet") { + array_push($array_items,request('add').":".request('qt')); + } else { + $toadd = $qt_to_add+request('qt'); + $array_items[$id_to_modify] = request('add').":".$toadd; + } } else { $array_items = []; - array_push($array_items,request('add')); + array_push($array_items,request('add').":".request('qt')); } $final_items = implode("-",$array_items); @@ -273,7 +291,7 @@ class ECCController extends Controller $schedule->$periode_item = $final_items; $schedule->save(); - + return redirect('/ecc/inventory/'.$id.'/'.$niveau.'/'.$periode); } diff --git a/app/Http/Controllers/InventoryController.php b/app/Http/Controllers/InventoryController.php index 6c648870..589c79c0 100644 --- a/app/Http/Controllers/InventoryController.php +++ b/app/Http/Controllers/InventoryController.php @@ -54,15 +54,29 @@ class InventoryController extends Controller public function store($id,$periode,$niveau) { $schedule = Schedule::find($id); - + $id_to_modify = "passet"; + $qt_to_add = 0; $periode_item = 'n'.$niveau.'_p'.$periode.'_item'; if (isset($schedule->$periode_item)) { $array_items = explode("-",$schedule->$periode_item); - array_push($array_items,request('add')); + for ($i=0; $i < count($array_items); $i++) { + $array_item_id = explode(":",$array_items[$i]); + + if ($array_item_id[0] == request('add')) { + $id_to_modify = $i; + $qt_to_add = $array_item_id[1]; + } + } + if ($id_to_modify === "passet") { + array_push($array_items,request('add').":".request('qt')); + } else { + $toadd = $qt_to_add+request('qt'); + $array_items[$id_to_modify] = request('add').":".$toadd; + } } else { $array_items = []; - array_push($array_items,request('add')); + array_push($array_items,request('add').":".request('qt')); } $final_items = implode("-",$array_items); @@ -70,7 +84,7 @@ class InventoryController extends Controller $schedule->$periode_item = $final_items; $schedule->save(); - + return redirect('/admin/inventory/'.$id.'/'.$periode.'/'.$niveau); } @@ -91,10 +105,14 @@ class InventoryController extends Controller foreach ($items_array as $item_array) { if ($item_array != "") { - $items->push(Item::find($item_array)); + $item_array_ex = explode(":",$item_array); + $this_item = Item::find($item_array_ex[0]); + $this_item->quantity = $item_array_ex[1]; + $items->push($this_item); } } } + return view('admin.inventory.show',['schedule' => $schedule, 'periode' => $periode, 'niveau' => $niveau, 'items' => $items, 'dispo_item' => $schedule->getInventory($periode)]); } diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index 0b14f58e..f7501d01 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -39,6 +39,7 @@ class ItemController extends Controller $item->name = request('name'); $item->desc = request('desc'); + $item->quantiy = request('qt'); $item->save(); @@ -82,6 +83,7 @@ class ItemController extends Controller $item->name = request('name'); $item->desc = request('desc'); + $item->quantity = request('qt'); $item->save(); diff --git a/app/Http/helpers.php b/app/Http/helpers.php new file mode 100644 index 00000000..cf472355 --- /dev/null +++ b/app/Http/helpers.php @@ -0,0 +1,19 @@ +get('https://status.c-cms.cf/api/v1/incidents'); + + $isBroken = false; + + $incidents_decode = json_decode($incidents->getBody(),true); + + foreach ($incidents_decode['data'] as $incident) { + if (!$incident['is_resolved']) { + $isBroken = true; + } + } + + return $isBroken; +} \ No newline at end of file diff --git a/app/Schedule.php b/app/Schedule.php index 28fb64e0..c438722f 100644 --- a/app/Schedule.php +++ b/app/Schedule.php @@ -13,8 +13,10 @@ class Schedule extends Model public function getInventory($periode) { - $dispo = []; - $used = []; + $dispo_id = []; + $dispo_qt = []; + $used_id = []; + $used_qt = []; $dispo_item = collect(); $string_periode = 'p'.$periode; @@ -22,34 +24,72 @@ class Schedule extends Model $inventory = Item::all(); foreach ($inventory as $item) { - array_push($dispo, $item->id); + array_push($dispo_id, $item->id); + array_push($dispo_qt, $item->quantity); } $n1 = 'n1_'.$string_periode.'_item'; $items_array = explode("-",$this->$n1); - - foreach ($items_array as $item_array) { - array_push($used,$item_array); + if ($items_array[0] == "") { + unset($items_array[0]); + } + $items_array = array_values($items_array); + if ($items_array != "") { + foreach ($items_array as $item_array) { + $items_for = explode(":",$item_array); + array_push($used_id,$items_for[0]); + array_push($used_qt,$items_for[1]); + } } $n2 = 'n2_'.$string_periode.'_item'; $items_array = explode("-",$this->$n2); + if ($items_array[0] == "") { + unset($items_array[0]); + } + $items_array = array_values($items_array); - foreach ($items_array as $item_array) { - array_push($used,$item_array); + if ($items_array != "") { + foreach ($items_array as $item_array) { + $items_for = explode(":",$item_array); + array_push($used_id,$items_for[0]); + array_push($used_qt,$items_for[1]); + } } $n3 = 'n3_'.$string_periode.'_item'; $items_array = explode("-",$this->$n3); - - foreach ($items_array as $item_array) { - array_push($used,$item_array); + if ($items_array[0] == "") { + unset($items_array[0]); + } + $items_array = array_values($items_array); + if ($items_array != "") { + foreach ($items_array as $item_array) { + $items_for = explode(":",$item_array); + array_push($used_id,$items_for[0]); + array_push($used_qt,$items_for[1]); + } } - $dispo = array_diff($dispo,$used); - - foreach ($dispo as $key) { - $dispo_item->push(Item::find($key)); + for ($i=0; $i < count($used_id); $i++) { + for ($e=0; $e < count($dispo_id); $e++) { + if (isset($dispo_id[0])) { + if ($used_id[$i] == $dispo_id[$e]) { + $dispo_qt[$e] = $dispo_qt[$e] - $used_qt[$i]; + if ($dispo_qt[$e] < 1) { + unset($dispo_id[$e]); + unset($dispo_qt[$e]); + } + } + } + } + } + $dispo_id = array_values($dispo_id); + $dispo_qt = array_values($dispo_qt); + for ($i=0; $i < count($dispo_id); $i++) { + $this_item = Item::find($dispo_id[$i]); + $this_item->quantity = $dispo_qt[$i]; + $dispo_item->push($this_item); } return $dispo_item; diff --git a/composer.json b/composer.json index bf2e145f..0d801e5b 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,8 @@ ], "psr-4": { "App\\": "app/" - } + }, + "files": ["app/Http/helpers.php"] }, "autoload-dev": { "psr-4": { diff --git a/database/migrations/2018_09_07_104706_create_items_table.php b/database/migrations/2018_09_07_104706_create_items_table.php index f9cc159f..1e5c5ef3 100644 --- a/database/migrations/2018_09_07_104706_create_items_table.php +++ b/database/migrations/2018_09_07_104706_create_items_table.php @@ -15,6 +15,7 @@ class CreateItemsTable extends Migration { Schema::create('items', function (Blueprint $table) { $table->increments('id'); + $table->integer('quantity'); $table->string('name'); $table->string('desc'); $table->timestamps(); diff --git a/public/assets/js/calendar/calendar.js b/public/assets/js/calendar/calendar.js index ee00ec70..50c6cbb4 100644 --- a/public/assets/js/calendar/calendar.js +++ b/public/assets/js/calendar/calendar.js @@ -98,7 +98,7 @@ function switchType() eventBeginTime.value = "18:30"; eventEndTime.value = "21:45"; eventLocation.value = "Escadron"; - tinymce.get('event_desc').setContent("Lors des soirées d'instruction, les cadets auronts la possibilité de participer par niveau a des activitées en lien avec le programme des cadets, que ce soit des activitées de tir, marche militaire, musique, pilotage, leadership et plus, a tous les coups le plaisir est au rendez-vous."); + tinymce.get('event_desc').setContent("Lors des soirées d'instruction, les cadets auront la possibilité de participer par niveau à des activités en lien avec le programme des cadets, qu'il s'agisse d'activités de tir, de marche militaire, de musique, de pilotage, de leadership et plus, dans une ambiance plaisante."); var n1_p1_plandone = document.getElementById('n1_p1_plandone'); var n1_p2_plandone = document.getElementById('n1_p2_plandone'); diff --git a/resources/views/admin/calendar/calendar_display.blade.php b/resources/views/admin/calendar/calendar_display.blade.php index c3556361..4beddf68 100644 --- a/resources/views/admin/calendar/calendar_display.blade.php +++ b/resources/views/admin/calendar/calendar_display.blade.php @@ -16,11 +16,6 @@ - @if (!\App\Config::find(1)->state) - - @endif
diff --git a/resources/views/admin/configs/general.blade.php b/resources/views/admin/configs/general.blade.php new file mode 100644 index 00000000..8d03c863 --- /dev/null +++ b/resources/views/admin/configs/general.blade.php @@ -0,0 +1,70 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+ Configuration Générale +
+
+
+
+
L'horaire est t-il disponible publique sur la page d'accueil du site
+
+ + +
+
+
+
L'horaire est t-il complet ? Si cette option est désactivé les utilisateurs ne reseverons pas de notification concernant l'horaire
+
+ + +
+
+
+
+
+
+@endsection + +@section('breadcrumb') +
+
+
+
+

Configuration Générale

+
+
+
+
+
+
+
    +
  1. Configuration/Générale
    2. +
+
+
+
+
+@endsection + +@section('custom_scripts') + +@endsection diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php index 883fbca7..13a546dc 100644 --- a/resources/views/admin/dashboard.blade.php +++ b/resources/views/admin/dashboard.blade.php @@ -1,33 +1,123 @@ @extends('layouts.admin.main') @section('content') - +
+ @foreach ($userClasse as $classe) +
+ @if ($classe['plan_done'] == "on") +
+ + Le cours {{$classe['ocom']}} - {{$classe['name']}} du {{$classe['date']}} est remis.
+ @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 + +
+ @else +
+ + Le cours {{$classe['ocom']}} - {{$classe['name']}} du {{$classe['date']}} n'est pas remis.
+ @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 + +
+ @endif +
+ @endforeach +
+ + +
+
+
+ {{count($futureEvent)}} +
Activité a venir
+
+
+ @foreach ($futureEvent as $event) + {{$event->data['event_name']}}
+ @endforeach +
+ Afficher plus +
+
+
+
+
+
+ {{count(\App\Log::all())}} +
Activité sur le site
+
+
+ @foreach (\App\Log::all()->forPage(1,3); as $event) + {{$event->action}}
+ @endforeach +
+ Afficher plus +
+
+
+
+
+
+ {{count(\App\Message::all())}} +
Message publié
+
+
+
+ @foreach (\App\Message::all()->forPage(1,4); as $msg) +
+
{{$msg->title}}
+
+
+ {!!$msg->body!!} +
+
+
+ @endforeach +
+
+ Afficher plus +
+
+
+
+
+
+
+ Card image cap +
{{\Auth::User()->fullname()}}
+
{{\App\Rank::find(\Auth::User()->rank)->name}}
+
+
+
+ Profil +
+
+
+
@endsection @section('breadcrumb') diff --git a/resources/views/admin/inventory/booking.blade.php b/resources/views/admin/inventory/booking.blade.php index b07b707c..c1ebee33 100644 --- a/resources/views/admin/inventory/booking.blade.php +++ b/resources/views/admin/inventory/booking.blade.php @@ -42,7 +42,7 @@ - + @@ -50,7 +50,7 @@ @foreach ($n1_p1_items as $item) - + @@ -76,7 +76,7 @@
IDQuantité Item Description
{{$item}}@php $quantity = explode(":",$item); @endphp {{$quantity[1]}} {{\App\Item::find($item)->name}} {{\App\Item::find($item)->desc}}
- + @@ -84,7 +84,7 @@ @foreach ($n1_p2_items as $item) - + @@ -113,7 +113,7 @@
IDQuantité Item Description
{{$item}}@php $quantity = explode(":",$item); @endphp {{$quantity[1]}} {{\App\Item::find($item)->name}} {{\App\Item::find($item)->desc}}
- + @@ -121,7 +121,7 @@ @foreach ($n2_p1_items as $item) - + @@ -147,7 +147,7 @@
IDQuantité Item Description
{{$item}}@php $quantity = explode(":",$item); @endphp {{$quantity[1]}} {{\App\Item::find($item)->name}} {{\App\Item::find($item)->desc}}
- + @@ -155,7 +155,7 @@ @foreach ($n2_p2_items as $item) - + @@ -184,7 +184,7 @@
IDQuantité Item Description
{{$item}}@php $quantity = explode(":",$item); @endphp {{$quantity[1]}} {{\App\Item::find($item)->name}} {{\App\Item::find($item)->desc}}
- + @@ -192,7 +192,7 @@ @foreach ($n3_p1_items as $item) - + @@ -218,7 +218,7 @@
IDQuantité Item Description
{{$item}}@php $quantity = explode(":",$item); @endphp {{$quantity[1]}} {{\App\Item::find($item)->name}} {{\App\Item::find($item)->desc}}
- + @@ -226,7 +226,7 @@ @foreach ($n3_p2_items as $item) - + diff --git a/resources/views/admin/inventory/index.blade.php b/resources/views/admin/inventory/index.blade.php index ec080b79..5e570272 100644 --- a/resources/views/admin/inventory/index.blade.php +++ b/resources/views/admin/inventory/index.blade.php @@ -13,7 +13,7 @@
IDQuantité Item Description
{{$item}}@php $quantity = explode(":",$item); @endphp {{$quantity[1]}} {{\App\Item::find($item)->name}} {{\App\Item::find($item)->desc}}
- + @@ -22,7 +22,7 @@ @foreach ($items as $item) - + diff --git a/resources/views/admin/inventory/show.blade.php b/resources/views/admin/inventory/show.blade.php index 3eee5940..ffec31bc 100644 --- a/resources/views/admin/inventory/show.blade.php +++ b/resources/views/admin/inventory/show.blade.php @@ -19,6 +19,7 @@ + @@ -28,7 +29,8 @@ - + + @endif @endforeach @@ -47,15 +49,17 @@ + @foreach ($dispo_item as $item) @if ($item !== null) - + + @endif @endforeach diff --git a/resources/views/admin/item/add.blade.php b/resources/views/admin/item/add.blade.php index 553d5dc2..0e9d2af4 100644 --- a/resources/views/admin/item/add.blade.php +++ b/resources/views/admin/item/add.blade.php @@ -18,6 +18,15 @@ +
+
+
+ + + Quantité disponible +
+
+
diff --git a/resources/views/admin/item/edit.blade.php b/resources/views/admin/item/edit.blade.php index d4bbdcfc..65cb3b06 100644 --- a/resources/views/admin/item/edit.blade.php +++ b/resources/views/admin/item/edit.blade.php @@ -18,6 +18,15 @@
+
+
+
+ + + Quantité disponible +
+
+
diff --git a/resources/views/admin/update.blade.php b/resources/views/admin/update.blade.php index d79d288b..275131a4 100644 --- a/resources/views/admin/update.blade.php +++ b/resources/views/admin/update.blade.php @@ -1,6 +1,73 @@ @extends('layouts.admin.main') @section('content') + +
+ ALPHA 3.0.5STABLE ALPHA +
+
+

+ Front-End +

    +
  • Ajout d'un quantité d'item dans l'inventaire.
    • +
  • Modification de l'interface de la gestion d'inventaire pour accomoder l'ajout de quantité.
    • +
  • Ajout d'un indicateur de status sur la page de connexion..
    • +
  • Le rapport de bug est maintenant publique.
    • +
  • Ajout du dashboard administrateur.
    • +
  • Ajout d'option de configuration générale.'
    • +
+

+
+

+ Back End & API +

    +
  • Modification du model de réservation pour accomoder l'ajout de quantité.
    • +
  • Ajout d'une quantité d'item a l'inventaire.
    • +
  • Ajout d'un « Helper » pour connaitre le status des services.
    • +
  • Ajout d'une section « Alerte » dans le modele de page Admin.
    • +
+

+
+

+ Correction de bug +

+

+ 2018-09-21 18:30 +
+ + +
+ ALPHA 3.0.4STABLE ALPHA +
+
+

+ Nouveauté +

    +
  • Création de l'espace cadet cadre.
    • +
  • Ajout de nouveau type d'icones.
    • +
+

+
+

+ Back End & API +

    +
  • Ajout de CSS spécifique au calendrier
    • +
  • Ajout d'un controller pour l'ECC
    • +
+

+
+

+ Correction de bug +

    +
  • Correction de multiple bug
    • +
+

+ 2018-09-14 18:30 +
diff --git a/resources/views/ecc/booking.blade.php b/resources/views/ecc/booking.blade.php index a51d278d..17128d75 100644 --- a/resources/views/ecc/booking.blade.php +++ b/resources/views/ecc/booking.blade.php @@ -9,6 +9,7 @@
ID Quantité Nom Description
{{$item->id}}{{$item->quantity}} {{$item->name}} {{$item->desc}}   Modifier
Nom DescriptionQuantité
{{$item->name}} {{$item->desc}}
{{ csrf_field() }}
{{$item->quantity}}
{{ csrf_field() }}
Nom DescriptionQuantité
{{ csrf_field() }}
{{ csrf_field() }}
 {{$item->name}} {{$item->desc}}
+ @@ -17,9 +18,10 @@ @foreach ($items as $item) + - + @endforeach @@ -36,15 +38,16 @@ + @foreach ($dispo_item as $item) - + - + @endforeach diff --git a/resources/views/ecc/dashboard.blade.php b/resources/views/ecc/dashboard.blade.php index ca289ae2..84505669 100644 --- a/resources/views/ecc/dashboard.blade.php +++ b/resources/views/ecc/dashboard.blade.php @@ -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}} diff --git a/resources/views/ecc/update.blade.php b/resources/views/ecc/update.blade.php index f80589ae..91907651 100644 --- a/resources/views/ecc/update.blade.php +++ b/resources/views/ecc/update.blade.php @@ -2,6 +2,43 @@ @section('content')
+
+
+
+
Mise a jour 3.0.5
+

+ Front-End +

    +
  • Ajout d'un quantité d'item dans l'inventaire.
    • +
  • Modification de l'interface de la gestion d'inventaire pour accomoder l'ajout de quantité.
    • +
  • Ajout d'un indicateur de status sur la page de connexion..
    • +
  • Le rapport de bug est maintenant publique.
    • +
  • Ajout du dashboard administrateur.
    • +
  • Ajout d'option de configuration générale.'
    • +
+

+
+

+ Back End & API +

    +
  • Modification du model de réservation pour accomoder l'ajout de quantité.
    • +
  • Ajout d'une quantité d'item a l'inventaire.
    • +
  • Ajout d'un « Helper » pour connaitre le status des services.
    • +
  • Ajout d'une section « Alerte » dans le modele de page Admin.
    • +
+

+
+

+ Correction de bug +

+

+
+
+
diff --git a/resources/views/layouts/admin/alert.blade.php b/resources/views/layouts/admin/alert.blade.php new file mode 100644 index 00000000..cc4fab0f --- /dev/null +++ b/resources/views/layouts/admin/alert.blade.php @@ -0,0 +1,23 @@ +
+
+ @php + $configs = \App\Config::all(); + @endphp + + @if ($configs->where('name','is_schedule_public')->first()->state == 0) + @if (\Auth::User()->getPerm('schedule_edit')) + + @endif + @endif + + @if ($configs->where('name','is_schedule_build')->first()->state == 0) + @if (\Auth::User()->getPerm('schedule_edit')) + + @endif + @endif +
+
\ No newline at end of file diff --git a/resources/views/layouts/admin/header.blade.php b/resources/views/layouts/admin/header.blade.php index 42aa3c8a..07af6bda 100644 --- a/resources/views/layouts/admin/header.blade.php +++ b/resources/views/layouts/admin/header.blade.php @@ -55,8 +55,8 @@ foreach (Auth::user()->unreadNotifications as $notification) {
- {{ trans('admin/header.profil')}} - {{ trans('admin/header.settings')}} + {{ trans('admin/header.logout')}}
diff --git a/resources/views/layouts/admin/main.blade.php b/resources/views/layouts/admin/main.blade.php index 2052fb7f..6d090712 100644 --- a/resources/views/layouts/admin/main.blade.php +++ b/resources/views/layouts/admin/main.blade.php @@ -30,6 +30,8 @@ use App\Notifications\Alert; + @include('layouts.admin.alert') + @yield('content')
diff --git a/resources/views/layouts/admin/sidebar.blade.php b/resources/views/layouts/admin/sidebar.blade.php index a17d1ce3..0ec2a833 100644 --- a/resources/views/layouts/admin/sidebar.blade.php +++ b/resources/views/layouts/admin/sidebar.blade.php @@ -71,7 +71,7 @@ @@ -79,9 +79,9 @@

{{ trans('admin/sidebar.tools_title') }}

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index cb536d29..70731b56 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -16,17 +16,38 @@ + + diff --git a/routes/api.php b/routes/api.php index 2cfde571..dd644975 100644 --- a/routes/api.php +++ b/routes/api.php @@ -32,6 +32,9 @@ Route::middleware('auth:api')->group(function () { /** Inventory Route */ Route::post('/item/delete', 'ItemController@destroy'); + /** Config Route */ + Route::post('/config/general/save', 'ConfigController@update'); + Route::get('/user/perm/{id}', function($id) { $user = \App\User::find($id); return $user->getPerm("schedule_edit"); diff --git a/routes/web.php b/routes/web.php index addab91f..0e953d6c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -55,6 +55,8 @@ Route::middleware(['auth','admin'])->group(function () { Route::get('/admin/config/job/add' , 'JobController@create'); Route::post('/admin/config/job/add' , 'JobController@store'); Route::get('/admin/config/job/edit/{id}' , 'JobController@edit'); + Route::get('/admin/config' , 'ConfigController@index'); + /** Inventory */ Route::get('/admin/inventory' , 'InventoryController@index'); @@ -92,8 +94,8 @@ Route::middleware(['auth','staff'])->group(function () { }); /* Other Route */ Route::get('/test', function () { - - return view('welcome'); + + dd(getStatus()); }); diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 1a16f20a..d37260f7 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -18,6 +18,7 @@ return array( 'App\\Http\\Controllers\\CalendarController' => $baseDir . '/app/Http/Controllers/CalendarController.php', 'App\\Http\\Controllers\\ConfigController' => $baseDir . '/app/Http/Controllers/ConfigController.php', 'App\\Http\\Controllers\\Controller' => $baseDir . '/app/Http/Controllers/Controller.php', + 'App\\Http\\Controllers\\ECCController' => $baseDir . '/app/Http/Controllers/ECCController.php', 'App\\Http\\Controllers\\InventoryController' => $baseDir . '/app/Http/Controllers/InventoryController.php', 'App\\Http\\Controllers\\ItemController' => $baseDir . '/app/Http/Controllers/ItemController.php', 'App\\Http\\Controllers\\JobController' => $baseDir . '/app/Http/Controllers/JobController.php', diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index 1c513d8c..5d2cbf7d 100644 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -26,4 +26,5 @@ return array( '0b0974a5566a1077e4f2e111341112c1' => $vendorDir . '/zendframework/zend-diactoros/src/functions/normalize_server.php', '1ca3bc274755662169f9629d5412a1da' => $vendorDir . '/zendframework/zend-diactoros/src/functions/normalize_uploaded_files.php', '40360c0b9b437e69bcbb7f1349ce029e' => $vendorDir . '/zendframework/zend-diactoros/src/functions/parse_cookie_header.php', + '6d394c3a532652dafb4dd296ba6a3f0b' => $baseDir . '/app/Http/helpers.php', ); diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 445d51fd..e826fde6 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -27,6 +27,7 @@ class ComposerStaticInit7aa8410dad307922e6e62bcfdfadda15 '0b0974a5566a1077e4f2e111341112c1' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/functions/normalize_server.php', '1ca3bc274755662169f9629d5412a1da' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/functions/normalize_uploaded_files.php', '40360c0b9b437e69bcbb7f1349ce029e' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/functions/parse_cookie_header.php', + '6d394c3a532652dafb4dd296ba6a3f0b' => __DIR__ . '/../..' . '/app/Http/helpers.php', ); public static $prefixLengthsPsr4 = array ( @@ -401,6 +402,7 @@ class ComposerStaticInit7aa8410dad307922e6e62bcfdfadda15 'App\\Http\\Controllers\\CalendarController' => __DIR__ . '/../..' . '/app/Http/Controllers/CalendarController.php', 'App\\Http\\Controllers\\ConfigController' => __DIR__ . '/../..' . '/app/Http/Controllers/ConfigController.php', 'App\\Http\\Controllers\\Controller' => __DIR__ . '/../..' . '/app/Http/Controllers/Controller.php', + 'App\\Http\\Controllers\\ECCController' => __DIR__ . '/../..' . '/app/Http/Controllers/ECCController.php', 'App\\Http\\Controllers\\InventoryController' => __DIR__ . '/../..' . '/app/Http/Controllers/InventoryController.php', 'App\\Http\\Controllers\\ItemController' => __DIR__ . '/../..' . '/app/Http/Controllers/ItemController.php', 'App\\Http\\Controllers\\JobController' => __DIR__ . '/../..' . '/app/Http/Controllers/JobController.php',
Quantité Nom Description
{{$item->quantity}} {{$item->name}} {{$item->desc}}
{{ csrf_field() }}
{{ csrf_field() }}
Nom DescriptionQuantité
{{ csrf_field() }}
{{ csrf_field() }}
 {{$item->name}} {{$item->desc}}