Clean code to PEP8 standards, update announcementboard views.py and dashboard models.py

widget_appappandaway/announcementboard/models.py

@@ -4,7 +4,7 @@ from django.urls import reverse
 
 from dashboard.models import WidgetUser
 
-# Create your models here.
+
 class Announcement(models.Model):
     title = models.CharField(max_length=255)
     body = models.TextField()
@@ -19,7 +19,7 @@ class Announcement(models.Model):
 
 
 class Reaction(models.Model):
-    reaction_names = [('Like','Like'),('Love','Love'),('Angry','Angry')]
+    reaction_names = [('Like', 'Like'), ('Love', 'Love'), ('Angry', 'Angry')]
     name = models.CharField(choices=reaction_names, max_length=255)
     tally = models.IntegerField(default=0, blank=True, null=True)
     announcement = models.ForeignKey(Announcement, on_delete=models.CASCADE, related_name="reacts")

widget_appappandaway/announcementboard/views.py

@@ -3,19 +3,35 @@ from django.http import HttpResponse
 
 from .models import Announcement, Reaction
 
-# Create your views here.
 
+# Create your views here.
 def index(request):
-    output = "<h1><b> Widget's Announcement Board </b></h1> <br> <h3>Announcements:</h3>"
+    output = "<h1><b> Widget's Announcement Board </b></h1><h3>Announcements:</h3>"
 
     for announcement in Announcement.objects.order_by('-pub_datetime'):
-        output += '{} by {} {} published {}:<br> {} <br>'.format(
+        output += '<b>{}</b> by {} {} published {}:<br> {} <br>'.format(
             announcement.title, announcement.author.first_name, announcement.author.last_name, announcement.pub_datetime.strftime("%m/%d/%Y %I:%M %p"), announcement.body)
 
         reactList = announcement.reacts.all()
-        for react in reactList:
+        sortedReactList = sortReacts(reactList)
+
+        for react in sortedReactList:
             output += '{}: {} <br>'.format(react.name, react.tally)
 
         output += '<br>'
 
     return HttpResponse(output)
+
+
+# Sorts reactions in the following order: Like, Love, Angry
+def sortReacts(list):
+    sortedReactList = ['']*3
+    for react in list:
+        if react.name == "Like":
+            sortedReactList[0] = react
+        elif react.name == "Love":
+            sortedReactList[1] = react
+        elif react.name == "Angry":
+            sortedReactList[2] = react
+
+    return sortedReactList

widget_appappandaway/dashboard/models.py

-from django.db import models
-
-# Create your models here.
-
 from django.db import models
 from django.urls import reverse
 
+
+# Create your models here.
 class Department(models.Model):
     dept_name = models.CharField(max_length=48, unique=True)
     home_unit = models.CharField(max_length=48)
@@ -15,11 +13,12 @@ class Department(models.Model):
     def get_absolute_url(self):
         return reverse('department_detail', args=[str(self.dept_name)])
 
+
 class WidgetUser(models.Model):
     first_name = models.TextField(max_length=48)
     middle_name = models.TextField(max_length=48)
     last_name = models.TextField(max_length=48)
-    department = models.ForeignKey(Department, on_delete=models.CASCADE, related_name='department')
+    department = models.ForeignKey(Department, on_delete=models.CASCADE, related_name='users')
 
     def __str__(self):
         return '{}, {} {}'.format(self.last_name, self.first_name, self.middle_name)

widget_appappandaway/dashboard/views.py

@@ -3,8 +3,8 @@ from django.http import HttpResponse
 
 from .models import WidgetUser
 
-# Create your views here.
 
+# Create your views here.
 def index(request):
     output = "Welcome to Widget!<br><br> WIDGET USERS:<br>"
     userList = WidgetUser.objects.order_by('last_name')