Event resturcturing
- new short_description field instead of title - autosave text - autocompletion on login
This commit is contained in:
@@ -13,24 +13,26 @@ class Event ( models.Model ):
|
||||
EVENT_TYPES = (
|
||||
( 'Reh', _('Rehearsal') ),
|
||||
( 'Conc', _('Concert') ),
|
||||
( 'GenReh', _('General Rehearsal') ),
|
||||
( 'Party', _('Party') ),
|
||||
( 'Travel', _('Travel') )
|
||||
)
|
||||
|
||||
title = models.CharField( max_length=40, verbose_name = _("titel") )
|
||||
type = models.CharField( max_length=6, choices=EVENT_TYPES, default='Reh', verbose_name= _("type") )
|
||||
short_desc = models.CharField( null=True, max_length=100, blank = True, verbose_name= _("Short Description") )
|
||||
location = models.TextField( blank=False, verbose_name=_("location") )
|
||||
map_location = PlainLocationField( based_field = location, zoom=7 )
|
||||
desc = models.TextField( blank=True, verbose_name=_("description"))
|
||||
|
||||
map_location = PlainLocationField(blank=True, based_field = location, zoom=7, verbose_name=_("Location on map") )
|
||||
desc = models.TextField( blank=True, verbose_name=_("description") )
|
||||
|
||||
date = models.DateField( verbose_name= _("date") )
|
||||
time = models.TimeField( null=True, blank=True, verbose_name = _("time") )
|
||||
meeting_time = models.TimeField( null=True, blank=True, verbose_name = _("meeting_time") )
|
||||
|
||||
end_date = models.DateField( null=True, blank = True, verbose_name = _("End Date") )
|
||||
|
||||
participants = models.ManyToManyField( User, through='EventParticipation', verbose_name=_("participants") )
|
||||
|
||||
def __unicode__(self):
|
||||
return self.title + " ( " + self.get_type_display() + " ) "
|
||||
return self.title
|
||||
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
@@ -42,6 +44,14 @@ class Event ( models.Model ):
|
||||
if not u in self.participants.all():
|
||||
EventParticipation.objects.create( event=self, user = u, status='?', comment = '' )
|
||||
|
||||
@property
|
||||
def title(self):
|
||||
res = self.get_type_display()
|
||||
if ( self.short_desc ):
|
||||
res += " ( " + self.short_desc + " ) "
|
||||
|
||||
return res
|
||||
|
||||
@property
|
||||
def displaytime(self):
|
||||
if self.meeting_time is None or self.meeting_time == "":
|
||||
|
||||
Reference in New Issue
Block a user