Merge branch 'features/feature-add-defunt-bijou-taker-name' into staging

gestion/lib/Controller/PageController.php

@@ -2346,12 +2346,22 @@ class PageController extends Controller {
 
 			$pdf->MultiCell(0, 5, utf8_decode(html_entity_decode("À la suite de notre prise en charge, une liste des bijoux appartenant au défunt a été établie comme suit :")), '','J',0);
 			$pdf->setY($pdf->GetY()+5);
-			$col_width = round(($pdf->GetPageWidth()-30)/2);
-			$pdf->SetFont('ComicSans', 'B', 10); $pdf->MultiCell($col_width, 8, utf8_decode(html_entity_decode("Désignation")), 'LTRB', 'C');
-			$pdf->SetXY($col_width+15, $pdf->GetY()-8); $pdf->SetFont('ComicSans', 'B', 10); $pdf->MultiCell($col_width, 8, utf8_decode(html_entity_decode("Commentaire")), 'LTRB', 'C');
+			$col_width = round(($pdf->GetPageWidth()-30)/3);
+			$pdf->SetFont('ComicSans', 'B', 10); 
+			$pdf->MultiCell($col_width, 8, utf8_decode(html_entity_decode("Désignation")), 'LTRB', 'C');
+			$pdf->SetXY($col_width+15, $pdf->GetY()-8); 
+			$pdf->SetFont('ComicSans', 'B', 10); 
+			$pdf->MultiCell($col_width, 8, utf8_decode(html_entity_decode("Commentaire")), 'LTRB', 'C');
+			$pdf->SetXY($col_width+75, $pdf->GetY()-8); 
+			$pdf->SetFont('ComicSans', 'B', 10); 
+			$pdf->MultiCell($col_width, 8, utf8_decode(html_entity_decode("Qui a récupéré le bijou")), 'LTRB', 'C');
 			foreach ($bijoux as $key => $bijou) {
-				$pdf->SetFont('ComicSans', '', 10); $pdf->MultiCell($col_width, 8, utf8_decode(html_entity_decode($bijou->designation)), 'LTRB', 'L');
-				$pdf->SetXY($col_width+15, $pdf->GetY()-8); $pdf->SetFont('ComicSans', '', 10); $pdf->MultiCell($col_width, 8, utf8_decode(html_entity_decode($bijou->commentaire)), 'LTRB', 'L');
+				$pdf->SetFont('ComicSans', '', 10); 
+				$pdf->MultiCell($col_width, 8, utf8_decode(html_entity_decode($bijou->designation)), 'LTRB', 'L');
+				$pdf->SetXY($col_width+15, $pdf->GetY()-8); $pdf->SetFont('ComicSans', '', 10); 
+				$pdf->MultiCell($col_width, 8, utf8_decode(html_entity_decode($bijou->commentaire)), 'LTRB', 'L');
+				$pdf->SetXY($col_width+75, $pdf->GetY()-8); $pdf->SetFont('ComicSans', '', 10); 
+				$pdf->MultiCell($col_width, 8, utf8_decode(html_entity_decode($bijou->taker_name)), 'LTRB', 'L');
 			}
 			$photosCount = 0;
 			if($withPhotos){

gestion/lib/Db/Bdd.php

@@ -52,7 +52,7 @@ class Bdd {
         "fk_user_uuid",
         "phone_number","address",'postal_code','city','email','siret_number','tva_intracommu',
         'order_number','case_number','fk_template_type_key',
-        'facture_case_number','facture_order_number');
+        'facture_case_number','facture_order_number','taker_name');
         $this->whiteTable = array(
             "client", "lieu", "trajet", "devis", "produit_devis", "facture", "produit", "configuration", "ligne_trajet", "thanato", "article", "defunt", "article_devis", "bibliotheque", "bijou_defunt", "obs_defunt", "hypo_defunt",
             "client_group_discount","client_group",
@@ -804,7 +804,7 @@ class Bdd {
     }
 
     public function getListBijoux($numdefunt, $idNextcloud) {
-        $sql = "SELECT ".$this->tableprefix."bijou_defunt.id as bdid, designation, commentaire,photo,photo_name FROM "
+        $sql = "SELECT ".$this->tableprefix."bijou_defunt.id as bdid, designation, commentaire,photo,photo_name,taker_name FROM "
         .$this->tableprefix."bijou_defunt, ".$this->tableprefix."defunt
         WHERE ".$this->tableprefix."defunt.id = defunt_id AND ".$this->tableprefix."defunt.id = ?";
         return $this->execSQL($sql, array($numdefunt));

gestion/src/js/modules/ajaxRequest.mjs

@@ -524,6 +524,7 @@ export function getBijouxById() {
                 '<td><div class="editable" data-table="bijou_defunt" data-column="designation" data-id="' + myresp.bdid + '">' + ((myresp.designation.length === 0) ? '-' : myresp.designation) + '</div></td>' +
                 '<td><div class="editable" data-table="bijou_defunt" data-column="commentaire" data-id="' + myresp.bdid + '">' + ((myresp.commentaire.length === 0) ? '-' : myresp.commentaire) + '</div></td>' +
                 photoHtml + 
+                '<td><div class="editable" data-table="bijou_defunt" data-column="taker_name" data-id="' + myresp.bdid + '">' + ((myresp.taker_name.length === 0) ? '-' : myresp.taker_name) + '</div></td>' +
                 '<td><div data-html2canvas-ignore data-modifier="getBijouxById" data-id="' + myresp.bdid + '" data-table="bijou_defunt" class="deleteItem icon-delete"></div></td>'+
                 '</tr>'
             );

gestion/templates/content/defuntshow.php

@@ -485,6 +485,7 @@
                 <th>Désignation</th>
                 <th><?php p($l->t('Comment'));?></th>
                 <th><?php p($l->t('Photo'));?></th>
+                <th><?php p($l->t('Nom de la personne qui a récupéré ces bijoux'));?></th>
                 <th>Actions</th>
               </tr>
           </thead>