altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Added a break_info() model on Timeslot. Fixes the missing breaks on the

Browse source 
text agenda.
 - Legacy-Id: 6376
This commit is contained in:
Henrik Levkowetz 2013-10-04 21:49:52 +00:00
parent f95b2795fe
commit dbc17624f8
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ietf/meeting/models.py
View file

@ -3,6 +3,7 @@
import pytz, datetime
from urlparse import urljoin
import copy
import debug
from django.db import models
from django.conf import settings
@ -267,6 +268,13 @@ class TimeSlot(models.Model):
def reg_info(self):
return (self.registration() is not None)
def break_info(self):
breaks = self.__class__.objects.filter(meeting=self.meeting, time__month=self.time.month, time__day=self.time.day, type="break").order_by("time")
for brk in breaks:
if brk.time_desc[-4:] == self.time_desc[:4]:
return brk
return None
def __unicode__(self):
location = self.get_location()
if not location:
@ -642,14 +650,13 @@ class ScheduledSession(models.Model):
return ""
return self.session.group.parent.acronym
@property
def break_info(self):
breaks = self.schedule.scheduledsessions_set.filter(timeslot__time__month=self.timeslot.time.month, timeslot__time__day=self.timeslot.time.day, timeslot__type="break").order_by("timeslot__time")
now = self.timeslot.time_desc[:4]
for brk in breaks:
if brk.time_desc[-4:] == now:
return brk
return None
# def break_info(self):
# breaks = self.schedule.scheduledsessions_set.filter(timeslot__time__month=self.timeslot.time.month, timeslot__time__day=self.timeslot.time.day, timeslot__type="break").order_by("timeslot__time")
# now = self.timeslot.time_desc[:4]
# for brk in breaks:
# if brk.time_desc[-4:] == now:
# return brk
# return None
@property
def area_name(self):