Changeset 1030 for WAeUP_SRP/trunk

Timestamp:

11 Dec 2006, 18:12:23 (18 years ago)

Author:

joachim

Message:

made Widgets.py from Widgets_neu.py
corrected a syntax-error in Widgets.py
added some doubleclick error-checking in start_clearance (checked into Custom)
catch ConflictError? in PinTable?.
clearance_edit_form modified to catch anonymous access.
search_students.py + students_index.py actually unchanged.

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTables.py (modified) (3 diffs)
• Widgets.py (modified) (4 diffs)
• Widgets_neu.py (deleted)
• skins/waeup_student/clearance_edit_form.pt (modified) (2 diffs)
• skins/waeup_student/search_students_form.pt (modified) (1 diff)
• skins/waeup_student/start_clearance.py (modified) (3 diffs)
• skins/waeup_student/students_index.py (modified) (1 diff)

WAeUP_SRP/trunk/WAeUPTables.py

@@ -130 +130 @@
 
 class PinTable(WAeUPTable):
-
+    from ZODB.POSException import ConflictError
     meta_type = 'WAeUP Pin Tool'
     name = "pins"
@@ -136 +136 @@
     def __init__(self):
         WAeUPTable.__init__(self, 'portal_pins')
-
-
+        
+    
     def searchAndSetRecord(self, uid, student_id,prefix):
         #records = self.searchResults(uid=uid)
@@ -159 +159 @@
             # Add the updated data:
             record_data['student'] = student_id
-            self.catalog_object(dict2ob(record_data), uid)
-            return 1
+            try:
+                self.catalog_object(dict2ob(record_data), uid)
+                return 1
+            except ConflictError:
+                return 2
         if record.student.upper() != student_id.upper():
             return 0

WAeUP_SRP/trunk/Widgets.py

@@ -506 +506 @@
         s_id = str(self.portal_membership.getAuthenticatedMember())
         if self.reference == "":
-            ref = s_id 
+            ref = s_id
         else:
             ref = datastructure[self.reference]
@@ -512 +512 @@
                 do = 0
                 datastructure.setError(widget_id, 'Errors in other data, PIN neither checked nor used.')
+                s_logger.info('"%s", "%s","entered wrong data together with pin", "%s"' % (s_id,ref,pin))
         while do:
             ok = pins.searchAndSetRecord(pin,ref,prefix)
-            if ok == -2:
+            if ok < -2 or ok > 2:
+                err = 'Unknown error, please report!'
+                s_logger.info('"%s","%s", "caused unknown error with pin", "%s"' % (s_id,ref,pin))
+                break
+            elif ok == -2:
                 err = 'Service already activated but with a different PIN.'
+                s_logger.info('"%s","%s", "repeatedly activated service but with different pin", "%s"' % (s_id,ref,pin))
                 break
             elif ok == -1:
                 err = 'Invalid PIN'
-                break
-            elif ok == -3:
-                err = 'Unknown error, please report!'
+                s_logger.info('"%s","%s", "entered invalid pin", "%s"' % (s_id,ref,pin))
                 break
             if ok == 0:
                 err = 'PIN already used.'
+                s_logger.info('"%s","%s", "entered used pin", "%s"' % (s_id,ref,pin))
                 break
             if ok >= 1:
@@ -531 +536 @@
                     if self.reference == "jamb_reg_no":
                         err = "You are already logged in."
-                        s_logger.info('"%s", "logged in with pin", "%s"' % (ref,pin))
+                        s_logger.info('"%s","%s", "checked admission though logged in", "%s"' % (s_id,ref,pin))
                         break
-                    s_logger.info('"%s", "used pin", "%s"' % (ref,pin))                #bitte genauer beschreiben
+                    s_logger.info('"%s","%s", "successfully used pin", "%s"' % (s_id,ref,pin)) 
                     break
                 else:
                     student = getStudentByRegNo(self,ref)
-                    s_logger.info('"jamb_reg_no:%s","used","%s"' % (ref,pin))         #bitte genauer beschreiben
+                    s_logger.info('"%s","%s","successfully used pin","%s"' % (s_id,ref,pin))
                 if student is None:
                     err = "Student not found."
+                    s_logger.info('"%s","not found in admission list"' % (ref)) 
                     break
                 s_id = student.getId()
@@ -546 +552 @@
                         if hasattr(self.portal_directories.students,s_id):
                             err = "Please login with your Student Id %s and 10-digit PIN." % s_id
-                            s_logger.info('"%s", "repeatedly checked admission with pin", "%s"' % (s_id,pin))      #ist das richtig?
+                            s_logger.info('"%s","%s", "repeatedly checked admission with pin", "%s"' % (s_id,ref,pin))   
                             break
                         else:
-                            s_logger.info('"%s","(non-member) repeatedly checked admission with pin",  "%s"' % (s_id,pin))     #ist das richtig?
+                            s_logger.info('"%s","%s","(non-member) repeatedly checked admission with pin", "%s"' % (s_id,ref,pin)) 
                     else:
-                        err = "Please login with your Student Id %s and 10-digit PIN." % s_id
-                        s_logger.info('"%s", "repeatedly checked admission with pin", "%s"' % (s_id,pin))      #ist das richtig?
+                        err = "Unknown error" % s_id
+                        s_logger.info('"%s","%s", "repeatedly activated service with pin", "%s"' % (s_id,ref,pin))   
                         break
-##                if self.reference == "jamb_reg_no":
-##                    res = self.students_catalog(jamb_reg_no = ref)
-##                    if len(res) > 0:
-##                        err = "Please login with your Student Id %s and 10-digit PIN." % s_id
-##                        s_logger.info("Student %s double checked Admission Pin %s" % (s_id,pin))
-##                        break
                 try:
                     student.getContent().makeStudentMember(s_id,password=pin[4:])
-                    s_logger.info('"%s", "has been created using pin", "%s"' % (s_id,pin))
+                    s_logger.info('"%s","%s", "has been created using pin", "%s"' % (s_id,ref,pin))
                 except:
                     err = "Please login with your Student Id %s and 10-digit PIN." % s_id
-                    s_logger.info('"%s", "has been repeatedly created usin pin", "%s"' % (s_id,ref))      #?????  bitte genauer beschreiben
+                    s_logger.info('"%s","%s", "could not be made a member with pin", "%s"' % (s_id,ref,pin))  
                     break
             break

WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_form.pt

@@ -1 +1 @@
 <metal:block define-macro="clearance_edit_form">
+<metal:block tal:define="info context/getStudentInfo">
+  <span tal:condition="not: info">
+    <metal:block use-macro="here/error_not_found/macros/not_found" />
+  </span>
+<metal:block tal:condition="info"> 
 <tal:block define="
-           info context/getStudentInfo;
            is_so context/isSectionOfficer;
            is_staff context/isStaff;
@@ -46 +50 @@
 </tal:block>
 </metal:block>
+</metal:block>
+</metal:block>

WAeUP_SRP/trunk/skins/waeup_student/search_students_form.pt

@@ -35 +35 @@
       
         <span tal:replace="structure rendered" />
-        <tal:block tal:condition="python: batch_info and batch_info['nb_pages'] > 1">
+        <tal:block tal:condition="python: items and batch_info and batch_info['nb_pages'] > 1">
           <div class="batchLayout">
             <span i18n:translate="">

WAeUP_SRP/trunk/skins/waeup_student/start_clearance.py

@@ -23 +23 @@
 app_doc = info['app_doc']
 review_state = info['review_state']
-
+session = REQUEST.SESSION
 res,psm,ds = lt.renderLayout(layout_id='student_clearance',
                       schema_id= 'student_clearance',
@@ -41 +41 @@
                                  )
 error = False
-if app_doc.passport is None:
+if session.get("clicked",None):
+    psm = 'Please wait a moment, until "Clearance started" turns green, then click on the green link'
+    error = True
+elif app_doc.passport is None:
     psm = "You must upload your passport picture before you can start the registration process!"
     error = True
@@ -57 +60 @@
                                  ds = ds,
                                  )
+session.set("clicked","clicked")
 pin = str(ds.get('clr_ac_pin'))
 logger.info('"%s", "entered clearance pin", "%s"' % (info['id'],pin))

WAeUP_SRP/trunk/skins/waeup_student/students_index.py

@@ -24 +24 @@
 
 if "ClearanceOfficers" in member.getGroups():
-    return redirect("%s/search_students" % students_url)
+    return context.waeup_tool.searchStudents()
+    #return redirect("%s/search_students" % students_url)
 if context.isSectionOfficer():
     return redirect("%s/search_students" % students_url)