slambert/Thanasoft-H2F
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' into 'production'

Browse Source 
Staging fixe attestation

See merge request sottye/h2f!2
This commit is contained in:
narindra RAZAFIMANDIMBY 2025-04-28 13:22:14 +00:00
commit 821ce6270f
10 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/js/calendar-dashboard.js
View File

File diff suppressed because one or more lines are too long

2
calendar/js/calendar-dashboard.js.map
View File

File diff suppressed because one or more lines are too long

4
calendar/js/calendar-main.js
View File

File diff suppressed because one or more lines are too long

2
calendar/js/calendar-main.js.map
View File

File diff suppressed because one or more lines are too long

4
calendar/js/calendar-reference.js
View File

File diff suppressed because one or more lines are too long

2
calendar/js/calendar-reference.js.map
View File

File diff suppressed because one or more lines are too long

4
calendar/js/calendar-src_store_index_js.js
View File

File diff suppressed because one or more lines are too long

2
calendar/js/calendar-src_store_index_js.js.map
View File

File diff suppressed because one or more lines are too long

5
calendar/src/store/calendarObjects.js
View File

@ -253,15 +253,14 @@ const actions = {
const foldedComment = foldICSLines(escapedComment) const foldedComment = foldICSLines(escapedComment)
let newCommentKeyValue = "COMMENT:"+foldedComment; let newCommentKeyValue = "COMMENT:"+foldedComment;
//let regex = /COMMENT:[^\s]+/; let regex = /^COMMENT:.*(?:\r?\n [^\n]*)*/m;
let regex = /^COMMENT:.*$/m;
if(regex.test(icsValue)){ if(regex.test(icsValue)){
icsValue = icsValue.replace(regex, newCommentKeyValue); icsValue = icsValue.replace(regex, newCommentKeyValue);
} }
else{ else{
const customKeyValue = { const customKeyValue = {
"COMMENT": foldedComment "COMMENT": foldedComment
}; }
icsValue = setCustomKeyValuesArrayToIcsAndReturnIcs(icsValue,customKeyValue); icsValue = setCustomKeyValuesArrayToIcsAndReturnIcs(icsValue,customKeyValue);
} }
} }

4
gestion/lib/Service/Certificate/PdfHandler/CareCertificatePdfHandler.php
View File

@ -87,13 +87,13 @@ class CareCertificatePdfHandler extends FPDF {
$this->SetFont('Arial', '', 14); $this->SetFont('Arial', '', 14);
$this->MultiCell(0,7, FileExportHelpers::FormatTextForExport('Employé au sein de notre société et titulaire du diplôme national de Thanatopracteur a effectué des soins de conservation sur le corps du défunt:')); $this->MultiCell(0,7, FileExportHelpers::FormatTextForExport('Employé au sein de notre société et titulaire du diplôme national de Thanatopracteur a effectué des soins de conservation sur le corps du défunt:'));
$this->SetFont('Arial', 'B', 14); $this->SetFont('Arial', 'B', 14);
$this->Cell(0,12, 'Mr/Mme '.$this->devisOfDefunt['defunt_nom'],0,1); $this->Cell(0,12, 'Mr/Mme '. FileExportHelpers::FormatTextForExport($this->devisOfDefunt['defunt_nom']),0,1);
$this->SetFont('Arial', '', 14); $this->SetFont('Arial', '', 14);
$this->Cell(0,12, FileExportHelpers::FormatTextForExport("Qui reposait à l'adresse suivante") . ': ',0,1); $this->Cell(0,12, FileExportHelpers::FormatTextForExport("Qui reposait à l'adresse suivante") . ': ',0,1);
$this->SetFont('Arial', 'B', 14); $this->SetFont('Arial', 'B', 14);
$this->Cell(0,12, FileExportHelpers::FormatTextForExport($this->devisOfDefunt['location_of_devis']),0,1); $this->Cell(0,12, FileExportHelpers::FormatTextForExport($this->devisOfDefunt['location_of_devis']),0,1);
$this->SetFont('Arial', '', 14); $this->SetFont('Arial', '', 14);
$this->Cell(0,12, FileExportHelpers::FormatTextForExport("La présente attestion est établie pour faire valoir ce que de droit."),0,5); $this->Cell(0,12, FileExportHelpers::FormatTextForExport("La présente attestation est établie pour faire valoir ce que de droit."),0,5);
$this->Ln(5); $this->Ln(5);
$this->Cell(0,12,FileExportHelpers::FormatTextForExport('Fait à '). FileExportHelpers::FormatTextForExport($this->devisOfDefunt['configuration']->adresse)); $this->Cell(0,12,FileExportHelpers::FormatTextForExport('Fait à '). FileExportHelpers::FormatTextForExport($this->devisOfDefunt['configuration']->adresse));
$this->SetX(150); $this->SetX(150);