Changeset 688 for WAeUP_SRP/trunk

Timestamp:

13 Oct 2006, 12:36:47 (18 years ago)

Author:

joachim

Message:

pins overview now shows first 10 unused and all used pins

Location:

WAeUP_SRP/trunk

Files:

• ScratchCards.py (modified) (1 diff)
• skins/waeup_pins/batch_index_html.pt (modified) (3 diffs)
• skins/waeup_pins/getBatchInfo.py (modified) (2 diffs)

WAeUP_SRP/trunk/ScratchCards.py

@@ -87 +87 @@
     def getUnusedPins(self):
         """return a list of unused Pins"""
-        max_pins = 30
+        max_pins = 10
         #import pdb;pdb.set_trace()
         pins_cat = self.portal_pins

WAeUP_SRP/trunk/skins/waeup_pins/batch_index_html.pt

@@ -2 +2 @@
 
   <metal:body use-macro="here/main_template/macros/master">
+    <metal:block fill-slot="header">
+      <a href=""
+         tal:attributes="href string:${here/academicsParent}">
+        <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
+        Up one level
+      </a>
+      <h3 tal:content="here/title_or_id" />
+      <div tal:condition="nothing" tal:content="info/container_path"/>
+    </metal:block>
 
     <metal:main fill-slot="main">
@@ -7 +16 @@
       </span>
       <span tal:condition="python:not isAnon and info">
-
-        <h3>Unused PINs</h3>
-        <br />
         <span tal:omit-tag="" 
               tal:content="structure python: info['batch_doc'].render(proxy=info['batch_doc'],
@@ -16 +22 @@
               />
         <br />
+        <h3>Unused</h3>
         <table>
           <tr tal:repeat="pin info/unused">
             <td tal:content="pin/serial" />
             <td tal:content="pin/pin" />
+          </tr>
+        </table>
+        <h3>Used</h3>
+        <table>
+          <tr tal:repeat="pin info/used">
+            <td tal:content="pin/serial" />
+            <td tal:content="pin/pin" />
+            <td tal:content="pin/student" />
           </tr>
         </table>

WAeUP_SRP/trunk/skins/waeup_pins/getBatchInfo.py

@@ -10 +10 @@
 # $Id: student_edit.py 486 2006-09-06 10:09:39Z joachim $
 """
-return Info about the current Student
+return Info about the current Batch
 """
 
@@ -22 +22 @@
 info['id'] = batch.getId()
 info['title'] = batch.Title or 'empty Title'
-info['unused'] = batch.getContent().getUnusedPins()
+info['unused'],info['used'] = batch.getContent().getUnusedPins()
 return info