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

Compare commits

base: root:production-hfc
Branches Tags
root:production-hfc
root:feat-tva-multi
root:develop-tolotsoa
root:develop-ezway
root:production
..
compare: root:develop-tolotsoa
Branches Tags
root:production-hfc
root:feat-tva-multi
root:develop-tolotsoa
root:develop-ezway
root:production

No commits in common. "production-hfc" and "develop-tolotsoa" have entirely different histories.
production ... develop-to

17 changed files with 818 additions and 1440 deletions
Show Stats Expand all files Collapse all files

1
calendar/src/views/EditSimple.vue
View File

@ -161,6 +161,7 @@
:is-read-only="isReadOnly" :is-read-only="isReadOnly"
:prop-model="rfcProps.absenceType" :prop-model="rfcProps.absenceType"
:noWrap='true' :noWrap='true'
sle
@update:value="updateAbsenceType" /> @update:value="updateAbsenceType" />
</div> </div>
</div> </div>

1
gestion/appinfo/routes.php
View File

@ -99,7 +99,6 @@ return [
// generation attestation pacemaker, rapport de soins, de bijoux // generation attestation pacemaker, rapport de soins, de bijoux
['name' => 'page#saveAttestationPacemaker', 'url' => '/saveAttestationPacemaker', 'verb' => 'POST'], ['name' => 'page#saveAttestationPacemaker', 'url' => '/saveAttestationPacemaker', 'verb' => 'POST'],
['name' => 'page#saveAttestationAbsentPacemaker', 'url' => '/saveAttestationAbsentPacemaker', 'verb' => 'POST'],
['name' => 'page#saveRapportSoin', 'url' => '/saveRapportSoin', 'verb' => 'POST'], ['name' => 'page#saveRapportSoin', 'url' => '/saveRapportSoin', 'verb' => 'POST'],
['name' => 'page#saveRapportBijoux', 'url' => '/saveRapportBijoux', 'verb' => 'POST'], ['name' => 'page#saveRapportBijoux', 'url' => '/saveRapportBijoux', 'verb' => 'POST'],

2
gestion/js/defuntShow.app.js
View File

File diff suppressed because one or more lines are too long

84
gestion/lib/Controller/PageController.php
View File

@ -2031,14 +2031,12 @@ class PageController extends Controller
* @NoAdminRequired * @NoAdminRequired
* @NoCSRFRequired * @NoCSRFRequired
*/ */
public function apiReloadFec() public function apiReloadFec() {
{
$this->reloadFec(); $this->reloadFec();
return new DataResponse("", 200, ['Content-Type' => 'application/json']); return new DataResponse("", 200, ['Content-Type' => 'application/json']);
} }
private function reloadFec() private function reloadFec(){
{
$current_config = json_decode($this->myDb->getConfiguration($this->idNextcloud)); $current_config = json_decode($this->myDb->getConfiguration($this->idNextcloud));
$clean_folder = html_entity_decode($current_config[0]->path).'/'; $clean_folder = html_entity_decode($current_config[0]->path).'/';
@ -2060,21 +2058,22 @@ class PageController extends Controller
'montant_tva' => 0, 'montant_tva' => 0,
'montant_ttc' => 0, 'montant_ttc' => 0,
); );
if($factureIsSingle) { if($factureIsSingle){
$produits = json_decode($this->getProduitsById($facture->id_devis)); $produits = json_decode($this->getProduitsById($facture->id_devis));
foreach ($produits as $key => $produit) { foreach ($produits as $key => $produit) {
$htPrice = $produit->prix_unitaire; $htPrice = $produit->prix_unitaire;
if($facture->fk_client_group_id != null || $facture->fk_client_group_id != 0) { if($facture->fk_client_group_id != null || $facture->fk_client_group_id != 0){
$price = $this->myDb->getProductPriceByClientGroupId($facture->fk_client_group_id, $produit->id); $price = $this->myDb->getProductPriceByClientGroupId($facture->fk_client_group_id,$produit->id);
if($price != null) { if($price != null){
$htPrice = $price; $htPrice = $price;
} }
} }
$facture_temp['montant_htc'] += $htPrice * $produit->quantite; $facture_temp['montant_htc'] += $htPrice * $produit->quantite;
}; };
$facture_temp['montant_tva'] = ($facture_temp['montant_htc'] * $facture_temp['tva']) / 100; $facture_temp['montant_tva'] = ($facture_temp['montant_htc'] * $facture_temp['tva'])/100;
$facture_temp['montant_ttc'] = $facture_temp['montant_tva'] + $facture_temp['montant_htc']; $facture_temp['montant_ttc'] = $facture_temp['montant_tva'] + $facture_temp['montant_htc'];
} else { }
else{
$devis = $this->myDb->getDevisByFkFactureId($facture->id); $devis = $this->myDb->getDevisByFkFactureId($facture->id);
$factureGroupIsRelatedToAnyDevis = $devis != null; $factureGroupIsRelatedToAnyDevis = $devis != null;
$mentionFilters = [ $mentionFilters = [
@ -2084,11 +2083,11 @@ class PageController extends Controller
$isFactureGroupForSingleClient = $facture->facture_client_id != null && $facture->facture_client_id != 0; $isFactureGroupForSingleClient = $facture->facture_client_id != null && $facture->facture_client_id != 0;
if($isFactureGroupForSingleClient) { if($isFactureGroupForSingleClient){
$facture_temp["client"] = $facture->facture_client_entreprise; $facture_temp["client"] = $facture->facture_client_entreprise;
$facture_temp["nom_client"] = $facture->facture_client_name; $facture_temp["nom_client"] = $facture->facture_client_name;
if(!$factureGroupIsRelatedToAnyDevis) { if(!$factureGroupIsRelatedToAnyDevis ){
$devisList = $this->myDb->getDevisByClientIdAndMonthYear( $devisList = $this->myDb->getDevisByClientIdAndMonthYear(
$facture->facture_client_id, $facture->facture_client_id,
$facture->facture_month, $facture->facture_month,
@ -2096,11 +2095,12 @@ class PageController extends Controller
$mentionFilters $mentionFilters
); );
} }
} else { }
$facture_temp["client"] = $facture->group_code_comptable ?? '-'; else{
$facture_temp["client"] = $facture->group_code_comptable ??'-';
$facture_temp["nom_client"] = $facture->facture_group_name; $facture_temp["nom_client"] = $facture->facture_group_name;
if(!$factureGroupIsRelatedToAnyDevis) { if(!$factureGroupIsRelatedToAnyDevis ){
$devisList = $this->myDb->getDevisByClientGroupFacturationIdAndMonthYear( $devisList = $this->myDb->getDevisByClientGroupFacturationIdAndMonthYear(
$facture->facture_client_group_facturation_id, $facture->facture_client_group_facturation_id,
$facture->facture_month, $facture->facture_month,
@ -2112,24 +2112,24 @@ class PageController extends Controller
); );
} }
} }
if($factureGroupIsRelatedToAnyDevis) { if($factureGroupIsRelatedToAnyDevis){
$devisList = $this->myDb->getDevisByClientIdByFactureId($facture->id, $mentionFilters); $devisList = $this->myDb->getDevisByClientIdByFactureId($facture->id, $mentionFilters );
} }
foreach($devisList as $currentDevis) { foreach($devisList as $currentDevis){
$produits = json_decode($this->getProduitsById($currentDevis['id'])); $produits = json_decode($this->getProduitsById($currentDevis['id']));
foreach ($produits as $key => $produit) { foreach ($produits as $key => $produit) {
$htPrice = $produit->prix_unitaire; $htPrice = $produit->prix_unitaire;
if($currentDevis["fk_client_group_id"] != null || $currentDevis["fk_client_group_id"] != 0) { if($currentDevis["fk_client_group_id"] != null || $currentDevis["fk_client_group_id"] != 0){
$price = $this->myDb->getProductPriceByClientGroupId($currentDevis["fk_client_group_id"], $produit->id); $price = $this->myDb->getProductPriceByClientGroupId($currentDevis["fk_client_group_id"],$produit->id);
if($price != null) { if($price != null){
$htPrice = $price; $htPrice = $price;
} }
} }
$facture_temp['montant_htc'] += $htPrice * $produit->quantite; $facture_temp['montant_htc'] += $htPrice * $produit->quantite;
}; };
} }
$facture_temp['montant_tva'] = ($facture_temp['montant_htc'] * $facture_temp['tva']) / 100; $facture_temp['montant_tva'] = ($facture_temp['montant_htc'] * $facture_temp['tva'])/100;
$facture_temp['montant_ttc'] = $facture_temp['montant_tva'] + $facture_temp['montant_htc']; $facture_temp['montant_ttc'] = $facture_temp['montant_tva'] + $facture_temp['montant_htc'];
} }
@ -2138,11 +2138,11 @@ class PageController extends Controller
$data_temp = array(); $data_temp = array();
foreach ($data_factures as $key => $facture) { foreach ($data_factures as $key => $facture) {
$datesplit = explode('-', $facture['date_facture']); $datesplit = explode('-', $facture['date_facture']);
if($data_temp[strval($datesplit[0])] == null) { if($data_temp[strval($datesplit[0])]==NULL) {
$data_temp[strval($datesplit[0])][strval($datesplit[1])] = array(0 => $facture); $data_temp[strval($datesplit[0])][strval($datesplit[1])] = array(0=>$facture);
} else { } else {
if($data_temp[strval($datesplit[0])][strval($datesplit[1])] == null) { if($data_temp[strval($datesplit[0])][strval($datesplit[1])]==NULL) {
$data_temp[strval($datesplit[0])][strval($datesplit[1])] = array(0 => $facture); $data_temp[strval($datesplit[0])][strval($datesplit[1])] = array(0=>$facture);
} else { } else {
array_push($data_temp[strval($datesplit[0])][strval($datesplit[1])], $facture); array_push($data_temp[strval($datesplit[0])][strval($datesplit[1])], $facture);
} }
@ -2174,8 +2174,7 @@ class PageController extends Controller
$_clean_folder = $clean_folder.'FEC/'.$key_annee.'/'; $_clean_folder = $clean_folder.'FEC/'.$key_annee.'/';
try { try {
$this->storage->newFolder($_clean_folder); $this->storage->newFolder($_clean_folder);
} catch(\OCP\Files\NotPermittedException $e) { } catch(\OCP\Files\NotPermittedException $e) { }
}
foreach ($annee as $key_mois => $mois) { foreach ($annee as $key_mois => $mois) {
// Initialize FEC headers // Initialize FEC headers
@ -2284,11 +2283,9 @@ class PageController extends Controller
} }
} }
} catch(\OCP\Files\NotFoundException $e) { } catch(\OCP\Files\NotFoundException $e) { }
}
} catch(\OCP\Files\NotPermittedException $e) { } catch(\OCP\Files\NotPermittedException $e) { }
}
} }
private function refreshFEC() private function refreshFEC()
@ -3662,29 +3659,6 @@ class PageController extends Controller
} }
/**
* @NoAdminRequired
* @NoCSRFRequired
* @param int $defuntId
*/
public function saveAttestationAbsentPacemaker($defuntId, $email = '')
{
try {
$careCertificateFilename = $this->certificateService->generatePacemakerAbsentCertificate($defuntId, $this->idNextcloud);
if($careCertificateFilename != null && trim($email) != '') {
//send email
$this->sendAttachmentToClientByDefunt($defuntId, $careCertificateFilename, $email, "Retrait de pile", "Vous trouverez en pièce jointe l'attestation de retrait de pile ", true);
}
return $careCertificateFilename;
} catch(\OCP\Files\NotFoundException $e) {
}
}
/** /**
* @NoAdminRequired * @NoAdminRequired
* @NoCSRFRequired * @NoCSRFRequired

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

@ -2615,7 +2615,7 @@ class Bdd
return $data; return $data;
} }
private function getThanatoDevisListByDateSave($thanatoId, $date) private function getThanatoDevisListByDate($thanatoId, $date)
{ {
$dateFormatted = $date->format('Y-m-d'); $dateFormatted = $date->format('Y-m-d');
$sql = "SELECT $sql = "SELECT
@ -2656,42 +2656,6 @@ class Bdd
return $devisList; return $devisList;
} }
private function getThanatoDevisListByDate($thanatoId, $date)
{
$dateFormatted = $date->format('Y-m-d');
$sql = "SELECT
devis.id,
devis.date,
devis.mentions,
devis.num as calendar_uuid,
devis.id_defunt as id_defunt,
devis.id_lieu as id_lieu,
devis.id_client as id_client,
devis.id_thanato as id_thanato,
thanato.nom as nom_thanato,
thanato.prenom as prenom_thanato,
defunt.nom as nom_defunt,
lieu.nom as nom_lieu,
lieu.latitude as lieu_latitude,
lieu.longitude as lieu_longitude,
client.nom as nom_client,
client.entreprise as client_entreprise,
client.adresse as client_adresse
FROM ".$this->tableprefix."devis as devis
LEFT JOIN ".$this->tableprefix."thanato as thanato on devis.id_thanato = thanato.id
LEFT JOIN ".$this->tableprefix."lieu as lieu on devis.id_lieu = lieu.id
LEFT JOIN ".$this->tableprefix."defunt as defunt on devis.id_defunt = defunt.id
LEFT JOIN ".$this->tableprefix."client as client on devis.id_client = client.id
WHERE devis.date = ? AND
devis.id_thanato = ?
ORDER BY devis.date ASC;";
$devisList = $this->execSQLNoJsonReturn(
$sql,
[$dateFormatted,$thanatoId]
);
return $devisList;
}
public function getThanatoById($thanatoId) public function getThanatoById($thanatoId)
{ {
$sql = "SELECT id, nom, prenom,fk_user_uuid FROM ".$this->tableprefix."thanato WHERE id = ? LIMIT 1;"; $sql = "SELECT id, nom, prenom,fk_user_uuid FROM ".$this->tableprefix."thanato WHERE id = ? LIMIT 1;";
@ -3189,7 +3153,7 @@ class Bdd
return 0; return 0;
} }
private function getClientFactureStatisticPerMonthSave($clientId, array $produitList) private function getClientFactureStatisticPerMonth($clientId, array $produitList)
{ {
$currentYear = date('Y'); $currentYear = date('Y');
$monthLists = range(1, 12); $monthLists = range(1, 12);
@ -3210,11 +3174,12 @@ class Bdd
LEFT JOIN ".$this->tableprefix."devis as devis on facture.id_devis = devis.id LEFT JOIN ".$this->tableprefix."devis as devis on facture.id_devis = devis.id
WHERE YEAR(facture.date_paiement) = ? AND WHERE YEAR(facture.date_paiement) = ? AND
MONTH(facture.date_paiement) = ? AND MONTH(facture.date_paiement) = ? AND
devis.id_client = ? devis.id_client = ? AND
(devis.mentions = ? OR devis.mentions = ?)
ORDER BY facture.date_paiement ASC;"; ORDER BY facture.date_paiement ASC;";
$factureList = $this->execSQLNoJsonReturn( $factureList = $this->execSQLNoJsonReturn(
$sql, $sql,
[$currentYear,$monthValue,$clientId] [$currentYear,$monthValue,$clientId,DevisMentionConstant::FACTURED,DevisMentionConstant::FACTURED_FORMATTED]
); );
$factureDevisIds = []; $factureDevisIds = [];
@ -3244,58 +3209,6 @@ class Bdd
return $data; return $data;
} }
private function getClientFactureStatisticPerMonth($clientId, array $produitList, $clientGroupId = null)
{
$currentYear = date('Y');
$monthLists = range(1, 12);
$data = [] ;
foreach($monthLists as $monthValue) {
if(!isset($data[$monthValue])) {
$data[$monthValue] = [];
}
$sql = "SELECT
devis.id as devis_id,
devis.id_client as devis_client_id,
devis.date as devis_date,
devis.mentions as devis_mention
FROM ".$this->tableprefix."devis as devis
WHERE YEAR(devis.date) = ? AND
MONTH(devis.date) = ? AND
devis.id_client = ?
ORDER BY devis.date ASC;";
$factureList = $this->execSQLNoJsonReturn(
$sql,
[$currentYear,$monthValue,$clientId]
);
$factureDevisIds = [];
foreach($factureList as $facture) {
$factureDevisIds[] = $facture['devis_id'];
}
$defuntCount = count($factureList);
$produitsPrice = 0;
$statisticForeachProductPerMonth = [];
foreach($produitList as $produit) {
if(!isset($statisticForeachProductPerMonth[$produit['id']])) {
$statisticForeachProductPerMonth[$produit['id']] = 0;
}
$productTotalCount = $this->getDevisProductsQuantityByDevisListAndProductId($factureDevisIds, $produit['id']);
$prixUnitaire = is_null($clientGroupId) ? $produit["prix_unitaire"] : $this->getProductPriceByClientGroupId($clientGroupId, $produit['id']);
$totalWithoutVat = $productTotalCount * $prixUnitaire;
$statisticForeachProductPerMonth[$produit['id']] += $productTotalCount;
$produitsPrice += $totalWithoutVat;
}
$data[$monthValue] = [
"defunt_count" => $defuntCount,
"total_price" => $produitsPrice,
"year" => $currentYear,
"products" => $statisticForeachProductPerMonth
];
}
return $data;
}
public function getExportClientStatData(array $clientIds) public function getExportClientStatData(array $clientIds)
{ {
$data = []; $data = [];
@ -3309,10 +3222,9 @@ class Bdd
$client = $this->getClientById($clientId); $client = $this->getClientById($clientId);
if($client != null) { if($client != null) {
$clientName = trim($client["client_nom"]) . '-' .trim($client['client_entreprise']); $clientName = trim($client["client_nom"]) . '-' .trim($client['client_entreprise']);
$clientGroupId = $client['fk_client_group_id'];
} }
$data[$clientId]["client_name"] = $clientName; $data[$clientId]["client_name"] = $clientName;
$data[$clientId]["client_data"] = $this->getClientFactureStatisticPerMonth($clientId, $produitList, $clientGroupId); $data[$clientId]["client_data"] = $this->getClientFactureStatisticPerMonth($clientId, $produitList);
} }
return $data; return $data;
} }
@ -3572,7 +3484,6 @@ class Bdd
devis.comment as devis_comment, devis.comment as devis_comment,
devis.id_client as devis_id_client, devis.id_client as devis_id_client,
devis.devis_full_number, devis.devis_full_number,
devis.mentions,
client.nom as client_nom, client.nom as client_nom,
client.entreprise as client_entreprise, client.entreprise as client_entreprise,
client.adresse as client_adresse, client.adresse as client_adresse,
@ -3627,7 +3538,6 @@ class Bdd
devis.comment as devis_comment, devis.comment as devis_comment,
devis.id_client as devis_id_client, devis.id_client as devis_id_client,
devis.devis_full_number, devis.devis_full_number,
devis.mentions,
client.nom as client_nom, client.nom as client_nom,
client.entreprise as client_entreprise, client.entreprise as client_entreprise,
client.adresse as client_adresse, client.adresse as client_adresse,

161
gestion/lib/Service/Certificate/CertificateService.php
View File

@ -29,14 +29,12 @@ namespace OCA\Gestion\Service\Certificate;
use DateTime; use DateTime;
use DateTimeImmutable; use DateTimeImmutable;
use OCA\Gestion\Db\Bdd; use OCA\Gestion\Db\Bdd;
use OCP\Files\IRootFolder;
use OCA\Gestion\Helpers\DateHelpers; use OCA\Gestion\Helpers\DateHelpers;
use OCA\Gestion\Service\Certificate\PdfHandler\CareCertificatePdfHandler; use OCA\Gestion\Service\Certificate\PdfHandler\CareCertificatePdfHandler;
use OCA\Gestion\Service\Certificate\PdfHandler\PacemakerCertificatePdfHandler; use OCA\Gestion\Service\Certificate\PdfHandler\PacemakerCertificatePdfHandler;
use OCA\Gestion\Service\Certificate\PdfHandler\PacemakerAbsentCertificatePdfHandler; use OCP\Files\IRootFolder;
class CertificateService class CertificateService {
{
/** @var Bdd */ /** @var Bdd */
private $gestionBdd; private $gestionBdd;
@ -46,105 +44,102 @@ class CertificateService
private const DEFAULT_NEXTCLOUD_ADMIN = "admin"; private const DEFAULT_NEXTCLOUD_ADMIN = "admin";
public function __construct( public function __construct(
Bdd $gestionBdd, Bdd $gestionBdd,
IRootFolder $rootFolder IRootFolder $rootFolder) {
) {
$this->gestionBdd = $gestionBdd; $this->gestionBdd = $gestionBdd;
$this->rootFolder = $rootFolder; $this->rootFolder = $rootFolder;
} }
private function signatureImageExists() private function signatureImageExists(){
{
$storage = $this->rootFolder->getUserFolder(self::DEFAULT_NEXTCLOUD_ADMIN); $storage = $this->rootFolder->getUserFolder(self::DEFAULT_NEXTCLOUD_ADMIN);
try { try{
if(isset($storage)) { if(isset($storage)){
$storage->get("/.gestion/sign.png"); $storage->get("/.gestion/sign.png");
$signatureExist = true; $signatureExist = true;
} else { }else{
$signatureExist = false; $signatureExist = false;
} }
} catch(\OCP\Files\NotFoundException $e) { }
catch(\OCP\Files\NotFoundException $e) {
$signatureExist = false; $signatureExist = false;
} }
return $signatureExist; return $signatureExist;
} }
private function tamponImageExist() private function tamponImageExist(){
{
$storage = $this->rootFolder->getUserFolder(self::DEFAULT_NEXTCLOUD_ADMIN); $storage = $this->rootFolder->getUserFolder(self::DEFAULT_NEXTCLOUD_ADMIN);
try { try{
if(isset($storage)) { if(isset($storage)){
$storage->get("/.gestion/sign.jpg"); // tampon image $storage->get("/.gestion/sign.jpg"); // tampon image
$signatureExist = true; $signatureExist = true;
} else { }else{
$signatureExist = false; $signatureExist = false;
} }
} catch(\OCP\Files\NotFoundException $e) { }
catch(\OCP\Files\NotFoundException $e) {
$signatureExist = false; $signatureExist = false;
} }
return $signatureExist; return $signatureExist;
} }
private function getLogo() private function getLogo(){
{
$storage = $this->rootFolder->getUserFolder(self::DEFAULT_NEXTCLOUD_ADMIN); $storage = $this->rootFolder->getUserFolder(self::DEFAULT_NEXTCLOUD_ADMIN);
try{
try { try {
try { if(isset($storage)){
if(isset($storage)) {
$file = $storage->get('/.gestion/logo.png'); $file = $storage->get('/.gestion/logo.png');
} else { }else{
return "nothing"; return "nothing";
} }
} catch(\OCP\Files\NotFoundException $e) { } catch(\OCP\Files\NotFoundException $e) {
$file = $storage->get('/.gestion/logo.jpeg'); $file = $storage->get('/.gestion/logo.jpeg');
} }
} catch(\OCP\Files\NotFoundException $e) { }
catch(\OCP\Files\NotFoundException $e) {
return "nothing"; return "nothing";
} }
return base64_encode($file->getContent()); return base64_encode($file->getContent());
} }
private function setDevisOfDefuntDefaultValue($devisOfDefunt) private function setDevisOfDefuntDefaultValue($devisOfDefunt){
{
$devisOfDefunt["devis_date"] = new DateTimeImmutable($devisOfDefunt["devis_date"]); $devisOfDefunt["devis_date"] = new DateTimeImmutable($devisOfDefunt["devis_date"]);
$locationOfDevis = ""; $locationOfDevis = "";
if($devisOfDefunt['lieu_nom'] != null) { if($devisOfDefunt['lieu_nom'] != null){
$locationOfDevis .= $devisOfDefunt['lieu_nom']; $locationOfDevis .= $devisOfDefunt['lieu_nom'];
} }
if($devisOfDefunt['lieu_adresse'] != null) { if($devisOfDefunt['lieu_adresse'] != null){
$locationOfDevis .= " ". $devisOfDefunt['lieu_adresse']; $locationOfDevis .= " ". $devisOfDefunt['lieu_adresse'];
} }
$devisOfDefunt['location_of_devis'] = $locationOfDevis; $devisOfDefunt['location_of_devis'] = $locationOfDevis;
if($devisOfDefunt['thanato_nom'] == null) { if($devisOfDefunt['thanato_nom'] == null){
$devisOfDefunt['thanato_nom'] = ""; $devisOfDefunt['thanato_nom'] = "";
} }
if($devisOfDefunt['thanato_prenom'] == null) { if($devisOfDefunt['thanato_prenom'] == null){
$devisOfDefunt['thanato_prenom'] = ""; $devisOfDefunt['thanato_prenom'] = "";
} }
if($devisOfDefunt['thanato_reference'] == null) { if($devisOfDefunt['thanato_reference'] == null){
$devisOfDefunt['thanato_reference'] = ""; $devisOfDefunt['thanato_reference'] = "";
} }
if($devisOfDefunt['client_nom'] == null) { if($devisOfDefunt['client_nom'] == null){
$devisOfDefunt['client_nom'] = ""; $devisOfDefunt['client_nom'] = "";
} }
if($devisOfDefunt['client_prenom'] == null) { if($devisOfDefunt['client_prenom'] == null){
$devisOfDefunt['client_prenom'] = ""; $devisOfDefunt['client_prenom'] = "";
} }
if($devisOfDefunt['client_entreprise'] == null) { if($devisOfDefunt['client_entreprise'] == null){
$devisOfDefunt['client_entreprise'] = ""; $devisOfDefunt['client_entreprise'] = "";
} }
if($devisOfDefunt['client_adresse'] == null) { if($devisOfDefunt['client_adresse'] == null){
$devisOfDefunt['client_adresse'] = ""; $devisOfDefunt['client_adresse'] = "";
} }
return $devisOfDefunt; return $devisOfDefunt;
} }
public function generateCareCertificate($defuntId, $idNextCloud) public function generateCareCertificate($defuntId,$idNextCloud){
{
$storage = $this->rootFolder->getUserFolder($idNextCloud); $storage = $this->rootFolder->getUserFolder($idNextCloud);
$configs = json_decode($this->gestionBdd->getConfiguration(self::DEFAULT_NEXTCLOUD_ADMIN)); $configs = json_decode($this->gestionBdd->getConfiguration(self::DEFAULT_NEXTCLOUD_ADMIN));
$currentConfig = $configs[0]; $currentConfig = $configs[0];
$logo = $this->getLogo(); $logo = $this->getLogo();
$devisOfDefunt = $this->gestionBdd->getDevisOfDefunt($defuntId); $devisOfDefunt = $this->gestionBdd->getDevisOfDefunt($defuntId);
if($devisOfDefunt == null) { if($devisOfDefunt == null){
return null; return null;
} }
$devisOfDefunt["configuration"] = $currentConfig; $devisOfDefunt["configuration"] = $currentConfig;
@ -155,65 +150,61 @@ class CertificateService
$pdfFilename = $this->GetCareCertificateFilename($devisOfDefunt); $pdfFilename = $this->GetCareCertificateFilename($devisOfDefunt);
$filenamePath = $clean_folder.$careCertificateFolder.$pdfFilename.'.pdf'; $filenamePath = $clean_folder.$careCertificateFolder.$pdfFilename.'.pdf';
$pdf = new CareCertificatePdfHandler(); $pdf = new CareCertificatePdfHandler();
$pdf->AddFont('ComicSans', '', 'Comic Sans MS.php'); $pdf->AddFont('ComicSans','','Comic Sans MS.php');
$pdf->AddFont('ComicSans', 'B', 'comic-sans-bold.php'); $pdf->AddFont('ComicSans','B','comic-sans-bold.php');
$signatureImageExist = $this->signatureImageExists(); $signatureImageExist = $this->signatureImageExists();
$tamponImageExist = $this->tamponImageExist(); $tamponImageExist = $this->tamponImageExist();
$pdf->SetCareCertificateData($devisOfDefunt, $logo, $signatureImageExist, $tamponImageExist); $pdf->SetCareCertificateData($devisOfDefunt,$logo,$signatureImageExist ,$tamponImageExist);
$pdf->SetCareCertificate(); $pdf->SetCareCertificate();
try { try {
$storage->newFolder($folderDestination); $storage->newFolder($folderDestination);
} catch(\OCP\Files\NotPermittedException $e) {
} }
$pdfContent = $pdf->Output('', 'S'); catch(\OCP\Files\NotPermittedException $e) {
}
$pdfContent = $pdf->Output('','S');
$storage->newFile($filenamePath); $storage->newFile($filenamePath);
$pdfFile = $storage->get($filenamePath); $pdfFile = $storage->get($filenamePath);
$pdfFile->putContent($pdfContent); $pdfFile->putContent($pdfContent);
return $filenamePath; return $filenamePath;
} }
private function getCareCertificateFolder($devisOfDefunt) private function getCareCertificateFolder($devisOfDefunt){
{
$careCertificateFolder = 'CLIENTS/' $careCertificateFolder = 'CLIENTS/'
.mb_strtoupper($devisOfDefunt["client_nom"], 'UTF-8') .mb_strtoupper($devisOfDefunt["client_nom"],'UTF-8')
.'/DEFUNTS/' .'/DEFUNTS/'
.mb_strtoupper($devisOfDefunt["defunt_nom"], 'UTF-8').'/' .mb_strtoupper($devisOfDefunt["defunt_nom"],'UTF-8').'/'
.'ATTESTATION/'; .'ATTESTATION/';
return $careCertificateFolder; return $careCertificateFolder;
} }
private function GetCareCertificateFilename($devisOfDefunt) private function GetCareCertificateFilename($devisOfDefunt){
{ $filename = 'ATTESTATION_SOIN_'.mb_strtoupper($devisOfDefunt['defunt_nom'],'UTF-8');
$filename = 'ATTESTATION_SOIN_'.mb_strtoupper($devisOfDefunt['defunt_nom'], 'UTF-8');
return $filename; return $filename;
} }
private function getPacemakerCertificateFolder($devisOfDefunt) private function getPacemakerCertificateFolder($devisOfDefunt){
{
$folder = 'CLIENTS/' $folder = 'CLIENTS/'
.mb_strtoupper($devisOfDefunt["client_nom"], 'UTF-8') .mb_strtoupper($devisOfDefunt["client_nom"],'UTF-8')
.'/DEFUNTS/' .'/DEFUNTS/'
.mb_strtoupper($devisOfDefunt["defunt_nom"], 'UTF-8').'/' .mb_strtoupper($devisOfDefunt["defunt_nom"],'UTF-8').'/'
.'ATTESTATION/'; .'ATTESTATION/';
return $folder; return $folder;
} }
private function getPacemakerCertificateFilename($devisOfDefunt) private function getPacemakerCertificateFilename($devisOfDefunt){
{ $filename = 'ATTESTATION_PACEMAKER_'.mb_strtoupper($devisOfDefunt['defunt_nom'],'UTF-8');
$filename = 'ATTESTATION_PACEMAKER_'.mb_strtoupper($devisOfDefunt['defunt_nom'], 'UTF-8');
return $filename; return $filename;
} }
public function generatePacemakerCertificate($defuntId, $idNextCloud) public function generatePacemakerCertificate($defuntId,$idNextCloud){
{
$storage = $this->rootFolder->getUserFolder($idNextCloud); $storage = $this->rootFolder->getUserFolder($idNextCloud);
$configs = json_decode($this->gestionBdd->getConfiguration(self::DEFAULT_NEXTCLOUD_ADMIN)); $configs = json_decode($this->gestionBdd->getConfiguration(self::DEFAULT_NEXTCLOUD_ADMIN));
$currentConfig = $configs[0]; $currentConfig = $configs[0];
$logo = $this->getLogo(); $logo = $this->getLogo();
$devisOfDefunt = $this->gestionBdd->getDevisOfDefunt($defuntId); $devisOfDefunt = $this->gestionBdd->getDevisOfDefunt($defuntId);
if($devisOfDefunt == null) { if($devisOfDefunt == null){
return null; return null;
} }
$devisOfDefunt["configuration"] = $currentConfig; $devisOfDefunt["configuration"] = $currentConfig;
@ -224,58 +215,18 @@ class CertificateService
$pdfFilename = $this->getPacemakerCertificateFilename($devisOfDefunt); $pdfFilename = $this->getPacemakerCertificateFilename($devisOfDefunt);
$filenamePath = $clean_folder.$pacemakerCertificateFolder.$pdfFilename.'.pdf'; $filenamePath = $clean_folder.$pacemakerCertificateFolder.$pdfFilename.'.pdf';
$pdf = new PacemakerCertificatePdfHandler(); $pdf = new PacemakerCertificatePdfHandler();
$pdf->AddFont('ComicSans', '', 'Comic Sans MS.php'); $pdf->AddFont('ComicSans','','Comic Sans MS.php');
$pdf->AddFont('ComicSans', 'B', 'comic-sans-bold.php'); $pdf->AddFont('ComicSans','B','comic-sans-bold.php');
$signatureImageExist = $this->signatureImageExists(); $signatureImageExist = $this->signatureImageExists();
$tamponImageExist = $this->tamponImageExist(); $tamponImageExist = $this->tamponImageExist();
$pdf->SetPacemakerCertificateData($devisOfDefunt, $logo, $signatureImageExist, $tamponImageExist); $pdf->SetPacemakerCertificateData($devisOfDefunt,$logo,$signatureImageExist ,$tamponImageExist);
$pdf->SetPacemakerCertificate(); $pdf->SetPacemakerCertificate();
try { try {
$storage->newFolder($folderDestination); $storage->newFolder($folderDestination);
} catch(\OCP\Files\NotPermittedException $e) {
} }
$pdfContent = $pdf->Output('', 'S'); catch(\OCP\Files\NotPermittedException $e) {
$storage->newFile($filenamePath);
$pdfFile = $storage->get($filenamePath);
$pdfFile->putContent($pdfContent);
return $filenamePath;
} }
$pdfContent = $pdf->Output('','S');
private function getPacemakerAbsentCertificateFilename($devisOfDefunt)
{
$filename = 'ATTESTATION_ABSENCE_PACEMAKER_'.mb_strtoupper($devisOfDefunt['defunt_nom'], 'UTF-8');
return $filename;
}
public function generatePacemakerAbsentCertificate($defuntId, $idNextCloud)
{
$storage = $this->rootFolder->getUserFolder($idNextCloud);
$configs = json_decode($this->gestionBdd->getConfiguration(self::DEFAULT_NEXTCLOUD_ADMIN));
$currentConfig = $configs[0];
$logo = $this->getLogo();
$devisOfDefunt = $this->gestionBdd->getDevisOfDefunt($defuntId);
if($devisOfDefunt == null) {
return null;
}
$devisOfDefunt["configuration"] = $currentConfig;
$devisOfDefunt = $this->setDevisOfDefuntDefaultValue($devisOfDefunt);
$clean_folder = html_entity_decode(string: $currentConfig->path).'/';
$pacemakerCertificateFolder = $this->getPacemakerCertificateFolder($devisOfDefunt);
$folderDestination = $clean_folder.$pacemakerCertificateFolder;
$pdfFilename = $this->getPacemakerAbsentCertificateFilename($devisOfDefunt);
$filenamePath = $clean_folder.$pacemakerCertificateFolder.$pdfFilename.'.pdf';
$pdf = new PacemakerAbsentCertificatePdfHandler();
$pdf->AddFont('ComicSans', '', 'Comic Sans MS.php');
$pdf->AddFont('ComicSans', 'B', 'comic-sans-bold.php');
$signatureImageExist = $this->signatureImageExists();
$tamponImageExist = $this->tamponImageExist();
$pdf->SetPacemakerCertificateData($devisOfDefunt, $logo, $signatureImageExist, $tamponImageExist);
$pdf->SetPacemakerCertificate();
try {
$storage->newFolder($folderDestination);
} catch(\OCP\Files\NotPermittedException $e) {
}
$pdfContent = $pdf->Output('', 'S');
$storage->newFile($filenamePath); $storage->newFile($filenamePath);
$pdfFile = $storage->get($filenamePath); $pdfFile = $storage->get($filenamePath);
$pdfFile->putContent($pdfContent); $pdfFile->putContent($pdfContent);

239
gestion/lib/Service/Certificate/PdfHandler/PacemakerAbsentCertificatePdfHandler.php
View File

@ -1,239 +0,0 @@
<?php
declare(strict_types=1);
/**
* Calendar App
*
* @copyright 2021 Anna Larch <anna.larch@gmx.net>
*
* @author Anna Larch <anna.larch@gmx.net>
* @author Richard Steinmetz <richard@steinmetz.cloud>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either
* version 3 of the License, or any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
*
* You should have received a copy of the GNU Affero General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Gestion\Service\Certificate\PdfHandler;
use DateTime;
use FPDF;
use OCA\Gestion\Helpers\DateHelpers;
use OCA\Gestion\Helpers\FileExportHelpers;
use OCA\Gestion\Helpers\PriceHelpers;
class PacemakerAbsentCertificatePdfHandler extends FPDF
{
private $devisOfDefunt = [];
private $logo = null;
private $signatureImageExist = false;
private $tamponImageExist = false;
private $imagePath = "/var/www/html/data/admin/files/.gestion/";
public function Header()
{
if ($this->logo != "nothing") {
$this->Image($this->imagePath . "logo.png", 10, 10, 50, 35);
}
// En-tête avec les informations de l'entreprise - SOUS le logo
$this->SetXY(10, 50); // Position sous le logo
$this->SetFont('Arial', 'B', 12);
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport($this->devisOfDefunt['configuration']->entreprise), 0, 1);
$this->SetFont('Arial', '', 10);
$this->MultiCell(0, 4, FileExportHelpers::FormatTextForExport($this->devisOfDefunt['configuration']->adresse), 0, 'L');
if (isset($this->devisOfDefunt['configuration']->telephone)) {
$this->Cell(0, 4, 'Tel : ' . FileExportHelpers::FormatTextForExport($this->devisOfDefunt['configuration']->telephone), 0, 1);
}
if (isset($this->devisOfDefunt['thanato_reference'])) {
$this->Cell(0, 4, 'Habilitation : ' . FileExportHelpers::FormatTextForExport($this->devisOfDefunt['thanato_reference']), 0, 1);
}
if (isset($this->devisOfDefunt['configuration']->siret)) {
$this->Cell(0, 4, 'Siret : ' . FileExportHelpers::FormatTextForExport($this->devisOfDefunt['configuration']->siret), 0, 1);
}
}
public function Footer()
{
$this->SetY(-15);
$this->MultiCell(0, 5, utf8_decode(html_entity_decode($this->devisOfDefunt['configuration']->legal_one)), 0, 'C');
$this->MultiCell(0, 5, utf8_decode(html_entity_decode($this->devisOfDefunt['configuration']->adresse)), 0, 'C');
}
public function SetPacemakerCertificateData(array $devisOfDefunt, $logo = null, $signatureImageExist = false, $tamponImageExist = false)
{
$this->devisOfDefunt = $devisOfDefunt;
$this->logo = $logo;
$this->signatureImageExist = $signatureImageExist;
$this->tamponImageExist = $tamponImageExist;
}
public function SetPacemakerCertificate()
{
$this->AddPage();
$this->SetMargins(left: 20, top: 0, right: 20);
$this->SetPacemakerCertificateTitle();
$this->SetPacemakerCertificateContent();
}
private function SetPacemakerCertificateContent()
{
$this->SetY(100); // Position réduite après le titre
$this->SetFont('Arial', '', 12);
// Déterminer le genre selon la civilité
$civilite = isset($this->devisOfDefunt['thanato_civilite']) ? $this->devisOfDefunt['thanato_civilite'] : 'Madame';
$pronom = 'Je soussignée';
$profession = 'thanatopractrice diplômée';
// Adaptation selon la civilité
if (strtolower($civilite) === 'monsieur' || strtolower($civilite) === 'm.' || strtolower($civilite) === 'mr') {
$pronom = 'Je soussigné';
$profession = 'thanatopracteur diplômé';
}
// Texte principal avec genre adapté
$mainText = $pronom . ', ' . $civilite . ' ' .
mb_convert_encoding(html_entity_decode($this->devisOfDefunt['thanato_prenom']), 'ISO-8859-1', 'UTF-8'). ' ' .mb_convert_encoding(html_entity_decode($this->devisOfDefunt['thanato_nom']), 'ISO-8859-1', 'UTF-8').
', ' . $profession . ', certifie ne pas avoir constaté, à la palpation, la présence d\'un pacemaker pour :';
$this->MultiCell(0, 6, FileExportHelpers::FormatTextForExport($mainText));
$this->Ln(8);
// Nom du défunt
$this->SetFont('Arial', 'B', 12);
$this->Cell(20, 8, 'Nom :', 0, 0);
$this->SetFont('Arial', '', 12);
$this->Cell(0, 8, FileExportHelpers::FormatTextForExport(mb_convert_encoding(html_entity_decode($this->devisOfDefunt['defunt_nom']), 'ISO-8859-1', 'UTF-8')), 0, 1);
$this->Ln(3);
// Date
$this->SetFont('Arial', 'B', 12);
$this->Cell(20, 8, 'Date :', 0, 0);
$this->SetFont('Arial', '', 12);
if (isset($this->devisOfDefunt['devis_date'])) {
$this->Cell(0, 8, $this->devisOfDefunt['devis_date']->format('d/m/Y'), 0, 1);
} else {
$this->Cell(0, 8, '', 0, 1);
}
$this->Ln(3);
// Lieu d'intervention
$this->SetFont('Arial', 'B', 12);
$this->Cell(40, 8, 'Lieu d\'intervention :', 0, 0);
$this->SetFont('Arial', '', 12);
$lieu = isset($this->devisOfDefunt['lieu_intervention']) ?
$this->devisOfDefunt['lieu_intervention'] :
$this->devisOfDefunt['location_of_devis'];
// Utiliser MultiCell pour permettre le retour à la ligne
$this->SetX(20); // Retour au début de la ligne
$this->SetFont('Arial', 'B', 12);
$this->Cell(40, 8, 'Lieu d\'intervention :', 0, 1); // 1 pour aller à la ligne suivante
$this->SetFont('Arial', '', 12);
$this->MultiCell(0, 6, FileExportHelpers::FormatTextForExport($lieu), 0, 'L');
// Signatures et cachet - juste après le lieu d'intervention
$this->Ln(15); // Petit espace après le lieu d'intervention
if ($this->signatureImageExist) {
$this->Image($this->imagePath."sign.png", 140, $this->GetY(), 40, 16);
}
if($this->tamponImageExist) {
$this->SetXY(120, $this->GetY() + 20); // Augmenté de 5 à 20 pour plus d'espace
$this->Image($this->imagePath."sign.jpg", 120, $this->GetY(), 80, 35);
}
}
private function SetPacemakerCertificateTitle()
{
$this->SetY(y: 85); // Titre plus bas pour éviter l'en-tête
$this->SetFont('Arial', 'B', 16);
$this->Cell(0, 10, FileExportHelpers::FormatTextForExport('ATTESTATION D\'ABSENCE DE PACEMAKER'), 0, 1, 'C');
$this->Ln(5); // Espace réduit après le titre
}
public function MultiAlignCell($w, $h, $text, $border = 0, $ln = 0, $align = 'L', $fill = false)
{
// Store reset values for (x,y) positions
$x = $this->GetX() + $w;
$y = $this->GetY();
// Make a call to FPDF's MultiCell
$this->MultiCell($w, $h, $text, $border, $align, $fill);
// Reset the line position to the right, like in Cell
if ($ln == 0) {
$this->SetXY($x, $y);
}
}
public function NbLines($w, $txt)
{
// Compute the number of lines a MultiCell of width w will take
if (!isset($this->CurrentFont)) {
$this->Error('No font has been set');
}
$cw = $this->CurrentFont['cw'];
if ($w == 0) {
$w = $this->w - $this->rMargin - $this->x;
}
$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
$s = str_replace("\r", '', (string) $txt);
$nb = strlen($s);
if ($nb > 0 && $s[$nb - 1] == "\n") {
$nb--;
}
$sep = -1;
$i = 0;
$j = 0;
$l = 0;
$nl = 1;
while ($i < $nb) {
$c = $s[$i];
if ($c == "\n") {
$i++;
$sep = -1;
$j = $i;
$l = 0;
$nl++;
continue;
}
if ($c == ' ') {
$sep = $i;
}
$l += $cw[$c];
if ($l > $wmax) {
if ($sep == -1) {
if ($i == $j) {
$i++;
}
} else {
$i = $sep + 1;
}
$sep = -1;
$j = $i;
$l = 0;
$nl++;
} else {
$i++;
}
}
return $nl;
}
}

11
gestion/lib/Service/Devis/DevisDataProcessor.php
View File

@ -23,11 +23,6 @@ class DevisDataProcessor
$data_devis = []; $data_devis = [];
foreach ($devisData as $devis) { foreach ($devisData as $devis) {
// Exclure les devis annulés des récapitulatifs
if (isset($devis['mentions']) && $devis['mentions'] === 'CANCELED') {
continue;
}
$devis_temp = $this->createDevisStructure($devis, $currentConfig); $devis_temp = $this->createDevisStructure($devis, $currentConfig);
$devis_temp = $this->calculateDevisAmounts($devis_temp, $devis, $filter, $idNextCloud); $devis_temp = $this->calculateDevisAmounts($devis_temp, $devis, $filter, $idNextCloud);
$data_devis[] = $devis_temp; $data_devis[] = $devis_temp;
@ -46,8 +41,6 @@ class DevisDataProcessor
'devis_date' => $devis['devis_date'], 'devis_date' => $devis['devis_date'],
'lieu_nom' => $devis['lieu_nom'], 'lieu_nom' => $devis['lieu_nom'],
'lieu_adresse' => $devis['lieu_adresse'], 'lieu_adresse' => $devis['lieu_adresse'],
'thanato_nom' => $devis['thanato_nom'],
'thanato_prenom' => $devis['thanato_prenom'],
'defunt_nom' => $devis['defunt_nom'], 'defunt_nom' => $devis['defunt_nom'],
'defunt_sexe' => $devis['defunt_sexe'], 'defunt_sexe' => $devis['defunt_sexe'],
'client_nom' => $devis['client_nom'], 'client_nom' => $devis['client_nom'],
@ -85,9 +78,9 @@ class DevisDataProcessor
} }
// Traitement identique aux factures // Traitement identique aux factures
// $produitsReferenceArray = array_unique($produitsReferenceArray); $produitsReferenceArray = array_unique($produitsReferenceArray);
$produitsReferenceAsString = implode("-", $produitsReferenceArray); $produitsReferenceAsString = implode("-", $produitsReferenceArray);
$devis_temp['article'] = !empty($produitsReferenceAsString) ? $produitsReferenceAsString : ''; $devis_temp['article'] = !empty($produitsReferenceAsString) ? $produitsReferenceAsString : 'SOINS';
$devis_temp['montant_tva'] = ($devis_temp['montant_htc'] * $devis_temp['tva']) / 100; $devis_temp['montant_tva'] = ($devis_temp['montant_htc'] * $devis_temp['tva']) / 100;
$devis_temp['montant_ttc'] = $devis_temp['montant_tva'] + $devis_temp['montant_htc']; $devis_temp['montant_ttc'] = $devis_temp['montant_tva'] + $devis_temp['montant_htc'];

35
gestion/lib/Service/Devis/DevisPdfGenerator.php
View File

@ -81,31 +81,16 @@ class DevisPdfGenerator
private function calculatePagination($totalItems) private function calculatePagination($totalItems)
{ {
if ($totalItems <= 8) {
// Tout sur 1 page
return [ return [
'nb_pages' => 1, 'nb_pages' => ceil($totalItems / 12), // RÉDUIRE à 12 par page
'items_per_page' => 15, 'items_per_page' => 12,
'current_index' => 0
];
}
// Réserver 8 items pour dernière page
$itemsAvantDernierePage = $totalItems - 8;
$nbPagesNormales = ceil($itemsAvantDernierePage / 15);
return [
'nb_pages' => $nbPagesNormales + 1,
'items_per_page' => 15,
'current_index' => 0 'current_index' => 0
]; ];
} }
// VOICI LA FONCTION CORRIGÉE - 4 paramètres au lieu de 10
private function generateSinglePage(PageContext $context, $num_page, &$pagination, &$totals) private function generateSinglePage(PageContext $context, $num_page, &$pagination, &$totals)
{ {
$startIndex = $pagination['current_index'];
$remainingItems = count($context->dataDevis) - $startIndex;
$context->pdf->AddPage(); $context->pdf->AddPage();
$context->pdf->SetAutoPagebreak(false); $context->pdf->SetAutoPagebreak(false);
$context->pdf->SetMargins(0, 0, 10); $context->pdf->SetMargins(0, 0, 10);
@ -115,17 +100,7 @@ class DevisPdfGenerator
$this->layoutManager->addClientInfoSection($context->pdf, $context->clientInfo, $context->dataDevis[0]); $this->layoutManager->addClientInfoSection($context->pdf, $context->clientInfo, $context->dataDevis[0]);
$this->layoutManager->addDocumentTitle($context->pdf, $context->dataDevis[0], $context->year); $this->layoutManager->addDocumentTitle($context->pdf, $context->dataDevis[0], $context->year);
// ✅ Calculer items $itemsToProcess = min($pagination['items_per_page'], count($context->dataDevis) - $pagination['current_index']);
$isLastPage = ($num_page == $pagination['nb_pages']);
$hasAmounts = !$context->montant;
if ($isLastPage && $hasAmounts) {
// Dernière page avec totaux : max 8 items
$itemsToProcess = min(8, $remainingItems);
} else {
// Pages normales : 15 items
$itemsToProcess = min(15, $remainingItems);
}
$config = [ $config = [
'pagination' => $pagination, 'pagination' => $pagination,
@ -136,7 +111,7 @@ class DevisPdfGenerator
'sansMontant' => $context->montant 'sansMontant' => $context->montant
]; ];
$finalY = $this->tableRenderer->createDevisTable( $this->tableRenderer->createDevisTable(
$context->pdf, $context->pdf,
$context->dataDevis, $context->dataDevis,
$config $config

11
gestion/lib/Service/Devis/DevisPdfLayoutManager.php
View File

@ -63,18 +63,17 @@ class DevisPdfLayoutManager
); );
} }
public function addLegalFooter($pdf, $config, $tableEndY = 0) public function addLegalFooter($pdf, $config)
{ {
$y0 = 280; $y0 = 260;
$pageWidth = $pdf->GetPageWidth(); $pageWidth = $pdf->GetPageWidth();
$pdf->SetFont('Arial', '', 6); $pdf->SetFont('Arial', '', 6);
$pdf->SetXY(1, $y0);
$pdf->Cell($pageWidth, 5, mb_convert_encoding(html_entity_decode($config->legal_one), 'ISO-8859-1', 'UTF-8'), 0, 0, 'C');
$pdf->SetXY(1, $y0 + 4); $pdf->SetXY(1, $y0 + 4);
$pdf->Cell($pageWidth, 5, mb_convert_encoding(html_entity_decode($config->legal_two), 'ISO-8859-1', 'UTF-8'), 0, 0, 'C'); $pdf->Cell($pageWidth, 5, mb_convert_encoding(html_entity_decode($config->legal_one), 'ISO-8859-1', 'UTF-8'), 0, 0, 'C');
$pdf->SetXY(1, $y0 + 8); $pdf->SetXY(1, $y0 + 8);
$pdf->Cell($pageWidth, 5, mb_convert_encoding(html_entity_decode($config->legal_two), 'ISO-8859-1', 'UTF-8'), 0, 0, 'C');
$pdf->SetXY(1, $y0 + 12);
$pdf->Cell($pageWidth, 5, mb_convert_encoding(html_entity_decode($config->telephone), 'ISO-8859-1', 'UTF-8'), 0, 0, 'C'); $pdf->Cell($pageWidth, 5, mb_convert_encoding(html_entity_decode($config->telephone), 'ISO-8859-1', 'UTF-8'), 0, 0, 'C');
} }

176
gestion/lib/Service/Devis/DevisPdfTableRenderer.php
View File

@ -13,59 +13,41 @@ class DevisPdfTableRenderer
$totals = &$config['totals']; $totals = &$config['totals'];
$sansMontant = $config['sansMontant'] ?? false; $sansMontant = $config['sansMontant'] ?? false;
// Système de pagination comme les factures
$maxItemsPerPage = 22; // Nombre maximum d'éléments par page
$startIndex = $pagination['current_index']; $startIndex = $pagination['current_index'];
$itemsThisPage = min($itemsToProcess, count($dataDevis) - $startIndex); $itemsThisPage = min($itemsToProcess, count($dataDevis) - $startIndex);
$tableEndY = $this->drawTableStructure($pdf, $numPage, $nbPage, $sansMontant, $itemsThisPage); $this->drawTableStructure($pdf, $numPage, $nbPage, $sansMontant);
$this->addTableHeaders($pdf, $sansMontant); $this->addTableHeaders($pdf, $sansMontant);
$this->populateTableData($pdf, $dataDevis, $startIndex, $itemsThisPage, $totals, $sansMontant); $this->populateTableData($pdf, $dataDevis, $startIndex, $itemsThisPage, $totals, $sansMontant);
// Totaux seulement sur la dernière page
if ($numPage == $nbPage && !$sansMontant) { if ($numPage == $nbPage && !$sansMontant) {
$finalY = $this->addTableTotals($pdf, $totals, $tableEndY); $this->addTableTotals($pdf, $totals);
} else { }
$finalY = $tableEndY;
} }
return $finalY; private function drawTableStructure($pdf, $numPage, $nbPage, $sansMontant)
}
private function drawTableStructure($pdf, $numPage, $nbPage, $sansMontant, $itemsOnPage)
{ {
$pdf->SetLineWidth(0.2); $pdf->SetLineWidth(0.2);
$pdf->Rect(5, 105, 200, 130, "D");
$headerHeight = 10;
$rowHeight = 10;
$tableHeight = $headerHeight + ($itemsOnPage * $rowHeight);
$endY = 105 + $tableHeight;
$isLastPage = ($numPage == $nbPage);
$hasAmounts = !$sansMontant;
if ($isLastPage && $hasAmounts) {
// Dessiner 3 côtés seulement (haut, gauche, droite)
$pdf->Line(5, 105, 205, 105); // Haut
$pdf->Line(5, 105, 5, $endY); // Gauche
$pdf->Line(205, 105, 205, $endY); // Droite
// Pas de ligne du bas - elle sera tracée dans addTableTotals
} else {
// Dessiner rectangle complet
$pdf->Rect(5, 105, 200, $tableHeight, "D");
}
$pdf->Line(5, 115, 205, 115); $pdf->Line(5, 115, 205, 115);
$endY = ($numPage == $nbPage && !$sansMontant) ? 225 : 235;
if (!$sansMontant) { if (!$sansMontant) {
$verticalLines = [24, 41, 58, 77, 102, 127, 147, 167, 178, 189]; // Ajustement final des positions des lignes verticales
// Article et Défunt de même taille, TTC réduit
$verticalLines = [22, 39, 56, 75, 105, 135, 155, 170, 185];
} else { } else {
$verticalLines = [27, 47, 67, 85, 110, 135, 160]; // Pour sans montant: Article et Défunt de même taille
$verticalLines = [27, 47, 67, 85, 115, 145];
} }
foreach ($verticalLines as $x) { foreach ($verticalLines as $x) {
$pdf->Line($x, 105, $x, $endY); $pdf->Line($x, 105, $x, $endY);
} }
return $endY;
} }
private function addTableHeaders($pdf, $sansMontant) private function addTableHeaders($pdf, $sansMontant)
@ -74,17 +56,16 @@ class DevisPdfTableRenderer
if (!$sansMontant) { if (!$sansMontant) {
$headers = [ $headers = [
[5, 19, "N° Devis"], [5, 17, "N° Devis"],
[24, 17, "N° Dossier"], [22, 17, "N° Dossier"],
[41, 17, "N° Commande"], [39, 17, "N° Commande"],
[58, 19, "Date"], [56, 19, "Date"],
[77, 25, "Article"], [75, 30, "Article"], // Taille augmentée
[102, 25, "Lieu du soin"], [105, 30, "Lieu du soin"],
[127, 20, "Thanato"], [135, 20, "Défunt"], // Taille réduite pour équilibrer
[147, 20, "Défunt"], [155, 15, "H.T."],
[167, 11, "H.T."], [170, 15, "TVA"],
[178, 11, "TVA"], [185, 15, "T.T.C"] // Taille réduite
[189, 16, "T.T.C"]
]; ];
} else { } else {
$headers = [ $headers = [
@ -92,10 +73,9 @@ class DevisPdfTableRenderer
[27, 20, "N° Dossier"], [27, 20, "N° Dossier"],
[47, 20, "N° Commande"], [47, 20, "N° Commande"],
[67, 18, "Date"], [67, 18, "Date"],
[85, 25, "Article"], [85, 30, "Article"], // Même taille que Défunt
[110, 25, "Lieu du soin"], [115, 30, "Lieu du soin"],
[135, 25, "Thanato"], [145, 30, "Défunt"] // Même taille que Article
[160, 45, "Défunt"]
]; ];
} }
@ -146,34 +126,28 @@ class DevisPdfTableRenderer
} }
}; };
// Préparer le nom complet du thanatopracteur
$thanatoNom = trim(($devis['thanato_prenom'] ?? '') . ' ' . ($devis['thanato_nom'] ?? ''));
$thanatoNom = \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($thanatoNom);
if (!$sansMontant) { if (!$sansMontant) {
$addSmartCell($pdf, 6, $yDevis, 18, $devis['devis_full_number']); // LARGEURS ÉQUILIBRÉES avec Article et Défunt de même taille
$addSmartCell($pdf, 25, $yDevis, 16, $devis['case_number'] ?? ''); $addSmartCell($pdf, 6, $yDevis, 16, $devis['devis_full_number']);
$addSmartCell($pdf, 42, $yDevis, 16, $devis['order_number'] ?? ''); $addSmartCell($pdf, 23, $yDevis, 16, $devis['case_number'] ?? '');
$addSmartCell($pdf, 40, $yDevis, 16, $devis['order_number'] ?? '');
$addSmartCell($pdf, 59, $yDevis, 18, mb_convert_encoding($formatterDate->format($dateSoin), 'ISO-8859-1', 'UTF-8')); $addSmartCell($pdf, 57, $yDevis, 18, mb_convert_encoding($formatterDate->format($dateSoin), 'ISO-8859-1', 'UTF-8'));
$articleText = \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($devis['article'] ?? 'SOINS'); $articleText = \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($devis['article'] ?? 'SOINS');
$addSmartCell($pdf, 78, $yDevis, 24, $articleText); $addSmartCell($pdf, 76, $yDevis, 29, $articleText); // Article agrandi
$lieuText = \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($devis['lieu_nom'] ?? ''); $lieuText = \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($devis['lieu_nom'] ?? '');
$addSmartCell($pdf, 103, $yDevis, 24, $lieuText); $addSmartCell($pdf, 106, $yDevis, 29, $lieuText);
// COLONNE Thanatopracteur (après Lieu du soin)
$addSmartCell($pdf, 128, $yDevis, 19, $thanatoNom);
// COLONNE Défunt (après Thanato)
$defuntText = \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($devis['defunt_nom'] ?? ''); $defuntText = \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($devis['defunt_nom'] ?? '');
$addSmartCell($pdf, 148, $yDevis, 19, $defuntText); $addSmartCell($pdf, 136, $yDevis, 19, $defuntText); // Défunt réduit
$addSmartCell($pdf, 168, $yDevis, 10, number_format($devis['montant_htc'], 2, '.', '') . chr(128), 'R'); $addSmartCell($pdf, 156, $yDevis, 14, number_format($devis['montant_htc'], 2, '.', '') . chr(128), 'R');
$addSmartCell($pdf, 179, $yDevis, 10, number_format($devis['montant_tva'], 2, '.', '') . chr(128), 'R'); $addSmartCell($pdf, 171, $yDevis, 14, number_format($devis['montant_tva'], 2, '.', '') . chr(128), 'R');
$addSmartCell($pdf, 190, $yDevis, 15, number_format($devis['montant_ttc'], 2, '.', '') . chr(128), 'R'); $addSmartCell($pdf, 186, $yDevis, 14, number_format($devis['montant_ttc'], 2, '.', '') . chr(128), 'R'); // TTC réduit
} else { } else {
// Pour sans montant: Article et Défunt de même taille
$addSmartCell($pdf, 6, $yDevis, 21, $devis['devis_full_number']); $addSmartCell($pdf, 6, $yDevis, 21, $devis['devis_full_number']);
$addSmartCell($pdf, 28, $yDevis, 19, $devis['case_number'] ?? ''); $addSmartCell($pdf, 28, $yDevis, 19, $devis['case_number'] ?? '');
$addSmartCell($pdf, 48, $yDevis, 19, $devis['order_number'] ?? ''); $addSmartCell($pdf, 48, $yDevis, 19, $devis['order_number'] ?? '');
@ -181,58 +155,52 @@ class DevisPdfTableRenderer
$addSmartCell($pdf, 68, $yDevis, 17, mb_convert_encoding($formatterDate->format($dateSoin), 'ISO-8859-1', 'UTF-8')); $addSmartCell($pdf, 68, $yDevis, 17, mb_convert_encoding($formatterDate->format($dateSoin), 'ISO-8859-1', 'UTF-8'));
$articleText = \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($devis['article'] ?? 'SOINS'); $articleText = \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($devis['article'] ?? 'SOINS');
$addSmartCell($pdf, 86, $yDevis, 24, $articleText); $addSmartCell($pdf, 86, $yDevis, 29, $articleText); // Article agrandi
$lieuText = \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($devis['lieu_nom'] ?? ''); $lieuText = \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($devis['lieu_nom'] ?? '');
$addSmartCell($pdf, 111, $yDevis, 24, $lieuText); $addSmartCell($pdf, 116, $yDevis, 29, $lieuText);
// COLONNE Thanatopracteur (après Lieu du soin)
$addSmartCell($pdf, 136, $yDevis, 24, $thanatoNom);
// COLONNE Défunt (après Thanato)
$defuntText = \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($devis['defunt_nom'] ?? ''); $defuntText = \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($devis['defunt_nom'] ?? '');
$addSmartCell($pdf, 161, $yDevis, 44, $defuntText); $addSmartCell($pdf, 146, $yDevis, 29, $defuntText); // Défunt réduit
} }
} }
private function addTableTotals($pdf, $totals, $tableEndY) private function addTableTotals($pdf, $totals)
{ {
$totalEndY = $tableEndY + 8; $pdf->Line(5, 225, 205, 225);
$pdf->SetLineWidth(0.2);
// Juste les lignes horizontales haut et bas
$pdf->Line(5, $tableEndY, 205, $tableEndY);
$pdf->Line(5, $totalEndY, 205, $totalEndY);
$pdf->Line(5, $tableEndY, 5, $totalEndY);
$pdf->Line(205, $tableEndY, 205, $totalEndY);
$pdf->SetFont('Arial', 'B', 8); $pdf->SetFont('Arial', 'B', 8);
$pdf->SetXY(5, $tableEndY); // Alignement des totaux avec les colonnes HT, TVA, TTC
$pdf->Cell(162, 8, 'TOTAL', 0, 0, 'C'); $pdf->SetXY(5, 225);
$pdf->Cell(130, 8, 'TOTAL', 0, 0, 'C');
$pdf->SetXY(167, $tableEndY); // POSITIONS alignées avec les colonnes du tableau
$pdf->Cell(9, 8, number_format($totals['ht'], 2, '.', '') . chr(128), 0, 0, 'R'); $pdf->SetXY(155, 225);
$pdf->Cell(15, 8, number_format($totals['ht'], 2, '.', '') . chr(128), 0, 0, 'R');
$pdf->SetXY(170, 225);
$pdf->Cell(15, 8, number_format($totals['tva'], 2, '.', '') . chr(128), 0, 0, 'R');
$pdf->SetXY(185, 225);
$pdf->Cell(15, 8, number_format($totals['ttc'], 2, '.', '') . chr(128), 0, 0, 'R');
$pdf->SetXY(181, $tableEndY); // CADRE TOTAL TTC - Texte à l'intérieur du cadre aligné à droite
$pdf->Cell(9, 8, number_format($totals['tva'], 2, '.', '') . chr(128), 0, 0, 'R'); $pdf->SetXY(155, 240);
$pdf->Cell(30, 8, 'TOTAL TTC', 0, 0, 'C');
$pdf->SetXY(189, $tableEndY); // Valeur alignée avec la fin du tableau tout à droite
$pdf->Cell(16, 8, number_format($totals['ttc'], 2, '.', '') . chr(128), 0, 0, 'R'); $pdf->SetXY(185, 240);
$pdf->Cell(15, 8, number_format($totals['ttc'], 2, '.', '') . chr(128), 0, 0, 'R');
$cadreY = $totalEndY + 3; // Cadre TOTAL TTC aligné avec la fin du tableau (205)
$lines = [
[155, 240, 155, 248], // Ligne verticale gauche
[185, 240, 185, 248], // Ligne de séparation
[205, 240, 205, 248], // Ligne verticale droite (alignée avec fin du tableau)
[155, 240, 205, 240], // Ligne horizontale haute
[155, 248, 205, 248] // Ligne horizontale basse
];
$pdf->SetXY(170, $cadreY + 1); foreach ($lines as $line) {
$pdf->Cell(19, 6, 'TOTAL TTC', 0, 0, 'C'); $pdf->Line($line[0], $line[1], $line[2], $line[3]);
}
$pdf->SetXY(189, $cadreY + 1);
$pdf->Cell(16, 6, number_format($totals['ttc'], 2, '.', '') . chr(128), 0, 0, 'C');
$pdf->Rect(170, $cadreY, 35, 8, 'D');
$pdf->Line(189, $cadreY, 189, $cadreY + 8);
return $cadreY + 8;
} }
} }

48
gestion/lib/Service/ExportClientStatisticService.php
View File

@ -30,8 +30,7 @@ use OCA\Gestion\Db\Bdd;
use OCA\Gestion\Helpers\FileExportHelpers; use OCA\Gestion\Helpers\FileExportHelpers;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
class ExportClientStatisticService class ExportClientStatisticService {
{
/** @var Bdd */ /** @var Bdd */
private $gestionBdd; private $gestionBdd;
@ -40,27 +39,24 @@ class ExportClientStatisticService
public function __construct( public function __construct(
Bdd $gestionBdd, Bdd $gestionBdd,
LoggerInterface $logger LoggerInterface $logger) {
) {
$this->logger = $logger; $this->logger = $logger;
$this->gestionBdd = $gestionBdd; $this->gestionBdd = $gestionBdd;
} }
public function getFileName(array $clientIds) public function getFileName(array $clientIds){
{
$filename = ""; $filename = "";
$clients = $this->gestionBdd->getClientsByClientsID($clientIds); $clients = $this->gestionBdd->getClientsByClientsID($clientIds);
foreach($clients as $client) { foreach($clients as $client){
$filename .= $client['client_nom'] . '-' . $client['client_entreprise'] . '--'; $filename .= $client['client_nom'] . '-' . $client['client_entreprise'] . '--';
} }
$filename = rtrim($filename, '-'); $filename = rtrim($filename, '-');
$filename = str_replace(' ', '-', $filename); $filename = str_replace(' ','-', $filename);
$filename = str_replace('&nbsp;', '-', $filename); $filename = str_replace('&nbsp;','-', $filename);
return $filename; return $filename;
} }
public function getExportClientFileHeader(): string public function getExportClientFileHeader(): string{
{
$fileHeader = $fileHeader =
'CLIENT'.';'. 'CLIENT'.';'.
'MOIS'.';'. 'MOIS'.';'.
@ -68,39 +64,37 @@ class ExportClientStatisticService
'NB DE DEFUNTS'.';'; 'NB DE DEFUNTS'.';';
$produitList = $this->gestionBdd->getProduitsListAsArray(); $produitList = $this->gestionBdd->getProduitsListAsArray();
foreach($produitList as $produit) { foreach($produitList as $produit){
$fileHeader .= FileExportHelpers::FormatTextForExport($produit['reference']).';'; $fileHeader .= FileExportHelpers::FormatTextForExport($produit['reference']).';';
} }
$fileHeader .= 'TOTAL HT'.';'."\n"; $fileHeader .= 'TOTAL HT'.';'."\n";
return $fileHeader; return $fileHeader;
} }
public function populateExportDataIntoFileContent(array $exportData, string $fileContent): string public function populateExportDataIntoFileContent(array $exportData,string $fileContent): string{
{ foreach($exportData as $clientId => $clientData){
foreach($exportData as $clientId => $clientData) {
$clientName = $clientData["client_name"]; $clientName = $clientData["client_name"];
$clientStatPerMonth = $clientData["client_data"]; $clientStatPerMonth = $clientData["client_data"];
$totalPrice = 0; $totalPrice = 0;
if(!empty($clientStatPerMonth)) { if(!empty($clientStatPerMonth)){
foreach($clientStatPerMonth as $month => $stat) { foreach($clientStatPerMonth as $month => $stat){
$stat["client_name"] = $clientName; $stat["client_name"] = $clientName;
$totalPrice += $stat["total_price"]; $totalPrice+=$stat["total_price"];
$fileContent = $this->populateClientStatDataIntoFileContent($fileContent, $month, $stat); $fileContent = $this->populateClientStatDataIntoFileContent($fileContent,$month,$stat);
} }
$fileContent = $this->populateTotalPriceIntoFileContent($fileContent, $totalPrice, count($stat["products"])); $fileContent = $this->populateTotalPriceIntoFileContent($fileContent,$totalPrice,count($stat["products"]));
} }
} }
return $fileContent; return $fileContent;
} }
private function populateTotalPriceIntoFileContent(string $fileContent, $totalPrice, $productsCount) private function populateTotalPriceIntoFileContent(string $fileContent,$totalPrice,$productsCount){
{
$fileContent = $fileContent. $fileContent = $fileContent.
''.';'. ''.';'.
''.';'. ''.';'.
''.';'. ''.';'.
''.';'; ''.';';
while($productsCount > 0) { while($productsCount > 0){
$fileContent .= ''.';'; $fileContent .= ''.';';
$productsCount--; $productsCount--;
} }
@ -108,12 +102,10 @@ class ExportClientStatisticService
return $fileContent; return $fileContent;
} }
private function populateClientStatDataIntoFileContent(string $fileContent, $month, array $statPerMonth) private function populateClientStatDataIntoFileContent(string $fileContent,$month,array $statPerMonth){
{
$yearValue = $statPerMonth["year"]; $yearValue = $statPerMonth["year"];
$defuntCount = $statPerMonth["defunt_count"]; $defuntCount = $statPerMonth["defunt_count"];
$products = $statPerMonth["products"]; $products = $statPerMonth["products"];
$priceTotal = $statPerMonth["total_price"];
$fileContent = $fileContent. $fileContent = $fileContent.
FileExportHelpers::FormatTextForExport($statPerMonth['client_name']).';'. FileExportHelpers::FormatTextForExport($statPerMonth['client_name']).';'.
@ -121,10 +113,10 @@ class ExportClientStatisticService
"$yearValue".';'. "$yearValue".';'.
"$defuntCount".';'; "$defuntCount".';';
foreach($products as $productCount) { foreach($products as $productCount){
$fileContent .= "$productCount".";"; $fileContent .= "$productCount".";";
} }
$fileContent .= "$priceTotal".';'."\n"; $fileContent .= "\n";
return $fileContent; return $fileContent;
} }

145
gestion/lib/Service/ExportThanatoStatisticService.php
View File

@ -34,8 +34,7 @@ use OCA\Gestion\Constants\BddConstant;
use OCA\Gestion\Helpers\FileExportHelpers; use OCA\Gestion\Helpers\FileExportHelpers;
use OCA\Gestion\Constants\AbsenceTypeConstant; use OCA\Gestion\Constants\AbsenceTypeConstant;
class ExportThanatoStatisticService class ExportThanatoStatisticService {
{
/** @var Bdd */ /** @var Bdd */
private $gestionBdd; private $gestionBdd;
@ -51,45 +50,43 @@ class ExportThanatoStatisticService
Bdd $gestionBdd, Bdd $gestionBdd,
LoggerInterface $logger, LoggerInterface $logger,
IRootFolder $rootFolder, IRootFolder $rootFolder,
GeoService $geoService GeoService $geoService) {
) {
$this->geoService = $geoService; $this->geoService = $geoService;
$this->rootFolder = $rootFolder; $this->rootFolder = $rootFolder;
$this->logger = $logger; $this->logger = $logger;
$this->gestionBdd = $gestionBdd; $this->gestionBdd = $gestionBdd;
} }
private function getFilename($thanatoName, $thanatoLastName, $month, $year) private function getFilename($thanatoName,$thanatoLastName,$month,$year){
{
$filename = "$year-$month-"; $filename = "$year-$month-";
$filename .= $thanatoName . '-' . $thanatoLastName; $filename .= $thanatoName . '-' . $thanatoLastName;
$filename = str_replace(' ', '-', $filename); $filename = str_replace(' ','-', $filename);
$filename = str_replace('&nbsp;', '-', $filename); $filename = str_replace('&nbsp;','-', $filename);
return $filename; return $filename;
} }
private function exportThanatoStatistic($thanatoId, $month, $year, $idNextcloud) private function exportThanatoStatistic($thanatoId,$month,$year,$idNextcloud){
{
$thanato = $this->gestionBdd->getThanatoById($thanatoId); $thanato = $this->gestionBdd->getThanatoById($thanatoId);
if($thanato == null) { if($thanato == null){
return null; return null;
} }
$exportData = $this->gestionBdd->getExportThanatoStatisticData($thanatoId, $month, $year); $exportData = $this->gestionBdd->getExportThanatoStatisticData($thanatoId,$month,$year);
if(empty($exportData)) { if(empty($exportData)){
return null; return null;
} }
$defaultConfig = json_decode($this->gestionBdd->getConfiguration(BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD)); $defaultConfig = json_decode($this->gestionBdd->getConfiguration(BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD));
$racineFolder = html_entity_decode($defaultConfig[0]->path).'/'; $racineFolder = html_entity_decode($defaultConfig[0]->path).'/';
$thanatoFolder = $racineFolder.'STATISTIQUES/THANATOS/'; $thanatoFolder = $racineFolder.'STATISTIQUES/THANATOS/';
$fileHeader = $this->getExportThanatoFileHeader(); $fileHeader = $this->getExportThanatoFileHeader();
$fileContent = $this->populateExportDataIntoFileContent($exportData, $fileHeader); $fileContent = $this->populateExportDataIntoFileContent($exportData,$fileHeader);
$storage = $this->rootFolder->getUserFolder($idNextcloud); $storage = $this->rootFolder->getUserFolder($idNextcloud);
try { try{
$storage->newFolder($thanatoFolder); $storage->newFolder($thanatoFolder);
} catch(\OCP\Files\NotPermittedException $e) { }
catch(\OCP\Files\NotPermittedException $e) {
} }
$filename = $this->getFilename($thanato["nom"], $thanato["prenom"], $month, $year); $filename = $this->getFilename($thanato["nom"],$thanato["prenom"],$month,$year);
$fileNamePath = $thanatoFolder."STAT-THANATO-" . $filename . '.csv'; $fileNamePath = $thanatoFolder."STAT-THANATO-" . $filename . '.csv';
$storage->newFile($fileNamePath); $storage->newFile($fileNamePath);
$file = $storage->get($fileNamePath); $file = $storage->get($fileNamePath);
@ -97,22 +94,20 @@ class ExportThanatoStatisticService
return $fileNamePath; return $fileNamePath;
} }
public function exportThanatosListStatistic(array $thanatoIds, $month, $year, $idNextcloud) public function exportThanatosListStatistic(array $thanatoIds,$month,$year,$idNextcloud){
{
$filenames = []; $filenames = [];
foreach($thanatoIds as $thanatoId) { foreach($thanatoIds as $thanatoId){
$filename = $this->exportThanatoStatistic($thanatoId, $month, $year, $idNextcloud); $filename = $this->exportThanatoStatistic($thanatoId,$month,$year,$idNextcloud);
if($filename != null) { if($filename != null){
$filenames[] = $filename; $filenames[] = $filename;
} }
} }
return $filenames; return $filenames;
} }
public function getExportThanatoFileHeader(): string public function getExportThanatoFileHeader(): string{
{
$fileHeader = $fileHeader =
'DEVIS'.';'. 'FACTURE'.';'.
'THANATOPRACTEUR'.';'. 'THANATOPRACTEUR'.';'.
'DATE'.';'. 'DATE'.';'.
'HEURE DE DEBUT'.';'. 'HEURE DE DEBUT'.';'.
@ -138,23 +133,20 @@ class ExportThanatoStatisticService
return $fileHeader; return $fileHeader;
} }
private function populateNoDevisDataInADay(string $fileContent, $leave) private function populateNoDevisDataInADay(string $fileContent,$leave){
{
$startTimeValue = ""; $startTimeValue = "";
$endTimeValue = ""; $endTimeValue = "";
$leaveValue = "Non"; $leaveValue = "Non";
$restValue = "Non"; // AJOUTER CETTE LIGNE if($leave["onLeave"]){
$diseaseValue = "Non"; // AJOUTER CETTE LIGNE
if($leave["onLeave"]) {
$startTimeValue = $leave["startTime"]; $startTimeValue = $leave["startTime"];
$endTimeValue = $leave["endTime"]; $endTimeValue = $leave["endTime"];
if($leave["absenceTypeKey"] == AbsenceTypeConstant::LEAVE) { if($leave["absenceTypeKey"] == AbsenceTypeConstant::LEAVE){
$leaveValue = "Oui"; $leaveValue = "Oui";
} }
if($leave["absenceTypeKey"] == AbsenceTypeConstant::DISEASE) { if($leave["absenceTypeKey"] == AbsenceTypeConstant::DISEASE){
$diseaseValue = "Oui"; $diseaseValue = "Oui";
} }
if($leave["absenceTypeKey"] == AbsenceTypeConstant::REST) { if($leave["absenceTypeKey"] == AbsenceTypeConstant::REST){
$restValue = "Oui"; $restValue = "Oui";
} }
} }
@ -184,8 +176,7 @@ class ExportThanatoStatisticService
return $fileContent; return $fileContent;
} }
public function populateExportDataIntoFileContent(array $exportData, string $fileContent): string public function populateExportDataIntoFileContent(array $exportData,string $fileContent): string{
{
$g_totalDistance = 0; $g_totalDistance = 0;
$g_totalDevisHours = 0; $g_totalDevisHours = 0;
@ -196,7 +187,7 @@ class ExportThanatoStatisticService
$g_totalRestHours = 0; $g_totalRestHours = 0;
$g_totalDevisCount = 0; $g_totalDevisCount = 0;
foreach($exportData as $devisDate => $devisData) { foreach($exportData as $devisDate => $devisData){
$totalDevisHours = 0; $totalDevisHours = 0;
$totalWorkedHours = 8; $totalWorkedHours = 8;
$totalLeaveHours = 0; $totalLeaveHours = 0;
@ -206,26 +197,27 @@ class ExportThanatoStatisticService
$totalDevisCount = 0; $totalDevisCount = 0;
$totalTravelingHoursBetweenDevisLocation = 0; $totalTravelingHoursBetweenDevisLocation = 0;
$hasDevisInTheCurrentDate = $devisData['hasDevis']; $hasDevisInTheCurrentDate = $devisData['hasDevis'];
if($hasDevisInTheCurrentDate === false) { if($hasDevisInTheCurrentDate === false){
$leaves = $devisData["leaves"]; $leaves = $devisData["leaves"];
foreach($leaves as $leave) { foreach($leaves as $leave){
$fileContent = $this->populateNoDevisDataInADay($fileContent, $leave); $fileContent = $this->populateNoDevisDataInADay($fileContent,$leave);
if($leave["onLeave"]) { if($leave["onLeave"]){
$totalLeaveHoursInsideWorkingHours = $leave["totalWorkedHours"]; $totalLeaveHoursInsideWorkingHours = $leave["totalWorkedHours"];
if($leave["absenceTypeKey"] == AbsenceTypeConstant::LEAVE) { if($leave["absenceTypeKey"] == AbsenceTypeConstant::LEAVE ){
$totalLeaveHours += $totalLeaveHoursInsideWorkingHours; $totalLeaveHours += $totalLeaveHoursInsideWorkingHours;
} }
if($leave["absenceTypeKey"] == AbsenceTypeConstant::REST) { if($leave["absenceTypeKey"] == AbsenceTypeConstant::REST){
$totalRestHours += $totalLeaveHoursInsideWorkingHours; $totalRestHours += $totalLeaveHoursInsideWorkingHours;
} }
if($leave["absenceTypeKey"] == AbsenceTypeConstant::DISEASE) { if($leave["absenceTypeKey"] == AbsenceTypeConstant::DISEASE){
$totalDiseaseHours += $totalLeaveHoursInsideWorkingHours; $totalDiseaseHours += $totalLeaveHoursInsideWorkingHours;
} }
} }
} }
$totalAbsenceHours = $totalLeaveHours + $totalRestHours + $totalDiseaseHours; $totalAbsenceHours = $totalLeaveHours + $totalRestHours + $totalDiseaseHours;
$totalWorkedHours -= $totalAbsenceHours; $totalWorkedHours -= $totalAbsenceHours;
} else { }
else{
$totalDevisCount += count($devisData["devisId"]); $totalDevisCount += count($devisData["devisId"]);
$routeLines = $this->gestionBdd->getRouteLinesByDevisIdList($devisData["devisId"]); $routeLines = $this->gestionBdd->getRouteLinesByDevisIdList($devisData["devisId"]);
$totalDistanceAndTotalTravelingHoursBetweenDevis = $this->geoService->getTotalDistanceAndTotalTravelingHoursBetweenDevisLocationByRouteLines($routeLines); $totalDistanceAndTotalTravelingHoursBetweenDevis = $this->geoService->getTotalDistanceAndTotalTravelingHoursBetweenDevisLocationByRouteLines($routeLines);
@ -233,23 +225,23 @@ class ExportThanatoStatisticService
$totalTravelingHoursBetweenDevisLocation = $totalDistanceAndTotalTravelingHoursBetweenDevis["totalTravelingHours"]; $totalTravelingHoursBetweenDevisLocation = $totalDistanceAndTotalTravelingHoursBetweenDevis["totalTravelingHours"];
$devisList = $devisData["devis"]; $devisList = $devisData["devis"];
$leaves = $devisData["leaves"]; $leaves = $devisData["leaves"];
if(!empty($devisList)) { if(!empty($devisList)){
foreach($devisList as $devis) { foreach($devisList as $devis){
$fileContent = $this->populateDevisDataIntoThanatoExportFileContent($fileContent, $devis); $fileContent = $this->populateDevisDataIntoThanatoExportFileContent($fileContent,$devis);
$totalDevisHours += $devis["totalHours"]; $totalDevisHours += $devis["totalHours"];
} }
} }
foreach($leaves as $leave) { foreach($leaves as $leave){
$fileContent = $this->populateNoDevisDataInADay($fileContent, $leave); $fileContent = $this->populateNoDevisDataInADay($fileContent,$leave);
if($leave["onLeave"]) { if($leave["onLeave"]){
$totalLeaveHoursInsideWorkingHours = $leave["totalWorkedHours"]; $totalLeaveHoursInsideWorkingHours = $leave["totalWorkedHours"];
if($leave["absenceTypeKey"] == AbsenceTypeConstant::LEAVE) { if($leave["absenceTypeKey"] == AbsenceTypeConstant::LEAVE){
$totalLeaveHours += $totalLeaveHoursInsideWorkingHours; $totalLeaveHours += $totalLeaveHoursInsideWorkingHours;
} }
if($leave["absenceTypeKey"] == AbsenceTypeConstant::REST) { if($leave["absenceTypeKey"] == AbsenceTypeConstant::REST){
$totalRestHours += $totalLeaveHoursInsideWorkingHours; $totalRestHours += $totalLeaveHoursInsideWorkingHours;
} }
if($leave["absenceTypeKey"] == AbsenceTypeConstant::DISEASE) { if($leave["absenceTypeKey"] == AbsenceTypeConstant::DISEASE){
$totalDiseaseHours += $totalLeaveHoursInsideWorkingHours; $totalDiseaseHours += $totalLeaveHoursInsideWorkingHours;
} }
} }
@ -266,8 +258,7 @@ class ExportThanatoStatisticService
$totalLeaveHours, $totalLeaveHours,
$totalTravelingHoursBetweenDevisLocation, $totalTravelingHoursBetweenDevisLocation,
$totalDiseaseHours, $totalDiseaseHours,
$totalRestHours, $totalRestHours,$totalDevisCount
$totalDevisCount
); );
$g_totalDistance += $totalDistance; $g_totalDistance += $totalDistance;
@ -288,15 +279,13 @@ class ExportThanatoStatisticService
$g_totalLeaveHours, $g_totalLeaveHours,
$g_totalTravelingHoursBetweenDevisLocation, $g_totalTravelingHoursBetweenDevisLocation,
$g_totalDiseaseHours, $g_totalDiseaseHours,
$g_totalRestHours, $g_totalRestHours,$g_totalDevisCount
$g_totalDevisCount
); );
return $fileContent; return $fileContent;
} }
private function populateLastRecapForTheLine(string $fileContent, $distance, $totalDevisHours, $totalWorkedHours, $totalLeaveHours, $totalTravelingHours, $totalDiseaseHours = 0, $totalRestHours = 0, $totalDevisCount = 0) private function populateLastRecapForTheLine(string $fileContent,$distance,$totalDevisHours,$totalWorkedHours,$totalLeaveHours,$totalTravelingHours ,$totalDiseaseHours = 0,$totalRestHours = 0,$totalDevisCount = 0){
{
$fileContent = $fileContent. $fileContent = $fileContent.
''.';'. ''.';'.
''.';'. ''.';'.
@ -323,8 +312,7 @@ class ExportThanatoStatisticService
return $fileContent; return $fileContent;
} }
private function getFormatDevisProduitsAsString($devisProduits) private function getFormatDevisProduitsAsString($devisProduits){
{
$result = ''; $result = '';
foreach ($devisProduits as $produit) { foreach ($devisProduits as $produit) {
$result .= $produit['produit_reference'] . '-' . $produit['produit_description'] . '--'; $result .= $produit['produit_reference'] . '-' . $produit['produit_description'] . '--';
@ -334,8 +322,7 @@ class ExportThanatoStatisticService
return $result; return $result;
} }
private function populateDevisDataIntoThanatoExportFileContentSave(string $fileContent, array $devis) private function populateDevisDataIntoThanatoExportFileContent(string $fileContent,array $devis){
{
$produitAsString = $this->getFormatDevisProduitsAsString($devis["produits"]); $produitAsString = $this->getFormatDevisProduitsAsString($devis["produits"]);
$factureNum = $devis["facture_num"] ?? $devis["facture_on_group_num"] ?? ""; $factureNum = $devis["facture_num"] ?? $devis["facture_on_group_num"] ?? "";
$fileContent = $fileContent. $fileContent = $fileContent.
@ -365,36 +352,4 @@ class ExportThanatoStatisticService
return $fileContent; return $fileContent;
} }
private function populateDevisDataIntoThanatoExportFileContent(string $fileContent, array $devis)
{
$produitAsString = $this->getFormatDevisProduitsAsString($devis["produits"]);
$devisNum = (string)($devis["calendar_uuid"] ?? "");
$fileContent = $fileContent.
FileExportHelpers::FormatTextForExport($devisNum).';'.
FileExportHelpers::FormatTextForExport(($devis['nom_thanato'] ?? '') . ' ' . ($devis['prenom_thanato'] ?? '')).';'.
FileExportHelpers::FormatTextForExport($devis["date"] ?? "").';'.
FileExportHelpers::FormatTextForExport($devis["startTime"] ?? "").';'.
FileExportHelpers::FormatTextForExport($devis["endTime"] ?? "").';'.
FileExportHelpers::FormatTextForExport($produitAsString).';'.
FileExportHelpers::FormatTextForExport($devis["dayType"] ?? "").';'.
'Non'.';'.
''.';'.
''.';'.
FileExportHelpers::FormatTextForExport($devis["nom_defunt"] ?? "").';'. // ICI
FileExportHelpers::FormatTextForExport($devis["nom_lieu"] ?? "").';'.
FileExportHelpers::FormatTextForExport($devis["nom_client"] ?? "").';'.
FileExportHelpers::FormatTextForExport($devis["client_adresse"] ?? "").';'.
''.';'.
''.';'.
''.';'.
''.';'.
''.';'.
''.';'.
''.';'.
''.';'."\n";
return $fileContent;
}
} }

110
gestion/lib/Service/GeoService.php
View File

@ -30,31 +30,28 @@ use Exception;
use OCA\Gestion\Constants\GeoConstant; use OCA\Gestion\Constants\GeoConstant;
use OCA\Gestion\Helpers\GeoHelpers; use OCA\Gestion\Helpers\GeoHelpers;
class GeoService class GeoService {
{
public function __construct() public function __construct() {
{
} }
/** /**
* Calcul la distance entre les deux points à vol d'oiseau * Calcul la distance entre les deux points à vol d'oiseau
*/ */
private function getDistanceInKmBetweenTwoPoints($lat1, $lon1, $lat2, $lon2) private function getDistanceInKmBetweenTwoPoints($lat1, $lon1, $lat2, $lon2) {
{
$R = 6371; // Rayon moyen de la Terre en kilomètres $R = 6371; // Rayon moyen de la Terre en kilomètres
$dLat = deg2rad($lat2 - $lat1); $dLat = deg2rad($lat2 - $lat1);
$dLon = deg2rad($lon2 - $lon1); $dLon = deg2rad($lon2 - $lon1);
$a = sin($dLat / 2) * sin($dLat / 2) + cos(deg2rad($lat1)) * cos(deg2rad($lat2)) * sin($dLon / 2) * sin($dLon / 2); $a = sin($dLat/2) * sin($dLat/2) + cos(deg2rad($lat1)) * cos(deg2rad($lat2)) * sin($dLon/2) * sin($dLon/2);
$c = 2 * atan2(sqrt($a), sqrt(1 - $a)); $c = 2 * atan2(sqrt($a), sqrt(1-$a));
$d = $R * $c; $d = $R * $c;
return round($d, 2); return round($d, 2);
} }
private function getTravelingHourBetweenTwoPoints(array $origin, array $destination, $mode = "driving") private function getTravelingHourBetweenTwoPoints(array $origin,array $destination,$mode = "driving"){
{
$baseUrl = "https://api.geoapify.com/v1/routing"; $baseUrl = "https://api.geoapify.com/v1/routing";
$originPoints = GeoHelpers::getPointsTextFromLatitudeAndLongitude($origin["latitude"], $origin["longitude"]); $originPoints = GeoHelpers::getPointsTextFromLatitudeAndLongitude($origin["latitude"],$origin["longitude"]);
$destinationPoints = GeoHelpers::getPointsTextFromLatitudeAndLongitude($destination["latitude"], $destination["longitude"]); $destinationPoints = GeoHelpers::getPointsTextFromLatitudeAndLongitude($destination["latitude"],$destination["longitude"]);
$fullUrl = $baseUrl."?waypoints=$originPoints|$destinationPoints&mode=$mode&apiKey=9e23d93e7f454c988344f9171bf867aa"; $fullUrl = $baseUrl."?waypoints=$originPoints|$destinationPoints&mode=$mode&apiKey=9e23d93e7f454c988344f9171bf867aa";
$curl = curl_init(); $curl = curl_init();
@ -82,39 +79,39 @@ class GeoService
$travelTimeHours = round($travelTimeHours, 2); $travelTimeHours = round($travelTimeHours, 2);
return $travelTimeHours; return $travelTimeHours;
} }
} catch(Exception $e) { }
catch(Exception $e){
return 0; return 0;
} }
} }
public function getTotalDistanceAndTotalTravelingHoursBetweenDevisLocationByRouteLinesSave(array $routeLines) public function getTotalDistanceAndTotalTravelingHoursBetweenDevisLocationByRouteLines(array $routeLines){
{
$distanceCumul = 0; $distanceCumul = 0;
$totalTravelingHoursBetweenTwoDevisLocation = 0; $totalTravelingHoursBetweenTwoDevisLocation = 0;
$lastPoint = null; $lastPoint = NULL;
for ($i = 0; $i < sizeof($routeLines); $i++) { for ($i=0; $i < sizeof($routeLines); $i++) {
$currentDistance = 0; $currentDistance = 0;
if($routeLines[$i]['lieu_id'] != null) { if($routeLines[$i]['lieu_id'] != NULL){
$lastPoint = $routeLines[$i]; $lastPoint = $routeLines[$i];
} }
if($lastPoint['lieu_id'] != null && $routeLines[$i + 1]['lieu_id'] != null) { if($lastPoint['lieu_id'] != NULL && $routeLines[$i+1]['lieu_id'] != NULL){
$currentDistance = $this->getDistanceInKmBetweenTwoPoints( $currentDistance = $this->getDistanceInKmBetweenTwoPoints(
floatval(value: $lastPoint['latitude']), floatval(value: $lastPoint['latitude']),
floatval($lastPoint['longitude']), floatval($lastPoint['longitude']),
floatval($routeLines[$i + 1]['latitude']), floatval($routeLines[$i+1]['latitude']),
floatval($routeLines[$i + 1]['longitude']) floatval($routeLines[$i+1]['longitude'])
); );
$targetIsBetweenTwoDevisLocation = $lastPoint['source'] != "siege" && $routeLines[$i + 1]["source"] != "siege"; $targetIsBetweenTwoDevisLocation = $lastPoint['source'] != "siege" && $routeLines[$i+1]["source"] != "siege";
if($targetIsBetweenTwoDevisLocation) { if($targetIsBetweenTwoDevisLocation){
$originPoints = [ $originPoints = [
"latitude" => $lastPoint["latitude"], "latitude" => $lastPoint["latitude"],
"longitude" => $lastPoint["longitude"] "longitude" => $lastPoint["longitude"]
]; ];
$destinationPoints = [ $destinationPoints = [
"latitude" => $routeLines[$i + 1]["latitude"], "latitude" => $routeLines[$i+1]["latitude"],
"longitude" => $routeLines[$i + 1]["longitude"] "longitude" => $routeLines[$i+1]["longitude"]
]; ];
$totalTravelingHoursBetweenTwoDevisLocation += $this->getTravelingHourBetweenTwoPoints( $totalTravelingHoursBetweenTwoDevisLocation+= $this->getTravelingHourBetweenTwoPoints(
$originPoints, $originPoints,
$destinationPoints, $destinationPoints,
GeoConstant::DRIVING_MODE GeoConstant::DRIVING_MODE
@ -128,65 +125,4 @@ class GeoService
"totalTravelingHours" => $totalTravelingHoursBetweenTwoDevisLocation "totalTravelingHours" => $totalTravelingHoursBetweenTwoDevisLocation
]; ];
} }
public function getTotalDistanceAndTotalTravelingHoursBetweenDevisLocationByRouteLines(array $routeLines)
{
$distanceCumul = 0;
$totalTravelingHoursBetweenTwoDevisLocation = 0;
$lastPoint = null;
for ($i = 0; $i < sizeof($routeLines); $i++) {
$currentDistance = 0;
// Vérifier que l'élément actuel existe
if(!isset($routeLines[$i])) {
continue;
}
if($routeLines[$i]['lieu_id'] != null) {
$lastPoint = $routeLines[$i];
}
// Vérifier que $i+1 existe ET que $lastPoint n'est pas null
if($lastPoint !== null &&
isset($routeLines[$i + 1]) &&
isset($lastPoint['lieu_id']) &&
isset($routeLines[$i + 1]['lieu_id']) &&
$lastPoint['lieu_id'] != null &&
$routeLines[$i + 1]['lieu_id'] != null) {
$currentDistance = $this->getDistanceInKmBetweenTwoPoints(
floatval($lastPoint['latitude']),
floatval($lastPoint['longitude']),
floatval($routeLines[$i + 1]['latitude']),
floatval($routeLines[$i + 1]['longitude'])
);
$targetIsBetweenTwoDevisLocation = $lastPoint['source'] != "siege" && $routeLines[$i + 1]["source"] != "siege";
if($targetIsBetweenTwoDevisLocation) {
$originPoints = [
"latitude" => $lastPoint["latitude"],
"longitude" => $lastPoint["longitude"]
];
$destinationPoints = [
"latitude" => $routeLines[$i + 1]["latitude"],
"longitude" => $routeLines[$i + 1]["longitude"]
];
$totalTravelingHoursBetweenTwoDevisLocation += $this->getTravelingHourBetweenTwoPoints(
$originPoints,
$destinationPoints,
GeoConstant::DRIVING_MODE
);
}
}
$distanceCumul += $currentDistance;
}
return [
"totalDistance" => round($distanceCumul, 2),
"totalTravelingHours" => round($totalTravelingHoursBetweenTwoDevisLocation, 2)
];
}
} }

12
gestion/src/js/defuntShow.js
View File

@ -4,7 +4,7 @@ import "datatables.net-dt/css/jquery.dataTables.css";
import "../css/mycss.css"; import "../css/mycss.css";
import "./listener/main_listener"; import "./listener/main_listener";
import { getBibliotheques, exportCareCertificate,getBijouxById, getHypodermiquesyId, getObservationsById, getproduits, saveAttestationPacemaker, saveAttestationAbsentPacemaker, saveRapportBijoux, saveRapportSoin, setBijouxPhoto, setDefuntCover, setDefuntPacemakerPhoto, updateDB } from "./modules/ajaxRequest.mjs"; import { getBibliotheques, exportCareCertificate,getBijouxById, getHypodermiquesyId, getObservationsById, getproduits, saveAttestationPacemaker, saveRapportBijoux, saveRapportSoin, setBijouxPhoto, setDefuntCover, setDefuntPacemakerPhoto, updateDB } from "./modules/ajaxRequest.mjs";
import { globalConfiguration } from "./modules/mainFunction.mjs"; import { globalConfiguration } from "./modules/mainFunction.mjs";
let bibliotheques = []; let bibliotheques = [];
@ -77,7 +77,6 @@ window.addEventListener("DOMContentLoaded", function () {
}); });
var pacemakerBtn = document.getElementById("pacemakerBtn"); var pacemakerBtn = document.getElementById("pacemakerBtn");
var pacemakerAbsentBtn = document.getElementById("pacemakerAbsentBtn");
var rapportSoinBtn = document.getElementById("rapportSoinBtn"); var rapportSoinBtn = document.getElementById("rapportSoinBtn");
var exportCareCertificateButton = document.getElementById("exportCareCertificate"); var exportCareCertificateButton = document.getElementById("exportCareCertificate");
var setDefuntCoverButton = this.document.getElementById("coverProductsSetButton"); var setDefuntCoverButton = this.document.getElementById("coverProductsSetButton");
@ -145,9 +144,6 @@ window.addEventListener("DOMContentLoaded", function () {
case 'pacemaker': case 'pacemaker':
saveAttestationPacemaker({ defuntId: defuntid ,email: isSendEmail ? email: ''}); saveAttestationPacemaker({ defuntId: defuntid ,email: isSendEmail ? email: ''});
break; break;
case 'pacemakerAbsent':
saveAttestationAbsentPacemaker({ defuntId: defuntid ,email: isSendEmail ? email: ''});
break;
case 'rapport-soin': case 'rapport-soin':
saveRapportSoin({ numdefunt: defuntid ,email: isSendEmail ? email: ''}); saveRapportSoin({ numdefunt: defuntid ,email: isSendEmail ? email: ''});
break; break;
@ -186,12 +182,6 @@ window.addEventListener("DOMContentLoaded", function () {
modalElement.modal('show') modalElement.modal('show')
// saveAttestationPacemaker({ defuntId: defuntid }); // saveAttestationPacemaker({ defuntId: defuntid });
}); });
pacemakerAbsentBtn.addEventListener("click", function(){
modalTitle.text("Générer l'attestation d'absence pacemaker")
modalElement.data('export-type', 'pacemakerAbsent')
modalElement.modal('show')
// saveAttestationPacemaker({ defuntId: defuntid });
});
rapportSoinBtn.addEventListener("click", function(){ rapportSoinBtn.addEventListener("click", function(){
modalElement.data('export-type', 'rapport-soin') modalElement.data('export-type', 'rapport-soin')

25
gestion/src/js/modules/ajaxRequest.mjs
View File

@ -678,31 +678,6 @@ export function saveAttestationPacemaker(myData) {
}); });
}; };
/**
* Save pdf in nextcloud
* @param {*} myData
*/
export function saveAttestationAbsentPacemaker(myData) {
showLoader();
$.ajax({
url: baseUrl + '/saveAttestationAbsentPacemaker',
type: 'POST',
contentType: 'application/json',
data: JSON.stringify(myData)
}).done(function (response) {
if(!response) {
showMessage('Ce defunt n\'appartient à aucun devis.');
} else {
showSuccess('Sauvegardé dans '+ response);
}
}).fail(function (response, code) {
showMessage(t('gestion', 'Erreur dans la génération d\'attestation pacemaker'));
}).always(function () {
hideLoader();
});
};
/** /**
* Save pdf in nextcloud * Save pdf in nextcloud
* @param {*} myData * @param {*} myData

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

@ -30,7 +30,6 @@ $coverProducts = $_['coverProducts'];
<div class="div"> <div class="div">
<button id="exportCareCertificate" class="btn btn-secondary" type="button">Générer l'attestation de soins</button> <button id="exportCareCertificate" class="btn btn-secondary" type="button">Générer l'attestation de soins</button>
<button id="pacemakerBtn" class="btn btn-secondary" type="button">Générer l'attestation retrait de pile</button> <button id="pacemakerBtn" class="btn btn-secondary" type="button">Générer l'attestation retrait de pile</button>
<button id="pacemakerAbsentBtn" class="btn btn-secondary" type="button">Générer l'attestation d'Absence de Pacemacker</button>
<button id="rapportSoinBtn" class="btn btn-secondary" type="button">Générer le rapport de soins</button> <button id="rapportSoinBtn" class="btn btn-secondary" type="button">Générer le rapport de soins</button>
<button id="showRapportBijouxExportModal" class="btn btn-secondary" type="button" data-toggle="modal" data-target="#saveRapportBijouxModal">Générer le rapport des bijoux</button> <button id="showRapportBijouxExportModal" class="btn btn-secondary" type="button" data-toggle="modal" data-target="#saveRapportBijouxModal">Générer le rapport des bijoux</button>
</div> </div>