Merge branch 'add_missing_contact_person_field' into 'master'

Adding missing contact person field on form

See merge request !142

frontend/public/locales/en/common.json

@@ -24,7 +24,8 @@
     "mobilePhone": "Mobile phone",
     "passportNumber": "Passport number",
     "passportNationality": "Passport nationality",
-    "countryCallingCode": "Country code"
+    "countryCallingCode": "Country code",
+    "contactPersonUnit": "Contact at unit"
   },
   "sponsor": {
     "addRole": "Add role",

frontend/public/locales/nb/common.json

@@ -24,7 +24,8 @@
     "mobilePhone": "Mobilnummer",
     "passportNumber": "Passnummer",
     "passportNationality": "Passnasjonalitet",
-    "countryCallingCode": "Landkode"
+    "countryCallingCode": "Landkode",
+    "contactPersonUnit": "Kontakt ved avdeling"
   },
   "sponsor": {
     "addRole": "Legg til rolle",

frontend/public/locales/nn/common.json

@@ -25,7 +25,8 @@
     "mobilePhone": "Mobilnummer",
     "passportNumber": "Passnummer",
     "passportNationality": "Passnasjonalitet",
-    "countryCallingCode": "Landkode"
+    "countryCallingCode": "Landkode",
+    "contactPersonUnit": "Kontakt ved avdeling"
   },
   "sponsor": {
     "addRole": "Legg til role",

frontend/src/routes/sponsor/register/formData.ts

@@ -4,6 +4,7 @@ export type RegisterFormData = {
   role_type?: string
   role_start?: Date
   role_end?: Date
+  contact_person_unit?: string
   comment?: string
   ou_id?: number
   email?: string

frontend/src/routes/sponsor/register/stepPersonForm.tsx

@@ -239,6 +239,12 @@ const StepPersonForm = forwardRef(
                 )}
               />
 
+              <TextField
+                id="contact_person"
+                label={t('input.contactPersonUnit')}
+                {...register(`contact_person_unit`)}
+              />
+
               <TextField
                 id="comment"
                 label={t('input.comment')}

frontend/src/routes/sponsor/register/stepRegistration.tsx

@@ -70,6 +70,7 @@ export default function StepRegistration() {
           formData.role_end === null
             ? null
             : format(formData.role_end as Date, 'yyyy-MM-dd'),
+        contact_person_unit: formData.contact_person_unit,
         comments: formData.comment,
         orgunit: formData.ou_id,
       },

gregui/tests/api/test_invite_guest.py

@@ -10,28 +10,29 @@ from gregui.api.views.invitation import InvitationView
 
 @pytest.mark.django_db
 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 = {
         "first_name": "Foo",
         "last_name": "Bar",
         "email": "test@example.com",
         "role": {
-            "start_date": (
-                datetime.datetime.today() + datetime.timedelta(days=1)
-            ).strftime("%Y-%m-%d"),
-            "end_date": (
-                datetime.datetime.today() + datetime.timedelta(days=10)
-            ).strftime("%Y-%m-%d"),
+            "start_date": (role_start_date).strftime("%Y-%m-%d"),
+            "end_date": (role_end_date).strftime("%Y-%m-%d"),
             "orgunit": unit_foo.id,
             "type": role_type_foo.id,
+            "comments": test_comment,
+            "contact_person_unit": contact_person_unit,
         },
     }
     url = reverse("gregui-v1:invitation")
 
-    all_persons = Person.objects.all()
-    assert len(all_persons) == 0
+    assert len(Person.objects.all()) == 0
 
-    factory = APIRequestFactory()
-    request = factory.post(url, data, format="json")
+    request = APIRequestFactory().post(url, data, format="json")
     force_authenticate(request, user=user_sponsor)
 
     view = InvitationView.as_view()
@@ -50,6 +51,14 @@ def test_invite_guest(client, user_sponsor, unit_foo, role_type_foo):
         value="test@example.com",
     ).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
 def test_invite_cancel(