Feriennet display phone numbers in international format

Author: Tschuppi81

src/onegov/feriennet/templates/bookings.pt

@@ -225,7 +225,7 @@
                                                                                 <i class="fa fa-envelope" aria-hidden="true"></i>
                                                                             </a>
 
-                                                                            <a href="tel:${row.phone}" tal:condition="row.phone" title="${row.phone}">
+                                                                            <a href="tel:${layout.format_phone_number(row.phone)}" tal:condition="row.phone" title="${layout.format_phone_number(row.phone)}">
                                                                                 <span class="show-for-sr" i18n:translate>
                                                                                     Call <tal:b i18n:name="name">${row.parent}</tal:b>
                                                                                 </span>

src/onegov/feriennet/templates/macros.pt

@@ -281,7 +281,7 @@
     </div>
     <div tal:define="phone user.data.get('phone')" tal:condition="phone">
         <dt i18n:translate>Phone</dt>
-        <dd><a href="tel:${phone}">${phone}</a></dd>
+        <dd><a href="tel:${layout.format_phone_number(phone)}">${layout.format_phone_number(phone)}</a></dd>
     </div>
 </metal:b
 
@@ -415,7 +415,7 @@
             </tal:b>
             <tal:b condition="'phone' in public">
                 <li class="organiser-phone" tal:condition="organiser.data.phone|nothing">
-                    <a href="tel:${organiser.data.phone}">${organiser.data.phone}</a>
+                    <a href="tel:${layout.format_phone_number(organiser.data.phone)}">${layout.format_phone_number(organiser.data.phone)}</a>
                 </li>
             </tal:b>
             <tal:b condition="'website' in public">

src/onegov/feriennet/templates/occasion_attendees.pt

@@ -55,13 +55,12 @@
                                 </div>
                                 <div>
                                     <span i18n:translate>Phone:</span>
-                                    <span><a href="tel:${volunteer.phone}">${volunteer.phone}</a></span>
+                                    <span><a href="tel:${layout.format_phone_number(volunteer.phone)}">${layout.format_phone_number(volunteer.phone)}</a></span>
                                 </div>
                             </li>
                         </ul>
                     </tal:b>
 
-
                     <h4 i18n:translate>Attendees</h4>
                     <ul class="attendees">
                         <li tal:repeat="details occasions[occasion]">

src/onegov/feriennet/templates/volunteers.pt

@@ -99,7 +99,7 @@
                                                         </a>
                                                     </li>
                                                     <li>
-                                                        <a href="tel:${record.phone}">
+                                                        <a href="tel:${layout.format_phone_number(record.phone)}">
                                                             <i class="fa fa-fw fa-phone-square" aria-hidden="true"></i>
                                                             <tal:b i18n:translate>
                                                                 Contact by phone
@@ -183,7 +183,7 @@
                                                     <div>
                                                         <dt i18n:translate>Phone</dt>
                                                         <dd>
-                                                            <a href="tel:${record.phone}">${record.phone}</a>
+                                                            <a href="tel:${layout.format_phone_number(record.phone)}">${layout.format_phone_number(record.phone)}</a>
                                                         </dd>
                                                     </div>
                                                 </dl>

src/onegov/org/utils.py

@@ -1258,8 +1258,11 @@ def format_phone_number(phone_number: str) -> str:
     if not phone_number:
         return ''
 
-    parsed = phonenumbers.parse(phone_number, 'CH')
-    return phonenumbers.format_number(
-        parsed,
-        phonenumbers.PhoneNumberFormat.INTERNATIONAL
-    )
+    try:
+        parsed = phonenumbers.parse(phone_number, 'CH')
+
+        return phonenumbers.format_number(
+            parsed, phonenumbers.PhoneNumberFormat.INTERNATIONAL
+        )
+    except phonenumbers.phonenumberutil.NumberParseException:
+        return phone_number

tests/onegov/feriennet/test_views.py

@@ -549,7 +549,7 @@ def test_organiser_info(client, scenario):
     contact.form['zip_code'] = '20001'
     contact.form['place'] = 'Washington'
     contact.form['email'] = '[email protected]'
-    contact.form['phone'] = '+41 23 456 789'
+    contact.form['phone'] = '+41234567890'
     contact.form['website'] = 'https://www.example.org'
     contact.form['emergency'] = '+01 234 56 78 (Peter)'
     contact.form.submit()
@@ -600,28 +600,28 @@ def with_public_organiser_data(values):
     assert "Admins Association" not in page
     assert "Washington" in page
     assert "[email protected]" not in page
-    assert "+41 23 456 789" not in page
+    assert "+41 23 456 78 90" not in page
     assert "https://www.example.org" not in page
 
     page = with_public_organiser_data(['email'])
     assert "Admins Association" not in page
     assert "Washington" not in page
     assert "[email protected]" in page
-    assert "+41 23 456 789" not in page
+    assert "+41 23 456 78 90" not in page
     assert "https://www.example.org" not in page
 
     page = with_public_organiser_data(['phone'])
     assert "Admins Association" not in page
     assert "Washington" not in page
     assert "[email protected]" not in page
-    assert "+41 23 456 789" in page
+    assert "+41 23 456 78 90" in page
     assert "https://www.example.org" not in page
 
     page = with_public_organiser_data(['website'])
     assert "Admins Association" not in page
     assert "Washington" not in page
     assert "[email protected]" not in page
-    assert "+41 23 456 789" not in page
+    assert "+41 23 456 78 90" not in page
     assert "https://www.example.org" in page
 
 

tests/onegov/org/test_utils.py

@@ -322,3 +322,8 @@ def test_format_phone_number():
     assert utils.format_phone_number('41') == '+41 41'
     assert utils.format_phone_number('') == ''
     assert utils.format_phone_number(None) == ''
+
+    # force error (too long for phone number), will return the input
+    long_text = ('You can reach me during office hours at 041 111 22 33 '
+                 'otherwise at 041 111 22 44')
+    assert utils.format_phone_number(long_text) == long_text