Add support for flotr2 as an alternative to Google Charts #166

d00z3l · 2014-04-07T06:15:05Z

I have made changes adding the JavaScript charting library Flotr2 as an alternative to Google Charts. I think it is a much better alternative when you are using it in a corporate environment with no need for external calls. Toggle between Google Charts and Flotr2 in the gitblit.properties file: web.chartType = flotr2 or web.chartType = google. The default is google.

gitblit · 2014-04-08T04:34:49Z

This is a somewhat frequent request so thanks for tackling it. It looks like the activity graphs are not working properly. If we can get those working properly, then I'll be more interested in merging.

d00z3l · 2014-04-08T04:53:11Z

Which one of activity graphs aren't working? Which page?

On 8/04/2014 2:34 PM, James Moger wrote:

This is a somewhat frequent request so thanks for tackling it. It
looks like the activity graphs are not working properly. If we can get
those working properly, then I'll be more interested in merging.

—
Reply to this email directly or view it on GitHub
#166 (comment).

gitblit · 2014-04-08T04:53:43Z

Repo summary page.

d00z3l · 2014-04-08T05:05:58Z

Can you send a screenshot? What repo are you looking at?

On 8/04/2014 2:53 PM, James Moger wrote:

Repo summary page.

—
Reply to this email directly or view it on GitHub
#166 (comment).

d00z3l · 2014-04-08T07:35:32Z

I have just pushed the changes to fix the summary page.

On 8/04/2014 2:53 PM, James Moger wrote:

Repo summary page.

—
Reply to this email directly or view it on GitHub
#166 (comment).

d00z3l · 2014-04-08T07:41:29Z

Also just fixed Metrics page

On 8/04/2014 2:53 PM, James Moger wrote:

Repo summary page.

—
Reply to this email directly or view it on GitHub
#166 (comment).

gitblit · 2014-04-08T13:44:14Z

That looks much better. With all the graphing lib choices, why flotr2? I have nothing against it, just never heard of it.

marcomsousa · 2014-04-08T13:46:08Z

here do you have the answer: http://swizec.com/blog/flotr2-my-favorite-javascript-graph-library/swizec/4558

kwoot · 2014-04-08T13:50:16Z

Cool. Thanks!

op 08-04-14 15:46, Marco Sousa schreef:

here do you have the answer:
http://swizec.com/blog/flotr2-my-favorite-javascript-graph-library/swizec/4558

—
Reply to this email directly or view it on GitHub
#166 (comment).

Jeroen Baten | EMAIL : JBATEN@I2RS.NL
____ _ __ | web : www.i2rs.nl
| )|)( | tel : +31 (0)345 - 75 26 28
|/_| __) | Molenwindsingel 46, 4105 HK, Culemborg, the Netherlands

gitblit · 2014-04-08T14:17:20Z

@DooZel Here is what I'd like to do, if you are willing...

tweak the activity graphs to use the colors of the original graphs - those are the Gitblit colors - the dark navy blue & the orange.
I'd like to see x-axis labels so I don't have to mouse-hover over points - although I do like that feature. If this becomes a layout or size problem, we'll skip it.
Add % to the pie chart labels, as an engineer unit-less numbers make me cringe. :)
Dump all the GoogleChart code, including your new setting. I don't see a reason to continue offering GoogleCharts with a working, self-hosted charting solution that is faster and substantially equivalent.
Is there a way to specify an onclick handler for the pie charts? I've long had this idea to jump to the repo summary page from a pie chart click. We'll skip it if can't be done or if it requires ugly hacks.

d00z3l · 2014-04-08T23:49:08Z

Only because I have used it before and I think it works well.

On 8/04/2014 11:44 PM, James Moger wrote:

That looks much better. With all the graphing lib choices, why flotr2?
I have nothing against it, just never heard of it.

—
Reply to this email directly or view it on GitHub
#166 (comment).

d00z3l · 2014-04-09T00:05:29Z

The x-axis labels were painful, that is why I excluded them. 1, 3 & 4 I
can do, I will also look at how to do the click event.

On 9/04/2014 12:17 AM, James Moger wrote:

@DooZel https://github.com/doozel Here is what I'd like to do, if
you are willing...

tweak the activity graphs to use the colors of the original graphs

those are the Gitblit colors - the dark navy blue & the orange.

I'd like to see x-axis labels so I don't have to mouse-hover over
points - although I do like that feature. If this becomes a layout
or size problem, we'll skip it.

Add /%/ to the pie chart labels, as an engineer unit-less numbers
make me cringe. :)

Dump all the GoogleChart code, including your new setting. I don't
see a reason to continue offering GoogleCharts with a working,
self-hosted charting solution that is faster and substantially
equivalent.

Is there a way to specify an onclick handler for the pie charts?
I've long had this idea to jump to the repo summary page from a
pie chart click. We'll skip it if can't be done or if it requires
ugly hacks.

—
Reply to this email directly or view it on GitHub
#166 (comment).

…justed colors and added click event to repository pie charts

d00z3l · 2014-04-09T04:32:15Z

I have made the changes below (1, 3, 4 & 5), I could add a click event
to the repository pie charts. I couldn't do it for the author as you
need to also specify a repository name for the search to work.

On 9/04/2014 12:17 AM, James Moger wrote:

@DooZel https://github.com/doozel Here is what I'd like to do, if
you are willing...

tweak the activity graphs to use the colors of the original graphs

those are the Gitblit colors - the dark navy blue & the orange.

I'd like to see x-axis labels so I don't have to mouse-hover over
points - although I do like that feature. If this becomes a layout
or size problem, we'll skip it.

Add /%/ to the pie chart labels, as an engineer unit-less numbers
make me cringe. :)

Dump all the GoogleChart code, including your new setting. I don't
see a reason to continue offering GoogleCharts with a working,
self-hosted charting solution that is faster and substantially
equivalent.

Is there a way to specify an onclick handler for the pie charts?
I've long had this idea to jump to the repo summary page from a
pie chart click. We'll skip it if can't be done or if it requires
ugly hacks.

—
Reply to this email directly or view it on GitHub
#166 (comment).

gitblit · 2014-04-09T12:38:43Z

src/main/java/com/gitblit/wicket/pages/SummaryPage.java

+		String displayFormat = "MMM dd";
+		if(metrics.size() > 0 && metrics.get(0).name.length() == 7){
+			df = new SimpleDateFormat("yyyy-MM");
+			displayFormat = "MMM";


Let's change this to displayFormat = "yyyy MMM";

gitblit · 2014-04-09T12:45:33Z

This looks great! I have a few more tweaks I'd like before merging.

Move the new resources into a flotr or flotr2 dir
The old graph didn't show a blue circle for every data point. Those blue circles actually represent tags so there should two series, I suppose. The normal points (orange line) and the tag points (discrete blue dots). The tag points are determined by metric.tag > 0. I don't have the tag labels, just a count. When we restore tag indicators, then we're ready to merge.

gitblit · 2014-04-09T12:55:55Z

src/main/java/com/gitblit/wicket/pages/ActivityPage.java

 				getString("gb.repository"), getString("gb.commits"));
 		for (Metric metric : repositoryMetrics.values()) {
 			chart.addValue(metric.name, metric.count);
 		}
 		chart.setShowLegend(false);
+		chart.setClickUrl("../summary/");


String url = urlFor(SummaryPage.class, null).toString() + "?r=";
chart.setClickUrl(url);

gitblit · 2014-04-10T01:06:09Z

I pushed your commits to ticket-43 for preservation, squashed them, and merged to master. Thanks for working on this, you've just closed issue-283.

tryan added 4 commits April 7, 2014 16:04

Add support for flotr2 as an alternative to Google Charts

5c7ea77

Add chartType property and remove angle brackets

8af89e1

Property value should have been google

e3103c1

Make the size of the chart on the summary smaller

723880b

Fix chart rendering on repo summary page

2741da5

Fix same bug from Summary page on Metrics page

bcab06a

Format values in charts with toString to remove any thousands separator

ed87785

Removed old Google Charts code, add percentage sign to pir charts, ad…

9d006ad

…justed colors and added click event to repository pie charts

gitblit reviewed Apr 9, 2014
View reviewed changes

Fix URL in charts, add tag highlights, date format and remove sort

c45057e

gitblit closed this Apr 10, 2014

gitblit added a commit that referenced this pull request Sep 5, 2014

Merged #166 "Fix XRF vulnerability"

30dc4e4

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for flotr2 as an alternative to Google Charts #166

Add support for flotr2 as an alternative to Google Charts #166

d00z3l commented Apr 7, 2014

gitblit commented Apr 8, 2014

d00z3l commented Apr 8, 2014

gitblit commented Apr 8, 2014

d00z3l commented Apr 8, 2014

d00z3l commented Apr 8, 2014

d00z3l commented Apr 8, 2014

gitblit commented Apr 8, 2014

marcomsousa commented Apr 8, 2014

kwoot commented Apr 8, 2014

gitblit commented Apr 8, 2014

d00z3l commented Apr 8, 2014

d00z3l commented Apr 9, 2014

d00z3l commented Apr 9, 2014

gitblit Apr 9, 2014

gitblit commented Apr 9, 2014

gitblit Apr 9, 2014

gitblit commented Apr 10, 2014

Add support for flotr2 as an alternative to Google Charts #166

Add support for flotr2 as an alternative to Google Charts #166

Conversation

d00z3l commented Apr 7, 2014

gitblit commented Apr 8, 2014

d00z3l commented Apr 8, 2014

gitblit commented Apr 8, 2014

d00z3l commented Apr 8, 2014

d00z3l commented Apr 8, 2014

d00z3l commented Apr 8, 2014

gitblit commented Apr 8, 2014

marcomsousa commented Apr 8, 2014

kwoot commented Apr 8, 2014

gitblit commented Apr 8, 2014

d00z3l commented Apr 8, 2014

d00z3l commented Apr 9, 2014

d00z3l commented Apr 9, 2014

gitblit Apr 9, 2014

Choose a reason for hiding this comment

gitblit commented Apr 9, 2014

gitblit Apr 9, 2014

Choose a reason for hiding this comment

gitblit commented Apr 10, 2014