Modified timer model to include objective status.

This commit is contained in:
Adarnof
2015-11-29 04:30:15 +00:00
parent d14ec57575
commit 5bc0892dae
4 changed files with 25 additions and 25 deletions

View File

@@ -6,13 +6,13 @@ from django.core.validators import MaxValueValidator, MinValueValidator
class TimerForm(forms.Form):
structure_choices = [('POCO', 'POCO'), ('I-HUB', 'I-HUB'), ('POS[S]', 'POS[S]'),
('POS[M]', 'POS[M]'), ('POS[L]', 'POS[L]'), ('Station', 'Station'), ('Other', 'Other')]
fleet_type_choices = [('Armor', 'Armor'), ('Shield', 'Shield'), ('Other', 'Other')]
objective_choices = [('Friendly', 'Friendly'), ('Hostile', 'Hostile'), ('Neutral', 'Neutral')]
name = forms.CharField(max_length=254, required=True, label='Fleet Name')
details = forms.CharField(max_length=254, required=True, label='Details')
system = forms.CharField(max_length=254, required=True, label="System")
planet_moon = forms.CharField(max_length=254, label="Planet/Moon", required=False, initial="")
structure = forms.ChoiceField(choices=structure_choices, required=True, label="Structure Type")
fleet_type = forms.ChoiceField(choices=fleet_type_choices, required=True, label="Fleet Type")
objective = forms.ChoiceField(choices=objective_choices, required=True, label="Objective")
days_left = forms.IntegerField(required=True, label="Days Remaining", validators=[MinValueValidator(0)])
hours_left = forms.IntegerField(required=True, label="Hours Remaining", validators=[MinValueValidator(0), MaxValueValidator(23)])
minutes_left = forms.IntegerField(required=True, label="Minutes Remaining", validators=[MinValueValidator(0), MaxValueValidator(59)])

View File

@@ -8,11 +8,11 @@ from eveonline.models import EveCorporationInfo
class Timer(models.Model):
class Meta:
ordering = ['eve_time']
name = models.CharField(max_length=254, default="")
details = models.CharField(max_length=254, default="")
system = models.CharField(max_length=254, default="")
planet_moon = models.CharField(max_length=254, default="")
structure = models.CharField(max_length=254, default="")
fleet_type = models.CharField(max_length=254, default="")
objective = models.CharField(max_length=254, default="")
eve_time = models.DateTimeField()
important = models.BooleanField(default=False)
eve_character = models.ForeignKey(EveCharacter)

View File

@@ -54,11 +54,11 @@ def add_timer_view(request):
# handle valid form
timer = Timer()
timer.name = form.cleaned_data['name']
timer.details = form.cleaned_data['details']
timer.system = form.cleaned_data['system']
timer.planet_moon = form.cleaned_data['planet_moon']
timer.structure = form.cleaned_data['structure']
timer.fleet_type = form.cleaned_data['fleet_type']
timer.objective = form.cleaned_data['objective']
timer.eve_time = eve_time
timer.important = form.cleaned_data['important']
timer.eve_character = character