Changeset 2606 for WAeUP_SRP/base/skins/waeup_student

Timestamp:

9 Nov 2007, 12:04:49 (17 years ago)

Author:

Henrik Bettermann

Message:

resolve #122

Location:

WAeUP_SRP/base/skins/waeup_student

Files:

• course_registration_slip.pt (modified) (1 diff)
• getStudyLevelInfo.py (modified) (3 diffs)
• login_student.pt (modified) (1 diff)
• student_view.pt (modified) (1 diff)
• study_level_view.pt (modified) (4 diffs)

WAeUP_SRP/base/skins/waeup_student/course_registration_slip.pt

@@ -74 +74 @@
         <br />
         <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 width="72%" tal:content="row/title"></td>
-            <td align="center" width="10%" tal:content="row/code"></td>
-            <td align="center" width="2%">S<span tal:content="row/semester" /></td>
-            <td align="center" width="2%" tal:content="row/credits"></td>
-            <td align="center" width="14%" tal:content="row/coe|nothing"></td>
-          </tr>
+
+
+       <span tal:repeat="sem python:('1','2')">       
+                    
+        <th colspan="3" tal:content="python: test(sem == '1','First Semester', 'Second Semester')" />                
+        <tr tal:repeat="row python: test(sem == '1',info['normal1'],info['normal2'])"
+            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
+          <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"
+                   tal:attributes="value id;
+                   id python:'cb_' + id;
+                   checked python:id in info['choosen_ids'];" 
+                   />
+          </td>
+          <td width="71%" tal:content="row/title"></td>
+          <td align="center" width="10%" tal:content="row/code"></td>
+          <td align="center" width="2%">S<span tal:content="row/semester" /></td>
+          <td align="center" width="2%" tal:content="row/credits"></td>
+          <td align="center" width="10%" tal:content="row/coe|nothing"></td>
+          
+          <td tal:condition="python:review_state == 'school_fee_paid'" width="5%" align="center">
+          <a href="edit" tal:attributes="href string:course_edit/${row/code}"
+          target="edit"
+          onclick="javascript:window.open('','edit','width=600, height=350, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
+          [edit]
+          </a> 
+          </td>          
+        </tr>
+        
+        
+        <th colspan="3" tal:condition="info/normal3"> Combined</th>                
+        <tr tal:condition="info/normal3" tal:repeat="row info/normal3"
+            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
+          <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"
+                   tal:attributes="value id;
+                   id python:'cb_' + id;
+                   checked python:id in info['choosen_ids'];" 
+                   />
+          </td>
+          <td width="71%" tal:content="row/title"></td>
+          <td align="center" width="10%" tal:content="row/code"></td>
+          <td align="center" width="2%">S<span tal:content="row/semester" /></td>
+          <td align="center" width="2%" tal:content="row/credits"></td>
+          <td align="center" width="10%" tal:content="row/coe|nothing"></td>
+          
+          <td tal:condition="python:review_state == 'school_fee_paid'" width="5%" align="center">
+          <a href="edit" tal:attributes="href string:course_edit/${row/code}"
+          target="edit"
+          onclick="javascript:window.open('','edit','width=600, height=350, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
+          [edit]
+          </a> 
+          </td>          
+        </tr>        
+        
+        </span>        
+        
           <tr>
             <td width="82%" colspan="2" align="right">Total Credits:</td>

WAeUP_SRP/base/skins/waeup_student/getStudyLevelInfo.py

@@ -55 +55 @@
 #    return 0.0
 
-def cmp_semester_id(a,b):
-    s1 = "%(semester)s%(id)s" % a
-    s2 = "%(semester)s%(id)s" % b
-    if s1 == s2:
-        return 0
-    if s1 > s2:
-        return 1
-    return -1
+#def cmp_semester_id(a,b):
+#    s1 = "%(semester)s%(id)s" % a
+#    s2 = "%(semester)s%(id)s" % b
+#    if s1 == s2:
+#        return 0
+#    if s1 > s2:
+#        return 1
+#    return -1
 
 student_id = context.getStudentId()
@@ -95 +95 @@
     course_results.moveResultsHere(context,student_id)
     logger.info("%s initiated moveResultsHere for %s in level %s" % (member_id,student_id,level_id))
-credits_total,carry_overs,normal = course_results.getCourses(student_id,level_id)
+credits_total,carry_overs,normal1,normal2,normal3 = course_results.getCourses(student_id,level_id)
 info['credits_total'] = credits_total
 max_credits = 50
@@ -108 +108 @@
 info['carry_overs'] = carry_overs
 # normal.sort(cmp_semester_id)
-info['normal'] = normal
+info['normal1'] = normal1
+info['normal2'] = normal2
+info['normal3'] = normal3
 
 students_object = context.portal_url.getPortalObject().campus.students

WAeUP_SRP/base/skins/waeup_student/login_student.pt

@@ -42 +42 @@
     <td>
         <input type="password" id="password" name="__ac_password" size="20"
-               value="" /></td>
+               value="" />&nbsp;&nbsp; <font color='red'>Notice: Passwords are case sensitive.  </font>   </td>
     </tr>
     </tbody>

WAeUP_SRP/base/skins/waeup_student/student_view.pt

@@ -67 +67 @@
 
         <span tal:repeat="row rows">
-        <tr tal:condition="python:row['type'] != 'StudentPume'"
-            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
+        <tr tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
           <td><a href="view" tal:attributes="href string:${row/url}">
             <strong tal:content="row/title" /></a> </td>

WAeUP_SRP/base/skins/waeup_student/study_level_view.pt

@@ -46 +46 @@
         <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;"
               tal:condition="show_check_boxes">
@@ -68 +69 @@
       <h4>Session Courses</h4>
       <br />
-    <div class="" tal:condition="not: info/normal">
+    <div class="" tal:condition="python: not (info['normal1'] or info['normal2'] or info['normal3'])">
       <font color="red">Your faculty has not yet provided the list of courses for your certificate. Please contact your faculty!</font>
       <br /><br />
     </div>
-      <table class="contentListing" width="100%" id="folder_content"
-             tal:condition="info/normal">      
-        <tr tal:repeat="row info/normal"
+      <table class="contentListing" width="100%" id="folder_content">
+        
+        <span tal:repeat="sem python:('1','2')">       
+                    
+        <th colspan="3" tal:content="python: test(sem == '1','First Semester', 'Second Semester')" />                
+        <tr tal:repeat="row python: test(sem == '1',info['normal1'],info['normal2'])"
             tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
           <td align="left" valign="middle" style="width: 5px;"
@@ -91 +95 @@
           <td align="center" width="10%" tal:content="row/coe|nothing"></td>
           
-          
-
-
           <td tal:condition="python:review_state == 'school_fee_paid'" width="5%" align="center">
           <a href="edit" tal:attributes="href string:course_edit/${row/code}"
@@ -101 +102 @@
           </a> 
           </td>          
+        </tr>
+        
+        
+        <th colspan="3" tal:condition="info/normal3"> Combined</th>                
+        <tr tal:condition="info/normal3" tal:repeat="row info/normal3"
+            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
+          <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"
+                   tal:attributes="value id;
+                   id python:'cb_' + id;
+                   checked python:id in info['choosen_ids'];" 
+                   />
+          </td>
+          <td width="71%" tal:content="row/title"></td>
+          <td align="center" width="10%" tal:content="row/code"></td>
+          <td align="center" width="2%">S<span tal:content="row/semester" /></td>
+          <td align="center" width="2%" tal:content="row/credits"></td>
+          <td align="center" width="10%" tal:content="row/coe|nothing"></td>
           
-          
-        </tr>
+          <td tal:condition="python:review_state == 'school_fee_paid'" width="5%" align="center">
+          <a href="edit" tal:attributes="href string:course_edit/${row/code}"
+          target="edit"
+          onclick="javascript:window.open('','edit','width=600, height=350, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
+          [edit]
+          </a> 
+          </td>          
+        </tr>        
+        
+        
+        
+        </span>
+
         <tr>
           <td tal:condition="show_check_boxes" colspan="1"></td>