Merge branch 'master' of https://gitlab.discs.ateneo.edu/fritzie.delpilar/midterm_CtrlF

widget_CtrlF/dashboard/models.py

 from django.db import models
+from django.urls import reverse
 
 
 class Department(models.Model):
@@ -16,4 +17,7 @@ class WidgetUser(models.Model):
     department = models.ForeignKey(Department, on_delete=models.CASCADE)
 
     def __str__(self):
-        return '{}, {} {}'.format(self.last_name, self.first_name, self.middle_name)    
\ No newline at end of file
+        return '{}, {} {}'.format(self.last_name, self.first_name, self.middle_name)    
+    
+    def get_absolute_url(self):
+        return reverse('dashboard:widgetuser-details', kwargs={'pk': self.pk})
\ No newline at end of file

widget_CtrlF/dashboard/templates/dashboard/dashboard.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block page-title %}Widget v2{% endblock %}
+
+{% block heading %} <h1> Welcome to Widget! </h1> {% endblock %}
+
+{% block content %}
+<p>
+    Widget Users:<br>
+    {% for user in users %}
+    <a href="{{ user.get_absolute_url }}">{{ user.last_name }}, {{ user.first_name }}</a><br>
+    {% endfor %}
+</p>
+{% endblock %}
+
+{% block footing %}
+<p class="centerB">
+    <a href="{% url 'dashboard:widgetuser-create' %}">
+        <button class="btn add">Add Widget User</button>
+     </a>
+</p>
+<p>
+    <a href="/announcement_board/" class="link">Announcement Board</a><br>
+    <a href="/forum/" class="link">Forum</a><br>
+
+</p>
+{% endblock %}
\ No newline at end of file

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

+{% extends 'base.html' %}
+{% load static %}
+
+{% block page-title %}Add Widget User{% endblock %}
+
+{% block heading %} <h1> Add a new Widget User: </h1> {% endblock %}
+
+{% block content %}
+<form method="post">
+    {% csrf_token %}
+    {{ form.as_p }}
+    <p class="centerB">
+        <input class="submitB" type="submit" value="Add Widget User">
+    </p> 
+</form>
+{% endblock %}
\ No newline at end of file

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

+{% extends 'base.html' %}
+{% load static %}
+
+{% block page-title %}{{ object.last_name }}, {{ object.first_name }}{% endblock %}
+
+{% block heading %} <h1> {{ object.first_name }} {{ object.middle_name }} {{ object.last_name }} </h1> {% endblock %}
+
+{% block content %}
+<p>
+    {{ object.department.dept_name }}<br>
+    {{ object.department.home_unit }}<br>
+</p>
+{% endblock %}
+
+{% block footing %}
+<p class="centerB">
+    <a href="{% url 'dashboard:widgetuser-update' object.pk %}">
+        <button class="btn edit">Edit Widget User</button>
+    </a>
+</p>
+{% endblock %}
\ No newline at end of file

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

+{% extends 'base.html' %}
+{% load static %}
+
+{% block page-title %}Edit Widget User{% endblock %}
+
+{% block heading %} <h1> Edit Widget User: </h1> {% endblock %}
+
+{% block content %}
+<form method="post">
+    {% csrf_token %}
+    {{ form.as_p }}
+    <p class="centerB">
+        <input class="submitB" type="submit" value="Save Changes to Widget User">
+    </p>
+</form>
+{% endblock %}
\ No newline at end of file

widget_CtrlF/dashboard/urls.py

 from django.urls import path
 
-from .views import index
+from .views import (dashboard, WidgetUserDetailView, WidgetUserCreateView, WidgetUserUpdateView)
 
 urlpatterns = [
-    path('', index, name='index'),
+    path ('dashboard/', dashboard, name='dashboard'),
+    path ('widgetusers/<int:pk>/details', WidgetUserDetailView.as_view(), name='widgetuser-details'),
+    path ('widgetusers/add', WidgetUserCreateView.as_view(), name='widgetuser-create'),
+    path ('widgetusers/<int:pk>/edit', WidgetUserUpdateView.as_view(), name='widgetuser-update')
 ]
 
 app_name = "dashboard"
\ No newline at end of file

widget_CtrlF/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
+from .models import WidgetUser
 
 
-def index (request):
-    return_string = '<p>Welcome to Widget!</p> WIDGET USERS:<br>'
-    for user in WidgetUser.objects.all():
-        return_string += '{}, {} {}: {}, {}<br>'.format(
-            user.last_name, user.first_name, user.middle_name, user.department.dept_name, user.department.home_unit
-            )
-    html_string = '<html><body>{}</body></html>'.format(return_string)
-    return HttpResponse(html_string)
\ No newline at end of file
+def dashboard(request):
+    users = WidgetUser.objects.all()
+    return render(request, 'dashboard/dashboard.html', {'users': users})
+
+
+class WidgetUserDetailView(DetailView):
+    model = WidgetUser
+    template_name = 'dashboard/widgetuser-details.html'
+
+
+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'

widget_CtrlF/forum/migrations/0004_merge_20230516_0026.py

+# Generated by Django 4.2.1 on 2023-05-15 16:26
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('forum', '0002_auto_20230306_0546'),
+        ('forum', '0003_alter_reply_pub_datetime'),
+    ]
+
+    operations = [
+    ]

widget_CtrlF/widget_CtrlF/urls.py

@@ -19,6 +19,6 @@ from django.urls import path, include
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('announcement_board/', include('announcement_board.urls', namespace='announcement_board')),
-    path('dashboard/', include('dashboard.urls', namespace="dashboard")),
+    path('', include('dashboard.urls', namespace="dashboard")),
     path('forum/', include('forum.urls', namespace="forum")),
 ]