svn commit: r1760250 - in /comdev/reporter.apache.org/trunk/site: getjson.py render.js

[se...@apache.org]

Author: sebb
Date: Sun Sep 11 13:57:18 2016
New Revision: 1760250

URL: http://svn.apache.org/viewvc?rev=1760250&view=rev
Log:
Where multiple JIRAs may be used, record all the keys with tickets rather than just the last one checked
Show which keys had tickets

Modified:
    comdev/reporter.apache.org/trunk/site/getjson.py
    comdev/reporter.apache.org/trunk/site/render.js

Modified: comdev/reporter.apache.org/trunk/site/getjson.py
URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/getjson.py?rev=1760250&r1=1760249&r2=1760250&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/getjson.py (original)
+++ comdev/reporter.apache.org/trunk/site/getjson.py Sun Sep 11 13:57:18 2016
@@ -293,20 +293,24 @@ if re.match(r"^[-a-zA-Z0-9_.]+$", user):
         jiraname = group.upper()
         if group in jmap:
             keys[group] = []
+            jdata[group][2] = []
             for jiraname in jmap[group]:
                 x,y, p = getJIRAS(jiraname)
                 jdata[group][0] += x
                 jdata[group][1] += y
-                jdata[group][2] = p
+                if x > 0 or y > 0:
+                    jdata[group][2].append(p)
                 keys[group].append(jiraname)
         elif group in ddata and 'name' in ddata[group]:
             jiras = getJIRAProjects(ddata[group]['name'])
             keys[group] = jiras
+            jdata[group][2] = []
             for jiraname in jiras:
                 x,y, p= getJIRAS(jiraname)
                 jdata[group][0] += x
                 jdata[group][1] += y
-                jdata[group][2] = p
+                if x > 0 or y > 0:
+                    jdata[group][2].append(p)
         elif jiraname:
             keys[group]=[jiraname]
             x,y, p= getJIRAS(jiraname)

Modified: comdev/reporter.apache.org/trunk/site/render.js
URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/render.js?rev=1760250&r1=1760249&r2=1760250&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/render.js (original)
+++ comdev/reporter.apache.org/trunk/site/render.js Sun Sep 11 13:57:18 2016
@@ -792,8 +792,9 @@ function renderJIRA(pmc) {
 	obj.innerHTML += jsdata.jira[pmc][0] + " JIRA tickets created in the last 3 months<br>";
 	obj.innerHTML += jsdata.jira[pmc][1] + " JIRA tickets closed/resolved in the last 3 months<br>";
 	if (jsdata.keys[pmc]) {
-		obj.innerHTML += "Keys used: <kbd>" + jsdata.keys[pmc].join(", ") + "</kbd>"
+		obj.innerHTML += "Keys used: <kbd>" + jsdata.keys[pmc].join(", ") + "</kbd><br>"
 	}
+	obj.innerHTML += "Keys with tickets: <kbd>" + jsdata.jira[pmc][2].join(", ") + "</kbd>"
 
 }