ross/penracourses
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add functionality to create linked supervisor account when creating a user

Browse Source
This commit is contained in:
Ross
2026-06-15 11:32:21 +01:00
parent 1f0877964b
commit c52cf46d65
5 changed files with 144 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generic/forms.py
+7 -1
View File
@@ -12,7 +12,7 @@ from django.forms import (
DateField,
SplitDateTimeField,
SplitDateTimeWidget,
BooleanField,
)
from django.forms import inlineformset_factory
from atlas.models import CaseCollection
@@ -812,6 +812,12 @@ class UserUserForm(Form):
first_name = CharField(max_length=255, required=True)
last_name = CharField(max_length=255, required=True)
grade = ModelChoiceField(UserGrades.objects.all(), required=False)
create_supervisor = BooleanField(
required=False,
label="Create linked supervisor account",
help_text="If checked, a supervisor profile with this user's name and email will be automatically created.",
initial=False,
)
class TraineeForm(Form):
generic/templates/generic/trainee_creation_form.html
+36 -24
View File
@@ -1,30 +1,42 @@
{% extends "generic/base.html" %}
<!-- {% load static from static %} -->
{% load crispy_forms_tags %}
{% block css %}
{% endblock %}
{% block js %}
<!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
{{form.media}}
<script type="text/javascript">
</script>
<!-- {{ form.media }} -->
{{ form.media }}
{% endblock %}
{% block content %}
<h2>Create Trainee</h2>
Use this form to create a user. Only existing supervisors can be added (<a href="{% url 'generic:supervisor_create' %}">create them first</a> and refresh this page or add them later if they do not exist).
{% if errors %}
<div class="alert alert-info" role="alert">{{errors}}</a></div>
{% endif %}
<form action="" method="post" enctype="multipart/form-data" id="condition-form">
{% csrf_token %}
<table>
{{ form|crispy }}
</table>
<input type="submit" class="submit-button" value="Submit" name="submit">
</form>
{% block content %}
<div class="container py-4">
<div class="row justify-content-center">
<div class="col-md-8">
<div class="card shadow-sm border border-secondary border-opacity-20">
<div class="card-header bg-primary text-white py-3">
<h4 class="mb-0"><i class="bi bi-person-plus me-2"></i>Create Trainee</h4>
</div>
<div class="card-body p-4">
<p class="text-muted mb-4">Use this form to create a user. Only existing supervisors can be added (if they don't exist, <a href="{% url 'generic:supervisor_create' %}" class="fw-bold">create them first</a> and refresh this page or add them later).</p>
{% if errors %}
<div class="alert alert-danger" role="alert">
<i class="bi bi-exclamation-triangle-fill me-2"></i>{{ errors }}
</div>
{% endif %}
<form action="" method="post" enctype="multipart/form-data" id="condition-form">
{% csrf_token %}
{{ form|crispy }}
<div class="mt-4 d-flex justify-content-between">
<a href="{% url 'accounts_list' %}" class="btn btn-outline-secondary">
<i class="bi bi-x-lg me-1"></i>Cancel
</a>
<button type="submit" class="btn btn-primary px-4">
<i class="bi bi-check-lg me-1"></i>Create Trainee
</button>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
{% endblock %}
generic/templates/generic/user_creation_form.html
+35 -23
View File
@@ -1,30 +1,42 @@
{% extends "generic/base.html" %}
<!-- {% load static from static %} -->
{% load crispy_forms_tags %}
{% block css %}
{% endblock %}
{% block js %}
<!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
{{form.media}}
<script type="text/javascript">
</script>
<!-- {{ form.media }} -->
{{ form.media }}
{% endblock %}
{% block content %}
<h2>Create User</h2>
Use this form to create a user. Create a trainee <a href="{% url 'create_trainee' %}">here</a>.
{% if errors %}
<div class="alert alert-info" role="alert">{{errors}}</a></div>
{% endif %}
<form action="" method="post" enctype="multipart/form-data" id="condition-form">
{% csrf_token %}
<table>
{{ form|crispy }}
</table>
<input type="submit" class="submit-button" value="Submit" name="submit">
</form>
{% block content %}
<div class="container py-4">
<div class="row justify-content-center">
<div class="col-md-8">
<div class="card shadow-sm border border-secondary border-opacity-20">
<div class="card-header bg-primary text-white py-3">
<h4 class="mb-0"><i class="bi bi-person-plus me-2"></i>Create User</h4>
</div>
<div class="card-body p-4">
<p class="text-muted mb-4">Use this form to create a new user. To create a trainee instead, click <a href="{% url 'create_trainee' %}" class="fw-bold">here</a>.</p>
{% if errors %}
<div class="alert alert-danger" role="alert">
<i class="bi bi-exclamation-triangle-fill me-2"></i>{{ errors }}
</div>
{% endif %}
<form action="" method="post" enctype="multipart/form-data" id="condition-form">
{% csrf_token %}
{{ form|crispy }}
<div class="mt-4 d-flex justify-content-between">
<a href="{% url 'accounts_list' %}" class="btn btn-outline-secondary">
<i class="bi bi-x-lg me-1"></i>Cancel
</a>
<button type="submit" class="btn btn-primary px-4">
<i class="bi bi-check-lg me-1"></i>Create User
</button>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
{% endblock %}
generic/views.py
+14 -1
View File
@@ -5948,9 +5948,22 @@ def create_user(request, context=None, trainee: bool = False):
if trainee and form.cleaned_data.get("supervisor"):
supervisor = form.cleaned_data["supervisor"]
user_profile.supervisor = supervisor
user_profile.save()
if not trainee and form.cleaned_data.get("create_supervisor"):
from generic.models import Supervisor
supervisor, created = Supervisor.objects.get_or_create(
email=new_user.email,
defaults={
"name": f"{new_user.first_name} {new_user.last_name}".strip(),
"user": new_user,
}
)
if not created and not supervisor.user:
supervisor.user = new_user
supervisor.name = f"{new_user.first_name} {new_user.last_name}".strip()
supervisor.save(update_fields=["user", "name"])
except Exception as error:
errors = f"Unable to create account profile {error}"
return render(