Skip to content

Commit

Permalink
Add <ul></ul> tags to emails
Browse files Browse the repository at this point in the history
  • Loading branch information
@Iain-S
Iain-S committed Nov 14, 2023
1 parent c0971aa commit 374cae0
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 82 deletions.
27 changes: 15 additions & 12 deletions rctab/templates/emails/abolishment.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,21 @@
Abolishments ({{abolishments|length}})
</div>
<div class="normal-text">
{% for sub in abolishments %}
<li> <b> <span class=summary-item>{{ sub.name }} ({{ sub.subscription_id }})</span> </b>
<p>
<span class=summary-item>Subscription name: {{ sub.name }}</span>
<span class=summary-item>Subscription ID: {{ sub.subscription_id }}</span>
</p>
<p>
<span class=summary-item>Approval adjustment: £{{ "%.2f"|format(sub.approval) }}</span>
<span class=summary-item>Allocation adjustment: £{{ "%.2f"|format(sub.allocation) }}</span>
</p>
</li>
{% endfor %}
<ul>
{% for sub in abolishments %}
<li>
<b> <span class=summary-item>{{ sub.name }} ({{ sub.subscription_id }})</span> </b>
<p>
<span class=summary-item>Subscription name: {{ sub.name }}</span>
<span class=summary-item>Subscription ID: {{ sub.subscription_id }}</span>
</p>
<p>
<span class=summary-item>Approval adjustment: £{{ "%.2f"|format(sub.approval) }}</span>
<span class=summary-item>Allocation adjustment: £{{ "%.2f"|format(sub.allocation) }}</span>
</p>
</li>
{% endfor %}
</ul>
</div>
<div class="horizontal-line"></div>
</div>
Expand Down
149 changes: 79 additions & 70 deletions rctab/templates/emails/daily_summary.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,100 +17,109 @@
New Subscriptions ({{new_subscriptions|length}})
</div>
<div class="normal-text">
{% for sub in new_subscriptions %}
<li> <b> <span class=summary-item>{{ sub.name }} ({{ sub.subscription_id }})</span> </b>
<p>
<span class=summary-item>Subscription name: {{ sub.name }}</span>
<span class=summary-item>Subscription ID: {{ sub.subscription_id }}</span>
<span class=summary-item>Status: {{ sub.status }}</span>
</p>
<p>
<span class=summary-item>Approved from: {{ sub.approved_from }}</span>
<span class=summary-item>Approved to: {{ sub.approved_to }}</span>
<span class=summary-item>Amount approved: £{{ "%.2f"|format(sub.approved) }}</span>
<span class=summary-item>Allocated: £{{ "%.2f"|format(sub.allocated) }}</span>
</p>
</li>
{% endfor %}
<ul>
{% for sub in new_subscriptions %}
<li> <b> <span class=summary-item>{{ sub.name }} ({{ sub.subscription_id }})</span> </b>
<p>
<span class=summary-item>Subscription name: {{ sub.name }}</span>
<span class=summary-item>Subscription ID: {{ sub.subscription_id }}</span>
<span class=summary-item>Status: {{ sub.status }}</span>
</p>
<p>
<span class=summary-item>Approved from: {{ sub.approved_from }}</span>
<span class=summary-item>Approved to: {{ sub.approved_to }}</span>
<span class=summary-item>Amount approved: £{{ "%.2f"|format(sub.approved) }}</span>
<span class=summary-item>Allocated: £{{ "%.2f"|format(sub.allocated) }}</span>
</p>
</li>
{% endfor %}
</ul>
</div>
<div class="horizontal-line"></div>
<div class="heading-2">
Status changes ({{status_changes|length}})
</div>
<div class="normal-text">
{% for sub in status_changes %}
<li>
<b> <span class=summary-item>{{ sub["new_status"]["display_name"]}} ({{ sub["new_status"]["subscription_id"]
}})</span>
</b>
<p>
{% if sub["new_status"]["display_name"] != sub["old_status"]["display_name"] %}
<span class=summary-item> Subscription name: <span class="strikethrough">
{{ sub["old_status"]["display_name"] }}</span> →
{{sub["new_status"]["display_name"] }} </span>
{% else %}
<span class=summary-item>Subscription name: {{ sub["new_status"]["display_name"]}}</span>
{% endif %}
{% if sub["new_status"]["state"] != sub["old_status"]["state"] %}
<span class=summary-item>Status: <span class="strikethrough">{{ sub["old_status"]["state"] }}</span>
→
{{sub["new_status"]["state"] }} </span>
{% else %}
<span class=summary-item>Status: {{ sub["new_status"]["state"]}}</span>
{% endif %}
</p>
</li>
{% endfor %}
<ul>
{% for sub in status_changes %}
<li>
<b> <span class=summary-item>{{ sub["new_status"]["display_name"]}} ({{ sub["new_status"]["subscription_id"]
}})</span>
</b>
<p>
{% if sub["new_status"]["display_name"] != sub["old_status"]["display_name"] %}
<span class=summary-item> Subscription name: <span class="strikethrough">
{{ sub["old_status"]["display_name"] }}</span> →
{{sub["new_status"]["display_name"] }} </span>
{% else %}
<span class=summary-item>Subscription name: {{ sub["new_status"]["display_name"]}}</span>
{% endif %}
{% if sub["new_status"]["state"] != sub["old_status"]["state"] %}
<span class=summary-item>Status: <span class="strikethrough">{{ sub["old_status"]["state"] }}</span>
→
{{sub["new_status"]["state"] }} </span>
{% else %}
<span class=summary-item>Status: {{ sub["new_status"]["state"]}}</span>
{% endif %}
</p>
</li>
{% endfor %}
</ul>
</div>
<div class="horizontal-line"></div>
<div class="heading-2">
New approvals/allocations ({{new_approvals_and_allocations|length}})
</div>
<div class="normal-text">
{% for n in new_approvals_and_allocations %}
<li>
<b> <span class=summary-item>{{ n["details"]["name"] }} ({{ n["details"]["subscription_id"]
}})</span>
</b>
<span class=summary-item>New approval: £{{ "%.2f"|format(n["approvals"] | sum) }}</span>
<span class=summary-item>New allocation: £{{ "%.2f"|format(n["allocations"] | sum) }}</span>
<span class=summary-item>Status: {{ n["details"]["state"] }}</span>
</li>
{% endfor %}
<ul>
{% for n in new_approvals_and_allocations %}
<li>
<b> <span class=summary-item>{{ n["details"]["name"] }} ({{ n["details"]["subscription_id"]
}})</span>
</b>
<span class=summary-item>New approval: £{{ "%.2f"|format(n["approvals"] | sum) }}</span>
<span class=summary-item>New allocation: £{{ "%.2f"|format(n["allocations"] | sum) }}</span>
<span class=summary-item>Status: {{ n["details"]["state"] }}</span>
</li>
{% endfor %}
</ul>
</div>
<div class="horizontal-line"></div>
<div class="heading-2">
Notifications sent ({{num_notifications}})
</div>
<div class="normal-text">
{% for n in notifications_sent %}
<li>
<b> <span class=summary-item>{{ n["name"]}} ({{ n["subscription_id"] }})</span></b>
{% for e in n["emails_sent"] %}
<span class=summary-item>Notification type: {{ e["type"] }}.
{% if e["type"] == "overbudget" or e["type"] == "usage-alert"%}
{{e["extra_info"]}} % of budget used.
{%elif e["type"] == "time-based"%}
{{e["extra_info"]}} days until expiry.
{% endif %}
</span>
<ul>
{% for n in notifications_sent %}
<li>
<b> <span class=summary-item>{{ n["name"]}} ({{ n["subscription_id"] }})</span></b>
{% for e in n["emails_sent"] %}
<span class=summary-item>Notification type: {{ e["type"] }}.
{% if e["type"] == "overbudget" or e["type"] == "usage-alert"%}
{{e["extra_info"]}} % of budget used.
{%elif e["type"] == "time-based"%}
{{e["extra_info"]}} days until expiry.
{% endif %}
</span>
{% endfor %}
</li>
{% endfor %}
</li>
{% endfor %}
</ul>
</div>
<div class="heading-2">
Finance entries ({{num_finance}})
</div>

{% for f in finance %}
<li>
<b> <span class=summary-item>{{ f["name"]}} ({{ f["subscription_id"] }})</span></b>
{% for e in f["finance_entry"] %}
<div class="normal-text">Amount: {{ e["amount"] }}
</div>
{% endfor %}
</li>
<ul>
{% for f in finance %}
<li>
<b> <span class=summary-item>{{ f["name"]}} ({{ f["subscription_id"] }})</span></b>
{% for e in f["finance_entry"] %}
<div class="normal-text">Amount: {{ e["amount"] }}
</div>
{% endfor %}
</li>
{% endfor %}
</ul>

</div>
{% endblock %}

0 comments on commit 374cae0

Please sign in to comment.