Changeset 2674 for WAeUP_SRP

Timestamp:

16 Nov 2007, 09:23:11 (17 years ago)

Author:

Henrik Bettermann

Message:

inform students why course registration is disabled

Location:

WAeUP_SRP

Files:

• base/skins/waeup_student/getStudyCourseInfo.py (modified) (2 diffs)
• base/skins/waeup_student/study_course_view.pt (modified) (1 diff)
• uniben/profiles/default/properties.xml (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_student/getStudyCourseInfo.py

@@ -86 +86 @@
 if review_state != 'content_addable' and student_review_state == 'school_fee_paid': #and context.isStudent():
     wftool.doActionFor(context,'close_for_edit')
-    
+
 has_paid = student_review_state == 'school_fee_paid'
 
@@ -92 +92 @@
                current_level not in levels and\
                (previous_verdict in ('A','B','C','F','J','L','M') or\
-               sbrain.level == '100' or\
-               (sbrain.mode.startswith('de') and sbrain.level == '200'))
+               current_level == '100' or\
+               (sbrain.mode.startswith('de') and current_level == '200'))
+               
+missing_data = has_paid and\
+               current_level not in levels and\
+               not (previous_verdict or sbrain.level) and\
+               not (current_level == '100' or\
+               (sbrain.mode.startswith('de') and current_level == '200'))           
 
-
+info['missing_data'] = missing_data
 levels.sort()
 info['create_level'] = None
 student_levels_voc = context.portal_vocabularies.student_levels
-if may_register:
+if not missing_data:
     info['create_level'] = current_level
     info['create_level_str'] = student_levels_voc.get(current_level)

WAeUP_SRP/base/skins/waeup_student/study_course_view.pt

@@ -136 +136 @@
                      value string: Register Courses for ${info/create_level_str}" 
                      />
-            <font color="red">
-            <br /><br />
-            Creating the course list may take several minutes. Please be patient, don't click twice!
-            </font>                       
           </td>
         </tr>
       </table>
-    </form>          
+    </form>  
+    
+    <div tal:condition="not: create_level">
+       <font color='red'>
+          Your faculty has not yet provided the results and verdict of the previous session.
+       </font>
+    </div>
 
   </span>

WAeUP_SRP/uniben/profiles/default/properties.xml

@@ -4 +4 @@
  <property name="enable_password_reset" type="boolean">True</property>
  <property name="enable_portal_joining" type="boolean">False</property>
- <property name="session" type="string">2006/2007</property>
+ <property name="session" type="string">2007/2008</property>
  <property name="static_dir" type="string">static/</property>
 </site>