Merge branch 'announcementsv2' into 'main'

Announcementsv2

See merge request !18

README.txt

@@ -27,6 +27,6 @@ https://stackoverflow.com/questions/6540032/sorting-related-items-in-a-django-te
 
 (sgd) Joaquin Crisologo, 7 May, 2023
 (sgd) Andrew Idquival, 28 February, 2023
-(sgd) Jayson Lim, 28 February, 2023
+(sgd) Jayson Lim, 8 May, 2023
 (sgd) Almira Redoble, 1 May, 2023
 (sgd) Neptune Sy, 28 February, 2023
\ No newline at end of file

widget_vincentdjango/announcementBoard/migrations/0002_auto_20230305_1528.py

-# Generated by Django 3.2 on 2023-03-05 07:28
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0001_initial'),
-        ('announcementBoard', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='announcement',
-            name='author',
-            field=models.ForeignKey(default=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='announcements', to='dashboard.widgetuser'),
-        ),
-        migrations.AlterField(
-            model_name='reaction',
-            name='annoucement',
-            field=models.ForeignKey(default=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='reactions', to='announcementBoard.announcement'),
-        ),
-        migrations.AlterField(
-            model_name='reaction',
-            name='name',
-            field=models.CharField(choices=[('Like', 'Like'), ('Love', 'Love'), ('Angry', 'Angry')], default='Like', max_length=5),
-        ),
-        migrations.AlterField(
-            model_name='reaction',
-            name='tally',
-            field=models.PositiveIntegerField(default=0),
-        ),
-    ]

widget_vincentdjango/announcementBoard/migrations/0002_auto_20230305_1746.py

-# Generated by Django 3.2 on 2023-03-05 09:46
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0001_initial'),
-        ('announcementBoard', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='announcement',
-            name='author',
-            field=models.ForeignKey(default=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='announcements', to='dashboard.widgetuser'),
-        ),
-        migrations.AlterField(
-            model_name='reaction',
-            name='annoucement',
-            field=models.ForeignKey(default=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='reactions', to='announcementBoard.announcement'),
-        ),
-        migrations.AlterField(
-            model_name='reaction',
-            name='name',
-            field=models.CharField(choices=[('Like', 'Like'), ('Love', 'Love'), ('Angry', 'Angry')], default='Like', max_length=5),
-        ),
-        migrations.AlterField(
-            model_name='reaction',
-            name='tally',
-            field=models.PositiveIntegerField(default=0),
-        ),
-    ]

widget_vincentdjango/announcementBoard/migrations/0003_merge_0002_auto_20230305_1528_0002_auto_20230305_1746.py

-# Generated by Django 3.2 on 2023-03-05 11:15
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('announcementBoard', '0002_auto_20230305_1528'),
-        ('announcementBoard', '0002_auto_20230305_1746'),
-    ]
-
-    operations = [
-    ]

widget_vincentdjango/announcementBoard/urls.py

-from django.urls import path
-from .views import index
-
-urlpatterns = [
-    path('', index, name='index'),
-]
-
-
-app_name = "announcementBoard"
\ No newline at end of file

widget_vincentdjango/announcementBoard/views.py

-from django.shortcuts import render
-from django.http import HttpResponse
-from .models import Announcement
-from dashboard.models import WidgetUser
-
-def index(request):
-
-    head = "<h1 style='border-bottom:4px solid lightgray;\
-            padding-bottom:30px;\
-            font-size:450%;'>\
-            Widget's Announcement Board\
-            </h1>"
-
-    body = "<h2>Announcements:</h2>"
-  
-    for x in Announcement.objects.all():
-        reaction = x.reactions.all()
-        body += "<p style='border: 2px solid gray;\
-                  border-radius:5px;\
-                  padding:20px 30px;'>\
-                  {} by {} {} published {}:\
-                  <br>\
-                  {}\
-                  </p>".format(x.title, x.author.first_name, x.author.last_name,
-                               x.format_pub_datetime(), x.body)
-        for y in reaction:
-            body += "<p>{}: {}\
-                </p>".format(y.name, y.tally)
-
-        body += '<p>&nbsp;</p>'
-
-    return_string = "<html>\
-                    <body style = 'font-family:helvetica;\
-                    padding:30px;'>\
-                    {}{}\
-                    </body></html>".format(head, body)
-
-    return HttpResponse(return_string)

widget_vincentdjango/announcementBoard/admin.py → widget_vincentdjango/announcements/admin.py

@@ -23,9 +23,9 @@ class AnnouncementAdmin(admin.ModelAdmin):
 class ReactionAdmin(admin.ModelAdmin):
     model = Reaction
 
-    list_display = ('name', 'tally', 'annoucement')
-    search_fields = ('name', 'annoucement')
-    list_filter = ('name', 'annoucement')
+    list_display = ('name', 'tally', 'announcement')
+    search_fields = ('name', 'announcement')
+    list_filter = ('name', 'announcement')
 
 
 admin.site.register(Announcement, AnnouncementAdmin)

widget_vincentdjango/announcementBoard/apps.py → widget_vincentdjango/announcements/apps.py

@@ -3,4 +3,4 @@ from django.apps import AppConfig
 
 class AnnouncementboardConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'announcementBoard'
+    name = 'announcements'

widget_vincentdjango/announcementBoard/migrations/0001_initial.py → widget_vincentdjango/announcements/migrations/0001_initial.py

-# Generated by Django 3.2 on 2023-03-04 07:17
+# Generated by Django 3.2 on 2023-05-11 07:09
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -20,16 +20,16 @@ class Migration(migrations.Migration):
                 ('title', models.CharField(default='', max_length=250)),
                 ('body', models.TextField(blank=True, null=True)),
                 ('pub_datetime', models.DateTimeField(auto_now_add=True)),
-                ('author', models.ForeignKey(default=True, null=True, on_delete=django.db.models.deletion.SET_DEFAULT, to='dashboard.widgetuser')),
+                ('author', models.ForeignKey(default=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='announcements', to='dashboard.widgetuser')),
             ],
         ),
         migrations.CreateModel(
             name='Reaction',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=10)),
-                ('tally', models.IntegerField(default=0)),
-                ('annoucement', models.ForeignKey(default=True, null=True, on_delete=django.db.models.deletion.SET_DEFAULT, to='announcementBoard.announcement')),
+                ('name', models.CharField(choices=[('Like', 'Like'), ('Love', 'Love'), ('Angry', 'Angry')], default='Like', max_length=5)),
+                ('tally', models.PositiveIntegerField(default=0)),
+                ('announcement', models.ForeignKey(default=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='reactions', to='announcements.announcement')),
             ],
         ),
     ]

widget_vincentdjango/announcementBoard/models.py → widget_vincentdjango/announcements/models.py

 from django.db import models
 from dashboard.models import WidgetUser
+from django.urls import reverse
 
 
 class Announcement(models.Model):
@@ -12,20 +13,23 @@ class Announcement(models.Model):
         on_delete=models.CASCADE,
         related_name='announcements',
     )
-    pub_datetime = models.DateTimeField(auto_now_add=True)
+    pub_datetime = models.DateTimeField(auto_now_add=True, editable=False)
 
     def __str__(self):
         return self.title
     
     def format_pub_datetime(self):
         return self.pub_datetime.strftime('%m/%d/%Y, %I:%M %p')
+    
+    def get_absolute_url(self):
+        return reverse('announcements:announcements-detail', kwargs={'pk': self.pk})
 
 class Reaction(models.Model):
     name = models.CharField(max_length=5, choices=[('Like', 'Like'), 
                                                    ('Love', 'Love'), 
                                                    ('Angry', 'Angry')], default='Like')
     tally = models.PositiveIntegerField(default=0)
-    annoucement = models.ForeignKey(
+    announcement = models.ForeignKey(
         Announcement, 
         null=True, 
         default=True, 

widget_vincentdjango/announcements/templates/announcements/announcement-add.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %} Add Announcement {% endblock %}
+{% block heading %}
+	<h1 class="subheader"> Add a new announcement: </h1>
+{% endblock %}
+{% block content %}
+    <form method="post">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <div class="separator-bar"></div>
+		<input class="action-button" type="submit" value="Add Announcement">
+    </form>
+{% endblock %}

widget_vincentdjango/announcements/templates/announcements/announcement-details.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %} {{ object.title }} {% endblock %}
+{% block heading %}
+    <h1> {{ object.title }} </h1>
+    <h2> by {{ object.author.first_name }} {{ object.author.last_name }} </h2>
+    <h4> {{ object.format_pub_datetime }} </h4>
+    <p class="detail-body"> {{ object.body }} </p>
+
+    <div class="separator-bar"></div>
+    {% for reaction in object.reactions.all %}
+        <p class="detail-additionalinfo">
+            {{ reaction.name }}: {{ reaction.tally }}
+        </p>
+    {% endfor %}
+    <div class="separator-bar"></div>
+    <button class="action-button" onclick="window.location.href='{% url 'announcements:announcements-edit' pk=object.pk %}'">
+        Edit Announcement
+    </button>
+{% endblock %}
\ No newline at end of file

widget_vincentdjango/announcements/templates/announcements/announcement-edit.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %} Edit Anouncement {% endblock %}
+{% block heading %}
+	<h1 class="subheader"> Edit Announcement: </h1>
+{% endblock %}
+{% block content %}
+	<form method="post">
+		{% csrf_token %}
+		{{ form.as_p }}
+		<br>
+        <div class="separator-bar"></div>
+		<input class="action-button" type="submit" value="Save Changes to Announcement">
+	</form>
+{% endblock %}

widget_vincentdjango/announcements/templates/announcements/announcements.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %} Widget's Announcement Board {% endblock %}
+{% block heading %}
+    <h1 id="header"> Welcome to Widget's Announcement Board! </h1>
+{% endblock %}
+{% block content %}
+    <h2 class="subheader"> Announcements: </h2>
+    <ul>
+            {% for object in announcements|dictsortreversed:"pub_datetime" %}
+            <li class="object-cell">
+                <a href="{{ object.get_absolute_url }}"> <span class="object-title">{{ object.title }}</span> by 
+                    {{ object.author.first_name}} {{ object.author.last_name }}
+                </a>
+            </li>
+            {% endfor %}
+    </ul>
+	<hr>
+	<button onclick="window.location.href='{% url 'announcements:announcements-add' %}'" class="action-button">
+        New Announcement
+    </button>
+    <div id="footer">
+        <a href="{% url 'dashboard:index' %}">Dashboard</a>
+        <a href="{% url 'forum:index' %}">Forum</a>
+        <a href="{% url 'assignments:homePage' %}">Assignments</a>
+        <a href="{% url 'widget_calendar:index' %}">Calendar</a>
+    </div>
+
+{% endblock %}

widget_vincentdjango/announcements/urls.py

+from django.urls import path
+from .views import index, AnnouncementsDetailView, AnnouncementsCreateView, AnnouncementsUpdateView
+
+urlpatterns = [
+    path('', index, name='index'),
+    path('announcements/<int:pk>/details', AnnouncementsDetailView.as_view(), name='announcements-detail'),
+    path('announcements/add', AnnouncementsCreateView.as_view(), name = 'announcements-add'),
+    path('announcements/<int:pk>/edit', AnnouncementsUpdateView.as_view(), name = 'announcements-edit')
+]
+
+
+app_name = "announcements"
\ No newline at end of file

widget_vincentdjango/announcements/views.py

+from django.shortcuts import render
+from django.http import HttpResponse
+from .models import Announcement
+from django.views.generic.detail import DetailView
+from django.views.generic.edit import CreateView, UpdateView
+from dashboard.models import WidgetUser
+
+def index(request):
+    announcements = Announcement.objects.all()
+    return render(request, 'announcements/announcements.html', {'announcements':announcements})
+
+class AnnouncementsDetailView(DetailView):
+    model = Announcement
+    template_name = 'announcements/announcement-details.html'
+
+class AnnouncementsCreateView(CreateView):
+    model = Announcement
+    template_name = 'announcements/announcement-add.html'
+    fields = ["title", "body", "author"]
+
+class AnnouncementsUpdateView(UpdateView):
+    model = Announcement
+    template_name = 'announcements/announcement-edit.html'
+    fields = '__all__'
\ No newline at end of file

widget_vincentdjango/assignments/templates/assignments/assignments.html

@@ -18,7 +18,7 @@
 {% block navigation %}
     <button class="buttonLink" onclick="window.location.href='add/';"> <b>New Assignment</b> </button><br><br>
     <a class="miniLink" href="/dashboard"> Dashboard </a> <br>
-    <a class="miniLink" href="/announcementBoard"> Announcements </a> <br>
+    <a class="miniLink" href="/announcements"> Announcements </a> <br>
     <a class="miniLink" href="/forum"> Forum </a> <br> 
     <a class="miniLink" href="/widget_calendar"> Calendar </a> <br>
 {% endblock %}
\ No newline at end of file

widget_vincentdjango/dashboard/templates/dashboard/dashboard.html

@@ -29,7 +29,7 @@
         </button>
     </div>
     <div id="footer">
-        <a href="{% url 'announcementBoard:index' %}">Announcement Board</a>
+        <a href="{% url 'announcements:index' %}">Announcement Board</a>
         <a href="{% url 'forum:index' %}">Forum</a>
         <a href="{% url 'assignments:homePage' %}">Assignments</a>
         <a href="{% url 'widget_calendar:index' %}">Calendar</a>

widget_vincentdjango/forum/templates/forum/forum.html

@@ -21,7 +21,7 @@
 	<button onclick="window.location.href='{% url 'forum:forumpost-add' %}';" class="action-button"> New Post </button>
     <div id="footer">
         <a href="{% url 'dashboard:index' %}">Dashboard</a>
-        <a href="{% url 'announcementBoard:index' %}">Announcements</a>
+        <a href="{% url 'announcements:index' %}">Announcements</a>
         <a href="{% url 'assignments:homePage' %}">Assignments</a>
         <a href="{% url 'widget_calendar:index' %}">Calendar</a>
     </div>

widget_vincentdjango/widget_vincentdjango/settings.py

@@ -43,7 +43,7 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'dashboard',
     'assignments',
-    'announcementBoard',
+    'announcements',
     'forum',
     'widget_calendar',
 ]

widget_vincentdjango/widget_vincentdjango/urls.py

@@ -21,6 +21,6 @@ urlpatterns = [
     path('', include('dashboard.urls', namespace="dashboard")),
     path('widget_calendar/', include('widget_calendar.urls', namespace="widget_calendar")),
     path('assignments/', include('assignments.urls', namespace="assignments")),
-    path('announcementBoard/', include('announcementBoard.urls', namespace="announcementBoard")),
+    path('announcements/', include('announcements.urls', namespace="announcements")),
     path('forum/', include('forum.urls', namespace="forum")),
 ]