verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

#7884 added new filter field #2981

Merged
jon merged 15 commits from 7884-AddLabelerField into dev 2024-10-02 05:04:18 +00:00
Conversation 0 Commits 15 Files Changed 2 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c4f26094d5 - Show all commits

6
modules/entry/back/methods/entry/filter.js
View File

@ -229,19 +229,19 @@ module.exports = Self => {
if (daysAgo && daysOnward) { if (daysAgo && daysOnward) {
sql = ` sql = `
WHERE t.shipped >= util.VN_CURDATE() - INTERVAL ? DAY AND t.shipped >= util.VN_CURDATE() - INTERVAL ? DAY
AND t.shipped <= util.VN_CURDATE() + INTERVAL ? DAY AND t.shipped <= util.VN_CURDATE() + INTERVAL ? DAY
`; `;
params.push(daysAgo, daysOnward); params.push(daysAgo, daysOnward);
} else if (daysAgo) { } else if (daysAgo) {
sql = ` sql = `
WHERE t.shipped >= util.VN_CURDATE() - INTERVAL ? DAY AND t.shipped >= util.VN_CURDATE() - INTERVAL ? DAY
AND t.shipped < util.VN_CURDATE() AND t.shipped < util.VN_CURDATE()
`; `;
params.push(daysAgo); params.push(daysAgo);
} else if (daysOnward) { } else if (daysOnward) {
sql = ` sql = `
WHERE t.shipped <= util.VN_CURDATE() + INTERVAL ? DAY AND t.shipped <= util.VN_CURDATE() + INTERVAL ? DAY
AND t.shipped >= util.VN_CURDATE() AND t.shipped >= util.VN_CURDATE()
`; `;
params.push(daysOnward); params.push(daysOnward);