Changeset 1255 for WAeUP_SRP/trunk

Timestamp:

10 Jan 2007, 00:24:40 (18 years ago)

Author:

joachim

Message:

increaselevels

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTool.py (modified) (2 diffs)
• skins/waeup_student/getAccommodationInfo.py (modified) (2 diffs)
• skins/waeup_student/reserve_accommodation.py (modified) (1 diff)
• skins/waeup_utilities/createReturningStudent.py (modified) (3 diffs)
• skins/waeup_utilities/increaseReturningLevels.py (added)

WAeUP_SRP/trunk/WAeUPTool.py

@@ -168 +168 @@
         validlevel = False
         try:
-            int(level)
+            il = int(level) + 100
+            level = "%s" % il
             validlevel = True
         except:
@@ -179 +180 @@
                 level = erg[0].Level
             try:
-                int(level)
+                il = int(level) + 100
+                level = "%s" % il
                 em = '"%s","fixed Level from results_import","%s"' % (student.matric_no,erg[0].Level)
                 logger.info(em)

WAeUP_SRP/trunk/skins/waeup_student/getAccommodationInfo.py

@@ -58 +58 @@
                     )
 s_brain = res[0]
+info['error'] = None
 info['matric_no']=s_brain.matric_no
 info['jamb_reg_no']=s_brain.jamb_reg_no
@@ -100 +101 @@
         #from Products.zdb import set_trace; set_trace()
         certificate = c_brain.getObject().getContent()
-        if int(s_brain.level) +100 == int(certificate.end_level):
+        try:
+            certlevel = int(certificate.end_level)
+        except:
+            info["error"] = '"no end_level for","%s"' % c_brain.getId
+            return info
+        try:
+            studentlevel = int(s_brain.level) + 100
+        except:
+            info["error"] = '"no level for","%s"' % s_brain.getId
+            return info
+        if studentlevel >= certlevel:
             bt = "fi"
 d['sex'] = 'male'

WAeUP_SRP/trunk/skins/waeup_student/reserve_accommodation.py

@@ -53 +53 @@
                       button = button
                       )
-if psm == 'invalid':
+if psm == 'invalid' or info['error'] is not None:
+    member_id = str(context.portal_membership.getAuthenticatedMember())
+    logger.info('"%s", %s' % (member_id,info['error'] ))
+    if psm == 'invalid':
+        psm = "please correct your input"
+    else:
+        psm = "Error in Data, unable to reserve bed."
     return context.accommodation_pin_edit_form(rendered = res,
-                                 psm = "Please correct your input!",
                                  #psm = "%s, %s" % (psm,ds),
                                  mode = mode,

WAeUP_SRP/trunk/skins/waeup_utilities/createReturningStudent.py

@@ -19 +19 @@
 logger = logging.getLogger('createReturningStudent')
 
-#if str(member) not in ("admin","joachim"):
-#    return "not possible"
-
-
-#defined in WAeUPTool.py
-
-# def createOne(student_brain):
-#     sid = context.waeup_tool.generateStudentId('?')
-#     students_folder.invokeFactory('Student', sid)
-#     student = getattr(students_folder,sid)
-#     wftool.doActionFor(student,'return')
-#     student.manage_setLocalRoles(sid, ['Owner',])
-#     jamb_reg_no = student_brain.Entryregno,
-#     context.students_catalog.addRecord(id = sid,
-#                                        matric_no = matric_no,
-#                                        jamb_reg_no = jamb_reg_no,
-#                                        sex = student_brain.Sex == "F",
-#                                        name = "%s %s %s" % (student_brain.Firstname,
-#                                                             student_brain.Middlename,
-#                                                             student_brain.Lastname)
-#                                     )
-#     return sid,jamb_reg_no
-
 if not matric_no:
     return "No MatricNo"
@@ -52 +29 @@
         return "MatricNo %s not found in Returning Table" % matric_no
     student_brain = res[0]
-    sid,jamb_reg_no = context.waeup_tool.createOne(student_brain)
+    sid,jamb_reg_no = context.waeup_tool.createOne(students_folder,student_brain,'?')
     logger.info('"%s","Created Student","%s", "%s" ' % (member,sid,matric_no))
     return "Student MatricNo %s, StudentId %s Jamb %s created" % (matric_no,sid,jamb_reg_no)
@@ -66 +43 @@
         continue
     if count > 100:
-        context.waeup_tool.createOne(student,commit=True)
+        context.waeup_tool.createOne(students_folder,student,'Z',commit=True)
         logger.info('"%s","Commited Students","%s", "%s" ' % (member,count,total))
         total += count
         count = 1
+        if total > 500:
+            break
     else:
-        context.waeup_tool.createOne(student)
-        count += 1
+        for letter in ('ABCDEFGHKLMNPQRSTUVWXY'):
+            context.waeup_tool.createOne(students_folder,student,letter)
+            count += 1
 logger.info('"%s","Create Students finish","%s"' % (member,total))