Merge branch 'master' of gitlab.utc.fr:nf17-camp-p14/clivi

controller/fact.php

@@ -4,7 +4,7 @@
 */
 
 // Implemented actions
-$actions = array("listeFacture", "addFacture", "editFacture", "detailFacture");
+$actions = array("listeFacture", "addFacture", "detailFacture");
 
 // Check action is correct
 if(!in_array($action, $actions)) {
@@ -21,17 +21,11 @@ switch($action) {
 		$formConf = $facture->getForm();
 		include 'view/form.php';
 		break;
-	case "editFacture":
-		$facture = new Facture();
-        $facture->select($_GET['id']);
-        $formConf = $facture->getForm();
-        include 'view/form.php';
-		break;
 	case "detailFacture":
 		$facture = new Facture();
         $facture->select($_GET['id']);
         $formConf = $facture->getForm();
-        include 'view/detail.php';
+        include 'view/formDetail.php';
 		break;
 	default:
 		include 'view/404.php';

view/formDetail.php

+<!-- Begin page content -->
+<div class="container">
+    <div class="page-header">
+        <h1><?php echo $formConf->getTitle(); ?></h1>
+    </div>
+
+    <table class="table">
+        <thead>
+            <?php foreach($list->getLabels() as $field): ?>
+                <th><?php echo $field->label; ?></th>
+            <?php endforeach; ?>
+                <th></th>
+        </thead>
+        <tbody>
+            <?php foreach($list->getLines() as $line): ?>
+                <tr>  
+                    <?php foreach($line->getFields() as $field): ?>
+                        <td><?php echo $field->show(); ?></td>
+                    <?php endforeach; ?>
+                </tr>
+            <?php endforeach; ?>
+        </tbody>
+    </table>
+
+    <?php echo $formConf->getAlerts(); ?>
+    <form role="form" method="post">
+        <input type="hidden" name="submitForm" value="1">
+        <?php foreach($formConf->getFields() as $field): ?>
+            <?php echo $field->html($formConf); ?>
+        <?php endforeach; ?>
+        <button type="submit" class="btn btn-default"><?php echo $formConf->getSubmitText(); ?></button>
+    </form>
+</div>
\ No newline at end of file

view/stats.php

@@ -11,8 +11,8 @@
         </thead>
         <tbody>
                 <tr>
+                    <td>Nombre moyen d'animal par client : </td>
                     <td><?php $tmp = $stats->nbAnimalMoyClient(); echo $tmp["value"]; ?></td>
-                    <td>l2</td>
                 </tr>
         </tbody>
       </table>