nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-17 19:59:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add in a Alliance view

Browse Source
This commit is contained in:
Andrew Williams
2011-07-19 13:19:25 +01:00
parent f2b1954291
commit e0017497a0
4 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/eve_api/models/corporation.py
View File

@@ -55,6 +55,10 @@ class EVEPlayerCorporation(EVEAPIModel):
membercount = self.member_count membercount = self.member_count
return (float(self.api_keys) / membercount) * 100 return (float(self.api_keys) / membercount) * 100
@property
def average_sp(self):
return self.eveplayercharacter_set.aggregate(models.Avg('total_sp'))['total_sp__avg']
@models.permalink @models.permalink
def get_absolute_url(self): def get_absolute_url(self):
return ('eveapi-corporation', [self.pk]) return ('eveapi-corporation', [self.pk])

2
app/eve_api/templates/eve_api/character_list.html
View File

@@ -15,7 +15,7 @@
{% for char in acc.list %} {% for char in acc.list %}
<tr><td><a href="{% url eveapi-character char.id %}">{{ char.name }}</a></td> <tr><td><a href="{% url eveapi-character char.id %}">{{ char.name }}</a></td>
<td><a href="{% url eveapi-corporation char.corporation.id %}">{{ char.corporation }}</a></td> <td><a href="{% url eveapi-corporation char.corporation.id %}">{{ char.corporation }}</a></td>
<td>{% if char.corporation.alliance %}{{ char.corporation.alliance }}{% endif %}</td> <td>{% if char.corporation.alliance %}<a href="{% url eveapi-alliance char.corporation.alliance.id %}">{{ char.corporation.alliance }}</a>{% endif %}</td>
<td style="text-align: right;">{{ char.total_sp|intcomma }} SP</td> <td style="text-align: right;">{{ char.total_sp|intcomma }} SP</td>
<td>{% if char.current_training %}{{ char.current_training.skill.name }} to Level {{ char.current_training.in_training }}{% endif %}</td> <td>{% if char.current_training %}{{ char.current_training.skill.name }} to Level {{ char.current_training.in_training }}{% endif %}</td>
</tr> </tr>

2
app/eve_api/urls.py
View File

@@ -14,5 +14,5 @@ urlpatterns = patterns('',
url(r'^character/(?P<charid>\d+)/$', views.eveapi_character, name="eveapi-character"), url(r'^character/(?P<charid>\d+)/$', views.eveapi_character, name="eveapi-character"),
url(r'^corporation/(?P<corporationid>\d+)/$', views.eveapi_corporation, name="eveapi-corporation"), url(r'^corporation/(?P<corporationid>\d+)/$', views.eveapi_corporation, name="eveapi-corporation"),
url(r'^alliance/(?P<allianceid>\d+)/$', views.eveapi_alliance, name="eveapi-alliance"),
) )

15
app/eve_api/views.py
View File

@@ -13,7 +13,7 @@ from eve_proxy.models import ApiAccessLog
from eve_proxy.exceptions import DocumentRetrievalError from eve_proxy.exceptions import DocumentRetrievalError
from eve_api.app_defines import * from eve_api.app_defines import *
from eve_api.forms import EveAPIForm from eve_api.forms import EveAPIForm
from eve_api.models import EVEAccount, EVEPlayerCharacter, EVEPlayerCorporation from eve_api.models import EVEAccount, EVEPlayerCharacter, EVEPlayerCorporation, EVEPlayerAlliance
from eve_api.tasks import import_apikey_result from eve_api.tasks import import_apikey_result
@@ -195,3 +195,16 @@ def eveapi_corporation(request, corporationid, template='eve_api/corporation.htm
'view_members': corporation.eveplayercharacter_set.filter(eveaccount__user=request.user, roles__name="roleDirector").count() or request.user.is_superuser, 'view_members': corporation.eveplayercharacter_set.filter(eveaccount__user=request.user, roles__name="roleDirector").count() or request.user.is_superuser,
} }
return render_to_response(template, context, context_instance=RequestContext(request)) return render_to_response(template, context, context_instance=RequestContext(request))
@login_required
def eveapi_alliance(request, allianceid, template='eve_api/alliance.html'):
alliance = get_object_or_404(EVEPlayerAlliance, pk=allianceid)
context = {
'alliance': alliance,
'executor': alliance.executor.ceo_character,
}
return render_to_response(template, context, context_instance=RequestContext(request))