Changeset 2000


Ignore:
Timestamp:
9 Jul 2007, 07:04:27 (17 years ago)
Author:
Henrik Bettermann
Message:

ticket #245

Location:
WAeUP_SRP/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/WAeUPTool.py

    r1998 r2000  
    502502        ###)
    503503
    504     security.declarePublic('getAccommodationInfo') ###(
    505     def getAccommodationInfo(self,bed):
    506         """return Accommodation Info"""
     504    security.declarePublic('getHallInfo') ###(
     505    def getHallInfo(self,bed):
     506        """return Hall Info"""
    507507        info = {}
    508508        hall,block,room,letter = bed.split('_')

  • WAeUP_SRP/trunk/skins/waeup_accommodation/change_bed.py

    r1566 r2000  
    5252        d['bed'] = bed
    5353        d['student_status'] = status
    54         acco_info = context.waeup_tool.getAccommodationInfo(bed)
     54        acco_info = context.waeup_tool.getHallInfo(bed)
    5555        d['acco_maint_code'] = acco_info.get('maintenance_code')
    5656        d['acco_maint_fee'] = acco_info.get('maintenance_fee')
    … …  
    9393        d['bed'] = bed
    9494        d['student_status'] = status
    95         acco_info = context.waeup_tool.getAccommodationInfo(bed)
     95        acco_info = context.waeup_tool.getHallInfo(bed)
    9696        d['acco_maint_code'] = acco_info.get('maintenance_code')
    9797        d['acco_maint_fee'] = acco_info.get('maintenance_fee')

  • WAeUP_SRP/trunk/skins/waeup_accommodation/getFormattedBed.py

    r1566 r2000  
    1919    return bed
    2020hall,block,room,letter = bed.split('_')
    21 info = context.waeup_tool.getAccommodationInfo(bed)
     21info = context.waeup_tool.getHallInfo(bed)
    2222if info:
    2323    hall_title = info['hall_title']

  • WAeUP_SRP/trunk/skins/waeup_accommodation/reallocate_bed.py

    r1566 r2000  
    5454        d['bed'] = bed
    5555        d['student_status'] = status
    56         acco_info = context.waeup_tool.getAccommodationInfo(bed)
     56        acco_info = context.waeup_tool.getHallInfo(bed)
    5757        d['acco_maint_code'] = acco_info.get('maintenance_code')
    5858        d['acco_maint_fee'] = acco_info.get('maintenance_fee')
    … …  
    9898        d['bed'] = bed
    9999        d['student_status'] = status
    100         acco_info = context.waeup_tool.getAccommodationInfo(bed)
     100        acco_info = context.waeup_tool.getHallInfo(bed)
    101101        d['acco_maint_code'] = acco_info.get('maintenance_code')
    102102        d['acco_maint_fee'] = acco_info.get('maintenance_fee')

  • WAeUP_SRP/trunk/skins/waeup_accommodation/reserve_accommodation.py

    r1566 r2000  
    9797        student.invokeFactory('StudentAccommodation',acco_id)
    9898        acco = getattr(student,acco_id)
    99         acco_info = context.waeup_tool.getAccommodationInfo(bed)
     99        acco_info = context.waeup_tool.getHallInfo(bed)
    100100        ds.set('acco_maint_code', acco_info.get('maintenance_code'))
    101101        ds.set('acco_maint_fee', acco_info.get('maintenance_fee'))

  • WAeUP_SRP/trunk/skins/waeup_student/getMaintenancePrefix.py

    r1164 r2000  
    1414s_info = context.getAccommodationInfo()
    1515if s_info.has_key('acco_doc'):
    16     info = context.waeup_tool.getAccommodationInfo(s_info['acco_doc'].bed)
     16    info = context.waeup_tool.getHallInfo(s_info['acco_doc'].bed)
    1717    if info:
    1818        return info['maintenance_code']
Note: See TracChangeset for help on using the changeset viewer.