add event state and topic name in the agenda templates [CPCN-633] (#167)

superdesk · Mar 27, 2024 · fd05f74 · fd05f74
1 parent 4d09f68
commit fd05f74
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/server/theme/email_agenda.fr_ca.html b/server/theme/email_agenda.fr_ca.html
@@ -1,7 +1,8 @@
 <h1>{{ get_highlighted_field(item, ["headline", "name"]) | safe }}</h1>
+<div><b>Nouvel élément pour votre sujet suivi: {{ topic_name }}</b></div>
 <a href="{{ url_for_agenda(item) }}"><b>Voir cet élément dans votre compte: </b>{{ url_for_agenda(item) }}</a>
 
-{%  if item.event %}<p class="h3"><b>Quand: </b>{{ dateString }}</p>{% endif %}
+{%  if item.event %}<p class="h3"><b>Quand: </b>{{ dateString }}  {{get_event_state(item)}}</p>{% endif %}
 
 {% if location and location != '' %}
     <p class="h3"><b>Où:</b> {{ location }}</p>
@@ -12,7 +13,7 @@ <h1>{{ get_highlighted_field(item, ["headline", "name"]) | safe }}</h1>
               src={{ map | safe }} ></div>
 {% endif %}
 
-{% if contacts | length is gt 1 %}
+{% if contacts | length is gt 0 %}
     <p><b>Contact: </b>
     {% for contact in contacts %}
         <div>{{ contact.name or contact.organisation }}

diff --git a/server/theme/email_agenda.fr_ca.txt b/server/theme/email_agenda.fr_ca.txt
@@ -1,8 +1,9 @@
 {{ item.headline or item.name }}
+Nouvel élément pour votre sujet suivi: {{ topic_name }}
 Voir cet élément dans votre compte: {{ url_for_agenda(item) }}
-{%  if item.event %}Quand: {{ dateString }}{% endif %}
+{%  if item.event %}Quand: {{ dateString }}  {{get_event_state(item)}}{% endif %}
 {% if location and location != '' %}Où: {{ location }}
-{% endif %}{% if contacts | length is gt 1 %}Contact: {% for contact in contacts %}{{ contact.name or contact.organisation }} {{ contact.phone }} {{ contact.mobile }} {{ contact.email }}
+{% endif %}{% if contacts | length is gt 0 %}Contact: {% for contact in contacts %}{{ contact.name or contact.organisation }} {{ contact.phone }} {{ contact.mobile }} {{ contact.email }}
 {% endfor %}
 {% endif %}{% if links | length is gt 1 %}Web: {% for link in links %}{{ link }}
 {% endfor %}

diff --git a/server/theme/email_agenda.html b/server/theme/email_agenda.html
@@ -1,6 +1,7 @@
 <h1>{{ get_highlighted_field(item, ["headline", "name"]) | safe }}</h1>
+<div><b>New item for saved topic: {{ topic_name }}</b></div>
 <a href="{{ url_for_agenda(item) }}"><b>View this item in your account: </b>{{ url_for_agenda(item) }}</a>
-{%  if item.event %}<p class="h3"><b>When:</b>{{ dateString }}</p>{% endif %}
+{%  if item.event %}<p class="h3"><b>When:</b>{{ dateString }}  {{get_event_state(item)}}</p>{% endif %}
 
 {% if location and location != '' %}
     <p class="h3"><b>Where:</b> {{ location }}</p>
@@ -11,7 +12,7 @@ <h1>{{ get_highlighted_field(item, ["headline", "name"]) | safe }}</h1>
               src={{ map | safe }} ></div>
 {% endif %}
 
-{% if contacts | length is gt 1 %}
+{% if contacts | length is gt 0 %}
     <p><b>Contact: </b>
     {% for contact in contacts %}
         <div>{{ contact.name or contact.organisation }}

diff --git a/server/theme/email_agenda.txt b/server/theme/email_agenda.txt
@@ -1,8 +1,9 @@
 {{ item.headline or item.name }}
+New item for saved topic: {{ topic_name }}
 View this item in your account: {{ url_for_agenda(item) }}
-{%  if item.event %} When: {{ dateString }}{% endif %}
-{% if location and location != '' %}Where: {{ location }}
-{% endif %}{% if contacts | length is gt 1 %}Contact: {% for contact in contacts %}{{ contact.name or contact.organisation }} {{ contact.phone }} {{ contact.mobile }} {{ contact.email }}
+{% if item.event %}When: {{ dateString }}  {{get_event_state(item)}}{% endif %}
+{% if location and location != '' %}Where: {{ location }}{% endif %}
+{% if contacts | length is gt 0 %}Contact: {% for contact in contacts %}{{ contact.name or contact.organisation }} {{ contact.phone }} {{ contact.mobile }} {{ contact.email }}
 {% endfor %}
 {% endif %}{% if links | length is gt 1 %}Web: {% for link in links %}{{ link }}
 {% endfor %}