Added 'add announcement' feature

widget_tee_jays_angelos/announcements/forms.py

+from django import forms
+from django.forms import ModelForm
+from django import forms
+
+from .models import *
+
+class AnnouncementForm(ModelForm):
+    class Meta:
+        model = Announcement
+        fields ='__all__'
\ No newline at end of file

widget_tee_jays_angelos/announcements/migrations/0023_announcement_related_image.py

+# Generated by Django 3.2.12 on 2022-05-21 15:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('announcements', '0022_alter_announcement_pub_date'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='announcement',
+            name='related_image',
+            field=models.ImageField(blank=True, null=True, upload_to='announcements/'),
+        ),
+    ]

widget_tee_jays_angelos/announcements/migrations/0024_auto_20220521_2335.py

+# Generated by Django 3.2.12 on 2022-05-21 15:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('announcements', '0023_announcement_related_image'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='announcement',
+            name='announcement_body',
+            field=models.CharField(max_length=500, null=True),
+        ),
+        migrations.AlterField(
+            model_name='announcement',
+            name='announcement_title',
+            field=models.CharField(max_length=50, null=True),
+        ),
+    ]

widget_tee_jays_angelos/announcements/migrations/0025_auto_20220522_0117.py

+# Generated by Django 3.2.12 on 2022-05-21 17:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('announcements', '0024_auto_20220521_2335'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='reaction',
+            name='related_image',
+            field=models.ImageField(blank=True, null=True, upload_to='announcementPictures/'),
+        ),
+        migrations.AlterField(
+            model_name='announcement',
+            name='related_image',
+            field=models.ImageField(blank=True, null=True, upload_to='announcementPictures/'),
+        ),
+    ]

widget_tee_jays_angelos/announcements/migrations/0026_remove_reaction_related_image.py

+# Generated by Django 3.2.12 on 2022-05-21 17:17
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('announcements', '0025_auto_20220522_0117'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='reaction',
+            name='related_image',
+        ),
+    ]

widget_tee_jays_angelos/announcements/models.py

@@ -3,11 +3,11 @@ from homepage.models import WidgetUser
 
 # Create your models here.
 class Announcement(models.Model):
-    announcement_title = models.CharField(max_length=50)
-    announcement_body = models.CharField(max_length=500)
+    announcement_title = models.CharField(max_length=50, null=True)
+    announcement_body = models.CharField(max_length=500, null=True)
     pub_date = models.DateField("date published", null=True, auto_now_add=True)
     author = models.ForeignKey(WidgetUser, on_delete=models.CASCADE, null=True, related_name='author')
-
+    related_image = models.ImageField(upload_to="announcementPictures/", height_field=None, width_field=None, max_length=100, null=True, blank=True)
     def __str__(self):
         return self.announcement_title
 

widget_tee_jays_angelos/announcements/static/announcements/announcementsstyle.css

-/* body
+body
 {
-    background-color: black;
-} */
+}
 
 h1 
 {
@@ -93,7 +92,7 @@ li
     width: 455px;
     height: 530px;
     border-radius: 20px; 
-    position: relative; 
-    top: -380px;  
+    position: absolute; 
+    top: 200px ;  
     left: 50% ;
 }
\ No newline at end of file

widget_tee_jays_angelos/announcements/templates/announcements/announcements.html

@@ -2,11 +2,10 @@
 {% block content %}
     <div class="indexRectangularShadow"></div>
     <h1 style="text-align: center">New Announcement</h1>
-    <form action="">
-        <p>Enter Title: <input type="text" name="title"></p> 
-        <p>Enter Body: <input type="text" name="body"></p> 
-        <p>Choose author: <input type="text" name="author"></p> 
-        <p>Image (optional): <input type="image" name="image"></p> 
-        <input type="Submit">
+    <form method="POST" enctype="multipart/form-data">
+        {% csrf_token %}
+        {{form.as_p}}
+        <input type="submit" value="Submit"></input>
     </form>
+    <h2><a href="/announcements/">Announcement Board</a></h2>
 {% endblock %}
\ No newline at end of file

widget_tee_jays_angelos/announcements/templates/announcements/details.html

@@ -5,13 +5,15 @@
         <div class="detailsTitleRectangularShadow"></div>
         <h1>{{Announcement.announcement_title}}</h1>
         <h2 style="position: relative; left: 70px;">by {{Announcement.author.first_name}} {{Announcement.author.last_name}}, {{Announcement.pub_date}}</h2>
-        <img src="/static/announcements/{{Announcement.author.last_name}}.jpg" class="detailsProfilePicture">
+        <img src="{{ user.picture.url }}" class="detailsProfilePicture">
         <p style="margin-right: 50%; position: relative; top: -60px;">{{Announcement.announcement_body}}</p>
         {% for reaction in reactions %}
-            <img src="/static/announcements/{{reaction.reaction_name}}.jpg" class="detailsReactions">
+            <img src="/images/announcementPictures/{{reaction.reaction_name}}.jpg" class="detailsReactions">
             <p style="position: relative; top: -110px; left: 50px;">{{reaction.reaction_name}}: {{reaction.tally}}</p>
         {% endfor %}
-        <img src="/static/announcements/{{Announcement.announcement_title}}.jpg" class="detailsRelatedPicture">
+        {% if Announcement.related_image %}
+            <img src="{{ Announcement.related_image.url }}" class="detailsRelatedPicture">
+        {% endif %}
     {% else %}
         <p>Announcement not found.</p>
     {% endif %}

widget_tee_jays_angelos/announcements/templates/announcements/index.html

@@ -7,10 +7,10 @@
         <ul>
         {% for Announcement in announcement_list %}
             <li><a href="/announcements/{{Announcement.id}}/details">{{Announcement.announcement_title}}, by {{Announcement.author.last_name}}, {{Announcement.author.first_name}}, dated {{Announcement.pub_date}}</a></li>
-            <img src="/static/announcements/indexMegaphoneIcon.jpg" class="indexMegaphoneIcon">  
+            <img src="/images/announcementPictures/indexMegaphoneIcon.jpg" class="indexMegaphoneIcon">  
         {% endfor %}
         </ul>
-    <h2><a href="/announcements/add">New Announcement</a></h2>
+    <h2><a href="/announcements/add/">New Announcement</a></h2>
     {% else %}
         <p>No Announcements are available</p>
     {% endif %}

widget_tee_jays_angelos/announcements/urls.py

 from django.urls import path
-from . import views
+from .views import AnnouncementsPageView, AnnouncementAddView, AnnouncementDetailsView
+from django.conf.urls.static import static
+from django.conf import settings
 
 urlpatterns = [
-    path('', views.index, name="announcements"),
-    path('add/', views.add, name="add"),
-    path('<int:announcement_id>/details/', views.details, name="details"),
+    path('', AnnouncementsPageView.as_view(), name="announcements"),
+    path('add/', AnnouncementAddView.as_view(), name="add"),
+    path('<int:announcement_id>/details/', AnnouncementDetailsView.as_view(), name="details"),
 ]

widget_tee_jays_angelos/announcements/views.py

 from array import array
+from distutils.command.upload import upload
+from tkinter import Widget
 from django.http import HttpResponse, Http404
 from announcements.models import Announcement, Reaction, WidgetUser
 from django.shortcuts import render
-from django.template import loader
+from django.template import ContextPopException, loader
+from django.views import View
+from .forms import AnnouncementForm
 
 # Create your views here.
-def index(request):
-	announcement_list = Announcement.objects.order_by("pub_date")
-	context = {
-		"announcement_list": announcement_list,
-	}
-	return render(request, "announcements/index.html", context)
-	
-def add(request):
-	return render(request, "announcements/announcements.html")
+class AnnouncementsPageView(View):
+	def get(self, request):
+		announcement_list = Announcement.objects.order_by("pub_date")
+		user_list = WidgetUser.objects.order_by("last_name")
+		context = {
+			"announcement_list": announcement_list,
+			"user_list": user_list,
+		}
+		return render(request, "announcements/index.html", context)
 
-# helper function that iterates through every reaction of an announcement, adds it to an array, then returns it 
-def getReactions(pk):
-	announcementReactions = []
-	for reaction in Announcement.objects.get(pk=pk).announcements.all():
-		announcementReactions.append(reaction)
-	return announcementReactions
+class AnnouncementAddView(View):
+	def get(self, request):
+		form = AnnouncementForm()
+		context ={
+			"form": form,
+		}
+		return render(request, "announcements/announcements.html", context)
 
-def details(request, announcement_id):
-	try:
-		announcement = Announcement.objects.get(pk=announcement_id)
-	except Announcement.DoesNotExist:
-		raise Http404("Announcement does not exist!")
-	try:
-		reactions = getReactions(pk=announcement_id)
-	except Reaction.DoesNotExist:
-		raise Http404("Reaction does not exist!")
-	context = {
-		"Announcement": announcement,
-		"reactions": reactions
+	def post(self, request):
+		context = {}
+		if request.method =="POST":
+			form = AnnouncementForm(request.POST, request.FILES)
+			if form.is_valid():
+				form.save()
+		context ={
+			"form": form,
 		}
-	return render(request, "announcements/details.html", context)
\ No newline at end of file
+		return render(request, "announcements/announcements.html", context)
+
+
+
+class AnnouncementDetailsView(View):
+	# helper function that iterates through every reaction of an announcement, adds it to an array, then returns it 
+	def getReactions(self, pk):
+		announcementReactions = []
+		announcement = Announcement.objects.get(pk=pk)
+		if len(announcement.announcements.all()) == 0:
+			announcement.announcements.create(reaction_name="Like", tally=0)
+			announcement.announcements.create(reaction_name="Love", tally=0)
+			announcement.announcements.create(reaction_name="Angry", tally=0)
+		for reaction in announcement.announcements.all():
+			announcementReactions.append(reaction)
+		return announcementReactions
+		
+	#helper function to get the context
+	def getContext(self, request, announcement_id):
+		try:
+			announcement = Announcement.objects.get(pk=announcement_id)
+		except Announcement.DoesNotExist:
+			raise Http404("Announcement does not exist!")
+		try:
+			reactions = self.getReactions(pk=announcement_id)
+		except Reaction.DoesNotExist:
+			raise Http404("Reaction does not exist!")
+		try:
+			user = WidgetUser.objects.get(pk=announcement.author.id)
+		except WidgetUser.DoesNotExist:
+			raise Http404("User does not exist!")
+		context = {
+			"Announcement": announcement,
+			"reactions": reactions,
+			"user": user,
+			}
+		return context
+
+	def get(self, request, announcement_id):
+		context = self.getContext(request, announcement_id)
+		return render(request, "announcements/details.html", context)
+	
+	def post(self, request, announcement_id):
+		context = self.getContext(request, announcement_id)
+		return render(request, "announcements/details.html", context)
\ No newline at end of file

widget_tee_jays_angelos/templates/base.html

@@ -3,7 +3,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <meta charset = "UTF-8"
+    <meta charset = "UTF-8">
     <meta http-equiv="X-UA-COMPATIBLE" content="IE=edge">
     <meta name="viewport" content ="width=device-width, inital-scale=1.0">
     {% block head %}