From 2d6849a8ae267c4868bde63fd01561169c03bd94 Mon Sep 17 00:00:00 2001 From: Gabriel Jenik Date: Tue, 31 Mar 2015 18:21:00 -0300 Subject: [PATCH] Fixed issue #9591: Sometimes date_max / date_min validations for date/time questions doesn't allow to use the maximum date expected. - Reformat expression held into date_max / date_min into "Y-m-d H:i" format, so comparison can be done among equals format. - Now min_date / max_date supports all the date formats correctly parsed by strtotime: YYYY-MM-DD, YYYY/MM/DD, DD.MM.YYYY, MM/DD/YYYY, DD-MM-YYYY, US natural language, ... --- application/helpers/expressions/em_manager_helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php index 668aeed9073..83f532256a3 100644 --- a/application/helpers/expressions/em_manager_helper.php +++ b/application/helpers/expressions/em_manager_helper.php @@ -1568,7 +1568,7 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL) } $sq_name = ($this->sgqaNaming)?$sq['rowdivid'].".NAOK":$sq['varName'].".NAOK"; - $sq_name = '(is_empty(' . $sq_name . ') || ('. $sq_name . ' >= ' . $date_min . '))'; + $sq_name = '(is_empty(' . $sq_name . ') || ('. $sq_name . ' >= date("Y-m-d H:i", strtotime(' . $date_min . ')) ))'; $subqValidSelector = ''; break; default: @@ -1637,7 +1637,7 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL) } $sq_name = ($this->sgqaNaming)?$sq['rowdivid'].".NAOK":$sq['varName'].".NAOK"; - $sq_name = '(is_empty(' . $sq_name . ') || is_empty(' . $date_max . ') || ('. $sq_name . ' <= ' . $date_max . '))'; + $sq_name = '(is_empty(' . $sq_name . ') || is_empty(' . $date_max . ') || ('. $sq_name . ' <= date("Y-m-d H:i", strtotime(' . $date_max . ')) ))'; $subqValidSelector = ''; break; default: