diff --git a/templates/md.html b/templates/md.html index 589e91f..a1c7ac3 100644 --- a/templates/md.html +++ b/templates/md.html @@ -12,7 +12,6 @@ {% block body %}
-

Neueste Nachrichten

@@ -52,7 +51,7 @@ Anstoß Heim Gast - Erg.> + Erg. Tipp {% for match in matches %} @@ -88,43 +87,43 @@

-
-

Mitspieler

-
- - - - - {% for match in matches %} - - {% endfor %} - - {% for mandant, list in mandant_dict.items %} - {% for mate in list %} + {% for mandant, list in mandant_dict.items %} +
+

Mitspieler {{ mandant }}

+
+
TipperGesamt - {% if match.iconURLTeam1 != "" %} - - {% else %} - - {% endif %} -

- {% if match.iconURLTeam2 != "" %} - - {% else %} - - {% endif %} -
+ + + + {% for match in matches %} + + {% endfor %} + + {% for mate in list %} {% for tipp in mate.tipps %} {% endfor %} - {% endfor %} - - {% endfor %} -
TipperGesamt + {% if match.iconURLTeam1 != "" %} + + {% else %} + + {% endif %} +

+ {% if match.iconURLTeam2 != "" %} + + {% else %} + + {% endif %} +
{{ mate.mate.first_name }} {{ mate.sum_score }}{{ tipp }}
+ {% endfor %} + + +
-
+ {% endfor %} {% endblock %} diff --git a/tipp/views.py b/tipp/views.py index 5ea4ee1..6c2e048 100644 --- a/tipp/views.py +++ b/tipp/views.py @@ -320,11 +320,11 @@ def matchday(request, ls, season, matchday, template_name='md.html'): mandant_dict = {} for m in mandants: mandant = Mandant.objects.get(id=m) - mandant_dict[mandant.name] = [] + mandant_dict[mandant.description] = [] rs = RelUserMandant.objects.filter(mandant=m) for r in rs: - mandant_dict[mandant.name].append({ + mandant_dict[mandant.description].append({ 'mate': r.user, 'tipps': [], 'sum_score': 0