Commit 58770713 authored by RJC's avatar RJC

fixed announcement view

parent ef1a5049
...@@ -6,7 +6,7 @@ from django.utils import timezone ...@@ -6,7 +6,7 @@ from django.utils import timezone
def convert_to_localtime(utctime): def convert_to_localtime(utctime):
format = '%d/%m/%Y %H:%M' format = '%d/%m/%Y %I:%M %p'
utc = utctime.replace(tzinfo=pytz.UTC) utc = utctime.replace(tzinfo=pytz.UTC)
localtz = utc.astimezone(timezone.get_current_timezone()) localtz = utc.astimezone(timezone.get_current_timezone())
return localtz.strftime(format) return localtz.strftime(format)
...@@ -19,12 +19,13 @@ def index(request): ...@@ -19,12 +19,13 @@ def index(request):
html_string_2 = "" html_string_2 = ""
for announced in Announcement.objects.all(): for announced in Announcement.objects.all():
html_string_2 += "{} by {} {} published {}<br />:\ html_string_2 += "{} by {} {} published {}:<br />\
{}".format(announced.title, announced.author.first_name, {}<br/>".format(announced.title, announced.author.first_name,
announced.author.last_name, announced.author.last_name,
convert_to_localtime(announced.pub_datetime), announced.body) convert_to_localtime(announced.pub_datetime), announced.body)
for reacts in announced.reaction.all(): for reacts in announced.reaction_set.all():
html_string_2 += "{}: {}".format(reacts.name, reacts.tally) html_string_2 += "{}: {}<br/>".format(reacts.name, reacts.tally)
html_string_2 += '<br/>'
html_string_final = html_string_1 + html_string_2 + "</html>" html_string_final = html_string_1 + html_string_2 + "</html>"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment