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

Adding "Paplink" feature (#401)

Browse Source 
* Initial testing of paplink functionality. More fancy interfaces coming.

* Removed a invalid view reference.

* Added a link on the front page.

* Fixed some bad references and incorrect in game browser header usages.

* Started work on statistics-pages.

* Added an initial modify-paplink page where the pap itself can be deleted and characters removed.

* Added a very simple statistics page. Also some name change for ~reasons~.

* Small but crucial fix of syntax.

* Added personal statistics page.

* Corputils page now include fatlinkstats.

* Added link to the personal statistics page. Moved other buttons for clarity.

* Removed some unused code and imports

* Added more statistics, and all corps in alliance are now visible even if no paps are registered.

* Now requesting trust for the right domain. And some redundant imports and commented lines are removed.
This commit is contained in:
Joakim Strandberg
2016-04-30 01:00:45 +02:00
committed by Mr McClain
parent 1abeba5658
commit b190b8e191
19 changed files with 874 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
corputils/views.py
View File

@@ -2,7 +2,6 @@ from django.conf import settings
from django.shortcuts import render_to_response
from django.template import RequestContext
from django.contrib.auth.decorators import login_required
from django.contrib.auth.decorators import permission_required
from django.shortcuts import HttpResponseRedirect
from collections import namedtuple
@@ -14,17 +13,45 @@ from eveonline.models import EveCorporationInfo
from eveonline.models import EveAllianceInfo
from eveonline.models import EveCharacter
from eveonline.models import EveApiKeyPair
from authentication.models import AuthServicesInfo
from fleetactivitytracking.models import Fat
from util import check_if_user_has_permission
from forms import CorputilsSearchForm
from evelink.api import APIError
import logging
import datetime
logger = logging.getLogger(__name__)
class Player(object):
def __init__(self, main, user, maincorp, maincorpid, altlist, apilist, n_fats):
self.main = main
self.user = user
self.maincorp = maincorp
self.maincorpid = maincorpid
self.altlist = altlist
self.apilist = apilist
self.n_fats = n_fats
def first_day_of_next_month(year, month):
if month == 12:
return datetime.datetime(year+1,1,1)
else:
return datetime.datetime(year, month+1, 1)
def first_day_of_previous_month(year, month):
if month == 1:
return datetime.datetime(year-1,12,1)
else:
return datetime.datetime(year, month-1, 1)
@login_required
def corp_member_view(request, corpid = None):
def corp_member_view(request, corpid = None, year=datetime.date.today().year, month=datetime.date.today().month):
year = int(year)
month = int(month)
start_of_month = datetime.datetime(year, month, 1)
start_of_next_month = first_day_of_next_month(year, month)
start_of_previous_month = first_day_of_previous_month(year, month)
logger.debug("corp_member_view called by user %s" % request.user)
try:
@@ -58,7 +85,6 @@ def corp_member_view(request, corpid = None):
corpid = membercorplist[0][0]
corp = EveCorporationInfo.objects.get(corporation_id=corpid)
Player = namedtuple("Player", ["main", "maincorp", "maincorpid", "altlist", "apilist"])
if check_if_user_has_permission(request.user, 'alliance_apis') or (check_if_user_has_permission(request.user, 'corp_apis') and (user_corp_id == corpid)):
logger.debug("Retreiving and sending API-information")
@@ -96,10 +122,12 @@ def corp_member_view(request, corpid = None):
api_pair = None
num_registered_characters = num_registered_characters + 1
characters_with_api.setdefault(mainname, Player(main=mainchar,
user=char_owner,
maincorp=maincorp,
maincorpid=maincorpid,
altlist=[],
apilist=[])
apilist=[],
n_fats=0)
).altlist.append(char)
if api_pair:
characters_with_api[mainname].apilist.append(api_pair)
@@ -127,16 +155,26 @@ def corp_member_view(request, corpid = None):
api_pair = None
num_registered_characters = num_registered_characters + 1
characters_with_api.setdefault(mainname, Player(main=mainchar,
user=char_owner,
maincorp=maincorp,
maincorpid=maincorpid,
altlist=[],
apilist=[])
apilist=[],
n_fats=0)
).altlist.append(char)
if api_pair:
characters_with_api[mainname].apilist.append(api_pair)
n_unacounted = corp.member_count - (num_registered_characters + len(characters_without_api))
for mainname, player in characters_with_api.items():
fats_this_month = Fat.objects.filter(user=player.user).filter(fatlink__fatdatetime__gte = start_of_month).filter(fatlink__fatdatetime__lt = start_of_next_month)
characters_with_api[mainname].n_fats = len(fats_this_month)
if start_of_next_month > datetime.datetime.now():
start_of_next_month = None
if not settings.IS_CORP:
context = {"membercorplist": membercorplist,
"corp": corp,
@@ -154,6 +192,10 @@ def corp_member_view(request, corpid = None):
"characters_without_api": sorted(characters_without_api.items()),
"search_form": CorputilsSearchForm()}
context["next_month"] = start_of_next_month
context["previous_month"] = start_of_previous_month
context["this_month"] = start_of_month
return render_to_response('registered/corputils.html',context, context_instance=RequestContext(request) )
return HttpResponseRedirect("/dashboard/")