diff options
author | Marcello Stanisci <stanisci.m@gmail.com> | 2019-03-20 22:53:14 +0100 |
---|---|---|
committer | Marcello Stanisci <stanisci.m@gmail.com> | 2019-03-20 22:53:14 +0100 |
commit | 49c3ca55986228049dd5f23cca55bccc86b7af15 (patch) | |
tree | b1c04801ed52dc82a4e53155eb043ce2e5ae62e8 /talersurvey/survey | |
parent | d35b2decd9d488092da77a77aa08434ed50d7f11 (diff) | |
download | survey-49c3ca55986228049dd5f23cca55bccc86b7af15.tar.gz survey-49c3ca55986228049dd5f23cca55bccc86b7af15.tar.bz2 survey-49c3ca55986228049dd5f23cca55bccc86b7af15.zip |
Test and fix #5643; also updating the config module.
Diffstat (limited to 'talersurvey/survey')
-rw-r--r-- | talersurvey/survey/survey.py | 5 | ||||
-rw-r--r-- | talersurvey/survey/templates/survey_stats.html | 2 |
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> |