Skip to content

add datepicker with indeterminate position to iso19139 schema. fix datepicker. layout fix #9151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidblasby wants to merge 9 commits into
base: main
Choose a base branch
from
Open

add datepicker with indeterminate position to iso19139 schema. fix datepicker. layout fix #9151

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
be90512
add datepicker with indeterminate position to iso19139 schema. fix d…
david-blasby Jan 29, 2026
29726d8
backout hnap submodule
david-blasby Jan 29, 2026
e544915
force PR to re-evaluate
david-blasby Jan 29, 2026
fa6fb38
remove hnap
david-blasby Jan 29, 2026
8638316
remove unused xslt vars, add label text back in
david-blasby Feb 2, 2026
a243b37
add for <begin|end> and handle gml OLD and gml 3.2
david-blasby Feb 9, 2026
efd8b22
layout changes, hide datapicker components when not needed
david-blasby Feb 18, 2026
fd322b0
make indeterminate position dropdown larger
david-blasby Feb 18, 2026
2ef8342
add better gml-version agnostic matching. Add suggestion from jose f…
david-blasby Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ Developer documentation located in ``README.md`` files in the code-base:
* General documentation for the project as a whole is in this [README.md](README.md)
* [Software Development Documentation](/software_development/) provides instructions for setting up a development environment, building GeoNetwork, compiling user documentation, and making a releases.
* Module specific documentation can be found in each module

3 changes: 3 additions & 0 deletions schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-date.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<xsl:template mode="mode-iso19139"
priority="2000"
match="gmd:CI_Date/gmd:date">

<xsl:param name="schema" select="$schema" required="no"/>
<xsl:param name="labels" select="$labels" required="no"/>
<xsl:param name="listOfValues" select="$iso19139codelists" required="no"/>
Expand Down Expand Up @@ -175,6 +176,8 @@
<xsl:template mode="mode-iso19139"
priority="2000"
match="*[(gco:Date|gco:DateTime) and not(../gmd:dateType)]">


<xsl:param name="schema" select="$schema" required="no"/>
<xsl:param name="labels" select="$labels" required="no"/>
<xsl:param name="overrideLabel" select="''" required="no"/>
Expand Down
240 changes: 236 additions & 4 deletions schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,18 +151,250 @@

-->

<xsl:template mode="mode-iso19139"
match="gml320:TimeInstant[gml320:timePosition]|gml:TimeInstant[gml:timePosition]"
priority="50000">

<xsl:variable name="configName" select="concat(local-name(..),'Position')"/>
<!-- 'temporalRangeSection' this is the name of the section (defined elsewhere)
and uses to find the translated tag for the section in the UI -->
<xsl:variable name="translation"
select="$strings/*[name() = $configName]"/>
<xsl:variable name="name"
select="if ($translation != '')
then $translation
else $configName"/>

<xsl:variable name="id" select="concat('_X', gn:element/@ref, '_replace')"/>

<xsl:variable name="isFirst" select="position() = 1"/>
<xsl:variable name="originalNode"
select="gn-fn-metadata:getOriginalNode($metadata, .)"/>
<xsl:variable name="del" select="./@del"/>

<xsl:variable name="refToDelete">
<xsl:call-template name="get-ref-element-to-delete">
<xsl:with-param name="node" select="$originalNode"/>
<xsl:with-param name="delXpath" select="$del"/>
</xsl:call-template>
</xsl:variable>

<xsl:variable name="parent_parent" select="."/>

<!-- look at the actual XML's gml namespace URI
if its GML 32, then that matches most of the implicit
assumptions inside GN. Especially the JS, which assumes that
an element with a "gml:" prefix is GML 3.2.
However, this is a really bad assumption - all the iso19139 sample data
has "gml:" as the old (NOT GML 3.2).
Also, in this XSLT;
"gml:" - version 3.2
"gml320:" - OLD VERSION (!!!!!!!!)
-->
<xsl:variable name="element_ns_uri" select="namespace-uri()"/>
<xsl:variable name="element_ns_prefix" select="prefix-from-QName(node-name(.))"/>
<xsl:variable name="gml_is_32" select="$element_ns_uri = 'http://www.opengis.net/gml/3.2'"/>
<xsl:variable name="timeinstance_id" select="@*[local-name() = 'id']"/>

<xsl:variable name="prefix_to_use">gml</xsl:variable>

<xsl:variable name="prefix_to_use_select">
<xsl:choose>
<xsl:when test="$gml_is_32">gml</xsl:when>
<xsl:otherwise>gml320</xsl:otherwise>
</xsl:choose>
</xsl:variable>


<xsl:variable name="label_node" select="local-name(..)"/>


<xsl:variable name="template">
<template xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gn="http://www.fao.org/geonetwork" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gmx="http://www.isotc211.org/2005/gmx" xmlns:srv="http://www.isotc211.org/2005/srv" xmlns:xlink="http://www.w3.org/1999/xlink">
<values>
<key
xpath="."
use="gn-date-picker"
tooltip="gmd:extent|gmd:EX_TemporalExtent">
<xsl:attribute name="label" select="$label_node"/>

<directiveAttributes
data-assume-gml-ns="true"
>
<xsl:attribute name="data-indeterminate-position" select="concat('eval#',$prefix_to_use_select,':timePosition/@indeterminatePosition')"/>
<xsl:attribute name="data-tag-name" select="concat($prefix_to_use,':timePosition')"/>

</directiveAttributes>
</key>
</values>
<snippet>
<!-- this is more explicitly done, below -->
<gml:TimeInstant>
{{<xsl:copy-of select="local-name(..)"/>}}
</gml:TimeInstant>
</snippet>
</template>
</xsl:variable>

<xsl:variable name="keyValues">
<xsl:call-template name="build-key-value-configuration">
<xsl:with-param name="template" select="$template/template"/>
<xsl:with-param name="currentNode" select="$parent_parent"/>
<xsl:with-param name="readonly" select="'false'"/>
</xsl:call-template>
</xsl:variable>

<xsl:variable name="templateCombinedWithNode" as="node()">
<template>
<xsl:copy-of select="$template/template/values"/>

<xsl:element name="snippet" inherit-namespaces="no">
<xsl:attribute name="data-remove-gn-ns-def">true</xsl:attribute>

<xsl:element name="gml:TimeInstant" namespace="{$element_ns_uri}" inherit-namespaces="no">
<xsl:attribute namespace="{$element_ns_uri}" name="gml:id"><xsl:value-of select="$timeinstance_id"/></xsl:attribute>
{{<xsl:copy-of select="local-name(..)"/>}}
</xsl:element>


</xsl:element>
</template>
</xsl:variable>


<xsl:call-template name="render-element-template-field">
<xsl:with-param name="name" select="$name"/>
<xsl:with-param name="id" select="$id"/>
<xsl:with-param name="isExisting" select="true()"/>
<xsl:with-param name="template" select="$templateCombinedWithNode"/>
<xsl:with-param name="keyValues" select="$keyValues"/>
<xsl:with-param name="refToDelete" select="$refToDelete/gn:element"/>
<xsl:with-param name="isFirst" select="$isFirst"/>
</xsl:call-template>
</xsl:template>

<!---
For temporal extent, we want a more complicated control.
This will allow the <beginPosition indeterminatePosition="now"></beginPosition>
It also sets up the DatePicker so it has the indeterminatePosition drop-down, plus
a calendar date selector, a time selector, a timezone selector, and "mode" selector (i.e. only year, year + month, date & time).

This is basically a replacement for https://github.com/geonetwork/core-geonetwork/blob/5f6571e72e2bd39237394caf1f076a6cc0dc8758/schemas/iso19139/src/main/plugin/iso19139/layout/config-editor.xml#L1471-L1513
See the "template" variable, below.

This is basically a stand-in for the <field name="temporalRangeSection"> and uses the same template to do the controls.
-->
<xsl:template mode="mode-iso19139"
match="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement[//gml:beginPosition]"
Copy link
Copy Markdown
Member

@josegar74 josegar74 Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
match="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement[//gml:beginPosition]"
match="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement[gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod//gml:beginPosition]"

@david-blasby this change target better the element and solves the problems with the full view. Please give a try and let me know.

Copy link
Copy Markdown
Contributor Author

@davidblasby davidblasby Mar 27, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had some issues with the sample data, so I had to update this to:

match="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement[//local-name()='beginPosition']"

(i.e. handle multiple GML "versions" by using local-name instead of a prefixed name (ie. gml:beginPosition)).

Copy link
Copy Markdown
Contributor Author

@davidblasby davidblasby Mar 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@josegar74 - I'm not sure how that will work. Here is a typical beginPosition XML (from the GN sample data):

<gmd:extent>
    <gmd:EX_Extent>
        <gmd:temporalElement>
            <gmd:EX_TemporalExtent>
                <gmd:extent>
                    <gml:TimePeriod xmlns:gml="http://www.opengis.net/gml/3.2" gml:id="d3773e252a1052958">
                        <gml:beginPosition indeterminatePosition="before">2000-01-01T04:29:00</gml:beginPosition>
                        <gml:endPosition indeterminatePosition="after">2008-01-08T05:29:00</gml:endPosition>
                    </gml:TimePeriod>
                </gmd:extent>
            </gmd:EX_TemporalExtent>
        </gmd:temporalElement>
    </gmd:EX_Extent>
</gmd:extent>

I'm not sure how:

match="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement[gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod//gml:beginPosition]"

will match this. Perhaps I am unfamiliar where the "[" will occur. I I thought it would evaluate at the gmd:temporalElement location (i.e. requires gmd:temporalElement/gmd:EX_TemporalExtent/...).

Copy link
Copy Markdown
Contributor Author

@davidblasby davidblasby Mar 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@josegar74 - I've pushed another commit.

  1. changes some of the XPATHs to local-name matching for the gml:/gml320: prefixes
  2. added your match, above (converted to local-name matching)

I'm not sure how to test what you found (unable to add TimeInstant). I think (not sure) that its still problematic.

priority="30000">
<xsl:variable name="xpath" select="gn-fn-metadata:getXPath(.)"/>
<xsl:variable name="isoType" select="if (../@gco:isoType) then ../@gco:isoType else ''"/>


<xsl:variable name="configName" select="'temporalRangeSection'"/>
<!-- 'temporalRangeSection' this is the name of the section (defined elsewhere)
and uses to find the translated tag for the section in the UI -->
<xsl:variable name="translation"
select="$strings/*[name() = $configName]"/>
<xsl:variable name="name"
select="if ($translation != '')
then $translation
else $configName"/>

<xsl:variable name="id" select="concat('_X', gn:element/@ref, '_replace')"/>

<xsl:variable name="template">
<template xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gn="http://www.fao.org/geonetwork" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gmx="http://www.isotc211.org/2005/gmx" xmlns:srv="http://www.isotc211.org/2005/srv" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink">
<values>
<!-- -Need a * for gml:TimePeriodTypeCHOICE_ELEMENT2 added by editor enumerated tree
but this will make the XSLT formatter fails. Using // to access the element in both case. -->
<key label="beginPosition"
xpath="gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod//gml:beginPosition"
use="gn-date-picker"
tooltip="gmd:extent|gmd:EX_TemporalExtent">
<directiveAttributes
data-tag-name="gml:beginPosition"
data-indeterminate-position="eval#gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/*/gml:beginPosition/@indeterminatePosition"/>
</key>
<key label="endPosition"
xpath="gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod//gml:endPosition"
use="gn-date-picker"
tooltip="gmd:extent|gmd:EX_TemporalExtent">
<directiveAttributes
data-tag-name="gml:endPosition"
data-indeterminate-position="eval#gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/*/gml:endPosition/@indeterminatePosition"/>
</key>
</values>
<snippet>
<gmd:temporalElement>
<gmd:EX_TemporalExtent>
<gmd:extent>
<gml:TimePeriod gml:id="">
{{beginPosition}}
{{endPosition}}
</gml:TimePeriod>
</gmd:extent>
</gmd:EX_TemporalExtent>
</gmd:temporalElement>
</snippet>
</template>
</xsl:variable>
<xsl:variable name="isFirst" select="position() = 1"/>
<xsl:variable name="originalNode"
select="gn-fn-metadata:getOriginalNode($metadata, .)"/>
<xsl:variable name="del" select="./@del"/>

<xsl:variable name="refToDelete">
<xsl:call-template name="get-ref-element-to-delete">
<xsl:with-param name="node" select="$originalNode"/>
<xsl:with-param name="delXpath" select="$del"/>
</xsl:call-template>
</xsl:variable>

<xsl:variable name="parent_parent" select="."/>

<xsl:variable name="keyValues">
<xsl:call-template name="build-key-value-configuration">
<xsl:with-param name="template" select="$template/template"/>
<xsl:with-param name="currentNode" select="$parent_parent"/>
<xsl:with-param name="readonly" select="'false'"/>
</xsl:call-template>
</xsl:variable>


<xsl:variable name="templateCombinedWithNode" as="node()">
<template>
<xsl:copy-of select="$template/template/values"/>
<snippet>
<xsl:apply-templates mode="gn-merge" select="$template/template/snippet/*|$editorConfig/editor/snippets/list[@name = $template/template/snippets/@name]/snippet/*">
<xsl:with-param name="node-to-merge" select="$parent_parent"/>
</xsl:apply-templates>
</snippet>
</template>
</xsl:variable>

<xsl:call-template name="render-element-template-field">
<xsl:with-param name="name" select="$name"/>
<xsl:with-param name="id" select="$id"/>
<xsl:with-param name="isExisting" select="true()"/>
<xsl:with-param name="template" select="$templateCombinedWithNode"/>
<xsl:with-param name="keyValues" select="$keyValues"/>
<xsl:with-param name="refToDelete" select="$refToDelete/gn:element"/>
<xsl:with-param name="isFirst" select="$isFirst"/>
</xsl:call-template>

</xsl:template>


<!-- ===================================================================== -->
<!-- gml:TimePeriod (format = %Y-%m-%dThh:mm:ss) -->
<!-- ===================================================================== -->

<xsl:template mode="mode-iso19139"
match="gml:beginPosition|gml:endPosition|gml:timePosition|
gml320:beginPosition|gml320:endPosition|gml320:timePosition"
match="gml:beginPosition|gml:endPosition|
gml320:beginPosition|gml320:endPosition"
priority="200">


<xsl:variable name="xpath" select="gn-fn-metadata:getXPath(.)"/>
<xsl:variable name="value" select="normalize-space(text())"/>
<xsl:variable name="isoType" select="if (../@gco:isoType) then ../@gco:isoType else ''"/>
Expand All @@ -181,14 +413,14 @@
</xsl:if>
</xsl:variable>


<xsl:call-template name="render-element">
<xsl:with-param name="label"
select="$labelConfig"/>
<xsl:with-param name="name" select="gn:element/@ref"/>
<xsl:with-param name="value" select="text()"/>
<xsl:with-param name="cls" select="local-name()"/>
<xsl:with-param name="xpath" select="$xpath"/>

<!--
Default field type is Date.

Expand Down
23 changes: 18 additions & 5 deletions web-ui/src/main/resources/catalog/components/edit/datepicker/DatePickerDirective.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@
elementRef: "@",
id: "@",
tagName: "@",
assumeGmlNs: "@",
indeterminatePosition: "@",
required: "@",
hideTime: "@",
Expand Down Expand Up @@ -358,14 +359,26 @@
scope.dateTime = "";
}

//if we don't know what this namespace is (findNamespaceUri returns undefined),
//then we don't add it!
var elementNSDef = "";
var namespaceURI = gnSchemaManagerService.findNamespaceUri(
namespace,
gnCurrentEdit.schema
);
if (namespaceURI !== undefined) {
elementNSDef = " xmlns:" + namespace + '="' + namespaceURI + '"';
}
Comment on lines +365 to +371
Copy link
Copy Markdown
Member

@josegar74 josegar74 Feb 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would not be more efficient to put this code in the else of:

              //if data-assume-gml-ns is set, then don't put in the NS declaration
              if (scope.assumeGmlNs === "true" && namespace === "gml") {
                elementNSDef = "";
              }

Copy link
Copy Markdown
Contributor Author

@davidblasby davidblasby Feb 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think efficiency is important here.

Copy link
Copy Markdown
Member

@josegar74 josegar74 Feb 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In that case is ok.


//if data-assume-gml-ns is set, then don't put in the NS declaration
if (scope.assumeGmlNs === "true" && namespace === "gml") {
elementNSDef = "";
}

scope.xmlSnippet =
"<" +
tag +
" xmlns:" +
namespace +
'="' +
gnSchemaManagerService.findNamespaceUri(namespace, gnCurrentEdit.schema) +
'"' +
elementNSDef +
attribute +
">" +
scope.dateTime +
Expand Down
10 changes: 9 additions & 1 deletion web-ui/src/main/resources/catalog/components/edit/datepicker/partials/datepicker.html
View file
Open in desktop
Copy link
Copy Markdown
Contributor

@tylerjmchugh tylerjmchugh Feb 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The UI does not seem to match the rest of the form:

Image Image Image Image

Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,30 @@
class="form-control"
data-ng-model="year"
data-ng-show="mode === DATE_MODE.YEAR"
data-ng-disabled="withIndeterminatePosition && (indeterminatePosition === 'now' || indeterminatePosition === 'unknown')"
/>
<input
type="month"
class="form-control"
data-ng-model="month"
data-ng-show="mode === DATE_MODE.MONTH"
data-ng-disabled="withIndeterminatePosition && (indeterminatePosition === 'now' || indeterminatePosition === 'unknown')"
/>
<input
type="date"
class="form-control"
data-ng-model="date"
data-ng-show="mode === DATE_MODE.DATE || mode === DATE_MODE.DATETIME"
data-ng-class="hideTime == 'true' ? 'gn-notime' : ''"
data-ng-disabled="withIndeterminatePosition && (indeterminatePosition === 'now' || indeterminatePosition === 'unknown')"
style="width: 100%"
/>
<!-- Time input -->
<input
type="time"
class="form-control"
class="form-control gn-time"
data-ng-model="time"
data-ng-disabled="withIndeterminatePosition && (indeterminatePosition === 'now' || indeterminatePosition === 'unknown')"
data-ng-show="mode === DATE_MODE.DATETIME && !hideTime"
/>
<!-- Timezone selector (only if time is to be displayed) -->
Expand All @@ -63,6 +69,7 @@
data-ng-model="timezoneObj"
data-ng-show="mode === DATE_MODE.DATETIME && !hideTime"
data-ng-options="t as (t.name + ' ' + t.offset) for t in timezoneNames"
data-ng-disabled="withIndeterminatePosition && (indeterminatePosition === 'now' || indeterminatePosition === 'unknown')"
></select>

<!-- Date mode selector -->
Expand All @@ -71,6 +78,7 @@
type="button"
class="btn btn-default dropdown-toggle"
data-toggle="dropdown"
data-ng-disabled="withIndeterminatePosition && (indeterminatePosition === 'now' || indeterminatePosition === 'unknown')"
>
<i class="fa fa-cog"></i>&nbsp;<span class="caret"></span>
</button>
Expand Down
1 change: 1 addition & 0 deletions web-ui/src/main/resources/catalog/style/gn_editor.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ form.gn-editor {
}
}
&.gn-time-with-ind-position {
display: flex;
> select.gn-indeterminate-position {
width: 20%;
}
Expand Down
Loading
Loading