From dd58fc5095941dd1d589461dba546d032941e652 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Wed, 2 Oct 2024 14:01:27 -0400 Subject: [PATCH 1/2] add more nuance to nuanced remark display / view documentation --- .../edit/fields/helpers/ActionButton.vue | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/components/panels/edit/fields/helpers/ActionButton.vue b/src/components/panels/edit/fields/helpers/ActionButton.vue index 38242c26..c015e262 100644 --- a/src/components/panels/edit/fields/helpers/ActionButton.vue +++ b/src/components/panels/edit/fields/helpers/ActionButton.vue @@ -309,6 +309,7 @@ }, returnRemark: function(){ + // check the lowest level first if (this.profileStore.rtLookup[this.structure.parentId] && this.profileStore.rtLookup[this.structure.parentId].propertyTemplates){ for (let pt of this.profileStore.rtLookup[this.structure.parentId].propertyTemplates){ @@ -317,8 +318,31 @@ } } } - // maybe it is in the parent structure + + // try the next level up let parentStructure = this.profileStore.returnStructureByComponentGuid(this.guid) + if (parentStructure.valueConstraint && parentStructure.valueConstraint.valueTemplateRefs && parentStructure.valueConstraint.valueTemplateRefs.length>0){ + for (let vRt of parentStructure.valueConstraint.valueTemplateRefs){ + if (this.profileStore.rtLookup[vRt]){ + if (this.structure.propertyURI == 'http://www.w3.org/2002/07/owl#sameAs'){ + // if its a #sameAs we kind of lose the connection, so select the first one and check + if (this.profileStore.rtLookup[vRt].propertyTemplates && this.profileStore.rtLookup[vRt].propertyTemplates[0]){ + if (this.profileStore.rtLookup[vRt].propertyTemplates[0].remark && this.profileStore.rtLookup[vRt].propertyTemplates[0].remark != ''){ + return this.profileStore.rtLookup[vRt].propertyTemplates[0].remark + } + } + }else{ + for (let pt of this.profileStore.rtLookup[vRt].propertyTemplates){ + if (pt.propertyURI == this.structure.propertyURI && pt.remark && pt.remark != ''){ + return pt.remark + } + } + } + } + } + } + + // maybe it is in the parent structure if (this.profileStore.rtLookup[parentStructure.parentId] && this.profileStore.rtLookup[parentStructure.parentId].propertyTemplates){ for (let pt of this.profileStore.rtLookup[parentStructure.parentId].propertyTemplates){ if (pt.propertyURI == parentStructure.propertyURI && pt.remark){ From c60c2085cf9002c3e7db3ad93a877dd2460fabc6 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Wed, 2 Oct 2024 14:02:04 -0400 Subject: [PATCH 2/2] ver bump --- src/stores/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stores/config.js b/src/stores/config.js index eb088777..1c7e3a22 100644 --- a/src/stores/config.js +++ b/src/stores/config.js @@ -7,7 +7,7 @@ export const useConfigStore = defineStore('config', { versionMajor: 0, versionMinor: 14, - versionPatch: 24, + versionPatch: 25, regionUrls: {