Changeset 1002

Timestamp:

6 Dec 2006, 18:08:45 (18 years ago)

Author:

joachim

Message:

search for PIN added

Location:

WAeUP_SRP/trunk

Files:

• ScratchCards.py (modified) (1 diff)
• profiles/default/layouts.xml (modified) (1 diff)
• profiles/default/layouts/scratch_card_search.xml (added)
• profiles/default/vocabularies.xml (modified) (1 diff)
• profiles/default/vocabularies/scratch_card_search_mode.xml (added)
• skins/waeup_pins/batch_view.pt (modified) (3 diffs)
• skins/waeup_pins/getBatchInfo.py (modified) (2 diffs)
• skins/waeup_pins/pins_view.pt (modified) (1 diff)
• skins/waeup_pins/search_pins.py (added)

WAeUP_SRP/trunk/ScratchCards.py

@@ -136 +136 @@
               } for p in pins_cat.searchResults(prefix_batch = "%s%d"
                                                % (doc.prefix,doc.batch_no),
-                                               ) 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
+                                               )[-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
 
 InitializeClass(ScratchCardBatch)

WAeUP_SRP/trunk/profiles/default/layouts.xml

@@ -13 +13 @@
  <object name="student" meta_type="CPS Layout"/>
  <object name="scratch_card_batch" meta_type="CPS Layout"/>
+ <object name="scratch_card_search" meta_type="CPS Layout"/>
  <object name="student_study_course" meta_type="CPS Layout"/>
  <object name="student_accommodation" meta_type="CPS Layout"/>

WAeUP_SRP/trunk/profiles/default/vocabularies.xml

@@ -21 +21 @@
  <object name="pin_prefixes" meta_type="CPS Vocabulary"/>
  <object name="student_search_mode" meta_type="CPS Vocabulary"/>
+ <object name="scratch_card_search_mode" meta_type="CPS Vocabulary"/>
  <object name="student_status_voc" meta_type="CPS Vocabulary"/>
  <object name="searchable_student_states" meta_type="CPS Vocabulary"/>

WAeUP_SRP/trunk/skins/waeup_pins/batch_view.pt

@@ -1 @@
-<metal:html tal:define="info context/getBatchInfo;
+<metal:html tal:define="info options/info;
+                        rendered options/rendered;
                         mtool here/portal_membership;
                         member mtool/getAuthenticatedMember;
                         ">
-
   <metal:body use-macro="here/main_template/macros/master">
     <metal:block fill-slot="header">
@@ -29 +29 @@
         <h3>Unused</h3>
         <table>
-          <tr tal:repeat="pin info/unused">
+          <tr tal:repeat="pin python: info['unused'][:2]">
             <td width="50px"> <span tal:content="pin/serial" />: </td>
             <td tal:content="pin/pin" />
@@ -35 +35 @@
         </table>
         </span>
+        <span tal:replace="structure rendered" />
 
-        <h3>Used</h3>
+        <h3>Results</h3>
         <table>
           <tr tal:repeat="pin info/used">
             <td width="50px"> <span tal:content="pin/serial" />: </td>
             <td tal:content="pin/pin" />
+            <td tal:content="pin/student_id" />
             <td>
               <a tal:condition="pin/student_url" href="" tal:content="pin/student"

WAeUP_SRP/trunk/skins/waeup_pins/getBatchInfo.py

@@ -25 +25 @@
 info['unused'],used = batch.getContent().getUnusedPins()
 l = []
-students_rpath = context.portal_catalog(meta_type = "StudentsFolder")[-1].relative_path
-students_url = "%s/%s" % (context.portal_url(),students_rpath)
+p_url = context.portal_url
+students_url = "%s/%s" % (p_url,"students")
 
 for item in used:
@@ -32 +32 @@
     if len(sno)==10:
     #if bd.prefix == "APP":
-        res = context.portal_catalog(SearchableText=sno,portal_type='StudentApplication')
+        #res = context.portal_catalog(SearchableText=sno,portal_type='StudentApplication')
+        res = context.students_catalog(jamb_reg_no=sno)
         if len(res) > 0:
-            item['student_url'] = "%s/%s" % (context.portal_url(),res[0].relative_path)
+            item['student_url'] = "%s/%s" % (context.portal_url(),res[0].id)
+            item['student_id'] = res[0].id
         else:
             item['student_url'] = None
     else:
         item['student_url'] = '%s/%s' % (students_url,item['student'])
+        item['student_id'] = student
 info['used'] = used
 return info

WAeUP_SRP/trunk/skins/waeup_pins/pins_view.pt

@@ -10 +10 @@
           <tr tal:repeat="batch batches">
             <td><a href="batch" 
-                   tal:attributes="href string:${batch/getPath}"
+                   tal:attributes="href string:${batch/getPath}/search_pins"
                    tal:content="batch/Title"></a></td>    
           </tr>