[evolvis-commits] r15251: Merged from 5.0: three patches from Ralf Habacker

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 23:51:34 CET 2011


Author: mirabilos
Date: 2011-02-28 23:51:34 +0100 (Mon, 28 Feb 2011)
New Revision: 15251

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/common/reporting/Report.class.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/activity/index.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/projecttime.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/sitetime.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/sitetimebar.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/toolspie.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/usersummary.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/admin/tracker.php
Log:
Merged from 5.0: three patches from Ralf Habacker

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/reporting/Report.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/reporting/Report.class.php	2011-02-28 22:51:29 UTC (rev 15250)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/reporting/Report.class.php	2011-02-28 22:51:34 UTC (rev 15251)
@@ -46,6 +46,8 @@
 var $end_date;
 var $span_name=array(1=>'Daily',2=>'Weekly',3=>'Monthly',4=>'OverAll');
 var $graph_interval=array(1=>7,2=>1,3=>1,4=>1);
+var $max_weeks = 104;
+var $max_month = 24;
 
 function Report() {
 	$this->Error();
@@ -70,12 +72,13 @@
 function &getMonthStartArr() {
 	if (count($this->month_start_arr) < 1) {
 		$min_date=$this->getMinDate();
-		for ($i=0; $i<24; $i++) {
+		for ($i=0; $i<$this->max_month; $i++) {
 			$this->month_start_arr[]=mktime(0,0,0,date('m')+1-$i,1,date('Y'));
 			if ($this->month_start_arr[$i] < $min_date) {
 				break;
 			}
 		}
+		sort($this->month_start_arr);
 	}
 	return $this->month_start_arr;
 }
@@ -84,12 +87,13 @@
 	if (count($this->week_start_arr) < 1) {
 		$min_date=$this->getMinDate();
 		$start=mktime(0,0,0,date('m'),(date('d')+$this->adjust_days[date('D')]),date('Y'));
-		for ($i=0; $i<104; $i++) {
+		for ($i=0; $i<$this->max_weeks; $i++) {
 			$this->week_start_arr[]=($start-REPORT_WEEK_SPAN*$i);
 			if ($this->week_start_arr[$i] < $min_date) {
 				break;
 			}
 		}
+		sort($this->week_start_arr);
 	}
 	return $this->week_start_arr;
 }

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/activity/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/activity/index.php	2011-02-28 22:51:29 UTC (rev 15250)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/activity/index.php	2011-02-28 22:51:34 UTC (rev 15251)
@@ -33,7 +33,7 @@
 		$begin = (time()-(30*86400));
 		$rendered_begin = strftime($date_format, $begin) ;
 	} else {
-		$begin = mktime (0,0,0,$tmp['tm_mon']+1,$tmp['tm_mday'],$tmp['tm_year']);
+		$begin = mktime (0,0,0,$tmp['tm_mon']+1,$tmp['tm_mday'],$tmp['tm_year'] + 1900);
 		$rendered_begin = $received_begin ;
 	}
 }
@@ -47,7 +47,7 @@
 		$end = time() ;
 		$rendered_end = strftime($date_format, $end) ;
 	} else {
-		$end = mktime (0,0,0,$tmp['tm_mon']+1,$tmp['tm_mday'],$tmp['tm_year']) + 86400;
+		$end = mktime (0,0,0,$tmp['tm_mon']+1,$tmp['tm_mday'],$tmp['tm_year'] + 1900);
 		$rendered_end = $received_end ;
 	}
 }

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/projecttime.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/projecttime.php	2011-02-28 22:51:29 UTC (rev 15250)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/projecttime.php	2011-02-28 22:51:34 UTC (rev 15251)
@@ -45,9 +45,14 @@
 
 if (!$start) {
 	$z =& $report->getMonthStartArr();
-	$start = $z[count($z)-1];
+	$start = $z[0];
 }
 
+if (!$end) {
+	$z =& $report->getMonthStartArr();
+	$end = $z[count($z)-1];
+}
+
 echo report_header(_('Time Tracking By Project'));
 
 $a[]=_('By Task');

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/sitetime.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/sitetime.php	2011-02-28 22:51:29 UTC (rev 15250)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/sitetime.php	2011-02-28 22:51:34 UTC (rev 15251)
@@ -43,9 +43,14 @@
 
 if (!$start) {
 	$z =& $report->getMonthStartArr();
-	$start = $z[count($z)-1];
+	$start = $z[0];
 }
 
+if (!$end) {
+	$z =& $report->getMonthStartArr();
+	$end = $z[count($z)-1];
+}
+
 echo report_header(_('Site-Wide Time Tracking'));
 
 $a[]=_('By Task');

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/sitetimebar.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/sitetimebar.php	2011-02-28 22:51:29 UTC (rev 15250)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/sitetimebar.php	2011-02-28 22:51:34 UTC (rev 15251)
@@ -42,9 +42,14 @@
 
 if (!$start) {
 	$z =& $report->getMonthStartArr();
-	$start = $z[count($z)-1];
+	$start = $z[0];
 }
 
+if (!$end) {
+	$z =& $report->getMonthStartArr();
+	$end = $z[count($z)-1];
+}
+
 echo report_header(_('Site-Wide Time Tracking'));
 
 ?>

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/toolspie.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/toolspie.php	2011-02-28 22:51:29 UTC (rev 15250)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/toolspie.php	2011-02-28 22:51:34 UTC (rev 15251)
@@ -40,9 +40,14 @@
 
 if (!$start) {
 	$z =& $report->getMonthStartArr();
-	$start = $z[count($z)-1];
+	$start = $z[0];
 }
 
+if (!$end) {
+	$z =& $report->getMonthStartArr();
+	$end = $z[count($z)-1];
+}
+
 session_require_global_perm ('forge_stats', 'read') ;
 
 echo report_header(_('Tool Pie Graphs'));

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/usersummary.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/usersummary.php	2011-02-28 22:51:29 UTC (rev 15250)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/usersummary.php	2011-02-28 22:51:34 UTC (rev 15251)
@@ -42,10 +42,10 @@
 
 $z =& $report->getWeekStartArr();
 if (!$start) {
-	$start = $z[count($z)-1];
+	$start = $z[0];
 }
 if (!$end) {
-	$end=$z[0];
+	$end=$z[count($z)-1];
 }
 if (!$tstat) {
 	$tstat='1';

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/admin/tracker.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/admin/tracker.php	2011-02-28 22:51:29 UTC (rev 15250)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/admin/tracker.php	2011-02-28 22:51:34 UTC (rev 15251)
@@ -10,7 +10,7 @@
 echo _('Create a new tracker.') ;
 echo '</p>';
 
-echo '<p>' . util_make_link ('/tracker/admin/?group_id='.$group_id.'&update_type=1',
+echo '<p>' . util_make_link ('/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&update_type=1',
 			     '<strong>'._('Update Settings').'</strong>').'<br />' ;
 echo _('Set up preferences like expiration times, email addresses.') ;
 echo '</p>';



More information about the evolvis-commits mailing list