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

Fix minore #1073

This commit is contained in:
Pek5892 2022-10-11 10:28:25 +02:00
parent 54fd0d0226
commit f5b15738a5
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/statistiche/edit.php
View File

@ -281,7 +281,34 @@ $tipi = $dbo->fetchArray('SELECT * FROM `in_tipiintervento`');
$dataset = '';
foreach ($tipi as $tipo) {
$interventi = $dbo->fetchArray('SELECT COUNT(*) AS result, YEAR(in_interventi.data_richiesta) AS year, MONTH(in_interventi.data_richiesta) AS month FROM in_interventi WHERE in_interventi.idtipointervento = '.prepare($tipo['idtipointervento']).' AND in_interventi.data_richiesta BETWEEN '.prepare($start).' AND '.prepare($end).' GROUP BY YEAR(in_interventi.data_richiesta), MONTH(in_interventi.data_richiesta) ORDER BY YEAR(in_interventi.data_richiesta) ASC, MONTH(in_interventi.data_richiesta) ASC');
$interventi = $dbo->fetchArray('SELECT
COUNT(in_interventi.id) AS result,
YEAR(sessioni.orario_fine) AS `year`,
MONTH(sessioni.orario_fine) AS `month`
FROM
in_interventi
LEFT JOIN(
SELECT
in_interventi_tecnici.idintervento,
MAX(orario_fine) AS orario_fine
FROM
in_interventi_tecnici
GROUP BY
idintervento
) sessioni
ON
in_interventi.id = sessioni.idintervento
WHERE
in_interventi.idtipointervento = '.prepare($tipo['idtipointervento']).' AND IFNULL(
sessioni.orario_fine,
in_interventi.data_richiesta
) BETWEEN '.prepare($start).' AND '.prepare($end).'
GROUP BY
YEAR(sessioni.orario_fine),
MONTH(sessioni.orario_fine)
ORDER BY
YEAR(sessioni.orario_fine) ASC,
MONTH(sessioni.orario_fine) ASC');
$interventi = Stats::monthly($interventi, $start, $end);
@ -337,7 +364,8 @@ $(document).ready(function() {
// Ore interventi per tipologia
$dataset = '';
foreach ($tipi as $tipo) {
$interventi = $dbo->fetchArray('SELECT ROUND( SUM(in_interventi_tecnici.ore), 2 ) AS result, YEAR(in_interventi.data_richiesta) AS year, MONTH(in_interventi.data_richiesta) AS month FROM in_interventi INNER JOIN in_interventi_tecnici ON in_interventi.id=in_interventi_tecnici.idintervento WHERE in_interventi.idtipointervento = '.prepare($tipo['idtipointervento']).' AND in_interventi.data_richiesta BETWEEN '.prepare($start).' AND '.prepare($end).' GROUP BY YEAR(in_interventi.data_richiesta), MONTH(in_interventi.data_richiesta) ORDER BY YEAR(in_interventi.data_richiesta) ASC, MONTH(in_interventi.data_richiesta) ASC');
$interventi = $dbo->fetchArray('SELECT ROUND( SUM(in_interventi_tecnici.ore), 2 ) AS result, YEAR(in_interventi_tecnici.orario_fine) AS year, MONTH(in_interventi_tecnici.orario_fine) AS month FROM in_interventi INNER JOIN in_interventi_tecnici ON in_interventi.id=in_interventi_tecnici.idintervento WHERE in_interventi.idtipointervento = '.prepare($tipo['idtipointervento']).' AND in_interventi.data_richiesta BETWEEN '.prepare($start).' AND '.prepare($end).' GROUP BY
YEAR(in_interventi_tecnici.orario_fine), MONTH(in_interventi_tecnici.orario_fine) ORDER BY YEAR(in_interventi_tecnici.orario_fine) ASC, MONTH(in_interventi_tecnici.orario_fine) ASC');
$interventi = Stats::monthly($interventi, $start, $end);