From 6b494a2b865a395e19f3dc6f9d204e2c2408479b Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Tue, 4 Jun 2019 16:26:00 +0100
Subject: [PATCH] Only show the en dash if month is totally empty
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This code wasn’t taking into account that you might have sent letters
in the month.

The dash is only there to space out months which don’t have any usage
in them.
---
 app/templates/views/usage-with-letters.html | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/templates/views/usage-with-letters.html b/app/templates/views/usage-with-letters.html
index f0b7e901a..30cc88bd2 100644
--- a/app/templates/views/usage-with-letters.html
+++ b/app/templates/views/usage-with-letters.html
@@ -99,7 +99,7 @@
                 currency="£",
                 smallest=True
               ) }}
-          <ul>
+              <ul>
               {% if month.free %}
                 <li class="tabular-numbers">{{ "{:,}".format(month.free) }} free {{ message_count_label(month.free, 'sms', '') }}</li>
               {% endif %}
@@ -107,18 +107,16 @@
                 <li class="tabular-numbers">{{ "{:,}".format(month.paid) }} {{ message_count_label(month.paid, 'sms', '') }}at
                 {{- ' {:.2f}p'.format(sms_rate * 100) }}</li>
               {% endif %}
-              {% if not (month.free or month.paid) %}
-                <li aria-hidden="true">–</li>
-              {% endif %}
-              </ul>
-             <ul>
               {% for letter in month.letters%}
                 {% if letter[0] %}
                   <li class="tabular-numbers">{{ "{:,} {}".format(letter[0], letter[3])}} class {{ message_count_label(letter[0], 'letter', '') }}at
                   {{ '{:.0f}p'.format(letter[1] * 100) }}</li>
                 {% endif %}
               {% endfor %}
-            </ul>
+              {% if not (month.free or month.paid or month.letters) %}
+                <li aria-hidden="true">–</li>
+              {% endif %}
+              </ul>
             {% endcall %}
           {% endcall %}
         </div>