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

Cost decimal changed

Browse Source
This commit is contained in:
unknown 2025-12-12 11:32:17 +05:30
parent f81046a95a
commit e635c9787a
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/controllers/submission.controller.js
View File

@ -304,7 +304,7 @@ exports.submissionHistory = async (req, res) => {
const { establishment_id } = req.params; const { establishment_id } = req.params;
const data = await Submission.findAll({ let data = await Submission.findAll({
attributes: { attributes: {
include: [ include: [
[ [
@ -312,7 +312,7 @@ exports.submissionHistory = async (req, res) => {
"product_count" "product_count"
], ],
[ [
Sequelize.literal(`(SELECT ROUND(SUM(sp2.current_cost), 4) FROM submission_products AS sp2 WHERE sp2.submission_id = submission.id)`), Sequelize.literal(`(SELECT ROUND(COALESCE(SUM(sp2.current_cost), 0), 2) FROM submission_products AS sp2 WHERE sp2.submission_id = submission.id)`),
"total_cost" "total_cost"
] ]
] ]
@ -320,16 +320,13 @@ exports.submissionHistory = async (req, res) => {
where: { establishment_id }, where: { establishment_id },
order: [["id", "DESC"]], order: [["id", "DESC"]],
}); });
const result = data.map(obj => {
const record = obj.get({ plain: true }); data = data.map(item => ({
...item.get(),
const num = Number(record.total_cost); total_cost: Number(item.get("total_cost") || 0).toFixed(2)
if (!isNaN(num)) { }));
record.total_cost = Number.isInteger(num) ? num : num.toFixed(4);
} res.status(200).json({ status: "success", data });
return record;
});
res.status(200).json({ status: "success", data: result });
} catch (err) { } catch (err) {
res.status(500).json({ status: "failed", message: err.message }); res.status(500).json({ status: "failed", message: err.message });
} }
@ -545,7 +542,7 @@ exports.viewSubmissionDetails = async (req, res) => {
}; };
} }
const data = await Submission.findOne( { let data = await Submission.findOne( {
where: whereCondition, where: whereCondition,
include: [ include: [
{ {
@ -581,11 +578,16 @@ exports.viewSubmissionDetails = async (req, res) => {
], ],
}); });
if (!data) return res.status(404).json({ status: "failed", message: "Not found" }); let plainData = data.get({ plain: true });
plainData.products = plainData.products.map(p => {
const quarter_periods = getQuarterPeriods(Number(data.year), data.quarter); const format = v => Number(v || 0).toFixed(2);
return {
res.status(200).json({ status: "success", data , quarter_periods }); ...p,
current_cost: format(p.current_cost)
};
});
const quarter_periods = getQuarterPeriods(Number(plainData.year), plainData.quarter);
res.status(200).json({ status: "success", data: plainData, quarter_periods });
} catch (err) { } catch (err) {
res.status(500).json({ status: "failed", message: err.message }); res.status(500).json({ status: "failed", message: err.message });
@ -1026,6 +1028,7 @@ exports.getProductSubmissionHistory = async (req, res) => {
Number(d.submission.year), Number(d.submission.year),
d.submission.quarter d.submission.quarter
); );
d.dataValues.current_cost = Number(d.current_cost || 0).toFixed(2);
} }