Changeset 1240 for pykota/trunk/pykota/reporters

Timestamp:

12/27/03 17:49:25 (20 years ago)

Author:

uid67467

Message:

Should be ok now.

Location:

pykota/trunk/pykota/reporters

Files:

• html.py (modified) (3 diffs)
• text.py (modified) (3 diffs)

pykota/trunk/pykota/reporters/html.py

@@ -22 +22 @@
 #
 # $Log$
-# Revision 1.2  2003/12/27 15:43:36  uid67467
-# Savannah is back online...
+# Revision 1.3  2003/12/27 16:49:25  uid67467
+# Should be ok now.
 #
 # Revision 1.1  2003/12/02 14:41:17  jalet
@@ -56 +56 @@
                 for (group, grouppquota) in self.tool.storage.getPrinterGroupsAndQuotas(printer, self.ugnames) :
                     oddeven += 1
-                    if oddeven % 1 :
+                    if oddeven % 2 :
                         oddevenclass = "odd"
                     else :    
                         oddevenclass = "even"
-                    (pages, money, name, reached, soft, hard, balance, datelimit, lifepagecounter, lifetimepaid) = self.getQuota(group, grouppquota)
+                    (pages, money, name, reached, pagecounter, soft, hard, balance, datelimit, lifepagecounter, lifetimepaid) = self.getQuota(group, grouppquota)
                     self.report.append('<tr class="%s">%s</tr>' % (oddevenclass, "".join(["<td>%s</td>" % h for h in (name, reached, pagecounter, soft, hard, balance, datelimit or "&nbsp;", lifepagecounter, lifetimepaid)])))
                     total += pages
@@ -68 +68 @@
                 for (user, userpquota) in self.tool.storage.getPrinterUsersAndQuotas(printer, self.ugnames) :
                     oddeven += 1
-                    if oddeven % 1 :
+                    if oddeven % 2 :
                         oddevenclass = "odd"
                     else :    

pykota/trunk/pykota/reporters/text.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.7  2003/12/27 16:49:25  uid67467
+# Should be ok now.
+#
 # Revision 1.6  2003/12/02 14:40:21  jalet
 # Some code refactoring.
@@ -45 +48 @@
 #
 
-from mx import DateTime
-
 from pykota.reporter import BaseReporter, PyKotaReporterError
     
@@ -68 +69 @@
                 self.report.append('-' * len(header))
                 for (group, grouppquota) in self.tool.storage.getPrinterGroupsAndQuotas(printer, self.ugnames) :
-                    (pages, money, name, reached, soft, hard, balance, datelimit, lifepagecounter, lifetimepaid) = self.getQuota(group, grouppquota)
+                    (pages, money, name, reached, pagecounter, soft, hard, balance, datelimit, lifepagecounter, lifetimepaid) = self.getQuota(group, grouppquota)
                     self.report.append("%-9.9s %s %7i %7s %7s %10s %-10.10s %8i %10s" % (name, reached, pagecounter, soft, hard, balance, datelimit, lifepagecounter, lifetimepaid))
                     total += pages