Changeset 2031 for WAeUP_SRP/trunk

Timestamp:

18 Jul 2007, 07:51:47 (17 years ago)

Author:

Henrik Bettermann

Message:

enable registering courses for session 05

only drawback: level object for session 05 is not closed after submission (register_courses)

please check

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_default/getSessionId.py (modified) (1 diff)
• waeup_default/getSessionString.py (deleted)
• waeup_default/getSessionString.py_not_used (added)
• waeup_design/slip_template.pt (modified) (1 diff)
• waeup_student/course_registration_slip.pt (modified) (1 diff)
• waeup_student/create_level.py (modified) (3 diffs)
• waeup_student/getStudyLevelInfo.py (modified) (1 diff)
• waeup_student/study_level_view.pt (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_default/getSessionId.py

@@ -17 +17 @@
 import DateTime
 now = DateTime.DateTime()
-if now.month() > 7:
+if now.month() > 8:
     s = "%s" % now.year()
 else:

WAeUP_SRP/trunk/skins/waeup_design/slip_template.pt

@@ -68 +68 @@
           style="margin: 0px;"
           tal:attributes="onload here/getOnLoad|string:setFocus();">
-    <div>
-      <a href="http://uniben.waeup.org/accessibility" accesskey="0"></a>
-      <a href="http://uniben.waeup.org/" accesskey="1"></a>
-      <a href="#content" accesskey="2"></a>
-      <a href="#menu" accesskey="3"></a>
-      <a href="http://uniben.waeup.org/advanced_search_form"
-         accesskey="4"></a>
-      <a href="http://uniben.waeup.org/" accesskey="7"></a>
-    </div>
-    
+   
     <table summary="Logo Block"
            style="margin-left: auto; margin-right: auto; width: 100%;"

WAeUP_SRP/trunk/skins/waeup_student/course_registration_slip.pt

@@ -17 +17 @@
           view_only info/view_only"
           >
-      <h3>Course Registration Slip</h3>
+      <h3>Course Registration Slip for <span tal:content="here/title_or_id" /></h3>
       <br />
       <div tal:condition="validated">

WAeUP_SRP/trunk/skins/waeup_student/create_level.py

@@ -33 +33 @@
 cert_id = student.course
 current_level = student.level
+current_session = student.session
 in_progress =  request.get('in_progress','not started')
 #level_created =  request.get('level_created','xxx')
@@ -60 +61 @@
     level = getattr(context,"%s" % current_level)
     context.portal_workflow.doActionFor(level,'open')
-    study_session = context.getSessionString()
-    level.getContent().edit(mapping={'session': study_session})
+    #study_session = context.getSessionString()
+    level.getContent().edit(mapping={'session': current_session})
     context.portal_workflow.doActionFor(level,'close_for_edit')
     context.waeup_tool.doCommit()
@@ -133 +134 @@
         context.waeup_tool.doCommit()
 logger.info('%s finished to create level %s' % (student.id,current_level))
+
+if current_session == '05':
+    next_session = '06'
+    next_level = "%s" % (int(current_level) + 100)
+    study_course = getattr(student,'study_course')
+    context.portal_workflow.doActionFor(study_course,'open')
+    study_course_doc = study_course.getContent()
+    study_course_doc.edit(mapping= {'current_level': next_level,
+                                    'current_session': next_session,})
+    context.portal_workflow.doActionFor(study_course,'close_for_edit')
+
 return response.redirect("%s/%s" % (context.absolute_url(),current_level))
 

WAeUP_SRP/trunk/skins/waeup_student/getStudyLevelInfo.py

@@ -123 +123 @@
 info['credits_total'] = credits_total
 info['credits_exceeded'] = credits_total > 51
+session_of_level = context.getContent().session
+info['submission_allowed']= not info['credits_exceeded'] and session_of_level == context.getSessionId()[-2:]
 carry_overs.sort(cmp_semester_id)
 info['carry_overs'] = carry_overs

WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt

@@ -129 +129 @@
                      
               <br /><br />
-              <input tal:condition="not: info/credits_exceeded" 
+              <input tal:condition="info/submission_allowed" 
                      type="submit" name="register_courses:method"
-                     class="context" value="Submit" />
+                     class="context" value="Submit to Course Adviser" 
+                     tal:attributes="onclick python:'return window.confirm(\'%s\')' %
+                     ('Do you really want to submit the course list?', )" />
               <span tal:condition="info/credits_exceeded">
                   <font color="red"> <strong>Your total credits exceed 50!</strong></font>