Changeset 1540

Timestamp:

14 Mar 2007, 11:48:01 (18 years ago)

Author:

Henrik Bettermann

Message:

batch_view beautified

Location:

WAeUP_SRP/trunk/skins/waeup_pins

Files:

• batch_view.pt (modified) (1 diff)
• disable_pins.py (modified) (1 diff)
• getBatchInfo.py (deleted)
• search_pins.py (modified) (5 diffs)

WAeUP_SRP/trunk/skins/waeup_pins/batch_view.pt

@@ -30 +30 @@
         <table tal:condition="info/used">
           <tr tal:repeat="pin info/used">
-            <td tal:content="python:path('repeat/pin/index')+1" />
-            <td width="50px"> <span tal:content="pin/serial" />: </td>
+            <td tal:content="python:path('repeat/pin/index')+1">: </td>
+            <td width="50px"> <span tal:content="pin/serial" /></td>
             <td tal:content="pin/pin" />
             <td tal:content="pin/student_id" />

WAeUP_SRP/trunk/skins/waeup_pins/disable_pins.py

@@ -36 +36 @@
     uid = res[0].pin
     dict = {"pin": uid,
-            "student": "disabled by: %s on %s" % (member,current)
+            "student": "disabled by %s on %s" % (member,current)
             }
     pincat.modifyRecord(**dict)

WAeUP_SRP/trunk/skins/waeup_pins/search_pins.py

@@ -39 +39 @@
                 not_found.append(item)
     return not_found
-        
+
 def set_used_pins(items, from_cat=False):
     l = []
@@ -55 +55 @@
             pin = i.get('pin')
         item['student'] = sno
-        item['prefix'] = prefix 
+        item['prefix'] = prefix
         item['serial'] = serial
         if len(sno) > 0:
@@ -79 +79 @@
             if sno.startswith('disabled'):
                 item['student_url'] = None
+                item['student_id'] = ''
             else:
                 item['student_url'] = '%s/campus/students/%s' % (context.portal_url(),item['student'])
-            item['student_id'] = item['student']
+                item['student_id'] = item['student']
         else:
             item['student_url'] = ''
@@ -104 +105 @@
 #from Products.zdb import set_trace;set_trace()
 if context.portal_type == "ScratchCardBatch":
-    info['batch_doc'] = context.getContent() 
+    info['batch_doc'] = context.getContent()
     info['used'] = set_used_pins(info['batch_doc'].getUsedPins())
     info['unused'] = info['batch_doc'].getUnusedPins()
@@ -140 +141 @@
     else:
         items = []
-        
+
 info['used'] = set_used_pins(items,from_cat=True)