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

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

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

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

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

2
gestion/src/js/objects/lieu.mjs
View File

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