SS-FCSC/fcsc_ipi_backend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dashboard conflit resolved : GWM

Browse Source
This commit is contained in:
Gowtham M 2025-11-12 09:27:14 +05:30
parent c5ec47f201
commit bef081d417
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/controllers/dashboard.controller.js
View File

@ -189,21 +189,24 @@ exports.adminDashboard = async (req, res) => {
let { quarter, year } = req.query; let { quarter, year } = req.query;
// if quarter/year not passed → take latest open config // if quarter/year not passed → take latest open config
if (!quarter || !year) { // if (!quarter || !year) {
const lastConfig = await QuarterlyWindowsConfiguration.findOne({ // const lastConfig = await QuarterlyWindowsConfiguration.findOne({
order: [ // order: [
['year', 'DESC'], // ['year', 'DESC'],
['quarter', 'DESC'] // ['quarter', 'DESC']
] // ]
}); // });
if (lastConfig) { // if (lastConfig) {
quarter = lastConfig.quarter; // quarter = lastConfig.quarter;
year = lastConfig.year; // year = lastConfig.year;
} // }
} // }
let whereCond = {};
if (quarter === 'All') quarter = null;
if (year === 'All') year = null;
const whereCond = {};
if (quarter) whereCond.quarter = quarter; if (quarter) whereCond.quarter = quarter;
if (year) whereCond.year = year; if (year) whereCond.year = year;