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

Added Skillpoint totals to each skill group

Browse Source
This commit is contained in:
Kaphene
2011-06-30 10:47:07 +01:00
committed by Andrew Williams
parent 5766b336b1
commit f6d00a7549
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/eve_api/templates/eve_api/character.html
View File

@@ -60,16 +60,18 @@
<a href=#" id="openAll">Open All</a>
<a href=#" id="collapseAll">Collapse All</a>
</div>
{{skillTree.256.total_sp}}
<table>
{% regroup skills by skill.group as skill_group %}
{% for group in skill_group %}
<tr class="skill_heading" id="{{ group.grouper }}"><th colspan=3>{{ group.grouper }}</th></tr>
{% for skill in group.list %}
{% for group in skillTree %}
{{group.items}}
<tr class="skill_heading" id="{{ group.1 }}"><th colspan=2>{{ group.1 }}</th><th>{{ group.0|intcomma }}</th></tr>
{% for skill in group.2 %}
{% if skill.in_training %}
<tr class="child intraining" parent="{{ group.grouper }}"><td>{{ skill.skill.name }} - Training to Level {{ skill.in_training }}</td><td><img src="{{ STATIC_URL }}img/skills/level{{ skill.level }}t.gif" alt="Level {{ skill.level }}" /></td><td>{{ skill.skillpoints|intcomma }} SP</td></tr>
<tr class="child intraining" parent="{{ group.1 }}"><td>{{ skill.skill.name }} - Training to Level {{ skill.in_training }}</td><td><img src="{{ STATIC_URL }}img/skills/level{{ skill.level }}t.gif" alt="Level {{ skill.level }}" /></td><td>{{ skill.skillpoints|intcomma }} SP</td></tr>
{% else %}
<tr class="child" parent="{{ group.grouper }}"><td>{{ skill.skill.name }} </td><td><img src="{{ STATIC_URL }}img/skills/level{{ skill.level }}.gif" alt="Level {{ skill.level }}" /></td><td>{{ skill.skillpoints|intcomma }} SP</td></tr>
<tr class="child" parent="{{ group.1 }}"><td>{{ skill.skill.name }} </td><td><img src="{{ STATIC_URL }}img/skills/level{{ skill.level }}.gif" alt="Level {{ skill.level }}" /></td><td>{{ skill.skillpoints|intcomma }} SP</td></tr>
{% endif %}
{% endfor %}
{% endfor %}

13
app/eve_api/views.py
View File

@@ -142,7 +142,7 @@ def eveapi_character(request, charid=None):
if charid:
character = get_object_or_404(EVEPlayerCharacter.objects.select_related('corporation', 'corporation__aliance'), id=charid)
# Check if the user has permission to see the character profile
#Check if the user has permission to see the character profile
if not request.user.has_perm('eve_api.can_view_all_characters') and (not character.account or not request.user == character.account.user):
raise Http404
@@ -151,6 +151,17 @@ def eveapi_character(request, charid=None):
except:
current_training = None
skills = character.eveplayercharacterskill_set.all().order_by('skill__group__name', 'skill__name')
skillTree = []
currentSkillGroup = 0
for skill in skills:
if not skill.skill.group.id == currentSkillGroup:
currentSkillGroup = skill.skill.group.id
skillTree.append([0, skill.skill.group.name, []])
skillTree[-1][0] += skill.skillpoints
skillTree[-1][2].append(skill)
return render_to_response('eve_api/character.html', locals(), context_instance=RequestContext(request))
characters = EVEPlayerCharacter.objects.select_related('corporation', 'corporation__alliance').filter(eveaccount__user=request.user).only('id', 'name', 'corporation__name', 'corporation__alliance__name')