Bug fixed
This commit is contained in:
parent
8557ddb37a
commit
74751cf357
@ -7,7 +7,6 @@ const EstablishmentUser = db.EstablishmentUser;
|
|||||||
const { sendEmailService } = require("../services/email.service");
|
const { sendEmailService } = require("../services/email.service");
|
||||||
|
|
||||||
// Create new configuration
|
// Create new configuration
|
||||||
|
|
||||||
exports.createConfig = async (req, res) => {
|
exports.createConfig = async (req, res) => {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
@ -100,7 +99,7 @@ exports.getAllConfigs = async (req, res) => {
|
|||||||
],
|
],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
order: [["year", "DESC"]],
|
order: [[Sequelize.literal("COALESCE(updated_at, created_at)"), "DESC"]],
|
||||||
});
|
});
|
||||||
res
|
res
|
||||||
.status(200)
|
.status(200)
|
||||||
|
|||||||
@ -312,18 +312,24 @@ exports.submissionHistory = async (req, res) => {
|
|||||||
"product_count"
|
"product_count"
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
Sequelize.literal(`(SELECT SUM(sp2.current_cost) FROM submission_products AS sp2 WHERE sp2.submission_id = submission.id)`),
|
Sequelize.literal(`(SELECT ROUND(SUM(sp2.current_cost), 4) FROM submission_products AS sp2 WHERE sp2.submission_id = submission.id)`),
|
||||||
"total_cost"
|
"total_cost"
|
||||||
]
|
]
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
where: { establishment_id },
|
where: { establishment_id },
|
||||||
order: [["id", "DESC"]],
|
order: [["id", "DESC"]],
|
||||||
|
});
|
||||||
|
const result = data.map(obj => {
|
||||||
|
const record = obj.get({ plain: true });
|
||||||
|
|
||||||
|
const num = Number(record.total_cost);
|
||||||
|
if (!isNaN(num)) {
|
||||||
|
record.total_cost = Number.isInteger(num) ? num : num.toFixed(4);
|
||||||
|
}
|
||||||
|
return record;
|
||||||
});
|
});
|
||||||
|
res.status(200).json({ status: "success", data: result });
|
||||||
|
|
||||||
res.status(200).json({ status: "success", data });
|
|
||||||
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
res.status(500).json({ status: "failed", message: err.message });
|
res.status(500).json({ status: "failed", message: err.message });
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,6 +10,7 @@ module.exports = (sequelize, DataTypes) => {
|
|||||||
survey_name: {
|
survey_name: {
|
||||||
type: DataTypes.STRING(10),
|
type: DataTypes.STRING(10),
|
||||||
allowNull: false,
|
allowNull: false,
|
||||||
|
unique: true,
|
||||||
},
|
},
|
||||||
year: {
|
year: {
|
||||||
type: DataTypes.INTEGER,
|
type: DataTypes.INTEGER,
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
Establishment Code * (Mandatory),Factory Name * (Mandatory),User Name * (Mandatory),Email * (Mandatory),Emirate * (Mandatory),HS Code 1 * (Mandatory),HS Code 2,HS Code 3,HS Code 4,HS Code 5,Permanent Factory Code,Industry Code Business Register,Industry Code Current Production,Description,Industry Code Mismatch Remarks,Establishment Address,City/Town,Postal Code,PO Box,Makani Number,Contact Person Name,Contact Person Designation,Mobile Number,Website,Number of Emirati Male,Number of Emirati Female,Number of Non-Emirati Male,Number of Non-Emirati Female
|
Establishment Id * (Mandatory),Factory Name * (Mandatory),User Name * (Mandatory),Email * (Mandatory),Emirate * (Mandatory),HS Code 1 * (Mandatory),HS Code 2,HS Code 3,HS Code 4,HS Code 5,Permanent Factory Code,Industry Code Business Register,Industry Code Current Production,Description,Industry Code Mismatch Remarks,Establishment Address,City/Town,Postal Code,PO Box,Makani Number,Contact Person Name,Contact Person Designation,Mobile Number,Website,Number of Emirati Male,Number of Emirati Female,Number of Non-Emirati Male,Number of Non-Emirati Female
|
||||||
|
|||||||
|
Loading…
Reference in New Issue
Block a user