finish : calendar share , lieu id , WIP soins in export thanato
This commit is contained in:
parent
762917593a
commit
4e27436b11
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
@ -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;
|
||||
}
|
||||
|
||||
@ -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'.';'.
|
||||
|
||||
@ -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>',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user