Project

General

Profile

« Previous | Next » 

Revision 1da8cee7

Added by Benjamin Dauvergne over 13 years ago

restore room in the event object

View differences:

calebasse/agenda/managers.py
event.description = description
event.participants = participants
event.services = services
event.room = room
if note is not None:
event.notes.create(note=note)
start_datetime = start_datetime or datetime.now().replace(
......
)
occurence_duration = default.DEFAULT_OCCURRENCE_DURATION
end_datetime = end_datetime or start_datetime + occurence_duration
event.add_occurrences(start_datetime, end_datetime, room, **rrule_params)
event.add_occurrences(start_datetime, end_datetime, **rrule_params)
event.save()
return event
......
return self._set_event(event, participants, services = services,
start_datetime = start_datetime, end_datetime = end_datetime,
**rrule_params)
room=room, **rrule_params)
def create_holiday(self, start_date, end_date, peoples=[], services=[], motive=''):
event_type, created = agenda.models.EventType.objects.get_or_create(
calebasse/agenda/models.py
null=True, blank=True, default=None)
participants = models.ManyToManyField('personnes.People',
null=True, blank=True, default=None)
room = models.ForeignKey('ressources.Room', blank=True, null=True,
verbose_name=u'Salle')
class Meta:
verbose_name = u'Evénement'
......
event = models.ForeignKey('Event', verbose_name=_('event'), editable=False)
notes = models.ManyToManyField('Note', verbose_name=_('notes'),
null=True, blank=True, default=None)
room = models.ForeignKey('ressources.Room', blank=True, null=True,
verbose_name=u'Salle')
objects = managers.OccurrenceManager()
calebasse/cale_base/fixtures/agenda.json
"pk": 3,
"model": "agenda.event",
"fields": {
"room": 2,
"event_type": 2,
"services": [
1,
......
"pk": 2,
"model": "agenda.event",
"fields": {
"room": 1,
"event_type": 1,
"services": [
1
......
"pk": 1,
"model": "agenda.event",
"fields": {
"room": 1,
"event_type": 1,
"services": [
1
......
"model": "agenda.occurrence",
"fields": {
"start_time": "2012-10-30T10:00:00",
"room": 1,
"notes": [],
"end_time": "2012-10-30T10:45:00",
"event": 1
......
"model": "agenda.occurrence",
"fields": {
"start_time": "2012-10-30T10:45:00",
"room": 1,
"notes": [],
"end_time": "2012-10-30T11:30:00",
"event": 2
......
"model": "agenda.occurrence",
"fields": {
"start_time": "2012-10-30T11:30:00",
"room": 2,
"notes": [],
"end_time": "2012-10-30T12:00:00",
"event": 3

Also available in: Unified diff