diff --git a/bcap/functions/bcap_site_descriptors.py b/bcap/functions/bcap_site_descriptors.py index 2d29184b..7a5c6df0 100644 --- a/bcap/functions/bcap_site_descriptors.py +++ b/bcap/functions/bcap_site_descriptors.py @@ -59,7 +59,7 @@ class BCAPSiteDescriptors(AbstractPrimaryDescriptorsFunction): aliases.REGISTRATION_STATUS, aliases.TYPOLOGY_CLASS, ] - _popup_nodes = [aliases.CITY, "address"] + _popup_nodes = [aliases.REGISTRATION_STATUS, aliases.NAME, "typologies"] _card_nodes = [aliases.REGISTRATION_STATUS, aliases.NAME, "typologies"] _address_nodes = [ [aliases.STREET_NUMBER, aliases.STREET_NAME], @@ -131,6 +131,10 @@ def get_primary_descriptor_from_nodes( return_value += BCAPSiteDescriptors._format_value( "Descriptor", typology_values, config ) + elif alias == aliases.REGISTRATION_STATUS and alias in display_values: + return_value += BCAPSiteDescriptors._format_value( + "Registration Status", display_values[alias], config + ) elif alias in display_values: return_value += BCAPSiteDescriptors._format_value( nodes[alias].name, display_values[alias], config diff --git a/bcap/media/js/views/components/search/cross-model-advanced-search.js b/bcap/media/js/views/components/search/cross-model-advanced-search.js index 9daf7e9d..30dfc19f 100644 --- a/bcap/media/js/views/components/search/cross-model-advanced-search.js +++ b/bcap/media/js/views/components/search/cross-model-advanced-search.js @@ -290,8 +290,18 @@ let view_model = BaseFilter.extend({ return false; } + let op = filter_value.op; + + if (op === 'null' || op === 'not_null') { + return true; + } + let val = filter_value.val; + if (val === 'null' || val === 'not_null') { + return true; + } + if (val === undefined || val === null || val === '') { return false; } diff --git a/bcap/pkg/system_settings/System_Settings.json b/bcap/pkg/system_settings/System_Settings.json index a9f23467..266832df 100644 --- a/bcap/pkg/system_settings/System_Settings.json +++ b/bcap/pkg/system_settings/System_Settings.json @@ -181,7 +181,7 @@ "c5a2b94a-fadd-11e6-a029-6c4008b05c4c": { "en": { "direction": "ltr", - "value": "BC Archaeology Portal" + "value": "BCAP" } }, "c5a2bdb3-fadd-11e6-8c96-6c4008b05c4c": { @@ -343,4 +343,4 @@ } ] } -} \ No newline at end of file +} diff --git a/bcap/search_components/cross_model_advanced_search.py b/bcap/search_components/cross_model_advanced_search.py index 9c9feecb..7917057d 100644 --- a/bcap/search_components/cross_model_advanced_search.py +++ b/bcap/search_components/cross_model_advanced_search.py @@ -74,7 +74,6 @@ from arches.app.search.search_engine_factory import SearchEngineFactory from arches.app.utils.betterJSONSerializer import JSONDeserializer - details = { "classname": "CrossModelAdvancedSearch", "componentname": "cross-model-advanced-search", @@ -225,7 +224,16 @@ def _is_valid(self, value: Any) -> bool: return False if isinstance(value, dict): + op = value.get("op", "") + + if op in ("null", "not_null"): + return True + val = value.get("val", "") + + if val in ("null", "not_null"): + return True + return bool(val) or val == 0 or val is False return True diff --git a/bcap/src/bcap/components/pages/details/ArchaeologicalSite/sections/DetailsSection2.vue b/bcap/src/bcap/components/pages/details/ArchaeologicalSite/sections/DetailsSection2.vue index 3ad088bc..403fa0d3 100644 --- a/bcap/src/bcap/components/pages/details/ArchaeologicalSite/sections/DetailsSection2.vue +++ b/bcap/src/bcap/components/pages/details/ArchaeologicalSite/sections/DetailsSection2.vue @@ -187,8 +187,9 @@ const { const authorityData = computed(() => currentData.value?.authority || []); const siteNamesData = computed(() => currentData.value?.site_names || []); + const temporaryNumbersData = computed((): TemporaryNumberTile[] => { - return (props.siteVisitData ?? []) + const all = (props.siteVisitData ?? []) .map( (visit) => visit.aliased_data?.identification?.aliased_data @@ -198,6 +199,21 @@ const temporaryNumbersData = computed((): TemporaryNumberTile[] => { (tile): tile is TemporaryNumberTile => !!tile?.aliased_data?.temporary_number?.node_value, ); + + const seen = new Set(); + + return all.filter((tile) => { + const val = String( + tile.aliased_data?.temporary_number?.node_value ?? '', + ); + + if (seen.has(val)) { + return false; + } + + seen.add(val); + return true; + }); }); const siteAlertDataRaw = computed(() => { @@ -441,7 +457,7 @@ const parentSite = computed(() => { -import { ref, computed, type Ref } from 'vue'; +import { ref, computed, watchEffect, type Ref } from 'vue'; import type { DetailsData } from '@/bcap/types.ts'; import { formatDateTime } from '@/bcap/util.ts'; import type { EditLogData } from '@/bcgov_arches_common/types.ts'; @@ -56,6 +56,11 @@ const { data: relatedSiteVisits } = useRelatedResourceData( siteVisitResourceIdComputed, ); +watchEffect(() => { + const name = props.data.displayname || ''; + document.title = name ? `BCAP - ${name} - Details` : 'BCAP'; +}); + const archSiteTileIds = computed(() => { const tileIds: string[] = []; if (!resourceData.value || props.data.graph_slug !== 'archaeological_site') diff --git a/bcap/src/bcap/components/pages/details/HriaDiscontinuedData/sections/DetailsSection1.vue b/bcap/src/bcap/components/pages/details/HriaDiscontinuedData/sections/DetailsSection1.vue index d4033bb2..fce64505 100644 --- a/bcap/src/bcap/components/pages/details/HriaDiscontinuedData/sections/DetailsSection1.vue +++ b/bcap/src/bcap/components/pages/details/HriaDiscontinuedData/sections/DetailsSection1.vue @@ -27,12 +27,12 @@ const props = withDefaults( const currentData = computed(() => props.data?.aliased_data); const jurisdictionTenureColumns = [ - { field: 'site_jurisdiction', label: 'Site Jurisdiction' }, - { field: 'tenure_type', label: 'Tenure Type' }, - { field: 'tenure_identifier', label: 'Tenure Identifier' }, + { field: 'site_jurisdiction', label: 'Jurisdiction' }, + { field: 'tenure_type', label: 'Tenure/Reserves Type' }, + { field: 'tenure_identifier', label: 'Description' }, { field: 'tenure_remarks', label: 'Tenure Remarks', isHtml: true }, - { field: 'jurisdiction_entered_by', label: 'Entered By' }, - { field: 'jurisdiction_entered_date', label: 'Entered Date' }, + { field: 'jurisdiction_entered_by', label: 'Modified By' }, + { field: 'jurisdiction_entered_date', label: 'Modified On' }, ]; const hriaChronologyColumns = [ diff --git a/bcap/src/bcap/components/pages/details/SiteVisit/sections/SiteVisitDetailsSection3.vue b/bcap/src/bcap/components/pages/details/SiteVisit/sections/SiteVisitDetailsSection3.vue index ae46dd03..31745fc6 100644 --- a/bcap/src/bcap/components/pages/details/SiteVisit/sections/SiteVisitDetailsSection3.vue +++ b/bcap/src/bcap/components/pages/details/SiteVisit/sections/SiteVisitDetailsSection3.vue @@ -74,13 +74,12 @@ const permittedValue = computed(() => { if (nonPermittedField && 'node_value' in nonPermittedField) { const nonPermitted = nonPermittedField.node_value; - if (nonPermitted === undefined || nonPermitted === null) - return 'Unknown'; + if (nonPermitted === undefined || nonPermitted === null) return ''; - return nonPermitted ? 'No' : 'Yes'; + return nonPermitted ? 'Yes' : 'No'; } - return 'Unknown'; + return ''; }); const siteVisitDetailsTableData = computed(() => { diff --git a/bcap/templates/index.htm b/bcap/templates/index.htm index e31244fd..a0272090 100644 --- a/bcap/templates/index.htm +++ b/bcap/templates/index.htm @@ -324,7 +324,7 @@

{% blocktrans %}bc archaeology portal{% endblocktrans %}

alt="null" />
-

{% blocktrans %}BC Archaeology Portal{% endblocktrans %}

+

{% blocktrans %}BCAP{% endblocktrans %}

{% trans "Official Register of Archaeological Sites for British Columbia" %}

@@ -342,7 +342,7 @@

alt="null" />
-

{% blocktrans %}BC Archaeology Portal{% endblocktrans %}

+

{% blocktrans %}BCAP{% endblocktrans %}

{% trans "Official Register of Archaeological Sites for British Columbia" %}

@@ -364,7 +364,7 @@

alt="McAbee Fossil Beds" />
-

{% blocktrans %}BC Archaeology Portal{% endblocktrans %}

+

{% blocktrans %}BCAP{% endblocktrans %}

{% trans "Official Register of Archaeological Sites for British Columbia" %}

diff --git a/bcap/templates/views/resource/editor.htm b/bcap/templates/views/resource/editor.htm index 93e73784..13414121 100644 --- a/bcap/templates/views/resource/editor.htm +++ b/bcap/templates/views/resource/editor.htm @@ -21,6 +21,8 @@ {% load i18n %} {% load webpack_static from webpack_loader %} +{% block title %}BCAP - {{ displayname }} - Report{% endblock title %} + {% block graph_header_title %} {% trans "Resource Editor" %} {% endblock graph_header_title %} diff --git a/bcap/templates/views/search.htm b/bcap/templates/views/search.htm index 215946b5..dc158709 100644 --- a/bcap/templates/views/search.htm +++ b/bcap/templates/views/search.htm @@ -1,6 +1,8 @@ {% extends "views/search.htm" %} {% load webpack_static from webpack_loader %} +{% block title %}BCAP - Search{% endblock title %} + {% block css %} {{ block.super }} diff --git a/bcap/util/aliases/archaeological_site.py b/bcap/util/aliases/archaeological_site.py index a6ea4353..a303a7bd 100644 --- a/bcap/util/aliases/archaeological_site.py +++ b/bcap/util/aliases/archaeological_site.py @@ -71,7 +71,7 @@ class ArchaeologicalSiteAliases(AbstractAliases): REFERENCE_TYPE = "reference_type" REFERENCE_YEAR = "reference_year" REGISTER_TYPE = "register_type" - REGISTRATION_STATUS = "registration_status" + REGISTRATION_STATUS = "decision_registration_status" RELATED_DOCUMENT_DESCRIPTION = "related_document_description" RELATED_DOCUMENT_TYPE = "related_document_type" RELATED_SITE_DOCUMENTS = "related_site_documents"