Changeset 2758 for WAeUP_SRP/base

Timestamp:

25 Nov 2007, 22:06:28 (17 years ago)

Author:

Henrik Bettermann

Message:

allow registration of probation levels

and more fixes

Location:

WAeUP_SRP/base/skins

Files:

• waeup_epayment/getNextInfo.py (added)
• waeup_epayment/getPaymentsFolderInfo.py (modified) (2 diffs)
• waeup_layout/portlet_student_workflow_display.pt (modified) (1 diff)
• waeup_student/create_level.py (modified) (1 diff)
• waeup_student/getNextInfo.py (deleted)
• waeup_student/getStudyLevelInfo.py (modified) (4 diffs)
• waeup_student/new_session_results_slip.pt (added)
• waeup_student/refresh_level.py (modified) (3 diffs)
• waeup_student/study_level_view.pt (modified) (8 diffs)

WAeUP_SRP/base/skins/waeup_epayment/getPaymentsFolderInfo.py

@@ -1 @@
-## Script (Python) "getPaymentsFolderInfo"
+z## Script (Python) "getPaymentsFolderInfo"
 ##bind container=container
 ##bind context=context
@@ -109 +109 @@
         row['confirmed'] = 'unsuccessful'
     row['is_editable'] = is_so and (row['confirmed'] == 'active')
-        
+
     payments.append(row)
 

WAeUP_SRP/base/skins/waeup_layout/portlet_student_workflow_display.pt

@@ -77 +77 @@
   <span tal:condition="python:info['review_state']=='returning'">
   <tr><td class="active">
-    <a href="" tal:attributes="href string:${info/url}/session_results_view">
+    
     Returning
-    </a>
+
   </td></tr>
   </span>

WAeUP_SRP/base/skins/waeup_student/create_level.py

@@ -117 +117 @@
     cert = res[0]
     path = cert.getPath()
-    query = Eq("path","%s/%s" % (path,current_level)) &\
+    academics_level = 100 * (int(current_level)/100)
+    query = Eq("path","%s/%s" % (path,academics_level)) &\
             Eq('portal_type','CertificateCourse')
     courses = aq_portal(query)

WAeUP_SRP/base/skins/waeup_student/getStudyLevelInfo.py

@@ -38 +38 @@
 logger = logging.getLogger('Skins.getStudyLevelInfo')
 
+info = {}
+
 student_id = context.getStudentId()
-level_id = context.getId()
+level_id  =  context.getId()
 
-info = {}
 info['is_so'] = is_so = context.isSectionOfficer()
 info['is_student'] = is_student = context.isStudent()
@@ -49 +50 @@
 info['view_only'] =  review_state != "school_fee_paid"
 
+level_doc = info['doc'] = context.getContent()
 
 school_fee_paid =  review_state == 'school_fee_paid'
-
 is_current_level = level_id == student.level
 
-info['show_check_boxes'] =  (is_ca and school_fee_paid and is_current_level) or\
-                            (is_student and school_fee_paid and is_current_level) or\
-                            (is_so and is_current_level)
+
+
+info['show_check_boxes'] =  (is_ca and school_fee_paid and is_current_level and not level_doc.verdict) or\
+                            (is_student and school_fee_paid and is_current_level and not level_doc.verdict) or\
+                            (is_so and is_current_level and not level_doc.verdict)
 
 info['is_current_level'] = is_current_level
@@ -72 +75 @@
     elif review_state == 'courses_validated':
         info['status_info'] = "Courses validated"
-level_doc = info['doc'] = context.getContent()
+
 cert_id = student.course
 info['cert_id'] = cert_id
@@ -90 +93 @@
 if gpa and total_credits:
     info['gpa'] = "%4.2f" % (float(gpa)/int(total_credits))
-    
-info['submission_allowed']= school_fee_paid and level_id == student.level
+
+info['submission_allowed']= school_fee_paid and level_id == student.level and not level_doc.verdict
 info['validation_allowed']= review_state == 'courses_registered' and is_current_level
 info['rejection_allowed']= review_state in ('courses_registered', 'courses_validated',) and is_current_level
 
-info['verdict'] = context.portal_vocabularies.verdicts.get(level_doc.verdict)
+info['verdict'] = context.portal_vocabularies.verdicts.get(level_doc.verdict).upper()
 info['session'] = context.portal_vocabularies.sessions.get(level_doc.session)
+info['level_str'] = context.portal_vocabularies.levels.get(level_id)
+
 
 # carry_overs.sort(cmp_semester_id)

WAeUP_SRP/base/skins/waeup_student/refresh_level.py

@@ -47 +47 @@
 res = context.portal_catalog(portal_type="Certificate", id = cert_id)
 query = Eq('student_id',student_id) & Eq('level_id', level_id)
-existing_courses = [course.code for course in 
+existing_courses = [course.code for course in
                     context.course_results.evalAdvancedQuery(query)]
 l = []
@@ -54 +54 @@
     cert = res[0]
     path = cert.getPath()
-    query = Eq("path","%s/%s" % (path,student.level)) &\
+    academics_level = 100 * (int(student.level)/100)
+    query = Eq("path","%s/%s" % (path,academics_level)) &\
             Eq('portal_type','CertificateCourse')
     courses = aq_portal(query)
@@ -67 +68 @@
         d['core_or_elective'] = getattr(c.getObject().getContent(),'core_or_elective')
         d['course_id'] = course_id
-        d['student_id'] = student_id 
-        d['level_id'] = level_id 
+        d['student_id'] = student_id
+        d['level_id'] = level_id
         d['key'] = "%s|%s|%s" % (student_id,level_id,course_id)
         records.append(d)

WAeUP_SRP/base/skins/waeup_student/study_level_view.pt

@@ -17 +17 @@
                        view_only info/view_only">       
     <div style="text-align: right" 
-         tal:condition="python:review_state in ('courses_registered','courses_validated',)">
+         tal:condition="python:review_state in ('courses_registered','courses_validated',) and is_current_level">
     <a href="" target="slip" tal:attributes="href string:course_registration_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')">
@@ -24 +24 @@
     </a>
     </div>
+    
+    <div style="text-align: right" 
+         tal:condition="info/verdict">
+    <a href="" target="slip" tal:attributes="href string:new_session_results_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" />
+        Session Results Slip
+    </a>
+    </div>    
 
           
@@ -64 +73 @@
     <form action="." method="post" class="group" onsubmit="return submit_once()">
       <span tal:condition="info/carry_overs" tal:omit-tag="">
-      <h4>Carryover Courses</h4>
+      <h3>Carryover Courses</h3>
       <br />
       <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content">
@@ -94 +103 @@
       </table>
       </span> 
-      <br />
 
       <div class="" tal:condition="python: info['data_missing'] and not info['spillover']">
@@ -102 +110 @@
        
       <span tal:condition="not:info/data_missing" tal:omit-tag=""> 
-      <h4>Session Courses</h4>
+      <h3>Session Courses</h3>
       <br />
 
@@ -112 +120 @@
         <th tal:attributes="colspan python: test(show_check_boxes,'2','1')" 
             tal:content="python: test(sem == '1','First Semester', 'Second Semester')" />
-        <th align='center'>code</th> 
+        <th align='center'></th> 
         <th align='center'>sm</th>
         <th align='center'>cr</th>
@@ -186 +194 @@
       </span>
       
-    
+      <br />
+      <table>
+      <tr><th>sm:</th> <td>Semester</td></tr>
+      <tr><th>cr:</th> <td>Credits</td></tr>
+      <tr><th>sc:</th> <td>Score</td></tr>
+      <tr><th>gr: </th> <td>Grade</td></tr>
+      <tr><th>wt: </th> <td>Weight</td></tr>
+      </table>      
+          
+      <br />
       
       <table tal:condition="python: is_student and info['submission_allowed'] and show_check_boxes" width="100%" cellspacing="0" cellpadding="2"
@@ -230 +247 @@
         </tr>
       </table>
-      <table tal:condition="python:is_so and is_current_level" width="100%" cellspacing="0" cellpadding="2"
+      <table tal:condition="python: is_so and show_check_boxes" width="100%" cellspacing="0" cellpadding="2"
              class="folderButtons">
         <tr>