MAJ

tms/assets/js/tapes.js

@@ -39,6 +39,7 @@ $(document).ready(function () {
                     return '<span class="badge bg-info text-white small">' + datetime +  '</span>';
                 }
             },
+
             {
                 data: 'tapeid',
                 orderable: false,

tms/src/Controller/TapeController.php

@@ -151,6 +151,11 @@ class TapeController extends AbstractController
             $countQueryBuilder->orWhere('t.label LIKE :tapeLabel');
             $countQueryBuilder->setParameter('tapeLabel', $search.'%');
 
+            $mainQueryBuilder->orWhere('t.prix LIKE :tapePrix');
+            $mainQueryBuilder->setParameter(':tapePrix', $search.'%');
+            $countQueryBuilder->orWhere('t.prix  LIKE :tapePrix');
+            $countQueryBuilder->setParameter(':tapePrix', $search.'%');
+
             $mainQueryBuilder->orWhere('m.nom LIKE :modelName');
             $mainQueryBuilder->setParameter('modelName', $search.'%');
             $countQueryBuilder->orWhere('m.nom LIKE :modelName');
@@ -187,6 +192,8 @@ class TapeController extends AbstractController
                 $mainQueryBuilder->orderBy('li.nom', $orderDir);
             else if($orderColumn == 5) // datecreation
                 $mainQueryBuilder->orderBy('t.' . $colums[$orderColumn]['data'], $orderDir);
+            else if($orderColumn == 6) // Prix
+                $mainQueryBuilder->orderBy('t.' . $colums[$orderColumn]['data'], $orderDir);
         }
 
         $data = $mainQueryBuilder
@@ -362,7 +369,13 @@ class TapeController extends AbstractController
 
         $histories = json_decode($tape->getHistory(),TRUE);
 
-        $htmlhistory = '<ul class="timeline">';
+        $htmlhistory='<ul>';
+        $htmlhistory.='<li><strong>Prix : </strong>'.$tape->getPrix().'</li>';
+        if ($tape->getCommentaire()!='')
+            $htmlhistory.='<li><strong>Commentaire: </strong><em>'.$tape->getCommentaire().'</em></li>';
+        $htmlhistory.='</ul><br/><br/><h2>Historique</h2>';
+        $htmlhistory .= '<ul class="timeline">';
+
         $cpt = 0;
 
         foreach ($histories as $history) {

tms/templates/tapes/main.html.twig

@@ -29,7 +29,7 @@
                 MAJ Multiple
             </button>
 
-            <table id="tableTapes" class=" table-striped  m-4 table table-bordered">
+            <table id="tableTapes" class=" table-striped  m-4 table table-bordered small">
 
                 <thead>
                 <tr>