diff --git a/app/controllers/dashboard.controller.js b/app/controllers/dashboard.controller.js index de9d8d1..6bb90ff 100644 --- a/app/controllers/dashboard.controller.js +++ b/app/controllers/dashboard.controller.js @@ -256,12 +256,22 @@ exports.adminDashboard = async (req, res) => { )`), "product_count", ], + [ + Sequelize.literal(`( + SELECT eu.name + FROM establishment_users eu + WHERE eu.id = submission.created_by + LIMIT 1 + )`), + "created_by_name" + ] ], }, order: [["created_at", "DESC"]], limit: 10, }); + console.log(recentSubmissions,'geetha') return res.status(200).json({ status: "success", selected_quarter: quarter, diff --git a/app/controllers/submission.controller.js b/app/controllers/submission.controller.js index c73fc40..d91fd97 100644 --- a/app/controllers/submission.controller.js +++ b/app/controllers/submission.controller.js @@ -45,7 +45,7 @@ exports.createSubmission = async (req, res) => { const currentResponded = config.responded ?? 0; const currentNotResponded = config.not_responded ?? 0; // respond increase, not responded decrease - await QuarterlyWindowsConfiguration.update({responded: currentResponded + 1, not_responded: currentNotResponded - 1, updated_by: req.user.id, updated_at: new Date() }, {where: { id: config.id }} ); + await QuarterlyWindowsConfiguration.update({responded: currentResponded + 1, not_responded: currentNotResponded - 1, updated_at: new Date() }, {where: { id: config.id }} ); } if (products.length) {