From 20a1fe9af7b1d2e75066785aa85da4ed72269e54 Mon Sep 17 00:00:00 2001
From: Cyril L'Orphelin <cyril.lorphelin@cc.in2p3.fr>
Date: Mon, 10 Feb 2020 15:26:54 +0100
Subject: [PATCH] MAJ add entity TapeModel
---
tms/src/Controller/TapeController.php | 9 +--
tms/templates/librairie/main.html.twig | 8 +--
tms/templates/tapes/main.html.twig | 65 +++++++++---------
.../cache/dev/App_KernelDevDebugContainer.php | 4 +-
.../dev/App_KernelDevDebugContainer.php.meta | Bin 22809 -> 22809 bytes
.../dev/App_KernelDevDebugContainer.xml.meta | Bin 22809 -> 22809 bytes
tms/var/cache/dev/url_generating_routes.php | 5 +-
tms/var/cache/dev/url_matching_routes.php | 5 +-
8 files changed, 51 insertions(+), 45 deletions(-)
diff --git a/tms/src/Controller/TapeController.php b/tms/src/Controller/TapeController.php
index 99087dbf..3a911fc6 100644
--- a/tms/src/Controller/TapeController.php
+++ b/tms/src/Controller/TapeController.php
@@ -2,17 +2,18 @@
namespace App\Controller;
-use App\Entity\TapeModele;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
+use App\Entity\TapeModele;
class TapeController extends AbstractController
{
/**
- * @Route("/listModel",name="show_models")
+ * @Route("/listModels",name="show_models")
*/
- public function listModel(Request $request)
+ public function listModels(Request $request)
{
$models = $this->getDoctrine()
diff --git a/tms/templates/librairie/main.html.twig b/tms/templates/librairie/main.html.twig
index 23cb9a64..cc836682 100644
--- a/tms/templates/librairie/main.html.twig
+++ b/tms/templates/librairie/main.html.twig
@@ -19,7 +19,7 @@
<div class="col-9 p-4">
<h2 class="m-2">LIBRAIRIES</h2><hr/>
<div class="row">
- <a class="btn btn-primary text-white" data-toggle="modal" data-target="#addModal"><i class="fas fa-plus-circle"></i> Ajouter une librairie</a>
+ <a class="btn btn-dark text-white" data-toggle="modal" data-target="#addModal"><i class="fas fa-plus-circle"></i> Ajouter une librairie</a>
</div>
<div class="row m-2 p-2">
@@ -67,7 +67,7 @@
</div>
<div class="modal-footer">
- <a id="addLibrary" class="btn btn-primary text-white" data-toggle="modal"><i class="fas fa-plus-circle"></i> Ajouter une librairie</a>
+ <a id="addLibrary" class="btn btn-dark text-white" data-toggle="modal"><i class="fas fa-plus-circle"></i> Ajouter une librairie</a>
</div>
</form>
@@ -79,7 +79,7 @@
</div>
- <div class="col-10 text-left border-primary p-4" style="border-left : 4px solid;">
+ <div class="col-10 text-left border-dark p-4" style="border-left : 4px solid;">
<table id="tableLibraries" class="dataTable m-4 table table-bordered" >
@@ -144,7 +144,7 @@
</div>
<div class="modal-footer">
- <a id="edit_{{ librairy.librairieid }}" class="editLibrary btn btn-primary text-white" data-toggle="modal"><i class="fas fa-plus-circle"></i> Modifier la librairie</a>
+ <a id="edit_{{ librairy.librairieid }}" class="editLibrary btn btn-dark text-white" data-toggle="modal"><i class="fas fa-plus-circle"></i> Modifier la librairie</a>
</div>
</form>
diff --git a/tms/templates/tapes/main.html.twig b/tms/templates/tapes/main.html.twig
index 2d9a9060..ee2b32cd 100644
--- a/tms/templates/tapes/main.html.twig
+++ b/tms/templates/tapes/main.html.twig
@@ -53,11 +53,11 @@
<input type="text" id="fabricant" class="form-control" required/>
</div>
<div class="form-group">
- <label for="capacite">Capacite</label>
+ <label for="capacite">Capacite - To</label>
<input type="number" id="capacite" class="form-control" required/>
</div>
<div class="form-group">
- <label for="longueur">Longueur</label>
+ <label for="longueur">Longueur - M</label>
<input type="number" id="longueur" class="form-control" required/>
</div>
@@ -66,7 +66,7 @@
</div>
<div class="modal-footer">
- <a id="addModel" class="btn btn-primary text-white" data-toggle="modal"><i class="fas fa-plus-circle"></i> Ajouter une librairie</a>
+ <a id="addModel" class="btn btn-primary text-white" data-toggle="modal"><i class="fas fa-plus-circle"></i> Ajouter un modèle de bande</a>
</div>
</form>
@@ -80,40 +80,38 @@
<div class="col-10 text-left border-primary p-4" style="border-left : 4px solid;">
- <table id="tableLibraries" class="dataTable m-4 table table-bordered" >
+ <table id="tableModels" class="dataTable m-4 table table-bordered" >
<thead>
<tr>
<th>Nom</th>
- <th>Description</th>
<th>Fabricant</th>
- <th>Nombre de Slots</th>
- <th>Date de creation</th>
+ <th>Capacité - To</th>
+ <th>Longueur - M</th>
<th></th>
</tr>
</thead>
<tbody>
- {% for librairy in librairies %}
+ {% for model in models %}
<tr>
- <td>{{ librairy.nom }}</td>
- <td>{{ librairy.type }}</td>
- <td>{{ librairy.fabricant }}</td>
- <td>{{ librairy.nbslots }}</td>
- <td class="small">{{ librairy.datecreation |date('Y-m-d h:m') }}</td>
+ <td>{{ model.nom }}</td>
+ <td>{{ model.fabricant }}</td>
+ <td>{{ model.capacite }}</td>
+ <td>{{ model.longueur }}</td>
<td>
- <a title="Remove Model" id="remove_{{ librairy.librairieid }}" class="removeModel" href="#"><i class="fas fa-trash-alt m-2"></i></a>
- <a title="Edit Model" data-toggle="modal" data-target="#editModal_{{ librairy.librairieid }}" href="edit_{{ librairy.librairieid }}" > <i class="fas fa-edit m-2"></i></a>
+ <a title="Remove Model" id="remove_{{ model.modelid }}" class="removeModel" href="#"><i class="fas fa-trash-alt m-2"></i></a>
+ <a title="Edit Model" data-toggle="modal" data-target="#editModal_{{ model.modelid }}" href="edit_{{ model.modelid }}" > <i class="fas fa-edit m-2"></i></a>
<!-- Modal associé au bouton d'édition -->
- <div class="modal fade" id="editModal_{{ librairy.librairieid }}">
+ <div class="modal fade" id="editModal_{{ model.modelid }}">
<div class="modal-dialog">
<div class="modal-content">
<form class="needs-validation" novalidate>
<div class="modal-header">
- <h5 class="modal-title">Edition d'une librairie</h5>
+ <h5 class="modal-title">Edition d'un modèle</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
@@ -122,19 +120,20 @@
<div class="form-group">
<label for="nom">Nom</label>
- <input type="text" id="nom_{{ librairy.librairieid }}" class="form-control" value="{{ librairy.nom }}" required />
+ <input type="text" id="nom_{{ model.modelid }}" class="form-control" value="{{ model.nom }}" required />
</div>
+
<div class="form-group">
- <label for="type">Description</label>
- <input type="text" id="type_{{ librairy.librairieid }}" class="form-control" value="{{ librairy.type }}" required/>
+ <label for="type">Fabricant</label>
+ <input type="text" id="fabricant_{{ model.modelid }}" class="form-control" value="{{ model.fabricant }}" required/>
</div>
<div class="form-group">
- <label for="type">Fabricant</label>
- <input type="text" id="fabricant_{{ librairy.librairieid }}" class="form-control" value="{{ librairy.fabricant }}" required/>
+ <label for="capacite">Capacite - To</label>
+ <input type="number" id="capacite_{{ model.modelid }}" class="form-control" value="{{ model.capacite }}" required/>
</div>
<div class="form-group">
- <label for="nbslots">Nombre de Slots</label>
- <input type="number" id="nbslots_{{ librairy.librairieid }}" class="form-control" value="{{ librairy.nbslots }}" required/>
+ <label for="longueur">Longueur - M</label>
+ <input type="number" id="longueur_{{ model.modelid }}" class="form-control" value="{{ model.longueur }}" required/>
</div>
@@ -143,7 +142,7 @@
</div>
<div class="modal-footer">
- <a id="edit_{{ librairy.librairieid }}" class="editModel btn btn-primary text-white" data-toggle="modal"><i class="fas fa-plus-circle"></i> Modifier la librairie</a>
+ <a id="edit_{{ model.modelid }}" class="editModel btn btn-primary text-white" data-toggle="modal"><i class="fas fa-plus-circle"></i> Modifier le modèle</a>
</div>
</form>
@@ -200,9 +199,9 @@
var nom=$("#nom").val();
- var type=$("#type").val();
+ var capacite=$("#capacite").val();
var fabricant=$("#fabricant").val();
- var nbslots=$("#nbslots").val();
+ var longueur=$("#longueur").val();
$.ajax({
@@ -212,8 +211,8 @@
data: {
"nom": nom,
"fabricant": fabricant,
- "type": type,
- "nbslots": nbslots
+ "capacite": capacite,
+ "longueur": longueur
},
async: false,
success: function (data)
@@ -243,9 +242,9 @@
var id = $(this).attr('id').split("edit_").pop();
var nom=$("#nom_"+id).val();
- var type=$("#type_"+id).val();
+ var capacite=$("#capacite_"+id).val();
var fabricant=$("#fabricant_"+id).val();
- var nbslots=$("#nbslots_"+id).val();
+ var longueur=$("#longueur_"+id).val();
$.ajax({
@@ -256,8 +255,8 @@
"id": id,
"nom": nom,
"fabricant": fabricant,
- "type": type,
- "nbslots": nbslots
+ "capacite": capacite,
+ "longueur": longueur
},
async: false,
success: function (data)
diff --git a/tms/var/cache/dev/App_KernelDevDebugContainer.php b/tms/var/cache/dev/App_KernelDevDebugContainer.php
index 5c89c26b..18f88b11 100644
--- a/tms/var/cache/dev/App_KernelDevDebugContainer.php
+++ b/tms/var/cache/dev/App_KernelDevDebugContainer.php
@@ -16,6 +16,6 @@ if (!\class_exists(App_KernelDevDebugContainer::class, false)) {
return new \ContainerEXDxpGV\App_KernelDevDebugContainer([
'container.build_hash' => 'EXDxpGV',
- 'container.build_id' => '42cffbc6',
- 'container.build_time' => 1581328363,
+ 'container.build_id' => '18f34761',
+ 'container.build_time' => 1581344132,
], __DIR__.\DIRECTORY_SEPARATOR.'ContainerEXDxpGV');
diff --git a/tms/var/cache/dev/App_KernelDevDebugContainer.php.meta b/tms/var/cache/dev/App_KernelDevDebugContainer.php.meta
index b149b942bc6a7ba46efdb33f8e0b8c93763e24f9..ecddc56fcd3fe65962c12aa61acebecb61770a20 100644
GIT binary patch
delta 60
zcmbQaiE-v8#tj|Xs-^~Jsi}sRMy7^omTBe|CTWH#rbcP0N#-UN$!3P8O4hZRRwk1Z
Q#k3|b&<otGq4QA(07eWG8~^|S
delta 60
zcmbQaiE-v8#tj|XsuronX(<M&Ny#Z@CW&c@MrLM~=BAd$X%+^?hAAnDO4hZRRwk1Z
Q#k3|b&<otGq4QA(0Ay7Y&;S4c
diff --git a/tms/var/cache/dev/App_KernelDevDebugContainer.xml.meta b/tms/var/cache/dev/App_KernelDevDebugContainer.xml.meta
index b149b942bc6a7ba46efdb33f8e0b8c93763e24f9..ecddc56fcd3fe65962c12aa61acebecb61770a20 100644
GIT binary patch
delta 60
zcmbQaiE-v8#tj|Xs-^~Jsi}sRMy7^omTBe|CTWH#rbcP0N#-UN$!3P8O4hZRRwk1Z
Q#k3|b&<otGq4QA(07eWG8~^|S
delta 60
zcmbQaiE-v8#tj|XsuronX(<M&Ny#Z@CW&c@MrLM~=BAd$X%+^?hAAnDO4hZRRwk1Z
Q#k3|b&<otGq4QA(0Ay7Y&;S4c
diff --git a/tms/var/cache/dev/url_generating_routes.php b/tms/var/cache/dev/url_generating_routes.php
index 27c58ac9..01ac28a4 100644
--- a/tms/var/cache/dev/url_generating_routes.php
+++ b/tms/var/cache/dev/url_generating_routes.php
@@ -20,5 +20,8 @@ return [
'add_library' => [[], ['_controller' => 'App\\Controller\\LibrairieController::addLibrary'], [], [['text', '/addLibrary']], [], []],
'edit_library' => [[], ['_controller' => 'App\\Controller\\LibrairieController::editLibrary'], [], [['text', '/editLibrary']], [], []],
'remove_library' => [[], ['_controller' => 'App\\Controller\\LibrairieController::removeLibrary'], [], [['text', '/removeLibrary']], [], []],
- 'app_tape_listtapes' => [[], ['_controller' => 'App\\Controller\\TapeController::listTapes'], [], [['text', '/listTapes']], [], []],
+ 'show_models' => [[], ['_controller' => 'App\\Controller\\TapeController::listModels'], [], [['text', '/listModels']], [], []],
+ 'add_Model' => [[], ['_controller' => 'App\\Controller\\TapeController::addModel'], [], [['text', '/addModel']], [], []],
+ 'edit_Model' => [[], ['_controller' => 'App\\Controller\\TapeController::editModel'], [], [['text', '/editModel']], [], []],
+ 'remove_Model' => [[], ['_controller' => 'App\\Controller\\TapeController::removeModel'], [], [['text', '/removeModel']], [], []],
];
diff --git a/tms/var/cache/dev/url_matching_routes.php b/tms/var/cache/dev/url_matching_routes.php
index 831d5537..3c83f15e 100644
--- a/tms/var/cache/dev/url_matching_routes.php
+++ b/tms/var/cache/dev/url_matching_routes.php
@@ -18,7 +18,10 @@ return [
'/addLibrary' => [[['_route' => 'add_library', '_controller' => 'App\\Controller\\LibrairieController::addLibrary'], null, null, null, false, false, null]],
'/editLibrary' => [[['_route' => 'edit_library', '_controller' => 'App\\Controller\\LibrairieController::editLibrary'], null, null, null, false, false, null]],
'/removeLibrary' => [[['_route' => 'remove_library', '_controller' => 'App\\Controller\\LibrairieController::removeLibrary'], null, null, null, false, false, null]],
- '/listTapes' => [[['_route' => 'app_tape_listtapes', '_controller' => 'App\\Controller\\TapeController::listTapes'], null, null, null, false, false, null]],
+ '/listModels' => [[['_route' => 'show_models', '_controller' => 'App\\Controller\\TapeController::listModels'], null, null, null, false, false, null]],
+ '/addModel' => [[['_route' => 'add_Model', '_controller' => 'App\\Controller\\TapeController::addModel'], null, null, null, false, false, null]],
+ '/editModel' => [[['_route' => 'edit_Model', '_controller' => 'App\\Controller\\TapeController::editModel'], null, null, null, false, false, null]],
+ '/removeModel' => [[['_route' => 'remove_Model', '_controller' => 'App\\Controller\\TapeController::removeModel'], null, null, null, false, false, null]],
],
[ // $regexpList
0 => '{^(?'
--
GitLab