feat(pd): travelq excel;

- Continued excel formulae.

ckanext/canada/tables/travelq.yaml

@@ -198,7 +198,7 @@ resources:
     obligation: Mandatory
     excel_required: true
     #TODO: figure out Excel formula for this...
-    excel_error_formula: 'AND(NOT(ISBLANK({cell})),IFERROR(REGEX({cell},"^\s*([^,]+?)\s*,\s*([^,]+?)\s*$"),1))'
+    excel_error_formula: AND(NOT(ISBLANK({cell})), ISNA(REGEX({cell}, "^\s*([A-Za-zÀ-ÿ''\s\-\.]+?)\s*,\s*([A-Za-zÀ-ÿ''\s\-\.]+?)\s*$"))
     form_required: true
     validation:
       en: |
@@ -227,7 +227,8 @@ resources:
       fr: Note, use the format {City Name}, {Country Name} (e.g. Ottawa, Canada or New York City, United States of America)
     obligation: Optional
     excel_required: false
-    excel_required_formula: NOT(ISBLANK({destination_2_fr}))
+    #TODO: figure out Excel formula for this...
+    excel_required_formula: OR(NOT(ISBLANK({destination_2_fr})), AND(NOT(ISBLANK({cell})), IFERROR(REGEX({cell}, "^\s*([A-Za-zÀ-ÿ''\s\-\.]+?)\s*,\s*([A-Za-zÀ-ÿ''\s\-\.]+?)\s*$"))))
     form_required: false
     format_type:
       en: Free text – Note, use the format {City Name}, {Country Name} (e.g. Ottawa, Canada or New York City, United States of America)
@@ -249,7 +250,8 @@ resources:
       fr: Note, use the format {City Name}, {Country Name} (e.g. Ottawa, Canada or New York City, United States of America)
     obligation: Optional
     excel_required: false
-    excel_required_formula: NOT(ISBLANK({destination_3_fr}))
+    #TODO: figure out Excel formula for this...
+    excel_required_formula: OR(NOT(ISBLANK({destination_3_fr})), AND(NOT(ISBLANK({cell})), IFERROR(REGEX({cell}, "^\s*([A-Za-zÀ-ÿ''\s\-\.]+?)\s*,\s*([A-Za-zÀ-ÿ''\s\-\.]+?)\s*$"))))
     form_required: false
     format_type:
       en: Free text – Note, use the format {City Name}, {Country Name} (e.g. Ottawa, Canada or New York City, United States of America)
@@ -271,7 +273,8 @@ resources:
       fr: Note, use the format {City Name}, {Country Name};{City 2 Name}, {Country 2 Name} (e.g. Ottawa, Canada;New York City, United States of America)
     obligation: Optional
     excel_required: false
-    excel_required_formula: NOT(ISBLANK({destination_other_fr}))
+    #TODO: figure out Excel formula for this...
+    excel_required_formula: OR(NOT(ISBLANK({destination_other_fr})), AND(NOT(ISBLANK({cell})), IFERROR(REGEX({cell}, "^([A-Za-zÀ-ÿ''\s\-\.]+,\s*[A-Za-zÀ-ÿ''\s\-\.]+)(?:;\s*([A-Za-zÀ-ÿ''\s\-\.]+,\s*[A-Za-zÀ-ÿ''\s\-\.]+))*$"))))
     form_required: false
     format_type:
       en: Free text – Note, use the format {City Name}, {Country Name};{City 2 Name}, {Country 2 Name} (e.g. Ottawa, Canada;New York City, United States of America)
@@ -293,6 +296,8 @@ resources:
       fr: Note, use the format {City Name}, {Country Name} (e.g. Ottawa, Canada or New York City, United States of America)
     obligation: Mandatory
     excel_required: true
+    #TODO: figure out Excel formula for this...
+    excel_error_formula: AND(NOT(ISBLANK({cell})), IFERROR(REGEX({cell}, "^\s*([A-Za-zÀ-ÿ''\s\-\.]+?)\s*,\s*([A-Za-zÀ-ÿ''\s\-\.]+?)\s*$")))
     form_required: true
     validation: This field must not be empty
     format_type:
@@ -315,7 +320,8 @@ resources:
       fr: Note, use the format {City Name}, {Country Name} (e.g. Ottawa, Canada or New York City, United States of America)
     obligation: Optional
     excel_required: false
-    excel_required_formula: NOT(ISBLANK({destination_2_en}))
+    #TODO: figure out Excel formula for this...
+    excel_required_formula: OR(NOT(ISBLANK({destination_2_en})), AND(NOT(ISBLANK({cell})), IFERROR(REGEX({cell}, "^\s*([A-Za-zÀ-ÿ''\s\-\.]+?)\s*,\s*([A-Za-zÀ-ÿ''\s\-\.]+?)\s*$"))))
     form_required: false
     format_type:
       en: Free text – Note, use the format {City Name}, {Country Name} (e.g. Ottawa, Canada or New York City, United States of America)
@@ -337,7 +343,8 @@ resources:
       fr: Note, use the format {City Name}, {Country Name} (e.g. Ottawa, Canada or New York City, United States of America)
     obligation: Optional
     excel_required: false
-    excel_required_formula: NOT(ISBLANK({destination_3_en}))
+    #TODO: figure out Excel formula for this...
+    excel_required_formula: OR(NOT(ISBLANK({destination_3_en})), AND(NOT(ISBLANK({cell})), IFERROR(REGEX({cell}, "^\s*([A-Za-zÀ-ÿ''\s\-\.]+?)\s*,\s*([A-Za-zÀ-ÿ''\s\-\.]+?)\s*$"))))
     form_required: false
     format_type:
       en: Free text – Note, use the format {City Name}, {Country Name} (e.g. Ottawa, Canada or New York City, United States of America)
@@ -359,7 +366,8 @@ resources:
       fr: Note, use the format {City Name}, {Country Name};{City 2 Name}, {Country 2 Name} (e.g. Ottawa, Canada;New York City, United States of America)
     obligation: Optional
     excel_required: false
-    excel_required_formula: NOT(ISBLANK({destination_other_en}))
+    #TODO: figure out Excel formula for this...
+    excel_required_formula: OR(NOT(ISBLANK({destination_other_en})), AND(NOT(ISBLANK({cell})), IFERROR(REGEX({cell}, "^([A-Za-zÀ-ÿ''\s\-\.]+,\s*[A-Za-zÀ-ÿ''\s\-\.]+)(?:;\s*([A-Za-zÀ-ÿ''\s\-\.]+,\s*[A-Za-zÀ-ÿ''\s\-\.]+))*$"))))
     form_required: false
     format_type:
       en: Free text – Note, use the format {City Name}, {Country Name};{City 2 Name}, {Country 2 Name} (e.g. Ottawa, Canada;New York City, United States of America)