metonym/dawdle
metonym/dawdle
1
0
Fork 0
forked from pwgen2155/dawdle
Code Pull requests Activity

feat: new column total idled

Browse source
This commit is contained in:
pwgen2155 2024-02-29 09:43:00 +11:00
parent ff6c74e101
commit c5058db9eb
4 changed files with 8 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
site/dawdle/templates/dawdle/base.html
View file

@ -70,7 +70,7 @@ body {
color: #00f;
}
.evil-align {
color: #500;
color: #B00;
}
@media only screen and (max-width: 1200px) {
body {

49
site/dawdle/templates/dawdle/player_items.html
View file

@ -1,49 +0,0 @@
{% extends "dawdle/base.html" %}
{% load static %}
{% load duration %}
{% load alignment %}
{% block content %}
<div class="contentbox">
<h1>Players</h1>
<table id="playerlist">
<thead>
<tr><td>Rank</td><td style="width:30rem">Name</td><td>Time to next level</td></tr>
</thead><tbody>
{% for p in object_list %}
<tr class="{%if p.online %}online{% else %}offline{% endif %}">
<td style="text-align:right">#{{forloop.counter}}</td>
<td><img style="height: 0.7em; width: 0.7em"
src="{% if p.online %}
{% static 'dawdle/Blue_sphere.svg' %}
{% else %}
{% static 'dawdle/Gray_sphere.svg' %}
{% endif %}"
alt="{% if p.online %}
On
{% else %}
Off
{% endif %}">
<a href="{% url 'dawdle:player-detail' p.name %}">{{p.name}},
the <span class="{{p.alignment|alignment}}-align">{{p.alignment|alignment}}</span>
level {{p.level}} {{p.cclass}}</a>
</td>
<td style="text-align: right"2>{{p.nextlvl|duration}}</td>
</tr>
{% endfor %}
</tbody></table>
<div id="pmap-container">
<img id="pmap" src="{% url 'dawdle:map' %}" alt="Player Map" usemap="#playermap">
</div>
<map name="playermap">
{% for p in object_list %}
<area shape="circle"
coords="{{p.posx}},{{p.posy}},3"
alt="{{p.name}}"
href="{% url 'dawdle:player-detail' p.name %}">
{% endfor %}
</map>
</div>
{% endblock %}

14
site/dawdle/templates/dawdle/player_list.html
View file

@ -10,7 +10,7 @@
<table id="playerlist">
<thead>
<tr><td>Rank</td><td style="width:30rem">Name</td><td>Time to next level</td><td>IRC User</td><td>Level Total</td></tr>
<tr><td>Rank</td><td style="width:30rem">Name</td><td>Time to next level</td><td>IRC User</td><td>Item Total</td><td>Total Idled</td></tr>
</thead><tbody>
{% for p in object_list %}
<tr class="{%if p.online %}online{% else %}offline{% endif %}">
@ -26,14 +26,14 @@
{% else %}
Off
{% endif %}">
<a href="{% url 'dawdle:player-detail' p.name %}">{{p.name}},
the <span class="{{p.alignment|alignment}}-align">{{p.alignment|alignment}}</span>
level {{p.level}} {{p.cclass}}</a>
<a href="{% url 'dawdle:player-detail' p.name %}">{{p.name}}
the <span class="{{p.alignment|alignment}}-align">{{p.alignment|alignment}}</span>
level {{p.level}} {{p.cclass}}</a>
</td>
<td style="text-align: right"2>{{p.nextlvl|duration}}</td>
<td><i>{{ p.userhost|split:"!"|first}}</i></td>
<td style="text-align: right"2>{{p.item_set | lvlsum}}</td>
{#{% for i in p.item_set.aggregate(Sum('level'))['level__sum'] %}#}
<td><i>{{ p.userhost|split:"!"|first}}</i></td>
<td style="text-align: center"2>{{p.item_set | lvlsum}}</td>
<td style="text-align: center"2>{{p.idled |duration}}</td>
</tr>
{% endfor %}
</tbody></table>

7
site/dawdle/views.py
View file

@ -75,17 +75,10 @@ class PlayerListView(generic.ListView):
model = Player
queryset = Player.objects.order_by('-level', 'nextlvl')
#def get_context_data(self, **kwargs):
# #context = super().get_context_data(**kwargs)
# context['players'] = p.order_by('-level', 'nextlvl')
# context['total_items'] = p.item_set.aggregate(Sum('level'))['level__sum']
# return context
class PlayerDetailView(generic.DetailView):
model = Player
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
p = self.object