Fixed Team List in Templates.

dav_events/models.py

@@ -256,6 +256,11 @@ class Event(models.Model):
             'trainer_email': self.trainer_email,
             'trainer_phone': self.trainer_phone,
             'trainer_2_fullname': self.trainer_2_fullname,
+            'trainer_2_email': self.trainer_2_email,
+            'trainer_2_phone': self.trainer_2_phone,
+            'trainer_3_fullname': self.trainer_3_fullname,
+            'trainer_3_email': self.trainer_3_email,
+            'trainer_3_phone': self.trainer_3_phone,
         }
         return context
 

dav_events/templates/dav_events/emails/event_to_publish.txt

@@ -1,15 +1,12 @@
 {% load i18n %}Hallo Redaktionsteam,
 
-{{ trainer_firstname }} {{ trainer_familyname }} hat eine neue Veranstaltung angelegt:
+{{ trainer_firstname }} {{ trainer_familyname }} hat eine neue Veranstaltung angelegt.
-
------
-{{ event.render_as_text }}-----
-
 Die Veranstaltung wurde zur Veröffentlichung frei gegeben.
 
------ HTML Joomla -----
+-----
-{{ sport|upper }}**/{{ first_day|date:'y' }} - {{ title }}
+{{ event.render_as_text }}
 
+----- HTML Joomla -----
 <h6>{{ short_date }}{% if alt_short_date %}<br />
 ({% trans 'Ersatztermin' %}: {{ alt_short_date }})
 {% endif %}</h6>
@@ -51,6 +48,6 @@ Die Veranstaltung wurde zur Veröffentlichung frei gegeben.
 {% endif %}{% if min_participants > 0 or max_participants > 0 %}<strong>{% trans 'Teilnehmerzahl' %}:</strong> {% if min_participants > 0 and max_participants > 0 %}{{ min_participants }} - {{ max_participants }} {% trans 'Teilnehmer' %}{% elif min_participants > 0 %}min. {{ min_participants }} {% trans 'Teilnehmer' %}{% else %}max. {{ max_participants }} {% trans 'Teilnehmer' %}{% endif %}<br />
 {% endif %}{% if charge > 0 or additional_costs %}<strong>{% trans 'Kosten' %}:</strong> {% if charge > 0 %}{{ charge|floatformat:'-2' }} € {% trans 'Teilnahmegebühr' %}{% endif %}{% if additional_costs %}{% if charge > 0 %}{% trans 'zzgl.' %}{% endif %}{{ additional_costs }}{% endif %}<br />
 {% endif %}{% if deadline %}<strong>{% trans 'Anmeldeschluss' %}:</strong> {{ deadline|date:'l, d. F Y' }}<br />
-{% endif %}{% if trainer_2_fullname %}{% if mode == 'training' %}<strong>{% trans 'Ausbildungsteam' %}:</strong>{% else %}<strong>{% trans 'Team' %}:</strong>{% endif %} XXX <br />
+{% endif %}{% if trainer_2_fullname %}{% if mode == 'training' %}<strong>{% trans 'Ausbildungsteam' %}:</strong>{% else %}<strong>{% trans 'Team' %}:</strong>{% endif %} {{ trainer_firstname }} {{ trainer_familyname }}{% if trainer_email or trainer_phone %} ({% if trainer_email %}<a href="mailto:{{ trainer_email }}">{{ trainer_email }}</a>{% endif %}{% if trainer_email and trainer_phone %}, {% endif %}{% if trainer_phone %}{{ trainer_phone }}{% endif %}){% endif %}, {{ trainer_2_fullname }}{% if trainer_2_email or trainer_2_phone %} ({% if trainer_2_email %}<a href="mailto:{{ trainer_2_email }}">{{ trainer_2_email }}</a>{% endif %}{% if trainer_2_email and trainer_2_phone %}, {% endif %}{% if trainer_2_phone %}{{ trainer_2_phone }}{% endif %}){% endif %}{% if trainer_3_fullname %}, {{ trainer_3_fullname }}{% if trainer_3_email or trainer_3_phone %} ({% if trainer_3_email %}<a href="mailto:{{ trainer_3_email }}">{{ trainer_3_email }}</a>{% endif %}{% if trainer_3_email and trainer_3_phone %}, {% endif %}{% if trainer_3_phone %}{{ trainer_3_phone }}{% endif %}){% endif %}{% endif %}<br />
 {% endif %}{% if trainer_familyname %}<strong>{% trans 'Leitung' %}:</strong> {{ trainer_firstname }} {{ trainer_familyname }}{% if trainer_email %} (<a href="mailto:{{ trainer_email }}">{{ trainer_email }}</a>){% endif %}{% if trainer_phone %} {{ trainer_phone }}{% endif %}
-{% endif %}-----
+{% endif %}

dav_events/templates/dav_events/event.html

@@ -146,16 +146,19 @@
             {% else %}
                 <strong>{% trans 'Team' %}:</strong>
             {% endif %}
-            XXX <br />
+            {{ trainer_firstname }} {{ trainer_familyname }}{% if trainer_email or trainer_phone %}
+            ({% if trainer_email %}<a href="mailto:{{ trainer_email }}">{{ trainer_email }}</a>{% endif %}{% if trainer_email and trainer_phone %}, {% endif %}{% if trainer_phone %}{{ trainer_phone }}{% endif %}){% endif %},
+            {{ trainer_2_fullname }}{% if trainer_2_email or trainer_2_phone %}
+            ({% if trainer_2_email %}<a href="mailto:{{ trainer_2_email }}">{{ trainer_2_email }}</a>{% endif %}{% if trainer_2_email and trainer_2_phone %}, {% endif %}{% if trainer_2_phone %}{{ trainer_2_phone }}{% endif %}){% endif %}{% if trainer_3_fullname %},
+            {{ trainer_3_fullname }}{% if trainer_3_email or trainer_3_phone %}
+            ({% if trainer_3_email %}<a href="mailto:{{ trainer_3_email }}">{{ trainer_3_email }}</a>{% endif %}{% if trainer_3_email and trainer_3_phone %}, {% endif %}{% if trainer_3_phone %}{{ trainer_3_phone }}{% endif %}){% endif %}{% endif %}
+            <br />
         {% endif %}
         {% if trainer_familyname %}
             <strong>{% trans 'Leitung' %}:</strong>
             {{ trainer_firstname }} {{ trainer_familyname }}
-            {% if trainer_email %}
+            {% if trainer_email or trainer_phone %}
-                (<a href="mailto:{{ trainer_email }}">{{ trainer_email }}</a>)
+            ({% if trainer_email %}<a href="mailto:{{ trainer_email }}">{{ trainer_email }}</a>{% endif %}{% if trainer_email and trainer_phone %}, {% endif %}{% if trainer_phone %}{{ trainer_phone }}{% endif %})
-            {% endif %}
-            {% if trainer_phone %}
-                {{ trainer_phone }}
             {% endif %}
         {% endif %}
     </div>

dav_events/templates/dav_events/event.txt

@@ -41,6 +41,6 @@
 {% endif %}{% if min_participants > 0 or max_participants > 0 %}{% trans 'Teilnehmerzahl' %}: {% if min_participants > 0 and max_participants > 0 %}{{ min_participants }} - {{ max_participants }} {% trans 'Teilnehmer' %}{% elif min_participants > 0 %}min. {{ min_participants }} {% trans 'Teilnehmer' %}{% else %}max. {{ max_participants }} {% trans 'Teilnehmer' %}{% endif %}
 {% endif %}{% if charge > 0 or additional_costs %}{% trans 'Kosten' %}: {% if charge > 0 %}{{ charge|floatformat:'-2' }} € {% trans 'Teilnahmegebühr' %}{% endif %}{% if additional_costs %}{% if charge > 0 %} {% trans 'zzgl.' %} {% endif %}{{ additional_costs }}{% endif %}
 {% endif %}{% if deadline %}{% trans 'Anmeldeschluss' %}: {{ deadline|date:'l, d. F Y' }}
-{% endif %}{% if trainer_2_fullname %}{% if mode == 'training' %}{% trans 'Ausbildungsteam' %}:{% else %}{% trans 'Team' %}:{% endif %} XXX
+{% endif %}{% if trainer_2_fullname %}{% if mode == 'training' %}{% trans 'Ausbildungsteam' %}:{% else %}{% trans 'Team' %}:{% endif %} {{ trainer_firstname }} {{ trainer_familyname }}{% if trainer_email or trainer_phone %} ({% if trainer_email %}{{ trainer_email }}{% endif %}{% if trainer_email and trainer_phone %}, {% endif %}{% if trainer_phone %}{{ trainer_phone }}{% endif %}){% endif %}, {{ trainer_2_fullname }}{% if trainer_2_email or trainer_2_phone %} ({% if trainer_2_email %}{{ trainer_2_email }}{% endif %}{% if trainer_2_email and trainer_2_phone %}, {% endif %}{% if trainer_2_phone %}{{ trainer_2_phone }}{% endif %}){% endif %}{% if trainer_3_fullname %}, {{ trainer_3_fullname }}{% if trainer_3_email or trainer_3_phone %} ({% if trainer_3_email %}{{ trainer_3_email }}{% endif %}{% if trainer_3_email and trainer_3_phone %}, {% endif %}{% if trainer_3_phone %}{{ trainer_3_phone }}{% endif %}){% endif %}{% endif %}
 {% endif %}{% if trainer_familyname %}{% trans 'Leitung' %}: {{ trainer_firstname }} {{ trainer_familyname }}{% if trainer_email %} ({{ trainer_email }}){% endif %}{% if trainer_phone %} {{ trainer_phone }}{% endif %}
 {% endif %}