Changeset - 494b8ffb1779
[Not reviewed]
0 1 0
Tobias - 5 years ago 2019-01-03 23:45:51
tobias@localhost.localdomain
Fix slot naming if re-using talk types
1 file changed with 1 insertions and 1 deletions:
0 comments (0 inline, 0 general)
vendor/symposion/schedule/models.py
Show inline comments
...
 
@@ -157,49 +157,49 @@ class Slot(models.Model):
 
    def end_datetime(self):
 
        return datetime.datetime(
 
            self.day.date.year,
 
            self.day.date.month,
 
            self.day.date.day,
 
            self.end.hour,
 
            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 save(self, *args, **kwargs):
 
        roomlist = ' '.join(map(str, self.rooms))
 
        self.name = "%s %s (%s - %s) %s" % (self.day.date, self.kind.label, self.start, self.end, roomlist)
 
        self.content_override_html = parse(self.content_override)
 
        super(Slot, self).save(*args, **kwargs)
 

	
 
    def __str__(self):
 
        return "%s: %s" % (self.kind.schedule.section.name, self.name)
 
        return "%s: %s" % (self.day.schedule.section.name, self.name)
 

	
 
    class SymposionMeta:
 
        select_related = ('kind__schedule__section', 'day')
 

	
 
    class Meta:
 
        ordering = ["day", "start", "end"]
 
        verbose_name = _("slot")
 
        verbose_name_plural = _("slots")
 

	
 

	
 
class SlotRoom(models.Model):
 
    """
 
    Links a slot with a room.
 
    """
 

	
 
    slot = models.ForeignKey(Slot, verbose_name=_("Slot"))
 
    room = models.ForeignKey(Room, verbose_name=_("Room"))
 

	
 
    def __str__(self):
 
        return "%s %s" % (self.room, self.slot)
 

	
 
    class Meta:
 
        unique_together = [("slot", "room")]
 
        ordering = ["slot", "room__order"]
0 comments (0 inline, 0 general)