Finalized Announcement_Board's views and model

eb703cd5 · Colleen · e785edfd · eb703cd5 · eb703cd5 · eb703cd5
Commit eb703cd5 authored Mar 05, 2023 by Colleen
19 changed files
--- a/widget_gitgud/Announcement_Board/__pycache__/models.cpython-39.pyc
+++ b/widget_gitgud/Announcement_Board/__pycache__/models.cpython-39.pyc
--- a/widget_gitgud/Announcement_Board/__pycache__/views.cpython-39.pyc
+++ b/widget_gitgud/Announcement_Board/__pycache__/views.cpython-39.pyc
--- a/widget_gitgud/Announcement_Board/migrations/0002_alter_announcement_author.py
+++ b/widget_gitgud/Announcement_Board/migrations/0002_alter_announcement_author.py
+# Generated by Django 4.1.6 on 2023-03-05 07:46
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Dashboard', '0001_initial'),
+        ('Announcement_Board', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='announcement',
+            name='author',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='Dashboard.widgetuser'),
+        ),
+    ]
--- a/widget_gitgud/Announcement_Board/migrations/__pycache__/0002_alter_announcement_author.cpython-39.pyc
+++ b/widget_gitgud/Announcement_Board/migrations/__pycache__/0002_alter_announcement_author.cpython-39.pyc
--- a/widget_gitgud/Announcement_Board/views.py
+++ b/widget_gitgud/Announcement_Board/views.py
@@ -6,11 +6,26 @@ from .models import Announcement, Reaction
 def index(request):
    return_string = '<ul>'
    for announcement in Announcement.objects.all():
-        return_string += '{} by {}: <br> published {}:<br>{} <br> Like: {} <br> Love: {} <br> Angry: {}<br><br>'.format(
+        return_string += '{} by {}: <br> published {}:<br>{} <br>'.format(
            announcement.title, announcement.author, 
            announcement.pub_datetime,announcement.body,
-            Reaction.tally, Reaction.tally, Reaction.tally
        )
+        announced = announcement
+        like = 0
+        love = 0
+        angry = 0
+        for reaction in Reaction.objects.all():
+            if reaction.name == "like" and reaction.announcement == announced:
+                like += reaction.tally
+            if reaction.name == "love" and reaction.announcement == announced:
+                love += reaction.tally
+            if reaction.name == "angry" and reaction.announcement == announced:
+                angry += reaction.tally
+        return_string += 'like: {} <br> love: {} <br> angry: {}<br><br>'.format(
+            like, love, angry,
+        )
+
+
    return_string += '</ul>'
    html_string = '<html><head>Widget’s Announcement Board<br><br>Announcements:</head><body>{}</body><html>'.format(return_string)


--- a/widget_gitgud/db.sqlite3
+++ b/widget_gitgud/db.sqlite3
--- a/widget_gitgud/widget_gitgud/__pycache__/settings.cpython-39.pyc
+++ b/widget_gitgud/widget_gitgud/__pycache__/settings.cpython-39.pyc
--- a/widget_gitgud/widget_gitgud/__pycache__/urls.cpython-39.pyc
+++ b/widget_gitgud/widget_gitgud/__pycache__/urls.cpython-39.pyc
--- a/widget_gitgud/widgetcalendar/__pycache__/__init__.cpython-39.pyc
+++ b/widget_gitgud/widgetcalendar/__pycache__/__init__.cpython-39.pyc
--- a/widget_gitgud/widgetcalendar/__pycache__/admin.cpython-39.pyc
+++ b/widget_gitgud/widgetcalendar/__pycache__/admin.cpython-39.pyc
--- a/widget_gitgud/widgetcalendar/__pycache__/apps.cpython-39.pyc
+++ b/widget_gitgud/widgetcalendar/__pycache__/apps.cpython-39.pyc
--- a/widget_gitgud/widgetcalendar/__pycache__/models.cpython-39.pyc
+++ b/widget_gitgud/widgetcalendar/__pycache__/models.cpython-39.pyc
--- a/widget_gitgud/widgetcalendar/__pycache__/urls.cpython-39.pyc
+++ b/widget_gitgud/widgetcalendar/__pycache__/urls.cpython-39.pyc
--- a/widget_gitgud/widgetcalendar/__pycache__/views.cpython-39.pyc
+++ b/widget_gitgud/widgetcalendar/__pycache__/views.cpython-39.pyc
--- a/widget_gitgud/widgetcalendar/migrations/0003_alter_event_activity.py
+++ b/widget_gitgud/widgetcalendar/migrations/0003_alter_event_activity.py
+# Generated by Django 4.1.6 on 2023-03-05 08:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('widgetcalendar', '0002_alter_location_venue'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='event',
+            name='activity',
+            field=models.TextField(default='', max_length=200),
+        ),
+    ]
--- a/widget_gitgud/widgetcalendar/migrations/__pycache__/0001_initial.cpython-39.pyc
+++ b/widget_gitgud/widgetcalendar/migrations/__pycache__/0001_initial.cpython-39.pyc
--- a/widget_gitgud/widgetcalendar/migrations/__pycache__/0002_alter_location_venue.cpython-39.pyc
+++ b/widget_gitgud/widgetcalendar/migrations/__pycache__/0002_alter_location_venue.cpython-39.pyc
--- a/widget_gitgud/widgetcalendar/migrations/__pycache__/0003_alter_event_activity.cpython-39.pyc
+++ b/widget_gitgud/widgetcalendar/migrations/__pycache__/0003_alter_event_activity.cpython-39.pyc
--- a/widget_gitgud/widgetcalendar/migrations/__pycache__/__init__.cpython-39.pyc
+++ b/widget_gitgud/widgetcalendar/migrations/__pycache__/__init__.cpython-39.pyc