tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed last value checkbox in reports. Ticket#3685

This commit is contained in:
Arturo Gonzalez 2016-05-30 08:58:24 +02:00
parent a5eeb7e4f1
commit 2ce399dd0d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -599,6 +599,7 @@ $class = 'databox filters';
} }
else { else {
$report_type = reports_get_report_types(); $report_type = reports_get_report_types();
if (!empty($report_type) and isset($report_type[$type]['name'])) if (!empty($report_type) and isset($report_type[$type]['name']))
echo $report_type[$type]['name']; echo $report_type[$type]['name'];
else else
@ -672,7 +673,7 @@ $class = 'databox filters';
<td style=""> <td style="">
<?php <?php
html_print_checkbox('last_value', '1', html_print_checkbox('last_value', '1',
($period === 0), false, false, 'set_last_value_period();'); ((int)$period === 0), false, false, 'set_last_value_period();');
?> ?>
</td> </td>
</tr> </tr>
@ -2545,8 +2546,10 @@ function chooseType() {
$("#row_show_resume").show(); $("#row_show_resume").show();
$("#row_show_in_two_columns").show(); $("#row_show_in_two_columns").show();
var checked = $("input[name='last_value']").prop("checked");
$("#row_last_value").show(); $("#row_last_value").show();
if ($("#hidden-period").val() == 0) { if (checked) {
$("#row_period").hide(); $("#row_period").hide();
$("input[name='last_value']").prop("checked", true); $("input[name='last_value']").prop("checked", true);
} }
@ -2598,8 +2601,10 @@ function chooseType() {
$("#row_show_graph").show(); $("#row_show_graph").show();
$("#row_show_in_two_columns").show(); $("#row_show_in_two_columns").show();
var checked = $("input[name='last_value']").prop("checked");
$("#row_last_value").show(); $("#row_last_value").show();
if ($("#hidden-period").val() == 0) { if (checked) {
$("#row_period").hide(); $("#row_period").hide();
$("input[name='last_value']").prop("checked", true); $("input[name='last_value']").prop("checked", true);
} }