Skip to content
Snippets Groups Projects
Commit bb04ea1f authored by Tore.Brede's avatar Tore.Brede
Browse files

Adding missing contact person field on form

parent 6e8e1d0c
No related branches found
No related tags found
1 merge request!142Adding missing contact person field on form
Pipeline #99881 passed
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
"mobilePhone": "Mobile phone", "mobilePhone": "Mobile phone",
"passportNumber": "Passport number", "passportNumber": "Passport number",
"passportNationality": "Passport nationality", "passportNationality": "Passport nationality",
"countryCallingCode": "Country code" "countryCallingCode": "Country code",
"contactPersonUnit": "Contact at unit"
}, },
"sponsor": { "sponsor": {
"addRole": "Add role", "addRole": "Add role",
......
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
"mobilePhone": "Mobilnummer", "mobilePhone": "Mobilnummer",
"passportNumber": "Passnummer", "passportNumber": "Passnummer",
"passportNationality": "Passnasjonalitet", "passportNationality": "Passnasjonalitet",
"countryCallingCode": "Landkode" "countryCallingCode": "Landkode",
"contactPersonUnit": "Kontakt ved avdeling"
}, },
"sponsor": { "sponsor": {
"addRole": "Legg til rolle", "addRole": "Legg til rolle",
......
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
"mobilePhone": "Mobilnummer", "mobilePhone": "Mobilnummer",
"passportNumber": "Passnummer", "passportNumber": "Passnummer",
"passportNationality": "Passnasjonalitet", "passportNationality": "Passnasjonalitet",
"countryCallingCode": "Landkode" "countryCallingCode": "Landkode",
"contactPersonUnit": "Kontakt ved avdeling"
}, },
"sponsor": { "sponsor": {
"addRole": "Legg til role", "addRole": "Legg til role",
......
...@@ -4,6 +4,7 @@ export type RegisterFormData = { ...@@ -4,6 +4,7 @@ export type RegisterFormData = {
role_type?: string role_type?: string
role_start?: Date role_start?: Date
role_end?: Date role_end?: Date
contact_person_unit?: string
comment?: string comment?: string
ou_id?: number ou_id?: number
email?: string email?: string
......
...@@ -219,6 +219,12 @@ const StepPersonForm = forwardRef( ...@@ -219,6 +219,12 @@ const StepPersonForm = forwardRef(
)} )}
/> />
<TextField
id="contact_person"
label={t('input.contactPersonUnit')}
{...register(`contact_person_unit`)}
/>
<TextField <TextField
id="comment" id="comment"
label={t('input.comment')} label={t('input.comment')}
......
...@@ -70,6 +70,7 @@ export default function StepRegistration() { ...@@ -70,6 +70,7 @@ export default function StepRegistration() {
formData.role_end === null formData.role_end === null
? null ? null
: format(formData.role_end as Date, 'yyyy-MM-dd'), : format(formData.role_end as Date, 'yyyy-MM-dd'),
contact_person_unit: formData.contact_person_unit,
comments: formData.comment, comments: formData.comment,
orgunit: formData.ou_id, orgunit: formData.ou_id,
}, },
......
...@@ -10,28 +10,29 @@ from gregui.api.views.invitation import InvitationView ...@@ -10,28 +10,29 @@ from gregui.api.views.invitation import InvitationView
@pytest.mark.django_db @pytest.mark.django_db
def test_invite_guest(client, user_sponsor, unit_foo, role_type_foo): def test_invite_guest(client, user_sponsor, unit_foo, role_type_foo):
test_comment = "This is a test comment"
contact_person_unit = "This is a test contact person"
role_start_date = datetime.datetime.today() + datetime.timedelta(days=1)
role_end_date = datetime.datetime.today() + datetime.timedelta(days=10)
data = { data = {
"first_name": "Foo", "first_name": "Foo",
"last_name": "Bar", "last_name": "Bar",
"email": "test@example.com", "email": "test@example.com",
"role": { "role": {
"start_date": ( "start_date": (role_start_date).strftime("%Y-%m-%d"),
datetime.datetime.today() + datetime.timedelta(days=1) "end_date": (role_end_date).strftime("%Y-%m-%d"),
).strftime("%Y-%m-%d"),
"end_date": (
datetime.datetime.today() + datetime.timedelta(days=10)
).strftime("%Y-%m-%d"),
"orgunit": unit_foo.id, "orgunit": unit_foo.id,
"type": role_type_foo.id, "type": role_type_foo.id,
"comments": test_comment,
"contact_person_unit": contact_person_unit,
}, },
} }
url = reverse("gregui-v1:invitation") url = reverse("gregui-v1:invitation")
all_persons = Person.objects.all() assert len(Person.objects.all()) == 0
assert len(all_persons) == 0
factory = APIRequestFactory() request = APIRequestFactory().post(url, data, format="json")
request = factory.post(url, data, format="json")
force_authenticate(request, user=user_sponsor) force_authenticate(request, user=user_sponsor)
view = InvitationView.as_view() view = InvitationView.as_view()
...@@ -50,6 +51,14 @@ def test_invite_guest(client, user_sponsor, unit_foo, role_type_foo): ...@@ -50,6 +51,14 @@ def test_invite_guest(client, user_sponsor, unit_foo, role_type_foo):
value="test@example.com", value="test@example.com",
).exists() ).exists()
role = Role.objects.filter(person__id=person.id).get()
assert role.orgunit == unit_foo
assert role.type == role_type_foo
assert role.start_date == role_start_date.date()
assert role.end_date == role_end_date.date()
assert role.contact_person_unit == contact_person_unit
assert role.comments == test_comment
@pytest.mark.django_db @pytest.mark.django_db
def test_invite_cancel( def test_invite_cancel(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment