REDBOX 257 - User demographic data #583
Conversation
brunns
force-pushed
the
feature/REDBOX-257-user-demographic-data
branch
from
34fd991 to
59e4d4b
Compare
brunns
force-pushed
the
feature/REDBOX-257-user-demographic-data
branch
from
1b0bd36 to
5f41840
Compare
| username = None | ||
| verified = models.BooleanField(default=False, blank=True, null=True) | ||
| invited_at = models.DateTimeField(default=None, blank=True, null=True) | ||
| invite_accepted_at = models.DateTimeField(default=None, blank=True, null=True) | ||
| last_token_sent_at = models.DateTimeField(editable=False, blank=True, null=True) | ||
| password = models.CharField("password", max_length=128, blank=True, null=True) | ||
| grade = models.CharField(null=True, max_length=3, choices=UserGrade) |
There was a problem hiding this comment.
i think we need blank=True as well?
There was a problem hiding this comment.
I think null=True is enough for all of them TBH. I don't think they should ever be blank.
There was a problem hiding this comment.
models side LGTM, needs some input from @rachaelcodes or @KevinEtchells for the FE side
| widgets: ClassVar[Mapping[str, forms.Widget]] = { | ||
| "grade": forms.Select(attrs={"class": "govuk-select"}), | ||
| "profession": forms.Select(attrs={"class": "govuk-select"}), | ||
| "business_unit": forms.Select(attrs={"class": "govuk-select"}), |
There was a problem hiding this comment.
Can we sort these alphabetically for user ease?
django_app/tests/conftest.py
Outdated
| @@ -53,8 +60,15 @@ def jemima_puddleduck(): | |||
|
|
|||
|
|
|||
| @pytest.fixture() | |||
| def mrs_tiggywinkle(): | |||
| return User.objects.create_user(email="[email protected]") | |||
| def mrs_tiggywinkle(business_unit: BusinessUnit) -> User: | |||
There was a problem hiding this comment.
Is it worth renaming this to something like user_with_demographic_info for test readability?
| {% endfor %} | ||
| <div class="govuk-button-group"> | ||
| {{ govukButton(text="Update") }} | ||
| {{ govukButton(text="Skip", href=url('documents')) }} |
There was a problem hiding this comment.
@brunns everything looks good to me, except I don't think it's a good idea to have 2 primary action buttons. Are you happy for me to make the "Skip" button grey?
There was a problem hiding this comment.
Go for it - or just suggest it here.
There was a problem hiding this comment.
I've just pushed the change :-)
brunns
force-pushed
the
feature/REDBOX-257-user-demographic-data
branch
from
93150f4 to
4d3f294
Compare
Context
Collect demographic data on our users.
Changes proposed in this pull request
Add grade, business unit and profession to the data model.
Allow upload of business unit data as CSV files via the admin interface.
If a user hasn't given us this data, pass them via a form on sign on.
Guidance to review
Relevant links
Things to check