[Fusionforge-commits] FusionForge branch master updated. 6a7b7e07a7e10776a0dfbc92b8fec34a6d6dffe8

Franck Villaume nerville at fusionforge.org
Thu Sep 11 14:48:31 CEST 2014


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  6a7b7e07a7e10776a0dfbc92b8fec34a6d6dffe8 (commit)
      from  8adf30168104f45f459ff46f104766946ab6dc79 (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 6a7b7e07a7e10776a0dfbc92b8fec34a6d6dffe8
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Sep 11 14:46:53 2014 +0200

    Widget Project Documents Activity: display graph if there is activity

diff --git a/src/common/widget/Widget_ProjectDocumentsActivity.class.php b/src/common/widget/Widget_ProjectDocumentsActivity.class.php
index fea60c2..96af05a 100644
--- a/src/common/widget/Widget_ProjectDocumentsActivity.class.php
+++ b/src/common/widget/Widget_ProjectDocumentsActivity.class.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights reserved
- * Copyright 2012, Franck Villaume - TrivialDev
+ * Copyright 2012,2014, Franck Villaume - TrivialDev
  *
  * This file is a part of Fusionforge.
  *
@@ -91,7 +91,7 @@ class Widget_ProjectDocumentsActivity extends Widget {
 		$textsArray[] = _('new and update Files'.' [FU]');
 		$textsArray[] = _('new files and directories'.' [FD]');
 		$textsArray[] = _('new and update files and directories'.' [FUD]');
-		$prefs = _("Display statistics:").html_build_select_box_from_arrays($optionsArray, $textsArray, "show", $this->_statistic_show);
+		$prefs = _('Display statistics')._(': ').html_build_select_box_from_arrays($optionsArray, $textsArray, "show", $this->_statistic_show);
 		return $prefs;
 	}
 
@@ -118,82 +118,88 @@ class Widget_ProjectDocumentsActivity extends Widget {
 		$activitysArray[] = $dm->getActivity($sections, $begin3, $end3);
 		$activitysArray[] = $dm->getActivity($sections, $begin2, $end2);
 		$activitysArray[] = $dm->getActivity($sections, $begin1, $end1);
-		echo '<script type="text/javascript">//<![CDATA['."\n";
-		switch($this->_statistic_show) {
-			case 'F':
-				echo 'var s1 = ['.$activitysArray[0]['docmannew'].', '.$activitysArray[1]['docmannew'].', '.$activitysArray[2]['docmannew'].', '.$activitysArray[3]['docmannew'].'];';
-				echo 'var series = [s1];';
-				echo 'var labels = [{label:\''._('new Files').'\'}];';
-				break;
-			case 'U': {
-				echo 'var s2 = ['.$activitysArray[0]['docmanupdate'].', '.$activitysArray[1]['docmanupdate'].', '.$activitysArray[2]['docmanupdate'].', '.$activitysArray[3]['docmanupdate'].'];';
-				echo 'var series = [s2];';
-				echo 'var labels = [{label:\''._('updated Files').'\'}];';
-				break;
-			}
-			case 'D': {
-				echo 'var s3 = ['.$activitysArray[0]['docgroupnew'].', '.$activitysArray[1]['docgroupnew'].', '.$activitysArray[2]['docgroupnew'].', '.$activitysArray[3]['docgroupnew'].'];';
-				echo 'var series = [s3];';
-				echo 'var labels = [{label:\''._('new Directories').'\'}];';
-				break;
-			}
-			case 'FU': {
-				echo 'var s1 = ['.$activitysArray[0]['docmannew'].', '.$activitysArray[1]['docmannew'].', '.$activitysArray[2]['docmannew'].', '.$activitysArray[3]['docmannew'].'];';
-				echo 'var s2 = ['.$activitysArray[0]['docmanupdate'].', '.$activitysArray[1]['docmanupdate'].', '.$activitysArray[2]['docmanupdate'].', '.$activitysArray[3]['docmanupdate'].'];';
-				echo 'var series = [s1, s2];';
-				echo 'var labels = [{label:\''._('new Files').'\'},
-						{label:\''._('updated Files').'\'}];';
-				break;
-			}
-			case 'FD': {
-				echo 'var s1 = ['.$activitysArray[0]['docmannew'].', '.$activitysArray[1]['docmannew'].', '.$activitysArray[2]['docmannew'].', '.$activitysArray[3]['docmannew'].'];';
-				echo 'var s3 = ['.$activitysArray[0]['docgroupnew'].', '.$activitysArray[1]['docgroupnew'].', '.$activitysArray[2]['docgroupnew'].', '.$activitysArray[3]['docgroupnew'].'];';
-				echo 'var series = [s1, s3];';
-				echo 'var labels = [{label:\''._('new Files').'\'},
-						{label:\''._('new Directories').'\'}];';
-				break;
-			}
-			default: {
-				echo 'var s1 = ['.$activitysArray[0]['docmannew'].', '.$activitysArray[1]['docmannew'].', '.$activitysArray[2]['docmannew'].', '.$activitysArray[3]['docmannew'].'];';
-				echo 'var s2 = ['.$activitysArray[0]['docmanupdate'].', '.$activitysArray[1]['docmanupdate'].', '.$activitysArray[2]['docmanupdate'].', '.$activitysArray[3]['docmanupdate'].'];';
-				echo 'var s3 = ['.$activitysArray[0]['docgroupnew'].', '.$activitysArray[1]['docgroupnew'].', '.$activitysArray[2]['docgroupnew'].', '.$activitysArray[3]['docgroupnew'].'];';
-				echo 'var series = [s1, s2, s3];';
-				echo 'var labels = [{label:\''._('new Files').'\'},
-						{label:\''._('updated Files').'\'},
-						{label:\''._('new Directories').'\'}];';
-				break;
+		if ( $activitysArray[0]['docmannew'] + $activitysArray[1]['docmannew'] + $activitysArray[2]['docmannew'] + $activitysArray[3]['docmannew'] +
+			$activitysArray[0]['docmanupdate'] + $activitysArray[1]['docmanupdate'] + $activitysArray[2]['docmanupdate'] + $activitysArray[3]['docmanupdate'] +
+			$activitysArray[0]['docgroupnew'] + $activitysArray[1]['docgroupnew'] + $activitysArray[2]['docgroupnew'] + $activitysArray[3]['docgroupnew'] ) {
+			echo '<script type="text/javascript">//<![CDATA['."\n";
+			switch($this->_statistic_show) {
+				case 'F':
+					echo 'var s1 = ['.$activitysArray[0]['docmannew'].', '.$activitysArray[1]['docmannew'].', '.$activitysArray[2]['docmannew'].', '.$activitysArray[3]['docmannew'].'];';
+					echo 'var series = [s1];';
+					echo 'var labels = [{label:\''._('new Files').'\'}];';
+					break;
+				case 'U': {
+					echo 'var s2 = ['.$activitysArray[0]['docmanupdate'].', '.$activitysArray[1]['docmanupdate'].', '.$activitysArray[2]['docmanupdate'].', '.$activitysArray[3]['docmanupdate'].'];';
+					echo 'var series = [s2];';
+					echo 'var labels = [{label:\''._('updated Files').'\'}];';
+					break;
+				}
+				case 'D': {
+					echo 'var s3 = ['.$activitysArray[0]['docgroupnew'].', '.$activitysArray[1]['docgroupnew'].', '.$activitysArray[2]['docgroupnew'].', '.$activitysArray[3]['docgroupnew'].'];';
+					echo 'var series = [s3];';
+					echo 'var labels = [{label:\''._('new Directories').'\'}];';
+					break;
+				}
+				case 'FU': {
+					echo 'var s1 = ['.$activitysArray[0]['docmannew'].', '.$activitysArray[1]['docmannew'].', '.$activitysArray[2]['docmannew'].', '.$activitysArray[3]['docmannew'].'];';
+					echo 'var s2 = ['.$activitysArray[0]['docmanupdate'].', '.$activitysArray[1]['docmanupdate'].', '.$activitysArray[2]['docmanupdate'].', '.$activitysArray[3]['docmanupdate'].'];';
+					echo 'var series = [s1, s2];';
+					echo 'var labels = [{label:\''._('new Files').'\'},
+							{label:\''._('updated Files').'\'}];';
+					break;
+				}
+				case 'FD': {
+					echo 'var s1 = ['.$activitysArray[0]['docmannew'].', '.$activitysArray[1]['docmannew'].', '.$activitysArray[2]['docmannew'].', '.$activitysArray[3]['docmannew'].'];';
+					echo 'var s3 = ['.$activitysArray[0]['docgroupnew'].', '.$activitysArray[1]['docgroupnew'].', '.$activitysArray[2]['docgroupnew'].', '.$activitysArray[3]['docgroupnew'].'];';
+					echo 'var series = [s1, s3];';
+					echo 'var labels = [{label:\''._('new Files').'\'},
+							{label:\''._('new Directories').'\'}];';
+					break;
+				}
+				default: {
+					echo 'var s1 = ['.$activitysArray[0]['docmannew'].', '.$activitysArray[1]['docmannew'].', '.$activitysArray[2]['docmannew'].', '.$activitysArray[3]['docmannew'].'];';
+					echo 'var s2 = ['.$activitysArray[0]['docmanupdate'].', '.$activitysArray[1]['docmanupdate'].', '.$activitysArray[2]['docmanupdate'].', '.$activitysArray[3]['docmanupdate'].'];';
+					echo 'var s3 = ['.$activitysArray[0]['docgroupnew'].', '.$activitysArray[1]['docgroupnew'].', '.$activitysArray[2]['docgroupnew'].', '.$activitysArray[3]['docgroupnew'].'];';
+					echo 'var series = [s1, s2, s3];';
+					echo 'var labels = [{label:\''._('new Files').'\'},
+							{label:\''._('updated Files').'\'},
+							{label:\''._('new Directories').'\'}];';
+					break;
+				}
 			}
-		}
-		echo 'var ticks = [\''._('3 weeks ago').'\', \''._('2 weeks ago').'\', \''._('Last Week').'\', \''._('Current Week').'\'];';
-		echo 'var plot1;';
-		echo 'jQuery(document).ready(function(){
-				plot1 = jQuery.jqplot(\'chart1\', series, {
-					seriesDefaults: {
-						renderer:jQuery.jqplot.BarRenderer,
-						rendererOptions: {fillToZero: true}
-					},
-					series:
-						labels
-					,
-					legend: {
-						show: true,
-						placement: \'insideGrid\',
-						location: \'ne\'
-					},
-					axes: {
-						xaxis: {
-							renderer: jQuery.jqplot.CategoryAxisRenderer,
-							ticks: ticks,
+			echo 'var ticks = [\''._('3 weeks ago').'\', \''._('2 weeks ago').'\', \''._('Last Week').'\', \''._('Current Week').'\'];';
+			echo 'var plot1;';
+			echo 'jQuery(document).ready(function(){
+					plot1 = jQuery.jqplot(\'chart1\', series, {
+						seriesDefaults: {
+							renderer:jQuery.jqplot.BarRenderer,
+							rendererOptions: {fillToZero: true}
+						},
+						series:
+							labels
+						,
+						legend: {
+							show: true,
+							placement: \'insideGrid\',
+							location: \'ne\'
+						},
+						axes: {
+							xaxis: {
+								renderer: jQuery.jqplot.CategoryAxisRenderer,
+								ticks: ticks,
+							}
 						}
-					}
-				});
-			});';
-		echo 'jQuery(window).resize(function() {
-				plot1.replot( { resetAxes: true } );
-			});'."\n";
-		echo '//]]></script>';
-		echo '<div id="chart1"></div>';
-		echo '<div class="underline-link">' . util_make_link('/docman/?group_id='.$group_id, _('Browse Documents Manager')) . '</div>';
+					});
+				});';
+			echo 'jQuery(window).resize(function() {
+					plot1.replot( { resetAxes: true } );
+				});'."\n";
+			echo '//]]></script>';
+			echo '<div id="chart1"></div>';
+		} else {
+			echo $HTML->information(_('No activity to display'));
+		}
+		echo html_e('div', array('class' => 'underline-link'), util_make_link('/docman/?group_id='.$group_id, _('Browse Documents Manager')));
 	}
 
 	function getTitle() {

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

Summary of changes:
 .../Widget_ProjectDocumentsActivity.class.php      |  158 ++++++++++----------
 1 file changed, 82 insertions(+), 76 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list