From 123d1e065581af4bd5e58f48e9e8d5d114f35b73 Mon Sep 17 00:00:00 2001
From: Tiavina <tiavina@ezway-technology.com>
Date: Wed, 29 Jan 2025 13:00:32 +0300
Subject: [PATCH] =?UTF-8?q?finish=20marque=20du=20produit=20et=20r=C3=A9fe?=
 =?UTF-8?q?rence=20du=20produit=20on=20defunt,=20wip=20add=20these=20on=20?=
 =?UTF-8?q?attestation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gestion/lib/Db/Bdd.php                                |  9 +++++----
 .../lib/Sql/20250129-ADD_PRODUCT_BRAND_ON_DEFUNT.sql  |  2 ++
 gestion/templates/content/defuntshow.php              | 11 +++++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 gestion/lib/Sql/20250129-ADD_PRODUCT_BRAND_ON_DEFUNT.sql

diff --git a/gestion/lib/Db/Bdd.php b/gestion/lib/Db/Bdd.php
index 76835bd..3c45800 100644
--- a/gestion/lib/Db/Bdd.php
+++ b/gestion/lib/Db/Bdd.php
@@ -43,7 +43,8 @@ class Bdd {
         "fk_client_group_id","fk_produit_id","ht_amount","client_group_name",
         "fk_client_group_facturation_id","group_facturation_name",
         "fk_product_type_id",
-        "portal_code","alarm_code","funeral_code");
+        "portal_code","alarm_code","funeral_code",
+        "product_brand");
         $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",
@@ -969,7 +970,7 @@ class Bdd {
             `id_nextcloud`, `nom`, `sexe`, `date_naissance`, `ref_pacemaker`, `date`,
             `corpulence`, `observations_corps`, `observations_generales`
             ) VALUES (?,?,?,?,?,NOW(),?,?,?);";
-        $this->execSQLNoData($sql, array($idNextcloud, 'Nom du défunt', 'm', '1973-11-11', 'Référence pacemaker', '', '', ''));
+        $this->execSQLNoData($sql, array($idNextcloud, 'Nom du défunt', 'm', '1973-11-11', '', '', '', ''));
         return true;
     }
 
@@ -981,7 +982,7 @@ class Bdd {
             `id_nextcloud`, `nom`, `sexe`, `date_naissance`, `ref_pacemaker`, `date`,
             `corpulence`, `observations_corps`, `observations_generales`
             ) VALUES (?,?,?,?,?,NOW(),?,?,?);";
-        $this->execSQLNoData($sql, array('admin',$name, 'm', '1973-11-11', 'Référence pacemaker', '', '', ''));
+        $this->execSQLNoData($sql, array('admin',$name, 'm', '1973-11-11', '', '', '', ''));
         return true;
     }
 
@@ -1389,7 +1390,7 @@ class Bdd {
 
     public function insertBijouDefunt($id,$idNextcloud){
         $sql = "INSERT INTO `".$this->tableprefix."bijou_defunt` (`defunt_id`, `id_nextcloud`,`designation`,`commentaire`) VALUES (?,?,?,?);";
-        $this->execSQLNoData($sql, array($id,$idNextcloud,'inserer un bijou', 'inserer un commentaire'));
+        $this->execSQLNoData($sql, array($id,$idNextcloud,'', ''));
         return true;
     }
 
diff --git a/gestion/lib/Sql/20250129-ADD_PRODUCT_BRAND_ON_DEFUNT.sql b/gestion/lib/Sql/20250129-ADD_PRODUCT_BRAND_ON_DEFUNT.sql
new file mode 100644
index 0000000..b8350ec
--- /dev/null
+++ b/gestion/lib/Sql/20250129-ADD_PRODUCT_BRAND_ON_DEFUNT.sql
@@ -0,0 +1,2 @@
+alter table oc_gestion_defunt add product_brand VARCHAR(255) DEFAULT '';
+update oc_gestion_defunt SET ref_pacemaker = '' WHERE ref_pacemaker = 'Référence pacemaker';
\ No newline at end of file
diff --git a/gestion/templates/content/defuntshow.php b/gestion/templates/content/defuntshow.php
index f1db552..3a195af 100644
--- a/gestion/templates/content/defuntshow.php
+++ b/gestion/templates/content/defuntshow.php
@@ -81,9 +81,16 @@
         </div>
         <!-- Référence pacemaker -->
         <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 16px">
-          <div class="col-3">Référence pacemaker</div>
+          <div class="col-3">Référence du produit</div>
           <div class="col-9">
-          <input class="gestion-input w-100" type="text" value="<?php echo $_['defunt'][0]->ref_pacemaker ?>" data-table="defunt" data-column="ref_pacemaker" data-id="<?php echo $_['defunt'][0]->id ?>"/>
+          <input class="gestion-input w-100" type="text" value="<?php echo ($_['defunt'][0]->ref_pacemaker ?? "") ?>" data-table="defunt" data-column="ref_pacemaker" data-id="<?php echo $_['defunt'][0]->id ?>"/>
+          </div>
+        </div>
+        <!-- Product brand -->
+        <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 16px">
+          <div class="col-3">Marque du produit</div>
+          <div class="col-9">
+          <input class="gestion-input w-100" type="text" value="<?php echo ($_['defunt'][0]->product_brand ?? "") ?>" data-table="defunt" data-column="product_brand" data-id="<?php echo $_['defunt'][0]->id ?>"/>
           </div>
         </div>
       </div>