summaryrefslogtreecommitdiff
path: root/talersurvey/survey
diff options
context:
space:
mode:
Diffstat (limited to 'talersurvey/survey')
-rw-r--r--talersurvey/survey/survey.py5
-rw-r--r--talersurvey/survey/templates/survey_stats.html2
2 files changed, 4 insertions, 3 deletions
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.</p>
<ul>
<li>Reserve pub: {{ stats['reserve_pub'] }}</li>
- <li>Reserve expiration: {{ stats['reserve_expiration'] }}</li>
+ <li>Reserve expiration: {{ prettydate(stats['reserve_expiration']) }}</li>
<li>Amount available {{ stats['amount_available'] }}</li>
<li>Amount picked up {{ stats['amount_picked_up'] }}</li>
<li>Amount authorized {{ stats['amount_authorized'] }}</li>