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

Users without a selected main character is not a problem anymore. Main will be listed as "User: [username]" and will be highlighted. Also added a row showing corp of main character.

Browse Source
This commit is contained in:
Ydmir 2016-01-22 21:25:30 +01:00
parent b7c1c8469d
commit f4eac57b0f
3 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
corputils/views.py
View File

@ -31,23 +31,36 @@ def corp_member_view(request):
if settings.IS_CORP: if settings.IS_CORP:
corp = EveCorporationInfo.objects.get(corporation_id=settings.CORP_ID) corp = EveCorporationInfo.objects.get(corporation_id=settings.CORP_ID)
Player = namedtuple("Player", ["main", "maincorp", "altlist"])
member_list = EveApiManager.get_corp_membertracking() member_list = EveApiManager.get_corp_membertracking()
characters_with_api = {} characters_with_api = {}
characters_without_api = {} characters_without_api = []
for char_id, member_data in member_list.items(): for char_id, member_data in member_list.items():
try: try:
char = EveCharacter.objects.get(character_id=char_id) char = EveCharacter.objects.get(character_id=char_id)
user = char.user user = char.user
try:
mainid = int(AuthServicesInfoManager.get_auth_service_info(user=user).main_char_id) mainid = int(AuthServicesInfoManager.get_auth_service_info(user=user).main_char_id)
mainname = EveCharacter.objects.get(character_id=mainid).character_name mainchar = EveCharacter.objects.get(character_id=mainid)
characters_with_api.setdefault(mainname,[]).append(char.character_name) mainname = mainchar.character_name
maincorp = mainchar.corporation_name
except ValueError:
mainname = "User: " + user.username
maincorp = None
characters_with_api.setdefault(mainname, Player(main=mainname,
maincorp=maincorp,
altlist=[])
).altlist.append(char.character_name)
except EveCharacter.DoesNotExist: except EveCharacter.DoesNotExist:
characters_without_api.setdefault(member_data["name"],[]).append(member_data["name"]) characters_without_api.append(member_data["name"])
context = {"corp": corp, context = {"corp": corp,
"characters_with_api": sorted(characters_with_api.items()), "characters_with_api": sorted(characters_with_api.items()),
"characters_without_api": sorted(characters_without_api.items()), "characters_without_api": sorted(characters_without_api),
"search_form": CorputilsSearchForm()} "search_form": CorputilsSearchForm()}
return render_to_response('registered/corputils.html',context, context_instance=RequestContext(request) ) return render_to_response('registered/corputils.html',context, context_instance=RequestContext(request) )

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

@ -1,6 +1,5 @@
{% extends "public/base.html" %} {% extends "public/base.html" %}
{% load bootstrap %} {% load bootstrap %}
{% load corputils_extras %}
{% block title %}Alliance Auth{% endblock %} {% block title %}Alliance Auth{% endblock %}
{% block page_title %}Corporation Member Tracking{% endblock page_title %} {% block page_title %}Corporation Member Tracking{% endblock page_title %}
@ -54,24 +53,31 @@
<table class="table table-condensed"> <table class="table table-condensed">
<tr> <tr>
<th class="text-center">Main character</th> <th class="text-center">Main character</th>
<th class="text-center">Main corporation</th>
<th class="text-center">Character list</th> <th class="text-center">Character list</th>
</tr> </tr>
{% for main, alts in characters_with_api %} {% for mainchar, player in characters_with_api %}
<tr> <tr >
<td class="text-center"> <td class="text-center">
<p class="">{{ main }}</p> <p class="">{{ mainchar }}</p>
</td>
<td class="text-center" {% if not corp.corporation_name == player.maincorp%} bgcolor="#FF99AA" {% endif %} >
<p class="">{{ player.maincorp }}</p>
</td> </td>
<td class="text-center"> <td class="text-center">
{% for name in alts %} {% for charname in player.altlist %}
<p class="">{{ name}}</p> <p class="">{{ charname }}</p>
{% endfor %} {% endfor %}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
{% for main, value in characters_without_api %} {% for charname in characters_without_api %}
<tr bgcolor="#DD5500"> <tr bgcolor="#DD8822">
<td class="text-center"> <td class="text-center">
<p class="">{{ main }}</p> <p class="">{{ charname }}</p>
</td>
<td class="text-center">
<p class=""></p>
</td> </td>
<td class="text-center"> <td class="text-center">
<p class="">No API registered!</p> <p class="">No API registered!</p>

5
stock/templates/registered/corputilssearchview.html
View File

@ -1,7 +1,6 @@
{% extends "public/base.html" %} {% extends "public/base.html" %}
{% load bootstrap %} {% load bootstrap %}
{% load staticfiles %} {% load staticfiles %}
{% load corputils_extras %}
{% block title %}Alliance Auth{% endblock %} {% block title %}Alliance Auth{% endblock %}
@ -10,7 +9,7 @@
{% block content %} {% block content %}
<div class="col-lg-12"> <div class="col-lg-12">
{% if perms.auth.corp_stats %} {% if perms.auth.corputils %}
<h1 class="page-header text-center">Member Search Results <h1 class="page-header text-center">Member Search Results
<div class="text-right"> <div class="text-right">
<!-- Button trigger modal --> <!-- Button trigger modal -->
@ -42,7 +41,7 @@
{% endif %} {% endif %}
</div> </div>
{% if perms.auth.corp_stats %} {% if perms.auth.corputils %}
<!-- Modal --> <!-- Modal -->
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
aria-hidden="true"> aria-hidden="true">