Merge branch 'master' into update-wet-theme

open-data · Oct 17, 2019 · 0074244 · 0074244
2 parents b231374 + 8df4569
commit 0074244
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 10 deletions.
diff --git a/bin/pd/Makefile b/bin/pd/Makefile
@@ -316,6 +316,7 @@ rebuild-grants: $(workdir)/filtered/grants.csv $(workdir)/filtered/grants-nil.cs
 	"$(workdir)/filtered/grants.csv" "$(workdir)/amendments/grants.csv"
 	$(paster) --plugin=ckanext-canada grants rebuild --lenient -c $(portal_ini) \
 	-f "$(workdir)/amendments/grants.csv" "$(workdir)/filtered/grants-nil.csv"
+	$(ogc_search)/load_gc_to_solr.py "$(workdir)/filtered/grants.csv" "$(workdir)/filtered/grants-nil.csv"
 
 $(workdir)/grants.csv:
 	$(paster) $(combine) grants -d $(workdir) -c $(registry_ini)

diff --git a/ckanext/canada/schemas/dataset.yaml b/ckanext/canada/schemas/dataset.yaml
@@ -33,6 +33,7 @@ dataset_fields:
     - primary
     - code
     - api
+    - app
 
 # FGP fields (hidden from form)
 - field_name: metadata_contact

diff --git a/ckanext/canada/schemas/presets.yaml b/ckanext/canada/schemas/presets.yaml
@@ -57,6 +57,10 @@ presets:
         en: API
         fr: API
       value: api
+    - label:
+        en: Application
+        fr: Application
+      value: app
     - label:
         en: Geospatial
         fr: Géospatiales

diff --git a/ckanext/canada/tables/contracts.yaml b/ckanext/canada/tables/contracts.yaml
@@ -758,6 +758,7 @@ resources:
       en: Mandatory for contracts after 2019-01-01
       fr: Obligatoire pour les marchés conclus après le 2019-01-01
     excel_required_formula: '{contract_date}>=DATE(2019,1,1)'
+    excel_error_formula: 'ISERROR(SEARCH("|"&TRIM({cell})&"|","|true|t|vrai|v|1|yes|y|oui|o|false|f|faux|0|no|n|non|"))'
     datastore_type: text
     excel_full_text_choices: false
     choices:
@@ -832,6 +833,7 @@ resources:
       en: Only mandatory when the Intellectual Property data field is one of the following values (A1, A2, A3, A41, A42, A43, A5, A8 or B).
     datastore_type: text
     excel_required_formula: 'NOT(OR({intellectual_property_code}="C",{intellectual_property_code}="NA",{intellectual_property_code}=""))'
+    excel_error_formula: 'ISERROR(SEARCH("|"&TRIM({cell})&"|","|true|t|vrai|v|1|yes|y|oui|o|false|f|faux|0|no|n|non|"))'
     excel_full_text_choices: false
     choices:
       Y:
@@ -852,6 +854,7 @@ resources:
       en: Mandatory for contracts after 2019-01-01
       fr: Obligatoire pour les marchés conclus après le 2019-01-01
     excel_required_formula: '{contract_date}>=DATE(2019,1,1)'
+    excel_error_formula: 'ISERROR(SEARCH("|"&TRIM({cell})&"|","|true|t|vrai|v|1|yes|y|oui|o|false|f|faux|0|no|n|non|"))'
     datastore_type: text
     excel_full_text_choices: false
     choices:
@@ -934,6 +937,7 @@ resources:
       en: Mandatory for contracts after 2019-06-21
       fr: Obligatoire pour les marchés conclus après le 2019-06-21
     excel_required_formula: '{contract_date}>=DATE(2019,6,21)'
+    excel_error_formula: 'ISERROR(SEARCH("|"&TRIM({cell})&"|","|true|t|vrai|v|1|yes|y|oui|o|false|f|faux|0|no|n|non|"))'
     datastore_type: text
     excel_full_text_choices: false
     choices:
@@ -971,6 +975,7 @@ resources:
         NEW.aboriginal_business := truthy_to_yn(NEW.aboriginal_business);
         NEW.potential_commercial_exploitation := truthy_to_yn(NEW.potential_commercial_exploitation);
         NEW.former_public_servant := truthy_to_yn(NEW.former_public_servant);
+        NEW.ministers_office := truthy_to_yn(NEW.ministers_office);
 
         PERFORM not_empty(NEW.contract_date, 'contract_date');
         IF NEW.contract_date >= '2019-01-01'::date THEN
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,7 @@ dataset_fields: @@
         - primary
         - code
         - api
+        - app
     # FGP fields (hidden from form)
     - field_name: metadata_contact
@@ Expand Down @@