root/THANASOFT-HFC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'features/feature-attestation-pacemaker-product-and-marque' into staging

Browse Source
This commit is contained in:
Tiavina 2025-01-29 13:18:41 +03:00
commit 26e10fc7eb
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gestion/lib/Db/Bdd.php
View File

@ -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;
}
@ -3193,6 +3194,7 @@ class Bdd {
defunt.nom as defunt_nom,
defunt.sexe as defunt_sexe,
defunt.ref_pacemaker as defunt_reference_pacemaker,
defunt.product_brand as defunt_product_brand,
client.nom as client_nom,
client.prenom as client_prenom,
client.entreprise as client_entreprise,

6
gestion/lib/Service/Certificate/PdfHandler/PacemakerCertificatePdfHandler.php
View File

@ -92,10 +92,14 @@ class PacemakerCertificatePdfHandler extends FPDF {
$this->Cell(0,12, FileExportHelpers::FormatTextForExport("Qui reposait à l'adresse suivante") . ' : ',0,1);
$this->SetFont('ComicSans', 'B', 14);
$this->MultiCell(0,6, FileExportHelpers::FormatTextForExport($this->devisOfDefunt['location_of_devis']));
$this->Ln(6);
$this->SetFont('ComicSans', '', 14);
$this->Cell(0,12,
$this->Cell(0,6,
FileExportHelpers::FormatTextForExport("Numéro de série : ").
FileExportHelpers::FormatTextForExport($this->devisOfDefunt['defunt_reference_pacemaker']),0,1);
$this->Cell(0,6,
FileExportHelpers::FormatTextForExport("Marque du produit : ").
FileExportHelpers::FormatTextForExport($this->devisOfDefunt['defunt_product_brand']),0,1);
$this->Cell(0,12, FileExportHelpers::FormatTextForExport("La présente attestion est établie pour faire valoir ce que de droit."),0,5);
$this->Ln(5);
$this->Cell(0,12,FileExportHelpers::FormatTextForExport('Fait à '). FileExportHelpers::FormatTextForExport($this->devisOfDefunt['configuration']->adresse));

2
gestion/lib/Sql/20250129-ADD_PRODUCT_BRAND_ON_DEFUNT.sql Normal file
View File

@ -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';

11
gestion/templates/content/defuntshow.php
View File

@ -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>