This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via b7d92682e98a780ffc5fc401c3ea24b81e4d3a9c (commit)
via 1f0b01bc21bec0d37b1b544262fbcbe1f111cb3a (commit)
from 23a7156f58b7b87f63d9e21e193f51d69b4277a3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=b7d92682e98a780ffc5fc401c3ea24b81e4d3a9c
commit b7d92682e98a780ffc5fc401c3ea24b81e4d3a9c
Author: Franck Villaume <[email protected]>
Date: Thu Mar 24 14:38:48 2016 +0100
tracker pie graph: remove unwanted quote
diff --git a/src/common/reporting/report_utils.php
b/src/common/reporting/report_utils.php
index 32d3f3c..f8093ac 100644
--- a/src/common/reporting/report_utils.php
+++ b/src/common/reporting/report_utils.php
@@ -5,7 +5,7 @@
* Copyright 2003-2004, Tim Perdue/GForge, LLC
* Copyright 2009, Roland Mas
* Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
- * Copyright 2013,2015 Franck Villaume - TrivialDev
+ * Copyright 2013,2015-2016, Franck Villaume - TrivialDev
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
@@ -388,7 +388,7 @@ function trackerpie_graph($group_id, $area, $SPAN, $start,
$end, $atid) {
echo 'var plot'.$chartid.';';
echo 'var data = new Array();';
while ($row = db_fetch_array($dbres)) {
- echo
'data.push([\''.htmlentities($row[0]).'\',\''.$row[1].'\']);';
+ echo
'data.push([\''.htmlentities($row[0]).'\','.$row[1].']);';
}
echo 'jQuery(document).ready(function(){
plot'.$chartid.' = jQuery.jqplot
(\'chart'.$chartid.'\', [data],
@@ -400,7 +400,6 @@ function trackerpie_graph($group_id, $area, $SPAN, $start,
$end, $atid) {
// Put data labels on
the pie slices.
// By default, labels
show the percentage of the slice.
showDataLabels: true,
- dataLabels: \'percent\',
}
},
legend: {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=1f0b01bc21bec0d37b1b544262fbcbe1f111cb3a
commit 1f0b01bc21bec0d37b1b544262fbcbe1f111cb3a
Author: Franck Villaume <[email protected]>
Date: Thu Mar 24 14:25:19 2016 +0100
ReportTrackerAct: fix PHP warning
diff --git a/src/common/reporting/ReportTrackerAct.class.php
b/src/common/reporting/ReportTrackerAct.class.php
index a01eba5..d243034 100644
--- a/src/common/reporting/ReportTrackerAct.class.php
+++ b/src/common/reporting/ReportTrackerAct.class.php
@@ -4,7 +4,7 @@
*
* Copyright 2003-2004, Tim Perdue/GForge, LLC
* Copyright 2009, Roland Mas
- * Copyright 2013, Franck Villaume - TrivialDev
+ * Copyright 2013,2016, Franck Villaume - TrivialDev
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
@@ -71,15 +71,31 @@ function
ReportTrackerAct($span,$group_id,$atid,$start=0,$end=0) {
}
}
+ // required since we unset val in $arr
+ $arr_backed = $arr;
for ($i=0; $i<count($arr); $i++) {
if ($arr[$i]<$start || $arr[$i]>$end) {
//skip this month as it's not in the range
unset($arr[$i]);
} else {
- $this->labels[]=date('M d',($arr[$i-1]-1)).' <->
'.date('M d',$arr[$i]);
-
$this->avgtime[]=$this->getAverageTime($atid,($arr[$i-1]-1),$arr[$i]);
-
$this->opencount[]=$this->getOpenCount($atid,($arr[$i-1]-1),$arr[$i]);
-
$this->stillopencount[]=$this->getStillOpenCount($atid,$arr[$i]);
+ if (!isset($arr_backed[$i-1])) {
+ switch ($span) {
+ case REPORT_TYPE_WEEKLY: {
+ $previous = $arr_backed[$i] -
REPORT_WEEK_SPAN;
+ break;
+ }
+ default: {
+ $previous =
mktime(0,0,0,date('m')-$this->max_month,1,date('Y'));
+ break;
+ }
+ }
+ } else {
+ $previous = $arr_backed[$i-1];
+ }
+ $this->labels[]=date('M d', ($previous-1)).' <->
'.date('M d', $arr[$i]);
+
$this->avgtime[]=$this->getAverageTime($atid,($previous-1), $arr[$i]);
+
$this->opencount[]=$this->getOpenCount($atid,($previous-1), $arr[$i]);
+ $this->stillopencount[]=$this->getStillOpenCount($atid,
$arr[$i]);
}
}
-----------------------------------------------------------------------
Summary of changes:
src/common/reporting/ReportTrackerAct.class.php | 26 ++++++++++++++++++++-----
src/common/reporting/report_utils.php | 5 ++---
2 files changed, 23 insertions(+), 8 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
