Add Flex Structures to timerboard

New FLEX structures as per https://support.eveonline.com/hc/en-us/articles/213021829-Upwell-Structures

Cleaned up layout slightly and removed Stations as there are no longer any conquerable stations left
This commit is contained in:
soratidus999 2018-12-01 17:26:51 +10:00
parent 00fe2a527e
commit d049ec2832
2 changed files with 122 additions and 100 deletions

View File

@ -34,6 +34,7 @@ class TimerForm(forms.ModelForm):
structure_choices = [('POCO', 'POCO'), structure_choices = [('POCO', 'POCO'),
('I-HUB', 'I-HUB'), ('I-HUB', 'I-HUB'),
('TCU', 'TCU'),
('POS[S]', 'POS[S]'), ('POS[S]', 'POS[S]'),
('POS[M]', 'POS[M]'), ('POS[M]', 'POS[M]'),
('POS[L]', 'POS[L]'), ('POS[L]', 'POS[L]'),
@ -45,8 +46,9 @@ class TimerForm(forms.ModelForm):
('Engineering Complex[XL]', 'Engineering Complex[XL]'), ('Engineering Complex[XL]', 'Engineering Complex[XL]'),
('Refinery[M]', 'Refinery[M]'), ('Refinery[M]', 'Refinery[M]'),
('Refinery[L]', 'Refinery[L]'), ('Refinery[L]', 'Refinery[L]'),
('Station', 'Station'), ('Cyno Beacon','Cyno Beacon'),
('TCU', 'TCU'), ('Cyno Jammer','Cyno Jammer'),
('Jump Gate','Jump Gate'),
('Moon Mining Cycle', 'Moon Mining Cycle'), ('Moon Mining Cycle', 'Moon Mining Cycle'),
(_('Other'), _('Other'))] (_('Other'), _('Other'))]
objective_choices = [('Friendly', _('Friendly')), objective_choices = [('Friendly', _('Friendly')),

View File

@ -64,14 +64,19 @@
href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }} </a> href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }} </a>
</td> </td>
<td class="text-center"> <td class="text-center">
{% ifequal timer.structure "POCO" %}
<div class="label label-info">
POCO
</div>
{% endifequal %}
{% ifequal timer.structure "I-HUB" %} {% ifequal timer.structure "I-HUB" %}
<div class="label label-warning"> <div class="label label-warning">
I-HUB I-HUB
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "POCO" %} {% ifequal timer.structure "TCU" %}
<div class="label label-success"> <div class="label label-danger">
POCO TCU
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "POS[S]" %} {% ifequal timer.structure "POS[S]" %}
@ -119,16 +124,6 @@
Engineering Complex [XL] Engineering Complex [XL]
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "Station" %}
<div class="label label-danger">
Station
</div>
{% endifequal %}
{% ifequal timer.structure "TCU" %}
<div class="label label-danger">
TCU
</div>
{% endifequal %}
{% ifequal timer.structure "Refinery[M]" %} {% ifequal timer.structure "Refinery[M]" %}
<div class="label label-warning"> <div class="label label-warning">
Refinery [M] Refinery [M]
@ -139,6 +134,21 @@
Refinery [L] Refinery [L]
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "Cyno Beacon" %}
<div class="label label-warning">
Cyno Beacon
</div>
{% endifequal %}
{% ifequal timer.structure "Cyno Jammer" %}
<div class="label label-warning">
Cyno Jammer
</div>
{% endifequal %}
{% ifequal timer.structure "Jump Gate" %}
<div class="label label-warning">
Jump Gate
</div>
{% endifequal %}
{% ifequal timer.structure "Moon Mining Cycle" %} {% ifequal timer.structure "Moon Mining Cycle" %}
<div class="label label-success"> <div class="label label-success">
Moon Mining Cycle Moon Mining Cycle
@ -213,91 +223,101 @@
<a href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }}</a> <a href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }}</a>
</td> </td>
<td class="text-center"> <td class="text-center">
{% ifequal timer.structure "I-HUB" %} {% ifequal timer.structure "POCO" %}
<div class="label label-warning"> <div class="label label-info">
I-HUB POCO
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "POCO" %} {% ifequal timer.structure "I-HUB" %}
<div class="label label-success"> <div class="label label-warning">
POCO I-HUB
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "POS[S]" %} {% ifequal timer.structure "TCU" %}
<div class="label label-info"> <div class="label label-danger">
POS [S] TCU
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "POS[M]" %} {% ifequal timer.structure "POS[S]" %}
<div class="label label-info"> <div class="label label-info">
POS [M] POS [S]
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "POS[L]" %} {% ifequal timer.structure "POS[M]" %}
<div class="label label-info"> <div class="label label-info">
POS [L] POS [M]
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "Citadel[M]" %} {% ifequal timer.structure "POS[L]" %}
<div class="label label-danger"> <div class="label label-info">
Citadel [M] POS [L]
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "Citadel[L]" %} {% ifequal timer.structure "Citadel[M]" %}
<div class="label label-danger"> <div class="label label-danger">
Citadel [L] Citadel [M]
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "Citadel[XL]" %} {% ifequal timer.structure "Citadel[L]" %}
<div class="label label-danger"> <div class="label label-danger">
Citadel [XL] Citadel [L]
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "Engineering Complex[M]" %} {% ifequal timer.structure "Citadel[XL]" %}
<div class="label label-warning"> <div class="label label-danger">
Engineering Complex [M] Citadel [XL]
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "Engineering Complex[L]" %} {% ifequal timer.structure "Engineering Complex[M]" %}
<div class="label label-warning"> <div class="label label-warning">
Engineering Complex [L] Engineering Complex [M]
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "Engineering Complex[XL]" %} {% ifequal timer.structure "Engineering Complex[L]" %}
<div class="label label-warning"> <div class="label label-warning">
Engineering Complex [XL] Engineering Complex [L]
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "Station" %} {% ifequal timer.structure "Engineering Complex[XL]" %}
<div class="label label-danger"> <div class="label label-warning">
Station Engineering Complex [XL]
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "TCU" %} {% ifequal timer.structure "Refinery[M]" %}
<div class="label label-danger"> <div class="label label-warning">
TCU Refinery [M]
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "Refinery[M]" %} {% ifequal timer.structure "Refinery[L]" %}
<div class="label label-warning"> <div class="label label-warning">
Refinery [M] Refinery [L]
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "Refinery[L]" %} {% ifequal timer.structure "Cyno Beacon" %}
<div class="label label-warning"> <div class="label label-warning">
Refinery [L] Cyno Beacon
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "Moon Mining Cycle" %} {% ifequal timer.structure "Cyno Jammer" %}
<div class="label label-success"> <div class="label label-warning">
Moon Mining Cycle Cyno Jammer
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "Other" %} {% ifequal timer.structure "Jump Gate" %}
<div class="label label-default"> <div class="label label-warning">
Other Jump Gate
</div> </div>
{% endifequal %} {% endifequal %}
{% ifequal timer.structure "Moon Mining Cycle" %}
<div class="label label-success">
Moon Mining Cycle
</div>
{% endifequal %}
{% ifequal timer.structure "Other" %}
<div class="label label-default">
Other
</div>
{% endifequal %}
</td> </td>
<td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td> <td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
<td class="text-center" nowrap> <td class="text-center" nowrap>