Changeset 1513 for WAeUP_SRP/trunk

Timestamp:

2 Mar 2007, 22:59:45 (18 years ago)

Author:

joachim

Message:

register courses

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_default/isCourseAdviser.py (added)
• waeup_student/courses_validated_slip.pt (added)
• waeup_student/create_level.py (modified) (1 diff)
• waeup_student/getStudyLevelInfo.py (modified) (2 diffs)
• waeup_student/notify_change_courses.py (added)
• waeup_student/register_courses.py (added)
• waeup_student/study_level_view.pt (modified) (7 diffs)
• waeup_student/validate_courses.py (added)

WAeUP_SRP/trunk/skins/waeup_student/create_level.py

@@ -60 +60 @@
             continue
         course_cat_entry = c_res[0]
-        if not course_cat_entry.passmark:
+        passmark = getattr(course_cat_entry,'passmark',None)
+        if not passmark:
             carry_over = co.GRADE in ('D','E','F')
         else:

WAeUP_SRP/trunk/skins/waeup_student/getStudyLevelInfo.py

@@ -1 @@
-# Script (Python) "getStudyLevelInfo"
+## Script (Python) "getStudyLevelInfo"
 ##bind container=container
 ##bind context=context
@@ -53 +53 @@
 
 info = {}
+info['is_student'] = is_student = context.isStudent() 
+info['is_ca'] = is_ca = context.isCourseAdviser() 
 info['student'] = student = context.students_catalog(id=student_id)[0]
+info['review_state'] = review_state = context.getStudentReviewState()
+info['view_only'] =  review_state != "school_fee_paid" 
+info['show_check_boxes'] =  (is_ca and review_state == 'courses_registered') or (is_student and context.getStudentReviewState() == "school_fee_paid") 
 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"
 info['doc'] = context.getContent()
 ##study_course = context.aq_parent.getContent()

WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt

@@ -3 +3 @@
     <metal:block fill-slot="header" 
                  tal:define="global info context/getStudyLevelInfo;
-                 global is_so context/isSectionOfficer;"
-                 >
+                 global is_so context/isSectionOfficer;
+                 global is_ca info/is_ca;
+                 global show_check_boxes info/show_check_boxes;
+                 global is_student info/is_student;
+                 global status_info info/status_info;
+                 global review_state info/review_state;
+                 global view_only info/view_only">
       <a href=""
          tal:attributes="href string:${here/academicsParent}">
@@ -10 +15 @@
         Up one level
       </a>
+              <div style="text-align: right"
+             tal:condition="python:review_state == 'courses_validated'">
+        <a href="" target="slip" tal:attributes="href string:courses_validated_slip"
+            onclick="javascript:window.open('','slip','width=600, height=700, directories=no, toolbar=no, location=no, menubar=yes, scrollbars=yes, status=no, resizable=no, dependent=no')">
+            <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" />
+            Validated Courses Slip
+        </a>
+        
+        </div>
+
       <h3> 
         <span tal:condition="is_so">
@@ -19 +34 @@
     </metal:block>
     <metal:main fill-slot="main" tal:condition="python:1">
-
+      <h3 tal:content="status_info"></h3>
       <form action="." method="post" class="group">
         <span tal:condition="info/carry_overs" tal:omit-tag="">
         <h3>Carryover Courses</h3>
         <br />
-        <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content">      
+        <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content">
           <tr tal:repeat="row info/carry_overs"
               tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
-            <td align="left" valign="middle" style="width: 5px;">
+            <td align="left" valign="middle" style="width: 5px;"
+                tal:condition="show_check_boxes">
               <input type="checkbox" name="ids:list" value="" id="" class="noborder"
                      tal:define="id row/id"
@@ -45 +61 @@
         <h3>Session Courses</h3>
         <br />
-        <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content">      
+        <table class="contentListing" width="100%" summary="content layout" id="folder_content">      
           <tr tal:repeat="row info/normal"
               tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
-            <td align="left" valign="middle" style="width: 5px;">
+            <td align="left" valign="middle" style="width: 5px;"
+                tal:condition="show_check_boxes">
               <input type="checkbox" name="ids:list" value="" id="" class="noborder"
                      tal:define="id row/id"
@@ -69 +86 @@
           </tr>
         </table>
-        <table width="100%" cellspacing="0" cellpadding="2"
+        <table tal:condition="not:view_only" width="100%" cellspacing="0" cellpadding="2"
+               class="folderButtons">
+          <tr>
+            <td align="left" valign="top" rowspan="3"></td>
+            <td align="left" valign="top">
+              <span tal:condition="python:1">
+                <input type="button" value="button_select_all" class="context"
+                       onclick="someJavaScriptFunctionThatWillBeReplaced"
+                       i18n:attributes="value"
+                       tal:attributes="onclick python:'toggleSelect(this, \'%s\', \'%s\')'
+                       % (cpsmcat('button_select_all'), cpsmcat('button_deselect_all'))"
+                       />
+                <input type="submit" name="course_result_delete:method" value="Delete checked"
+                       class="destructive" i18n:attributes="value"
+                       tal:attributes="onclick python:'return window.confirm(\'%s\')' %
+                       ('really delete checked courses', )" 
+                       />
+                <input tal:condition="python:1" type="submit" name="register_courses:method"
+                       class="context" value="Register" />
+                <input tal:condition="is_ca" type="submit" name="notify_change_courses:method"
+                       class="context" value="Reject Courses" />
+                <input tal:condition="python: 1"
+                       type="submit" name="refresh_level:method"
+                       class="context" value="Refresh List" 
+                       />
+              </span>
+            </td>
+          </tr>
+        </table>
+        <table tal:condition="python:is_ca and show_check_boxes" width="100%" cellspacing="0" cellpadding="2"
                class="folderButtons">
           <tr>
@@ -81 +127 @@
                        % (cpsmcat('button_select_all'), cpsmcat('button_deselect_all'))"
                        />
-                <input tal:condition="python:0" type="submit" name="register_checked:method"
-                       class="context" value="Register" />
-                <input tal:condition="python:0" type="submit" name="retract_checked:method"
-                       class="context" value="Retract" />
-                <input type="submit" name="course_result_delete:method" value="button_delete"
+                <input type="submit" name="course_result_delete:method" value="Delete checked"
                        class="destructive" i18n:attributes="value"
                        tal:attributes="onclick python:'return window.confirm(\'%s\')' %
-                       (cpsmcat('description_confirm_delete'), )" 
+                       ('really delete checked courses', )" 
                        />
+                <input tal:condition="python:1" type="submit" name="validate_courses:method"
+                       class="context" value="Validate" />
+                <input tal:condition="is_ca" type="submit" name="notify_change_courses:method"
+                       class="context" value="Reject Courses" />
                 <input tal:condition="python: 1"
                        type="submit" name="refresh_level:method"
@@ -100 +146 @@
       </form>
       <br />
-      <form action="add_course_result" method="post" class="group">
+      <form action="add_course_result" method="post" class="group"
+            tal:condition="show_check_boxes">
         <table>
           <tr>