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

Bugfix stampa calendario

This commit is contained in:
Thomas Zilio 2019-11-22 17:33:30 +01:00
parent 88732984f3
commit 12de3196f1
3 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/dashboard/widgets/stampa_calendario.dashboard.php
View File

@ -2,15 +2,18 @@
include_once __DIR__.'/../../../core.php';
//trovo id_print della stampa
$id_print = Prints::getModulePredefinedPrint(1)['id'];
use Carbon\Carbon;
// Trovo id_print della stampa
$id_print = Prints::getModulePredefinedPrint('Dashboard')['id'];
$date = new Carbon($_SESSION['dashboard']['date']);
echo '
<form action="" method="post" onsubmit="if($(this).parsley().validate()) { return stampa_calendario(); }" >
<div class="row">
<div class="col-md-4">
{[ "type": "text", "label": "'.tr('Mese e anno').'", "name": "date", "required": "1", "value": "'.$_SESSION['dashboard']['date'].'" ]}
{[ "type": "text", "label": "'.tr('Mese e anno').'", "name": "date", "required": "1" ]}
</div>
<div class="col-md-2">
@ -36,31 +39,32 @@ echo '
<script>$(document).ready(init)</script>';
?>
echo '
<script>
function stampa_calendario (){
window.open('<?php echo $rootdir; ?>/pdfgen.php?id_print=<?php echo $id_print; ?>');
window.open(globals.rootdir + "/pdfgen.php?id_print='.$id_print.'");
return false;
}
$('#format').change(function() {
session_set('settings,format', $(this).val(), 0, 0);
$("#format").change(function() {
session_set("dashboard,format", $(this).val(), 0, 0);
});
$('#orientation').change(function() {
session_set('settings,orientation', $(this).val(), 0, 0);
$("#orientation").change(function() {
session_set("dashboard,orientation", $(this).val(), 0, 0);
});
$(function() {
$('#date').datetimepicker({
format: 'MMMM YYYY',
$("#date").datetimepicker({
format: "MMMM YYYY",
locale: globals.locale,
useCurrent: false,
defaultDate: moment("'.$date->format("Y-m-d H:i:s").'")
});
$('#date').on('dp.change', function(e) {
session_set('dashboard,date', e.date.format("YYYY-MM-DD"), 0, 0);
$("#date").on("dp.change", function(e) {
session_set("dashboard,date", e.date.format("YYYY-MM-DD"), 0, 0);
});
});
</script>
</script>';

4
modules/primanota/add.php
View File

@ -92,9 +92,9 @@ foreach ($id_documenti as $id_documento) {
continue;
}
if(empty($id_anagrafica_movimenti)){
if (empty($id_anagrafica_movimenti)) {
$id_anagrafica_movimenti = $fattura->idanagrafica;
}elseif ($fattura->idanagrafica != $id_anagrafica_movimenti) {
} elseif ($fattura->idanagrafica != $id_anagrafica_movimenti) {
$id_anagrafica_movimenti = null;
}

15
templates/dashboard/body.php
View File

@ -52,7 +52,7 @@ if ($calendar['format'] == 'week') {
$min_date = $date->copy()->startOfMonth();
$max_date = $date->copy()->endOfMonth();
$where = ' (in_interventi_tecnici.orario_inizio) <= '.prepare($max_date).' AND (in_interventi_tecnici.orario_inizio) >= '.prepare($min_date).' AND ';
$where = ' (in_interventi_tecnici.orario_inizio) <= '.prepare($max_date).' AND (in_interventi_tecnici.orario_inizio) >= '.prepare($min_date).' AND ';
}
$height = '80';
@ -61,17 +61,18 @@ $stati = (array) $calendar['idstatiintervento'];
$tipi = (array) $calendar['idtipiintervento'];
$tecnici = (array) $calendar['idtecnici'];
$query = 'SELECT
$query = "SELECT
DATE(orario_inizio) AS data,
(SELECT ragione_sociale FROM an_anagrafiche WHERE idanagrafica=in_interventi.idanagrafica) AS anagrafica,
(SELECT ragione_sociale FROM an_anagrafiche WHERE idanagrafica=in_interventi_tecnici.idtecnico) AS tecnico
GROUP_CONCAT((SELECT ragione_sociale FROM an_anagrafiche WHERE idanagrafica=in_interventi_tecnici.idtecnico) SEPARATOR ', ') AS tecnico
FROM in_interventi_tecnici
INNER JOIN in_interventi ON in_interventi_tecnici.idintervento=in_interventi.id
LEFT OUTER JOIN in_statiintervento ON in_interventi.idstatointervento=in_statiintervento.idstatointervento
WHERE '.$where.'
WHERE ".$where.'
idtecnico IN('.implode(',', $tecnici).') AND
in_interventi.idstatointervento IN('.implode(',', $stati).') AND
in_interventi_tecnici.idtipointervento IN('.implode(',', $tipi).') '.Modules::getAdditionalsQuery('Interventi');
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');
@ -127,7 +128,7 @@ for ($i = 0; $i < $count; $i = $i + 7) {
echo '
<tr>';
for ($c = 0; $c < 7; ++$c ) {
for ($c = 0; $c < 7; ++$c) {
$element = $list[$i + $c];
echo '
@ -140,7 +141,7 @@ for ($i = 0; $i < $count; $i = $i + 7) {
echo '
<tr>';
for ($c = 0; $c < 7; ++$c ) {
for ($c = 0; $c < 7; ++$c) {
$element = $list[$i + $c];
$clienti = '';