Merge branch 'staging' into releases/release-hytha-prod

gestion/lib/Db/Bdd.php

@@ -2566,6 +2566,7 @@ class Bdd {
         produit.prix_unitaire as produit_price,
         produit.reference as produit_reference,
         produit.description as produit_description,
+        produit.fk_product_type_id as fk_product_type_id,
         produit.vat as produit_vat,
         devis.id_client as devis_client_id
         FROM ".$this->tableprefix ."produit_devis as produit_devis
@@ -2855,6 +2856,17 @@ class Bdd {
                 }
             }
             $products = $this->getDevisProduits($devis["devis_id"]);
+            if(count($products) > 1){
+                usort($products, function ($a, $b) {
+                    if ($a["fk_product_type_id"] === null && $b["fk_product_type_id"] !== null) {
+                        return -1; 
+                    }
+                    if ($a["fk_product_type_id"] !== null && $b["fk_product_type_id"] === null) {
+                        return 1;
+                    }
+                    return 0;
+                });
+            }
             foreach($products as $product){
                 $valueHt = $product['produit_price'] * $product['quantite'];
                 $valueTtc = PriceHelpers::calculPriceWithVatValue($valueHt,$tvaValue);

gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceFunecapPdfHandler.php

@@ -59,7 +59,7 @@ class InvoiceFunecapPdfHandler extends InvoiceGroupPdfHandler {
             $this->MultiAlignCell(100, 6, FileExportHelpers::FormatTextForExport($subcontractorCaseNumberText),0,'0',);
             $yValue += 6;
             foreach($products as $product){
-                $valueHt = $product['produit_price'];
+                $valueHt = $product['produit_price'] * $product["quantite"];
                 $valueTtc = PriceHelpers::calculPriceWithVatValue($valueHt,$tvaValue);
                 $totalHt+=$valueHt;
                 $totalTtc+=$valueTtc;
@@ -69,15 +69,26 @@ class InvoiceFunecapPdfHandler extends InvoiceGroupPdfHandler {
                     $dateValue = $devisDate;
                     $productDescription .= " de " . $currentDevis["defunt_nom"] ?? "";
                 }
-                $productDescriptionWidth = $this->GetStringWidth($productDescription);
-                $productDescriptionIsMultiline = $productDescriptionWidth > $maxDescriptionWidth;
                 $tvaAmount = $valueTtc - $valueHt;
-
                 $this->SetXY( 8,$yValue ); 
                 $this->Cell(20, 6, $dateValue, 0,0);
-    
+                
                 $this->SetXY( 35,$yValue ); 
-                $this->MultiAlignCell(100, 6, FileExportHelpers::FormatTextForExport($productDescription),0,'0',);
+                $productDescription = FileExportHelpers::FormatTextForExport($productDescription);
+                $productDescriptionWidth = $this->GetStringWidth($productDescription);
+                $productDescriptionWidthIsGreaterThanMaxWidth = $productDescriptionWidth > $maxDescriptionWidth;
+                $productDescriptionIsMultiline = false;
+                if ($productDescriptionWidthIsGreaterThanMaxWidth) {
+                    $yBefore = $this->GetY();
+                    $this->MultiCell($maxDescriptionWidth, 6, $productDescription,0,'L');
+                    $yAfter = $this->GetY();
+                    $productDescriptionIsMultiline = ($yAfter - $yBefore) > 6;
+                    if($productDescriptionIsMultiline){
+                        $this->SetXY($this->GetX(),$yBefore);
+                    }
+                } else {
+                    $this->Cell($maxDescriptionWidth, 6, $productDescription);
+                }
     
                 $this->SetXY( 138,$yValue ); 
                 $this->Cell(20, 6, number_format($valueHt,2,'.','').chr(128), 0, 0, 'C');

gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php

@@ -219,7 +219,7 @@ class InvoiceGroupPdfHandler extends FPDF {
         $totalTtc = 0;
         $totalTva = 0;
         $yValue = $this->startingYOfArticlesTable + 11;
-        $maxDescriptionWidth = 104;
+        $maxDescriptionWidth = 98;
         $currentIndexPosition = $this->currentIndexPosition;
         for($currentIndexPosition;$currentIndexPosition<($this->initialIndexPosition + $this->devisCountToGet);$currentIndexPosition++){
             $currentDevis = $devisData[$currentIndexPosition];
@@ -227,29 +227,37 @@ class InvoiceGroupPdfHandler extends FPDF {
             $devisDate = DateTime::createFromFormat('Y-m-d',$devisDate);
             $devisDate = $devisDate->format('d-m-Y');
             $products = $currentDevis["products"];
+            $productIncrement = 0;
             foreach($products as $product){
-                $valueHt = $product['produit_price'];
+                $valueHt = $product['produit_price'] * $product["quantite"];
                 $valueTtc = PriceHelpers::calculPriceWithVatValue($valueHt,$tvaValue);
                 $totalHt+=$valueHt;
                 $totalTtc+=$valueTtc;
                 $productDescription = $product["produit_description"] ?? "";
                 $dateValue = "";
-                if($product === end($products)){
+                if($productIncrement == 0){
                     $dateValue = $devisDate;
                     $productDescription .= " de " . $currentDevis["defunt_nom"] ?? "";
                 }
-                $productDescriptionWidth = $this->GetStringWidth($productDescription);
-                $productDescriptionIsMultiline = $productDescriptionWidth > $maxDescriptionWidth;
                 $tvaAmount = $valueTtc - $valueHt;
                 $this->SetXY( 8,$yValue ); 
                 $this->Cell(20, 6, $dateValue, 0,0);
-    
+                
                 $this->SetXY( 35,$yValue ); 
-                if($productDescriptionIsMultiline){
+                $productDescription = FileExportHelpers::FormatTextForExport($productDescription);
-                    $this->MultiAlignCell(100, 6, FileExportHelpers::FormatTextForExport($productDescription),0,'0',);
+                $productDescriptionWidth = $this->GetStringWidth($productDescription);
-                }
+                $productDescriptionWidthIsGreaterThanMaxWidth = $productDescriptionWidth > $maxDescriptionWidth;
-                else{
+                $productDescriptionIsMultiline = false;
-                    $this->Cell(100,6,FileExportHelpers::FormatTextForExport($productDescription),0,0);
+                if ($productDescriptionWidthIsGreaterThanMaxWidth) {
+                    $yBefore = $this->GetY();
+                    $this->MultiCell($maxDescriptionWidth, 6, $productDescription,0,'L');
+                    $yAfter = $this->GetY();
+                    $productDescriptionIsMultiline = ($yAfter - $yBefore) > 6;
+                    if($productDescriptionIsMultiline){
+                        $this->SetXY($this->GetX(),$yBefore);
+                    }
+                } else {
+                    $this->Cell($maxDescriptionWidth, 6, $productDescription);
                 }
     
                 $this->SetXY( 138,$yValue ); 
@@ -262,9 +270,10 @@ class InvoiceGroupPdfHandler extends FPDF {
                 $this->Cell(25, 6, number_format($valueTtc,2,'.','').chr(128), 0, 1, 'C');
                 $yValue += 6;
                 $totalTva += $tvaAmount;
-                if($productDescriptionIsMultiline){
+                if($productDescriptionWidthIsGreaterThanMaxWidth){
                     $yValue += 6;
                 }
+                $productIncrement++;
             }
         }
         $this->currentIndexPosition = $currentIndexPosition;

gestion/src/css/mycss.css

@@ -126,4 +126,20 @@ table.dataTable.display tbody tr.even > [class*="sorting_"] {
 @keyframes spin {
   from { transform: rotate(0deg); }
   to { transform: rotate(360deg); }
+}
+
+#additionalDefuntData {
+  opacity: 0;
+  transform: scaleY(0);
+  transform-origin: top;
+  overflow: hidden;
+  height: 0;  /* Initially hidden with no height */
+  transition: opacity 0.5s ease, transform 0.5s ease, height 0.5s ease;
+}
+
+/* Visible state (smooth transition when showing) */
+#additionalDefuntData.visibleContent {
+  opacity: 1;
+  transform: scaleY(1);
+  height: auto;  /* Automatically adjusts the height when showing */
 }

gestion/src/js/defuntShow.js

@@ -39,6 +39,7 @@ window.addEventListener("DOMContentLoaded", function () {
     let lavageInput = document.getElementById("lavage-input");
     let cosmetiquesInput = document.getElementById("cosmetiques-input");
     let surInput = document.getElementById("sur-input");
+    let buttonEditCareRapport = this.document.getElementById("buttonEditCareRapport");
 
     accesInput.addEventListener("keyup", (e) => autocomplete("acces"));
     rigiditeInput.addEventListener("keyup", (e) => autocomplete("rigidite"));
@@ -55,6 +56,11 @@ window.addEventListener("DOMContentLoaded", function () {
     cosmetiquesInput.addEventListener("keyup", (e) => autocomplete("cosmetiques"));
     surInput.addEventListener("keyup", (e) => autocomplete("sur"));
 
+    buttonEditCareRapport.addEventListener("click",function(){
+        var div = document.getElementById("additionalDefuntData");
+        div.classList.toggle("visibleContent");
+    })
+    
     observations.addEventListener("keyup", (e) => {
         if(e.target.className.includes("editable-obs")) {
             autocompleteObs(e.target.id);

gestion/templates/content/defuntshow.php

@@ -136,312 +136,319 @@
         </div>
       </div>
     </div>
-    <div class="col-6" style="margin-bottom: 32px">
+    <div>
-      <h6>ÉTATS DU CORPS</h6>
+      <button id="buttonEditCareRapport" class="btn btn-secondary" type="button">
-      <hr>
+      Editer rapport de soin
-      <!-- Corpulence -->
+      </button>
-      <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
-        <div class="col-3">Corpulence</div>
-        <div class="col-9">
-          <input id="corpulence-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->corpulence ?>" data-table="defunt" data-column="corpulence" data-id="<?php echo $_['defunt'][0]->id ?>"/>
-          <ul class="corpulence-list"></ul>
-        </div>
-      </div>
-      <!-- Rigidité -->
-      <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
-        <div class="col-3">Rigidité</div>
-        <div class="col-9">
-          <input id="rigidite-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->rigidite ?>" data-table="defunt" data-column="rigidite" data-id="<?php echo $_['defunt'][0]->id ?>"/>
-          <ul class="rigidite-list"></ul>
-        </div>
-      </div>
-      <!-- Lividités -->
-      <div class="d-flex flex-row col-12" style="margin-bottom: 16px">
-        <div class="col-3">Lividités</div>
-        <div class="col-9">
-          <input id="lividite-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->lividite ?>" data-table="defunt" data-column="lividite" data-id="<?php echo $_['defunt'][0]->id ?>"/>
-          <ul class="lividite-list"></ul>
-        </div>
-      </div>
-      <!-- Observations generales -->
-      <div class="d-flex flex-row col-12" style="margin-bottom: 16px">
-        <div class="col-3">Observations du corps</div>
-        <div class="col-9">
-          <textarea class="gestion-input w-100" data-table="defunt" data-column="observations_corps" data-id="<?php echo $_['defunt'][0]->id ?>"><?php echo $_['defunt'][0]->observations_corps ?></textarea>
-        </div>
-      </div>
     </div>
-    <div class="col-6" style="margin-bottom: 32px">
+    <div id="additionalDefuntData" class="hiddenContent pt-2">
-      <h6>ACCÈS</h6>
+      <div class="col-6" style="margin-bottom: 32px">
-      <hr>
+        <h6>ÉTATS DU CORPS</h6>
-      <!-- Nature accès -->
-      <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 8px">
-        <div class="col-3">Désignation</div>
-        <div class="col-9">
-          <input id="acces-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->acces ?>" data-table="defunt" data-column="acces" data-id="<?php echo $_['defunt'][0]->id ?>"/>
-          <ul class="acces-list"></ul>
-        </div>
-      </div>
-      <!-- Recherche accès -->
-      <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 8px">
-        <div class="col-3">Recherche</div>
-        <div class="col-9">
-        <input class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->acces_recherche ?>" data-table="defunt" data-column="acces_recherche" data-id="<?php echo $_['defunt'][0]->id ?>"/>
-        </div>
-      </div>
-      <!-- Etat -->
-      <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 16px">
-        <div class="col-3">État</div>
-        <div class="col-9">
-        <select class="gestion-select w-100" data-table="defunt" data-column="acces_etat" data-id="<?php echo $_['defunt'][0]->id ?>">
-          <option>Selectionner un état</option>
-          <option value="mauvais" <?php if(strcmp($_['defunt'][0]->acces_etat, 'mauvais')==0) echo 'selected' ?>>Mauvais</option>
-          <option value="bon" <?php if(strcmp($_['defunt'][0]->acces_etat, 'bon')==0) echo 'selected' ?>>Bon</option>
-        </select>
-        </div>
-      </div>
-    </div>
-    <div class="col-6" style="margin-bottom: 32px">
-      <h6>PRÉ-INJECTION</h6>
-      <hr>
-      <!-- Nature préinjection -->
-      <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
-        <div class="col-3">Désignation</div>
-        <div class="col-9">
-          <input id="preinjection-input" class="gestion-input w-100" autocomplete="off" type="text" value="<?php echo $_['defunt'][0]->preinjection ?>" data-table="defunt" data-column="preinjection" data-id="<?php echo $_['defunt'][0]->id ?>"/>
-          <ul class="preinjection-list"></ul>
-        </div>
-      </div>
-      <!-- Quantité préinjection -->
-      <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 16px">
-        <div class="col-3">Quantité(l)</div>
-        <div class="col-9">
-        <select class="gestion-select w-100" data-table="defunt" data-column="preinjection_qte" data-id="<?php echo $_['defunt'][0]->id ?>">
-        <?php for($i=0; $i<sizeof($quantiteOptions); $i++) { ?>
-          <option value="<?php echo $quantiteOptions[$i] ?>" <?php if($_['defunt'][0]->preinjection_qte == $quantiteOptions[$i]) echo 'selected' ?>><?php echo $quantiteOptions[$i] ?></option>
-        <?php } ?>
-        </select>
-        </div>
-      </div>
-    </div>
-    <div class="col-6" style="margin-bottom: 32px">
-      <h6>INJECTION</h6>
-      <hr>
-      <!-- Nature injection -->
-      <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
-        <div class="col-3">Désignation</div>
-        <div class="col-9">
-          <input id="injection-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->injection ?>" data-table="defunt" data-column="injection" data-id="<?php echo $_['defunt'][0]->id ?>"/>
-          <ul class="injection-list"></ul>
-        </div>
-      </div>
-      <!-- Diffusion injection -->
-      <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 8px">
-        <div class="col-3">Diffusion</div>
-        <div class="col-9">
-        <select class="gestion-select w-100" data-table="defunt" data-column="injection_diffusion" data-id="<?php echo $_['defunt'][0]->id ?>">
-          <option>Selectionner un état</option>
-          <option value="mauvaise" <?php if(strcmp($_['defunt'][0]->injection_diffusion, 'mauvaise')==0) echo 'selected' ?>>Mauvaise</option>
-          <option value="bonne" <?php if(strcmp($_['defunt'][0]->injection_diffusion, 'bonne')==0) echo 'selected' ?>>Bonne</option>
-        </select>
-        </div>
-      </div>
-      <!-- Quantité injection -->
-      <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 16px">
-        <div class="col-3">Quantité(l)</div>
-        <div class="col-9">
-          <select class="gestion-select w-100" data-table="defunt" data-column="injection_qte" data-id="<?php echo $_['defunt'][0]->id ?>">
-          <?php for($i=0; $i<sizeof($quantiteOptions); $i++) { ?>
-            <option value="<?php echo $quantiteOptions[$i] ?>" <?php if($_['defunt'][0]->injection_qte == $quantiteOptions[$i]) echo 'selected' ?>><?php echo $quantiteOptions[$i] ?></option>
-          <?php } ?>
-          </select>
-        </div>
-      </div>
-    </div>
-    <div class="col-6" style="margin-bottom: 32px">
-      <h6>CO-INJECTION</h6>
-      <hr>
-      <!-- Nature co-injection -->
-      <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
-        <div class="col-3">Désignation</div>
-        <div class="col-9">
-          <input id="coinjection-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->coinjection ?>" data-table="defunt" data-column="coinjection" data-id="<?php echo $_['defunt'][0]->id ?>"/>
-          <ul class="coinjection-list"></ul>
-        </div>
-      </div>
-      <!-- Quantité co-injection -->
-      <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 8px">
-        <div class="col-3">Quantité(l)</div>
-        <div class="col-9">
-        <select class="gestion-select w-100" data-table="defunt" data-column="coinjection_qte" data-id="<?php echo $_['defunt'][0]->id ?>">
-        <?php for($i=0; $i<sizeof($quantiteOptions); $i++) { ?>
-          <option value="<?php echo $quantiteOptions[$i] ?>" <?php if($_['defunt'][0]->coinjection_qte == $quantiteOptions[$i]) echo 'selected' ?>><?php echo $quantiteOptions[$i] ?></option>
-        <?php } ?>
-        </select>
-        </div>
-      </div>
-    </div>
-    <div class="col-6" style="margin-bottom: 32px">
-      <h6>DRAINAGE</h6>
-      <hr>
-      <!-- Designation drainage -->
-      <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
-        <div class="col-3">Désignation</div>
-        <div class="col-9">
-          <input id="drainage-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->drainage ?>" data-table="defunt" data-column="drainage" data-id="<?php echo $_['defunt'][0]->id ?>"/>
-          <ul class="drainage-list"></ul>
-        </div>
-      </div>
-      <!-- État drainage -->
-      <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 8px">
-        <div class="col-3">État</div>
-        <div class="col-9">
-        <select class="gestion-select w-100" data-table="defunt" data-column="drainage_etat" data-id="<?php echo $_['defunt'][0]->id ?>">
-          <option>Selectionner un état</option>
-          <option value="mauvaise" <?php if(strcmp($_['defunt'][0]->drainage_etat, 'mauvaise')==0) echo 'selected' ?>>Mauvaise</option>
-          <option value="bonne" <?php if(strcmp($_['defunt'][0]->drainage_etat, 'bonne')==0) echo 'selected' ?>>Bonne</option>
-        </select>
-        </div>
-      </div>
-      <!-- Quantité drainage -->
-      <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 16px">
-        <div class="col-3">Quantité(l)</div>
-        <div class="col-9">
-          <select class="gestion-select w-100" data-table="defunt" data-column="drainage_qte" data-id="<?php echo $_['defunt'][0]->id ?>">
-          <?php for($i=0; $i<sizeof($quantiteOptions); $i++) { ?>
-            <option value="<?php echo $quantiteOptions[$i] ?>" <?php if($_['defunt'][0]->drainage_qte == $quantiteOptions[$i]) echo 'selected' ?>><?php echo $quantiteOptions[$i] ?></option>
-          <?php } ?>
-          </select>
-        </div>
-      </div>
-    </div>
-    <div class="col-6" style="margin-bottom: 32px">
-      <h6>PONCTION</h6>
-      <hr>
-      <!-- Designation ponction -->
-      <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
-        <div class="col-3">Désignation</div>
-        <div id="ponction-input" class="col-9">
-          <input class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->ponction ?>" data-table="defunt" data-column="ponction" data-id="<?php echo $_['defunt'][0]->id ?>"/>
-          <ul class="ponction-list"></ul>
-        </div>
-      </div>
-      <!-- Quantité ponction -->
-      <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 16px">
-        <div class="col-3">Quantité(l)</div>
-        <div class="col-9">
-          <select class="gestion-select w-100" data-table="defunt" data-column="ponction_qte" data-id="<?php echo $_['defunt'][0]->id ?>">
-          <?php for($i=0; $i<sizeof($quantiteOptions); $i++) { ?>
-            <option value="<?php echo $quantiteOptions[$i] ?>" <?php if($_['defunt'][0]->ponction_qte == $quantiteOptions[$i]) echo 'selected' ?>><?php echo $quantiteOptions[$i] ?></option>
-          <?php } ?>
-          </select>
-        </div>
-      </div>
-    </div>
-    <div class="col-6" style="margin-bottom: 32px">
-      <h6>CAVITÉ</h6>
-      <hr>
-      <!-- Designation cavité -->
-      <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
-        <div class="col-3">Désignation</div>
-        <div class="col-9">
-          <input id="cavite-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->cavite ?>" data-table="defunt" data-column="cavite" data-id="<?php echo $_['defunt'][0]->id ?>"/>
-          <ul class="cavite-list"></ul>
-        </div>
-      </div>
-      <!-- Quantité cavité -->
-      <div class="d-flex flex-row col-12" style="margin-bottom: 16px">
-        <div class="col-3">Quantité(l)</div>
-        <div class="col-9">
-          <select class="gestion-select w-100" data-table="defunt" data-column="cavite_qte" data-id="<?php echo $_['defunt'][0]->id ?>">
-          <?php for($i=0; $i<sizeof($quantiteOptions); $i++) { ?>
-            <option value="<?php echo $quantiteOptions[$i] ?>" <?php if($_['defunt'][0]->cavite_qte == $quantiteOptions[$i]) echo 'selected' ?>><?php echo $quantiteOptions[$i] ?></option>
-          <?php } ?>
-          </select>
-        </div>
-      </div>
-    </div>
-    <div class="col-6" style="margin-bottom: 32px">
-      <h6>AUTRES TRAITEMENTS</h6>
-      <hr>
-      <!-- Hypodermiques -->
-      <div class="d-flex flex-column align-items-center" style="margin-bottom: 8px">
-        <div class="d-flex flex-row justify-content-between col-12">
-          <div>Hypodermiques</div>
-          <button id="defuntAddHypodermique" class="btn btn-secondary" type="button">Ajouter</button>
-        </div>
         <hr>
-        <div class="table-responsive col-12">
+        <!-- Corpulence -->
-          <table id="hypodermiques" class="table table-striped">
+        <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
-            <thead>
+          <div class="col-3">Corpulence</div>
-                <tr>
+          <div class="col-9">
-                  <th>Quantité</th>
+            <input id="corpulence-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->corpulence ?>" data-table="defunt" data-column="corpulence" data-id="<?php echo $_['defunt'][0]->id ?>"/>
-                  <th>Désignation</th>
+            <ul class="corpulence-list"></ul>
-                  <th>Endroit</th>
+          </div>
-                  <th>Actions</th>
+        </div>
-                </tr>
+        <!-- Rigidité -->
-            </thead>
+        <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
-            <tbody>
+          <div class="col-3">Rigidité</div>
-            </tbody>
+          <div class="col-9">
-          </table>
+            <input id="rigidite-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->rigidite ?>" data-table="defunt" data-column="rigidite" data-id="<?php echo $_['defunt'][0]->id ?>"/>
+            <ul class="rigidite-list"></ul>
+          </div>
+        </div>
+        <!-- Lividités -->
+        <div class="d-flex flex-row col-12" style="margin-bottom: 16px">
+          <div class="col-3">Lividités</div>
+          <div class="col-9">
+            <input id="lividite-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->lividite ?>" data-table="defunt" data-column="lividite" data-id="<?php echo $_['defunt'][0]->id ?>"/>
+            <ul class="lividite-list"></ul>
+          </div>
+        </div>
+        <!-- Observations generales -->
+        <div class="d-flex flex-row col-12" style="margin-bottom: 16px">
+          <div class="col-3">Observations du corps</div>
+          <div class="col-9">
+            <textarea class="gestion-input w-100" data-table="defunt" data-column="observations_corps" data-id="<?php echo $_['defunt'][0]->id ?>"><?php echo $_['defunt'][0]->observations_corps ?></textarea>
+          </div>
         </div>
       </div>
-    </div>
+      <div class="col-6" style="margin-bottom: 32px">
-    <div class="col-6" style="margin-bottom: 32px">
+        <h6>ACCÈS</h6>
-      <h6>HYGIÈNE</h6>
+        <hr>
-      <hr>
+        <!-- Nature accès -->
-      <!-- Désinfection -->
+        <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 8px">
-      <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
+          <div class="col-3">Désignation</div>
-        <div class="col-3">Désinfection</div>
+          <div class="col-9">
-        <div class="col-9">
+            <input id="acces-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->acces ?>" data-table="defunt" data-column="acces" data-id="<?php echo $_['defunt'][0]->id ?>"/>
-          <input id="desinfection-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->desinfection ?>" data-table="defunt" data-column="desinfection" data-id="<?php echo $_['defunt'][0]->id ?>"/>
+            <ul class="acces-list"></ul>
-          <ul class="desinfection-list"></ul>
+          </div>
+        </div>
+        <!-- Recherche accès -->
+        <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 8px">
+          <div class="col-3">Recherche</div>
+          <div class="col-9">
+          <input class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->acces_recherche ?>" data-table="defunt" data-column="acces_recherche" data-id="<?php echo $_['defunt'][0]->id ?>"/>
+          </div>
+        </div>
+        <!-- Etat -->
+        <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 16px">
+          <div class="col-3">État</div>
+          <div class="col-9">
+          <select class="gestion-select w-100" data-table="defunt" data-column="acces_etat" data-id="<?php echo $_['defunt'][0]->id ?>">
+            <option>Selectionner un état</option>
+            <option value="mauvais" <?php if(strcmp($_['defunt'][0]->acces_etat, 'mauvais')==0) echo 'selected' ?>>Mauvais</option>
+            <option value="bon" <?php if(strcmp($_['defunt'][0]->acces_etat, 'bon')==0) echo 'selected' ?>>Bon</option>
+          </select>
+          </div>
         </div>
       </div>
-      <!-- Lavage -->
+      <div class="col-6" style="margin-bottom: 32px">
-      <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
+        <h6>PRÉ-INJECTION</h6>
-        <div class="col-3">Lavage</div>
+        <hr>
-        <div class="col-9">
+        <!-- Nature préinjection -->
-          <input id="lavage-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->lavage ?>" data-table="defunt" data-column="lavage" data-id="<?php echo $_['defunt'][0]->id ?>"/>
+        <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
-          <ul class="lavage-list"></ul>
+          <div class="col-3">Désignation</div>
+          <div class="col-9">
+            <input id="preinjection-input" class="gestion-input w-100" autocomplete="off" type="text" value="<?php echo $_['defunt'][0]->preinjection ?>" data-table="defunt" data-column="preinjection" data-id="<?php echo $_['defunt'][0]->id ?>"/>
+            <ul class="preinjection-list"></ul>
+          </div>
+        </div>
+        <!-- Quantité préinjection -->
+        <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 16px">
+          <div class="col-3">Quantité(l)</div>
+          <div class="col-9">
+          <select class="gestion-select w-100" data-table="defunt" data-column="preinjection_qte" data-id="<?php echo $_['defunt'][0]->id ?>">
+          <?php for($i=0; $i<sizeof($quantiteOptions); $i++) { ?>
+            <option value="<?php echo $quantiteOptions[$i] ?>" <?php if($_['defunt'][0]->preinjection_qte == $quantiteOptions[$i]) echo 'selected' ?>><?php echo $quantiteOptions[$i] ?></option>
+          <?php } ?>
+          </select>
+          </div>
         </div>
       </div>
-      <!-- Désinfection cavité -->
+      <div class="col-6" style="margin-bottom: 32px">
-      <div class="d-flex flex-row col-12 align-items-center" style="margin-bottom: 8px">
+        <h6>INJECTION</h6>
-        <div class="col-3">Rasage</div>
+        <hr>
-        <div class="d-flex col-9 justify-content-start align-items-start">
+        <!-- Nature injection -->
-          <input class="gestion-checkbox" type="checkbox" <?php if($_['defunt'][0]->rasage==1) echo 'checked' ?> data-table="defunt" data-column="rasage" data-id="<?php echo $_['defunt'][0]->id ?>"/>
+        <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
+          <div class="col-3">Désignation</div>
+          <div class="col-9">
+            <input id="injection-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->injection ?>" data-table="defunt" data-column="injection" data-id="<?php echo $_['defunt'][0]->id ?>"/>
+            <ul class="injection-list"></ul>
+          </div>
+        </div>
+        <!-- Diffusion injection -->
+        <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 8px">
+          <div class="col-3">Diffusion</div>
+          <div class="col-9">
+          <select class="gestion-select w-100" data-table="defunt" data-column="injection_diffusion" data-id="<?php echo $_['defunt'][0]->id ?>">
+            <option>Selectionner un état</option>
+            <option value="mauvaise" <?php if(strcmp($_['defunt'][0]->injection_diffusion, 'mauvaise')==0) echo 'selected' ?>>Mauvaise</option>
+            <option value="bonne" <?php if(strcmp($_['defunt'][0]->injection_diffusion, 'bonne')==0) echo 'selected' ?>>Bonne</option>
+          </select>
+          </div>
+        </div>
+        <!-- Quantité injection -->
+        <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 16px">
+          <div class="col-3">Quantité(l)</div>
+          <div class="col-9">
+            <select class="gestion-select w-100" data-table="defunt" data-column="injection_qte" data-id="<?php echo $_['defunt'][0]->id ?>">
+            <?php for($i=0; $i<sizeof($quantiteOptions); $i++) { ?>
+              <option value="<?php echo $quantiteOptions[$i] ?>" <?php if($_['defunt'][0]->injection_qte == $quantiteOptions[$i]) echo 'selected' ?>><?php echo $quantiteOptions[$i] ?></option>
+            <?php } ?>
+            </select>
+          </div>
         </div>
       </div>
-    </div>
+      <div class="col-6" style="margin-bottom: 32px">
-    <div class="col-6" style="margin-bottom: 32px">
+        <h6>CO-INJECTION</h6>
-      <h6>PRÉSENTATION</h6>
+        <hr>
-      <hr>
+        <!-- Nature co-injection -->
-      <!-- Cosmetiques -->
+        <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
-      <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
+          <div class="col-3">Désignation</div>
-        <div class="col-3">Cosmétiques</div>
+          <div class="col-9">
-        <div class="col-9">
+            <input id="coinjection-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->coinjection ?>" data-table="defunt" data-column="coinjection" data-id="<?php echo $_['defunt'][0]->id ?>"/>
-          <input id="cosmetiques-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->presentation_cosmetique ?>" data-table="defunt" data-column="presentation_cosmetique" data-id="<?php echo $_['defunt'][0]->id ?>"/>
+            <ul class="coinjection-list"></ul>
-          <ul class="cosmetiques-list"></ul>
+          </div>
+        </div>
+        <!-- Quantité co-injection -->
+        <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 8px">
+          <div class="col-3">Quantité(l)</div>
+          <div class="col-9">
+          <select class="gestion-select w-100" data-table="defunt" data-column="coinjection_qte" data-id="<?php echo $_['defunt'][0]->id ?>">
+          <?php for($i=0; $i<sizeof($quantiteOptions); $i++) { ?>
+            <option value="<?php echo $quantiteOptions[$i] ?>" <?php if($_['defunt'][0]->coinjection_qte == $quantiteOptions[$i]) echo 'selected' ?>><?php echo $quantiteOptions[$i] ?></option>
+          <?php } ?>
+          </select>
+          </div>
         </div>
       </div>
-      <!-- Sur -->
+      <div class="col-6" style="margin-bottom: 32px">
-      <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
+        <h6>DRAINAGE</h6>
-        <div class="col-3">Sur</div>
+        <hr>
-        <div class="col-9">
+        <!-- Designation drainage -->
-          <input id="sur-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->presentation_sur ?>" data-table="defunt" data-column="presentation_sur" data-id="<?php echo $_['defunt'][0]->id ?>"/>
+        <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
-          <ul class="sur-list"></ul>
+          <div class="col-3">Désignation</div>
+          <div class="col-9">
+            <input id="drainage-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->drainage ?>" data-table="defunt" data-column="drainage" data-id="<?php echo $_['defunt'][0]->id ?>"/>
+            <ul class="drainage-list"></ul>
+          </div>
+        </div>
+        <!-- État drainage -->
+        <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 8px">
+          <div class="col-3">État</div>
+          <div class="col-9">
+          <select class="gestion-select w-100" data-table="defunt" data-column="drainage_etat" data-id="<?php echo $_['defunt'][0]->id ?>">
+            <option>Selectionner un état</option>
+            <option value="mauvaise" <?php if(strcmp($_['defunt'][0]->drainage_etat, 'mauvaise')==0) echo 'selected' ?>>Mauvaise</option>
+            <option value="bonne" <?php if(strcmp($_['defunt'][0]->drainage_etat, 'bonne')==0) echo 'selected' ?>>Bonne</option>
+          </select>
+          </div>
+        </div>
+        <!-- Quantité drainage -->
+        <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 16px">
+          <div class="col-3">Quantité(l)</div>
+          <div class="col-9">
+            <select class="gestion-select w-100" data-table="defunt" data-column="drainage_qte" data-id="<?php echo $_['defunt'][0]->id ?>">
+            <?php for($i=0; $i<sizeof($quantiteOptions); $i++) { ?>
+              <option value="<?php echo $quantiteOptions[$i] ?>" <?php if($_['defunt'][0]->drainage_qte == $quantiteOptions[$i]) echo 'selected' ?>><?php echo $quantiteOptions[$i] ?></option>
+            <?php } ?>
+            </select>
+          </div>
         </div>
       </div>
-    </div>
+      <div class="col-6" style="margin-bottom: 32px">
-    <div class="col-6" style="margin-bottom: 32px">
+        <h6>PONCTION</h6>
-      <h6>OBSERVATIONS</h6>
+        <hr>
-      <hr>
+        <!-- Designation ponction -->
-      <!-- Observations generales -->
+        <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
-      <div class="d-flex flex-row col-12" style="margin-bottom: 16px">
+          <div class="col-3">Désignation</div>
-        <div class="col-3">Observations générales</div>
+          <div id="ponction-input" class="col-9">
-        <div class="col-9">
+            <input class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->ponction ?>" data-table="defunt" data-column="ponction" data-id="<?php echo $_['defunt'][0]->id ?>"/>
-          <textarea class="gestion-input w-100" data-table="defunt" data-column="observations_generales" data-id="<?php echo $_['defunt'][0]->id ?>"><?php echo $_['defunt'][0]->observations_generales ?></textarea>
+            <ul class="ponction-list"></ul>
+          </div>
+        </div>
+        <!-- Quantité ponction -->
+        <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 16px">
+          <div class="col-3">Quantité(l)</div>
+          <div class="col-9">
+            <select class="gestion-select w-100" data-table="defunt" data-column="ponction_qte" data-id="<?php echo $_['defunt'][0]->id ?>">
+            <?php for($i=0; $i<sizeof($quantiteOptions); $i++) { ?>
+              <option value="<?php echo $quantiteOptions[$i] ?>" <?php if($_['defunt'][0]->ponction_qte == $quantiteOptions[$i]) echo 'selected' ?>><?php echo $quantiteOptions[$i] ?></option>
+            <?php } ?>
+            </select>
+          </div>
+        </div>
+      </div>
+      <div class="col-6" style="margin-bottom: 32px">
+        <h6>CAVITÉ</h6>
+        <hr>
+        <!-- Designation cavité -->
+        <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
+          <div class="col-3">Désignation</div>
+          <div class="col-9">
+            <input id="cavite-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->cavite ?>" data-table="defunt" data-column="cavite" data-id="<?php echo $_['defunt'][0]->id ?>"/>
+            <ul class="cavite-list"></ul>
+          </div>
+        </div>
+        <!-- Quantité cavité -->
+        <div class="d-flex flex-row col-12" style="margin-bottom: 16px">
+          <div class="col-3">Quantité(l)</div>
+          <div class="col-9">
+            <select class="gestion-select w-100" data-table="defunt" data-column="cavite_qte" data-id="<?php echo $_['defunt'][0]->id ?>">
+            <?php for($i=0; $i<sizeof($quantiteOptions); $i++) { ?>
+              <option value="<?php echo $quantiteOptions[$i] ?>" <?php if($_['defunt'][0]->cavite_qte == $quantiteOptions[$i]) echo 'selected' ?>><?php echo $quantiteOptions[$i] ?></option>
+            <?php } ?>
+            </select>
+          </div>
+        </div>
+      </div>
+      <div class="col-6" style="margin-bottom: 32px">
+        <h6>AUTRES TRAITEMENTS</h6>
+        <hr>
+        <!-- Hypodermiques -->
+        <div class="d-flex flex-column align-items-center" style="margin-bottom: 8px">
+          <div class="d-flex flex-row justify-content-between col-12">
+            <div>Hypodermiques</div>
+            <button id="defuntAddHypodermique" class="btn btn-secondary" type="button">Ajouter</button>
+          </div>
+          <hr>
+          <div class="table-responsive col-12">
+            <table id="hypodermiques" class="table table-striped">
+              <thead>
+                  <tr>
+                    <th>Quantité</th>
+                    <th>Désignation</th>
+                    <th>Endroit</th>
+                    <th>Actions</th>
+                  </tr>
+              </thead>
+              <tbody>
+              </tbody>
+            </table>
+          </div>
+        </div>
+      </div>
+      <div class="col-6" style="margin-bottom: 32px">
+        <h6>HYGIÈNE</h6>
+        <hr>
+        <!-- Désinfection -->
+        <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
+          <div class="col-3">Désinfection</div>
+          <div class="col-9">
+            <input id="desinfection-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->desinfection ?>" data-table="defunt" data-column="desinfection" data-id="<?php echo $_['defunt'][0]->id ?>"/>
+            <ul class="desinfection-list"></ul>
+          </div>
+        </div>
+        <!-- Lavage -->
+        <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
+          <div class="col-3">Lavage</div>
+          <div class="col-9">
+            <input id="lavage-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->lavage ?>" data-table="defunt" data-column="lavage" data-id="<?php echo $_['defunt'][0]->id ?>"/>
+            <ul class="lavage-list"></ul>
+          </div>
+        </div>
+        <!-- Désinfection cavité -->
+        <div class="d-flex flex-row col-12 align-items-center" style="margin-bottom: 8px">
+          <div class="col-3">Rasage</div>
+          <div class="d-flex col-9 justify-content-start align-items-start">
+            <input class="gestion-checkbox" type="checkbox" <?php if($_['defunt'][0]->rasage==1) echo 'checked' ?> data-table="defunt" data-column="rasage" data-id="<?php echo $_['defunt'][0]->id ?>"/>
+          </div>
+        </div>
+      </div>
+      <div class="col-6" style="margin-bottom: 32px">
+        <h6>PRÉSENTATION</h6>
+        <hr>
+        <!-- Cosmetiques -->
+        <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
+          <div class="col-3">Cosmétiques</div>
+          <div class="col-9">
+            <input id="cosmetiques-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->presentation_cosmetique ?>" data-table="defunt" data-column="presentation_cosmetique" data-id="<?php echo $_['defunt'][0]->id ?>"/>
+            <ul class="cosmetiques-list"></ul>
+          </div>
+        </div>
+        <!-- Sur -->
+        <div class="d-flex flex-row col-12" style="margin-bottom: 8px">
+          <div class="col-3">Sur</div>
+          <div class="col-9">
+            <input id="sur-input" class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->presentation_sur ?>" data-table="defunt" data-column="presentation_sur" data-id="<?php echo $_['defunt'][0]->id ?>"/>
+            <ul class="sur-list"></ul>
+          </div>
+        </div>
+      </div>
+      <div class="col-6" style="margin-bottom: 32px">
+        <h6>OBSERVATIONS</h6>
+        <hr>
+        <!-- Observations generales -->
+        <div class="d-flex flex-row col-12" style="margin-bottom: 16px">
+          <div class="col-3">Observations générales</div>
+          <div class="col-9">
+            <textarea class="gestion-input w-100" data-table="defunt" data-column="observations_generales" data-id="<?php echo $_['defunt'][0]->id ?>"><?php echo $_['defunt'][0]->observations_generales ?></textarea>
+          </div>
         </div>
       </div>
     </div>