Merge branch 'master' into feature/portal-sync-harvester

# Conflicts: # ckanext/canada/i18n/ckanext-canada.pot # ckanext/canada/i18n/en/LC_MESSAGES/ckanext-canada.po # ckanext/canada/i18n/fr/LC_MESSAGES/ckanext-canada.po ### RESOLVED.
open-data · Oct 17, 2024 · 30a1abf · 30a1abf
2 parents 9a306be + 7986755
commit 30a1abf
Show file tree

Hide file tree

Showing 14 changed files with 211 additions and 150 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,4 @@ links/who.ini
 ckanext/canada/templates/public/snippets/site_message_*
 ckanext/canada/download/*.jsonl
 **.mo
+*.xcf
diff --git a/bin/filter/filter_service_std.py b/bin/filter/filter_service_std.py
@@ -52,8 +52,8 @@ def main():
         if row['target']:
             target = float(row['target'])
 
-            # if no total_volume then target_met is not possible
-            if den <= 0:
+            # if no performance(volume_meeting_target/total_volume) then target_met is not possible
+            if row['performance'] is None:
                 row['target_met'] = 'NA'
 
             # if performance >= target then target is met

diff --git a/bin/pd/Makefile b/bin/pd/Makefile
@@ -556,6 +556,9 @@ rebuild-reclassification: $(workdir)/filtered/reclassification.csv $(workdir)/fi
 	@$(echo_date) Rebuilding Position Reclassification...
 	$(ckan_command) -c $(portal_ini) pd rebuild reclassification --lenient --has-nil \
 	-f "$(workdir)/filtered/reclassification.csv" -f "$(workdir)/filtered/reclassification-nil.csv"
+	@$(echo_date) Rebuilding Advanced Search...
+	@$(oc_search) import_data_csv --csv "$(workdir)/filtered/reclassification.csv" --search reclassification
+	@$(oc_search) import_data_csv --csv "$(workdir)/filtered/reclassification-nil.csv" --search reclassification --nothing_to_report	
 
 $(workdir)/reclassification.csv:
 	$(ckan_command) -c $(registry_ini) $(combine) reclassification -d $(workdir)

diff --git a/changes/0009.bugfix b/changes/0009.bugfix
@@ -0,0 +1 @@
+Fixed an issue with the Standard Service filter script not handling null `performance` fields.
diff --git a/changes/1518.changes b/changes/1518.changes
@@ -0,0 +1 @@
+Reclassification Search has been implemented on OC Search. For now, the Proactive Disclosure Makefile is being modified to rebuild both the Drupal and Django searches during the nightly rebuild.
diff --git a/changes/1520.changes b/changes/1520.changes
@@ -0,0 +1 @@
+Markdown help popup has been translated.
diff --git a/changes/1521.feature b/changes/1521.feature
@@ -0,0 +1,5 @@
+Added additional Resource formats sprite sheet and added supported Resource formats:
+
+* FLV
+* MKV
+* MP4
diff --git a/ckanext/canada/assets/public/canada_public.css b/ckanext/canada/assets/public/canada_public.css
@@ -478,16 +478,6 @@ ul.resource-list > li.resource-item > div.canada-resource-list-badges a.validati
 ul.resource-list > li.resource-item > div.canada-resource-list-badges{
   align-self: last baseline;
 }
-ul.resource-list > li.resource-item span.format-label[data-format="pbix"]{
-  background-image: url("/data/static/img/power_bi.svg"), url("/static/img/power_bi.svg");
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  background-position: 0 0;
-  width: 33px;
-  height: 36px;
-  transform: none !important;
-  margin: 0 !important;
-}
 .resource-item .resource-action-links{
   display: block !important;
   position: relative !important;
@@ -658,6 +648,39 @@ body ul.nav li.view-item a i.icon::before{
 ###################*/
 
 
+/*############################
+##  Custom Resource Sprites ##
+##############################*/
+ul.resource-list > li.resource-item span.format-label[data-format="pbix"]{
+  background-image: url("/data/static/img/sprite-resource-additional-icons.png"), url("/static/img/sprite-resource-additional-icons.png");
+  background-repeat: no-repeat;
+  width: 60px;
+  height: 65px;
+  background-position: -120px -220px;
+  transform: scale(0.53);
+  margin: -14px 0 0 -14px;
+}
+ul.resource-list > li.resource-item span.format-label[data-format="mp4"],
+ul.resource-list > li.resource-item span.format-label[data-format="flv"],
+ul.resource-list > li.resource-item span.format-label[data-format="mov"],
+ul.resource-list > li.resource-item span.format-label[data-format="avi"],
+ul.resource-list > li.resource-item span.format-label[data-format="mkv"],
+ul.resource-list > li.resource-item span.format-label[data-format="wmv"]{
+  background-image: url("/data/static/img/sprite-resource-additional-icons.png"), url("/static/img/sprite-resource-additional-icons.png");
+  background-repeat: no-repeat;
+  width: 60px;
+  height: 65px;
+  background-position: -220px -220px;
+  transform: scale(0.53);
+  margin: -14px 0 0 -14px;
+}
+/*############################
+##            END           ##
+##  Custom Resource Sprites ##
+##            END           ##
+##############################*/
+
+
 /*###############################
 ## FontAwesome5 Icon Overrides ##
 #################################*/

diff --git a/ckanext/canada/i18n/ckanext-canada.pot b/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-10-17 12:48+0000\n"
+"POT-Creation-Date: 2024-10-17 12:56+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"
@@ -529,62 +529,79 @@ msgstr ""
 msgid "Hide"
 msgstr ""
 
-#: ckanext/canada/strings.py:68
+#: ckanext/canada/strings.py:66
+msgid ""
+"You can use <a href=\"#markdown\" title=\"Markdown quick reference\" data-"
+"target=\"popover\" data-content=\"{}\" data-html=\"true\">Markdown "
+"formatting</a> here"
+msgstr ""
+
+#: ckanext/canada/strings.py:67
+msgid ""
+"<pre><p>__bold text__</p><p>_italic text_</p><p>* list<br>* of<br>* "
+"items</p><p>1. numbered<br>2. list<br>3. of "
+"items</p><p>https://auto.link.ed/</p><p>[Formatted "
+"Link](https://formatted.link)</p><p>> block quote</p></pre><p class='text-"
+"muted'><b>Please note:</b> HTML tags are stripped out for security "
+"reasons</p>"
+msgstr ""
+
+#: ckanext/canada/strings.py:70
 msgid "Please upload a file or link to an external resource"
 msgstr ""
 
-#: ckanext/canada/strings.py:69
+#: ckanext/canada/strings.py:71
 msgid "Cannot upload files of this type"
 msgstr ""
 
-#: ckanext/canada/strings.py:70
+#: ckanext/canada/strings.py:72
 msgid "Cannot link files of this type"
 msgstr ""
 
-#: ckanext/canada/strings.py:71
+#: ckanext/canada/strings.py:73
 msgid "Your password must be {} characters or longer."
 msgstr ""
 
-#: ckanext/canada/strings.py:72
+#: ckanext/canada/strings.py:74
 msgid ""
 "Your password must consist of at least three of the following character sets:"
 " uppercase characters, lowercase characters, digits, punctuation & special "
 "characters."
 msgstr ""
 
-#: ckanext/canada/strings.py:74
+#: ckanext/canada/strings.py:76
 msgid "Your password cannot be the same as your username."
 msgstr ""
 
-#: ckanext/canada/strings.py:77
+#: ckanext/canada/strings.py:79
 msgid "These fields have been removed, click update below to save your changes."
 msgstr ""
 
-#: ckanext/canada/strings.py:78
+#: ckanext/canada/strings.py:80
 msgid "These fields have been removed."
 msgstr ""
 
-#: ckanext/canada/strings.py:81
+#: ckanext/canada/strings.py:83
 msgid "Your form submission could not be validated, please re-submit the form."
 msgstr ""
 
-#: ckanext/canada/strings.py:84
+#: ckanext/canada/strings.py:86
 msgid "Open Government Portal"
 msgstr ""
 
-#: ckanext/canada/strings.py:85
+#: ckanext/canada/strings.py:87
 msgid "Open Government Portal (staging)"
 msgstr ""
 
-#: ckanext/canada/strings.py:88
+#: ckanext/canada/strings.py:90
 msgid "Single"
 msgstr ""
 
-#: ckanext/canada/strings.py:89
+#: ckanext/canada/strings.py:91
 msgid "Repeatable"
 msgstr ""
 
-#: ckanext/canada/strings.py:90
+#: ckanext/canada/strings.py:92
 msgid "Optional"
 msgstr ""
 

diff --git a/ckanext/canada/i18n/en/LC_MESSAGES/ckanext-canada.po b/ckanext/canada/i18n/en/LC_MESSAGES/ckanext-canada.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  CKAN\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-10-17 12:48+0000\n"
+"POT-Creation-Date: 2024-10-17 12:56+0000\n"
 "PO-Revision-Date: 2014-01-23 13:04+0000\n"
 "Last-Translator: Sean Hammond <[email protected]>\n"
 "Language: en\n"
@@ -538,62 +538,79 @@ msgstr ""
 msgid "Hide"
 msgstr ""
 
-#: ckanext/canada/strings.py:68
+#: ckanext/canada/strings.py:66
+msgid ""
+"You can use <a href=\"#markdown\" title=\"Markdown quick reference\" "
+"data-target=\"popover\" data-content=\"{}\" data-html=\"true\">Markdown "
+"formatting</a> here"
+msgstr ""
+
+#: ckanext/canada/strings.py:67
+msgid ""
+"<pre><p>__bold text__</p><p>_italic text_</p><p>* list<br>* of<br>* "
+"items</p><p>1. numbered<br>2. list<br>3. of "
+"items</p><p>https://auto.link.ed/</p><p>[Formatted "
+"Link](https://formatted.link)</p><p>> block quote</p></pre><p class"
+"='text-muted'><b>Please note:</b> HTML tags are stripped out for security"
+" reasons</p>"
+msgstr ""
+
+#: ckanext/canada/strings.py:70
 msgid "Please upload a file or link to an external resource"
 msgstr ""
 
-#: ckanext/canada/strings.py:69
+#: ckanext/canada/strings.py:71
 msgid "Cannot upload files of this type"
 msgstr ""
 
-#: ckanext/canada/strings.py:70
+#: ckanext/canada/strings.py:72
 msgid "Cannot link files of this type"
 msgstr ""
 
-#: ckanext/canada/strings.py:71
+#: ckanext/canada/strings.py:73
 msgid "Your password must be {} characters or longer."
 msgstr ""
 
-#: ckanext/canada/strings.py:72
+#: ckanext/canada/strings.py:74
 msgid ""
 "Your password must consist of at least three of the following character "
 "sets: uppercase characters, lowercase characters, digits, punctuation & "
 "special characters."
 msgstr ""
 
-#: ckanext/canada/strings.py:74
+#: ckanext/canada/strings.py:76
 msgid "Your password cannot be the same as your username."
 msgstr ""
 
-#: ckanext/canada/strings.py:77
+#: ckanext/canada/strings.py:79
 msgid "These fields have been removed, click update below to save your changes."
 msgstr "These fields will be removed once you save your changes."
 
-#: ckanext/canada/strings.py:78
+#: ckanext/canada/strings.py:80
 msgid "These fields have been removed."
 msgstr ""
 
-#: ckanext/canada/strings.py:81
+#: ckanext/canada/strings.py:83
 msgid "Your form submission could not be validated, please re-submit the form."
 msgstr ""
 
-#: ckanext/canada/strings.py:84
+#: ckanext/canada/strings.py:86
 msgid "Open Government Portal"
 msgstr ""
 
-#: ckanext/canada/strings.py:85
+#: ckanext/canada/strings.py:87
 msgid "Open Government Portal (staging)"
 msgstr ""
 
-#: ckanext/canada/strings.py:88
+#: ckanext/canada/strings.py:90
 msgid "Single"
 msgstr ""
 
-#: ckanext/canada/strings.py:89
+#: ckanext/canada/strings.py:91
 msgid "Repeatable"
 msgstr ""
 
-#: ckanext/canada/strings.py:90
+#: ckanext/canada/strings.py:92
 msgid "Optional"
 msgstr ""
 
@@ -2456,9 +2473,8 @@ msgid "View Harvest Source"
 msgstr ""
 
 #: ckanext/canada/templates/package/edit_base.html:13
-#, fuzzy
 msgid "View dataset"
-msgstr "0 Records"
+msgstr ""
 
 #: ckanext/canada/templates/package/edit_view.html:6
 #: ckanext/canada/templates/package/snippets/resource_views_list_item.html:17
@@ -2559,9 +2575,8 @@ msgid "Issued by"
 msgstr ""
 
 #: ckanext/canada/templates/package/read.html:168
-#, fuzzy
 msgid "Harvested Datasets"
-msgstr "What are records?"
+msgstr ""
 
 #: ckanext/canada/templates/package/read.html:184
 msgid "Related Items"
@@ -2615,9 +2630,8 @@ msgstr ""
 
 #: ckanext/canada/templates/package/read_base.html:76
 #: ckanext/canada/templates/source/read_base.html:29
-#, fuzzy
 msgid "Harvested Datasets:"
-msgstr "What are records?"
+msgstr ""
 
 #: ckanext/canada/templates/package/read_base.html:85
 msgid "Temporal Coverage"
@@ -4162,9 +4176,8 @@ msgid "Popular"
 msgstr ""
 
 #: ../ckanext-harvest/ckanext/harvest/templates/source/search.html:34
-#, fuzzy
 msgid "Search harvest sources..."
-msgstr "Search records..."
+msgstr ""
 
 #: ../ckanext-harvest/ckanext/harvest/templates/source/job/read.html:3
 #: ../ckanext-harvest/ckanext/harvest/templates/source/job/read.html:12