From 5f39e50c631c3011c5dd0376dd0b6b3b86153dfb Mon Sep 17 00:00:00 2001
From: Andrew Godwin <andrew@aeracode.org>
Date: Sun, 19 Feb 2023 10:48:41 -0700
Subject: [PATCH] Some improvements to poll display now they work more

Fixes #327
---
 activities/templatetags/activity_tags.py | 13 +++++++++++++
 static/css/style.css                     |  6 ++++++
 templates/activities/_type_question.html |  6 +++---
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/activities/templatetags/activity_tags.py b/activities/templatetags/activity_tags.py
index f063b60..8165a3c 100644
--- a/activities/templatetags/activity_tags.py
+++ b/activities/templatetags/activity_tags.py
@@ -35,6 +35,19 @@ def timedeltashort(value: datetime.datetime):
     return sign + text
 
 
+@register.filter
+def timedeltashortenddate(value: datetime.datetime):
+    """
+    Formatter for end dates - timedeltashort but it adds "ended ... ago" or
+    "left" depending on the direction.
+    """
+    output = timedeltashort(value)
+    if output.startswith("-"):
+        return f"{output[1:]} left"
+    else:
+        return f"Ended {output} ago"
+
+
 @register.simple_tag(takes_context=True)
 def urlparams(context, **kwargs):
     """
diff --git a/static/css/style.css b/static/css/style.css
index 10fd1c1..56b96b4 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -1650,6 +1650,12 @@ form .post {
     font-size: 12px;
 }
 
+.poll-footer span.todo {
+    padding-left: 6px;
+    font-size: 90%;
+    color: var(--color-text-dull);
+}
+
 .post .poll ul li .votes {
     margin-left: 10px;
     font-size: small;
diff --git a/templates/activities/_type_question.html b/templates/activities/_type_question.html
index ef456b6..111c24e 100644
--- a/templates/activities/_type_question.html
+++ b/templates/activities/_type_question.html
@@ -16,9 +16,9 @@
         {% if forloop.last %}</ul>{% endif %}
     {% endfor %}
     <div class="poll-footer">
-        <span class="vote-total">{{ post.type_data.voter_count }} people</span>
+        <span class="vote-total">{{ post.type_data.voter_count }} {{ post.type_data.voter_count|pluralize:"vote,votes" }}</span>
         &mdash;
-        {% if post.type_data.end_time %}<span class="vote-end">{{ post.type_data.end_time|timedeltashort }}</span>{% endif %}
-        <span>Polls are currently display only</span>
+        {% if post.type_data.end_time %}<span class="vote-end">{{ post.type_data.end_time|timedeltashortenddate }}</span>{% endif %}
+        <span class="todo">Polls are currently display only</span>
     </div>
 </div>