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

Now characters are listed in sorted order.

Browse Source
This commit is contained in:
Ydmir 2016-01-15 14:23:17 +01:00 committed by Ydmir
parent 93c3d450af
commit cc3d176533
2 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
corputils/views.py
View File

@ -35,15 +35,15 @@ def corp_member_view(request):
char = EveCharacter.objects.get(character_id=char_id) char = EveCharacter.objects.get(character_id=char_id)
user = char.user user = char.user
mainid = int(AuthServicesInfoManager.get_auth_service_info(user=user).main_char_id) mainid = int(AuthServicesInfoManager.get_auth_service_info(user=user).main_char_id)
characters_with_api.setdefault(mainid,{}).update({char_id:char.character_name}) mainname = EveCharacter.objects.get(character_id=mainid).character_name
characters_with_api.setdefault(mainname,[]).append(char.character_name)
except EveCharacter.DoesNotExist: except EveCharacter.DoesNotExist:
mainid = char_id characters_without_api.setdefault(member_data["name"],[]).append(member_data["name"])
characters_without_api.setdefault(mainid,{}).update({char_id:member_data["name"]})
context = {"corp": corp, context = {"corp": corp,
"characters_with_api": characters_with_api, "characters_with_api": sorted(characters_with_api.items()),
"characters_without_api": characters_without_api} "characters_without_api": sorted(characters_without_api.items())}
return render_to_response('registered/corputils.html',context, context_instance=RequestContext(request) ) return render_to_response('registered/corputils.html',context, context_instance=RequestContext(request) )
else: else:

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

@ -1,8 +1,4 @@
<!DOCTYPE html> {% extends "public/base.html" %}
<html lang="en">
<head>
<meta charset="UTF-8">
<title>{% extends "public/base.html" %}
{% block title %}Alliance Auth{% endblock %} {% block title %}Alliance Auth{% endblock %}
{% block page_title %}Corporation Stats{% endblock page_title %} {% block page_title %}Corporation Stats{% endblock page_title %}
{% load corputils_extras %} {% load corputils_extras %}
@ -30,7 +26,11 @@
<p>Ticker: {{ corp.corporation_ticker }}</p> <p>Ticker: {{ corp.corporation_ticker }}</p>
<p>Member: {{ corp.member_count }}</p> <p>Member count: {{ corp.member_count }}</p>
<p>Player count: {{characters_with_api|length}}</p>
<p>Unregistered characters: {{characters_without_api|length}}</p>
</div> </div>
</div> </div>
</div> </div>
@ -47,22 +47,22 @@
<th class="text-center">Main character</th> <th class="text-center">Main character</th>
<th class="text-center">Character list</th> <th class="text-center">Character list</th>
</tr> </tr>
{% for mainid, alts in characters_with_api.items %} {% for main, alts in characters_with_api %}
<tr> <tr>
<td class="text-center"> <td class="text-center">
<p class="">{{ alts|get_dict_item:mainid }}</p> <p class="">{{ main }}</p>
</td> </td>
<td class="text-center"> <td class="text-center">
{% for charid, name in alts.items %} {% for name in alts %}
<p class="">{{ name}}</p> <p class="">{{ name}}</p>
{% endfor %} {% endfor %}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
{% for mainid, alts in characters_without_api.items %} {% for main, value in characters_without_api %}
<tr bgcolor="#DD5500"> <tr bgcolor="#DD5500">
<td class="text-center"> <td class="text-center">
<p class="">{{ alts|get_dict_item:mainid }}</p> <p class="">{{ main }}</p>
</td> </td>
<td class="text-center"> <td class="text-center">
<p class="">No API registered!</p> <p class="">No API registered!</p>
@ -94,9 +94,3 @@
{% endif %} {% endif %}
</div> </div>
{% endblock content %} {% endblock content %}
</title>
</head>
<body>
</body>
</html>