Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-13 10:36:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

formatting storm

Browse Source
This commit is contained in:
Joel Falknau
2024-09-13 23:10:37 +10:00
parent ec5cf08eef
commit a99315ea55
336 changed files with 1347 additions and 1370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
allianceauth/fleetactivitytracking/views.py
View File

@@ -2,24 +2,23 @@ import datetime
import logging
import os
from allianceauth.authentication.models import CharacterOwnership
from django.contrib import messages
from django.contrib.auth.decorators import login_required
from django.contrib.auth.decorators import permission_required
from django.contrib.auth.decorators import login_required, permission_required
from django.contrib.auth.models import User
from django.core.exceptions import ValidationError, ObjectDoesNotExist
from django.shortcuts import render, redirect, get_object_or_404, Http404
from django.core.exceptions import ObjectDoesNotExist, ValidationError
from django.shortcuts import get_object_or_404, redirect, render
from django.utils import timezone
from django.utils.translation import gettext_lazy as _
from esi.decorators import token_required
from allianceauth.eveonline.providers import provider
from .forms import FatlinkForm
from .models import Fatlink, Fat
from django.utils.crypto import get_random_string
from django.utils.translation import gettext_lazy as _
from allianceauth.eveonline.models import EveAllianceInfo
from allianceauth.eveonline.models import EveCharacter
from allianceauth.eveonline.models import EveCorporationInfo
from esi.decorators import token_required
from allianceauth.authentication.models import CharacterOwnership
from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo
from allianceauth.eveonline.providers import provider
from .forms import FatlinkForm
from .models import Fat, Fatlink
SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
"""
@@ -50,7 +49,7 @@ class CorpStat:
try:
return "%.2f" % (float(self.n_fats) / float(self.corp.member_count))
except ZeroDivisionError:
return "%.2f" % 0
return f"{0:.2f}"
class MemberStat:
@@ -72,7 +71,7 @@ class MemberStat:
try:
return "%.2f" % (float(self.n_fats) / float(self.n_chars))
except ZeroDivisionError:
return "%.2f" % 0
return f"{0:.2f}"
def first_day_of_next_month(year, month):
@@ -95,7 +94,7 @@ def fatlink_view(request):
# If the user has the right privileges the site will also show the latest fatlinks with the options to add VIPs and
# manually add players.
user = request.user
logger.debug("fatlink_view called by user %s" % request.user)
logger.debug(f"fatlink_view called by user {request.user}")
latest_fats = Fat.objects.select_related('character', 'fatlink').filter(user=user).order_by('-id')[:5]
if user.has_perm('auth.fleetactivitytracking'):
@@ -182,7 +181,7 @@ def fatlink_personal_statistics_view(request, year=datetime.date.today().year):
logger.debug("Personal statistics view for year %i called by %s" % (year, request.user))
user = request.user
logger.debug("fatlink_personal_statistics_view called by user %s" % request.user)
logger.debug(f"fatlink_personal_statistics_view called by user {request.user}")
personal_fats = Fat.objects.select_related('fatlink').filter(user=user).order_by('id')
@@ -227,7 +226,7 @@ def fatlink_monthly_personal_statistics_view(request, year, month, char_id=None)
personal_fats = Fat.objects.filter(user=user)\
.filter(fatlink__fatdatetime__gte=start_of_month).filter(fatlink__fatdatetime__lt=start_of_next_month)
ship_statistics = dict()
ship_statistics = {}
n_fats = 0
for fat in personal_fats:
ship_statistics[fat.shiptype] = ship_statistics.setdefault(fat.shiptype, 0) + 1
@@ -300,7 +299,7 @@ def click_fatlink_view(request, token, fat_hash=None):
except ValidationError as e:
err_messages = []
for errorname, message in e.message_dict.items():
for _errorname, message in e.message_dict.items():
err_messages.append(message[0])
messages.error(request, ' '.join(err_messages))
@@ -330,12 +329,12 @@ def click_fatlink_view(request, token, fat_hash=None):
@login_required
@permission_required('auth.fleetactivitytracking')
def create_fatlink_view(request):
logger.debug("create_fatlink_view called by user %s" % request.user)
logger.debug(f"create_fatlink_view called by user {request.user}")
if request.method == 'POST':
logger.debug("Post request to create_fatlink_view by user %s" % request.user)
logger.debug(f"Post request to create_fatlink_view by user {request.user}")
form = FatlinkForm(request.POST)
if 'submit_fat' in request.POST:
logger.debug("Submitting fleetactivitytracking by user %s" % request.user)
logger.debug(f"Submitting fleetactivitytracking by user {request.user}")
if form.is_valid():
fatlink = Fatlink()
fatlink.fleet = form.cleaned_data["fleet"]
@@ -349,7 +348,7 @@ def create_fatlink_view(request):
except ValidationError as e:
form = FatlinkForm()
messages = []
for errorname, message in e.message_dict.items():
for _errorname, message in e.message_dict.items():
messages.append(message[0].decode())
context = {'form': form, 'errormessages': messages}
return render(request, 'fleetactivitytracking/fatlinkcreate.html', context=context)
@@ -361,7 +360,7 @@ def create_fatlink_view(request):
else:
form = FatlinkForm()
logger.debug("Returning empty form to user %s" % request.user)
logger.debug(f"Returning empty form to user {request.user}")
context = {'form': form}
@@ -371,7 +370,7 @@ def create_fatlink_view(request):
@login_required
@permission_required('auth.fleetactivitytracking')
def modify_fatlink_view(request, fat_hash=None):
logger.debug("modify_fatlink_view called by user %s" % request.user)
logger.debug(f"modify_fatlink_view called by user {request.user}")
fatlink = get_object_or_404(Fatlink, hash=fat_hash)
if request.GET.get('removechar', None):
@@ -382,7 +381,7 @@ def modify_fatlink_view(request, fat_hash=None):
Fat.objects.filter(fatlink=fatlink).filter(character=character).delete()
if request.GET.get('deletefat', None):
logger.debug("Removing fleetactivitytracking %s" % fatlink)
logger.debug(f"Removing fleetactivitytracking {fatlink}")
fatlink.delete()
return redirect('fatlink:view')