Added lab3 changes to homepage

e6b25bc9 · John Tamano · 59c7eb01 · e6b25bc9 · e6b25bc9 · e6b25bc9
Commit e6b25bc9 authored 2 years ago by John Tamano
30 changed files
--- a/widget_group22/announcements/__pycache__/admin.cpython-38.pyc
+++ b/widget_group22/announcements/__pycache__/admin.cpython-38.pyc
--- a/widget_group22/announcements/__pycache__/models.cpython-38.pyc
+++ b/widget_group22/announcements/__pycache__/models.cpython-38.pyc
--- a/widget_group22/announcements/__pycache__/urls.cpython-38.pyc
+++ b/widget_group22/announcements/__pycache__/urls.cpython-38.pyc
--- a/widget_group22/announcements/__pycache__/views.cpython-38.pyc
+++ b/widget_group22/announcements/__pycache__/views.cpython-38.pyc
--- a/widget_group22/announcements/migrations/__pycache__/0001_initial.cpython-38.pyc
+++ b/widget_group22/announcements/migrations/__pycache__/0001_initial.cpython-38.pyc
--- a/widget_group22/announcements/migrations/__pycache__/0002_reaction.cpython-38.pyc
+++ b/widget_group22/announcements/migrations/__pycache__/0002_reaction.cpython-38.pyc
--- a/widget_group22/announcements/migrations/__pycache__/0003_announcement_author.cpython-38.pyc
+++ b/widget_group22/announcements/migrations/__pycache__/0003_announcement_author.cpython-38.pyc
--- a/widget_group22/announcements/migrations/__pycache__/0004_merge_20220407_0740.cpython-38.pyc
+++ b/widget_group22/announcements/migrations/__pycache__/0004_merge_20220407_0740.cpython-38.pyc
--- a/widget_group22/announcements/migrations/__pycache__/0005_reaction_announcement_and_more.cpython-38.pyc
+++ b/widget_group22/announcements/migrations/__pycache__/0005_reaction_announcement_and_more.cpython-38.pyc
--- a/widget_group22/assignments/__pycache__/views.cpython-38.pyc
+++ b/widget_group22/assignments/__pycache__/views.cpython-38.pyc
--- a/widget_group22/db.sqlite3
+++ b/widget_group22/db.sqlite3
--- a/widget_group22/forum/__pycache__/admin.cpython-38.pyc
+++ b/widget_group22/forum/__pycache__/admin.cpython-38.pyc
--- a/widget_group22/forum/__pycache__/models.cpython-38.pyc
+++ b/widget_group22/forum/__pycache__/models.cpython-38.pyc
--- a/widget_group22/forum/__pycache__/urls.cpython-38.pyc
+++ b/widget_group22/forum/__pycache__/urls.cpython-38.pyc
--- a/widget_group22/forum/__pycache__/views.cpython-38.pyc
+++ b/widget_group22/forum/__pycache__/views.cpython-38.pyc
--- a/widget_group22/forum/migrations/__pycache__/0003_reply.cpython-38.pyc
+++ b/widget_group22/forum/migrations/__pycache__/0003_reply.cpython-38.pyc
--- a/widget_group22/forum/migrations/__pycache__/0004_post_author_alter_reply_post.cpython-38.pyc
+++ b/widget_group22/forum/migrations/__pycache__/0004_post_author_alter_reply_post.cpython-38.pyc
--- a/widget_group22/forum/migrations/__pycache__/0005_reply_author.cpython-38.pyc
+++ b/widget_group22/forum/migrations/__pycache__/0005_reply_author.cpython-38.pyc
--- a/widget_group22/forum/migrations/__pycache__/0006_alter_post_author_alter_reply_author.cpython-38.pyc
+++ b/widget_group22/forum/migrations/__pycache__/0006_alter_post_author_alter_reply_author.cpython-38.pyc
--- a/widget_group22/homepage/__pycache__/models.cpython-38.pyc
+++ b/widget_group22/homepage/__pycache__/models.cpython-38.pyc
--- a/widget_group22/homepage/__pycache__/urls.cpython-38.pyc
+++ b/widget_group22/homepage/__pycache__/urls.cpython-38.pyc
--- a/widget_group22/homepage/__pycache__/views.cpython-38.pyc
+++ b/widget_group22/homepage/__pycache__/views.cpython-38.pyc
--- a/widget_group22/homepage/templates/homepage.html
+++ b/widget_group22/homepage/templates/homepage.html
-{% block content %}
-    <h1>WIDGET USERS:</h1>
-    {% for WidgetUser in displayWidgetUsers %}
-        <p>
-            {{WidgetUser.last_name}}, {{WidgetUser.first_name}} {{WidgetUser.middle_name}}: 
-            {{WidgetUser.id_num}}, {{WidgetUser.email}}, {{WidgetUser.department}}, {{WidgetUser.department.home_unit}}
-        </p>
-    {% endfor %}
-{% endblock %}
--- a/widget_group22/homepage/templates/homepage/homepage.html
+++ b/widget_group22/homepage/templates/homepage/homepage.html
+<html>
+    <h1>Welcome to Widget!</h1>
+    <p1>Widget Users:</p1>
+    <ol>
+    {% for WidgetUser in WidgetUsers %}
+        <p1>
+            <li><a href = "/users/{{ WidgetUser.id }}/details">{{WidgetUser.last_name}}, {{WidgetUser.first_name}} {{WidgetUser.middle_name}}</a></li>
+        </p1>
+    {% endfor %}
+    </ol>
+</html>
\ No newline at end of file
--- a/widget_group22/homepage/templates/users/details.html
+++ b/widget_group22/homepage/templates/users/details.html
+<p1>
+{{widgetuserdetails.last_name}},
+{{widgetuserdetails.first_name}} 
+{{widgetuserdetails.middle_name}} 
+<br>
+    <li>{{widgetuserdetails.id_num}}</li>
+    <li>{{widgetuserdetails.email}}</li>
+    <li>{{widgetuserdetails.department.dept_name}}</li>
+    <li>{{widgetuserdetails.department.home_unit}}</li>
+</p1>
+<img src="https://thumbs.dreamstime.com/b/default-avatar-profile-vector-user-profile-default-avatar-profile-vector-user-profile-profile-179376714.jpg" style="width: 100px;height: 100px;">
\ No newline at end of file
--- a/widget_group22/homepage/urls.py
+++ b/widget_group22/homepage/urls.py
 from django.urls import path
-from .views import displayWidgetUsers, index
+from .views import displayWidgetUsers, displayUserDetails

 urlpatterns = [
-    path('',displayWidgetUsers, name='displayWidgetUsers')
+    path('homepage/',displayWidgetUsers, name='displayWidgetUsers'),
+    path('users/<int:user_id>/details',displayUserDetails, name='displayUserDetails')
 ]

 app_name = "homepage"
\ No newline at end of file
--- a/widget_group22/homepage/views.py
+++ b/widget_group22/homepage/views.py
@@ -3,13 +3,32 @@ from django.shortcuts import render
 from django.template.loader import get_template
 from homepage.models import Department, WidgetUser
 from django.template import Template, Context
-from django.http import HttpResponse
+from django.http import Http404, HttpResponse
 from . import models


 def index(request):
    return HttpResponse('Welcome to Widget!')

+def displayWidgetUsers(request):
+    WidgetUsers = models.WidgetUser.objects.order_by("last_name")
+    context = {
+        "WidgetUsers": WidgetUsers
+    }
+    return render(request, "homepage/homepage.html", context)
+
+def displayUserDetails(request, user_id):
+    try:
+        widgetuserdetails = WidgetUser.objects.get(pk=user_id)
+    except WidgetUser.DoesNotExist:
+        raise Http404("This User Does Not Exist!")
+    context = {
+        "widgetuserdetails" : widgetuserdetails
+    }
+    return render(request, "users/details.html", context)
+
+
+'''
 def displayWidgetUsers(request):
    WidgetUsers = models.WidgetUser.objects.all()
    WidgetUserInfo = ""
@@ -24,5 +43,5 @@ def displayWidgetUsers(request):
        temp = last_name + ", " + first_name + " " + middle_name + ": " + id_number + ", " + email + ", " + dept + ", " + home_unit
        WidgetUserInfo +=  "<br>" + temp
    return HttpResponse("WIDGET USERS:\n" + WidgetUserInfo)
-
+'''
 # Create your views here.
--- a/widget_group22/widget_group22/__pycache__/settings.cpython-38.pyc
+++ b/widget_group22/widget_group22/__pycache__/settings.cpython-38.pyc
--- a/widget_group22/widget_group22/__pycache__/urls.cpython-38.pyc
+++ b/widget_group22/widget_group22/__pycache__/urls.cpython-38.pyc
--- a/widget_group22/widget_group22/urls.py
+++ b/widget_group22/widget_group22/urls.py
@@ -18,7 +18,7 @@ from django.urls import include, path

 urlpatterns = [
    path('admin/', admin.site.urls),
-    path('homepage/', include('homepage.urls', namespace="homepage")),
+    path('', include('homepage.urls', namespace="homepage")),
    path('announcements/', include('announcements.urls', namespace = "announcements")),
    path('forum/',include('forum.urls',namespace="forum")),
    path('assignments/', include('assignments.urls', namespace="assignments")),