HospitalityQ Vendor Fields Revamp

changes/1533.changes

@@ -0,0 +1 @@
+HospitalityQ schema has additional `vendor` fields added, along with validation for expected format.

ckanext/canada/i18n/ckanext-canada.pot

@@ -1,14 +1,14 @@
 # Translations template for ckanext-canada.
-# Copyright (C) 2024 ORGANIZATION
+# Copyright (C) 2025 ORGANIZATION
 # This file is distributed under the same license as the ckanext-canada project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2025.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: ckanext-canada 0.4.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-12-16 20:27+0000\n"
+"POT-Creation-Date: 2025-01-22 14:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -130,44 +130,44 @@ msgstr ""
 msgid "Invalid business number"
 msgstr ""
 
-#: ckanext/canada/helpers.py:291 ckanext/canada/helpers.py:292
+#: ckanext/canada/helpers.py:292 ckanext/canada/helpers.py:293
 msgid "Treasury Board of Canada Secretariat"
 msgstr ""
 
-#: ckanext/canada/helpers.py:583 ckanext/canada/strings.py:13
+#: ckanext/canada/helpers.py:584 ckanext/canada/strings.py:13
 #: ckanext/canada/view.py:1164
 msgid "Members not found"
 msgstr ""
 
-#: ckanext/canada/helpers.py:706
+#: ckanext/canada/helpers.py:711
 msgid "Data awaiting load to DataStore"
 msgstr ""
 
-#: ckanext/canada/helpers.py:707
+#: ckanext/canada/helpers.py:712
 msgid "Loading data into DataStore"
 msgstr ""
 
-#: ckanext/canada/helpers.py:708
+#: ckanext/canada/helpers.py:713
 msgid "Data loaded into DataStore"
 msgstr ""
 
-#: ckanext/canada/helpers.py:709
+#: ckanext/canada/helpers.py:714
 msgid "Failed to load data into DataStore"
 msgstr ""
 
-#: ckanext/canada/helpers.py:710
+#: ckanext/canada/helpers.py:715
 msgid "Data available in DataStore"
 msgstr ""
 
-#: ckanext/canada/helpers.py:711
+#: ckanext/canada/helpers.py:716
 msgid "Resource not active in DataStore"
 msgstr ""
 
-#: ckanext/canada/helpers.py:712
+#: ckanext/canada/helpers.py:717
 msgid "DataStore status unknown"
 msgstr ""
 
-#: ckanext/canada/helpers.py:779 ckanext/canada/templates/home/quick_links.html:65
+#: ckanext/canada/helpers.py:784 ckanext/canada/templates/home/quick_links.html:65
 #: ckanext/canada/templates/scheming/package/snippets/package_form.html:28
 #: ckanext/canada/templates/snippets/cdts/header.html:31
 #: ckanext/canada/templates/snippets/dataset_facets.html:3
@@ -176,7 +176,7 @@ msgstr ""
 msgid "Open Data"
 msgstr ""
 
-#: ckanext/canada/helpers.py:780 ckanext/canada/templates/home/quick_links.html:79
+#: ckanext/canada/helpers.py:785 ckanext/canada/templates/home/quick_links.html:79
 #: ckanext/canada/templates/scheming/package/snippets/package_form.html:30
 #: ckanext/canada/templates/snippets/cdts/header.html:54
 #: ckanext/canada/templates/snippets/dataset_facets.html:5
@@ -185,49 +185,49 @@ msgstr ""
 msgid "Open Information"
 msgstr ""
 
-#: ckanext/canada/helpers.py:789
+#: ckanext/canada/helpers.py:794
 #: ckanext/canada/templates/snippets/dataset_facets.html:27
 msgid "Request sent to data owner - awaiting response"
 msgstr ""
 
-#: ckanext/canada/helpers.py:793
+#: ckanext/canada/helpers.py:798
 #: ckanext/canada/templates/snippets/publish_facet.html:44
 msgid "Pending"
 msgstr ""
 
-#: ckanext/canada/helpers.py:794 ckanext/canada/templates/package/read.html:14
+#: ckanext/canada/helpers.py:799 ckanext/canada/templates/package/read.html:14
 #: ckanext/canada/templates/snippets/package_item.html:33
 #: ckanext/canada/templates/snippets/publish_facet.html:44
 msgid "Draft"
 msgstr ""
 
-#: ckanext/canada/helpers.py:803 ckanext/canada/templates/home/quick_links.html:133
+#: ckanext/canada/helpers.py:808 ckanext/canada/templates/home/quick_links.html:133
 #: ckanext/canada/templates/snippets/cdts/header.html:57
 #: ckanext/canada/templates/snippets/dataset_facets.html:33
 #: ckanext/canada/templates/snippets/package_item.html:15
 #: ckanext/canada/templates/snippets/package_item.html:21
 msgid "Proactive Publication"
 msgstr ""
 
-#: ckanext/canada/helpers.py:825
+#: ckanext/canada/helpers.py:830
 #: ckanext/canada/templates/snippets/publish_facet.html:25
 msgid "Published"
 msgstr ""
 
-#: ckanext/canada/helpers.py:827
+#: ckanext/canada/helpers.py:832
 #: ckanext/canada/templates/snippets/publish_facet.html:34
 msgid "Scheduled"
 msgstr ""
 
-#: ckanext/canada/helpers.py:862
+#: ckanext/canada/helpers.py:867
 msgid "Registry Home"
 msgstr ""
 
-#: ckanext/canada/helpers.py:867
+#: ckanext/canada/helpers.py:872
 msgid "Open Government"
 msgstr ""
 
-#: ckanext/canada/helpers.py:870
+#: ckanext/canada/helpers.py:875
 #: ckanext/canada/templates/admin/publish_search.html:19
 #: ckanext/canada/templates/home/quick_links.html:104
 #: ckanext/canada/templates/organization/snippets/organization_search.html:8
@@ -237,80 +237,86 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: ckanext/canada/logic.py:302
+#: ckanext/canada/logic.py:304
 msgid "Could not determine a resource format. Please supply a format."
 msgstr ""
 
-#: ckanext/canada/logic.py:472
+#: ckanext/canada/logic.py:474
 msgid "Unknown Job"
 msgstr ""
 
-#: ckanext/canada/logic.py:477
+#: ckanext/canada/logic.py:479
 msgid "Entire Site"
 msgstr ""
 
-#: ckanext/canada/logic.py:578
+#: ckanext/canada/logic.py:580
 #, python-format
 msgid "No Portal Sync information found for package %s"
 msgstr ""
 
-#: ckanext/canada/plugins.py:759
+#: ckanext/canada/logic.py:646
+msgid ""
+"Invalid request. Full text search is not supported for data with more than {}"
+" rows."
+msgstr ""
+
+#: ckanext/canada/plugins.py:783
 #: ckanext/canada/templates/scheming/package/snippets/package_form.html:25
 msgid "Portal Type"
 msgstr ""
 
-#: ckanext/canada/plugins.py:760 ckanext/canada/templates/package/deleted.html:14
+#: ckanext/canada/plugins.py:784 ckanext/canada/templates/package/deleted.html:14
 #: ckanext/canada/templates/user/new_user_form.html:18
 msgid "Organization"
 msgstr ""
 
-#: ckanext/canada/plugins.py:761
+#: ckanext/canada/plugins.py:785
 msgid "Collection Type"
 msgstr ""
 
-#: ckanext/canada/plugins.py:762 ckanext/canada/plugins.py:763
+#: ckanext/canada/plugins.py:786 ckanext/canada/plugins.py:787
 msgid "Keywords"
 msgstr ""
 
-#: ckanext/canada/plugins.py:764
+#: ckanext/canada/plugins.py:788
 msgid "Subject"
 msgstr ""
 
-#: ckanext/canada/plugins.py:765
+#: ckanext/canada/plugins.py:789
 #: ckanext/canada/templates/package/snippets/resource_info.html:13
 #: ckanext/canada/templates/tabledesigner/view_snippets/cra_business_number.html:1
 msgid "Format"
 msgstr ""
 
-#: ckanext/canada/plugins.py:766
+#: ckanext/canada/plugins.py:790
 msgid "Resource Type"
 msgstr ""
 
-#: ckanext/canada/plugins.py:767
+#: ckanext/canada/plugins.py:791
 msgid "Maintenance and Update Frequency"
 msgstr ""
 
-#: ckanext/canada/plugins.py:768
+#: ckanext/canada/plugins.py:792
 msgid "Record Status"
 msgstr ""
 
-#: ckanext/canada/plugins.py:769
+#: ckanext/canada/plugins.py:793
 msgid "IMSO Approval"
 msgstr ""
 
-#: ckanext/canada/plugins.py:770
+#: ckanext/canada/plugins.py:794
 msgid "Jurisdiction"
 msgstr ""
 
-#: ckanext/canada/plugins.py:771
+#: ckanext/canada/plugins.py:795
 msgid "Suggestion Status"
 msgstr ""
 
-#: ckanext/canada/plugins.py:958
+#: ckanext/canada/plugins.py:983
 msgid "Previous"
 msgstr ""
 
-#: ckanext/canada/plugins.py:958
+#: ckanext/canada/plugins.py:983
 msgid "Next"
 msgstr ""
 
@@ -1043,8 +1049,8 @@ msgstr ""
 #. Title for PD Type: adminaircraft
 #. Resource Title for PD Type: adminaircraft
 #: ckanext/canada/tables/adminaircraft.yaml:5
-#: ckanext/canada/tables/adminaircraft.yaml:15
-#: ckanext/canada/tables/adminaircraft.yaml:20
+#: ckanext/canada/tables/adminaircraft.yaml:16
+#: ckanext/canada/tables/adminaircraft.yaml:21
 msgid "Proactive Publication - Use of Administrative Aircraft"
 msgstr ""
 
@@ -1066,10 +1072,10 @@ msgstr ""
 #. SQL Trigger String for PD Type: reclassification
 #. SQL Trigger String for PD Type: travelq
 #. SQL Trigger String for PD Type: wrongdoing
-#: ckanext/canada/tables/adminaircraft.yaml:316
+#: ckanext/canada/tables/adminaircraft.yaml:317
 #: ckanext/canada/tables/contracts.yaml:2185 ckanext/canada/tables/grants.yaml:838
-#: ckanext/canada/tables/hospitalityq.yaml:449
-#: ckanext/canada/tables/qpnotes.yaml:332
+#: ckanext/canada/tables/hospitalityq.yaml:575
+#: ckanext/canada/tables/qpnotes.yaml:335
 #: ckanext/canada/tables/reclassification.yaml:271
 #: ckanext/canada/tables/travelq.yaml:438 ckanext/canada/tables/wrongdoing.yaml:247
 msgid "Comma is not allowed in Reference Number field"
@@ -1155,8 +1161,8 @@ msgstr ""
 #. SQL Trigger String for PD Type: travelq
 #: ckanext/canada/tables/briefingt.yaml:406
 #: ckanext/canada/tables/contractsa.yaml:396
-#: ckanext/canada/tables/hospitalityq.yaml:606
-#: ckanext/canada/tables/qpnotes.yaml:456
+#: ckanext/canada/tables/hospitalityq.yaml:737
+#: ckanext/canada/tables/qpnotes.yaml:459
 #: ckanext/canada/tables/reclassification.yaml:389
 #: ckanext/canada/tables/travela.yaml:645 ckanext/canada/tables/travelq.yaml:600
 msgid "This must list the year you are reporting on (not the fiscal year)."
@@ -1404,7 +1410,7 @@ msgstr ""
 
 #. Label for PD Type: hospitalityq
 #: ckanext/canada/tables/hospitalityq.yaml:5
-#: ckanext/canada/tables/hospitalityq.yaml:405
+#: ckanext/canada/tables/hospitalityq.yaml:519
 msgid "Hospitality Expenses"
 msgstr ""
 
@@ -1415,8 +1421,15 @@ msgid ""
 "organization"
 msgstr ""
 
+#. SQL Trigger String for PD Type: hospitalityq
+#: ckanext/canada/tables/hospitalityq.yaml:576
+msgid ""
+"Invalid format for multiple commercial establishments or vendors. Use <Vendor"
+" Name>;<Vendor 2 Name> (e.g. Les Impertinentes;Les Street Monkeys)"
+msgstr ""
+
 #. Resource Title for PD Type: hospitalityq
-#: ckanext/canada/tables/hospitalityq.yaml:481
+#: ckanext/canada/tables/hospitalityq.yaml:612
 msgid "Proactive Publication - Hospitality Nothing to Report"
 msgstr ""
 
@@ -1448,7 +1461,7 @@ msgstr ""
 
 #. Title for PD Type: qpnotes
 #. Resource Title for PD Type: qpnotes
-#: ckanext/canada/tables/qpnotes.yaml:4 ckanext/canada/tables/qpnotes.yaml:14
+#: ckanext/canada/tables/qpnotes.yaml:4 ckanext/canada/tables/qpnotes.yaml:15
 msgid "Proactive Publication - Question Period Notes"
 msgstr ""
 
@@ -1463,7 +1476,7 @@ msgid "Access, upload and modify Question Period notes for your organization"
 msgstr ""
 
 #. Resource Title for PD Type: qpnotes
-#: ckanext/canada/tables/qpnotes.yaml:357
+#: ckanext/canada/tables/qpnotes.yaml:360
 msgid "Proactive Publication - Question Period Notes Nothing to Report"
 msgstr ""
 
@@ -2383,7 +2396,7 @@ msgstr ""
 #: ckanext/canada/templates/snippets/cdts/header.html:154
 #: ckanext/canada/templates/user/read.html:28
 #: ckanext/canada/templates/user/read_base.html:12
-#: ckanext/canada/templates/user/read_base.html:97
+#: ckanext/canada/templates/user/read_base.html:71
 msgid "Organizations"
 msgstr ""
 
@@ -3804,33 +3817,17 @@ msgid "Username:"
 msgstr ""
 
 #: ckanext/canada/templates/user/read_base.html:59
-#: ckanext/canada/templates/user/read_base.html:70
 msgid "This means only you can see this"
 msgstr ""
 
 #: ckanext/canada/templates/user/read_base.html:59
-#: ckanext/canada/templates/user/read_base.html:70
 msgid "Private"
 msgstr ""
 
 #: ckanext/canada/templates/user/read_base.html:64
 msgid "Member Since"
 msgstr ""
 
-#: ckanext/canada/templates/user/read_base.html:70
-#: ckanext/canada/templates/user/read_base.html:78
-msgid "API Key"
-msgstr ""
-
-#: ckanext/canada/templates/user/read_base.html:73
-msgid "Show API Key"
-msgstr ""
-
-#: ckanext/canada/templates/user/read_base.html:79
-#: ckanext/canada/templates/user/read_base.html:85
-msgid "Close"
-msgstr ""
-
 #: ckanext/canada/templates/user/recover_username.html:3
 msgid "Recover your username"
 msgstr ""