Changeset 1874

Timestamp:

8 Jun 2007, 22:00:05 (17 years ago)

Author:

Henrik Bettermann

Message:

ticket #252 and more

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_custom/logged_in.py (modified) (1 diff)
• waeup_student/getStudentWorkflowInfo.py (modified) (1 diff)
• waeup_student/getStudyLevelInfo.py (modified) (1 diff)
• waeup_student/study_level_view.pt (modified) (3 diffs)

WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

@@ -68 +68 @@
             payments.getContent().edit(mapping=d)
         student_pume = getattr(student,'pume',None)
-        s_review_state = context.getStudentReviewState()
+        s_review_state = context.getStudentReviewState(student.id)
         a_review_state = wftool.getInfoFor(student_app,'review_state',None)
         student_per = getattr(student,'personal',None)

WAeUP_SRP/trunk/skins/waeup_student/getStudentWorkflowInfo.py

@@ -27 +27 @@
 #info['student'] = student
 info['url'] = student.absolute_url()
-review_state = info['review_state'] = context.getStudentReviewState()
+review_state = info['review_state'] = context.getStudentReviewState(student_id)
 info['cr'] = review_state in  ('returning',
                                            'school_fee_paid',

WAeUP_SRP/trunk/skins/waeup_student/getStudyLevelInfo.py

@@ -116 +116 @@
         normal.append(d)
 info['credits_total'] = credits_total
-info['credits_exceeded'] = credits_total >= 50
+info['credits_exceeded'] = credits_total > 50
 carry_overs.sort(cmp_semester_id)
 info['carry_overs'] = carry_overs

WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt

@@ -132 +132 @@
                      ('Do you really want to delete selected courses?', )" 
                      />
-              <input tal:condition="python: 0" type="submit" name="refresh_level:method"
+              <input tal:condition="python: 1" type="submit" name="refresh_level:method"
                      class="context" value="Update" 
                      />
@@ -141 +141 @@
                      type="submit" name="register_courses:method"
                      class="context" value="Submit" />
-              <span tal:condition="info/credits_exceeded">Your credits exceed 50</span>
+              <span tal:condition="info/credits_exceeded">
+                  <font color="red"> <strong>Your total credits exceed 50!</strong></font>
+              </span>
                      
               <input type="hidden" name="action_after_validate" type="text" id="action_after_validate"
@@ -148 +150 @@
               <br /><br />
               
-              <span tal:condition="python: 0">
+              <span tal:condition="python: 1">
               <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. 
               Please use this function only if you are sure that your faculty has added courses which are not yet on your course list.                                
               </span>
-              <span tal:condition="python: 1">
+              <span tal:condition="python: 0">
               <strong>Note:</strong> The 'Update' function has been temporarily disabled.                                 
               </span>