diff --git a/productMods/WEB-INF/ontologies/app/listViewConfig.owl b/productMods/WEB-INF/ontologies/app/listViewConfig.owl
index 69717b7b..77569401 100644
--- a/productMods/WEB-INF/ontologies/app/listViewConfig.owl
+++ b/productMods/WEB-INF/ontologies/app/listViewConfig.owl
@@ -111,4 +111,10 @@
listViewConfig-dateTimeValue.xml
+
+ listViewConfig-dateTimeValue.xml
+
+
+ listViewConfig-dateTimeValue.xml
+
\ No newline at end of file
diff --git a/productMods/config/listViewConfig-dateTimeInterval.xml b/productMods/config/listViewConfig-dateTimeInterval.xml
index 384ffefd..201c90c0 100644
--- a/productMods/config/listViewConfig-dateTimeInterval.xml
+++ b/productMods/config/listViewConfig-dateTimeInterval.xml
@@ -9,17 +9,16 @@
PREFIX core: <http://vivoweb.org/ontology/core#>
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
- SELECT DISTINCT ?dateTimeStart ?precisionStart ?dateTimeEnd ?precisionEnd WHERE {
+ SELECT DISTINCT ?dateTimeStart (afn:localname(?dateTimePrecisionStart) AS ?precisionStart)
+ ?dateTimeEnd (afn:localname(?dateTimePrecisionEnd) AS ?precisionEnd) WHERE {
GRAPH ?g1 { ?subject ?property ?dateTimeInterval }
OPTIONAL { GRAPH ?g2 { ?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart ;
- core:dateTimePrecision ?dateTimePrecisionStart . }
- GRAPH ?g3 { ?dateTimePrecisionStart rdfs:label ?precisionStart }
+ core:dateTimePrecision ?dateTimePrecisionStart . }
}
- OPTIONAL { GRAPH ?g4 { ?dateTimeInterval core:end ?dateTimeEndValue .
+ OPTIONAL { GRAPH ?g3 { ?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd ;
- core:dateTimePrecision ?dateTimePrecisionEnd . }
- GRAPH ?g5 { ?dateTimePrecisionEnd rdfs:label ?precisionEnd }
+ core:dateTimePrecision ?dateTimePrecisionEnd . }
}
}
diff --git a/productMods/config/listViewConfig-dateTimeValue.xml b/productMods/config/listViewConfig-dateTimeValue.xml
index 2325ca16..653ea916 100644
--- a/productMods/config/listViewConfig-dateTimeValue.xml
+++ b/productMods/config/listViewConfig-dateTimeValue.xml
@@ -9,11 +9,10 @@
PREFIX core: <http://vivoweb.org/ontology/core#>
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
- SELECT DISTINCT ?dateTime ?precision WHERE {
+ SELECT DISTINCT ?dateTime (afn:localname(?dateTimePrecision) AS ?precision) WHERE {
GRAPH ?g1 { ?subject ?property ?dateTimeValue }
GRAPH ?g2 { ?dateTimeValue core:dateTime ?dateTime ;
core:dateTimePrecision ?dateTimePrecision . }
- GRAPH ?g3 { ?dateTimePrecision rdfs:label ?precision }
}
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl
index c053f45d..12c591e4 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl
@@ -2,10 +2,7 @@
<#-- Custom object property statement view for http://vivoweb.org/ontology/core#dateTimeInterval -->
-<#if statement.dateTimeStart??>
- ${dateTimeStart} ${precisionStart}
-#if>
- -
-<#if statement.dateTimeEnd??>
- ${dateTimeEnd} ${precisionEnd}
-#if>
\ No newline at end of file
+<#import "lib-datetime.ftl" as dt>
+
+<@dt.dateTimeIntervalLong "${statement.dateTimeStart!}" "${statement.precisionStart!}"
+ "${statement.dateTimeEnd!}" "${statement.precisionEnd!}" />
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl
index bfdc687b..4fb04f6a 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl
@@ -4,11 +4,4 @@
<#import "lib-datetime.ftl" as dt>
-<#--
-${statement.dateTime} ${statement.precision}
-
-<#assign dateTime = statement.dateTime?replace("T", " ")>
-${dateTime?datetime("yyyy-MM-dd HH:mm:ss")?string("h:mm a")} -->
-
-
-${dt.formatXsdDateTime(statement.dateTime, statement.precision, "long")}
\ No newline at end of file
+${dt.formatXsdDateTimeLong(statement.dateTime, statement.precision)}