Changeset 1278

Timestamp:

01/12/04 16:28:45 (21 years ago)

Author:

jalet

Message:

Now can output the user's history on several printers at the same time.

Location:

pykota/trunk

Files:

• cgi-bin/printquota.cgi (modified) (2 diffs)
• pykota/reporters/html.py (modified) (3 diffs)

pykota/trunk/cgi-bin/printquota.cgi

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.25  2004/01/12 15:28:45  jalet
+# Now can output the user's history on several printers at the same time.
+#
 # Revision 1.24  2004/01/12 14:52:03  jalet
 # Cuts the date string
@@ -271 +274 @@
                     elif job.JobAction == "WARN" :    
                         oddevenclass = "warn"
-                    self.report.append('<tr class="%s">%s</tr>' % (oddevenclass, "".join(["<td>%s</td>" % h for h in (job.JobDate[:19], job.User.Name, job.Printer.Name, job.PrinterPageCounter, job.JobId, job.JobSize, job.JobPrice, job.JobCopies, job.JobTitle, job.JobFileName, job.JobOptions, job.JobAction)])))
+                    username = '<a href="%s?%s">%s</a>' % (os.environ.get("SCRIPT_NAME", ""), urllib.urlencode({"history" : 1, "username" : job.User.Name}), job.User.Name)
+                    self.report.append('<tr class="%s">%s</tr>' % (oddevenclass, "".join(["<td>%s</td>" % h for h in (job.JobDate[:19], username, job.Printer.Name, job.PrinterPageCounter, job.JobId, job.JobSize, job.JobPrice, job.JobCopies, job.JobTitle, job.JobFileName, job.JobOptions, job.JobAction)])))
                 self.report.append('</table>')
                 dico = { "history" : 1,

pykota/trunk/pykota/reporters/html.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.8  2004/01/12 15:28:45  jalet
+# Now can output the user's history on several printers at the same time.
+#
 # Revision 1.7  2004/01/12 15:12:50  jalet
 # Small fix for history
@@ -44 +47 @@
 
 import os
+import urllib
 from mx import DateTime
 
@@ -58 +62 @@
             prefix = "User"
         for printer in self.printers :
-            self.report.append('<h2 class="printername">%s</h2>' % self.getPrinterTitle(printer))
+            phistoryurl = { "printername" : printer.Name, "history" : 1 }
+            self.report.append('<a href="%s?%s"><h2 class="printername">%s</h2></a>' % (os.environ.get("SCRIPT_NAME", ""), urllib.urlencode(phistoryurl), self.getPrinterTitle(printer)))
             self.report.append('<h3 class="printergracedelay">%s</h3>' % self.getPrinterGraceDelay(printer))
             (pjob, ppage) = self.getPrinterPrices(printer)