@@ -55,17 +55,24 @@ class Admin:
5555
5656class 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
6163class 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
7077class Proceeding (models .Model ):
7178 meeting_num = models .ForeignKey (Meeting , db_column = 'meeting_num' , unique = True , primary_key = True )
0 commit comments