Changeset 3795

Timestamp:

1 Dec 2008, 12:21:08 (16 years ago)

Author:

Henrik Bettermann

Message:

fix accommodation payment futminna

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_futminna/getAccommodationInfo.py (modified) (3 diffs)
• waeup_futminna/layout_student_acco_view_slip.pt (added)
• waeup_student/accommodation_edit_form.pt (modified) (1 diff)
• waeup_utilities/changeRegState.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_futminna/getAccommodationInfo.py

@@ -58 +58 @@
 # customize from here
 
-
-new_states = ('cleared_and_validated',
-              'school_fee_paid',
-              'courses_registered',
-              'courses_validated',
-              )
-
-new = student_record.entry_session == session[0]
-arrived = student_record.session == session[0]
-
-level = None
-end_level = None
-previous = None
-
 try:
     level = int(student_record.level)
 except:
     logger.info('%s has invalid level %s' % (student_id,student_record.level))
-try:
-    end_level = int(student_record.end_level)
-except:
-    logger.info('%s has invalid end_level %s' % (student_id,student_record.end_level))
-try:
-    previous = int(student_record.session) == int(session[0]) - 1
-except:
-    logger.info('%s has invalid session %s' % (student_id,student_record.session))
+    info['acco'] = None
+    info['booking_allowed'] = False
+    info['student_status'] = ''
+    return info    
 
-if level is None or end_level is None or student_record.review_state == 'deactivated':
-    pass
-elif arrived:
-    if new:
-        booking_allowed = student_record.review_state in new_states
-    else:
-        #booking_allowed = not (level % 100)
-        booking_allowed = True
-elif previous:
-    booking_allowed = not student_record.verdict in ('I',)
-
-info['booking_allowed'] = booking_allowed
-if not booking_allowed:
+if review_state in ('cleared_and_validated','school_fee_paid','courses_registered', 'courses_validated',) and student_record.session == session[0]:
+    info['booking_allowed'] = True
+    info['online_payment'] = True
+else:
     info['acco'] = None
+    info['booking_allowed'] = False
     info['student_status'] = ''
     return info
@@ -106 +80 @@
 info['acco'] = acco
 info['acco_id'] = acco_id
-bt = 're'
+
 info['maintenance_paid'] = False
 if acco is not None:
@@ -112 +86 @@
     info['acco_review_state'] = wf.getInfoFor(acco,'review_state',None)
     info['maintenance_paid'] = info['acco_review_state'] == "maintenance_fee_paid"
-
 d = {}
 d['sex'] = 'male'
+d['bt'] = 'all'
 if student_record.sex:
     d['sex'] = 'female'
+
 info['sex']=d['sex']
-d['bt'] = 'all'
 student_status = "%(sex)s_%(bt)s" % d
 info['student_status'] = student_status

WAeUP_SRP/trunk/skins/waeup_student/accommodation_edit_form.pt

@@ -41 +41 @@
  
            <ul tal:condition="not: maintenance_online" tal:omit-tag="">
-             <li>Buy a Hostel Maintainance Scratch Card 
+             <li>Buy a Hostel Maintenance Scratch Card 
                (Code: <span tal:replace="python: info['acco_doc'].acco_maint_code" />) for 
                <span tal:replace="python: info['acco_doc'].acco_maint_fee" /> Nairas</li> 

WAeUP_SRP/trunk/skins/waeup_utilities/changeRegState.py

@@ -29 +29 @@
 
 request = context.REQUEST
-students = context.portal_url.getPortalObject().campus.students
+#students = context.portal_url.getPortalObject().campus.students
 wftool = context.portal_workflow
 student_id = context.getStudentId()
+context_doc = context
 if student_id is None:
     return context.REQUEST.RESPONSE.redirect("%s/srp_anonymous_view" % context.portal_url())
-
-student = getattr(students,student_id)
+#student = getattr(students,student_id)
+#context_doc = student
 try:
-    wftool.doActionFor(student,transition)
+    wftool.doActionFor(context_doc,transition)
     logger.info('%s executed transition %s for %s' % (member,transition,student_id))
 except: