Skip to content
Snippets Groups Projects
Commit 797209e7e9cd authored by Fabien Amarger's avatar Fabien Amarger
Browse files

fix(QueryGenerators): Compare gYear if the relation is a TIME_PROPERTY_YEAR

parent 06828717f94a
No related branches found
No related tags found
No related merge requests found
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
for (var key in component.CriteriaGroup.EndClassWidgetGroup.selectedValues) { for (var key in component.CriteriaGroup.EndClassWidgetGroup.selectedValues) {
var value = component.CriteriaGroup.EndClassWidgetGroup.selectedValues[key]; var value = component.CriteriaGroup.EndClassWidgetGroup.selectedValues[key];
jsonQuery.where.push( jsonQuery.where.push(
this.initFilterTime(value.start, value.stop, objectVariable) this.initFilterTime(value.start, value.stop, objectVariable, _WidgetType)
) ; ) ;
} }
break; break;
...@@ -291,29 +291,27 @@ ...@@ -291,29 +291,27 @@
} ; } ;
} }
initFilterTime(StartYear, EndYear, index) { initFilterTime(StartYear, EndYear, index, widgetType) {
let xsdType = "http://www.w3.org/2001/XMLSchema#date";
var filters = new Array ; if (widgetType === Config.TIME_PROPERTY_YEAR) {
if (StartYear != null) { xsdType = "http://www.w3.org/2001/XMLSchema#gYear";
filters.push( { }
"type": "operation",
"operator": ">=", var filters = new Array();
"args": [ if (StartYear != null) {
""+index+"", filters.push({
"\""+StartYear+"\"^^http://www.w3.org/2001/XMLSchema#date" type: "operation",
] operator: ">=",
}) ; args: ["" + index + "", '"' + StartYear + '"^^' + xsdType],
} });
if (EndYear != null) { }
filters.push( { if (EndYear != null) {
"type": "operation", filters.push({
"operator": "<=", type: "operation",
"args": [ operator: "<=",
""+index+"", args: ["" + index + "", '"' + EndYear + '"^^' + xsdType],
"\""+EndYear+"\"^^http://www.w3.org/2001/XMLSchema#date" });
] }
}) ;
}
if (filters.length == 2 ) { if (filters.length == 2 ) {
return { return {
...@@ -397,4 +395,4 @@ ...@@ -397,4 +395,4 @@
module.exports = { module.exports = {
DefaultQueryGenerator: DefaultQueryGenerator DefaultQueryGenerator: DefaultQueryGenerator
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment