diff --git a/changes/open-4091.fix b/changes/open-4091.fix new file mode 100644 index 0000000..16177d3 --- /dev/null +++ b/changes/open-4091.fix @@ -0,0 +1,3 @@ +Adding string fields destination_2_eng/fra and destination_other_eng/fra to the defintion +of the Travel search in order to include these multi-value fields in the search results +export files. diff --git a/travelq/db/travelq_fields.json b/travelq/db/travelq_fields.json index 0151407..62e680f 100644 --- a/travelq/db/travelq_fields.json +++ b/travelq/db/travelq_fields.json @@ -1,120 +1,4 @@ [ - { - "alt_format": "", - "default_export_value": "date|0001-01-01T00:00:00", - "fid": "travelq_end_date", - "field_id": "end_date", - "format_name": "travelq", - "is_default_display": false, - "is_default_month": false, - "is_default_year": false, - "is_search_facet": false, - "label_en": "Travel End Date", - "label_fr": "Date de fin du voyage", - "search_id": "travelq", - "solr_extra_fields": "end_date_en,end_date_fr", - "solr_facet_display_order": 0, - "solr_facet_display_reversed": false, - "solr_facet_limit": 100, - "solr_facet_snippet": "", - "solr_facet_sort": "count", - "solr_field_export": "", - "solr_field_indexed": true, - "solr_field_is_coded": false, - "solr_field_is_currency": false, - "solr_field_lang": "bi", - "solr_field_multivalue_delimeter": ",", - "solr_field_multivalued": false, - "solr_field_stored": true, - "solr_field_type": "pdate" - }, - { - "alt_format": "", - "default_export_value": "str|-", - "fid": "travelq_total_range", - "field_id": "total_range", - "format_name": "travelq", - "is_default_display": false, - "is_default_month": false, - "is_default_year": false, - "is_search_facet": true, - "label_en": "Total", - "label_fr": "Total", - "search_id": "travelq", - "solr_extra_fields": "", - "solr_facet_display_order": 3, - "solr_facet_display_reversed": false, - "solr_facet_limit": 100, - "solr_facet_snippet": "", - "solr_facet_sort": "index", - "solr_field_export": "", - "solr_field_indexed": true, - "solr_field_is_coded": true, - "solr_field_is_currency": false, - "solr_field_lang": "bi", - "solr_field_multivalue_delimeter": ",", - "solr_field_multivalued": false, - "solr_field_stored": true, - "solr_field_type": "string" - }, - { - "alt_format": "", - "default_export_value": "str|-", - "fid": "travelq_format", - "field_id": "format", - "format_name": "travelq", - "is_default_display": false, - "is_default_month": false, - "is_default_year": false, - "is_search_facet": true, - "label_en": "Record Format", - "label_fr": "Format d'enregistrement", - "search_id": "travelq", - "solr_extra_fields": "", - "solr_facet_display_order": 0, - "solr_facet_display_reversed": false, - "solr_facet_limit": 100, - "solr_facet_snippet": "", - "solr_facet_sort": "count", - "solr_field_export": "", - "solr_field_indexed": true, - "solr_field_is_coded": true, - "solr_field_is_currency": false, - "solr_field_lang": "bi", - "solr_field_multivalue_delimeter": ",", - "solr_field_multivalued": false, - "solr_field_stored": true, - "solr_field_type": "string" - }, - { - "alt_format": "", - "default_export_value": "str|-", - "fid": "travelq_title_en", - "field_id": "title_en", - "format_name": "travelq", - "is_default_display": true, - "is_default_month": false, - "is_default_year": false, - "is_search_facet": false, - "label_en": "Title (English)", - "label_fr": "Titre (anglais)", - "search_id": "travelq", - "solr_extra_fields": "", - "solr_facet_display_order": 0, - "solr_facet_display_reversed": false, - "solr_facet_limit": 100, - "solr_facet_snippet": "", - "solr_facet_sort": "count", - "solr_field_export": "title_eng", - "solr_field_indexed": true, - "solr_field_is_coded": false, - "solr_field_is_currency": false, - "solr_field_lang": "en", - "solr_field_multivalue_delimeter": ",", - "solr_field_multivalued": false, - "solr_field_stored": true, - "solr_field_type": "search_text_en" - }, { "alt_format": "", "default_export_value": "float|0.0", @@ -753,35 +637,6 @@ "solr_field_stored": true, "solr_field_type": "search_text_en" }, - { - "alt_format": "", - "default_export_value": "str|-", - "fid": "travelq_additional_comments_en", - "field_id": "additional_comments_en", - "format_name": "travelq", - "is_default_display": false, - "is_default_month": false, - "is_default_year": false, - "is_search_facet": false, - "label_en": "Additional Comments English", - "label_fr": "Additional Comments English", - "search_id": "travelq", - "solr_extra_fields": "", - "solr_facet_display_order": 0, - "solr_facet_display_reversed": false, - "solr_facet_limit": 100, - "solr_facet_snippet": "", - "solr_facet_sort": "count", - "solr_field_export": "additional_comments_eng", - "solr_field_indexed": true, - "solr_field_is_coded": false, - "solr_field_is_currency": false, - "solr_field_lang": "en", - "solr_field_multivalue_delimeter": ",", - "solr_field_multivalued": false, - "solr_field_stored": true, - "solr_field_type": "search_text_en" - }, { "alt_format": "ALL", "default_export_value": "str|-", @@ -917,7 +772,7 @@ "solr_facet_limit": 100, "solr_facet_snippet": "", "solr_facet_sort": "count", - "solr_field_export": "", + "solr_field_export": "destination_2_fra", "solr_field_indexed": true, "solr_field_is_coded": false, "solr_field_is_currency": false, @@ -930,15 +785,15 @@ { "alt_format": "", "default_export_value": "str|-", - "fid": "travelq_destination_other_fr", - "field_id": "destination_other_fr", + "fid": "travelq_destination_other_en", + "field_id": "destination_other_en", "format_name": "travelq", "is_default_display": false, "is_default_month": false, "is_default_year": false, "is_search_facet": false, - "label_en": "Other places visited (French)", - "label_fr": "Endroits visit\u00e9s (fran\u00e7ais)", + "label_en": "Other places visited (English)", + "label_fr": "Endroits visit\u00e9s (anglais)", "search_id": "travelq", "solr_extra_fields": "", "solr_facet_display_order": 0, @@ -946,15 +801,73 @@ "solr_facet_limit": 100, "solr_facet_snippet": "", "solr_facet_sort": "count", - "solr_field_export": "", + "solr_field_export": "destination_other_eng", "solr_field_indexed": true, "solr_field_is_coded": false, "solr_field_is_currency": false, - "solr_field_lang": "fr", + "solr_field_lang": "en", "solr_field_multivalue_delimeter": ";", "solr_field_multivalued": true, "solr_field_stored": true, - "solr_field_type": "search_text_fr" + "solr_field_type": "search_text_en" + }, + { + "alt_format": "", + "default_export_value": "str|-", + "fid": "travelq_destination_2_en", + "field_id": "destination_2_en", + "format_name": "travelq", + "is_default_display": false, + "is_default_month": false, + "is_default_year": false, + "is_search_facet": false, + "label_en": "Second place visited (English)", + "label_fr": "Endroits visit\u00e9s (anglais)", + "search_id": "travelq", + "solr_extra_fields": "", + "solr_facet_display_order": 0, + "solr_facet_display_reversed": false, + "solr_facet_limit": 100, + "solr_facet_snippet": "", + "solr_facet_sort": "count", + "solr_field_export": "destination_2_eng", + "solr_field_indexed": true, + "solr_field_is_coded": false, + "solr_field_is_currency": false, + "solr_field_lang": "en", + "solr_field_multivalue_delimeter": ",", + "solr_field_multivalued": false, + "solr_field_stored": true, + "solr_field_type": "search_text_en" + }, + { + "alt_format": "", + "default_export_value": "str|-", + "fid": "travelq_format", + "field_id": "format", + "format_name": "travelq", + "is_default_display": false, + "is_default_month": false, + "is_default_year": false, + "is_search_facet": true, + "label_en": "Record Format", + "label_fr": "Format d'enregistrement", + "search_id": "travelq", + "solr_extra_fields": "", + "solr_facet_display_order": 0, + "solr_facet_display_reversed": false, + "solr_facet_limit": 100, + "solr_facet_snippet": "", + "solr_facet_sort": "count", + "solr_field_export": "", + "solr_field_indexed": true, + "solr_field_is_coded": true, + "solr_field_is_currency": false, + "solr_field_lang": "bi", + "solr_field_multivalue_delimeter": ",", + "solr_field_multivalued": false, + "solr_field_stored": true, + "solr_field_type": "string" }, { "alt_format": "", @@ -988,15 +901,15 @@ { "alt_format": "", "default_export_value": "str|-", - "fid": "travelq_destination_2_en", - "field_id": "destination_2_en", + "fid": "travelq_title_en", + "field_id": "title_en", "format_name": "travelq", - "is_default_display": false, + "is_default_display": true, "is_default_month": false, "is_default_year": false, "is_search_facet": false, - "label_en": "Second place visited (English)", - "label_fr": "Endroits visit\u00e9s (anglais)", + "label_en": "Title (English)", + "label_fr": "Titre (anglais)", "search_id": "travelq", "solr_extra_fields": "", "solr_facet_display_order": 0, @@ -1004,7 +917,7 @@ "solr_facet_limit": 100, "solr_facet_snippet": "", "solr_facet_sort": "count", - "solr_field_export": "", + "solr_field_export": "title_eng", "solr_field_indexed": true, "solr_field_is_coded": false, "solr_field_is_currency": false, @@ -1017,15 +930,15 @@ { "alt_format": "", "default_export_value": "str|-", - "fid": "travelq_destination_other_en", - "field_id": "destination_other_en", + "fid": "travelq_destination_other_fr", + "field_id": "destination_other_fr", "format_name": "travelq", "is_default_display": false, "is_default_month": false, "is_default_year": false, "is_search_facet": false, - "label_en": "Other places visited (English)", - "label_fr": "Endroits visit\u00e9s (anglais)", + "label_en": "Other places visited (French)", + "label_fr": "Endroits visit\u00e9s (fran\u00e7ais)", "search_id": "travelq", "solr_extra_fields": "", "solr_facet_display_order": 0, @@ -1033,14 +946,101 @@ "solr_facet_limit": 100, "solr_facet_snippet": "", "solr_facet_sort": "count", - "solr_field_export": "", + "solr_field_export": "destination_other_fra", "solr_field_indexed": true, "solr_field_is_coded": false, "solr_field_is_currency": false, - "solr_field_lang": "en", + "solr_field_lang": "fr", "solr_field_multivalue_delimeter": ";", "solr_field_multivalued": true, "solr_field_stored": true, + "solr_field_type": "search_text_fr" + }, + { + "alt_format": "", + "default_export_value": "str|-", + "fid": "travelq_total_range", + "field_id": "total_range", + "format_name": "travelq", + "is_default_display": false, + "is_default_month": false, + "is_default_year": false, + "is_search_facet": true, + "label_en": "Total", + "label_fr": "Total", + "search_id": "travelq", + "solr_extra_fields": "", + "solr_facet_display_order": 3, + "solr_facet_display_reversed": false, + "solr_facet_limit": 100, + "solr_facet_snippet": "", + "solr_facet_sort": "index", + "solr_field_export": "", + "solr_field_indexed": true, + "solr_field_is_coded": true, + "solr_field_is_currency": false, + "solr_field_lang": "bi", + "solr_field_multivalue_delimeter": ",", + "solr_field_multivalued": false, + "solr_field_stored": true, + "solr_field_type": "string" + }, + { + "alt_format": "", + "default_export_value": "date|0001-01-01T00:00:00", + "fid": "travelq_end_date", + "field_id": "end_date", + "format_name": "travelq", + "is_default_display": false, + "is_default_month": false, + "is_default_year": false, + "is_search_facet": false, + "label_en": "Travel End Date", + "label_fr": "Date de fin du voyage", + "search_id": "travelq", + "solr_extra_fields": "end_date_en,end_date_fr", + "solr_facet_display_order": 0, + "solr_facet_display_reversed": false, + "solr_facet_limit": 100, + "solr_facet_snippet": "", + "solr_facet_sort": "count", + "solr_field_export": "", + "solr_field_indexed": true, + "solr_field_is_coded": false, + "solr_field_is_currency": false, + "solr_field_lang": "bi", + "solr_field_multivalue_delimeter": ",", + "solr_field_multivalued": false, + "solr_field_stored": true, + "solr_field_type": "pdate" + }, + { + "alt_format": "", + "default_export_value": "str|-", + "fid": "travelq_additional_comments_en", + "field_id": "additional_comments_en", + "format_name": "travelq", + "is_default_display": false, + "is_default_month": false, + "is_default_year": false, + "is_search_facet": false, + "label_en": "Additional Comments English", + "label_fr": "Additional Comments English", + "search_id": "travelq", + "solr_extra_fields": "", + "solr_facet_display_order": 0, + "solr_facet_display_reversed": false, + "solr_facet_limit": 100, + "solr_facet_snippet": "", + "solr_facet_sort": "count", + "solr_field_export": "additional_comments_eng", + "solr_field_indexed": true, + "solr_field_is_coded": false, + "solr_field_is_currency": false, + "solr_field_lang": "en", + "solr_field_multivalue_delimeter": ",", + "solr_field_multivalued": false, + "solr_field_stored": true, "solr_field_type": "search_text_en" } ] \ No newline at end of file diff --git a/travelq/snippets/travelq_default_main_content_body_top.html b/travelq/snippets/travelq_default_main_content_body_top.html index 84a195d..156d6c0 100644 --- a/travelq/snippets/travelq_default_main_content_body_top.html +++ b/travelq/snippets/travelq_default_main_content_body_top.html @@ -30,7 +30,7 @@
Explore travel expenses for different organizations. You can view costs, create reports, and share the info.
- +
Examine the Travel Expenses Data Visualization