Changeset 2914 for WAeUP_SRP/uniben


Ignore:
Timestamp:
10 Dec 2007, 21:50:51 (17 years ago)
Author:
Henrik Bettermann
Message:

updated

Location:
WAeUP_SRP/uniben
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/uniben/profiles/default/layouts/student_accommodation.xml

    r2912 r2914  
    5454 </widget>
    5555 <widget name="acco_maint_sc_pin" meta_type="Scratchcard Pin Widget">
    56   <property name="title">Access Code</property>
     56  <property name="title">Hostel Maintenance PIN</property>
    5757  <property name="fields">
    5858   <element value="acco_maint_sc_pin"/>
    5959  </property>
    60   <property name="label">Access Code</property>
    61   <property name="label_edit">Access Code</property>
     60  <property name="label">Hostel Maintenance PIN</property>
     61  <property name="label_edit">Hostel Maintenance PIN</property>
    6262  <property name="readonly_layout_modes">
    6363   <element value="edit"/>
    … …  
    180180  <row>
    181181   <cell name="acco_maint_sc_pin"/>
    182   </row>
     182  </row>   
     183  <row>
     184   <cell name="acco_maint_pay_id"/>
     185  </row> 
    183186  <row>
    184187   <cell name="acco_maint_date"/>
    185188  </row>
     189
    186190 </table>
    187191</object>

  • WAeUP_SRP/uniben/profiles/default/layouts/student_accommodation_fe.xml

    r2912 r2914  
    5252  </property>
    5353  <property name="hidden_readonly_layout_modes"/>
    54  </widget> 
     54 </widget>
    5555 <widget name="acco_res_date" meta_type="DateTime Widget">
    5656  <property name="title">Hostel Application Date</property>
    … …  
    145145  <row>
    146146   <cell name="acco_maint_fee"/>
    147   </row> 
     147  </row>
    148148  <row>
    149149   <cell name="acco_maint_date"/>

  • WAeUP_SRP/uniben/waeup_custom/getAccommodationInfo.py

    r2903 r2914  
    6767review_state = info['review_state'] = s_brain.review_state
    6868
     69info['session'] = session = context.getSessionId()
     70
    6971students_object = context.portal_url.getPortalObject().campus.students
    7072student = getattr(students_object, student_id)
    … …  
    7375
    7476booking_allowed = False
    75 if review_state in ('cleared_and_validated','returning','school_fee_paid','courses_registered', 'courses_validated',):
     77if review_state in ('cleared_and_validated','returning','school_fee_paid','courses_registered', 'courses_validated',) and s_brain.session == session[0]:
    7678    booking_allowed = True
    7779    if s_brain.matric_no:
    … …  
    8789    info['acco'] = None
    8890    return info
    89 info['session'] = session = context.getSessionId()
     91
    9092acco_id = 'accommodation_' + session[0]
    9193acco = getattr(student,acco_id,None)
    … …  
    9799    info['acco_doc'] = acco.getContent()
    98100    info['acco_review_state'] = wf.getInfoFor(acco,'review_state',None)
    99     info['maintenance_paid'] = info['acco_review_state'] == "maintenance_fee_paid"   
    100    
    101    
     101    info['maintenance_paid'] = info['acco_review_state'] == "maintenance_fee_paid"
     102
     103
    102104d = {}
    103105if review_state == "cleared_and_validated":

  • WAeUP_SRP/uniben/waeup_custom/pay_interswitch.py

    r2892 r2914  
    6969info['student_name'] = student_record.name
    7070info['student_email'] = student_record.email
    71 info['session_id'] = student_record.session
     71info['session_id'] = student_record.session   # this holds only for new students
    7272info['type'] = 'online'
    7373info['status'] = 'started'
Note: See TracChangeset for help on using the changeset viewer.