Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
"name": field.html_name + "_0",
"value": field.subwidgets.0.data.value,
"classes": "nhsuk-input--width-2" + field_error_classes,
"type": "number"
"type": "number",
"suffix": "st"
}) }}
</div>

Expand All @@ -46,7 +47,8 @@
"name": field.html_name + "_1",
"value": field.subwidgets.1.data.value,
"classes": "nhsuk-input--width-2" + field_error_classes,
"type": "number"
"type": "number",
"suffix": "lb"
}) }}
</div>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
from django.test import TestCase
from django.forms import Form
from ...imperial_height_field import ImperialHeightField


class TestImperialHeightField(TestCase):
def test_renders_nhs_input(self):
class TestForm(Form):
field = ImperialHeightField(label="Abc")

self.assertHTMLEqual(
TestForm()["field"].as_field_group(),
"""
<div id="field" class="multi-field-input nhsuk-form-group">
<div class="multi-field-input__item">
<div class="nhsuk-form-group">
<label class="nhsuk-label" for="id_field_0">
Feet
</label>
<div class="nhsuk-input__wrapper">
<input class="nhsuk-input nhsuk-input--width-4" id="id_field_0" name="field_0" type="number">
<div class="nhsuk-input__suffix" aria-hidden="true">ft</div>
</div>
</div>
</div>

<div class="multi-field-input__item">
<div class="nhsuk-form-group">
<label class="nhsuk-label" for="id_field_1">
Inches
</label>
<div class="nhsuk-input__wrapper">
<input class="nhsuk-input nhsuk-input--width-4" id="id_field_1" name="field_1" type="number">
<div class="nhsuk-input__suffix" aria-hidden="true">in</div>
</div>
</div>
</div>
</div>
""",
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
from django.test import TestCase
from django.forms import Form
from ...imperial_weight_field import ImperialWeightField


class TestImperialWeightField(TestCase):
def test_renders_nhs_input(self):
class TestForm(Form):
field = ImperialWeightField(label="Abc")

self.assertHTMLEqual(
TestForm()["field"].as_field_group(),
"""
<div id="field" class="multi-field-input nhsuk-form-group">
<div class="multi-field-input__item">
<div class="nhsuk-form-group">
<label class="nhsuk-label nhsuk-fieldset__legend--m" for="id_field_0">
Stone
</label>
<div class="nhsuk-input__wrapper">
<input class="nhsuk-input nhsuk-input--width-2" id="id_field_0" name="field_0" type="number">
<div class="nhsuk-input__suffix" aria-hidden="true">st</div>
</div>
</div>
</div>

<div class="multi-field-input__item">
<div class="nhsuk-form-group">
<label class="nhsuk-label nhsuk-fieldset__legend--m" for="id_field_1">
Pounds
</label>
<div class="nhsuk-input__wrapper">
<input class="nhsuk-input nhsuk-input--width-2" id="id_field_1" name="field_1" type="number">
<div class="nhsuk-input__suffix" aria-hidden="true">lb</div>
</div>
</div>
</div>
</div>
""",
)
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django import forms

from ...nhsuk_forms.imperial_weight_form import ImperialWeightField
from ...nhsuk_forms.imperial_weight_field import ImperialWeightField
from ..models.response_set import ResponseSet

class ImperialWeightForm(forms.ModelForm):
Expand Down
3 changes: 2 additions & 1 deletion lung_cancer_screening/questions/forms/metric_weight_form.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ def __init__(self, *args, **kwargs):
required=True,
error_messages={
'required': 'Enter your weight',
}
},
suffix="kg"
)
def clean_weight_metric(self):
return self.cleaned_data['weight_metric'] * 10
Expand Down
Loading