Deleted cache

README.txt

@@ -5,22 +5,22 @@ Chidrome, Kirsten Daena, C. 211445
 Dayupay, Alec Isaiah, R. 211831
 Siongco, Jose Enrique, D. 215504
 
-Widget v1
+Widget v2
 Dashboard: Siongco
 Announcement Board: Bicomong
 Forum: Dayupay
 Assignments: Ballesteros
 Calendar: Chidrome
 
-Date of Submission: Monday, March 6, 2023
+Date of Submission: Monday, May 15, 2023
 
 With the power of Big Django Energy, we were able to complete this project effectively in compliance with the project specs. 
 
 References:
 https://www.geeksforgeeks.org/overriding-the-save-method-django-models/
 
-<sgd> Neo Emmanuel D. Ballesteros, 3/2/2023
-<sgd> Anthony P. Bicomong, 3/2/2023
-<sgd> Kirsten Daena C. Chidrome, 3/2/2023
-<sgd> Alec Isaiah R. Dayupay, 3/2/2023
-<sgd> Jose Enrique D. Siongco, 3/2/2023
+<sgd> Neo Emmanuel D. Ballesteros, 4/28/2023
+<sgd> Anthony P. Bicomong, 4/28/2023
+<sgd> Kirsten Daena C. Chidrome, 4/28/2023
+<sgd> Alec Isaiah R. Dayupay, 4/28/2023
+<sgd> Jose Enrique D. Siongco, 4/28/2023

widget_bigdjangoenergy/announcements/forms.py

+from django.forms import ModelForm
+from .models import Announcement
+
+class AnnouncementForm(ModelForm):
+    class Meta:
+        model = Announcement
+        fields = '__all__'

widget_bigdjangoenergy/announcements/migrations/0001_initial.py

-# Generated by Django 3.2 on 2023-03-03 15:39
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('dashboard', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Announcement',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('title', models.CharField(max_length=50)),
-                ('body', models.TextField()),
-                ('pub_datetime', models.DateTimeField()),
-                ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, 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(choices=[('Like', 'Like'), ('Love', 'Love'), ('Angry', 'Angry')], default='Like', max_length=50)),
-                ('tally', models.IntegerField(default=0)),
-                ('announcement', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='announcements.announcement')),
-            ],
-        ),
-    ]

widget_bigdjangoenergy/announcements/models.py

 from django.db import models
+from django.urls import reverse
 
 class Announcement(models.Model):
     title = models.CharField(max_length = 50)
     body = models.TextField()
     author = models.ForeignKey("dashboard.WidgetUser", on_delete=models.CASCADE)
-    pub_datetime = models.DateTimeField()
+    pub_datetime = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return self.title
 
+    def datetime(self):
+        return self.pub_datetime.strftime("%m/%d/%Y, %I:%M %p")
+    
+    def get_absolute_url(self):
+        return reverse("announcement-details", kwargs={'pk': self.pk})
+
 class Reaction(models.Model):
     Like = 'Like'
     Love = 'Love'

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

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %}Add Announcement{% endblock %}
+
+{% block content %}
+    <p>Add a new announcement:</p>
+    <form method="POST">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <input type="Submit" value="Add Announcement">
+    </form>
+{% endblock %}
\ No newline at end of file

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

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %}{{ object.title }}{% endblock %}
+
+{% block heading %}{{ object.title }}{% endblock %}
+
+{% block content %}
+    <p>by {{ object.author }}</p>
+    <p>{{ object.datetime }}</p>
+    <p>{{ object.body }}<br></p>
+
+    {% for reac in object.reaction_set.all %}
+        <p>{{ reac.name }}: {{ reac.tally }}</p>
+    {% endfor %}
+
+    <input type="button" value="Edit Announcement" onclick="location.href='{% url 'announcement-edit' object.pk %}'"/>
+{% endblock %}
\ No newline at end of file

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

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %}Edit Announcement{% endblock %}
+
+{% block content %}
+    <p>Edit Announcement:</p>
+    <form method="POST">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <input type="Submit" value="Save Changes to Announcement">
+    </form>
+{% endblock %}
\ No newline at end of file

widget_bigdjangoenergy/announcements/templates/announcements/announcements.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %}Widget's Announcement Board{% endblock %}
+
+{% block heading %}Welcome to Widget's Announcement Board!{% endblock %}
+
+{% block content %}
+    <p>Announcements:</p>
+    {% for ann in announcements %}
+        <p><a href="{% url 'announcement-details' ann.pk %}">{{ ann.title }} by {{ ann.author }}</a></p>
+    {% endfor %}
+    <input type="button" value="New Announcement" onclick="location.href='{% url 'announcement-add' %}'"/>
+{% endblock %}
+
+{% block links %}
+    <p><a href="http://localhost:8000/dashboard/">Dashboard</a></p>
+    <p><a href="http://localhost:8000/forum/">Forum</a></p>
+    <p><a href="http://localhost:8000/assignments/">Assignment</a></p>
+    <p><a href="http://localhost:8000/calendar/">Calendar</a></p>
+{% endblock %}
\ No newline at end of file

widget_bigdjangoenergy/announcements/urls.py

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

widget_bigdjangoenergy/announcements/views.py

-from django.http import HttpResponse
-from .models import Announcement, Reaction
+from django.shortcuts import render
+from django.views.generic.detail import DetailView
+from django.views.generic.edit import CreateView, UpdateView
+from .models import Announcement
 
 def index(request):
-    announcements = Announcement.objects.all()
-    reactions = Reaction.objects.all()
+    return render(request, 'announcements/announcements.html', {'announcements': Announcement.objects.order_by('-pub_datetime')})
 
-    response = "Widget's Announcement Board<br><br>Announcements:<br>"
-    for announcement in announcements:
-        response += "{} by {} published {}:<br>{}<br>".format(
-            announcement.title,
-            announcement.author,
-            announcement.pub_datetime.strftime("%m/%d/%Y, %I:%M %p"),
-            announcement.body
-        )
+class AnnouncementDetailView(DetailView):
+    model = Announcement
+    template_name = 'announcements/announcement-details.html'
 
-        for reaction in reactions:
-            if reaction.announcement == announcement:
-                response += "{}: {}<br>".format(
-                    reaction.name,
-                    str(reaction.tally)
-                )
-        
-        response += "<br>"
-
-    return HttpResponse(response)
+class AnnouncementCreateView(CreateView):
+    model = Announcement
+    fields = '__all__'
+    template_name = 'announcements/announcement-add.html'
 
+class AnnouncementUpdateView(UpdateView):
+    model = Announcement
+    fields = '__all__'
+    template_name = 'announcements/announcement-edit.html'

widget_bigdjangoenergy/assignments/migrations/0001_initial.py

-# Generated by Django 3.2 on 2023-03-03 15:39
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Course',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('code', models.CharField(max_length=10)),
-                ('title', models.CharField(max_length=50)),
-                ('section', models.CharField(max_length=3)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Assignment',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=50)),
-                ('description', models.TextField()),
-                ('perfect_score', models.IntegerField(default=0)),
-                ('passing_score', models.IntegerField(default=0)),
-                ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assignments.course')),
-            ],
-        ),
-    ]

widget_bigdjangoenergy/calendars/forms.py

+from django.forms import ModelForm
+from .models import Event
+
+class EventForm(ModelForm):
+    class Meta:
+        model = Event
+        fields = "__all__"
\ No newline at end of file

widget_bigdjangoenergy/calendars/migrations/0001_initial.py

-# Generated by Django 3.2 on 2023-03-03 15:39
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('assignments', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Location',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('modes', models.CharField(choices=[('Onsite', 'Onsite'), ('Online', 'Online'), ('Hybrid', 'Hybrid')], default='Onsite', max_length=50)),
-                ('venue', models.CharField(max_length=50)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Event',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('target_datetime', models.DateTimeField()),
-                ('activity', models.CharField(max_length=50)),
-                ('estimated_hours', models.FloatField(default=0)),
-                ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assignments.course')),
-                ('locations', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='calendars.location')),
-            ],
-        ),
-    ]

widget_bigdjangoenergy/calendars/models.py

 from django.db import models
+from django.urls import reverse
 
 class Location(models.Model):
     Onsite = 'Onsite'
@@ -24,3 +25,6 @@ class Event(models.Model):
 
     def __str__(self):
         return self.activity
+    
+    def get_absolute_url(self):
+        return reverse("event-details", kwargs={'pk': self.pk})
\ No newline at end of file

widget_bigdjangoenergy/calendars/templates/calendars/calendar.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %}Widget's Calendar of Activities{% endblock %}
+
+{% block heading %}Widget's Calendar of Activities{% endblock %}
+
+{% block content %}
+    {% for event in event %}
+        <p><a href="{% url 'event-details' event.pk %}">{{ event.activity }}</a></p>
+    {% endfor %}
+    <input type="button" value="New Activity" onclick="location.href='{% url 'event-add' %}'"/>
+{% endblock %}
+
+{% block links %}
+    <p><a href="http://localhost:8000/dashboard/">Dashboard</a></p>
+    <p><a href="http://localhost:8000/announcements/">Announcement</a></p>
+    <p><a href="http://localhost:8000/assignments/">Assignment</a></p>
+    <p><a href="http://localhost:8000/calendar/">Calendar</a></p>
+{% endblock %}

widget_bigdjangoenergy/calendars/templates/calendars/event-add.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %}Add Activity{% endblock %}
+
+{% block content %}
+    <p>Add a new activity:</p>
+    <form method="POST">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <input type="Submit" value="Save New Activity">
+    </form>
+{% endblock %}

widget_bigdjangoenergy/calendars/templates/calendars/event-details.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %}{{ object.activity }}{% endblock %}
+
+{% block heading %}{{ object.activty }}{% endblock %}
+
+{% block content %}
+    <p>Date and Time: {{ object.target_datetime }}</p>
+    <p>Estimated Hours: {{ object.estimated_hours }}</p>
+    <p>{{ object.course }}</p>
+    <p>Mode: {{ object.locations.modes }}</p>
+    <p>Venue: {{ object.locations.venue }}</p>
+
+    <input type="button" value="Edit Post" onclick="location.href='{% url 'event-edit' object.pk %}'"/>
+{% endblock %}

widget_bigdjangoenergy/calendars/templates/calendars/event-edit.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %}Edit Activity{% endblock %}
+
+{% block content %}
+    <p>Edit Activity:</p>
+    <form method="POST">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <input type="Submit" value="Save New Activity">
+    </form>
+{% endblock %}

widget_bigdjangoenergy/calendars/urls.py

 from django.urls import path
 from . import views
+from .views import EventDetailView, EventCreateView, EventUpdateView
 
 urlpatterns = [
-    path('', views.index, name = "index")
+    path('', views.calendar, name = "calendar"),
+    path('events/<int:pk>/details/', EventDetailView.as_view(), name = "event-details"),
+    path('events/add/', EventCreateView.as_view(), name = "event-add"),
+    path('events/<int:pk>/edit/', EventUpdateView.as_view(), name = "event-edit"),
 ]
\ No newline at end of file

widget_bigdjangoenergy/calendars/views.py

-from django.http import HttpResponse
+from django.shortcuts import render
+from django.views.generic.detail import DetailView
+from django.views.generic.edit import CreateView, UpdateView
 from .models import Event
 
-def index(request):
-    events = Event.objects.all()
+def calendar(request):
+    return render(request, 'calendars/calendar.html', {'event': Event.objects.all()})
 
-    response ="Widgets's Calendar of Activities<br><br>Date and Time: "
-    for event in events:
-        response += "{}<br>Activity: {}<br>Estimated Hours: {}<br>Course/Section: {}<br>Mode: {}<br>Venue: {}<br>".format(
-            event.target_datetime.strftime("%m/%d/%Y, %I:%M %p"),
-            event.activity,
-            str(event.estimated_hours),
-            event.course,
-            event.locations.modes,
-            event.locations.venue
-        )
+class EventDetailView(DetailView):
+    model = Event
+    template_name = 'calendars/event-details.html'
 
-    return HttpResponse(response)
\ No newline at end of file
+class EventCreateView(CreateView):
+    model = Event
+    fields = '__all__'
+    template_name = 'calendars/event-add.html'
+
+class EventUpdateView(UpdateView):
+    model = Event
+    fields = '__all__'
+    template_name = 'calendars/event-edit.html'
\ No newline at end of file

widget_bigdjangoenergy/dashboard/migrations/0001_initial.py

-# Generated by Django 3.2 on 2023-03-03 15:38
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Department',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('dept_name', models.CharField(max_length=50)),
-                ('home_unit', models.CharField(max_length=50)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='WidgetUser',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('first_name', models.CharField(max_length=50)),
-                ('middle_name', models.CharField(max_length=50)),
-                ('last_name', models.CharField(max_length=50)),
-                ('department', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.department')),
-            ],
-        ),
-    ]

widget_bigdjangoenergy/dashboard/models.py

@@ -16,3 +16,6 @@ class WidgetUser(models.Model):
 
     def __str__(self):
         return '{} {}'.format(self.first_name, self.last_name)
+    
+    def get_absolute_url(self):
+        return reverse("widgetuser-details", kwargs={'pk': self.pk})
\ No newline at end of file

widget_bigdjangoenergy/dashboard/templates/dashboard/dashboard.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %}Widget's Forum{% endblock %}
+
+{% block heading %}Welcome to Widget's Forum!{% endblock %}
+
+{% block content %}
+    <p>Forum posts:</p>
+    {% for user in WidgetUser %}
+        <p><a href="{{ user.get_absolute_url }}">{{ user.last_name }}, {{ user.first_name }}</a></p>
+    {% endfor %}
+    <input type="button" value="Add Widget User" onclick="location.href='{% url 'widgetuser-add' %}'"/>
+{% endblock %}
+
+{% block links %}
+    <p><a href="../announcements/">Announcement</a></p>
+    <p><a href="../forum/">Forum</a></p>
+    <p><a href="../assignments/">Assignment</a></p>
+    <p><a href="../calendar/">Calendar</a></p>
+{% endblock %}
\ No newline at end of file

widget_bigdjangoenergy/dashboard/templates/dashboard/widgetuser-add.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %}Add Widget User{% endblock %}
+
+{% block heading %}Add a new widget user:{% endblock %}
+{% block content %}
+    <form method="POST">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <input type="Submit" value="Add Widget User">
+    </form>
+{% endblock %}
\ No newline at end of file

widget_bigdjangoenergy/dashboard/templates/dashboard/widgetuser-details.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %}{{ object.last_name }}, {{ object.first_name }}{% endblock %}
+
+{% block heading %}{{ object.first_name }} {{ object.middle_name }} {{ object.last_name }}{% endblock %}
+
+{% block content %}
+    <p>{{ object.department }}</p>
+    <p>{{ object.department.home_unit }}</p>
+
+    <input type="button" value="Edit Widget User" onclick="location.href='{% url 'widgetuser-edit' object.pk %}'"/>
+{% endblock %}
\ No newline at end of file

widget_bigdjangoenergy/dashboard/templates/dashboard/widgetuser-edit.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %}Edit Post{% endblock %}
+
+{% block content %}
+    <p>Edit Widget User:</p>
+    <form method="POST">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <input type="Submit" value="Save Changes to Widget User">
+    </form>
+{% endblock %}
\ No newline at end of file

widget_bigdjangoenergy/dashboard/urls.py

 from django.urls import path
 
-from .views import dashboard
+from .views import (
+    dashboard, WidgetuserDetailView, WidgetuserCreateView, WidgetuserUpdateView
+)
 
 urlpatterns = [
-    path('', dashboard, name = "dashboard")
+    path('', dashboard, name="dashboard"),
+    path('widgetuser/add', WidgetuserCreateView.as_view(), name = "widgetuser-add"),
+    path('widgetuser/<int:pk>/details/', WidgetuserDetailView.as_view(), name="widgetuser-details"),
+    path('widgetuser/<int:pk>/edit/', WidgetuserUpdateView.as_view(), name="widgetuser-edit"),
 ]
\ No newline at end of file
-
-app_name = "dashboard"
\ No newline at end of file

widget_bigdjangoenergy/dashboard/views.py

 from django.shortcuts import render
 from django.http import HttpResponse
+from django.views.generic.detail import DetailView
+from django.views.generic.edit import CreateView, UpdateView
 from .models import Department, WidgetUser
 
 def dashboard(request):
-    widgetusers = WidgetUser.objects.all()
-    
-    response = "Welcome to Widget!<br><br>WIDGET USERS:<br>"
-    for user in widgetusers:
-        response += "{}, {} {}: {}, {}<br>".format(
-            user.last_name,
-            user.first_name,
-            user.middle_name,
-            user.department,
-            user.department.home_unit
-        )
-
-    return HttpResponse(response)
\ No newline at end of file
+    return render(request, 'dashboard/dashboard.html', {'WidgetUser': WidgetUser.objects.all()})
+
+
+class WidgetuserDetailView(DetailView):
+    model = WidgetUser
+    template_name ='dashboard/widgetuser-details.html'
+    fields = '__all__'
+
+
+class WidgetuserCreateView(CreateView):
+    model = WidgetUser
+    fields = '__all__'
+    template_name ='dashboard/widgetuser-add.html'
+
+
+class WidgetuserUpdateView(UpdateView):
+    model = WidgetUser
+    fields = '__all__'
+    template_name ='dashboard/widgetuser-edit.html'
+
+
+   
\ No newline at end of file

widget_bigdjangoenergy/forum/admin.py

@@ -8,8 +8,8 @@ class ForumPostAdmin(admin.ModelAdmin):
 
 class ReplyAdmin(admin.ModelAdmin):
     model = Reply
-    list_display = ("body", "author", "pub_datetime",)
-    search_field = ("body", "author", "pub_datetime",)
+    list_display = ("body", "author", "pub_datetime", "forum_post")
+    search_field = ("body", "author", "pub_datetime", "forum_post")
 
 admin.site.register(ForumPost, ForumPostAdmin)
 admin.site.register(Reply, ReplyAdmin)

widget_bigdjangoenergy/forum/forms.py

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

widget_bigdjangoenergy/forum/migrations/0001_initial.py

-# Generated by Django 3.2 on 2023-03-03 15:39
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('dashboard', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Reply',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('body', models.TextField()),
-                ('pub_datetime', models.DateTimeField()),
-                ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.widgetuser')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='ForumPost',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('title', models.CharField(max_length=50)),
-                ('body', models.TextField()),
-                ('pub_datetime', models.DateTimeField()),
-                ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.widgetuser')),
-            ],
-        ),
-    ]

widget_bigdjangoenergy/forum/models.py

 from django.db import models
+from django.urls import reverse
 
 class ForumPost(models.Model):
     title = models.CharField(max_length = 50)
     body = models.TextField()
     author = models.ForeignKey('dashboard.WidgetUser', on_delete=models.CASCADE)
-    pub_datetime = models.DateTimeField()
+    pub_datetime = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return self.title    
     
+    def datetime(self):
+        return self.pub_datetime.strftime("%m/%d/%Y, %I:%M %p")
+    
+    def get_absolute_url(self):
+        return reverse("forumpost-details", kwargs={'pk': self.pk})
+    
 class Reply(models.Model):
     body = models.TextField()
     author = models.ForeignKey('dashboard.WidgetUser', on_delete=models.CASCADE)
-    pub_datetime = models.DateTimeField()
+    pub_datetime = models.DateTimeField(auto_now_add=True)
+    forum_post = models.ForeignKey('ForumPost', on_delete=models.CASCADE, null= True )
 
     def __str__(self):
         return self.body
+    
+    def datetime(self):
+        return self.pub_datetime.strftime("%m/%d/%Y, %I:%M %p")

widget_bigdjangoenergy/forum/templates/forum/forum.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %}Widget's Forum{% endblock %}
+
+{% block heading %}Welcome to Widget's Forum!{% endblock %}
+
+{% block content %}
+    <p>Forum posts:</p>
+    {% for post in forumposts %}
+        <p><a href="{% url 'forumpost-details' post.pk %}">{{ post.title }} by {{ post.author }}</a></p>
+    {% endfor %}
+    <input type="button" value="New Post" onclick="location.href='{% url 'forumpost-add' %}'"/>
+{% endblock %}
+
+{% block links %}
+    <p><a href="http://localhost:8000/dashboard/">Dashboard</a></p>
+    <p><a href="http://localhost:8000/announcements/">Announcement</a></p>
+    <p><a href="http://localhost:8000/assignments/">Assignment</a></p>
+    <p><a href="http://localhost:8000/calendar/">Calendar</a></p>
+{% endblock %}
\ No newline at end of file

widget_bigdjangoenergy/forum/templates/forum/forumpost-add.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %}Add Post{% endblock %}
+
+{% block content %}
+    <p>Add a new post:</p>
+    <form method="POST">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <input type="Submit" value="Save New Post">
+    </form>
+{% endblock %}
\ No newline at end of file

widget_bigdjangoenergy/forum/templates/forum/forumpost-details.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %}{{ object.title }}{% endblock %}
+
+{% block heading %}{{ object.title }}{% endblock %}
+
+{% block content %}
+    <p>by {{ object.author }}</p>
+    <p>{{ object.datetime }}</p>
+    <p>{{ object.body }}</p>
+
+    <p><br>POST REPLIES:</p>
+    {% for reply in object.reply_set.all %}
+        <p>by {{ reply.author }}</p>
+        <p>{{ reply.datetime }}</p>
+        <p>{{ reply.body }}<br></p>
+    {% endfor %}
+
+    <input type="button" value="Edit Post" onclick="location.href='{% url 'forumpost-edit' object.pk %}'"/>
+{% endblock %}
\ No newline at end of file

widget_bigdjangoenergy/forum/templates/forum/forumpost-edit.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %}Edit Post{% endblock %}
+
+{% block content %}
+    <p>Edit Post:</p>
+    <form method="POST">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <input type="Submit" value="Save Changes to Post">
+    </form>
+{% endblock %}
\ No newline at end of file

widget_bigdjangoenergy/forum/urls.py

 from django.urls import path
 from . import views
+from .views import (ForumPostDetailView, ForumPostCreateView, ForumPostUpdateView)
 
 urlpatterns = [
-    path('', views.forum, name="forum")
+    path('', views.forum, name="forum"),
+    path('forumposts/<int:pk>/details/', ForumPostDetailView.as_view(), name="forumpost-details"),
+    path('forumposts/add/', ForumPostCreateView.as_view(), name="forumpost-add"),
+    path('forumposts/<int:pk>/edit/', ForumPostUpdateView.as_view(), name="forumpost-edit"),
 ]
\ No newline at end of file

widget_bigdjangoenergy/forum/views.py

-from django.http import HttpResponse
-from .models import ForumPost, Reply
+from django.shortcuts import render
+from django.views.generic.detail import DetailView
+from django.views.generic.edit import CreateView, UpdateView
+from .models import ForumPost
 
 def forum(request):
-    forumposts = ForumPost.objects.all()
-    replies = Reply.objects.all()
+    return render(request, 'forum/forum.html', {'forumposts': ForumPost.objects.order_by('-pub_datetime')})
 
-    response = "Widget's Forum<br><br>Forum Posts:<br>"
-    for post in forumposts:
-        response += "{} by {} posted {}:<br>{}<br>".format(
-            post.title,
-            post.author,
-            post.pub_datetime.strftime("%m/%d/%Y, %I:%M %p"),
-            post.body
-        )
+class ForumPostDetailView(DetailView):
+    model = ForumPost
+    template_name = 'forum/forumpost-details.html'
 
-    for reply in replies:
-        response += "Reply by {} posted {}:<br>{}<br>".format(
-            reply.author,
-            reply.pub_datetime.strftime("%m/%d/%Y, %I:%M %p"),
-            reply.body   
-        )
+class ForumPostCreateView(CreateView):
+    model = ForumPost
+    fields = '__all__'
+    template_name = 'forum/forumpost-add.html'
 
-    return HttpResponse(response)
+class ForumPostUpdateView(UpdateView):
+    model = ForumPost
+    fields = '__all__'
+    template_name = 'forum/forumpost-edit.html'
\ No newline at end of file

widget_bigdjangoenergy/templates/base.html

@@ -16,4 +16,8 @@
             {% block links %}{% endblock %}
         </div>
     </body>
+<<<<<<< HEAD
 </html>
+=======
+</html>
+>>>>>>> f677ebe22bd65d5a5b7defd80f65be44b8893457