finish : calendar share , lieu id , WIP soins in export thanato

This commit is contained in:
Tiavina 2024-12-27 17:35:31 +03:00
parent 762917593a
commit 4e27436b11
22 changed files with 23 additions and 23 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1779,7 +1779,7 @@ class Bdd {
private function setDevisIsWeekendOrNotText($devis){
$isWeekend = DateHelpers::isWeekend($devis['date']);
$value = $isWeekend ? "Férié" : "J";
$value = $isWeekend ? "Ferie" : "J";
$devis["dayType"] = $value;
return $devis;
}

View File

@ -49,8 +49,8 @@ class ExportThanatoStatisticService {
'Date'.';'.
'Heure Debut'.';'.
'Heure Fin'.';'.
utf8_decode(html_entity_decode('Jour/Férié')).';'.
'Nom et Prenoms'.';'.
utf8_decode(html_entity_decode('Jour/Ferie')).';'.
utf8_decode(html_entity_decode('Nom et Prénom')).';'.
'Lieu'.';'.
'Pompe funebre'.';'.
'Pompe funebre adresse'.';'.

View File

@ -21,7 +21,7 @@ export class Lieu {
*/
getDTRow() {
let myrow = [
'<div>' + this.user_id + '</div>',
'<div>' + this.id + '</div>',
'<div class="editable" data-table="lieu" data-column="nom" data-id="' + this.id + '" style="display:inline">' + this.nom + '</div>',
'<div class="editable" data-table="lieu" data-column="adresse" data-id="' + this.id + '" style="display:inline">' + this.adresse + '</div>',
'<div class="editable" data-table="lieu" data-column="latitude" data-id="' + this.id + '" style="display:inline">' + this.latitude + '</div>',