Changeset 686 for WAeUP_SRP/trunk/ScratchCards.py

Timestamp:

13 Oct 2006, 11:27:44 (18 years ago)

Author:

joachim

Message:

accommodation reservation works again, reverted layout_waeup_edit to old version

File:

• WAeUP_SRP/trunk/ScratchCards.py (modified) (1 diff)

WAeUP_SRP/trunk/ScratchCards.py

@@ -91 +91 @@
         pins_cat = self.portal_pins
         doc = self.getContent()
-        l = [{'pin': p.pin,
+        unused = [{'pin': p.pin,
               'serial': p.serial,
               } for p in pins_cat.searchResults(prefix_batch = "%s%d"
                                                % (doc.prefix,doc.batch_no),
-                                               ) if p.student == '']
-        if len (l) <= max_pins:
-            return l
-        return l[:max_pins]
+                                               ) if not p.student]
+        used = [{'pin': p.pin,
+              'serial': p.serial,
+              'student': p.student,
+              } for p in pins_cat.searchResults(prefix_batch = "%s%d"
+                                               % (doc.prefix,doc.batch_no),
+                                               ) if p.student]
+        if len (unused) <= max_pins:
+            return unused,used
+        return unused[:max_pins],used
 
 InitializeClass(ScratchCardBatch)