loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Fix widget stampa calendario

This commit is contained in:
pek5892 2024-06-06 11:20:30 +02:00
parent ec3272fb78
commit eebe5e2ddd
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
templates/dashboard/body.php
View File

@ -78,7 +78,8 @@ $stati = (array) $calendar['idstatiintervento'];
$tipi = (array) $calendar['idtipiintervento'];
$tecnici = (array) $calendar['idtecnici'];
$query = "SELECT
$query = "
SELECT
DATE(`orario_inizio`) AS data,
`an_anagrafiche`.`ragione_sociale` AS anagrafica,
GROUP_CONCAT(DISTINCT `tecnico`.`ragione_sociale` SEPARATOR ', ') AS tecnico
@ -86,7 +87,7 @@ $query = "SELECT
`in_interventi_tecnici`
INNER JOIN `in_interventi` ON `in_interventi_tecnici`.`idintervento`=`in_interventi`.`id`
INNER JOIN `an_anagrafiche` ON `in_interventi`.`idanagrafica`=`an_anagrafiche`.`idanagrafica`
LEFT JOIN `an_anagrafiche AS tecnico ON `in_interventi_tecnici`.`idtecnico`=`tecnico`.`idanagrafica`
LEFT JOIN `an_anagrafiche` AS tecnico ON `in_interventi_tecnici`.`idtecnico`=`tecnico`.`idanagrafica`
INNER JOIN `in_statiintervento` ON `in_interventi`.`idstatointervento`=`in_statiintervento`.`id`
WHERE
".$where.'
@ -95,6 +96,7 @@ $query = "SELECT
`in_interventi_tecnici`.`idtipointervento` IN('.implode(',', $tipi).') '.Modules::getAdditionalsQuery('Interventi').'
GROUP BY
`in_interventi`.`id`, data';
$sessioni = $dbo->fetchArray($query);
$sessioni = collect($sessioni)->groupBy('data');
@ -154,7 +156,7 @@ for ($i = 0; $i < $count; $i = $i + 7) {
$element = $list[$i + $c];
echo '
<th>'.ucfirst($element['date']->isoFormat('MMMM YYYY')).'</th>';
<th>'.ucfirst($element['date']->translatedFormat('d/m')).'</th>';
}
echo '

2
templates/dashboard_settimanale/body.php
View File

@ -125,7 +125,7 @@ for ($i = 0; $i < $count; $i = $i + 7) {
$element = $list[$i + $c];
echo '
<div class="divCell" align="center">'.ucfirst($element['date']->isoFormat('MMMM YYYY')).'</div>';
<div class="divCell" align="center">'.ucfirst($element['date']->translatedFormat('d')).'</div>';
}
echo '