diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index e5ff39a751..f1911fdb45 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2012-12-26 Juan Manuel Ramon + + * include/functions_graph.php: Fixed typos. + * operation/reporting/reporting_viewer.php: Fixed range selector + in report viewer. + 2012-12-26 Miguel de Dios * include/functions_config.php: erased double check for admin user diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 1bc444055c..cd1e3582f6 100755 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -110,7 +110,7 @@ function get_statwin_graph_statistics ($chart_array, $series_suffix = '') { $item['max'] = $item['max'.$series_suffix]; } - //Get stats for normal grap + //Get stats for normal graph if (isset($item['sum']) && $item['sum']) { //Sum all values later divide by the number of elements $stats['sum']['avg'] = $stats['sum']['avg'] + $item['sum']; @@ -180,7 +180,7 @@ function get_statwin_graph_statistics ($chart_array, $series_suffix = '') { $stats['sum']['last'] = $item['sum']; } - if(isset($item['min']) && $item['min']) { + if (isset($item['min']) && $item['min']) { $stats['min']['last'] = $item['min']; } diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php index 374db3fde8..d14ac8c424 100644 --- a/pandora_console/operation/reporting/reporting_viewer.php +++ b/pandora_console/operation/reporting/reporting_viewer.php @@ -172,6 +172,7 @@ ui_require_jquery_file ("ui-timepicker-addon"); @@ -257,15 +273,6 @@ foreach ($contents as $content) { $(document).ready (function () { $("*", "#table1-0").css("display", ""); //Re-show the first row of form. - $("#loading").slideUp (); - $("#text-time").timeEntry ({spinnerImage: 'images/time-entry.png', spinnerSize: [20, 20, 0]}); - $("#text-date").datepicker (); - - $('[id^=text-date_init]').datepicker (); - $('[id^=text-time_init]').timeEntry ({spinnerImage: 'images/time-entry.png', spinnerSize: [20, 20, 0]}); - - $.datepicker.regional[""]; - /* Show/hide begin date reports controls */ $("#checkbox-enable_init_date").click(function() { flag = $("#checkbox-enable_init_date").is(':checked');