Changeset 3812 for WAeUP_SRP/trunk

Timestamp:

11 Dec 2008, 07:24:16 (16 years ago)

Author:

Henrik Bettermann

Message:

resolve Uniben #589

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTool.py (modified) (2 diffs)
• skins/waeup_fceoyo/getSchoolFee.py (modified) (1 diff)

WAeUP_SRP/trunk/WAeUPTool.py

@@ -380 +380 @@
     def generateStudentId(self,letter): ###(
         import random
+        logger = logging.getLogger('WAeUPTool.generateStudentId')
         r = random
-        ##if letter not in ('ABCDEFGIHKLMNOPQRSTUVWXY'):
         if letter == '?':
             letter= r.choice('ABCDEFGHKLMNPQRSTUVWXY')
         sid = "%c%d" % (letter,r.randint(99999,1000000))
         students = self.portal_url.getPortalObject().campus.students
-        # while hasattr(students, sid):
-        #     sid = "%c%d" % (letter,r.randint(99999,1000000))
-        while self.students_catalog(id = sid):
+        while self.students_catalog(id = sid) or self.waeup_tool.picturePathExists(sid):
+            if self.waeup_tool.picturePathExists(sid):
+                logger.info('picture path %s exists' % sid)
             sid = "%c%d" % (letter,r.randint(99999,1000000))
         return sid
@@ -1263 +1263 @@
         pictures  = [picture[:picture.rfind('_')] for picture in os.listdir(picture_path)]
         return set(ids).issubset(set(pictures))
+    ###)
+    
+        security.declarePublic('picturePathExists') ###(
+    def picturePathExists(self, student_id=None):
+        """check if picture path exists in the filesystem"""
+        if student_id is None:
+            student_id = self.getStudentId()
+        if student_id is None:
+            return False
+        picture_path = getImagesDir(student_id)
+        if os.path.exists(picture_path):
+            return True
+        return False
     ###)
     

WAeUP_SRP/trunk/skins/waeup_fceoyo/getSchoolFee.py

@@ -14 +14 @@
 
 
-ARTS = ('CRS','ISS','MUS','SOS','THA','PES')
+ARTS = ('CRS','ISS','MUS','SOS','THA','PES','ECO','GEO')
 
 # SCS = ('BIO','HEC','MAT','ARB','ISC','IGB','YOR','HAU','ENG ','FRE','PHY ','CSC','PHE','AGE','FAA','BED','HEC')