martin/TipPy
1
1
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Fix of iss11

Browse Source
This commit is contained in:
martin
2016-10-06 11:20:49 +02:00
parent 26833e389a
commit b44d31d128
2 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
templates/md.html
View File

@@ -12,7 +12,6 @@
{% block body %} {% block body %}
<div id="content-main"> <div id="content-main">
<div class="row"> <div class="row">
</div>
<div class="col-md-7"> <div class="col-md-7">
<h2>Neueste Nachrichten</h2> <h2>Neueste Nachrichten</h2>
<p class="text-right"> <p class="text-right">
@@ -52,7 +51,7 @@
<th>Anstoß</th> <th>Anstoß</th>
<th>Heim</th> <th>Heim</th>
<th>Gast</th> <th>Gast</th>
<th>Erg.></th> <th>Erg.</th>
<th colspan="2">Tipp</th> <th colspan="2">Tipp</th>
</tr> </tr>
{% for match in matches %} {% for match in matches %}
@@ -88,43 +87,43 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-7"> {% for mandant, list in mandant_dict.items %}
<h2>Mitspieler</h2> <div class="col-md-7">
<div class="table-responsive"> <h4>Mitspieler {{ mandant }}</h4>
<table class="table table-hover table-condensed"> <div class="table-responsive">
<tr> <table class="table table-hover table-condensed">
<th>Tipper</th> <tr>
<th>Gesamt</th> <th>Tipper</th>
{% for match in matches %} <th>Gesamt</th>
<th> {% for match in matches %}
{% if match.iconURLTeam1 != "" %} <th>
<img src="{{ match.iconURLTeam1 }}" width="20"/> {% if match.iconURLTeam1 != "" %}
{% else %} <img src="{{ match.iconURLTeam1 }}" width="20"/>
<img src="{{ STATIC_URL }}{{ match.iconTeam1 }}" /> {% else %}
{% endif %} <img src="{{ STATIC_URL }}{{ match.iconTeam1 }}" />
<br /><br /> {% endif %}
{% if match.iconURLTeam2 != "" %} <br /><br />
<img src="{{ match.iconURLTeam2 }}" width="20"/> {% if match.iconURLTeam2 != "" %}
{% else %} <img src="{{ match.iconURLTeam2 }}" width="20"/>
<img src="{{ STATIC_URL }}{{ match.iconTeam2 }}" /> {% else %}
{% endif %} <img src="{{ STATIC_URL }}{{ match.iconTeam2 }}" />
</th> {% endif %}
{% endfor %} </th>
</tr> {% endfor %}
{% for mandant, list in mandant_dict.items %} </tr>
{% for mate in list %} {% for mate in list %}
<tr> <tr>
<td>{{ mate.mate.first_name }}</td> <td>{{ mate.mate.first_name }}</td>
<td>{{ mate.sum_score }}</td> <td>{{ mate.sum_score }}</td>
{% for tipp in mate.tipps %} {% for tipp in mate.tipps %}
<td>{{ tipp }}</td> <td>{{ tipp }}</td>
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
</tr> </tr>
{% endfor %} </table>
</table> </div>
</div> </div>
</div> {% endfor %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

4
tipp/views.py
View File

@@ -320,11 +320,11 @@ def matchday(request, ls, season, matchday, template_name='md.html'):
mandant_dict = {} mandant_dict = {}
for m in mandants: for m in mandants:
mandant = Mandant.objects.get(id=m) mandant = Mandant.objects.get(id=m)
mandant_dict[mandant.name] = [] mandant_dict[mandant.description] = []
rs = RelUserMandant.objects.filter(mandant=m) rs = RelUserMandant.objects.filter(mandant=m)
for r in rs: for r in rs:
mandant_dict[mandant.name].append({ mandant_dict[mandant.description].append({
'mate': r.user, 'mate': r.user,
'tipps': [], 'tipps': [],
'sum_score': 0 'sum_score': 0