nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ICapCalendar] Rename entry => booked_entries and max_entry => max_entries

Browse source
This commit is contained in:
Bezleputh 2013-11-13 00:25:52 +01:00 • committed by Florent
commit a93a9025d6
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
weboob/applications/boobcoming/boobcoming.py
View file

@ -115,13 +115,13 @@ class UpcomingFormatter(IFormatter):
if hasattr(obj, 'event_planner') and not empty(obj.event_planner):
result += u'Event planner: %s/%s \n' % (obj.event_planner)
if hasattr(obj, 'entry') and not empty(obj.entry) and \
hasattr(obj, 'max_entry') and not empty(obj.max_entry):
result += u'Entry: %s/%s \n' % (obj.entry, obj.max_entry)
elif hasattr(obj, 'entry') and not empty(obj.entry):
result += u'Entry: %s \n' % (obj.entry)
elif hasattr(obj, 'max_entry') and not empty(obj.max_entry):
result += u'Max entries: %s \n' % (obj.max_entry)
if hasattr(obj, 'booked_entries') and not empty(obj.booked_entries) and \
hasattr(obj, 'max_entries') and not empty(obj.max_entries):
result += u'Entry: %s/%s \n' % (obj.booked_entries, obj.max_entries)
elif hasattr(obj, 'booked_entries') and not empty(obj.booked_entries):
result += u'Entry: %s \n' % (obj.booked_entries)
elif hasattr(obj, 'max_entries') and not empty(obj.max_entries):
result += u'Max entries: %s \n' % (obj.max_entries)
if hasattr(obj, 'description') and not empty(obj.description):
result += u'Description:\n %s\n\n' % obj.description

4
weboob/capabilities/calendar.py
View file

@ -53,8 +53,8 @@ class BaseCalendarEvent(CapBaseObject):
category = StringField('Category of the event')
description = StringField('Description of the event')
price = FloatField('Price of the event')
entry = IntField('Entry number')
max_entry = IntField('Max entry number')
booked_entries = IntField('Entry number')
max_entries = IntField('Max entry number')
event_planner = StringField('Name of the event planner')
#the following elements deal with ICalendar stantdards