Changeset 6862 for WAeUP_SRP/trunk

Timestamp:

5 Oct 2011, 06:39:58 (13 years ago)

Author:

Henrik Bettermann

Message:

Change of functional specification: All students (except those in level 100) should be able to register 100L carryover courses.

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_futminna/create_level_101.py (moved) (moved from WAeUP_SRP/trunk/skins/waeup_futminna/create_level_501.py) (4 diffs)
• waeup_futminna/getStudentLevelsVoc.py (modified) (1 diff)
• waeup_futminna/getStudyCourseInfo.py (modified) (1 diff)
• waeup_futminna/getStudyLevelInfo.py (modified) (2 diffs)
• waeup_futminna/study_course_view.pt (modified) (1 diff)
• waeup_student/register_courses.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_futminna/create_level_101.py

@@ -24 +24 @@
 response = request.RESPONSE
 redirect = response.redirect
-logger = logging.getLogger('Skins.create_level_501')
+logger = logging.getLogger('Skins.create_level_101')
 info = context.waeup_tool.getAccessInfo(context)
 student_id = info['student_id']
@@ -34 +34 @@
 current_level = student.level
 
-if current_level not in ['500','510',]:
-    logger.info('%s tried to create level 501 but is not in level 500' % student.id)
-    return 'Forbidden'
-
 current_session = student.session
 in_progress =  request.get('in_progress','not started')
@@ -44 +40 @@
     return 'Forbidden'
 
-if context.hasObject('100') or context.hasObject('501'):
+if context.hasObject('100') or context.hasObject('101'):
     logger.info('%s tried to create already existing level 100' % student.id)
     return 'Forbidden'
 
-context.invokeFactory('StudentStudyLevel',"%s" % '501')
-level = getattr(context,"501")
+context.invokeFactory('StudentStudyLevel',"%s" % '101')
+level = getattr(context,"101")
 context.portal_workflow.doActionFor(level,'open')
 level.getContent().edit(mapping={'session': current_session})
@@ -84 +80 @@
     existing_uids = context.course_results.addMultipleRecords(records)
     if existing_uids:
-        logger.info('%s level 501 %s existing keys' % (student.id,
+        logger.info('%s level 101 %s existing keys' % (student.id,
                                                      ",".join(existing_uids)))
 
-logger.info('%s created level 501 (100 carry overs)' % student.id)
+logger.info('%s created level 101 (100 carry overs)' % student.id)
 
-return response.redirect("%s/501" % context.absolute_url())
+return response.redirect("%s/101" % context.absolute_url())

WAeUP_SRP/trunk/skins/waeup_futminna/getStudentLevelsVoc.py

@@ -38 +38 @@
 
 # FUTMinna only
-if ikey == 501:
+if ikey == 101:
     return "100 Level Carryover Courses"
 

WAeUP_SRP/trunk/skins/waeup_futminna/getStudyCourseInfo.py

@@ -94 +94 @@
                (student_record.entry_mode.startswith('pd') and current_level == '500'))  #fceokene only
 
-info['may_register_501'] = (current_level == '500') and '501' not in levels
+info['may_register_101'] = (int(current_level) > 199) and '100' not in levels and '101' not in levels
 
 missing_data = has_paid and\

WAeUP_SRP/trunk/skins/waeup_futminna/getStudyLevelInfo.py

@@ -47 +47 @@
 info['has_verdict'] = has_verdict = level_doc.verdict
 
-info['submission_allowed']= school_fee_paid and is_current_level and not has_verdict and level_id != '501'
-info['validation_allowed']= review_state == 'courses_registered' and is_current_level and level_id != '501'
+info['submission_allowed']= school_fee_paid and is_current_level and not has_verdict and level_id != '101'
+info['validation_allowed']= review_state == 'courses_registered' and is_current_level and level_id != '101'
 info['rejection_allowed']= review_state in ('courses_registered', 'courses_validated','returning',) and\
-                                             is_current_level and level_id != '501'
+                                             is_current_level and level_id != '101'
 info['validated'] = level_doc.validated_by and not (is_current_level and review_state in ('courses_registered',))
 info['show_check_boxes'] =  (is_ca and school_fee_paid and is_current_level and not has_verdict) or\
                             (info['is_student'] and school_fee_paid and is_current_level and not has_verdict) or\
-                            level_id == '501' or\
+                            level_id == '101' or\
                             (is_so) # and is_current_level and not has_verdict)
 
@@ -90 +90 @@
 info['credits_exceeded'] = total_credits > max_credits
 current_session = student.session
-info['show_submit'] = not info['credits_exceeded'] and level_id != '501'
-info['show_update'] = level_id != '501'
+info['show_submit'] = not info['credits_exceeded'] and level_id != '101'
+info['show_update'] = level_id != '101'
 #end customization
 

WAeUP_SRP/trunk/skins/waeup_futminna/study_course_view.pt

@@ -135 +135 @@
 
     <form action="" method="post" class="group" onsubmit="return submit_once()"
-          tal:attributes="action string:${context/absolute_url}/create_level_501"
+          tal:attributes="action string:${context/absolute_url}/create_level_101"
           tal:define="rows python: info['items'];"
-          tal:condition="info/may_register_501"
+          tal:condition="info/may_register_101"
           >
       <table width="100%" cellspacing="0" cellpadding="2"

WAeUP_SRP/trunk/skins/waeup_student/register_courses.py

@@ -34 +34 @@
 
 # FUTMinna only
-if context.getId() == '501':
+if context.getId() == '101':
     return 'Forbidden'