feat: Allow editing the portal profile (#65)

Author: Mr-Sunglasses

portal_account/views.py

@@ -34,8 +34,13 @@ def get_form_kwargs(self):
         kwargs.update({"user": self.request.user})
         return kwargs
 
-
 class PortalProfileUpdate(UpdateView):
     model = PortalProfile
-    fields = "__all__"
+    template_name = "portal_account/portalprofile_form.html"
     success_url = reverse_lazy("index")
+    form_class = PortalProfileForm
+
+    def get_form_kwargs(self):
+        kwargs = super(PortalProfileUpdate, self).get_form_kwargs()
+        kwargs.update({"user": self.request.user})
+        return kwargs

templates/portal_account/index.html

@@ -13,7 +13,8 @@ <h1 class="display-5">Account Management</h1>
     <hr>
     <h1 class="display-5">Your Portal Profile</h1>
     {% if profile_id %}
-        <a class="btn btn-primary btn-lg" role="button" href="{% url 'portal_account:portal_profile_detail' profile_id%}">View my profile</a>
+        <a class="btn btn-primary btn-lg" role="button" href="{% url 'portal_account:portal_profile_detail' profile_id %}">View my profile</a>
+        <a class="btn btn-secondary btn-lg" role="button" href="{% url 'portal_account:portal_profile_edit' profile_id %}">Edit profile</a>
     {% else %}
     <p class="col-md-8 fs-4">
         Your profile is not complete. Please complete your profile before proceeding.

templates/portal_account/portalprofile_detail.html

@@ -5,11 +5,38 @@
 {% block body %}
 {% endblock %}
 {% block content %}
-    <h1>Your Profile</h1>
-    <div>
-    {% bootstrap_label object.user.username %}
+    <h1 class="display-5 mb-4">Your Portal Profile</h1>
+    
+    <div class="card mb-4">
+        <div class="card-header">
+            <h5 class="card-title mb-0">Basic Information</h5>
+        </div>
+        <div class="card-body">
+            <div class="row mb-3">
+                <div class="col-md-3 fw-bold">Username:</div>
+                <div class="col-md-9">{{ object.user.username }}</div>
+            </div>
+            <div class="row mb-3">
+                <div class="col-md-3 fw-bold">Name:</div>
+                <div class="col-md-9">{{ object.user.first_name }} {{ object.user.last_name }}</div>
+            </div>
+            <div class="row mb-3">
+                <div class="col-md-3 fw-bold">Email:</div>
+                <div class="col-md-9">{{ object.user.email }}</div>
+            </div>
+            <div class="row mb-3">
+                <div class="col-md-3 fw-bold">Pronouns:</div>
+                <div class="col-md-9">{{ object.pronouns|default:"Not specified" }}</div>
+            </div>
+            <div class="row mb-3">
+                <div class="col-md-3 fw-bold">Code of Conduct Agreement:</div>
+                <div class="col-md-9">{% if object.coc_agreement %}Agreed{% else %}Not agreed{% endif %}</div>
+            </div>
+        </div>
+    </div>
+    
+    <div class="mt-4">
+        <a class="btn btn-primary" href="{% url 'portal_account:portal_profile_edit' object.pk %}">Edit Profile</a>
+        <a class="btn btn-secondary" href="{% url 'portal_account:index' %}">Back to Account Management</a>
     </div>
-    {% bootstrap_label object.user.first_name %}
-    {% bootstrap_label object.user.last_name %}
-
 {% endblock %}

templates/portal_account/portalprofile_edit.html

@@ -0,0 +1,29 @@
+{% extends "portal/base.html" %}
+{% load allauth i18n %}
+{% load django_bootstrap5 %}
+
+{% block body %}
+{% endblock %}
+{% block content %}
+    <main>
+        <h1 class="display-5">Edit your Portal Profile</h1>
+        <p class="lead">
+            Update your portal profile information below.
+        </p>
+        <div class="row g-5">
+            {% bootstrap_form_errors form %}
+            <form action="{% url 'portal_account:portal_profile_edit' object.pk %}" method="post" class="form">{% csrf_token %}
+                {% bootstrap_field form.username %}
+                {% bootstrap_field form.first_name %}
+                {% bootstrap_field form.last_name %}
+                {% bootstrap_field form.email %}
+                {% bootstrap_field form.pronouns %}
+                {% bootstrap_field form.coc_agreement %}
+                <div class="mt-4">
+                    <input type="submit" value="Update Profile" class="btn btn-primary" />
+                    <a href="{% url 'portal_account:portal_profile_detail' object.pk %}" class="btn btn-secondary">Cancel</a>
+                </div>
+            </form>
+        </div>
+    </main>
+{% endblock %}

templates/portal_account/portalprofile_form.html

@@ -6,20 +6,27 @@
 {% endblock %}
 {% block content %}
     <main>
-        <h1 class="display-5">Create your Portal Profile</h1>
+        <h1 class="display-5">{% if object.pk %}Edit{% else %}Create{% endif %} your Portal Profile</h1>
         <p class="lead">
-            Please complete your portal profile before proceeding.
+            {% if object.pk %}Update your portal profile information below.{% else %}Please complete your portal profile before proceeding.{% endif %}
         </p>
         <div class="row g-5">
             {% bootstrap_form_errors form %}
-            <form action="{% url 'portal_account:portal_profile_new' %}" method="post" class="form">{% csrf_token %}
+            <form action="{% if object.pk %}{% url 'portal_account:portal_profile_edit' object.pk %}{% else %}{% url 'portal_account:portal_profile_new' %}{% endif %}" method="post" class="form">{% csrf_token %}
                 {% bootstrap_field form.username %}
                 {% bootstrap_field form.first_name %}
                 {% bootstrap_field form.last_name %}
                 {% bootstrap_field form.email %}
                 {% bootstrap_field form.pronouns %}
                 {% bootstrap_field form.coc_agreement %}
-                <input type="submit" value="Submit" />
+                <div class="mt-4">
+                    <input type="submit" value="{% if object.pk %}Update Profile{% else %}Create Profile{% endif %}" class="btn btn-primary" />
+                    {% if object.pk %}
+                    <a href="{% url 'portal_account:portal_profile_detail' object.pk %}" class="btn btn-secondary">Cancel</a>
+                    {% else %}
+                    <a href="{% url 'portal_account:index' %}" class="btn btn-secondary">Cancel</a>
+                    {% endif %}
+                </div>
             </form>
 {#                <form class="needs-validation" novalidate="">#}
 {#                  <div class="row g-3">#}