Changeset 1012 for WAeUP_SRP/trunk

Timestamp:

8 Dec 2006, 12:34:33 (18 years ago)

Author:

joachim

Message:

=clearance_edit_form fixed, nr_of used Pins is shown in batch_view

Location:

WAeUP_SRP/trunk

Files:

• ScratchCards.py (modified) (1 diff)
• skins/waeup_pins/batch_view.pt (modified) (1 diff)
• skins/waeup_pins/search_pins.py (modified) (3 diffs)
• skins/waeup_student/clearance_edit_form.pt (modified) (1 diff)

WAeUP_SRP/trunk/ScratchCards.py

@@ -147 +147 @@
         return unused
 
+    security.declareProtected(View,"getNumberOfUsedPins")
+    def getNumberOfUsedPins(self):
+        """return the number of used Pins"""
+        #import pdb;pdb.set_trace()
+        pins_cat = self.portal_pins
+        doc = self.getContent()
+        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]
+        return len(used)
+
 InitializeClass(ScratchCardBatch)
 

WAeUP_SRP/trunk/skins/waeup_pins/batch_view.pt

@@ -27 +27 @@
         
         
+
+        <h3><span tal:replace="info/nr_used" /> Pins used out of 
+        <span tal:replace="info/batch_doc/no_of_pins" /></h3>
+      
         <span tal:replace="structure rendered" />
 

WAeUP_SRP/trunk/skins/waeup_pins/search_pins.py

@@ -22 +22 @@
 lt = context.portal_layouts
 validate = request.has_key("cpsdocument_edit_button")
+default = {'search_mode': 'student',}
 rend,psm,ds = lt.renderLayout(layout_id= 'scratch_card_search',
                       schema_id= 'student_search',
                       context=context,
                       mapping=validate and request,
-                      ob={},
+                      ob=default,
                       layout_mode='edit',
                       formaction="search_pins",
@@ -35 +36 @@
 info['unused'] = info['batch_doc'].getUnusedPins()
 info['used'] = []
+info['nr_used'] = info['batch_doc'].getNumberOfUsedPins()
 
 if psm == '':
@@ -46 +48 @@
 what = ds.get('search_mode')
 term = ds.get('search_string')
+if term != "":
+    if what == 'student' :
+        items_1 = context.portal_pins(student = term.upper())
+        items_2 = context.portal_pins(student = term.lower())
+        items = items_1 + items_2
+    elif what == 'pin':
+        items = context.portal_pins(pin = term.upper())
+    else:
+        items = []
+    l = []
+    students_url = "%s/%s" % (context.portal_url(),'students')
+    pins = []
+    for i in items:
+        item = {}
+        sno = i['student']
+        item['student'] = sno
+        item['serial'] = i.serial
+        item['pin'] = i.pin
+        if i.pin in pins:
+            continue
+        pins.append(i.pins)
+        if len(sno)==10:
+            #res = context.portal_catalog(SearchableText=sno,portal_type='StudentApplication')
+            res = context.students_catalog(jamb_reg_no=sno.upper())
+            if len(res) > 0:
+                item['student_url'] = "%s/campus/students/%s" % (context.portal_url(),res[0].id)
+                item['student_id'] = res[0].id
+            else:
+                item['student_url'] = None
+                item['student_id'] = ''
+        elif sno:
+            item['student_url'] = '%s/campus/students/%s' % (students_url,item['student'])
+            item['student_id'] = student
+        else:
+            item['student_url'] = ''
+            item['student_id'] = "not used"
+        l.append(item)
+        
+    info['used'] = l
 
-if what == 'student':
-    items_1 = context.portal_pins(student = term.upper())
-    items_2 = context.portal_pins(student = term.lower())
-    items = items_1 + items_2
-elif what == 'pin':
-    items = context.portal_pins(pin = term.upper())
-else:
-    items = []
-l = []
-students_url = "%s/%s" % (context.portal_url(),'students')
-pins = []
-for i in items:
-    item = {}
-    sno = i['student']
-    item['student'] = sno
-    item['serial'] = i.serial
-    item['pin'] = i.pin
-    if i.pin in pins:
-        continue
-    pins.append(i.pins)
-    if len(sno)==10:
-        #res = context.portal_catalog(SearchableText=sno,portal_type='StudentApplication')
-        res = context.students_catalog(jamb_reg_no=sno.upper())
-        if len(res) > 0:
-            item['student_url'] = "%s/campus/students/%s" % (context.portal_url(),res[0].id)
-            item['student_id'] = res[0].id
-        else:
-            item['student_url'] = None
-            item['student_id'] = ''
-    elif sno:
-        item['student_url'] = '%s/campus/students/%s' % (students_url,item['student'])
-        item['student_id'] = student
-    else:
-        item['student_url'] = ''
-        item['student_id'] = "not used"
-    l.append(item)
-    
-info['used'] = l
 return context.batch_view(rendered = rend,
                              psm = psm,

WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_form.pt

@@ -10 +10 @@
            editable python: (is_student and clear_review_state == 'opened' or is_so) and not is_co;
            mode python: test(editable,'edit','view');
+           layout_id python: test(is_co,'student_clearance','student_clearance_fe');
            rendered_main python:info['clear_doc'].render(request=request,
                                                layout_mode = mode,
                                                schema_id='student_clearance',
-                                               layout_id='student_clearance',
+                                               layout_id=layout_id,
                                                use_session=True);
            form_action string:clearance_edit;