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 #105 from Adarnof/timerboard

Browse Source 
Added ability to enter time remaining on RF timer
This commit is contained in:
Adarnof 2015-11-27 20:38:31 -05:00
commit 6aa1dc67b8
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
timerboard/form.py
View File

@ -1,4 +1,6 @@
from django import forms from django import forms
from django.core.validators import MaxValueValidator, MinValueValidator
class TimerForm(forms.Form): class TimerForm(forms.Form):
@ -11,5 +13,7 @@ class TimerForm(forms.Form):
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") fleet_type = forms.ChoiceField(choices=fleet_type_choices, required=True, label="Fleet Type")
eve_time = forms.DateTimeField(required=True, label="Eve Time") 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)])
important = forms.BooleanField(label="Important", required=False) important = forms.BooleanField(label="Important", required=False)

7
timerboard/views.py
View File

@ -46,6 +46,11 @@ def add_timer_view(request):
character = EveManager.get_character_by_id(auth_info.main_char_id) character = EveManager.get_character_by_id(auth_info.main_char_id)
corporation = EveManager.get_corporation_info_by_id(character.corporation_id) corporation = EveManager.get_corporation_info_by_id(character.corporation_id)
# calculate future time
future_time = datetime.timedelta(days=form.cleaned_data['days_left'], hours=form.cleaned_data['hours_left'], minutes=form.cleaned_data['minutes_left'])
current_time = datetime.datetime.utcnow()
eve_time = current_time + future_time
# handle valid form # handle valid form
timer = Timer() timer = Timer()
timer.name = form.cleaned_data['name'] timer.name = form.cleaned_data['name']
@ -53,7 +58,7 @@ def add_timer_view(request):
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.fleet_type = form.cleaned_data['fleet_type']
timer.eve_time = form.cleaned_data['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
timer.eve_corp = corporation timer.eve_corp = corporation