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

Merge branch '3.2.1' of https://gitlab.com/TheGamecraft/c-cms into 3.2.2

Browse Source
This commit is contained in:
Mathieu Lagace
2019-09-14 15:33:56 -04:00
parent 04dd5ee6b7 7f07490bdf
commit ccc947d444
8 changed files with 173 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/admin/booking/create.blade.php
View File

@@ -27,7 +27,7 @@
<td>{{$item->name}}</td>
<td>{{$item->category()->name}}</td>
<td>{!! $item->desc !!}</td>
<td>{{$item->available()}}</td>
<td>{{$item->available($event->date_begin,$event->date_end)}}</td>
<td>
<button class="btn btn-primary btn-block" onclick='openModal("{{$item->id}}")'>Réserver</button>
</td>
@@ -58,7 +58,7 @@
function openModal(id)
{
$.get("/api/booking/modal/item/" + id + "?api_token="+api_token, function (data) {
$.get("/api/booking/modal/item/" + id + "/{{$event_type}}/{{$event_id}}?api_token="+api_token, function (data) {
$("#modal-content").html(data);
});
$('#createModal').modal('toggle')

2
resources/views/admin/booking/index.blade.php
View File

@@ -116,7 +116,7 @@
function openModal(id)
{
$.get("/api/booking/modal/edit/item/" + id + "?api_token="+api_token, function (data) {
$.get("/api/booking/modal/edit/item/" + id + "/{{$event_type}}/{{$event_id}}?api_token="+api_token, function (data) {
$("#modal-content").html(data);
});
$('#editModal').modal('toggle')

2
resources/views/admin/booking/modal/create.blade.php
View File

@@ -27,7 +27,7 @@
<div class="col-md-12">
<div class="form-group">
<label>Quantité</label>
<input class="form-control" name="amount" type="number" min="1" required value="1" max="{{$item->available()}}">
<input class="form-control" name="amount" type="number" min="1" required value="1" max="{{$item->available($event->date_begin,$event->date_end)}}">
<small class="form-text text-muted">Quantité d'item a réserver</small>
</div>
</div>

2
resources/views/admin/booking/modal/edit.blade.php
View File

@@ -27,7 +27,7 @@
<div class="col-md-12">
<div class="form-group">
<label>Quantité</label>
<input class="form-control" name="amount" type="number" min="1" required value="{{$booking->amount}}" max="{{$booking->item->available()}}">
<input class="form-control" name="amount" type="number" min="1" required value="{{$booking->amount}}" max="{{$booking->item->available($event->date_begin,$event->date_end)}}">
<small class="form-text text-muted">Quantité d'item a réserver</small>
</div>
</div>

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

@@ -2,6 +2,99 @@
@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.2</h3>
<p class="category">2019-09-11</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="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">
Réactivation des réservations
</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 de l'inventaire
</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 réservations
</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">