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

2012-12-26 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/functions_graph.php: Fixed typos.
	* operation/reporting/reporting_viewer.php: Fixed range selector
	in report viewer.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7333 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-12-26 16:43:05 +00:00
parent 2168d81224
commit 3c6ca26719
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2012-12-26 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php: Fixed typos.
* operation/reporting/reporting_viewer.php: Fixed range selector
in report viewer.
2012-12-26 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php: erased double check for admin user

4
pandora_console/include/functions_graph.php
View File

@ -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'];
}

25
pandora_console/operation/reporting/reporting_viewer.php
View File

@ -172,6 +172,7 @@ ui_require_jquery_file ("ui-timepicker-addon");
<script language="javascript" type="text/javascript">
$(document).ready (function () {
$("#loading").slideUp ();
$("#text-time").timepicker({
showSecond: true,
@ -185,6 +186,21 @@ $(document).ready (function () {
closeText: '<?php echo __('Close');?>'});
$.datepicker.setDefaults($.datepicker.regional[ "<?php echo $config['language']; ?>"]);
$("#text-date").datepicker ({changeMonth: true, changeYear: true, showAnim: "slideDown"});
$('[id^=text-time_init]').timepicker({
showSecond: true,
timeFormat: 'hh:mm:ss',
timeOnlyTitle: '<?php echo __('Choose time');?>',
timeText: '<?php echo __('Time');?>',
hourText: '<?php echo __('Hour');?>',
minuteText: '<?php echo __('Minute');?>',
secondText: '<?php echo __('Second');?>',
currentText: '<?php echo __('Now');?>',
closeText: '<?php echo __('Close');?>'});
$('[id^=text-date_init]').datepicker ({changeMonth: true, changeYear: true, showAnim: "slideDown"});
});
</script>
@ -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["<?php echo $config['language']; ?>"];
/* Show/hide begin date reports controls */
$("#checkbox-enable_init_date").click(function() {
flag = $("#checkbox-enable_init_date").is(':checked');