gCubeSystem
/
grsf-publisher
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated freemarker templates to support new requests

This commit is contained in:
Luca Frosini 2024-08-01 14:05:47 +02:00
parent 78add8493c
commit 6aa2b371ed
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -5,6 +5,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
## [v1.1.1-SNAPSHOT]
- Added 'Jurisdictional Distribution' and 'Fishing Effort' #27796
- Removed thousands separator from Reference years #27886
- Added 'Map Preview' support #27843
- Forced 'searchable' to 'True' to solve statistic issue #27922
## [v1.1.0]

4
src/main/resources/freemarker/Fishery.ftl
View File

@ -14,6 +14,7 @@
</#if>
"version" : "${version?string["0.0"]}",
"private": ${include_sensitive?c},
"searchable": "True", <#-- If the Record is private we have to set searchable to True see https://support.d4science.org/issues/27922 -->
"extras": [
<#-- START of Common Metadata -->
<@metadata key="GRSF Type" namespace=identity_namespace var=grsf_type?capitalize />
@ -50,7 +51,8 @@
</#if>
<@metadata key="Status of the Record" var=status_grsf_record />
<@metadata key="spatial" var=spatial />
<@metadata key="spatial" var=spatial /> <#-- deprecated see https://support.d4science.org/issues/27843 -->
<@metadata key="Map Preview" var=map_preview /> <#-- see https://support.d4science.org/issues/27843 -->
<#-- END of Stock/Fishery Common Metadata -->
<#-- START of Fishery Metadata -->

4
src/main/resources/freemarker/Stock.ftl
View File

@ -14,6 +14,7 @@
</#if>
"version" : "${version?string["0.0"]}",
"private": ${include_sensitive?c},
"searchable": "True", <#-- If the Record is private we have to set searchable to True see https://support.d4science.org/issues/27922 -->
"extras": [
<#-- START of Common Metadata -->
<@metadata key="GRSF Type" namespace=identity_namespace var=grsf_type?capitalize />
@ -50,7 +51,8 @@
</#if>
<@metadata key="Status of the Record" var=status_grsf_record />
<@metadata key="spatial" var=spatial />
<@metadata key="spatial" var=spatial /> <#-- deprecated see https://support.d4science.org/issues/27843 -->
<@metadata key="Map Preview" var=map_preview /> <#-- see https://support.d4science.org/issues/27843 -->
<#-- END of Stock/Fishery Common Metadata -->
<#-- START of Stock Metadata -->

2
src/main/resources/freemarker/Traceability Unit.ftl
View File

@ -14,6 +14,7 @@
</#if>
"version" : "${version?string["0.0"]}",
"private": ${include_sensitive?c},
"searchable": "True", <#-- If the Record is private we have to set searchable to True see https://support.d4science.org/issues/27922 -->
"extras": [
<#-- START of Common Metadata -->
<@metadata key="GRSF Type" namespace=identity_namespace var="Traceability Unit" />
@ -44,6 +45,7 @@
<@metadatalist key="Flag State" namespace=identity_namespace list=flag_state tagValues=true />
<@metadatalist key="Fishing Gear" namespace=identity_namespace list=fishing_gear tagValues=true />
<@metadatalist key="Management Body/Authority" namespace=identity_namespace list=management_body_authorities />
<@metadata key="Map Preview" var=map_preview /> <#-- see https://support.d4science.org/issues/27843 -->
<#-- END of Traceability Unit Metadata -->
<@metadata key="system:type" var="Traceability Unit" sep="" />

2
src/main/resources/freemarker/macros.ftl
View File

@ -94,7 +94,7 @@
<#list list[0..*5] as ts>
{
"key": "<#if namespace?has_content>${namespace}:</#if>${key}",
"value": "${ts.value?json_string} [<#if ts.unit?has_content>Unit: ${ts.unit?json_string}<#assign valueSep = " - " ></#if><#if ts.reporting_year_or_assessment_id?has_content>${valueSep}Rep. Year or Assessment ID: ${ts.reporting_year_or_assessment_id?json_string}<#assign valueSep = " - " ></#if><#if ts.reference_year?has_content>${valueSep}Ref. Year: ${ts.reference_year?json_string}<#assign valueSep = " - " ></#if><#if ts.data_owner?has_content>${valueSep}Data Owner: ${ts.data_owner?json_string}<#assign valueSep = " - " ></#if><#if ts.db_source?has_content>${valueSep}DB Source: ${ts.db_source?json_string}</#if>]"
"value": "${ts.value?json_string} [<#if ts.unit?has_content>Unit: ${ts.unit?json_string}<#assign valueSep = " - " ></#if><#if ts.reporting_year_or_assessment_id?has_content>${valueSep}Rep. Year or Assessment ID: ${ts.reporting_year_or_assessment_id?json_string}<#assign valueSep = " - " ></#if><#if ts.reference_year?has_content>${valueSep}Ref. Year: ${ts.reference_year?replace(',','')}<#assign valueSep = " - " ></#if><#if ts.data_owner?has_content>${valueSep}Data Owner: ${ts.data_owner?json_string}<#assign valueSep = " - " ></#if><#if ts.db_source?has_content>${valueSep}DB Source: ${ts.db_source?json_string}</#if>]"
}${sep}
</#list>
</#if>