Skip to content

Commit 0c5cb66

Browse files
akshaykumar059004akshaykumar059004
committed
Implementation: Post funding data update
1 parent e43e2f4 commit 0c5cb66

File tree

4 files changed

+176
-21
lines changed

4 files changed

+176
-21
lines changed

‎controllers/pf_landformData.contoller.js‎

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,14 @@ exports.getpf_landformData = asyncHandler(async (req, res) => {
3535
//console.log(res);
3636
if (results.length > 0) {
3737
res.status(200);
38-
//console.log(results[0]);
39-
return res.json(results[0]);
38+
//const res = results[0];
39+
//res.formid = form_id;
40+
// console.log(results[0]);
41+
const result_with_id = results[0];
42+
result_with_id.form_id = form_id; // Add form_id to the result
43+
console.log("Result with ID:", result_with_id);
44+
//console.log("Result with ID:", result_with_id);
45+
return res.json(result_with_id).status(200);
4046
} else {
4147
return res.json(0);
4248
}
@@ -56,9 +62,9 @@ const updatepf_landformData_sql = `
5662
form_lands.p_contribution = ?,
5763
form_lands.f_contribution = ?,
5864
form_lands.total_est = ?,
59-
form_lands.measured_by = "verifier-1",
65+
form_lands.measured_by = ?,
6066
form_lands.total_area = ?,
61-
files.passbook_postfunding = "passbook.pdf"
67+
files.passbook_postfunding = ?
6268
WHERE
6369
form_lands.form_id = ?
6470
AND forms.form_type = 1`;
@@ -69,28 +75,35 @@ exports.updatepf_landformData = asyncHandler(async (req, res) => {
6975
const pf_landformData = req.body;
7076
try {
7177
console.log(pf_landformData);
72-
console.log(pf_landformData.landDevelopment.pradanContribution);
73-
console.log(pf_landformData.landDevelopment.farmerContribution);
74-
console.log(pf_landformData.landDevelopment.totalEstimate);
75-
console.log(pf_landformData.landOwnership.totalArea);
76-
console.log(pf_landformData.bankDetails.pf_passbook);
77-
console.log(pf_landformData.basicDetails.form_id);
78+
// console.log(pf_landformData.landDevelopment.pradanContribution);
79+
// console.log(pf_landformData.landDevelopment.farmerContribution);
80+
// console.log(pf_landformData.landDevelopment.totalEstimate);
81+
// console.log(pf_landformData.basicDetails.measuredBy);
82+
// console.log(pf_landformData.landOwnership.totalArea);
83+
// console.log(pf_landformData.bankDetails.pf_passbook.name2);
84+
// console.log(pf_landformData.basicDetails.form_id);
7885
const [results] = await connection.execute(updatepf_landformData_sql, [
7986
pf_landformData.landDevelopment.pradanContribution,
8087
pf_landformData.landDevelopment.farmerContribution,
8188
pf_landformData.landDevelopment.totalEstimate,
82-
pf_landformData.landDevelopment.totalArea,
83-
pf_landformData.basicDetails.form_id
89+
pf_landformData.basicDetails.measuredBy,
90+
pf_landformData.landOwnership.totalArea,
91+
pf_landformData.bankDetails.pf_passbook.name2,
92+
pf_landformData.form_id
8493
]);
8594
if (results.affectedRows > 0) {
86-
res.status(200).json("Received data successfully");
87-
return res.json(1);
95+
//console.log("Update successful");
96+
return res.status(200).json("Received data successfully");
8897
} else {
89-
return res.json(0);
98+
//console.log("No rows affected");
99+
return res.status(200).json("No rows affected");
90100
}
91101
} catch (err) {
102+
//console.error("Error updating data:", err);
92103
return res.status(500).json({ error: err.message });
93104
} finally {
94105
connection.release(); // Always release the connection
95106
}
96-
});
107+
});
108+
109+
//verficatino

‎controllers/pf_plantationformData.controller.js‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,74 @@ exports.getpf_plantationformData = asyncHandler(async (req, res) => {
5252
});
5353

5454
//Update postfunding data
55+
56+
const updatepf_plantationformData_sql = `
57+
UPDATE plantation_details
58+
LEFT JOIN forms ON plantation_details.form_id = forms.id
59+
LEFT JOIN files ON forms.id = files.form_id
60+
SET
61+
plantation_details.p_contribution = ?,
62+
plantation_details.f_contribution = ?,
63+
plantation_details.total_est = ?,
64+
plantation_details.plantaions = ?,
65+
plantation_details.nos = ?,
66+
plantation_details.price = ?,
67+
plantation_details.other_exp = ?,
68+
plantation_details.tot_nos = ?,
69+
plantation_details.tot_price = ?,
70+
plantation_details.measured_by = ?,
71+
plantation_details.total_area = ?,
72+
files.passbook_postfunding = ?
73+
WHERE
74+
plantation_details.form_id = ?
75+
AND forms.form_type = 3`;
76+
77+
exports.updatepf_plantationformData = asyncHandler(async (req, res) => {
78+
const connection = await db.getConnection();
79+
// const form_id = req.query.form_id;
80+
const pf_plantationformData = req.body;
81+
try {
82+
//console.log(pf_plantationformData);
83+
// console.log(pf_plantationformData.landDevelopment.pradanContribution);
84+
// console.log(pf_plantationformData.landDevelopment.farmerContribution);
85+
// console.log(pf_plantationformData.landDevelopment.totalEstimate);
86+
// console.log(pf_plantationformData.plantations.plantationTypes);
87+
// console.log(pf_plantationformData.plantations.plantationNumbers);
88+
// console.log(pf_plantationformData.plantations.plantationPrices);
89+
// console.log(pf_plantationformData.plantations.otherExpenses);
90+
// console.log(pf_plantationformData.plantations.total_nos);
91+
// console.log(pf_plantationformData.plantations.totalExpenses);
92+
// console.log(pf_plantationformData.basicDetails.measuredBy);
93+
// console.log(pf_plantationformData.landOwnership.totalArea);
94+
// console.log(pf_plantationformData.bankDetails.pf_passbook.name2);
95+
// console.log(pf_plantationformData.form_id);
96+
const [results] = await connection.execute(updatepf_plantationformData_sql, [
97+
pf_plantationformData.landDevelopment.pradanContribution,
98+
pf_plantationformData.landDevelopment.farmerContribution,
99+
pf_plantationformData.landDevelopment.totalEstimate,
100+
pf_plantationformData.plantations.plantationTypes,
101+
pf_plantationformData.plantations.plantationNumbers,
102+
pf_plantationformData.plantations.plantationPrices,
103+
pf_plantationformData.plantations.otherExpenses,
104+
pf_plantationformData.plantations.total_nos,
105+
pf_plantationformData.plantations.totalExpenses,
106+
pf_plantationformData.basicDetails.measuredBy,
107+
pf_plantationformData.landOwnership.totalArea,
108+
pf_plantationformData.bankDetails.pf_passbook.name2,
109+
pf_plantationformData.form_id
110+
]);
111+
if (results.affectedRows > 0) {
112+
//console.log("Update successful");
113+
return res.status(200).json("Received data successfully");
114+
} else {
115+
//console.log("No rows affected");
116+
return res.status(200).json("No rows affected");
117+
}
118+
//return res.json(200);
119+
} catch (err) {
120+
//console.error("Error updating data:", err);
121+
return res.status(500).json({ error: err.message });
122+
} finally {
123+
connection.release(); // Always release the connection
124+
}
125+
});

‎controllers/pf_pondformData.controller.js‎

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ exports.getpf_pondformData = asyncHandler(async (req, res) => {
3838
const [results] = await connection.execute(getpf_pondformData_sql, [form_id]);
3939

4040
if (results.length > 0) {
41-
return res.json(results[0]);
41+
//console.log(results[0]);
42+
const result_with_id = results[0];
43+
result_with_id.form_id = form_id;
44+
return res.json(result_with_id).status(200);
4245
} else {
4346
return res.json(0);
4447
}
@@ -49,4 +52,66 @@ exports.getpf_pondformData = asyncHandler(async (req, res) => {
4952
}
5053
});
5154

55+
5256
//Update postfunding data
57+
const updatepf_pondformData_sql = `
58+
UPDATE farm_pond_details
59+
LEFT JOIN forms ON farm_pond_details.form_id = forms.id
60+
LEFT JOIN files ON forms.id = files.form_id
61+
SET
62+
farm_pond_details.p_contribution = ?,
63+
farm_pond_details.f_contribution = ?,
64+
farm_pond_details.total_est = ?,
65+
farm_pond_details.measured_by = ?,
66+
farm_pond_details.len_pf = ?,
67+
farm_pond_details.bre_pf = ?,
68+
farm_pond_details.dep_pf = ?,
69+
farm_pond_details.vol_pf = ?,
70+
files.passbook_postfunding = ?
71+
WHERE
72+
farm_pond_details.form_id = ?
73+
AND forms.form_type = 2`;
74+
75+
exports.updatepf_pondformData = asyncHandler(async (req, res) => {
76+
const connection = await db.getConnection();
77+
// const form_id = req.query.form_id;
78+
const pf_pondformData = req.body;
79+
try {
80+
console.log(pf_pondformData);
81+
// console.log(pf_pondformData.landDevelopment.pradanContribution);
82+
// console.log(pf_pondformData.landDevelopment.farmerContribution);
83+
// console.log(pf_pondformData.landDevelopment.totalEstimate);
84+
// console.log(pf_pondformData.basicDetails.measuredBy);
85+
// console.log(pf_pondformData.landDevelopment.length);
86+
// console.log(pf_pondformData.landDevelopment.breadth);
87+
// console.log(pf_pondformData.landDevelopment.depth);
88+
// console.log(pf_pondformData.landDevelopment.volume);
89+
// console.log(pf_pondformData.bankDetails.pf_passbook.name2);
90+
// console.log(pf_pondformData.basicDetails.form_id);
91+
const [results] = await connection.execute(updatepf_pondformData_sql, [
92+
pf_pondformData.landDevelopment.pradanContribution,
93+
pf_pondformData.landDevelopment.farmerContribution,
94+
pf_pondformData.landDevelopment.totalEstimate,
95+
pf_pondformData.basicDetails.measuredBy,
96+
pf_pondformData.landDevelopment.length,
97+
pf_pondformData.landDevelopment.breadth,
98+
pf_pondformData.landDevelopment.depth,
99+
pf_pondformData.landDevelopment.volume,
100+
pf_pondformData.bankDetails.pf_passbook.name2,
101+
pf_pondformData.form_id
102+
]);
103+
if (results.affectedRows > 0) {
104+
//console.log("Update successful");
105+
return res.status(200).json("Received data successfully");
106+
} else {
107+
//console.log("No rows affected");
108+
return res.status(200).json("No rows affected");
109+
}
110+
//return res.json(200);
111+
} catch (err) {
112+
//console.error("Error updating data:", err);
113+
return res.status(500).json({ error: err.message });
114+
} finally {
115+
connection.release(); // Always release the connection
116+
}
117+
});

‎routes/formData.route.js‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ const {postLandformData} = require("../controllers/landformData.controller");
44
const {postPondformData} = require("../controllers/pondformData.controller");
55
const {postPlantationformData} = require("../controllers/plantationformData.controller");
66
const {updateLandformData} = require("../controllers/landformData.controller");
7-
const { getpf_landformData } = require("../controllers/pf_landformData.contoller");
8-
const { getpf_pondformData } = require("../controllers/pf_pondformData.controller");
9-
const { getpf_plantationformData } = require("../controllers/pf_plantationformData.controller");
7+
const {getpf_landformData} = require("../controllers/pf_landformData.contoller");
8+
const {getpf_pondformData} = require("../controllers/pf_pondformData.controller");
9+
const {getpf_plantationformData} = require("../controllers/pf_plantationformData.controller");
1010
const {updatepf_landformData} = require("../controllers/pf_landformData.contoller");
11-
11+
const {updatepf_pondformData} = require("../controllers/pf_pondformData.controller");
12+
const {updatepf_plantationformData} = require("../controllers/pf_plantationformData.controller");
1213

1314
//forms submission routes
1415
router.route('/postLandformData').post(postLandformData);
@@ -25,5 +26,10 @@ router.route('/getpf_plantationformData').get(getpf_plantationformData);
2526

2627
//update postfunding forms routes
2728
router.route('/updatepf_landformData').put(updatepf_landformData);
29+
router.route('/updatepf_pondformData').put(updatepf_pondformData);
30+
router.route('/updatepf_plantationformData').put(updatepf_plantationformData);
31+
32+
//verifier data fetch
33+
//router.route('/getv_landformData').get();
2834

2935
module.exports = router;

0 commit comments

Comments
 (0)