[Fusionforge-commits] FusionForge branch master updated. b6b50fbe94b9487fd1f2b3d66f73af34683d05e4

Franck VILLAUME nerville at fusionforge.org
Sun Jul 7 14:03:47 CEST 2013


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  b6b50fbe94b9487fd1f2b3d66f73af34683d05e4 (commit)
      from  f1728bca4aebb39850810835751854e5de4032e6 (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 -----------------------------------------------------------------
commit b6b50fbe94b9487fd1f2b3d66f73af34683d05e4
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Jul 7 14:02:56 2013 +0200

    pm: limit reporting up to project startdate... no more ridiculous report 52 years old :-)

diff --git a/src/www/pm/reporting/index.php b/src/www/pm/reporting/index.php
index d8a8b4f..4d1d035 100644
--- a/src/www/pm/reporting/index.php
+++ b/src/www/pm/reporting/index.php
@@ -5,6 +5,7 @@
  * Copyright 1999-2000 (c) Tim Perdue - Sourceforge
  * Copyright 2002 (c) GForge LLC
  * Copyright 2010 (c) FusionForge Team
+ * Copyrgith 2013, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -114,7 +115,9 @@ if ($what) {
 			$start=($time_now-($counter*$sub_duration));
 			$end=($time_now-(($counter-1)*$sub_duration));
 
-
+			if ($end < $g->getStartDate()) {
+				break;
+			}
 
 			$result = db_query_params ('SELECT avg((end_date-start_date)/(24*60*60))
 FROM project_task,project_group_list
@@ -138,6 +141,10 @@ AND project_group_list.group_id=$3 ',
 			$start=($time_now-($counter*$sub_duration));
 			$end=($time_now-(($counter-1)*$sub_duration));
 
+			if ($end < $g->getStartDate()) {
+				break;
+			}
+			
 			$result = db_query_params ('SELECT count(*)
 FROM project_task,project_group_list
 WHERE start_date >= $1
@@ -159,7 +166,9 @@ AND project_group_list.group_id=$3 ',
 			$start=($time_now-($counter*$sub_duration));
 			$end=($time_now-(($counter-1)*$sub_duration));
 
-
+			if ($end < $g->getStartDate()) {
+				break;
+			}
 
 			$result = db_query_params ('SELECT count(*)
 FROM project_task,project_group_list

-----------------------------------------------------------------------

Summary of changes:
 src/www/pm/reporting/index.php |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list