Index: /WAeUP_SRP/trunk/WAeUPTool.py
===================================================================
--- /WAeUP_SRP/trunk/WAeUPTool.py	(revision 1193)
+++ /WAeUP_SRP/trunk/WAeUPTool.py	(revision 1194)
@@ -33,4 +33,5 @@
 from Products.CMFCore.permissions import ModifyPortalContent
 from Products.CMFCore.utils import UniqueObject
+from Products.CMFCore.URLTool import URLTool
 from Students import makeCertificateCode
 import logging
@@ -55,13 +56,15 @@
 
 
-
     def generateStudentId(self,letter): ###(
         import random
         r = random
-        if letter not in ('ABCDEFGIHKLMNOPQRSTUVWXY'):
+        ##if letter not in ('ABCDEFGIHKLMNOPQRSTUVWXY'):
+        if letter == '?':
             letter= r.choice('ABCDEFGHKLMNPQRSTUVWXY')
-        students = self.portal_url.getPortalObject().campus.students
         sid = "%c%d" % (letter,r.randint(99999,1000000))
-        while hasattr(students, sid):
+##        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):
             sid = "%c%d" % (letter,r.randint(99999,1000000))
         return sid
@@ -69,7 +72,6 @@
 
     security.declareProtected(ModifyPortalContent,'createOne') ###(
-    def createOne(self,student_brain,commit=False):
-        students_folder = self.portal_url.getPortalObject().campus.students
-        sid = self.waeup_tool.generateStudentId('?')
+    def createOne(self,students_folder,student_brain,letter,commit=False):
+        sid = self.waeup_tool.generateStudentId(letter)
         students_folder.invokeFactory('Student', sid)
         student = getattr(students_folder,sid)
@@ -224,10 +226,41 @@
         # Level
         #
-##        l = getattr(studycourse,level,None)
-##        if l is None:
-##            studycourse.invokeFactory('StudentStudyLevel', level)
-##            l = getattr(studycourse, level)
-##            self.portal_workflow.doActionFor(l,'open',dest_container=l)
-##            l.getContent().edit(mapping={'Title': "Level %s" % level})
+        l = getattr(studycourse,level,None)
+        if l is None:
+            studycourse.invokeFactory('StudentStudyLevel', level)
+            l = getattr(studycourse, level)
+            self.portal_workflow.doActionFor(l,'open',dest_container=l)
+            l.getContent().edit(mapping={'Title': "Level %s" % level})
+###)
+
+    security.declarePublic('makeStudentLevel') ###(
+    def makeStudentLevel(self,student_id):
+        "create the StudyLevel for a returning Student"
+        #import pdb;pdb.set_trace()
+        logger = logging.getLogger('Student.CreateLevel')
+        students_folder = self.portal_url.getPortalObject().campus.students
+        res = self.students_catalog(id=student_id)
+        if res:
+            st = res[0]
+        course = st.course
+        matric_no = st.matric_no
+        level = st.level
+        res = self.results_import(matric_no = matric_no)
+        if res:
+            results = res
+        logger.info('"%s", "creating Level", "%s"' % (student_id,level))
+        #
+        # Level
+        #
+        student_obj = getattr(self.portal_url.getPortalObject().campus.students,student_id)
+        studycourse = getattr(student_obj,"study_course",None)
+        self.portal_workflow.doActionFor(studycourse,'close_for_edit',dest_container=studycourse)
+        l = getattr(studycourse,level,None)
+        if l is None:
+            studycourse.invokeFactory('StudentStudyLevel', level)
+            l = getattr(studycourse, level)
+            self.portal_workflow.doActionFor(l,'open',dest_container=l)
+            l.getContent().edit(mapping={'Title': "Level %s" % level})
+        ###)
 
     security.declarePublic('getAccommodationInfo') ###(
