new pd table for grants (monthly)

bin/filter/filter_grants_monthly.py

@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+"filter for grantsmonthly.csv"
+
+import csv
+import sys
+
+REMOVE_COLUMNS = [
+    'record_created',
+    'record_modified',
+    'user_modified',
+]
+
+def main():
+    reader = csv.DictReader(sys.stdin)
+    outnames = [f for f in reader.fieldnames if f not in REMOVE_COLUMNS]
+    writer = csv.DictWriter(sys.stdout, outnames)
+    writer.writeheader()
+    for row in reader:
+        try:
+            for rem in REMOVE_COLUMNS:
+                del row[rem]
+            writer.writerow(row)
+        except ValueError:
+            pass
+
+main()

changes/1525.feature

@@ -0,0 +1,21 @@
+New recombinant PD template for Grants (monthly). This template would be separate from
+the existing Grants template and is targeted only for the Staging environment. Major difference 
+between the two templates are:
+* Data collection is done quarterly for Grants vs monthly for Grants (monthly)
+* The following fields exist in Grants but deprecated in Grants (monthly):
+    - 3.9 research_organization_name
+    - 3.14 federal_riding_name_en
+    - 3.15 federal_riding_name_fr
+    - 3.21 agreement_title_en
+    - 3.22 agreement_title_fr
+    - 3.25 foreign_currency_type
+    - 3.26 foreign_currency_value
+    - 3.29 coverage
+    - 3.32 naics_identifier
+    - 3.35 additional_information_en
+    - 3.36 additional_information_fr
+* The following fields are new in the Grants (monthly) template:
+    - 3.26 dem_intended_beneficiary
+    - 3.27 other_dem_intended_beneficiary_description_en
+    - 3.28 other_dem_intended_beneficiary_description_fr
+    - 3.29 reason_amendment

ckanext/canada/i18n/ckanext-canada.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ckanext-canada 0.4.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-11-12 15:06+0000\n"
+"POT-Creation-Date: 2024-11-15 09:51-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -203,7 +203,7 @@ msgstr ""
 #: ckanext/canada/templates/admin/publish_search.html:18
 #: ckanext/canada/templates/home/quick_links.html:104
 #: ckanext/canada/templates/organization/snippets/organization_search.html:7
-#: ckanext/canada/templates/snippets/cdts/header.html:150
+#: ckanext/canada/templates/snippets/cdts/header.html:154
 #: ckanext/canada/templates/snippets/search_form.html:44
 msgid "Search"
 msgstr ""
@@ -221,62 +221,62 @@ msgstr ""
 msgid "No Portal Sync information found for package %s"
 msgstr ""
 
-#: ckanext/canada/plugins.py:709
+#: ckanext/canada/plugins.py:710
 #: ckanext/canada/templates/scheming/package/snippets/package_form.html:25
 msgid "Portal Type"
 msgstr ""
 
-#: ckanext/canada/plugins.py:710 ckanext/canada/templates/package/deleted.html:14
+#: ckanext/canada/plugins.py:711 ckanext/canada/templates/package/deleted.html:14
 #: ckanext/canada/templates/user/new_user_form.html:17
 msgid "Organization"
 msgstr ""
 
-#: ckanext/canada/plugins.py:711
+#: ckanext/canada/plugins.py:712
 msgid "Collection Type"
 msgstr ""
 
-#: ckanext/canada/plugins.py:712 ckanext/canada/plugins.py:713
+#: ckanext/canada/plugins.py:713 ckanext/canada/plugins.py:714
 msgid "Keywords"
 msgstr ""
 
-#: ckanext/canada/plugins.py:714
+#: ckanext/canada/plugins.py:715
 msgid "Subject"
 msgstr ""
 
-#: ckanext/canada/plugins.py:715
+#: ckanext/canada/plugins.py:716
 #: ckanext/canada/templates/tabledesigner/view_snippets/cra_business_number.html:1
 msgid "Format"
 msgstr ""
 
-#: ckanext/canada/plugins.py:716
+#: ckanext/canada/plugins.py:717
 msgid "Resource Type"
 msgstr ""
 
-#: ckanext/canada/plugins.py:717
+#: ckanext/canada/plugins.py:718
 msgid "Maintenance and Update Frequency"
 msgstr ""
 
-#: ckanext/canada/plugins.py:718
+#: ckanext/canada/plugins.py:719
 msgid "Record Status"
 msgstr ""
 
-#: ckanext/canada/plugins.py:719
+#: ckanext/canada/plugins.py:720
 msgid "IMSO Approval"
 msgstr ""
 
-#: ckanext/canada/plugins.py:720
+#: ckanext/canada/plugins.py:721
 msgid "Jurisdiction"
 msgstr ""
 
-#: ckanext/canada/plugins.py:721
+#: ckanext/canada/plugins.py:722
 msgid "Suggestion Status"
 msgstr ""
 
-#: ckanext/canada/plugins.py:910
+#: ckanext/canada/plugins.py:911
 msgid "Previous"
 msgstr ""
 
-#: ckanext/canada/plugins.py:910
+#: ckanext/canada/plugins.py:911
 msgid "Next"
 msgstr ""
 
@@ -909,13 +909,15 @@ msgstr ""
 #. SQL Trigger String for PD Type: adminaircraft
 #. SQL Trigger String for PD Type: contracts
 #. SQL Trigger String for PD Type: grants
+#. SQL Trigger String for PD Type: grantsmonthly
 #. SQL Trigger String for PD Type: hospitalityq
 #. SQL Trigger String for PD Type: qpnotes
 #. 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/contracts.yaml:2185 ckanext/canada/tables/grants.yaml:836
+#: ckanext/canada/tables/grantsmonthly.yaml:877
 #: ckanext/canada/tables/hospitalityq.yaml:449
 #: ckanext/canada/tables/qpnotes.yaml:332
 #: ckanext/canada/tables/reclassification.yaml:271
@@ -1243,6 +1245,53 @@ msgstr ""
 msgid "Proactive Publication - Grants and Contributions Nothing to Report"
 msgstr ""
 
+#. Title for PD Type: grantsmonthly
+#. Resource Title for PD Type: grantsmonthly
+#: ckanext/canada/tables/grantsmonthly.yaml:3
+#: ckanext/canada/tables/grantsmonthly.yaml:14
+msgid "Proactive Publication - Grants and Contributions Data Sharing Pilot"
+msgstr ""
+
+#. Label for PD Type: grantsmonthly
+#: ckanext/canada/tables/grantsmonthly.yaml:4
+msgid "Grants and Contributions Data Sharing Pilot"
+msgstr ""
+
+#. Description for PD Type: grantsmonthly
+#: ckanext/canada/tables/grantsmonthly.yaml:5
+msgid ""
+"Access, upload and modify the Grants and Contributions Data Sharing Pilot "
+"reports for your organization"
+msgstr ""
+
+#. SQL Trigger String for PD Type: grantsmonthly
+#. SQL Trigger String for PD Type: service
+#: ckanext/canada/tables/grantsmonthly.yaml:878
+#: ckanext/canada/tables/service.yaml:1533 ckanext/canada/tables/service.yaml:2346
+msgid "This field has a maximum length of {} characters."
+msgstr ""
+
+#. SQL Trigger String for PD Type: grantsmonthly
+#. SQL Trigger String for PD Type: service
+#: ckanext/canada/tables/grantsmonthly.yaml:879
+#: ckanext/canada/tables/service.yaml:1534 ckanext/canada/tables/service.yaml:2347
+msgid "Invalid choice: {}"
+msgstr ""
+
+#. SQL Trigger String for PD Type: grantsmonthly
+#. SQL Trigger String for PD Type: service
+#: ckanext/canada/tables/grantsmonthly.yaml:880
+#: ckanext/canada/tables/service.yaml:1536 ckanext/canada/tables/service.yaml:2350
+msgid "This field is required due to a response in a different field."
+msgstr ""
+
+#. SQL Trigger String for PD Type: grantsmonthly
+#. SQL Trigger String for PD Type: service
+#: ckanext/canada/tables/grantsmonthly.yaml:881
+#: ckanext/canada/tables/service.yaml:1537 ckanext/canada/tables/service.yaml:2351
+msgid "This text must be provided in both languages"
+msgstr ""
+
 #. Title for PD Type: hospitalityq
 #. Resource Title for PD Type: hospitalityq
 #: ckanext/canada/tables/hospitalityq.yaml:4
@@ -1362,31 +1411,11 @@ msgstr ""
 msgid "This field must be either a number, \"NA\", or \"ND\""
 msgstr ""
 
-#. SQL Trigger String for PD Type: service
-#: ckanext/canada/tables/service.yaml:1533 ckanext/canada/tables/service.yaml:2346
-msgid "This field has a maximum length of {} characters."
-msgstr ""
-
-#. SQL Trigger String for PD Type: service
-#: ckanext/canada/tables/service.yaml:1534 ckanext/canada/tables/service.yaml:2347
-msgid "Invalid choice: {}"
-msgstr ""
-
 #. SQL Trigger String for PD Type: service
 #: ckanext/canada/tables/service.yaml:1535 ckanext/canada/tables/service.yaml:2349
 msgid "Invalid input syntax for type integer: {}"
 msgstr ""
 
-#. SQL Trigger String for PD Type: service
-#: ckanext/canada/tables/service.yaml:1536 ckanext/canada/tables/service.yaml:2350
-msgid "This field is required due to a response in a different field."
-msgstr ""
-
-#. SQL Trigger String for PD Type: service
-#: ckanext/canada/tables/service.yaml:1537 ckanext/canada/tables/service.yaml:2351
-msgid "This text must be provided in both languages"
-msgstr ""
-
 #. SQL Constraint Error String for PD Type: service
 #: ckanext/canada/tables/service.yaml:1346
 msgid ""
@@ -1855,7 +1884,7 @@ msgid "Load more"
 msgstr ""
 
 #: ckanext/canada/templates/admin/base.html:5
-#: ckanext/canada/templates/snippets/cdts/header.html:197
+#: ckanext/canada/templates/snippets/cdts/header.html:201
 msgid "Admin"
 msgstr ""
 
@@ -2101,14 +2130,14 @@ msgid "Add information about government programs, activities and publications."
 msgstr ""
 
 #: ckanext/canada/templates/home/quick_links.html:91
-#: ckanext/canada/templates/snippets/cdts/header.html:135
+#: ckanext/canada/templates/snippets/cdts/header.html:139
 #: ckanext/canada/templates/snippets/dataset_facets.html:4
 #: ckanext/canada/templates/snippets/package_item.html:19
 msgid "Open Dialogue"
 msgstr ""
 
 #: ckanext/canada/templates/home/quick_links.html:98
-#: ckanext/canada/templates/snippets/cdts/header.html:144
+#: ckanext/canada/templates/snippets/cdts/header.html:148
 msgid "Consultations master dataset"
 msgstr ""
 
@@ -2142,58 +2171,58 @@ msgstr ""
 msgid "View the list of members linked to your organization."
 msgstr ""
 
-#: ckanext/canada/templates/home/quick_links.html:151
-#: ckanext/canada/templates/snippets/cdts/header.html:106
+#: ckanext/canada/templates/home/quick_links.html:152
+#: ckanext/canada/templates/snippets/cdts/header.html:110
 msgid "Reports Tabled in Parliament"
 msgstr ""
 
-#: ckanext/canada/templates/home/quick_links.html:152
+#: ckanext/canada/templates/home/quick_links.html:153
 msgid "Access, add or modify your reports tabled in Parliament."
 msgstr ""
 
-#: ckanext/canada/templates/home/quick_links.html:159
+#: ckanext/canada/templates/home/quick_links.html:160
 msgid "Briefing packages"
 msgstr ""
 
-#: ckanext/canada/templates/home/quick_links.html:166
-#: ckanext/canada/templates/snippets/cdts/header.html:118
+#: ckanext/canada/templates/home/quick_links.html:167
+#: ckanext/canada/templates/snippets/cdts/header.html:122
 msgid "New or incoming ministers"
 msgstr ""
 
-#: ckanext/canada/templates/home/quick_links.html:167
+#: ckanext/canada/templates/home/quick_links.html:168
 msgid ""
 "Access, add or modify briefing package information for your new or incoming "
 "minister."
 msgstr ""
 
-#: ckanext/canada/templates/home/quick_links.html:174
-#: ckanext/canada/templates/snippets/cdts/header.html:122
+#: ckanext/canada/templates/home/quick_links.html:175
+#: ckanext/canada/templates/snippets/cdts/header.html:126
 msgid "New or incoming deputy heads"
 msgstr ""
 
-#: ckanext/canada/templates/home/quick_links.html:175
+#: ckanext/canada/templates/home/quick_links.html:176
 msgid ""
 "Access, add or modify briefing package information for your new or incoming "
 "deputy head."
 msgstr ""
 
-#: ckanext/canada/templates/home/quick_links.html:182
-#: ckanext/canada/templates/snippets/cdts/header.html:126
+#: ckanext/canada/templates/home/quick_links.html:183
+#: ckanext/canada/templates/snippets/cdts/header.html:130
 msgid "Parliamentary Committee appearances for ministers"
 msgstr ""
 
-#: ckanext/canada/templates/home/quick_links.html:183
+#: ckanext/canada/templates/home/quick_links.html:184
 msgid ""
 "Access, add or modify briefing packages for Parliamentary Committee "
 "appearance for your minister."
 msgstr ""
 
-#: ckanext/canada/templates/home/quick_links.html:190
-#: ckanext/canada/templates/snippets/cdts/header.html:130
+#: ckanext/canada/templates/home/quick_links.html:191
+#: ckanext/canada/templates/snippets/cdts/header.html:134
 msgid "Parliamentary Committee appearances for deputy heads"
 msgstr ""
 
-#: ckanext/canada/templates/home/quick_links.html:191
+#: ckanext/canada/templates/home/quick_links.html:192
 msgid ""
 "Access, add or modify briefing packages for Parliamentary Committee "
 "appearance for your deputy head."
@@ -2248,7 +2277,7 @@ msgstr ""
 #: ckanext/canada/templates/organization/index.html:26
 #: ckanext/canada/templates/organization/members.html:10
 #: ckanext/canada/templates/organization/read_base.html:6
-#: ckanext/canada/templates/snippets/cdts/header.html:154
+#: ckanext/canada/templates/snippets/cdts/header.html:158
 #: ckanext/canada/templates/user/read.html:28
 #: ckanext/canada/templates/user/read_base.html:99
 msgid "Organizations"
@@ -3142,27 +3171,27 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: ckanext/canada/templates/snippets/cdts/header.html:159
+#: ckanext/canada/templates/snippets/cdts/header.html:163
 msgid "FAQ"
 msgstr ""
 
-#: ckanext/canada/templates/snippets/cdts/header.html:189
+#: ckanext/canada/templates/snippets/cdts/header.html:193
 #: ckanext/canada/templates/user/dashboard.html:4
 #: ckanext/canada/templates/user/dashboard_datasets.html:15
 #: ckanext/canada/templates/user/dashboard_groups.html:9
 #: ckanext/canada/templates/user/dashboard_organizations.html:9
 msgid "Dashboard"
 msgstr ""
 
-#: ckanext/canada/templates/snippets/cdts/header.html:205
+#: ckanext/canada/templates/snippets/cdts/header.html:209
 msgid "Get Help"
 msgstr ""
 
-#: ckanext/canada/templates/snippets/cdts/header.html:226
+#: ckanext/canada/templates/snippets/cdts/header.html:230
 msgid "Signed in as"
 msgstr ""
 
-#: ckanext/canada/templates/snippets/cdts/header.html:226
+#: ckanext/canada/templates/snippets/cdts/header.html:230
 msgid "View profile"
 msgstr ""