Changeset 2220 for pykota/trunk/cgi-bin

Timestamp:

04/28/05 09:20:20 (20 years ago)

Author:

jerome

Message:

Job's billing code is now clicable in the print job
history viewed from the CGI script

Files:

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

pykota/trunk/cgi-bin/printquota.cgi

@@ -183 +183 @@
             else :    
                 hostname = None
+            if self.form.has_key("billingcode") :    
+                billingcode = self.form["billingcode"].value
+            else :    
+                billingcode = None
             self.report = ["<h2>%s</h2>" % _("History")]    
-            history = self.storage.retrieveHistory(user, printer, datelimit, hostname)
+            history = self.storage.retrieveHistory(user, printer, datelimit, hostname, billingcode)
             if not history :
                 self.report.append("<h3>%s</h3>" % _("Empty"))
@@ -213 +217 @@
                     else :    
                         hostname_url = None
-                    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_url, printername_url, hostname_url, job.JobId, job.JobSize, job.JobPrice, job.JobCopies, job.JobSizeBytes, job.PrinterPageCounter, job.JobTitle, job.JobFileName, job.JobOptions, job.JobMD5Sum, job.JobBillingCode, job.JobPages)])))
+                    if job.JobBillingCode :
+                        billingcode_url = '<a href="%s?%s">%s</a>' % (os.environ.get("SCRIPT_NAME", ""), urllib.urlencode({"history" : 1, "billingcode" : job.JobBillingCode}), job.JobBillingCode)
+                    else :    
+                        billingcode_url = None
+                    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_url, \
+                                                        printername_url, \
+                                                        hostname_url, \
+                                                        job.JobId, \
+                                                        job.JobSize, \
+                                                        job.JobPrice, \
+                                                        job.JobCopies, \
+                                                        job.JobSizeBytes, \
+                                                        job.PrinterPageCounter, \
+                                                        job.JobTitle, \
+                                                        job.JobFileName, \
+                                                        job.JobOptions, \
+                                                        job.JobMD5Sum, \
+                                                        billingcode_url, \
+                                                        job.JobPages)])))
                 self.report.append('</table>')
                 dico = { "history" : 1,