Index: pykota/trunk/pykota/reporters/html.py
===================================================================
--- pykota/trunk/pykota/reporters/html.py (revision 3561)
+++ pykota/trunk/pykota/reporters/html.py (revision 3568)
@@ -38,40 +38,42 @@
prefix = "User"
for printer in self.printers :
- phistoryurl = { "printername" : printer.Name, "history" : 1 }
- self.report.append('%s
' % (os.environ.get("SCRIPT_NAME", ""), urllib.urlencode(phistoryurl), self.getPrinterTitle(printer)))
- self.report.append('
%s | " % h for h in headers])) - oddeven = 0 - for (entry, entrypquota) in getattr(self.tool.storage, "getPrinter%ssAndQuotas" % prefix)(printer, self.ugnames) : - oddeven += 1 - if oddeven % 2 : - oddevenclass = "odd" - else : - oddevenclass = "even" - (pages, money, name, reached, pagecounter, soft, hard, balance, datelimit, lifepagecounter, lifetimepaid, overcharge, warncount) = self.getQuota(entry, entrypquota) - if datelimit : - if datelimit == "DENY" : - oddevenclass = "deny" + entries = getattr(self.tool.storage, "getPrinter%ssAndQuotas" % prefix)(printer, self.ugnames) + if entries : + phistoryurl = { "printername" : printer.Name, "history" : 1 } + self.report.append('
---|
%s | " % h for h in headers])) + oddeven = 0 + for (entry, entrypquota) in entries : + oddeven += 1 + if oddeven % 2 : + oddevenclass = "odd" else : - oddevenclass = "warn" - if (not self.tool.config.getDisableHistory()) and (not self.isgroup) : - name = '%s' % (os.environ.get("SCRIPT_NAME", ""), name, printer.Name, name) - self.report.append('||||||||||
---|---|---|---|---|---|---|---|---|---|---|
%s | " % h for h in (name, reached, overcharge, pagecounter, soft, hard, balance, datelimit or " ", lifepagecounter, lifetimepaid, warncount)]))) - total += pages - totalmoney += money + oddevenclass = "even" + (pages, money, name, reached, pagecounter, soft, hard, balance, datelimit, lifepagecounter, lifetimepaid, overcharge, warncount) = self.getQuota(entry, entrypquota) + if datelimit : + if datelimit == "DENY" : + oddevenclass = "deny" + else : + oddevenclass = "warn" + if (not self.tool.config.getDisableHistory()) and (not self.isgroup) : + name = '%s' % (os.environ.get("SCRIPT_NAME", ""), name, printer.Name, name) + self.report.append('||||||||||
%s | " % h for h in (name, reached, overcharge, pagecounter, soft, hard, balance, datelimit or " ", lifepagecounter, lifetimepaid, warncount)]))) + total += pages + totalmoney += money - if total or totalmoney : - (tpage, tmoney) = self.getTotals(total, totalmoney) - self.report.append('||||||||||
%s | %s | |||||||||
%s |
%s
' % _("Totals may be inaccurate if some users are members of several groups."))