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

Merge pull request #1 from R4stl1n/master

Browse Source 
sync
This commit is contained in:
Mr McClain 2016-03-31 21:25:51 -05:00
commit 57e1282280
2 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
corputils/views.py
View File

@ -83,11 +83,14 @@ def corp_member_view(request, corpid = None):
mainname = mainchar.character_name mainname = mainchar.character_name
maincorp = mainchar.corporation_name maincorp = mainchar.corporation_name
maincorpid = mainchar.corporation_id maincorpid = mainchar.corporation_id
except (ValueError, EveCharacter.DoesNotExist): api_pair = EveApiKeyPair.objects.get(api_id=char.api_id)
except (ValueError, EveCharacter.DoesNotExist, EveApiKeyPair.DoesNotExist):
logger.info("No main character seem to be set for character %s" % char.character_name)
mainname = "User: " + char_owner.username mainname = "User: " + char_owner.username
mainchar = char mainchar = char
maincorp = "Not set." maincorp = "Not set."
maincorpid = None maincorpid = None
api_pair = None
num_registered_characters = num_registered_characters + 1 num_registered_characters = num_registered_characters + 1
characters_with_api.setdefault(mainname, Player(main=mainchar, characters_with_api.setdefault(mainname, Player(main=mainchar,
maincorp=maincorp, maincorp=maincorp,
@ -95,21 +98,48 @@ def corp_member_view(request, corpid = None):
altlist=[], altlist=[],
apilist=[]) apilist=[])
).altlist.append(char) ).altlist.append(char)
if api_pair:
characters_with_api[mainname].apilist.append(EveApiKeyPair.objects.get(api_id=char.api_id)) characters_with_api[mainname].apilist.append(api_pair)
except(EveApiKeyPair.DoesNotExist):
logger.info("User %s EveApiKeyPair does not exist. is main char selected?" % char_owner)
pass
except (EveCharacter.DoesNotExist): except (EveCharacter.DoesNotExist):
characters_without_api.update({member_data["name"]: member_data["id"]}) characters_without_api.update({member_data["name"]: member_data["id"]})
for char in EveCharacter.objects.filter(corporation_id=corpid):
if not char.character_id in member_list:
logger.info("Character %s does not exist in EveWho dump." % char.character_name)
char_owner = char.user
try:
mainid = int(AuthServicesInfoManager.get_auth_service_info(user=char_owner).main_char_id)
mainchar = EveCharacter.objects.get(character_id=mainid)
mainname = mainchar.character_name
maincorp = mainchar.corporation_name
maincorpid = mainchar.corporation_id
api_pair = EveApiKeyPair.objects.get(api_id=char.api_id)
except (ValueError, EveCharacter.DoesNotExist, EveApiKeyPair.DoesNotExist):
logger.info("No main character seem to be set for character %s" % char.character_name)
mainname = "User: " + char_owner.username
mainchar = char
maincorp = "Not set."
maincorpid = None
api_pair = None
num_registered_characters = num_registered_characters + 1
characters_with_api.setdefault(mainname, Player(main=mainchar,
maincorp=maincorp,
maincorpid=maincorpid,
altlist=[],
apilist=[])
).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))
if not settings.IS_CORP: if not settings.IS_CORP:
context = {"membercorp_list": membercorp_list, context = {"membercorp_list": membercorp_list,
"corp": corp, "corp": corp,
"characters_with_api": sorted(characters_with_api.items()), "characters_with_api": sorted(characters_with_api.items()),
'n_registered': num_registered_characters, 'n_registered': num_registered_characters,
'n_unacounted': n_unacounted,
"characters_without_api": sorted(characters_without_api.items()), "characters_without_api": sorted(characters_without_api.items()),
"search_form": CorputilsSearchForm()} "search_form": CorputilsSearchForm()}
else: else:
@ -117,6 +147,7 @@ def corp_member_view(request, corpid = None):
context = {"corp": corp, context = {"corp": corp,
"characters_with_api": sorted(characters_with_api.items()), "characters_with_api": sorted(characters_with_api.items()),
'n_registered': num_registered_characters, 'n_registered': num_registered_characters,
'n_unacounted': n_unacounted,
"characters_without_api": sorted(characters_without_api.items()), "characters_without_api": sorted(characters_without_api.items()),
"search_form": CorputilsSearchForm()} "search_form": CorputilsSearchForm()}

9
stock/templates/registered/corputils.html
View File

@ -28,7 +28,7 @@
<p>Player count: {{characters_with_api|length}}</p> <p>Player count: {{characters_with_api|length}}</p>
<p>Unregistered characters: {{characters_without_api|length}}</p> <p>Unregistered characters: {{characters_without_api|length|add:n_unacounted}}</p>
</div> </div>
<div class="col-lg-12 col-sm-5"> <div class="col-lg-12 col-sm-5">
<b>API Index:</b> <b>API Index:</b>
@ -76,7 +76,7 @@
</nav> </nav>
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a data-toggle="tab" href="#gotapi">Registered Main Characters <b>({{characters_with_api|length}})</b></a></li> <li class="active"><a data-toggle="tab" href="#gotapi">Registered Main Characters <b>({{characters_with_api|length}})</b></a></li>
<li><a data-toggle="tab" href="#noapi">Characters without API <b>({{characters_without_api|length}})</b></a></li> <li><a data-toggle="tab" href="#noapi">Characters without API <b>({{characters_without_api|length|add:n_unacounted}})</b></a></li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<div id="gotapi" class="tab-pane fade in active"> <div id="gotapi" class="tab-pane fade in active">
@ -147,6 +147,11 @@
{% if characters_without_api %} {% if characters_without_api %}
<div class="panel-body"> <div class="panel-body">
<div class="table-responsive"> <div class="table-responsive">
{% if 0 < n_unacounted %}
<div class="alert alert-danger" role="alert">
<h3>There are atleast {{ n_unacounted }} characters not accounted for in EveWho.</h3>
</div>
{% endif %}
<table class="table table-condensed table-hover table-striped"> <table class="table table-condensed table-hover table-striped">
<tr> <tr>
<th class="col-md-1"></th> <th class="col-md-1"></th>