Basic styling, lots of feature work

This commit is contained in:
2013-05-12 17:12:48 +01:00
parent 33cf34ba92
commit a644b280eb
24 changed files with 10681 additions and 24 deletions

View File

@@ -12,11 +12,11 @@ class Timer(models.Model):
(STATE_EXPIRED, 'Expired'),
)
TYPE_SHEILD_REENFORCEMENT = 1
TYPE_SHIELD_REENFORCEMENT = 1
TYPE_ARMOR_REENFORCEMENT = 2
TYPE_CHOICES = (
(TYPE_SHEILD_REENFORCEMENT, 'Sheild Reenforcement'),
(TYPE_SHIELD_REENFORCEMENT, 'Shield Reenforcement'),
(TYPE_ARMOR_REENFORCEMENT, 'Armor Reenforcement'),
)
@@ -30,6 +30,12 @@ class Timer(models.Model):
return self.STATE_EXPIRED
return self.STATE_ACTIVE
def get_state_display(self):
state = self.state
for v, disp in self.STATE_CHOICES:
if state == v:
return disp
class Meta:
app_label = 'timer'
ordering = ['-expiration']