Changeset 2912 for WAeUP_SRP


Ignore:
Timestamp:
10 Dec 2007, 20:11:24 (17 years ago)
Author:
Henrik Bettermann
Message:

layout changes

Location:
WAeUP_SRP
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/base/Students.py

    r2662 r2912  
    219219                continue
    220220            try:
    221                 icl = int(old_current_level)               
     221                icl = int(old_current_level)
    222222                if icl == int(old_current_level) and old_study_course == new_study_course:
    223223                    em = 'Already transferred'
    … …  
    594594        """compose title"""
    595595        content = self.getContent()
     596        session_str = self.portal_vocabularies.sessions.get(content.session)
    596597        #return "Accommodation Data for %s %s" % (content.firstname,content.lastname)
    597         return "Accommodation Data for Session %s" % content.session
     598        return "Accommodation Data for Session %s" % session_str
    598599
    599600
    … …  
    618619    def Title(self):
    619620        """compose title"""
    620         content = self.getContent()
     621        #content = self.getContent()
    621622        #return "Personal Data for %s %s" % (content.firstname,content.lastname)
    622623        return "Personal Data"
    … …  
    643644    def Title(self):
    644645        """compose title"""
    645         content = self.getContent()
     646        #content = self.getContent()
    646647        #return "Clearance/Eligibility Record for %s %s" % (content.firstname,content.lastname)
    647648        return "Clearance/Eligibility Record"
    … …  
    715716    def Title(self):
    716717        """compose title"""
    717         content = self.getContent()
     718        #content = self.getContent()
    718719        return "Study Course"
    719720
    … …  
    750751###)
    751752
    752 class StudentPume(CPSDocument): ###(
    753     """
    754     WAeUP Student container for the various student data
    755     """
    756     meta_type = 'StudentPume'
    757     portal_type = meta_type
    758     security = ClassSecurityInfo()
    759 
    760     security.declareProtected(View,"Title")
    761     def Title(self):
    762         """compose title"""
    763         return "PUME Results"
    764 
    765 
    766 InitializeClass(StudentPume)
    767 
    768 def addStudentPume(container, id, REQUEST=None, **kw):
    769     """Add a Students PUME data."""
    770     ob = StudentPume(id, **kw)
    771     return CPSBase_adder(container, ob, REQUEST=REQUEST)
    772 ###)
    773 
    774 ##class StudentSemester(CPSDocument): ###(
    775 ##    """
    776 ##    WAeUP StudentSemester containing the courses and students
    777 ##    """
    778 ##    meta_type = 'StudentSemester'
    779 ##    portal_type = meta_type
    780 ##    security = ClassSecurityInfo()
    781 ##
    782 ##InitializeClass(StudentSemester)
    783 ##
    784 ##def addStudentSemester(container, id, REQUEST=None, **kw):
    785 ##    """Add a StudentSemester."""
    786 ##    ob = StudentSemester(id, **kw)
    787 ##    return CPSBase_adder(container, ob, REQUEST=REQUEST)
    788 ##
    789 #####)
    790 
    791 ##class Semester(CPSDocument): ###(
    792 ##    """
    793 ##    WAeUP Semester containing the courses and students
    794 ##    """
    795 ##    meta_type = 'Semester'
    796 ##    portal_type = meta_type
    797 ##    security = ClassSecurityInfo()
    798 ##
    799 ##InitializeClass(Semester)
    800 ##
    801 ##def addSemester(container, id, REQUEST=None, **kw):
    802 ##    """Add a Semester."""
    803 ##    ob = Semester(id, **kw)
    804 ##    return CPSBase_adder(container, ob, REQUEST=REQUEST)
    805 ##
    806 #####)
    807753
    808754class StudentCourseResult(CPSDocument): ###(
    … …  
    839785###)
    840786
     787class StudentPume(CPSDocument): ###(
     788    """
     789    WAeUP Student container for the various student data
     790    """
     791    meta_type = 'StudentPume'
     792    portal_type = meta_type
     793    security = ClassSecurityInfo()
     794
     795    security.declareProtected(View,"Title")
     796    def Title(self):
     797        """compose title"""
     798        return "PUME Results"
     799
     800
     801InitializeClass(StudentPume)
     802
     803def addStudentPume(container, id, REQUEST=None, **kw):
     804    """Add a Students PUME data."""
     805    ob = StudentPume(id, **kw)
     806    return CPSBase_adder(container, ob, REQUEST=REQUEST)
     807
     808
     809
    841810# Backward Compatibility StudyLevel
    842811

  • WAeUP_SRP/base/skins/waeup_student/reserve_accommodation.py

    r2887 r2912  
    4040acco_id = info['acco_id']
    4141#session = info['session'][1]
    42 session = info['session']
    43 #session = acco_id[-4:]
     42session = info['session'][0]
     43
    4444validate = REQUEST.has_key("cpsdocument_create_button")
    4545if info.has_key('acco') and info['acco']:

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

    r2858 r2912  
    3939 </widget>
    4040 <widget name="acco_maint_fee" meta_type="String Widget">
    41   <property name="title">Maintenance Payment Fee</property>
     41  <property name="title">Maintenance Fee</property>
    4242  <property name="fields">
    4343   <element value="acco_maint_fee"/>
    4444  </property>
    45   <property name="label">Maintenance Payment Fee</property>
    46   <property name="label_edit">Maintenance Payment Fee</property>
     45  <property name="label">Maintenance Fee</property>
     46  <property name="label_edit">Maintenance Fee</property>
    4747  <property name="readonly_layout_modes">
    4848   <element value="edit"/>

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

    r2896 r2912  
    2222  <property name="hidden_readonly_layout_modes"/>
    2323  <property name="view_format">%d/%m/%Y</property>
    24   <property name="time_setting">False</property> 
     24  <property name="time_setting">False</property>
    2525 </widget>
    2626 <widget name="acco_maint_sc_pin" meta_type="Scratchcard Pin Widget">
    … …  
    3838  <property name="prefix">@getMaintenancePrefix</property>
    3939 </widget>
     40 <widget name="acco_maint_fee" meta_type="String Widget">
     41  <property name="title">Maintenance Fee</property>
     42  <property name="fields">
     43   <element value="acco_maint_fee"/>
     44  </property>
     45  <property name="label">Maintenance Fee</property>
     46  <property name="label_edit">Maintenance Fee</property>
     47  <property name="readonly_layout_modes">
     48   <element value="edit"/>
     49  </property>
     50  <property name="hidden_layout_modes">
     51   <element value="create"/>
     52  </property>
     53  <property name="hidden_readonly_layout_modes"/>
     54 </widget>
    4055 <widget name="acco_res_date" meta_type="DateTime Widget">
    4156  <property name="title">Hostel Application Date</property>
    … …  
    5368  <property name="hidden_readonly_layout_modes"/>
    5469  <property name="view_format">%d/%m/%Y</property>
    55   <property name="time_setting">False</property> 
     70  <property name="time_setting">False</property>
    5671 </widget>
    5772 <widget name="acco_res_sc_pin" meta_type="Scratchcard Pin Widget">
    … …  
    129144  </row>
    130145  <row>
     146   <cell name="acco_maint_fee"/>
     147  </row> 
     148  <row>
    131149   <cell name="acco_maint_date"/>
    132150  </row>

  • WAeUP_SRP/uniben/waeup_custom/getPaymentsFolderInfo.py

    r2859 r2912  
    3535import DateTime
    3636request = context.REQUEST
    37 #students = context.portal_url.getPortalObject().campus.students
     37students = context.portal_url.getPortalObject().campus.students
    3838student_id = context.getStudentId()
    3939if student_id is None:
    4040    return context.REQUEST.RESPONSE.redirect("%s/srp_anonymous_view" % context.portal_url())
    41 #student = getattr(students,student_id)
     41student = getattr(students,student_id)
    4242student_record = context.students_catalog.getRecordByKey(student_id)
    4343context['updatePayments']()
    … …  
    9595        if review_state == 'opened' and info['review_state'] == 'cleared_and_validated' and hasattr(so_doc, 'order_id') and not so_doc.resp_code:
    9696            row['is_requeryable'] = True
    97             row['callback_url'] = "%s/interswitch_cb" % (payments_path)
     97            row['callback_url'] = "%s/payments/%s/interswitch_cb" % (student.absolute_url(),
     98                                                            so.getId)
    9899            href = '%(query_url)s' % info
    99100            href += '?transRef=%(trans_ref)s' % row

  • WAeUP_SRP/uniben/waeup_custom/layout_student_acco_view_slip.pt

    r2847 r2912  
    99                                 'acco_res_date',
    1010                                 'acco_maint_sc_pin',
     11                                 'acco_maint_fee',                                 
    1112                                 'acco_maint_date',
    1213                                 )"
Note: See TracChangeset for help on using the changeset viewer.