[Cdd-commits] r1131 - in cdd/trunk/webtools: . templates

[CDD Subversion Commit]

Author: tille
Date: Tue Oct  7 16:24:20 2008
New Revision: 1131

Modified:
   cdd/trunk/webtools/bugs.py
   cdd/trunk/webtools/templates/bugs.xhtml
Log:
First version which is at least similar to Davids PHP page, further polishing needed.


Modified: cdd/trunk/webtools/bugs.py
==============================================================================
--- cdd/trunk/webtools/bugs.py	(original)
+++ cdd/trunk/webtools/bugs.py	Tue Oct  7 16:24:20 2008
@@ -89,24 +89,35 @@
 	data['projectadvertising'] = None
 
 allbugs = {}
+nbugs   = {}
+ndone   = {}
 for task in packages.keys():
-	pkgbugs = []
+	pkgbugs     = []
+	nbugs[task] = 0
+	ndone[task] = 0
 	# query bugs of meta package name
 	pkgbug = PackageBugs(data['tasks'][task].metapkg.pkg)
+
 	if pkgbug.pkgname:
 		pkgbugs.append(pkgbug)
 	for pkg in packages[task]:
 		pkgbug = PackageBugs(pkg)
 		if pkgbug.pkgname:
 			pkgbugs.append(pkgbug)
+		nbugs[task] += pkgbug.nbugs
+		ndone[task] += pkgbug.ndone
+
 	if pkgbugs:
 		allbugs[task] = pkgbugs
 	else:
 		allbugs[task] = None
+	print >>stderr, "DEBUG: %s/%s: nbugs = %i, ndone = %i" % (task, pkgbug.pkgname, nbugs[task], ndone[task])
 
 for task in packages.keys():
 	data['task']    = task
 	data['pkgbugs'] = allbugs[task]
+	data['nbugs']   = nbugs[task]
+	data['ndone']   = ndone[task]
 	template = loader.load('bugs.xhtml')
 	f = open(outputdir + '/' + task + '.html', 'w')
 	print >> f, template.generate(**data).render('xhtml')

Modified: cdd/trunk/webtools/templates/bugs.xhtml
==============================================================================
--- cdd/trunk/webtools/templates/bugs.xhtml	(original)
+++ cdd/trunk/webtools/templates/bugs.xhtml	Tue Oct  7 16:24:20 2008
@@ -38,11 +38,13 @@
 	</td>
 	<td class="main">
 		<div class="pageBody">
+
+<span py:choose="">
+  <span py:when="nbugs > 0">
 			<h1>$projectname ${tasks[task].metapkg.PrintedName.capitalize()} bugs</h1>
-<span py:if="pkgbugs != None">
 <table class="bugs">
   <py:for each="pkgbug in pkgbugs">
-    <span py:if="pkgbug.bugs != None">
+    <span py:if="pkgbug.nbugs > 0">
       <tr>
 	<td class="package">${pkgbug.pkgname} (${pkgbug.nbugs})</td>
 	<td colspan="2"></td>
@@ -58,12 +60,15 @@
   </py:for>
 </table>
 </span>
+<span py:otherwise=""><h1>$projectname ${tasks[task].metapkg.PrintedName.capitalize()} has no known open bugs</h1></span>
+</span>
 
+<span py:choose="">
+<span py:when="ndone > 0">
 <h1>$projectname ${tasks[task].metapkg.PrintedName.capitalize()} done bugs</h1>
-<span py:if="pkgbugs != None">
 <table class="bugs">
   <py:for each="pkgbug in pkgbugs">
-    <span py:if="pkgbug.done != None">
+    <span py:if="pkgbug.ndone > 0">
       <tr>
 	<td class="package">${pkgbug.pkgname} (${pkgbug.ndone}))</td>
 	<td colspan="2"></td>
@@ -79,6 +84,8 @@
   </py:for>
 </table>
 </span>
+<span py:otherwise=""><h1>$projectname ${tasks[task].metapkg.PrintedName.capitalize()} has no known done bugs</h1></span>
+</span>
 		</div>
 	</td>
 </tr>