Merge branch 'devera/announcements' into 'main'

Devera/announcements

See merge request !8

widget_group3/widget_group3/admin.py

 from django.contrib import admin
-from .models import WidgetUser, Forum
+from .models import WidgetUser, Forum, Announcement
+
 
 # Classes
 
+class AnnouncementAdmin(admin.ModelAdmin):
+    model = Announcement
+
+    search_fields = ('announcement_title', 'announcement_body', 'pub_date')
+    list_display = ('announcement_title', 'announcement_body', 'pub_date')
+    list_filter = ('announcement_title', 'announcement_body', 'pub_date')
+
+    fieldsets = [
+        ('Announcement Data', {
+            'fields': [
+                'announcement_title',
+                'announcement_body',
+            ] 
+        })
+    ]
+
+
 class WidgetUserAdmin(admin.ModelAdmin):
     model = WidgetUser
 
@@ -20,17 +38,6 @@ class WidgetUserAdmin(admin.ModelAdmin):
         }),
     ]
 
-class Assignment(models.Model):
-        name = models.CharField(max_length = 100)
-        description = models.CharField(max_length = 200)
-        max_points = models.IntegerField()
-
-        def __str__(self):
-                return self.name
-        
-        def get_absolute_url(self):
-                return reverse('assignment', args[(self.name)])
-
 
 
 
@@ -38,3 +45,4 @@ class Assignment(models.Model):
 # Register models
 admin.site.register(WidgetUser, WidgetUserAdmin)
 admin.site.register(Forum, ForumAdmin)
+admin.site.register(Announcement, AnnouncementAdmin)

widget_group3/widget_group3/models.py

 from django.db import models
 from django.urls import reverse
 
+class Announcement(models.Model):
+    announcement_title= models.CharField(max_length=50)
+    announcement_body = models.CharField(max_length=200)
+    pub_date = models.DateTimeField(auto_now_add=True, editable=False)
+
+    def __str__(self):
+        return self.full_announcement
+
+    def get_absolute_url(self):
+        return reverse('Announcement', args=[(self.full_announcement)])
+
+    @property
+    def full_announcement(self):
+        return '{} {} {}'.format(self.announcement_title, self.announcement_body, self.pub_date)
+
 
 class Forum(models.Model):
     post_title = models.CharField(max_length=50)
@@ -27,3 +42,14 @@ class WidgetUser(models.Model):
     @property
     def full_name(self):
         return '{} {} {}'.format(self.first_name, self.middle_name, self.last_name)
+
+class Assignment(models.Model):
+        name = models.CharField(max_length = 100)
+        description = models.CharField(max_length = 200)
+        max_points = models.IntegerField()
+
+        def __str__(self):
+                return self.name
+        
+        def get_absolute_url(self):
+                return reverse('assignment', args[(self.name)])

widget_group3/widget_group3/settings.py

@@ -40,7 +40,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'widget_group3',
+    'widget_group3'
 ]
 
 MIDDLEWARE = [