From cc3d1765338750868bea4362e23bbdcde878639e Mon Sep 17 00:00:00 2001 From: Ydmir Date: Fri, 15 Jan 2016 14:23:17 +0100 Subject: [PATCH] Now characters are listed in sorted order. --- corputils/views.py | 10 ++++---- stock/templates/registered/corputils.html | 30 +++++++++-------------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/corputils/views.py b/corputils/views.py index f75bb780..0bbd083b 100644 --- a/corputils/views.py +++ b/corputils/views.py @@ -35,15 +35,15 @@ def corp_member_view(request): char = EveCharacter.objects.get(character_id=char_id) user = char.user 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: - mainid = char_id - characters_without_api.setdefault(mainid,{}).update({char_id:member_data["name"]}) + characters_without_api.setdefault(member_data["name"],[]).append(member_data["name"]) context = {"corp": corp, - "characters_with_api": characters_with_api, - "characters_without_api": characters_without_api} + "characters_with_api": sorted(characters_with_api.items()), + "characters_without_api": sorted(characters_without_api.items())} return render_to_response('registered/corputils.html',context, context_instance=RequestContext(request) ) else: diff --git a/stock/templates/registered/corputils.html b/stock/templates/registered/corputils.html index eea074e6..507d6f6b 100644 --- a/stock/templates/registered/corputils.html +++ b/stock/templates/registered/corputils.html @@ -1,8 +1,4 @@ - - - - - {% extends "public/base.html" %} +{% extends "public/base.html" %} {% block title %}Alliance Auth{% endblock %} {% block page_title %}Corporation Stats{% endblock page_title %} {% load corputils_extras %} @@ -30,7 +26,11 @@ <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> @@ -47,22 +47,22 @@ <th class="text-center">Main character</th> <th class="text-center">Character list</th> </tr> - {% for mainid, alts in characters_with_api.items %} + {% for main, alts in characters_with_api %} <tr> <td class="text-center"> - <p class="">{{ alts|get_dict_item:mainid }}</p> + <p class="">{{ main }}</p> </td> <td class="text-center"> - {% for charid, name in alts.items %} + {% for name in alts %} <p class="">{{ name}}</p> {% endfor %} </td> </tr> {% endfor %} - {% for mainid, alts in characters_without_api.items %} + {% for main, value in characters_without_api %} <tr bgcolor="#DD5500"> <td class="text-center"> - <p class="">{{ alts|get_dict_item:mainid }}</p> + <p class="">{{ main }}</p> </td> <td class="text-center"> <p class="">No API registered!</p> @@ -93,10 +93,4 @@ {% endif %} {% endif %} </div> -{% endblock content %} - - - - - - \ No newline at end of file +{% endblock content %} \ No newline at end of file