Skip to content

Commit 3f1bc1d

Browse files
committed
added stats to commitfest personal dashboard page
1 parent ee12867 commit 3f1bc1d

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

pgcommitfest/commitfest/templates/me.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{%extends "base.html"%}
22
{%load commitfest %}
33
{%block contents%}
4+
<p>
5+
<br/>
6+
<b>Status summary: </b>{%for id,title,num in statussummary%}<a href="?status={{id}}">{{title}}</a>: {{num}}. {%endfor%}
7+
</p>
8+
49
<a class="btn btn-default" href="/open/new/">New patch</a>
510
<a class="btn btn-default" href="/current/">Current commitfest</a></li>
611
<a class="btn btn-default" href="/open/">Open commitfest</a></li>

pgcommitfest/commitfest/views.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,26 @@ def me(request):
8686
if patch_list.redirect:
8787
return patch_list.redirect
8888

89+
# Get stats related to user for current commitfest
90+
curs = connection.cursor()
91+
curs.execute(
92+
"SELECT ps.status, ps.statusstring, count(*) FROM commitfest_patchoncommitfest poc INNER JOIN commitfest_patchstatus ps ON ps.status=poc.status INNER JOIN commitfest_patch_authors pa ON pa.patch_id=poc.patch_id WHERE commitfest_id=%(id)s AND pa.user_id=%(user_id)s GROUP BY ps.status ORDER BY ps.sortkey",
93+
{
94+
"id": cf.id,
95+
"user_id": request.user.id
96+
},
97+
)
98+
statussummary = curs.fetchall()
99+
print(statussummary)
100+
89101
return render(
90102
request,
91103
"me.html",
92104
{
93105
"form": form,
94106
"title": "Personal Dashboard",
95107
"patches": patch_list.patches,
96-
"statussummary": "",
108+
"statussummary": statussummary,
97109
"has_filter": patch_list.has_filter,
98110
"grouping": patch_list.sortkey == 0,
99111
"sortkey": patch_list.sortkey,

0 commit comments

Comments
 (0)