SS-643 Users can edit their account details

common/forms.py

@@ -113,6 +113,7 @@ class UserForm(BootstrapErrorFormMixin, UserCreationForm):
             "Swedish university</a> email address. If you are not affiliated with a Swedish university, "
             "your account request will be reviewed manually."
         ),
+        #disabled = True,
     )
     password1 = forms.CharField(
         min_length=8,
@@ -321,3 +322,85 @@ class Meta:
         fields = [
             "token",
         ]
+
+
+class UserEditForm(BootstrapErrorFormMixin, forms.ModelForm):
+    first_name = forms.CharField(
+        min_length=1,
+        max_length=30,
+        label="First name",
+        widget=forms.TextInput(attrs={"class": "form-control"}),
+
+    )
+    last_name = forms.CharField(
+        min_length=1,
+        max_length=30,
+        label="Last name",
+        widget=forms.TextInput(attrs={"class": "form-control"}),
+    )
+    email = forms.EmailField(
+        max_length=254,
+        label="Email",
+        widget=forms.TextInput(attrs={"class": "form-control"}),
+        help_text=mark_safe(
+            "Email address can not be changed. Please email [email protected] with any questions."
+        ),
+        disabled = True,
+    )
+
+
+    required_css_class = "required"
+
+    class Meta:
+        model = User
+        fields = [
+            "username",
+            "first_name",
+            "last_name",
+            "email",
+            "password1",
+            "password2",
+        ]
+        exclude = [
+            "username",
+            "password1",
+            "password2",
+        ]
+
+    def __repr__(self) -> str:
+        return f"{self.__class__.__name__}({self.data})"
+
+
+class ProfileEditForm(BootstrapErrorFormMixin, forms.ModelForm):
+    affiliation = forms.ChoiceField(
+        widget=forms.Select(attrs={"class": "form-control"}),
+        label="University",
+        choices=UNIVERSITIES,
+        help_text="Affiliation can not be changed. Please email [email protected] with any questions.",
+        disabled = True,
+    )
+    department = forms.CharField(
+        widget=ListTextWidget(data_list=DEPARTMENTS, name="department-list", attrs={"class": "form-control"}),
+        label="Department",
+        required=False,
+        help_text="Select closest department name or enter your own.",
+    )
+
+    required_css_class = "required"
+
+    class Meta:
+        model = UserProfile
+        fields = [
+            "affiliation",
+            "department",
+            "note",
+            "why_account_needed",
+        ]
+        exclude = [
+            "note",
+            "why_account_needed",
+        ]
+
+    def __repr__(self):
+        return f"{self.__class__.__name__}({self.data})"
+

common/urls.py

@@ -9,4 +9,5 @@
     path("success/", views.RegistrationCompleteView.as_view(), name="success"),
     path("signup/", views.SignUpView.as_view(), name="signup"),
     path("verify/", views.VerifyView.as_view(), name="verify"),
+    path("edit-profile/", views.EditProfileView.as_view(), name="edit-profile"),
 ]

common/views.py

@@ -4,13 +4,17 @@
 from django.core.mail import send_mail
 from django.db import transaction
 from django.http.response import HttpResponseRedirect
-from django.shortcuts import redirect, render
+from django.shortcuts import redirect, render, HttpResponse
 from django.urls import reverse_lazy
 from django.views.generic import CreateView, TemplateView
+from django.views.generic.edit import UpdateView
+from django.core.exceptions import ObjectDoesNotExist
+from studio.utils import get_logger
 
-from .forms import ProfileForm, SignUpForm, TokenVerificationForm, UserForm
-from .models import EmailVerificationTable
+from .forms import ProfileForm, SignUpForm, TokenVerificationForm, UserForm, ProfileEditForm, UserEditForm
+from .models import EmailVerificationTable, UserProfile
 
+logger = get_logger(__name__)
 
 # Create your views here.
 class HomeView(TemplateView):
@@ -129,3 +133,80 @@ def post(self, request, *args, **kwargs):
                 messages.error(request, "Invalid token!")
                 return redirect("portal:home")
         return render(request, self.template_name, {"form": form})
+
+
+class EditProfileView(TemplateView):
+    """
+
+    """
+    template_name = "registration/edit_profile.html"
+
+    profile_edit_form_class = ProfileEditForm
+    user_edit_form_class= UserEditForm
+
+    def get_user_profile_info(self, request):
+         # Get the user profile
+        try:
+        # Note that not all users have a user profile object
+        # such as the admin superuser
+            user_profile_data = UserProfile.objects.get(user_id=request.user.id)
+        except ObjectDoesNotExist as e:
+            logger.error(str(e), exc_info=True)
+            user_profile = UserProfile()
+        except Exception as e:
+            logger.error(str(e), exc_info=True)
+            user_profile = UserProfile()
+
+        return user_profile_data
+
+
+    def get(self, request, *args, **kwargs):
+
+        user_profile_data = self.get_user_profile_info(request)
+
+        profile_edit_form = self.profile_edit_form_class(initial={
+                                                    "affiliation" : user_profile_data.affiliation,
+                                                    "department" : user_profile_data.department
+                                                 }) 
+        user_edit_form = self.user_edit_form_class(initial={
+                                                    "email" : user_profile_data.user.email,
+                                                    "first_name" : user_profile_data.user.first_name,
+                                                    "last_name" : user_profile_data.user.last_name
+                                                 }) 
+
+        return render(request, self.template_name, {"form": user_edit_form, "profile_form": profile_edit_form})
+
+    def post(self, request, *args, **kwargs):
+
+        user_profile_data = self.get_user_profile_info(request)
+
+        user_form_details = self.user_edit_form_class(request.POST, instance=request.user, initial={
+                                                    "email" : user_profile_data.user.email,})
+
+        profile_form_details = self.profile_edit_form_class(request.POST, instance=user_profile_data, initial={
+                                                   "affiliation" : user_profile_data.affiliation,})
+
+        if user_form_details.is_valid() and profile_form_details.is_valid():
+
+            user_form_details.save()
+            profile_form_details.save()
+
+
+            #logger.info(user_form_details.cleaned_data, exc_info=True)
+
+            logger.info("Updated First Name: "+str(self.get_user_profile_info(request).user.first_name), exc_info=True)
+            logger.info("Updated Last Name: "+str(self.get_user_profile_info(request).user.last_name), exc_info=True)
+            logger.info("Updated Department: "+str(self.get_user_profile_info(request).department), exc_info=True)
+
+            return render(request, "registration/edit_profile_done.html")
+
+        else:
+
+            # Redirect back to the same page if the data
+            # was invalid
+
+            #print (form.errors)
+            logger.error("Edit user error: " + str(user_form_details.errors), exc_info=True)
+            logger.error("Edit profile error: " + str(profile_form_details.errors), exc_info=True)
+
+            return render(request, self.template_name, {"form": user_form_details, "profile_form": profile_form_details})

templates/common/navbar.html

@@ -45,6 +45,7 @@
                         </button>
                         <ul class="dropdown-menu">
                             <li><a class="dropdown-item" href="{% url 'user-profile' %}"><i class="bi bi-person me-1"></i>My profile</a></li>
+                            <li><a class="dropdown-item" href="{% url 'common:edit-profile' %}"><i class="bi bi-person me-1"></i>Edit profile</a></li>
                             <li><a class="dropdown-item" href="{% url 'password_change' %}"><i class="bi bi-key me-1"></i>Change password</a></li>
                             <form action="{% url 'logout' %}" method="post">
                                 {% csrf_token %}

templates/registration/edit_profile.html

@@ -0,0 +1,118 @@
+{% extends 'base.html' %}
+
+{% block title %}Edit your Profile{% endblock %}
+
+{% load static %}
+{% load is_login_signup_disabled %}
+{% block extra_scripts %}
+	<script src="{% static 'js/form-helpers.js' %}"></script>
+{% endblock %}
+
+
+{% block content %}
+<div class="container">
+    {% if not maintenance_mode|is_login_signup_disabled %}
+    <div class="card border-0 shadow-lg my-5">
+        <div class="card-body p-0">
+            <!-- Nested Row within Card Body -->
+            <div class="row">
+                <div class="col-xs-12 col-lg-8 offset-lg-2">
+                    <div class="px-3 py-5">
+                        <div class="row">
+                            <div class="col">
+								<div class="col">
+								<h2 class="text-dark mb-4 text-center">Edit your Profile</h2>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="mw-30 m-auto pt-1">
+                            <form method="post">
+                                {% csrf_token %}
+                                <div class="row pb-3">
+                                    <div class="col-12">
+                                        <label class="form-label">{{form.email.label_tag}}</label>
+                                        {{form.email}}
+                                        <div class="form-text">{{form.email.help_text}}</div>
+                                        {% if form.email.errors %}
+                                        <div id="validation_email" class="invalid-feedback pt-1">
+                                            {% for error in form.email.errors %}
+                                            <p class="m-0">{{error|escape}}</p>
+                                            {% endfor %}
+                                        </div>
+                                        {% endif %}
+                                    </div>
+                                </div>
+                                <div class="row pb-3">
+                                    <div class="col-12 col-md-6 pb-3 pb-md-0">
+                                        <label class="form-label">{{form.first_name.label_tag}}</label>
+                                        {{form.first_name}}
+                                    {% if form.first_name.errors %}
+                                    <div class="form-text">{{form.first_name.help_text}}</div>
+                                    <div id="validation_first_name" class="invalid-feedback pt-1">
+                                        {% for error in form.first_name.errors %}
+                                          <p class="m-0">{{error|escape}}</p>
+                                        {% endfor %}
+                                    </div>
+                                    {% endif %}
+                                    </div>
+                                    <div class="col-12 col-md-6 pb-3 pb-md-0">
+                                        <label class="form-label">{{form.last_name.label_tag}} </label>
+                                        {{form.last_name}} 
+                                        <div class="form-text">{{form.last_name.help_text}}</div>
+                                      {% if form.last_name.errors %}
+                                      <div id="validation_last_name" class="pt-1 invalid-feedback">
+                                          {% for error in form.last_name.errors %}
+                                          <p class="m-0">{{error|escape}}</p>
+                                          {% endfor %}
+                                      </div>
+                                      {% endif %}
+                                    </div>
+                                </div>
+
+								<div class="row pb-3">
+                                    <div class="col-12 col-md-6 pb-3 pb-md-0">
+                                        <label class="form-label">{{profile_form.affiliation.label_tag}}</label>
+										{{ profile_form.affiliation }}
+                                        <div class="form-text">{{profile_form.affiliation.help_text}}</div>
+                                      {% if profile_form.affiliation.errors %}
+                                        <div id="validation_affiliation" class="pt-1 invalid-feedback">
+                                            {% for error in profile_form.affiliation.errors %}
+                                            <p class="m-0">{{error|escape}}</p>
+                                            {% endfor %}
+                                        </div>
+                                      {% endif %}
+									</div>
+										<div class="col-12 col-md-6 pb-3 pb-md-0">
+                                        <label class="form-label">{{profile_form.department.label_tag}}</label>
+										{{ profile_form.department | safe }}
+                                        <div class="form-text">{{profile_form.department.help_text}}</div>
+                                      {% if profile_form.department.errors %}
+                                        <div id="validation_department" class="pt-1 invalid-feedback">
+                                            {% for error in profile_form.department.errors %}
+                                            <p class="m-0">{{error|escape}}</p>
+                                            {% endfor %}
+                                        </div>
+                                      {% endif %}
+																		</div>
+																</div>
+                                <div class="row">
+                                    <div class="d-flex justify-content-end">
+
+                                        <a href="/" class="btn me-2">Cancel</a>
+                                        <input type="submit" name="save" value="Submit" class="btn btn-primary ms-2"
+                                            id="submit-id-save">
+                                    </div>
+                                </div>
+                            </form>
+                        </div>
+
+                        <hr>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    {% endif %}
+</div>
+{% endblock %}

templates/registration/edit_profile_done.html

@@ -0,0 +1,28 @@
+{% extends 'base.html' %}
+{% block title %}Change profile{% endblock %}
+
+{% block content %}
+    <!-- Begin Page Content -->
+    <div class="container">
+        <!-- Main Content Here -->
+        <div class="card o-hidden border-0 shadow-lg my-5">
+          <div class="card-body p-0">
+            <div class="row">
+              <div class="col-lg-3"></div>
+              <div class="col-lg-6">
+                <div class="p-5">
+                  <div class="text-center">
+                    <h1 class="h4 text-gray-900 mb-4">Profile editedd</h1>
+                  </div>
+                  <div class="text-center">
+                    <p>Your profile has been edited successfully!</p>
+                    <a class="btn btn-primary" href="{% url 'projects:index' %}">Go to dashboard</a>
+                    <hr >
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+    </div>
+{% endblock content %}

templates/user/profile.html

@@ -11,8 +11,14 @@
         <div class="card-body">
             <div class="row">
                 <div class="col">
-                    <h3 class="card-title mb-0">My user profile</h3>
-
+                    <div class="row">
+                        <div class="col">
+                        <h3 class="card-title mb-0">My user profile</h3>
+                        </div>
+                        <div class="col">
+                        <button type="button" type="submit" aria-expanded="false" class="btn btn-profile"><a href="{% url 'common:edit-profile' %}">Edit</a></button>
+                        </div>
+                        </div>
                     <div class="row pt-4">
                         <h6 class="fw-bold">Account</h6>
                     </div>