Changeset 1417 for WAeUP_SRP/trunk/skins

Timestamp:

15 Feb 2007, 10:56:43 (18 years ago)

Author:

joachim

Message:

Edit student_study course added
verdicts vocabulary added
new levels are only created, when no level there,
allow loggin for returning students, which have been created with add_student

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_custom/logged_in.py (modified) (2 diffs)
• waeup_default/waeup_edit.py (modified) (1 diff)
• waeup_student/add_student.py (modified) (1 diff)
• waeup_student/getSessionResults.py (modified) (2 diffs)
• waeup_student/getStudyCourseInfo.py (modified) (1 diff)
• waeup_student/study_level_view.pt (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

@@ -113 +113 @@
                              p_review_state == 'created' :
             wftool.doActionFor(student_per,'open')
-        
+        res = context.students_catalog(id = str(member))
+        matric_no = res[0].matric_no
+        is_imported = context.returning_import(matric_no = matric_no)
         if s_review_state == "application_pin_entered":
             redirect_url = "%s/application_edit_form" % student.absolute_url()
@@ -122 +124 @@
         elif s_review_state == "cleared_and_validated":
             redirect_url = "%s/personal_edit_form" % student.absolute_url()
-        elif s_review_state == "returning":
+        elif s_review_state == "returning" and is_imported:
             redirect_url = "%s/session_results_view" % student.absolute_url()
         else:

WAeUP_SRP/trunk/skins/waeup_default/waeup_edit.py

@@ -53 +53 @@
             context.students_catalog.modifyRecord(id = student_id,
                                                   course = course,
+                                                  level = ds.get('current_level'),
+                                                  verdict = ds.get('current_verdict'),
                                                   faculty = c_path[-4],
                                                   department = c_path[-3],

WAeUP_SRP/trunk/skins/waeup_student/add_student.py

@@ -49 +49 @@
 matric_no = ds.get('matric_no')
 res = context.students_catalog(matric_no = matric_no)
-psm = "Student with matric_no %s exists with Id: %s" % (matric_no,res[0].id)
 if res:
+    psm = "Student with matric_no %s exists with Id: %s" % (matric_no,res[0].id)
     return context.add_student_form(rendered = rendered,
                                  psm = psm,

WAeUP_SRP/trunk/skins/waeup_student/getSessionResults.py

@@ -8 +8 @@
 pr = context.portal_registration
 
+request = context.REQUEST
 returning = context.returning_import
 results = context.results_import
@@ -45 +46 @@
 
 res = returning(matric_no = matric_no)
-student_from_returning = res[0]
+if res:
+    student_from_returning = res[0]
+else:
+    return None
+
 res = results(matric_no = matric_no)
 results = res

WAeUP_SRP/trunk/skins/waeup_student/getStudyCourseInfo.py

@@ -45 +45 @@
 current_level = sbrain.level
 levels = context.objectIds()
-if current_level not in levels:
+#levels.sort()
+#if int(current_level) > int(levels[-1]):
+if not levels:
     context.invokeFactory('StudentStudyLevel',"%s" % current_level)
     level = getattr(context,"%s" % current_level)

WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt

@@ -11 +11 @@
       </a>
       <h3> 
-        <span tal:condition="python:is_so and s_info">
+        <span tal:condition="is_so">
           <span tal:content="info/student/name" />:
         </span>