Commits over time chart #486

herfstregen · 2017-06-28T10:02:21Z

No description provided.

commitGraph

…tGraph

coveralls · 2017-06-28T10:16:31Z

Coverage decreased (-0.4%) to 56.636% when pulling 41ef5d7 on commitGraph into 29e9043 on master.

jwgmeligmeyling · 2017-06-29T11:13:21Z

src/main/resources/templates/project-commit-graph.ftl

+
+    <div class="row">
+        <div class="col-md-10 col-md-offset-2">
+            <h4 style="line-height:34px; margin-top:0;">Nice graphs &nbsp; 😍</h4>


Can you please replace all "Nice graphs" occurrences with a property within our localisation file? (so ${i18n.translate("header.graphs")} and then in devhub_en.properties you add: header.graphs = .... We may reconsider to change the title too. I would keep the emoji.

I did, but it killed the emoji :'(

TimvdLippe · 2017-07-01T12:30:15Z

...main/java/nl/tudelft/ewi/devhub/server/web/resources/repository/AbstractProjectResource.java

+		return getGoogleChartDataForCommits(commitEntities);
+	}
+
+	private static List<List<Object>> getGoogleChartDataForCommits(List<Commit> commitEntities) {


I don't see any mention or communication with Google in this method. Should it be called getGoogleChartDataForCommits?

It doesn't call Google but it represents a data format specifically for Google Charts. So the naming is fine.

TimvdLippe · 2017-07-01T12:30:57Z

src/main/resources/templates/project-commit-graph.ftl

+                            vAxis: {minValue: 0, gridlines: {count : -1}}
+                        };
+
+                        var mijnMagischeElement = $('<div>')


¯_(ツ)_/¯ maybe to make the magic even more magic? :')

TimvdLippe · 2017-07-01T12:31:22Z

src/main/resources/templates/project-commit-graph.ftl

+
+    google.charts.load('current', {'packages':['corechart']});
+    google.charts.setOnLoadCallback(function() {
+        $.get('http://localhost:50001/courses/ti1705/TI1705/groups/1/person-commit')


Should be the production url, or relative from the current url.

It should be relative indeed. (/courses...)

TimvdLippe · 2017-07-01T12:31:38Z

src/main/resources/templates/project-commit-graph.ftl

+    var randomcolor = getRandColor(4);
+    google.charts.load('current', {'packages':['corechart']});
+    google.charts.setOnLoadCallback(function() {
+        $.get('http://localhost:50001/courses/ti1705/TI1705/groups/1/magical-chart-data')


Should be the production url, or relative from the current url.

It should be relative indeed. (/courses...)

And it should dynamically get the group and course numbers

Good catch 😉

TimvdLippe · 2017-07-01T12:32:10Z

src/main/resources/templates/project-commit-graph.ftl

+<script type="text/javascript" src="http://code.stephenmorley.org/javascript/colour-handling-and-processing/Colour.js"></script>
+<script type="text/javascript">
+
+    function getRandColor(brightness){


Did you copy this from an external resource? Would be better to include a link to it, maybe StackOverflow?

I think I did yes, you want a link for reference?

TimvdLippe · 2017-07-01T12:32:27Z

src/main/resources/templates/project-commit-graph.ftl

+
+        <!-- Graph for all commits -->
+        <div class="col-md-10">
+            <div id="allcommits_div" style="width: 100%; height: 500px; "></div>


Include styling in a <style> instead, not in-line

Or in the sass files perhaps.

TimvdLippe · 2017-07-01T23:28:30Z

Yes, because it is complex code and not immediately clear how it works.

…

On Sun, 2 Jul 2017, 01:17 asylunatic, ***@***.***> wrote: ***@***.**** commented on this pull request. ------------------------------ In src/main/resources/templates/project-commit-graph.ftl <#486 (comment)>: > + <div id="allcommits_div" style="width: 100%; height: 500px; "></div> + </div> + </div> + +  + <div class="row" id="personcommit_divs"> + </div> + +</div>  + ***@***.*** /] +<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script> +<script type="text/javascript" src="http://code.stephenmorley.org/javascript/colour-handling-and-processing/Colour.js"></script> +<script type="text/javascript"> + + function getRandColor(brightness){ I think I did yes, you want a link for reference? — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#486 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AFrDb3rCN3-qXYvU0uWAHDAvmjVE4DPAks5sJtN1gaJpZM4OHwBL> .

Fastjur

Please remove the localhost:5001 lines. Other than that everything that has not got comments looks good!

Fastjur · 2017-07-02T11:52:30Z

src/main/resources/templates/project-commit-graph.ftl

+
+        <!-- Graph for all commits -->
+        <div class="col-md-10">
+            <div id="allcommits_div" style="width: 100%; height: 500px; "></div>


Or in the sass files perhaps.

…sation file

coveralls · 2017-07-09T13:51:36Z

Coverage decreased (-0.2%) to 56.85% when pulling fa7c6f2 on commitGraph into 29e9043 on master.

asylunatic · 2017-07-09T14:04:38Z

src/main/resources/templates/project-commit-graph.ftl

+
+    google.charts.load('current', {'packages':['corechart']});
+    google.charts.setOnLoadCallback(function() {
+        $.get('/courses/ti1705/TI1705/groups/1/person-commit')


Also this should dynamically load, haven't figured that out though

coveralls · 2017-07-09T14:11:20Z

Coverage decreased (-0.2%) to 56.85% when pulling 4f52d38 on commitGraph into 29e9043 on master.

I've pushed changes that make the path truly relative.

coveralls · 2017-07-10T22:16:11Z

Coverage decreased (-0.5%) to 56.6% when pulling 497c068 on commitGraph into 29e9043 on master.

coveralls · 2017-07-11T08:35:01Z

Coverage decreased (-0.5%) to 56.6% when pulling 3c126b0 on commitGraph into 29e9043 on master.

herfstregen and others added 19 commits June 14, 2017 15:32

new page insights, link in sidebar

d13ba0c

fix active side bar component

a0233d8

Draw first graph

a91eec2

Add google graph magic

b521f53

Add proper heading to graphs section

ed3ff3b

Set graph background color transparent

2921c96

Merge branch 'master' into commitGraph

8e843fc

Some doubtful progress on magicalChartData

5a994e4

Merge branch 'commitGraph' of github.com:devhub-tud/devhub into

4a62625

commitGraph

merge conflict

22ff425

Add data from database to graph, wrong dateformat still

1ee6086

Merge branch 'commitGraph' of github.com:devhub-tud/devhub into commi…

7a718d8

…tGraph

Make the dates work

52c6555

methods for grouping commits by Auther by Date

27db4f2

Show graphs with commits per person by date

66b2c9c

Add some formatting

0cd7cb5

Add nice coloring to nice charts

6a7d486

adjusted scaling on y-axis

2c26c7f

Merge branch 'commitGraph' of github.com:devhub-tud/devhub into commi…

41ef5d7

…tGraph

herfstregen added the in progress label Jun 28, 2017

asylunatic requested review from jwgmeligmeyling and removed request for jwgmeligmeyling June 28, 2017 11:04

jwgmeligmeyling reviewed Jun 29, 2017

View reviewed changes

TimvdLippe reviewed Jul 1, 2017

View reviewed changes

Fastjur previously requested changes Jul 2, 2017

View reviewed changes

asylunatic added 2 commits July 9, 2017 15:31

Replace all Nice graphs occurrences with a property within the locali…

fa7c6f2

…sation file

Add claryfing comment to getRandColor

1d7488c

asylunatic reviewed Jul 9, 2017

View reviewed changes

jwgmeligmeyling force-pushed the commitGraph branch from 4f52d38 to 497c068 Compare July 10, 2017 22:02

Truly relative path

497c068

jwgmeligmeyling changed the title ~~Commit graph~~ Commits over time chart Jul 10, 2017

small fix in correct displaying the date in the graphs

3c126b0

jwgmeligmeyling merged commit c107c37 into master Jul 11, 2017

jwgmeligmeyling removed the in progress label Jul 11, 2017

jwgmeligmeyling deleted the commitGraph branch July 11, 2017 11:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commits over time chart #486

Commits over time chart #486

herfstregen commented Jun 28, 2017

coveralls commented Jun 28, 2017

jwgmeligmeyling Jun 29, 2017

asylunatic Jul 9, 2017

TimvdLippe Jul 1, 2017

jwgmeligmeyling Jul 2, 2017

TimvdLippe Jul 1, 2017

asylunatic Jul 9, 2017

TimvdLippe Jul 1, 2017

jwgmeligmeyling Jul 2, 2017

TimvdLippe Jul 1, 2017

jwgmeligmeyling Jul 2, 2017

Fastjur Jul 2, 2017

jwgmeligmeyling Jul 2, 2017

TimvdLippe Jul 1, 2017

asylunatic Jul 1, 2017

TimvdLippe Jul 1, 2017

Fastjur Jul 2, 2017

TimvdLippe commented Jul 1, 2017 via email

Fastjur left a comment

Fastjur Jul 2, 2017

coveralls commented Jul 9, 2017

asylunatic Jul 9, 2017

coveralls commented Jul 9, 2017

coveralls commented Jul 10, 2017

coveralls commented Jul 11, 2017

Commits over time chart #486

Commits over time chart #486

Conversation

herfstregen commented Jun 28, 2017

coveralls commented Jun 28, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TimvdLippe commented Jul 1, 2017 via email

Fastjur left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Jul 9, 2017

Choose a reason for hiding this comment

coveralls commented Jul 9, 2017

coveralls commented Jul 10, 2017

coveralls commented Jul 11, 2017