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 +14 -21
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b7b5334a99 - Show all commits

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

@ -221,36 +221,29 @@ module.exports = Self => {
JOIN vn.currency cu ON cu.id = e.currencyFk`
);
stmt.merge(conn.makeWhere(filter.where));
const {daysAgo, daysOnward} = ctx.args;
if (daysAgo || daysOnward) {
let sql = '';
if (daysOnward || daysAgo) {
const params = [];
let today = 'util.VN_CURDATE()';
let from = today;
let to = today;
if (daysAgo && daysOnward) {
sql = `
AND t.shipped >= util.VN_CURDATE() - INTERVAL ? DAY
AND t.shipped <= util.VN_CURDATE() + INTERVAL ? DAY
`;
params.push(daysAgo, daysOnward);
} else if (daysAgo) {
sql = `
AND t.shipped >= util.VN_CURDATE() - INTERVAL ? DAY
AND t.shipped < util.VN_CURDATE()
`;
if (daysAgo) {
from += ' - INTERVAL ? DAY';
params.push(daysAgo);
} else if (daysOnward) {
sql = `
AND t.shipped <= util.VN_CURDATE() + INTERVAL ? DAY
AND t.shipped >= util.VN_CURDATE()
`;
}
if (daysOnward) {
to += ' + INTERVAL ? DAY';
params.push(daysOnward);
}
stmt.merge({sql, params});
const whereDays = (filter.where ? 'AND' : 'WHERE') + ` t.shipped BETWEEN ${from} AND ${to}`;
stmt.merge({sql: whereDays, params});
}
stmt.merge(conn.makeSuffix(filter));
stmt.merge(conn.makePagination(filter));
const itemsIndex = stmts.push(stmt) - 1;
const sql = ParameterizedSQL.join(stmts, ';');