admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#36015 Bij datetime ook op tijdcomponent filteren (als meegeven)

Browse Source 
svn path=/Website/trunk/; revision=28832
This commit is contained in:
Jos Groot Lipman
2016-04-11 11:00:16 +00:00
parent 0723de0c75
commit 5a8756968f
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
APPL/API2/api2.inc
View File

@@ -341,7 +341,7 @@ api2 = {
if (filter == "exact") if (filter == "exact")
{ {
var safe_val = api2.toDate(filterval); var safe_val = api2.toDate(filterval);
safe_val = safe_val.toSQL(); safe_val = safe_val.toSQL(); // Een exacte *tijd* component ondersteunen we niet.
operand = " = "; operand = " = ";
} }
else if (filter == "range") else if (filter == "range")
@@ -349,11 +349,13 @@ api2 = {
var safe_val; var safe_val;
if (filterval1) { if (filterval1) {
var safe_val1 = api2.toDate(filterval1); var safe_val1 = api2.toDate(filterval1);
safe_val1 = safe_val1.beginToSQL(); var withtime = (field.typ == "datetime" && api2.hasTime(safe_val1));
safe_val1 = withtime?safe_val1.toSQL(true):safe_val1.beginToSQL();
} }
if (filterval2) { if (filterval2) {
var safe_val2 = api2.toDate(filterval2); var safe_val2 = api2.toDate(filterval2);
safe_val2 = safe_val2.endToSQL(); var withtime = (field.typ == "datetime" && api2.hasTime(safe_val1));
safe_val2 = withtime?safe_val2.toSQL(true):safe_val2.endToSQL();
} }
if (filterval1 && filterval2) { if (filterval1 && filterval2) {
operand = " BETWEEN "; operand = " BETWEEN ";
@@ -1164,6 +1166,12 @@ api2 = {
} }
return value; return value;
}, },
hasTime: function (dt)
{
return dt.getHours() > 0 ||
dt.getMinutes() > 0 ||
dt.getSeconds() > 0
},
toDate: function (dt) toDate: function (dt)
{ {
if (dt instanceof Date) if (dt instanceof Date)