Merge branch 'features/feature-defunt-cover' into staging

gestion/lib/Db/Bdd.php

@@ -497,7 +497,19 @@ class Bdd {
             }
         }
         $sql .= " ORDER BY ".$this->tableprefix."defunt.id DESC;";
-        return $this->execSQL($sql, $conditions);
+
+        $defuntsList = $this->execSQLNoJsonReturn($sql,$conditions);
+        foreach($defuntsList as &$defunt){
+            $defunt["product_cover_description"] = null;
+            $defuntHasDevis = $defunt["id_devis"] != null;
+            if($defuntHasDevis){
+                $productCover = $this->getProductCoverByDevisId($defunt["id_devis"]);
+                if($productCover != null){
+                    $defunt["product_cover_description"] = $productCover["description"];
+                }
+            }
+        }
+        return json_encode($defuntsList);
     }
 
     public function getUnusedDefunts($idNextcloud) {

gestion/src/js/objects/defunt.mjs

@@ -21,6 +21,15 @@ export class Defunt {
     this.numero_devis = ((myresp.user_id == null) ? '-' : myresp.user_id);
     this.baseUrl = generateUrl(`/apps/gestion/defunt/${this.id}/show`);
     this.age = Defunt.caclulateAge(myresp.date_naissance);
+    this.productCoverDescription = Defunt.getDefuntProductCoverDescriptionFromApiResponse(myresp);
+  }
+
+  static getDefuntProductCoverDescriptionFromApiResponse(myresp){
+    let defuntProductCoverDescription = "-";
+    if(myresp.product_cover_description != null && myresp.product_cover_description.length > 0 ){
+      defuntProductCoverDescription = myresp.product_cover_description;
+    }
+    return defuntProductCoverDescription;
   }
 
   /**
@@ -41,6 +50,7 @@ export class Defunt {
       '<div>'+this.numero_devis+'</div>', // numeroDevis
       '<div>'+this.pompe+'</div>', // pompe
       '<div>'+this.lieu+'</div>', // lieu
+      '<div>'+this.productCoverDescription+'</div>', // lieu
       '<div style="display:inline-block;margin-right:0px;width:80%;"><a href="' + this.baseUrl + '"><button>' + t('gestion', 'Open') + '</button></a></div><div data-modifier="defunt" data-id=' + this.id + ' data-table="defunt" style="display:inline-block;margin-right:0px;" class="deleteItem icon-delete"></div>'
     ];
     return myrow;

gestion/templates/content/defunt.php

@@ -22,6 +22,7 @@
                 <th>Numéro de devis</th>
                 <th>Pompe funèbre</th>
                 <th>Lieu de soin</th>
+                <th>Housse</th>
                 <th><?php p($l->t('Actions'));?></th>
             </tr>
         </thead>

gestion/templates/content/defuntshow.php

@@ -102,7 +102,7 @@
         </div>
         <?php endforeach; ?>
         <div class="row p-2">
-          <button class="btn btn-secondary" id="coverProductsRadioButton"> Choisir la housse</button>
+          <button class="btn btn-secondary" id="coverProductsRadioButton"> Valider le choix </button>
         </div>
       </div>
     </div>