Changeset 2364

Timestamp:

15 Oct 2007, 17:03:44 (17 years ago)

Author:

joachim

Message:

new function picturesList in waeup_tool used in clearance_edit

Location:

WAeUP_SRP/base

Files:

• WAeUPTool.py (modified) (1 diff)
• skins/waeup_student/clearance_edit.py (modified) (3 diffs)

WAeUP_SRP/base/WAeUPTool.py

@@ -702 +702 @@
     ###)
 
+    security.declarePublic('picturesList') ###(
+    def picturesList(self):
+        """check if pictures exist in the filesystem"""
+        path = 'images'
+        student_id = self.getStudentId()
+        picture_path = os.path.join(i_home,path,student_id)
+        if not os.path.exists(picture_path):
+            return []
+        return [picture[:picture.rfind('_')] for picture in os.listdir(picture_path)]
+    ###)
+
     security.declarePublic('showFsPicture') ###(
     def showFsPicture(self,path):

WAeUP_SRP/base/skins/waeup_student/clearance_edit.py

@@ -36 +36 @@
 #'Sorry, you are not allowed to access this page!'
 if info == None:
-  return REQUEST.RESPONSE.redirect(context.standard_error_message())
+    return REQUEST.RESPONSE.redirect(context.standard_error_message())
 student = info['student']
 #app = info['app']
@@ -49 +49 @@
                   )
 required_scans = ('fst_sit_scan',
-                  'age_dec',
-                  'birth_certificate',
 #                 'jamb_slip',
                   'ref_let',
@@ -97 +95 @@
         psm = "Content changed!"
         logger.info('%s edited clearance object of %s' % (member_id,student_id ))
-
     elif cpsdocument_edit_and_view_button:
         if acknowledge and info['review_state'] == "clearance_pin_entered":
-            missing = False
-            #files = clear_doc.objectIds()
-            # for scan in required_scans:
-            #     if scan not in files:
-            #         missing = True
-            #         break
-            # if not missing:
-            #     if not "age_dec" in files and not "birth_certificate" in files:
-            #         missing = True
-            if not context.waeup_tool.picturesExist(required_scans):
+            files = context.waeup_tool.picturesList()
+            req_found = [scan for scan in required_scans if scan in files]
+            birth_found = "age_dec" in files or "birth_certificate" in files
+            if not req_found or not birth_found:
                 logger.info('%s requested clearance with documents missing' % (student_id))
                 psm = "You have not uploaded all necessary documents to request clearance!"