Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-12 22:10:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #109 from Adarnof/timerboard

Browse Source 
Modified timer model to include objective status
This commit is contained in:
Adarnof 2015-11-29 16:31:33 -05:00
commit 8cfcd8b618
4 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
stock/templates/registered/timermanagement.html
View File

@ -25,8 +25,8 @@
<h4><b>Next Timer</b></h4> <h4><b>Next Timer</b></h4>
<table class="table table-responsive table-bordered"> <table class="table table-responsive table-bordered">
<tr> <tr>
<th style="width:150px" class="text-center">Fleet Name</th> <th style="width:150px" class="text-center">Details</th>
<th class="text-center">Fleet Type</th> <th class="text-center">Objective</th>
<th class="text-center">System</th> <th class="text-center">System</th>
<th class="text-center">Structure</th> <th class="text-center">Structure</th>
<th class="text-center">Eve Time</th> <th class="text-center">Eve Time</th>
@ -42,21 +42,21 @@
{% else %} {% else %}
<tr class="info"> <tr class="info">
{% endifequal %} {% endifequal %}
<td style="width:150px" class="text-center">{{ closest_timer.name }}</td> <td style="width:150px" class="text-center">{{ closest_timer.details }}</td>
<td class="text-center"> <td class="text-center">
{% ifequal closest_timer.fleet_type "Armor" %} {% ifequal closest_timer.objective "Hostile" %}
<div class="label label-danger"> <div class="label label-danger">
Armor Hostile
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal closest_timer.fleet_type "Shield" %} {% ifequal closest_timer.objective "Friendly" %}
<div class="label label-primary"> <div class="label label-primary">
Shield Friendly
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal closest_timer.fleet_type "Other" %} {% ifequal closest_timer.objective "Neutral" %}
<div class="label label-default"> <div class="label label-default">
Other Neutral
</div> </div>
{% endifequal %} {% endifequal %}
</td> </td>
@ -119,8 +119,8 @@
<h4><b>Future Timers</b></h4> <h4><b>Future Timers</b></h4>
<table class="table table-bordered"> <table class="table table-bordered">
<tr> <tr>
<th style="width:150px" class="text-center">Fleet Name</th> <th style="width:150px" class="text-center">Details</th>
<th class="text-center">Fleet Type</th> <th class="text-center">Objective</th>
<th class="text-center">System</th> <th class="text-center">System</th>
<th class="text-center">Structure</th> <th class="text-center">Structure</th>
<th class="text-center">Eve Time</th> <th class="text-center">Eve Time</th>
@ -137,21 +137,21 @@
{% else %} {% else %}
<tr class="info"> <tr class="info">
{% endifequal %} {% endifequal %}
<td style="width:150px" class="text-center">{{ timer.name }}</td> <td style="width:150px" class="text-center">{{ timer.details }}</td>
<td class="text-center"> <td class="text-center">
{% ifequal timer.fleet_type "Armor" %} {% ifequal timer.objective "Hostile" %}
<div class="label label-danger"> <div class="label label-danger">
Armor Hostile
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.fleet_type "Shield" %} {% ifequal timer.objective "Friendly" %}
<div class="label label-primary"> <div class="label label-primary">
Shield Friendly
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.fleet_type "Other" %} {% ifequal timer.objective "Neutral" %}
<div class="label label-default"> <div class="label label-default">
Other Neutral
</div> </div>
{% endifequal %} {% endifequal %}
</td> </td>

6
timerboard/form.py
View File

@ -6,13 +6,13 @@ from django.core.validators import MaxValueValidator, MinValueValidator
class TimerForm(forms.Form): class TimerForm(forms.Form):
structure_choices = [('POCO', 'POCO'), ('I-HUB', 'I-HUB'), ('POS[S]', 'POS[S]'), structure_choices = [('POCO', 'POCO'), ('I-HUB', 'I-HUB'), ('POS[S]', 'POS[S]'),
('POS[M]', 'POS[M]'), ('POS[L]', 'POS[L]'), ('Station', 'Station'), ('Other', 'Other')] ('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") system = forms.CharField(max_length=254, required=True, label="System")
planet_moon = forms.CharField(max_length=254, label="Planet/Moon", required=False, initial="") planet_moon = forms.CharField(max_length=254, label="Planet/Moon", required=False, initial="")
structure = forms.ChoiceField(choices=structure_choices, required=True, label="Structure Type") 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)]) 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)]) 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)]) minutes_left = forms.IntegerField(required=True, label="Minutes Remaining", validators=[MinValueValidator(0), MaxValueValidator(59)])

4
timerboard/models.py
View File

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

4
timerboard/views.py
View File

@ -54,11 +54,11 @@ def add_timer_view(request):
# handle valid form # handle valid form
timer = Timer() timer = Timer()
timer.name = form.cleaned_data['name'] timer.details = form.cleaned_data['details']
timer.system = form.cleaned_data['system'] timer.system = form.cleaned_data['system']
timer.planet_moon = form.cleaned_data['planet_moon'] timer.planet_moon = form.cleaned_data['planet_moon']
timer.structure = form.cleaned_data['structure'] 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.eve_time = eve_time
timer.important = form.cleaned_data['important'] timer.important = form.cleaned_data['important']
timer.eve_character = character timer.eve_character = character