Skip to content

Commit 2edecd6

Browse files
committed
Reindent NonSession.
Give NonSession a __str__ to try to help understand what is in it. - Legacy-Id: 125
1 parent 6396c8e commit 2edecd6

1 file changed

Lines changed: 14 additions & 7 deletions

File tree

ietf/proceedings/models.py

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,24 @@ class Admin:
5555

5656
class NonSessionRef(models.Model):
5757
name = models.CharField(maxlength=255)
58+
def __str__(self):
59+
return self.name
5860
class Meta:
5961
db_table = 'non_session_ref'
6062

6163
class NonSession(models.Model):
62-
non_session_id = models.IntegerField(primary_key=True)
63-
day_id = models.IntegerField()
64-
non_session_ref = models.ForeignKey(NonSessionRef)
65-
meeting_num = models.ForeignKey(Meeting, db_column='meeting_num', unique=True)
66-
time_desc = models.CharField(blank=True, maxlength=75)
67-
class Meta:
68-
db_table = 'non_session'
64+
non_session_id = models.AutoField(primary_key=True)
65+
day_id = models.IntegerField()
66+
non_session_ref = models.ForeignKey(NonSessionRef)
67+
meeting = models.ForeignKey(Meeting, db_column='meeting_num')
68+
time_desc = models.CharField(blank=True, maxlength=75)
69+
def __str__(self):
70+
if self.day_id:
71+
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)
72+
else:
73+
return "** %s %s @%d" % (self.time_desc, self.non_session_ref, self.meeting_id)
74+
class Meta:
75+
db_table = 'non_session'
6976

7077
class Proceeding(models.Model):
7178
meeting_num = models.ForeignKey(Meeting, db_column='meeting_num', unique=True, primary_key=True)

0 commit comments

Comments
 (0)