symposion_app Changeset - 135a79a97b91

Changeset - 135a79a97b91

Parent rev.

Child rev.

[Not reviewed]

Merge

0 3 0

Patrick Altman - 9 years ago 2015-08-03 12:44:57
paltman@gmail.com

Merge pull request #110 from miurahr/slot_name_with_rooms

slot name includes rooms

1 file changed with 2 insertions and 1 deletions:

symposion/schedule/models.py

0 comments (0 inline, 0 general)

symposion/schedule/models.py

➞

Show inline comments

@@ ... / @@ -116,25 +116,26 @@ class Slot(models.Model): @@
             self.end.minute)
     @property
     def length_in_minutes(self):
         return int(
             (self.end_datetime - self.start_datetime).total_seconds() / 60)
     @property
     def rooms(self):
         return Room.objects.filter(pk__in=self.slotroom_set.values("room"))
     def __unicode__(self):
         return u"%s %s (%s - %s)" % (self.day, self.kind, self.start, self.end)
         roomlist = ' '.join(map(lambda r: r.__unicode__(), self.rooms))
         return u"%s %s (%s - %s) %s" % (self.day, self.kind, self.start, self.end, roomlist)
     class Meta:
         ordering = ["day", "start", "end"]
 class SlotRoom(models.Model):
     """
     Links a slot with a room.
     """
     slot = models.ForeignKey(Slot)
     room = models.ForeignKey(Room)

0 comments (0 inline, 0 general)