created add forum page and fixed issues with models

3670b489 · Ron Rodillas · cfffc4c0 · 3670b489 · 3670b489 · 3670b489
Commit 3670b489 authored May 13, 2023 by Ron Rodillas
18 changed files
--- a/widget_group3/dashboard/__pycache__/models.cpython-39.pyc
+++ b/widget_group3/dashboard/__pycache__/models.cpython-39.pyc
--- a/widget_group3/dashboard/__pycache__/views.cpython-39.pyc
+++ b/widget_group3/dashboard/__pycache__/views.cpython-39.pyc
--- a/widget_group3/dashboard/models.py
+++ b/widget_group3/dashboard/models.py
@@ -22,5 +22,8 @@ class WidgetUser(models.Model):
        return self.department.home_unit
        
    def __str__(self):
+        return self.last_name+ ", "+ self.first_name
+        
+    def display_text(self):    
        return '{}, {} {}: {}, {}'.format(self.last_name, self.first_name, self.middle_name, self.dept_name, self.home_unit)
    
\ No newline at end of file
--- a/widget_group3/dashboard/views.py
+++ b/widget_group3/dashboard/views.py
@@ -8,7 +8,7 @@ from .models import WidgetUser
 def index(request):
    return_string = '<body>Welcome to Widget!<br><br>WIDGET USERS:<br><ul>'
    for user in WidgetUser.objects.all():
-        user_string = '<li>{}</li>'.format(user.__str__())
+        user_string = '<li>{}</li>'.format(user.display_text())
        return_string += user_string
        
    return_string += '</ul></body>'

--- a/widget_group3/db.sqlite3
+++ b/widget_group3/db.sqlite3
--- a/widget_group3/forum/__pycache__/models.cpython-39.pyc
+++ b/widget_group3/forum/__pycache__/models.cpython-39.pyc
--- a/widget_group3/forum/__pycache__/urls.cpython-39.pyc
+++ b/widget_group3/forum/__pycache__/urls.cpython-39.pyc
--- a/widget_group3/forum/__pycache__/views.cpython-39.pyc
+++ b/widget_group3/forum/__pycache__/views.cpython-39.pyc
--- a/widget_group3/forum/migrations/0004_alter_forumpost_author.py
+++ b/widget_group3/forum/migrations/0004_alter_forumpost_author.py
+# Generated by Django 4.1.7 on 2023-05-13 13:56
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboard', '0001_initial'),
+        ('forum', '0003_rename_reply_to_reply_forum_post'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='forumpost',
+            name='author',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.widgetuser'),
+        ),
+    ]
--- a/widget_group3/forum/migrations/0005_alter_reply_author.py
+++ b/widget_group3/forum/migrations/0005_alter_reply_author.py
+# Generated by Django 4.1.7 on 2023-05-13 14:07
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboard', '0001_initial'),
+        ('forum', '0004_alter_forumpost_author'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='reply',
+            name='author',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.widgetuser'),
+        ),
+    ]
--- a/widget_group3/forum/migrations/__pycache__/0004_alter_forumpost_author.cpython-39.pyc
+++ b/widget_group3/forum/migrations/__pycache__/0004_alter_forumpost_author.cpython-39.pyc
--- a/widget_group3/forum/migrations/__pycache__/0005_alter_reply_author.cpython-39.pyc
+++ b/widget_group3/forum/migrations/__pycache__/0005_alter_reply_author.cpython-39.pyc
--- a/widget_group3/forum/models.py
+++ b/widget_group3/forum/models.py
@@ -4,7 +4,7 @@ from django.db import models
 class ForumPost (models.Model):
    title = models.CharField(max_length=100)
    body = models.TextField()
-    author = models.CharField(max_length=100)
+    author = models.ForeignKey('dashboard.WidgetUser', on_delete=models.CASCADE, null=True)
    pub_datetime = models.DateTimeField(auto_now_add=True)
    
    def __str__(self):
@@ -16,12 +16,15 @@ class ForumPost (models.Model):
    def get_name(self):
        return self.title
    
-    def get_author(self):
-        return self.author
+    def get_author_first_name(self):
+        return self.author.first_name
+    
+    def get_author_last_name(self):
+        return self.author.last_name
        
 class Reply (models.Model):
    body = models.TextField()
-    author = models.CharField(max_length=100)
+    author = models.ForeignKey('dashboard.WidgetUser', on_delete=models.CASCADE, null=True)
    pub_datetime = models.DateTimeField(auto_now_add=True)
    forum_post = models.ForeignKey(ForumPost, on_delete=models.CASCADE)
    

--- a/widget_group3/forum/templates/widget_group3/forum.html
+++ b/widget_group3/forum/templates/widget_group3/forum.html
@@ -14,10 +14,10 @@ Widget's Forum

 <div>
 {% for post in posts %}
-"{{post.get_name}}" by {{post.get_author}}<br>
+"{{post.get_name}}" by {{post.get_author_first_name}} {{post.get_author_last_name}}<br>
 {% endfor %}
 <br><br><br>
-<button>New Post</button>
+<a href = "{% url 'forum:addPost' %}"><button>New Post</button></a>
 <br><br>
 <a href="{% url 'dashboard:index' %}"> Dashboard</a>
 <br>

--- a/widget_group3/forum/templates/forum/forumpost-add.html
+++ b/widget_group3/forum/templates/forum/forumpost-add.html
+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %}
+{% endblock %}
+
+{% block styles %}
+{% endblock %}
+
+{% block content %}
+<h1> Add a new post:</h1><br>
+<form method="POST" enctype="multipart/form-data">
+    {% csrf_token %} 
+    {{ form.as_p }}
+    <input type="submit" value="Save New Post">
+{% endblock %}
\ No newline at end of file
--- a/widget_group3/forum/templates/forum/forumpost-edit.html
+++ b/widget_group3/forum/templates/forum/forumpost-edit.html
+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %}
+{% endblock %}
+
+{% block styles %}
+{% endblock %}
+
+{% block content %}
+{% endblock %}
\ No newline at end of file
--- a/widget_group3/forum/urls.py
+++ b/widget_group3/forum/urls.py
 from django.urls import path
-from .views import index
+from .views import *

 urlpatterns = [
    path('', index, name='index'),
+    path('forumposts/add/', PostCreateView.as_view(), name='addPost'),
 ]

 app_name="forum"
\ No newline at end of file
--- a/widget_group3/forum/views.py
+++ b/widget_group3/forum/views.py
 from django.shortcuts import render
 from django.http import HttpResponse
 from .models import ForumPost, Reply
+from django.views.generic.edit import CreateView, UpdateView

 # Create your views here.
 def index(request):
    post_list = reversed(ForumPost.objects.all())
-    return render(request,"widget_group3/forum.html",{"posts":post_list})
+    return render(request,"forum/forum.html",{"posts":post_list})
+    
+class PostCreateView(CreateView):
+    model = ForumPost
+    fields = '__all__'
+    template_name = 'forum/forumpost-add.html'