Reindent NonSession.
Give NonSession a __str__ to try to help understand what is in it. - Legacy-Id: 125
This commit is contained in:
parent
6396c8ee73
commit
2edecd6f0d
|
@ -55,17 +55,24 @@ class MeetingVenue(models.Model):
|
||||||
|
|
||||||
class NonSessionRef(models.Model):
|
class NonSessionRef(models.Model):
|
||||||
name = models.CharField(maxlength=255)
|
name = models.CharField(maxlength=255)
|
||||||
|
def __str__(self):
|
||||||
|
return self.name
|
||||||
class Meta:
|
class Meta:
|
||||||
db_table = 'non_session_ref'
|
db_table = 'non_session_ref'
|
||||||
|
|
||||||
class NonSession(models.Model):
|
class NonSession(models.Model):
|
||||||
non_session_id = models.IntegerField(primary_key=True)
|
non_session_id = models.AutoField(primary_key=True)
|
||||||
day_id = models.IntegerField()
|
day_id = models.IntegerField()
|
||||||
non_session_ref = models.ForeignKey(NonSessionRef)
|
non_session_ref = models.ForeignKey(NonSessionRef)
|
||||||
meeting_num = models.ForeignKey(Meeting, db_column='meeting_num', unique=True)
|
meeting = models.ForeignKey(Meeting, db_column='meeting_num')
|
||||||
time_desc = models.CharField(blank=True, maxlength=75)
|
time_desc = models.CharField(blank=True, maxlength=75)
|
||||||
class Meta:
|
def __str__(self):
|
||||||
db_table = 'non_session'
|
if self.day_id:
|
||||||
|
return "%s %s %s @%d" % ((self.meeting.start_date + datetime.timedelta(self.day_id)).strftime('%A'), self.time_desc, self.non_session_ref, self.meeting_id)
|
||||||
|
else:
|
||||||
|
return "** %s %s @%d" % (self.time_desc, self.non_session_ref, self.meeting_id)
|
||||||
|
class Meta:
|
||||||
|
db_table = 'non_session'
|
||||||
|
|
||||||
class Proceeding(models.Model):
|
class Proceeding(models.Model):
|
||||||
meeting_num = models.ForeignKey(Meeting, db_column='meeting_num', unique=True, primary_key=True)
|
meeting_num = models.ForeignKey(Meeting, db_column='meeting_num', unique=True, primary_key=True)
|
||||||
|
|
Loading…
Reference in a new issue