Races: add FK to Race in RaceUpdate
This commit is contained in:
parent
f6fb16225f
commit
643147cec7
|
@ -143,7 +143,7 @@ class Races(Module):
|
||||||
racer.save()
|
racer.save()
|
||||||
|
|
||||||
# create an event for this too
|
# create an event for this too
|
||||||
RaceUpdate.objects.create(racer=racer, update="Started the race.")
|
RaceUpdate.objects.create(race=race, racer=racer, update="Started the race.")
|
||||||
|
|
||||||
return self.irc.reply(event, "you have started {0:s}.".format(race.name))
|
return self.irc.reply(event, "you have started {0:s}.".format(race.name))
|
||||||
except Racer.DoesNotExist:
|
except Racer.DoesNotExist:
|
||||||
|
@ -172,7 +172,7 @@ class Races(Module):
|
||||||
racer.save()
|
racer.save()
|
||||||
|
|
||||||
# create an event for this too
|
# create an event for this too
|
||||||
RaceUpdate.objects.create(racer=racer, update="Finished the race.")
|
RaceUpdate.objects.create(race=race, racer=racer, update="Finished the race.")
|
||||||
|
|
||||||
return self.irc.reply(event, "you have finished {0:s}.".format(race.name))
|
return self.irc.reply(event, "you have finished {0:s}.".format(race.name))
|
||||||
except Racer.DoesNotExist:
|
except Racer.DoesNotExist:
|
||||||
|
@ -198,7 +198,7 @@ class Races(Module):
|
||||||
"".format(race.name))
|
"".format(race.name))
|
||||||
|
|
||||||
# create an event
|
# create an event
|
||||||
RaceUpdate.objects.create(racer=racer, update=update)
|
RaceUpdate.objects.create(race=race, racer=racer, update=update)
|
||||||
|
|
||||||
return self.irc.reply(event, "update logged.")
|
return self.irc.reply(event, "update logged.")
|
||||||
except Racer.DoesNotExist:
|
except Racer.DoesNotExist:
|
||||||
|
|
|
@ -0,0 +1,48 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
from south.utils import datetime_utils as datetime
|
||||||
|
from south.db import db
|
||||||
|
from south.v2 import SchemaMigration
|
||||||
|
from django.db import models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(SchemaMigration):
|
||||||
|
|
||||||
|
def forwards(self, orm):
|
||||||
|
# Adding field 'RaceUpdate.race'
|
||||||
|
db.add_column(u'races_raceupdate', 'race',
|
||||||
|
self.gf('django.db.models.fields.related.ForeignKey')(default=1, to=orm['races.Race']),
|
||||||
|
keep_default=False)
|
||||||
|
|
||||||
|
|
||||||
|
def backwards(self, orm):
|
||||||
|
# Deleting field 'RaceUpdate.race'
|
||||||
|
db.delete_column(u'races_raceupdate', 'race_id')
|
||||||
|
|
||||||
|
|
||||||
|
models = {
|
||||||
|
u'races.race': {
|
||||||
|
'Meta': {'object_name': 'Race'},
|
||||||
|
'description': ('django.db.models.fields.TextField', [], {}),
|
||||||
|
'key': ('django.db.models.fields.CharField', [], {'max_length': '16', 'primary_key': 'True'}),
|
||||||
|
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
|
||||||
|
},
|
||||||
|
u'races.racer': {
|
||||||
|
'Meta': {'unique_together': "(('nick', 'race'),)", 'object_name': 'Racer'},
|
||||||
|
'finished': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||||
|
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||||
|
'joined': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||||
|
'nick': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
|
||||||
|
'race': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['races.Race']"}),
|
||||||
|
'started': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
|
||||||
|
},
|
||||||
|
u'races.raceupdate': {
|
||||||
|
'Meta': {'object_name': 'RaceUpdate'},
|
||||||
|
'event_time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||||
|
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||||
|
'race': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['races.Race']"}),
|
||||||
|
'racer': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['races.Racer']"}),
|
||||||
|
'update': ('django.db.models.fields.TextField', [], {})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
complete_apps = ['races']
|
|
@ -0,0 +1,48 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
from south.utils import datetime_utils as datetime
|
||||||
|
from south.db import db
|
||||||
|
from south.v2 import DataMigration
|
||||||
|
from django.db import models
|
||||||
|
|
||||||
|
class Migration(DataMigration):
|
||||||
|
|
||||||
|
def forwards(self, orm):
|
||||||
|
"Write your forwards methods here."
|
||||||
|
# Note: Don't use "from appname.models import ModelName".
|
||||||
|
# Use orm.ModelName to refer to models in this application,
|
||||||
|
# and orm['appname.ModelName'] for models in other applications.
|
||||||
|
for update in orm.RaceUpdate.objects.all():
|
||||||
|
update.race = update.racer.race
|
||||||
|
update.save()
|
||||||
|
|
||||||
|
def backwards(self, orm):
|
||||||
|
"Write your backwards methods here."
|
||||||
|
|
||||||
|
models = {
|
||||||
|
u'races.race': {
|
||||||
|
'Meta': {'object_name': 'Race'},
|
||||||
|
'description': ('django.db.models.fields.TextField', [], {}),
|
||||||
|
'key': ('django.db.models.fields.CharField', [], {'max_length': '16', 'primary_key': 'True'}),
|
||||||
|
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
|
||||||
|
},
|
||||||
|
u'races.racer': {
|
||||||
|
'Meta': {'unique_together': "(('nick', 'race'),)", 'object_name': 'Racer'},
|
||||||
|
'finished': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||||
|
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||||
|
'joined': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||||
|
'nick': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
|
||||||
|
'race': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['races.Race']"}),
|
||||||
|
'started': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
|
||||||
|
},
|
||||||
|
u'races.raceupdate': {
|
||||||
|
'Meta': {'object_name': 'RaceUpdate'},
|
||||||
|
'event_time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||||
|
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||||
|
'race': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['races.Race']"}),
|
||||||
|
'racer': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['races.Racer']"}),
|
||||||
|
'update': ('django.db.models.fields.TextField', [], {})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
complete_apps = ['races']
|
||||||
|
symmetrical = True
|
|
@ -40,6 +40,7 @@ class RaceUpdate(models.Model):
|
||||||
|
|
||||||
"""Periodic updates for a racer."""
|
"""Periodic updates for a racer."""
|
||||||
|
|
||||||
|
race = models.ForeignKey(Race)
|
||||||
racer = models.ForeignKey(Racer)
|
racer = models.ForeignKey(Racer)
|
||||||
update = models.TextField()
|
update = models.TextField()
|
||||||
event_time = models.DateTimeField(default=timezone.now)
|
event_time = models.DateTimeField(default=timezone.now)
|
||||||
|
@ -48,7 +49,7 @@ class RaceUpdate(models.Model):
|
||||||
"""Text representation of a race update."""
|
"""Text representation of a race update."""
|
||||||
|
|
||||||
local_time = timezone.localtime(self.event_time)
|
local_time = timezone.localtime(self.event_time)
|
||||||
return u"{0:s} in {1:s} @ {2:s}".format(self.racer.nick, self.racer.race.name,
|
return u"{0:s} in {1:s} @ {2:s}".format(self.racer.nick, self.race.name,
|
||||||
local_time.strftime('%Y-%m-%d %H:%M:%S %Z'))
|
local_time.strftime('%Y-%m-%d %H:%M:%S %Z'))
|
||||||
|
|
||||||
# vi:tabstop=4:expandtab:autoindent
|
# vi:tabstop=4:expandtab:autoindent
|
||||||
|
|
Loading…
Reference in New Issue