mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2026-02-11 01:26:22 +01:00
Update timerboard views
Adds basic unit tests Changed to class based views
This commit is contained in:
Basraah
@@ -2,13 +2,14 @@ import datetime
|
||||
import logging
|
||||
|
||||
from django.contrib import messages
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.contrib.auth.decorators import permission_required
|
||||
from django.shortcuts import get_object_or_404
|
||||
from django.shortcuts import render, redirect
|
||||
from django.views import View
|
||||
from django.urls import reverse_lazy
|
||||
from django.views.generic import CreateView, UpdateView, DeleteView
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin
|
||||
from django.utils import timezone
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from allianceauth.eveonline.models import EveCorporationInfo
|
||||
|
||||
from .form import TimerForm
|
||||
from .models import Timer
|
||||
@@ -16,136 +17,72 @@ from .models import Timer
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@login_required
|
||||
@permission_required('auth.timer_view')
|
||||
def timer_view(request):
|
||||
logger.debug("timer_view called by user %s" % request.user)
|
||||
char = request.user.profile.main_character
|
||||
if char:
|
||||
corp = EveCorporationInfo.objects.get(corporation_id=char.corporation_id)
|
||||
else:
|
||||
corp = None
|
||||
if corp:
|
||||
corp_timers = Timer.objects.all().filter(corp_timer=True).filter(eve_corp=corp)
|
||||
else:
|
||||
corp_timers = []
|
||||
render_items = {'timers': Timer.objects.all().filter(corp_timer=False),
|
||||
'corp_timers': corp_timers,
|
||||
'future_timers': Timer.objects.all().filter(corp_timer=False).filter(
|
||||
eve_time__gte=datetime.datetime.now()),
|
||||
'past_timers': Timer.objects.all().filter(corp_timer=False).filter(
|
||||
eve_time__lt=datetime.datetime.now())}
|
||||
|
||||
return render(request, 'timerboard/management.html', context=render_items)
|
||||
class BaseTimerView(LoginRequiredMixin, PermissionRequiredMixin, View):
|
||||
pass
|
||||
|
||||
|
||||
@login_required
|
||||
@permission_required('auth.timer_management')
|
||||
def add_timer_view(request):
|
||||
logger.debug("add_timer_view called by user %s" % request.user)
|
||||
if request.method == 'POST':
|
||||
form = TimerForm(request.POST)
|
||||
logger.debug("Request type POST contains form valid: %s" % form.is_valid())
|
||||
if form.is_valid():
|
||||
# Get character
|
||||
character = request.user.profile.main_character
|
||||
corporation = EveCorporationInfo.get_corporation_info_by_id(character.corporation_id)
|
||||
logger.debug(
|
||||
"Determined timer add request on behalf of character %s corporation %s" % (character, corporation))
|
||||
# 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 = timezone.now()
|
||||
eve_time = current_time + future_time
|
||||
logger.debug(
|
||||
"Determined timer eve time is %s - current time %s, adding %s" % (eve_time, current_time, future_time))
|
||||
# handle valid form
|
||||
timer = Timer()
|
||||
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.objective = form.cleaned_data['objective']
|
||||
timer.eve_time = eve_time
|
||||
timer.important = form.cleaned_data['important']
|
||||
timer.corp_timer = form.cleaned_data['corp_timer']
|
||||
timer.eve_character = character
|
||||
timer.eve_corp = corporation
|
||||
timer.user = request.user
|
||||
timer.save()
|
||||
logger.info("Created new timer in %s at %s by user %s" % (timer.system, timer.eve_time, request.user))
|
||||
messages.success(request, _('Added new timer in %(system)s at %(time)s.') % {"system": timer.system, "time": timer.eve_time})
|
||||
return redirect("timerboard:view")
|
||||
else:
|
||||
logger.debug("Returning new TimerForm")
|
||||
form = TimerForm()
|
||||
class TimerView(BaseTimerView):
|
||||
template_name = 'timerboard/view.html'
|
||||
permission_required = 'auth.timer_view'
|
||||
|
||||
render_items = {'form': form}
|
||||
def get(self, request):
|
||||
logger.debug("timer_view called by user {}".format(request.user))
|
||||
char = request.user.profile.main_character
|
||||
if char:
|
||||
corp = char.corporation
|
||||
else:
|
||||
corp = None
|
||||
|
||||
return render(request, 'timerboard/add.html', context=render_items)
|
||||
|
||||
|
||||
@login_required
|
||||
@permission_required('auth.timer_management')
|
||||
def remove_timer(request, timer_id):
|
||||
logger.debug("remove_timer called by user %s for timer id %s" % (request.user, timer_id))
|
||||
timer = get_object_or_404(Timer, id=timer_id)
|
||||
timer.delete()
|
||||
logger.debug("Deleting timer id %s by user %s" % (timer_id, request.user))
|
||||
messages.success(request, _('Deleted timer in %(system)s at %(time)s.') % {'system': timer.system,
|
||||
'time': timer.eve_time})
|
||||
return redirect("timerboard:view")
|
||||
|
||||
|
||||
@login_required
|
||||
@permission_required('auth.timer_management')
|
||||
def edit_timer(request, timer_id):
|
||||
logger.debug("edit_timer called by user %s for timer id %s" % (request.user, timer_id))
|
||||
timer = get_object_or_404(Timer, id=timer_id)
|
||||
if request.method == 'POST':
|
||||
form = TimerForm(request.POST)
|
||||
logger.debug("Received POST request containing updated timer form, is valid: %s" % form.is_valid())
|
||||
if form.is_valid():
|
||||
character = request.user.profile.main_character
|
||||
corporation = EveCorporationInfo.get_corporation_info_by_id(character.corporation_id)
|
||||
logger.debug(
|
||||
"Determined timer edit request on behalf of character %s corporation %s" % (character, corporation))
|
||||
# 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
|
||||
logger.debug(
|
||||
"Determined timer eve time is %s - current time %s, adding %s" % (eve_time, current_time, future_time))
|
||||
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.objective = form.cleaned_data['objective']
|
||||
timer.eve_time = eve_time
|
||||
timer.important = form.cleaned_data['important']
|
||||
timer.corp_timer = form.cleaned_data['corp_timer']
|
||||
timer.eve_character = character
|
||||
timer.eve_corp = corporation
|
||||
logger.info("User %s updating timer id %s " % (request.user, timer_id))
|
||||
messages.success(request, _('Saved changes to the timer.'))
|
||||
timer.save()
|
||||
return redirect("timerboard:view")
|
||||
else:
|
||||
current_time = timezone.now()
|
||||
td = timer.eve_time - current_time
|
||||
tddays, tdhours, tdminutes = td.days, td.seconds // 3600, td.seconds // 60 % 60
|
||||
data = {
|
||||
'details': timer.details,
|
||||
'system': timer.system,
|
||||
'planet_moon': timer.planet_moon,
|
||||
'structure': timer.structure,
|
||||
'objective': timer.objective,
|
||||
'important': timer.important,
|
||||
'corp_timer': timer.corp_timer,
|
||||
'days_left': tddays,
|
||||
'hours_left': tdhours,
|
||||
'minutes_left': tdminutes,
|
||||
render_items = {
|
||||
'timers': Timer.objects.filter(corp_timer=False),
|
||||
'corp_timers': Timer.objects.filter(corp_timer=True, eve_corp=corp),
|
||||
'future_timers': Timer.objects.filter(corp_timer=False, eve_time__gte=timezone.now()),
|
||||
'past_timers': Timer.objects.filter(corp_timer=False, eve_time__lt=timezone.now()),
|
||||
}
|
||||
form = TimerForm(initial=data)
|
||||
return render(request, 'timerboard/update.html', context={'form': form})
|
||||
|
||||
return render(request, self.template_name, context=render_items)
|
||||
|
||||
|
||||
class TimerManagementView(BaseTimerView):
|
||||
permission_required = 'auth.timer_management'
|
||||
index_redirect = 'timerboard:view'
|
||||
success_url = reverse_lazy(index_redirect)
|
||||
model = Timer
|
||||
form_class = TimerForm
|
||||
|
||||
def get_timer(self, timer_id):
|
||||
return get_object_or_404(self.model, id=timer_id)
|
||||
|
||||
|
||||
class AddUpdateMixin:
|
||||
def get_form_kwargs(self):
|
||||
"""
|
||||
Inject the request user into the kwargs passed to the form
|
||||
"""
|
||||
kwargs = super(AddUpdateMixin, self).get_form_kwargs()
|
||||
kwargs.update({'user': self.request.user})
|
||||
return kwargs
|
||||
|
||||
|
||||
class AddTimerView(TimerManagementView, AddUpdateMixin, CreateView):
|
||||
template_name_suffix = '_create_form'
|
||||
|
||||
def form_valid(self, form):
|
||||
result = super(AddTimerView, self).form_valid(form)
|
||||
timer = self.object
|
||||
logger.info("Created new timer in {} at {} by user {}".format(timer.system, timer.eve_time, self.request.user))
|
||||
messages.success(self.request, _('Added new timer in %(system)s at %(time)s.') % {"system": timer.system,
|
||||
"time": timer.eve_time})
|
||||
return result
|
||||
|
||||
|
||||
class EditTimerView(TimerManagementView, AddUpdateMixin, UpdateView):
|
||||
template_name_suffix = '_update_form'
|
||||
|
||||
def form_valid(self, form):
|
||||
messages.success(self.request, _('Saved changes to the timer.'))
|
||||
return super(EditTimerView, self).form_valid(form)
|
||||
|
||||
|
||||
class RemoveTimerView(TimerManagementView, DeleteView):
|
||||
pass
|
||||
|
||||
Reference in New Issue
Block a user