From c4b7e0fac6b900f316e88502643f0c10eea6a020 Mon Sep 17 00:00:00 2001
From: Vaibhav Mule <vaibhavmule135@gmail.com>
Date: Fri, 20 Mar 2020 15:59:19 +0530
Subject: [PATCH] remove propert and use template based dateformat
---
hypha/apply/funds/models/reminders.py | 4 ----
.../apply/funds/templates/funds/includes/reminders_block.html | 4 ++--
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/hypha/apply/funds/models/reminders.py b/hypha/apply/funds/models/reminders.py
index 919699d00..1015a965c 100644
--- a/hypha/apply/funds/models/reminders.py
+++ b/hypha/apply/funds/models/reminders.py
@@ -49,10 +49,6 @@ class Reminder(models.Model):
def is_expired(self):
return timezone.now() > self.time
- @property
- def time_with_format(self):
- return self.time.strftime('%Y-%m-%d %I:%M %p')
-
@property
def action_message(self):
return self.ACTION_MESSAGE[f'{self.action}-{self.medium}']
diff --git a/hypha/apply/funds/templates/funds/includes/reminders_block.html b/hypha/apply/funds/templates/funds/includes/reminders_block.html
index fdf1f528b..2cb714420 100644
--- a/hypha/apply/funds/templates/funds/includes/reminders_block.html
+++ b/hypha/apply/funds/templates/funds/includes/reminders_block.html
@@ -3,11 +3,11 @@
{% regroup object.reminders.all by get_action_display as action_list %}
<ul>
{% for action in action_list %}
- <li><strong>{{action.grouper}}</strong>
+ <li><strong>{{ action.grouper }}</strong>
<ul>
{% for reminder in action.list %}
<li class="{% if reminder.is_expired %}expired-reminder{% endif %}">
- {{reminder.time_with_format}}
+ {{ reminder.time|date:"SHORT_DATETIME_FORMAT" }}
<a class="link" href="{% url 'funds:submissions:reminders:delete' object.id reminder.id %}">
<svg class="icon icon--delete"><use xlink:href="#delete"></use></svg>
</a>
--
GitLab