Changeset 1524 for pykota/trunk/cgi-bin

Timestamp:

06/06/04 00:42:41 (20 years ago)

Author:

jalet

Message:

Improved web history reports

Files:

• pykota/trunk/cgi-bin/printquota.cgi (modified) (3 diffs)

pykota/trunk/cgi-bin/printquota.cgi

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.28  2004/06/05 22:42:41  jalet
+# Improved web history reports
+#
 # Revision 1.27  2004/05/26 14:49:40  jalet
 # First try at saving the job-originating-hostname in the database
@@ -269 +272 @@
             else :
                 self.report.append('<table class="pykotatable" border="1">')
-                headers = ["Date", "User", "Printer", "PageCounter", "JobId", "JobSize", "JobPrice", "Copies", "Title", "Filename", "Options", "HostName", "Action"]
+                headers = ["Date", "Action", "User", "Printer", "Hostname", "JobId", "JobSize", "JobPrice", "Copies", "JobBytes", "PageCounter", "Title", "Filename", "Options"]
                 self.report.append('<tr class="pykotacolsheader">%s</tr>' % "".join(["<th>%s</th>" % h for h in headers]))
                 oddeven = 0
@@ -283 +286 @@
                         oddevenclass = "warn"
                     username = '<a href="%s?%s">%s</a>' % (os.environ.get("SCRIPT_NAME", ""), urllib.urlencode({"history" : 1, "username" : job.UserName}), job.UserName)
-                    self.report.append('<tr class="%s">%s</tr>' % (oddevenclass, "".join(["<td>%s</td>" % h for h in (job.JobDate[:19], username, job.PrinterName, job.PrinterPageCounter, job.JobId, job.JobSize, job.JobPrice, job.JobCopies, job.JobTitle, job.JobFileName, job.JobOptions, job.JobHostName, job.JobAction)])))
+                    self.report.append('<tr class="%s">%s</tr>' % (oddevenclass, "".join(["<td>%s</td>" % (h or "&nbsp;") for h in (job.JobDate[:19], job.JobAction, username, job.PrinterName, job.JobHostName, job.JobId, job.JobSize, job.JobPrice, job.JobCopies, job.JobSizeBytes, job.PrinterPageCounter, job.JobTitle, job.JobFileName, job.JobOptions)])))
                 self.report.append('</table>')
                 dico = { "history" : 1,