From 49c3ca55986228049dd5f23cca55bccc86b7af15 Mon Sep 17 00:00:00 2001
From: Marcello Stanisci
Date: Wed, 20 Mar 2019 22:53:14 +0100
Subject: Test and fix #5643; also updating the config module.
---
talersurvey/survey/survey.py | 5 +++--
talersurvey/survey/templates/survey_stats.html | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
(limited to 'talersurvey/survey')
diff --git a/talersurvey/survey/survey.py b/talersurvey/survey/survey.py
index 65e5980..79d0f16 100644
--- a/talersurvey/survey/survey.py
+++ b/talersurvey/survey/survey.py
@@ -70,9 +70,10 @@ def utility_processor():
parsed_time = re.search(r"/Date\(([0-9]+)\)/", talerdate)
if not parsed_time:
return "malformed date given"
- timestamp = datetime.datetime.fromtimestamp(parsed_time.group(1))
+ parsed_time = int(parsed_time.group(1))
+ timestamp = datetime.datetime.fromtimestamp(parsed_time)
# returns the YYYY-MM-DD date format.
- return timestamp.isoformat()
+ return timestamp.strftime("%Y-%b-%d")
return dict(env=env, prettydate=prettydate)
diff --git a/talersurvey/survey/templates/survey_stats.html b/talersurvey/survey/templates/survey_stats.html
index 62c77dd..41cb437 100644
--- a/talersurvey/survey/templates/survey_stats.html
+++ b/talersurvey/survey/templates/survey_stats.html
@@ -6,7 +6,7 @@
merchant. Usually this should not be visible to users.
- Reserve pub: {{ stats['reserve_pub'] }}
- - Reserve expiration: {{ stats['reserve_expiration'] }}
+ - Reserve expiration: {{ prettydate(stats['reserve_expiration']) }}
- Amount available {{ stats['amount_available'] }}
- Amount picked up {{ stats['amount_picked_up'] }}
- Amount authorized {{ stats['amount_authorized'] }}
--
cgit v1.2.3