From 755cdd7d005ca34c250cf27ed31e6b4abf7e4cad Mon Sep 17 00:00:00 2001 From: Clint Tseng Date: Tue, 5 Mar 2019 16:15:36 -0800 Subject: [PATCH] data/bug #197: call date() for date type range constraints. --- public/javascripts/data.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/public/javascripts/data.js b/public/javascripts/data.js index c9327ce1..077b0ac9 100644 --- a/public/javascripts/data.js +++ b/public/javascripts/data.js @@ -535,10 +535,16 @@ var dataNS = odkmaker.namespace.load('odkmaker.data'); // numeric/date range if ((control.range !== undefined) && (control.range !== false)) { - if (!$.isBlank(control.range.min)) - constraint.push('. >' + (control.range.minInclusive ? '= ' : ' ') + xmlValue(control.range.min)); - if (!$.isBlank(control.range.max)) - constraint.push('. <' + (control.range.maxInclusive ? '= ' : ' ') + xmlValue(control.range.max)); + if (!$.isBlank(control.range.min)) { + var min = xmlValue(control.range.min); + if (control.type === 'inputDate') min = 'date(' + min + ')'; + constraint.push('. >' + (control.range.minInclusive ? '= ' : ' ') + min); + } + if (!$.isBlank(control.range.max)) { + var max = xmlValue(control.range.max); + if (control.type === 'inputDate') max = 'date(' + max + ')'; + constraint.push('. <' + (control.range.maxInclusive ? '= ' : ' ') + max); + } invalidText = 'Value must be between ' + $.emptyString(control.range.min, 'anything') + ' and ' + $.emptyString(control.range.max, 'anything'); }