Changeset 6858

Timestamp:

4 Oct 2011, 06:05:39 (13 years ago)

Author:

Henrik Bettermann

Message:

Implement 100L carryover courses registration in current_level 100. The level id is 501. The course result records are not beeing marked as carryovers because students can add courses which are not marked as such.

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_futminna/create_level_501.py (added)
• waeup_futminna/getStudentLevelsVoc.py (modified) (1 diff)
• waeup_futminna/getStudyCourseInfo.py (modified) (1 diff)
• waeup_futminna/getStudyLevelInfo.py (modified) (3 diffs)
• waeup_futminna/study_course_view.pt (modified) (1 diff)
• waeup_futminna/study_level_view.pt (modified) (6 diffs)
• waeup_student/register_courses.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_futminna/getStudentLevelsVoc.py

@@ -36 +36 @@
 else:
     raise KeyError
+
+# FUTMinna only
+if ikey == 501:
+    return "100 Level Carryover Courses"
+
 level_nr,repeat = divmod(ikey, 100)
 l = []

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
+
 missing_data = has_paid and\
                current_level not in levels 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
-info['validation_allowed']= review_state == 'courses_registered' and is_current_level
-info['rejection_allowed']= review_state in ('courses_registered', 'courses_validated','returning',) and is_current_level
+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['rejection_allowed']= review_state in ('courses_registered', 'courses_validated','returning',) and\
+                                             is_current_level and level_id != '501'
 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\
                             (is_so) # and is_current_level and not has_verdict)
 
@@ -60 +62 @@
 
 info['choosen_ids'] = request.get('ids',[])
-
-#info['status_info'] = ""
-#if is_student:
-#    if review_state == 'courses_registered':
-#        info['status_info'] = "Request for course validation pending"
-#    elif review_state == 'courses_validated':
-#        info['status_info'] = "Courses validated"
-#elif is_ca:
-#    if review_state == 'courses_registered':
-#        info['status_info'] = "Please validate these courses"
-#    elif review_state == 'courses_validated':
-#        info['status_info'] = "Courses validated"
 
 cert_id = student.course
@@ -96 +86 @@
             row['score'] = 0
 info['without_cascore'] = True
-#end customization
 
 info['max_credits'] = max_credits
 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'
+#end customization
 
 info['gpa'] = gpa

WAeUP_SRP/trunk/skins/waeup_futminna/study_course_view.pt

@@ -133 +133 @@
       </table>
     </form>  
+
+    <form action="" method="post" class="group" onsubmit="return submit_once()"
+          tal:attributes="action string:${context/absolute_url}/create_level_501"
+          tal:define="rows python: info['items'];"
+          tal:condition="info/may_register_501"
+          >
+      <table width="100%" cellspacing="0" cellpadding="2"
+             summary="contents of the folder"
+             class="folderButtons">
+        <tr>
+          <td align="left" valign="top" rowspan="3"></td>
+          <td align="left" valign="top">
+            <input type="submit" name="create_level"
+                     class="destructive"
+                     tal:attributes="value string: Register 100L Carryover Courses"
+                     />
+          </td>
+        </tr>
+      </table>
+    </form>
     
     <div tal:condition="info/missing_data">

WAeUP_SRP/trunk/skins/waeup_futminna/study_level_view.pt

@@ -13 +13 @@
     is_ca info/is_ca;
     show_check_boxes info/show_check_boxes;
+    show_update info/show_update;
     has_verdict info/has_verdict;
     submission_allowed info/submission_allowed;
@@ -209 +210 @@
                      ('Do you really want to delete selected courses?', )" 
                      />
-              <input tal:condition="python: 1" type="submit" name="refresh_level:method"
+              <input tal:condition="show_update" type="submit" name="refresh_level:method"
                      class="context" value="Update" 
                      />
@@ -215 +216 @@
                      
               <br /><br />
-              <input tal:condition="not: info/credits_exceeded" 
+              <input tal:condition="info/show_submit"
                      type="submit" name="register_courses:method"
                      class="context" value="Submit to Course Adviser" 
@@ -229 +230 @@
               <br /><br />
               
-              <span tal:condition="python: 1">
+              <span tal:condition="show_update">
               <strong>Note:</strong> 'Update' checks for all courses in your certificate and will add them to your course list irrespective of
               prior deletion, i.e. already deleted courses will show up again. 
@@ -257 +258 @@
                      ('Do you really want to delete the courses selected?', )" 
                      />
-              <input 
+              <input tal:condition="show_update"
                      type="submit" name="refresh_level:method"
                      class="context" value="Update" 
@@ -294 +295 @@
                      ('Do you really want to delete the courses selected?', )" 
                      />
-              <input tal:condition="show_check_boxes"
+              <input tal:condition="show_update"
                      type="submit" name="refresh_level:method"
                      class="context" value="Update" 

WAeUP_SRP/trunk/skins/waeup_student/register_courses.py

@@ -33 +33 @@
 student = getattr(students_folder,student_id)
 
+# FUTMinna only
+if context.getId() == '501':
+    return 'Forbidden'
+
 info = context.getStudyLevelInfo()
 if info['credits_exceeded']: