Skip to content

Commit b09d5c7

Browse files
KevinEtchellsKevinEtchells
committed
Remove unrequired questions/steps from the sign-up process
1 parent cf9f784 commit b09d5c7

File tree

11 files changed

+152
-995
lines changed

11 files changed

+152
-995
lines changed

‎django_app/redbox_app/redbox_core/models.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -453,17 +453,17 @@ class DurationTasks(models.TextChoices):
453453
# Additional fields for sign-up form
454454
# Page 1
455455
role = models.TextField(null=True, blank=True)
456-
# Page 2
456+
# Archived (old Page 2)
457457
accessibility_options = models.CharField(null=True, blank=True, max_length=64, choices=AccessibilityOptions)
458458
accessibility_categories = models.CharField(null=True, blank=True, max_length=64, choices=AccessibilityCategories)
459459
accessibility_description = models.TextField(null=True, blank=True)
460-
# Page 3
460+
# Archived (old Page 3)
461461
digital_confidence = models.CharField(null=True, blank=True, max_length=128, choices=DigitalConfidence)
462462
usage_at_work = models.CharField(null=True, blank=True, max_length=64, choices=RegularityAI)
463463
usage_outside_work = models.CharField(null=True, blank=True, max_length=64, choices=RegularityAI)
464464
how_useful = models.CharField(null=True, blank=True, max_length=64, choices=Usefulness)
465465
redbox_tasks = models.TextField(null=True, blank=True)
466-
# Page 4
466+
# Archived (old Page 4)
467467
task_1_description = models.TextField(null=True, blank=True)
468468
task_1_regularity = models.TextField(null=True, blank=True)
469469
task_1_duration = models.TextField(null=True, blank=True)
@@ -476,7 +476,7 @@ class DurationTasks(models.TextChoices):
476476
task_3_regularity = models.TextField(null=True, blank=True)
477477
task_3_duration = models.TextField(null=True, blank=True)
478478
task_3_consider_using_ai = models.CharField(null=True, blank=True, max_length=64, choices=ConsiderUsingAI)
479-
# Page 5
479+
# Archived (old Page 5)
480480
role_regularity_summarise_large_docs = models.CharField(
481481
null=True, blank=True, max_length=32, choices=RegularityTasks
482482
)
@@ -497,7 +497,7 @@ class DurationTasks(models.TextChoices):
497497
role_duration_specific_template = models.CharField(null=True, blank=True, max_length=32, choices=DurationTasks)
498498
role_duration_shorten_docs = models.CharField(null=True, blank=True, max_length=32, choices=DurationTasks)
499499
role_duration_write_docs = models.CharField(null=True, blank=True, max_length=32, choices=DurationTasks)
500-
# Page 6
500+
# Page 3 (old Page 6)
501501
consent_research = models.BooleanField(null=True, blank=True, default=False)
502502
consent_interviews = models.BooleanField(null=True, blank=True, default=False)
503503
consent_feedback = models.BooleanField(null=True, blank=True, default=False)

‎django_app/redbox_app/redbox_core/views/__init__.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from redbox_app.redbox_core.views.info_views import accessibility_statement_view, privacy_notice_view, support_view
2323
from redbox_app.redbox_core.views.misc_views import SecurityTxtRedirectView, health, homepage_view
2424
from redbox_app.redbox_core.views.ratings_views import RatingsView
25-
from redbox_app.redbox_core.views.signup_views import Signup1, Signup2, Signup3, Signup4, Signup5, Signup6, Signup7
25+
from redbox_app.redbox_core.views.signup_views import Signup1, Signup2, Signup3, Signup4
2626

2727
__all__ = [
2828
"ChatsTitleView",
@@ -49,9 +49,6 @@
4949
"Signup2",
5050
"Signup3",
5151
"Signup4",
52-
"Signup5",
53-
"Signup6",
54-
"Signup7",
5552
"report_app",
5653
"UpdateChatFeedback",
5754
"DeleteChat",

‎django_app/redbox_app/redbox_core/views/signup_views.py

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,6 @@ class Signup3(AbstractSignup):
6868
current_page = "sign-up-page-3"
6969
next_page = "sign-up-page-4"
7070

71-
72-
class Signup4(AbstractSignup):
73-
current_page = "sign-up-page-4"
74-
next_page = "sign-up-page-5"
75-
76-
77-
class Signup5(AbstractSignup):
78-
current_page = "sign-up-page-5"
79-
next_page = "sign-up-page-6"
80-
81-
82-
class Signup6(AbstractSignup):
83-
current_page = "sign-up-page-6"
84-
next_page = "sign-up-page-7"
85-
8671
def post(self, request: HttpRequest) -> HttpResponse:
8772
if not settings.ALLOW_SIGN_UPS:
8873
return redirect("homepage")
@@ -108,13 +93,13 @@ def post(self, request: HttpRequest) -> HttpResponse:
10893
for field_name, field_value in form.cleaned_data.items():
10994
setattr(user, field_name, field_value)
11095
user.save()
111-
return redirect("sign-up-page-7")
96+
return redirect("sign-up-page-4")
11297
else:
113-
return render(request, "sign-up-page-6.html", {"form": form})
98+
return render(request, "sign-up-page-3.html", {"form": form})
11499

115100

116-
class Signup7(View):
101+
class Signup4(View):
117102
def get(self, request: HttpRequest) -> HttpResponse:
118103
if not settings.ALLOW_SIGN_UPS:
119104
return redirect("homepage")
120-
return render(request, "sign-up-page-7.html")
105+
return render(request, "sign-up-page-4.html")

‎django_app/redbox_app/templates/sign-up-page-1.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<div class="govuk-grid-row">
1010
<div class="govuk-grid-column-two-thirds">
1111
<h1 class="govuk-heading-l govuk-!-margin-bottom-3">Sign up to Redbox</h1>
12-
<p class="govuk-body-l">Step 1 of 6</p>
12+
<p class="govuk-body-l">Step 1 of 3</p>
1313
</div>
1414
</div>
1515

‎django_app/redbox_app/templates/sign-up-page-2.html

Lines changed: 11 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% set pageTitle = "Accessibility" %}
1+
{% set pageTitle = "Digital Confidence" %}
22
{% extends "base.html" %}
33
{% from "macros/govuk-button.html" import govukButton %}
44

@@ -8,8 +8,8 @@
88

99
<div class="govuk-grid-row">
1010
<div class="govuk-grid-column-two-thirds">
11-
<h1 class="govuk-heading-l govuk-!-margin-bottom-3">Accessibility</h1>
12-
<p class="govuk-body-l">Step 2 of 6</p>
11+
<h1 class="govuk-heading-l govuk-!-margin-bottom-3">Digital Confidence</h1>
12+
<p class="govuk-body-l">Step 2 of 3</p>
1313
</div>
1414
</div>
1515

@@ -34,62 +34,30 @@ <h1 class="govuk-heading-l govuk-!-margin-bottom-3">Accessibility</h1>
3434
<div class="govuk-form-group">
3535
<fieldset class="govuk-fieldset">
3636
<legend class="govuk-fieldset__legend">
37-
{{ form.accessibility_options.label }}
37+
{{ form.ai_experience.label }}
3838
</legend>
3939
<div class="govuk-radios">
40-
{% for value, label in form.accessibility_options.field.choices %}
40+
{% for value, label in form.ai_experience.field.choices %}
4141
{% if value %}
4242
<div class="govuk-radios__item">
4343
<input class="govuk-radios__input" type="radio"
44-
id="accessibility_options_{{ loop.index0 }}"
45-
name="{{ form.accessibility_options.name }}"
44+
id="ai_experience_{{ loop.index0 }}"
45+
name="{{ form.ai_experience.name }}"
4646
value="{{ value }}"
47-
{% if value|string == form.accessibility_options.value()|string %}checked{% endif %}
48-
aria-describedby="accessibility_options_{{ loop.index0 }}-hint">
47+
{% if value|string == form.ai_experience.value()|string %}checked{% endif %}
48+
aria-describedby="ai_experience_{{ loop.index0 }}-hint">
4949
<label class="govuk-label govuk-radios__label"
50-
for="accessibility_options_{{ loop.index0 }}">
50+
for="ai_experience_{{ loop.index0 }}">
5151
{{ value }}
5252
</label>
53+
<div id="ai_experience_{{ loop.index0 }}-hint" class="govuk-hint govuk-radios__hint">{{ label }}</div>
5354
</div>
5455
{% endif %}
5556
{% endfor %}
5657
</div>
5758
</fieldset>
5859
</div>
5960

60-
<div class="govuk-form-group">
61-
<fieldset class="govuk-fieldset">
62-
<legend class="govuk-fieldset__legend">
63-
{{ form.accessibility_categories.label }}
64-
</legend>
65-
<div class="govuk-checkboxes">
66-
{% for value, label in form.accessibility_categories.field.choices %}
67-
{% if value %}
68-
<div class="govuk-radios__item">
69-
<input class="govuk-checkboxes__input" type="checkbox"
70-
id="accessibility_categories_{{ loop.index0 }}"
71-
name="{{ form.accessibility_categories.name }}"
72-
value="{{ value }}"
73-
{% if value|string == form.accessibility_categories.value()|string %}checked{% endif %}
74-
aria-describedby="accessibility_categories_{{ loop.index0 }}-hint">
75-
<label class="govuk-label govuk-checkboxes__label"
76-
for="accessibility_categories_{{ loop.index0 }}">
77-
{{ value }}
78-
</label>
79-
</div>
80-
{% endif %}
81-
{% endfor %}
82-
</div>
83-
</fieldset>
84-
</div>
85-
86-
<div class="govuk-form-group">
87-
<label class="govuk-label" for="{{ form.accessibility_description.id_for_label }}">
88-
{{ form.accessibility_description.label }}
89-
</label>
90-
{{ form.accessibility_description }}
91-
</div>
92-
9361
<div class="govuk-button-group">
9462
{{ govukButton(text="Continue") }}
9563
</div>

0 commit comments

Comments
 (0)