kutafaja
/
klnodekb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mongoose frissítve

This commit is contained in:
Vincze József 2025-02-06 15:30:02 +01:00
parent 79b54d6fb9
commit 966e240267
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app.js
View File

@ -552,19 +552,21 @@ app.post('/apiPostDailyReport/:apiKey',function(req,res){
// Munka lista lekérése és szűrése AJAX CALL // Munka lista lekérése és szűrése AJAX CALL
app.get('/filter', utils.ensureAuthenticated, async function(req, res) { app.get('/filter', utils.ensureAuthenticated, async function(req, res) {
//console.log(req.query.year.value); //console.log(req.query.year.value);
const year=new RegExp("^"+req.query.year);
const condition=new RegExp("^"+req.query.condition);
var query={ var query={
$or:[ $or:[
{"megrendelo": { "$regex": req.query.condition, "$options": "i" }}, {"megrendelo": { "$regex": condition, "$options": "i" }},
{$and: {$and:
[ [
{"workDate": { "$regex": req.query.year, "$options": "i" }}, {"workDate": { "$regex": year, "$options": "i" }},
{"title":{ "$regex": req.query.condition, "$options": "i" }} {"title":{ "$regex": condition, "$options": "i" }}
] ]
},{$and: },{$and:
[ [
{"workDate": { "$regex": req.query.year, "$options": "i" }}, {"workDate": { "$regex": year, "$options": "i" }},
{"poNumber":{ "$regex": req.query.condition, "$options": "i" }} {"poNumber":{ "$regex": condition, "$options": "i" }}
] ]
} }
] ]

2
package.json
View File

@ -41,7 +41,7 @@
"lightpick": "^1.6.2", "lightpick": "^1.6.2",
"moment": "^2.29.1", "moment": "^2.29.1",
"moment-range": "^4.0.2", "moment-range": "^4.0.2",
"mongoose": "^5.11.19", "mongoose": "^5.13.5",
"mongoose-auto-increment": "^3.0.1", "mongoose-auto-increment": "^3.0.1",
"mongoose-increment": "^2.0.0", "mongoose-increment": "^2.0.0",
"multer": "^1.4.2", "multer": "^1.4.2",