Merge branch 'cruz/announcements'

widget_group22/announcements/urls.py

 from django.urls import path
-from .views import announcements
+from .views import announcements, details
 
 urlpatterns = [
     path('', announcements, name='announcements'),
+    path('announcements/<int:announcement_id>/details/', details, name='details')
 ]
 
 app_name = "announcements"

widget_group22/announcements/views.py

@@ -7,26 +7,29 @@ def index(request):
     return HttpResponse('This is the Announcement Board!')
 
 def announcements(request):
-    all_announcements = models.Announcement.objects.all()
-    all_reactions = models.Reaction.objects.all()
+    all_announcements = models.Announcement.objects.order_by("pub_date")
+    context = {
+        "all_announcements": all_announcements
+    }
+    return render(request, 'announcements/announcements.html', context)
 
-    final_output = ''
-
-    for i in all_announcements:
-        title = i.announcement_title
-        body = i.announcement_body
-        date = str(i.pub_date)
-        last_name = i.author.last_name
-        first_name = i.author.first_name
-        like_tally = str(Reaction.objects.get(reaction_name='Like', announcement=i).get_tally())
-        love_tally = str(Reaction.objects.get(reaction_name='Love', announcement=i).get_tally())
-        angry_tally = str(Reaction.objects.get(reaction_name='Angry', announcement=i).get_tally())
-
-        output = (title+' by '+first_name+' '+last_name+' dated '+date+':<br>'
-                  +body+'<br>'
-                  +'Like: '+like_tally+'<br>'
-                  +'Love: '+love_tally+'<br>'
-                  +'Angry: '+angry_tally)
-
-        final_output += output +'<br><br>'
-    return HttpResponse('<h1>ANNOUNCEMENTS: </h1>' + final_output)
+def details(request, announcement_id):
+    announcement_details = models.Announcement.objects.get(pk=announcement_id)
+    reactions = models.Reaction.objects.filter(announcement=announcement_details)
+    like = 0
+    love = 0
+    angry = 0
+    for reaction in reactions:
+        if reaction.reaction_name=="Like":
+            like = reaction.tally
+        elif reaction.reaction_name=="Love":
+            love = reaction.tally
+        else:
+            angry = reaction.tally
+    context = {
+        "announcement_details": announcement_details,
+        "like": like,
+        "love": love,
+        "angry": angry,
+    }
+    return render(request, "announcements/details.html", context)