Changeset 1495

Timestamp:

26 Feb 2007, 12:57:35 (18 years ago)

Author:

joachim

Message:

fixed versions for course_registration

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• create_level.py (modified) (2 diffs)
• getStudyCourseInfo.py (modified) (1 diff)
• study_level_view.pt (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/create_level.py

@@ -43 +43 @@
 context.invokeFactory('StudentStudyLevel',"%s" % current_level)
 level = getattr(context,"%s" % current_level)
+context.portal_workflow.doActionFor(level,'open')
 study_session = context.getSessionString()
 level.getContent().edit(mapping={'session': study_session})
-context.portal_workflow.doActionFor(level,'open')
 context.portal_workflow.doActionFor(level,'close_for_edit')
 results = context.results_import(matric_no = student.matric_no)
-carry_overs = [brain for brain in results if brain.GRADE in ('D','E','F')]
-l = []
-for co in carry_overs:
-    d = context.getCourseInfo(co.CosCode)
-    d['grade'] = co.GRADE
-    d['carry_level'] = co.CarryLevel
-    cr_id = level.invokeFactory('StudentCourseResult',"%s_co" % co.CosCode)
-    getattr(level,cr_id).getContent().edit(mapping=d)
+if results:
+    carry_overs = [brain for brain in results if brain.GRADE in ('D','E','F')]
+    #carry_overs = [brain for brain in results if int(brain.Score) < 40 ]
+    l = []
+    for co in carry_overs:
+        d = context.getCourseInfo(co.CosCode)
+        d['grade'] = co.GRADE
+        d['carry_level'] = co.CarryLevel
+        cr_id = level.invokeFactory('StudentCourseResult',"%s_co" % co.CosCode)
+        course_result = getattr(level,cr_id)
+        context.portal_workflow.doActionFor(course_result,'open')
+        course_result.getContent().edit(mapping=d)
 res = context.portal_catalog(portal_type="Certificate", id = cert_id)
 l = []
@@ -68 +72 @@
         d = context.getCourseInfo(c.getId)
         cr_id = level.invokeFactory('StudentCourseResult',c.getId)
+        course_result = getattr(level,cr_id)
+        context.portal_workflow.doActionFor(course_result,'open')
         d['core_or_elective'] = getattr(c.getObject().getContent(),'core_or_elective')
-        getattr(level,cr_id).getContent().edit(mapping=d)
+        course_result.getContent().edit(mapping=d)
 session.set('in_progress','finished')
-return response.redirect("%s/study_level_view" % level.absolute_url())
+return response.redirect("%s" % level.absolute_url())

WAeUP_SRP/trunk/skins/waeup_student/getStudyCourseInfo.py

@@ -56 +56 @@
 student_review_state = context.getStudentReviewState()
 #may_register = 0 #1 or student_review_state in ('shool_fee_payed',)
-may_register = (1 or student_review_state in ('shool_fee_payed',)) and\
+may_register = (student_review_state in ('shool_fee_paid',)) and\
                current_level not in levels
 levels.sort()

WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt

@@ -40 +40 @@
       </form>    
       <form action="." method="post" class="group">
+        <span tal:condition="info/carry_overs" tal:omit-tag="">
         <h3>Carryover Courses</h3>
         <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content">      
@@ -59 +60 @@
           </tr>
         </table>
+        </span>
         <h3>Session Courses</h3>
         <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content">