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

Fix su stampa settimanale calendario

This commit is contained in:
Matteo 2023-05-19 13:19:19 +02:00
parent d268ba555f
commit 5cd74c4d1d
2 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/dashboard/widgets/stampa_calendario_settimanale.dashboard.php
View File

@ -37,7 +37,7 @@ echo '
</div>
<div class="col-md-4">
{[ "type": "select", "label": "'.tr('Orientamento').'", "name": "orientation", "required": "1", "values": "list=\"L\": \"'.tr('Orizzontale').'\", \"P\": \"'.tr('Verticale').'\"", "value": "'.$_SESSION['dashboard']['orientation'].'" ]}
{[ "type": "select", "label": "'.tr('Orientamento').'", "name": "orientation", "required": "1", "values": "list=\"L\": \"'.tr('Orizzontale').'\"", "value": "'.$_SESSION['dashboard']['orientation'].'" ]}
</div>

46
templates/dashboard_settimanale/body.php
View File

@ -21,6 +21,34 @@ include_once __DIR__.'/../../core.php';
use Carbon\Carbon;
?>
<style type="text/css">
.divTable
{
display: table;
width:auto;
background-color:#eee;
border:1px solid #666666;
border-spacing:5px;/*cellspacing:poor IE support for this*/
/* border-collapse:separate;*/
}
.divRow
{
display:table-row;
width:auto;
}
.divCell
{
float:left;/*fix for buggy browsers*/
display:table-column;
width:147px;
background-color:#ccc;
}
</style>
<?php
$calendar = $_SESSION['dashboard'];
$date_start = $calendar['date_week_start'];
@ -31,8 +59,6 @@ $title = date('d/m/Y', strtotime($date_start))." - ".date('d/m/Y', strtotime($da
$min_date = new Carbon($date_start);
$max_date = new Carbon($date_end);
$height = '480';
$stati = (array) $calendar['idstatiintervento'];
$tipi = (array) $calendar['idtipiintervento'];
$tecnici = (array) $calendar['idtecnici'];
@ -82,25 +108,25 @@ while ($current_day->lessThan($max_date)) {
// Stampa della tabella
echo '
<table class="table table-bordered">';
<div class="divTable">';
$count = count($list);
for ($i = 0; $i < $count; $i = $i + 7) {
echo '
<tr>';
<div class="divRow">';
for ($c = 0; $c < 7; ++$c) {
$element = $list[$i + $c];
echo '
<th>'.ucfirst($element['date']->formatLocalized('%A %d/%m')).'</th>';
<div class="divCell" align="center">'.ucfirst($element['date']->formatLocalized('%A %d/%m')).'</div>';
}
echo '
</tr>';
</div>';
echo '
<tr>';
<div class="divRow">';
for ($c = 0; $c < 7; ++$c) {
$element = $list[$i + $c];
@ -118,12 +144,12 @@ for ($i = 0; $i < $count; $i = $i + 7) {
}
echo '
<td style="height:'.$height.'px;background:'.$background.'">'.$clienti.'</td>';
<div class="divCell" style="background:'.$background.'">'.(!empty($clienti)?$clienti:'&nbsp;').'</div>';
}
echo '
</tr>';
</div>';
}
echo '
</table>';
</div>';