Gitcoin Grants CLR Graphs - breakdown of contribution volume over time #5687

owocki · 2019-12-26T17:00:07Z

Description

Adds a grants graph showing the breakdown of fund source over time to each Gitcoin Grant. Details at https://twitter.com/owocki/status/1210242826329632769

Refers/Fixes

User Research/Intution

Testing

on my local

… each gitcoin grant

codecov · 2019-12-26T17:05:11Z

Codecov Report

Merging #5687 into master will decrease coverage by 0.02%.
The diff coverage is 6.97%.

@@            Coverage Diff             @@
##           master    #5687      +/-   ##
==========================================
- Coverage   30.08%   30.05%   -0.03%     
==========================================
  Files         249      249              
  Lines       21455    21652     +197     
  Branches     3113     3213     +100     
==========================================
+ Hits         6454     6508      +54     
- Misses      14725    14863     +138     
- Partials      276      281       +5

Impacted Files	Coverage Δ
app/grants/views.py	`14.92% <0%> (-0.15%)`	⬇️
app/grants/models.py	`57.2% <7.69%> (-4.7%)`	⬇️
app/dashboard/views.py	`12.24% <0%> (ø)`	⬆️
...rketing/management/commands/no_applicants_email.py	`0% <0%> (ø)`	⬆️
app/marketing/mails.py	`16.8% <0%> (+3.13%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a8aa7d9...3f49ec6. Read the comment docs.

owocki · 2019-12-30T22:30:23Z

@danlipert just finished this up.. moving back to review

app/assets/v2/js/grants/stats.js

thelostone-mc · 2020-01-02T07:17:00Z

app/grants/templates/grants/detail/tabs.html

+          </div>
+          <script>
+            document.max_graph = {{max_graph}};
+            document.history = {{history|safe}}; 


update it to ?

const max_graph = {{ max_graph }} ; const history = {{ history|safe }};

hmm i was anchoring it off the document to give it global scope so i could reuse in the JS file.. let me see if that'll work still

app/assets/v2/js/grants/stats.js

thelostone-mc · 2020-01-02T07:19:03Z

app/assets/v2/js/grants/stats.js

+  if (document.max_graph > 1000) {
+    increment = 1000;
+  }
+  if (document.max_graph > 10000) {


thatll change the logical execution of this. i could move line 21 above line 18 + add an else if tho

thelostone-mc · 2020-01-02T07:21:01Z

app/assets/v2/js/grants/stats.js

+google.charts.setOnLoadCallback(drawChart);
+
+function drawChart() {
+  var target = document.getElementById('grant_chart');


use $('#grant_chart') ?

that seems to break the graph. i think that the google chart code doesnt expect jquery elements..

Ah that's cause we are loading it before jquery 😅
no worries

app/grants/templates/grants/detail/tabs.html

app/grants/templates/grants/detail/info.html

thelostone-mc · 2020-01-02T07:24:12Z

app/grants/models.py

+    @property
+    def history_by_month(self):
+        # gets the history of contributions to this grant month over month so they can be shown o grant details
+        # returns [["", "Subscription Billing",  "New Subscriptions", "One-Time Contributions", "CLR Matching Funds"], ["December 2017", 5534, 2011, 0, 0], ["January 2018", 10396, 0 , 0, 0 ], ... for each monnth in which this grant has contribution history];


remove comments?

hmm... are you sure? im trying to get in the habit of documenting my code more..

comments are good! I know we have a lot of docstring style comments which I think are overkill and lead to boilerplate copy-and-pasting but I think comments are something we should definitely encourage, especially if we want outside contributors to grok what we are doing more easily and hence be able to effectively dogfood more @thelostone-mc @owocki

alright alright! majority wins :P
the comments stay

thelostone-mc · 2020-01-02T07:25:06Z

app/grants/models.py

+                        subkey = 'New-Recurring'
+                    else:
+                        subkey = 'Recurring-Recurring'
+                if contrib.subscription.contributor_profile.handle in ['vs77bb', 'gitcoinbot', 'notscottmoore', 'owocki']:


thoughts on moving this to a constant defined above ?
['vs77bb', 'gitcoinbot', 'notscottmoore', 'owocki']`

thelostone-mc · 2020-01-02T14:52:05Z

@owocki Also given that folks have pointed out that the right side is empty! Would it make sense to combine this with the activity tab as opposed to being it's own ?

ideally the graph is build form the same data source as activity

owocki · 2020-01-02T15:03:03Z

@owocki Also given that folks have pointed out that the right side is empty! Would it make sense to combine this with the activity tab as opposed to being it's own ?

i dont follow "right side is empty" - what does that mean?

thelostone-mc · 2020-01-02T15:06:02Z

derp my bad !
So @androolloyd stated along with a bunch of other folks that the left side is filled with a lot of information while the right side aka tabs look relatively empty

hence the ping asking if it made sense to combine the graph with activity or nah

owocki · 2020-01-02T15:07:19Z

ok thanks; im indifferent to whether it should be its own tab or on the activity tab

owocki

78e793e
turns around aditya's code review.. would lub feedback from others tho

owocki · 2020-01-06T18:58:56Z

app/assets/v2/js/grants/stats.js

+google.charts.setOnLoadCallback(drawChart);
+
+function drawChart() {
+  var target = document.getElementById('grant_chart');


that seems to break the graph. i think that the google chart code doesnt expect jquery elements..

owocki · 2020-01-06T18:59:18Z

app/assets/v2/js/grants/stats.js

+  if (document.max_graph > 1000) {
+    increment = 1000;
+  }
+  if (document.max_graph > 10000) {


app/assets/v2/js/grants/stats.js

owocki · 2020-01-06T19:01:34Z

app/grants/models.py

+                        subkey = 'New-Recurring'
+                    else:
+                        subkey = 'Recurring-Recurring'
+                if contrib.subscription.contributor_profile.handle in ['vs77bb', 'gitcoinbot', 'notscottmoore', 'owocki']:


app/grants/templates/grants/detail/tabs.html

owocki · 2020-01-06T19:03:13Z

app/grants/templates/grants/detail/tabs.html

+          </div>
+          <script>
+            document.max_graph = {{max_graph}};
+            document.history = {{history|safe}}; 


danlipert

Really stoked for this - just one comment regarding DB queries

danlipert · 2020-01-07T09:44:48Z

app/grants/models.py

+        # returns [["", "Subscription Billing",  "New Subscriptions", "One-Time Contributions", "CLR Matching Funds"], ["December 2017", 5534, 2011, 0, 0], ["January 2018", 10396, 0 , 0, 0 ], ... for each monnth in which this grant has contribution history];
+        CLR_PAYOUT_HANDLES = ['vs77bb', 'gitcoinbot', 'notscottmoore', 'owocki']
+        month_to_contribution_numbers = {}
+        for sub in self.subscriptions.all():


prefetch_related('subscription_contribution') will save us a bunch of DB lookups I think. Then filter success=True in python like for contrib in [sc for sc in sub.subscription_contribution if sc.success=True]. What do you think? Cost some CPU but greatly reduces DB lookups so should be faster to execute.

hows this? i tested locally 3f49ec6

owocki added 2 commits December 26, 2019 09:58

adds graphs showing the contribution amounts, by type, over time, for…

05dbd17

… each gitcoin grant

adds graphs showing the contribution amounts, by type, over time, for…

acd510c

… each gitcoin grant

owocki requested review from danlipert, octavioamu and thelostone-mc as code owners December 26, 2019 17:00

owocki changed the title ~~Gitcoin Grants CLR Graphs - breakdown of contribution volume over time~~ DRAFT - Gitcoin Grants CLR Graphs - breakdown of contribution volume over time Dec 26, 2019

owocki changed the title ~~DRAFT - Gitcoin Grants CLR Graphs - breakdown of contribution volume over time~~ Gitcoin Grants CLR Graphs - breakdown of contribution volume over time Dec 30, 2019

owocki added 2 commits December 30, 2019 15:31

fixes this up for review

7515a0c

perf

b519124

thelostone-mc reviewed Jan 2, 2020

View reviewed changes

app/assets/v2/js/grants/stats.js Outdated Show resolved Hide resolved

thelostone-mc reviewed Jan 2, 2020

View reviewed changes

app/assets/v2/js/grants/stats.js Outdated Show resolved Hide resolved

thelostone-mc reviewed Jan 2, 2020

View reviewed changes

app/grants/templates/grants/detail/tabs.html Outdated Show resolved Hide resolved

thelostone-mc reviewed Jan 2, 2020

View reviewed changes

app/grants/templates/grants/detail/info.html Outdated Show resolved Hide resolved

thelostone-mc reviewed Jan 2, 2020

View reviewed changes

turned around aditya code review

78e793e

owocki commented Jan 6, 2020

View reviewed changes

code review

aa5b5cf

danlipert reviewed Jan 7, 2020

View reviewed changes

owocki added 2 commits January 7, 2020 09:27

Merge branch 'master' into kevin/grants_graphs

e61b331

feedback from dan

3f49ec6

thelostone-mc approved these changes Jan 8, 2020

View reviewed changes

danlipert approved these changes Jan 8, 2020

View reviewed changes

octavioamu approved these changes Jan 8, 2020

View reviewed changes

danlipert merged commit f9b7714 into master Jan 8, 2020

thelostone-mc deleted the kevin/grants_graphs branch January 8, 2020 13:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Gitcoin Grants CLR Graphs - breakdown of contribution volume over time #5687

Gitcoin Grants CLR Graphs - breakdown of contribution volume over time #5687

owocki commented Dec 26, 2019 •

edited

Loading

codecov bot commented Dec 26, 2019 •

edited

Loading

owocki commented Dec 30, 2019

thelostone-mc Jan 2, 2020 •

edited

Loading

owocki Jan 2, 2020

owocki Jan 6, 2020

thelostone-mc Jan 2, 2020

owocki Jan 2, 2020

owocki Jan 6, 2020

thelostone-mc Jan 2, 2020

owocki Jan 6, 2020

thelostone-mc Jan 8, 2020

thelostone-mc Jan 2, 2020

owocki Jan 2, 2020

danlipert Jan 7, 2020

thelostone-mc Jan 8, 2020

thelostone-mc Jan 2, 2020

owocki Jan 6, 2020

thelostone-mc commented Jan 2, 2020

owocki commented Jan 2, 2020

thelostone-mc commented Jan 2, 2020

owocki commented Jan 2, 2020

owocki left a comment

owocki Jan 6, 2020

owocki Jan 6, 2020

owocki Jan 6, 2020

owocki Jan 6, 2020

danlipert left a comment

danlipert Jan 7, 2020

owocki Jan 7, 2020

Gitcoin Grants CLR Graphs - breakdown of contribution volume over time #5687

Gitcoin Grants CLR Graphs - breakdown of contribution volume over time #5687

Conversation

owocki commented Dec 26, 2019 • edited Loading

Description

Refers/Fixes

Testing

codecov bot commented Dec 26, 2019 • edited Loading

Codecov Report

owocki commented Dec 30, 2019

thelostone-mc Jan 2, 2020 • edited Loading

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

thelostone-mc commented Jan 2, 2020

owocki commented Jan 2, 2020

thelostone-mc commented Jan 2, 2020

owocki commented Jan 2, 2020

owocki left a 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

danlipert left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

owocki commented Dec 26, 2019 •

edited

Loading

codecov bot commented Dec 26, 2019 •

edited

Loading

thelostone-mc Jan 2, 2020 •

edited

Loading