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

Bug fixed

Browse Source
This commit is contained in:
unknown 2025-12-10 14:22:05 +05:30
parent 8557ddb37a
commit 74751cf357
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/quarterlyWindowsConfiguration.controller.js
View File

@ -7,7 +7,6 @@ const EstablishmentUser = db.EstablishmentUser;
const { sendEmailService } = require("../services/email.service");
// Create new configuration
exports.createConfig = async (req, res) => {
try {
@ -100,7 +99,7 @@ exports.getAllConfigs = async (req, res) => {
],
],
},
order: [["year", "DESC"]],
order: [[Sequelize.literal("COALESCE(updated_at, created_at)"), "DESC"]],
});
res
.status(200)

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

@ -312,18 +312,24 @@ exports.submissionHistory = async (req, res) => {
"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"
]
]
},
where: { establishment_id },
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 });
res.status(200).json({ status: "success", data: result });
} catch (err) {
res.status(500).json({ status: "failed", message: err.message });
}

1
app/models/quarterlyWindowsConfiguration.model.js
View File

@ -10,6 +10,7 @@ module.exports = (sequelize, DataTypes) => {
survey_name: {
type: DataTypes.STRING(10),
allowNull: false,
unique: true,
},
year: {
type: DataTypes.INTEGER,

2
app/uploads/company_profile_upload_sample.csv
View File

@ -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

1 Establishment Code * (Mandatory) 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