Browse Source

Sort members by roles, then by name.

master
Ben Kurtovic 7 years ago
parent
commit
d3dce543be
1 changed files with 11 additions and 4 deletions
  1. +11
    -4
      calefaction/modules/members.py

+ 11
- 4
calefaction/modules/members.py View File

@@ -11,7 +11,11 @@ SCOPES = {"esi-corporations.read_corporation_membership.v1"}


_Member = namedtuple("_Member", ["id", "name", "roles"]) _Member = namedtuple("_Member", ["id", "name", "roles"])


# ... sort by seniority
def _weight(role):
"""Return an integer weight for the given role for sorting purposes."""
if role == "CEO":
return 0
return 100


def get_members(): def get_members():
"""Return a list of the members of the user's corporation. """Return a list of the members of the user's corporation.
@@ -28,9 +32,12 @@ def get_members():
cids = ",".join(str(item["character_id"]) for item in resp) cids = ",".join(str(item["character_id"]) for item in resp)
ceo_id = g.eve.esi(token).v2.corporations(corp_id).get()["ceo_id"] ceo_id = g.eve.esi(token).v2.corporations(corp_id).get()["ceo_id"]
resp = g.eve.esi(token).v1.characters.names.get(character_ids=cids) resp = g.eve.esi(token).v1.characters.names.get(character_ids=cids)
return [_Member(item["character_id"], item["character_name"],
"CEO" if item["character_id"] == ceo_id else None)
for item in resp]

members = [_Member(item["character_id"], item["character_name"],
"CEO" if item["character_id"] == ceo_id else None)
for item in resp]
members.sort(key=lambda m: (_weight(m.roles), m.name))
return members


def home(): def home():
"""Render and return the main members page.""" """Render and return the main members page."""


Loading…
Cancel
Save