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

Cleanup FAT edit page tables with pagination.

Browse Source 
Cleanup FAT statistics generation with smarter query.
This commit is contained in:
Adarnof 2016-12-13 17:31:36 -05:00
parent 6fd3c32ba0
commit 6ba084c710
2 changed files with 81 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
View File

@ -2,13 +2,13 @@
{% load bootstrap %} {% load bootstrap %}
{% load staticfiles %} {% load staticfiles %}
{% load i18n %} {% load i18n %}
{% load bootstrap_pagination %}
{% block title %}Alliance Auth{% endblock %} {% block title %}Alliance Auth{% endblock %}
{% block page_title %}{% trans "Fatlink view" %}{% endblock page_title %} {% block page_title %}{% trans "Fatlink view" %}{% endblock page_title %}
{% block content %} {% block content %}
<div class="col-lg-12"> <div class="col-lg-12">
<h1 class="page-header text-center">{% blocktrans %}Edit fatlink "{{ fatlink.name }}"{% endblocktrans %} <h1 class="page-header text-center">{% blocktrans %}Edit fatlink "{{ fatlink }}"{% endblocktrans %}
<div class="text-right"> <div class="text-right">
<form> <form>
<button type="submit" onclick="return confirm('Are you sure?')" class="btn btn-danger" name="deletefat" value="True"> <button type="submit" onclick="return confirm('Are you sure?')" class="btn btn-danger" name="deletefat" value="True">
@ -17,8 +17,13 @@
</form> </form>
</div> </div>
</h1> </h1>
<h4><b>{% trans "Registered characters" %}</b></h4> <div class="panel panel-default">
<table class="table table-responsive table-bordered"> <div class="panel-heading">{% trans "Registered characters" %}</div>
<div class="panel-body">
<div class="text-center">
{% bootstrap_paginate registered_fats range=10 %}
</div>
<table class="table table-responsive table-hover">
<tr> <tr>
<th class="text-center">{% trans "User" %}</th> <th class="text-center">{% trans "User" %}</th>
<th class="text-center">{% trans "Character" %}</th> <th class="text-center">{% trans "Character" %}</th>
@ -40,14 +45,17 @@
<td class="text-center">{{ fat.fatlink.fatdatetime }}</td> <td class="text-center">{{ fat.fatlink.fatdatetime }}</td>
<td class="text-center"> <td class="text-center">
<form> <form>
<button type="submit" class="btn btn-warning" name="removechar" value="{{ fat.character.character_id }}"><span <button type="submit" class="btn btn-warning" name="removechar" value="{{ fat.character.character_id }}">
class="glyphicon glyphicon-remove"></span></button> <span class="glyphicon glyphicon-remove"></span>
</button>
</form> </form>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
</div> </div>
</div>
</div>
<script src="/static/js/dateformat.js"></script> <script src="/static/js/dateformat.js"></script>

68
fleetactivitytracking/views.py
View File

@ -7,6 +7,7 @@ from django.contrib.auth.decorators import permission_required
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.utils import timezone from django.utils import timezone
from django.contrib import messages from django.contrib import messages
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
from eveonline.models import EveCharacter from eveonline.models import EveCharacter
from eveonline.models import EveCorporationInfo from eveonline.models import EveCorporationInfo
from eveonline.managers import EveManager from eveonline.managers import EveManager
@ -17,8 +18,6 @@ from esi.decorators import token_required
from slugify import slugify from slugify import slugify
from collections import OrderedDict
import string import string
import random import random
import datetime import datetime
@ -27,15 +26,27 @@ import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
FATS_PER_PAGE = int(getattr(settings, 'FATS_PER_PAGE', 20))
def get_page(model_list, page_num):
p = Paginator(model_list, FATS_PER_PAGE)
try:
fats = p.page(page_num)
except PageNotAnInteger:
fatss = p.page(1)
except EmptyPage:
fatss = p.page(p.num_pages)
return fats
class CorpStat(object): class CorpStat(object):
def __init__(self, corp_id, corp=None, blue=False): def __init__(self, corp_id, start_of_month, start_of_next_month, corp=None):
if corp: if corp:
self.corp = corp self.corp = corp
else: else:
self.corp = EveCorporationInfo.objects.get(corporation_id=corp_id) self.corp = EveCorporationInfo.objects.get(corporation_id=corp_id)
self.n_fats = 0 self.n_fats = Fat.objects.filter(character__corporation_id=self.corp.corporation_id).filter(fatlink__fatdatetime__gte=start_of_month).filter(fatlink__fatdatetime__lte=start_of_next_month).count()
self.blue = blue self.blue = self.corp.is_blue
def avg_fat(self): def avg_fat(self):
return "%.2f" % (float(self.n_fats) / float(self.corp.member_count)) return "%.2f" % (float(self.n_fats) / float(self.corp.member_count))
@ -83,34 +94,35 @@ def fatlink_statistics_view(request, year=datetime.date.today().year, month=date
start_of_next_month = first_day_of_next_month(year, month) start_of_next_month = first_day_of_next_month(year, month)
start_of_previous_month = first_day_of_previous_month(year, month) start_of_previous_month = first_day_of_previous_month(year, month)
fatStats = OrderedDict() fat_stats = {}
# get FAT stats for member corps
if settings.IS_CORP: if settings.IS_CORP:
fatStats[settings.CORP_NAME] = CorpStat(settings.CORP_ID) fat_stats[settings.CORP_ID] = CorpStat(settings.CORP_ID, start_of_month, start_of_next_month)
else: else:
alliance_corps = EveCorporationInfo.objects.filter(alliance__alliance_id=settings.ALLIANCE_ID) alliance_corps = EveCorporationInfo.objects.filter(alliance__alliance_id=settings.ALLIANCE_ID)
for corp in alliance_corps: for corp in alliance_corps:
fatStats[corp.corporation_name] = CorpStat(corp.corporation_id, corp=corp) fat_stats[corp.corporation_id] = CorpStat(corp.corporation_id, start_of_month, start_of_next_month)
fatlinks_in_span = Fatlink.objects.filter(fatdatetime__gte=start_of_month).filter( # get FAT stats for corps not in alliance
fatdatetime__lt=start_of_next_month) fats_in_span = Fat.objects.filter(fatlink__fatdatetime__gte=start_of_month).filter(
fatlink__fatdatetime__lt=start_of_next_month).exclude(character__corporation_id__in=fat_stats)
for fatlink in fatlinks_in_span: for fat in fats_in_span:
fats_in_fatlink = Fat.objects.filter(fatlink=fatlink) if not fat.character.corporation_id in fat_stats:
for fat in fats_in_fatlink: fat_stats[fat.character.corporation_id] = CorpStat(fat.character.corporation_id, start_of_month, start_of_next_month)
fatStats.setdefault(fat.character.corporation_name,
CorpStat(fat.character.corporation_id, blue=True)
).n_fats += 1
fatStatsList = [fatStat for corp_name, fatStat in fatStats.items()] # collect and sort stats
fatStatsList.sort(key=lambda stat: stat.corp.corporation_name) stat_list = [fat_stats[x] for x in fat_stats]
fatStatsList.sort(key=lambda stat: (stat.n_fats, stat.n_fats / stat.corp.member_count), reverse=True) stat_list.sort(key=lambda stat: stat.corp.corporation_name)
stat_list.sort(key=lambda stat: (stat.n_fats, stat.n_fats / stat.corp.member_count), reverse=True)
if datetime.datetime.now() > start_of_next_month: if datetime.datetime.now() > start_of_next_month:
context = {'fatStats': fatStatsList, 'month': start_of_month.strftime("%B"), 'year': year, context = {'fatStats': stat_list, 'month': start_of_month.strftime("%B"), 'year': year,
'previous_month': start_of_previous_month, 'next_month': start_of_next_month} 'previous_month': start_of_previous_month, 'next_month': start_of_next_month}
else: else:
context = {'fatStats': fatStatsList, 'month': start_of_month.strftime("%B"), 'year': year, context = {'fatStats': stat_list, 'month': start_of_month.strftime("%B"), 'year': year,
'previous_month': start_of_previous_month} 'previous_month': start_of_previous_month}
return render(request, 'fleetactivitytracking/fatlinkstatisticsview.html', context=context) return render(request, 'fleetactivitytracking/fatlinkstatisticsview.html', context=context)
@ -276,24 +288,26 @@ def create_fatlink_view(request):
def modify_fatlink_view(request, hash=""): def modify_fatlink_view(request, hash=""):
logger.debug("modify_fatlink_view called by user %s" % request.user) logger.debug("modify_fatlink_view called by user %s" % request.user)
if not hash: if not hash:
return redirect('/fat/') return redirect('auth_fatlink_view')
fatlink = Fatlink.objects.filter(hash=hash)[0] fatlink = Fatlink.objects.filter(hash=hash)[0]
if request.GET.get('removechar'): if request.GET.get('removechar', None):
character_id = request.GET.get('removechar') character_id = request.GET.get('removechar')
character = EveCharacter.objects.get(character_id=character_id) character = EveCharacter.objects.get(character_id=character_id)
logger.debug("Removing character %s from fleetactivitytracking %s" % (character.character_name, fatlink.name)) logger.debug("Removing character %s from fleetactivitytracking %s" % (character.character_name, fatlink.name))
Fat.objects.filter(fatlink=fatlink).filter(character=character).delete() Fat.objects.filter(fatlink=fatlink).filter(character=character).delete()
if request.GET.get('deletefat'): if request.GET.get('deletefat', None):
logger.debug("Removing fleetactivitytracking %s" % fatlink.name) logger.debug("Removing fleetactivitytracking %s" % fatlink.name)
fatlink.delete() fatlink.delete()
return redirect('/fat/') return redirect('auth_fatlink_view')
registered_fats = Fat.objects.filter(fatlink=fatlink).order_by('character') registered_fats = Fat.objects.filter(fatlink=fatlink).order_by('character__character_name')
context = {'fatlink': fatlink, 'registered_fats': registered_fats} fat_page = get_page(registered_fats, request.GET.get('page', 1))
context = {'fatlink': fatlink, 'registered_fats': fat_page}
return render(request, 'fleetactivitytracking/fatlinkmodify.html', context=context) return render(request, 'fleetactivitytracking/fatlinkmodify.html', context=context)