Changeset 1460

Timestamp:

21 Feb 2007, 17:39:39 (18 years ago)

Author:

joachim

Message:

M skins/waeup_student/getLevelFromResultsCosCode.py
return 2 for course_code "na"
M skins/waeup_accommodation/release_bed.py
M WAeUPTool.py
use getEntryMode in makeData

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTool.py (modified) (3 diffs)
• skins/waeup_accommodation/release_bed.py (modified) (1 diff)
• skins/waeup_student/getLevelFromResultsCosCode.py (modified) (1 diff)

WAeUP_SRP/trunk/WAeUPTool.py

@@ -72 +72 @@
             sid = "%c%d" % (letter,r.randint(99999,1000000))
         return sid
+    ###)
 
     def generatePassword(self,s=None): ###(
@@ -92 +93 @@
             return None
         return getattr(student_entry,"password","not set")
+    ###)
+
+    security.declarePublic('checkPassword') ###(
+    def checkPassword(self,password):
+        "return a student password"
+        student_entry = getattr(self.portal_directories.students,student_id,None)
+        if student_entry is None:
+            return False
+        return getattr(student_entry,"password","not set") == password
     ###)
 
@@ -306 +316 @@
         student_obj.invokeFactory('StudentPersonal','personal')
         da['jamb_reg_no'] = student.Entryregno
-        em = student.Mode_of_Entry
-        if em in ('DIRECT', 'DIRECT ENTRY',):
-            em = 'DE'
-        elif em in ('U.M.E', 'UNE',):
-            em = 'UME'
-        elif not em:
-            em = "unknown"
+        em = context.getEntryMode(student.Entryregno)
+##        em = student.Mode_of_Entry
+##        if em in ('DIRECT', 'DIRECT ENTRY',):
+##            em = 'DE'
+##        elif em in ('U.M.E', 'UNE',):
+##            em = 'UME'
+##        elif not em:
+##            em = "unknown"
         da['entry_mode'] = em
         personal = student_obj.personal

WAeUP_SRP/trunk/skins/waeup_accommodation/release_bed.py

@@ -29 +29 @@
 #stud_cat = context.students_catalog
 student_id = context.getStudentId()
-
+try:
+    from Products.zdb import set_trace
+except:
+    def set_trace():
+        return
+#set_trace()
 if student_id is not None:
     logger.info('"%s", "requests bed_release for", "%s"' % (member_id,student_id))

WAeUP_SRP/trunk/skins/waeup_student/getLevelFromResultsCosCode.py

@@ -11 +11 @@
 lnr = 0
 for e in list:
+    if e.CosCode == "na":
+        return 2
     try:
         cc = int(e.CosCode[3])