Skip to content

Commit 06418cc

Browse files
Churchill427Churchill427
authored
Merge pull request pradanvirudhunagar#30 from akshaykumar059004/main
Implemented forms fetch by id
2 parents f2e166c + 42c6dbb commit 06418cc

File tree

4 files changed

+233
-47
lines changed

4 files changed

+233
-47
lines changed

‎controllers/landformData.controller.js‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const postLandformData_bankdetails_sql = `INSERT INTO bank_details (
2323
branch, ifsc_code, farmer_ack
2424
) VALUES (?, ?, ?, ?, ?, ?, ?)`;
2525

26-
const postLandformData_files_sql = `INSERT INTO files (
26+
const postLandformData_submittedFiles_sql = `INSERT INTO files (
2727
form_id, identity, geotag, patta, fmb, photo, passbook
2828
) VALUES (?, ?, ?, ?, ?, ?, ?)`;
2929

@@ -66,7 +66,7 @@ exports.postLandformData = asyncHandler(async (req, res) => {
6666
safe(landformData.basicDetails.toiletCondition),
6767
safe(landformData.basicDetails.education),
6868
safe(landformData.user_id),
69-
safe(today),
69+
safe(landformData.landDevelopment.date),
7070
safe(landformData.landDevelopment.latitude),
7171
safe(landformData.landDevelopment.longitude),
7272
1,
@@ -114,19 +114,24 @@ exports.postLandformData = asyncHandler(async (req, res) => {
114114
safe(landformData.bankDetails.ifscCode),
115115
safe(landformData.bankDetails.farmerAgreed),
116116
]);
117-
118-
// Optional: Insert files if present
119-
// if (landformData.files) {
120-
// await connection.execute(postLandformData_files_sql, [
121-
// safe(form_id),
122-
// safe(landformData.files.identity),
123-
// safe(landformData.files.geotag),
124-
// safe(landformData.files.patta),
125-
// safe(landformData.files.fmb),
126-
// safe(landformData.files.photo),
127-
// safe(landformData.files.passbook),
128-
// ]);
129-
// }
117+
// console.log("1",landformData);
118+
// console.log("2",landformData?.bankDetails);
119+
// console.log("3",landformData?.bankDetails?.submittedFiles);
120+
// console.log("4",landformData?.bankDetails?.submittedFiles?.idCard);
121+
122+
// console.log(landformData?.bankDetails?.submittedFiles?.idCard?.name);
123+
// Optional: Insert submittedFiles if present
124+
if (landformData.bankDetails.submittedFiles) {
125+
await connection.execute(postLandformData_submittedFiles_sql, [
126+
safe(form_id),
127+
safe(landformData.bankDetails.submittedFiles.idCard.name),
128+
safe(landformData.bankDetails.submittedFiles.geoTag.name),
129+
safe(landformData.bankDetails.submittedFiles.patta.name),
130+
safe(landformData.bankDetails.submittedFiles.fmb.name),
131+
safe(landformData.bankDetails.submittedFiles.farmerPhoto.name),
132+
safe(landformData.bankDetails.submittedFiles.bankPassbook.name)
133+
]);
134+
}
130135

131136
// Commit transaction
132137
await connection.commit();

‎controllers/plantationformData.controller.js‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ exports.postPlantationformData = asyncHandler(async (req, res) => {
6666
safe(plantationformData.basicDetails.toiletCondition),
6767
safe(plantationformData.basicDetails.education),
6868
safe(plantationformData.user_id),
69-
safe(today),
69+
safe(plantationformData.landDevelopment.date),
7070
safe(plantationformData.landDevelopment.latitude),
7171
safe(plantationformData.landDevelopment.longitude),
7272
1,
@@ -118,18 +118,19 @@ exports.postPlantationformData = asyncHandler(async (req, res) => {
118118
safe(plantationformData.bankDetails.farmerAgreed),
119119
]);
120120

121-
// Optional: Insert files if present
122-
// if (plantationformData.files) {
123-
// await connection.execute(postLandformData_files_sql, [
124-
// safe(form_id),
125-
// safe(plantationformData.files.identity),
126-
// safe(plantationformData.files.geotag),
127-
// safe(plantationformData.files.patta),
128-
// safe(plantationformData.files.fmb),
129-
// safe(plantationformData.files.photo),
130-
// safe(plantationformData.files.passbook),
131-
// ]);
132-
// }
121+
console.log(plantationformData.bankDetails.submittedFiles.patta.name);
122+
//Optional: Insert files if present
123+
if (plantationformData.bankDetails.submittedFiles) {
124+
await connection.execute(postLandformData_files_sql, [
125+
safe(form_id),
126+
safe(plantationformData.bankDetails.submittedFiles.idCard.name),
127+
safe(plantationformData.bankDetails.submittedFiles.geoTag.name),
128+
safe(plantationformData.bankDetails.submittedFiles.patta.name),
129+
safe(plantationformData.bankDetails.submittedFiles.fmb.name),
130+
safe(plantationformData.bankDetails.submittedFiles.farmerPhoto.name),
131+
safe(plantationformData.bankDetails.submittedFiles.bankPassbook.name)
132+
]);
133+
}
133134

134135
// Commit transaction
135136
await connection.commit();

‎controllers/pondformData.controller.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ exports.postPondformData = asyncHandler(async (req, res) => {
6666
safe(pondformData.basicDetails.toiletCondition),
6767
safe(pondformData.basicDetails.education),
6868
safe(pondformData.user_id),
69-
safe(today),
69+
safe(pondformData.landDevelopment.date),
7070
safe(pondformData.landDevelopment.latitude),
7171
safe(pondformData.landDevelopment.longitude),
7272
1,
@@ -117,19 +117,19 @@ exports.postPondformData = asyncHandler(async (req, res) => {
117117
safe(pondformData.bankDetails.ifscCode),
118118
safe(pondformData.bankDetails.farmerAgreed),
119119
]);
120-
120+
console.log(pondformData.bankDetails.submittedFiles.patta.name);
121121
// Optional: Insert files if present
122-
// if (pondformData.files) {
123-
// await connection.execute(postLandformData_files_sql, [
124-
// safe(form_id),
125-
// safe(pondformData.files.identity),
126-
// safe(pondformData.files.geotag),
127-
// safe(pondformData.files.patta),
128-
// safe(pondformData.files.fmb),
129-
// safe(pondformData.files.photo),
130-
// safe(pondformData.files.passbook),
131-
// ]);
132-
// }
122+
if (pondformData.bankDetails.submittedFiles) {
123+
await connection.execute(postLandformData_files_sql, [
124+
safe(form_id),
125+
safe(pondformData.bankDetails.submittedFiles.idCard.name),
126+
safe(pondformData.bankDetails.submittedFiles.geoTag.name),
127+
safe(pondformData.bankDetails.submittedFiles.patta.name),
128+
safe(pondformData.bankDetails.submittedFiles.fmb.name),
129+
safe(pondformData.bankDetails.submittedFiles.farmerPhoto.name),
130+
safe(pondformData.bankDetails.submittedFiles.bankPassbook.name)
131+
]);
132+
}
133133

134134
// Commit transaction
135135
await connection.commit();

‎controllers/previewformsData.controller.js‎

Lines changed: 186 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
const db = require("../configs/mysql_config");
22
const asyncHandler = require("../middlewares/asyncHandler");
33

4-
const getpreviewformsData_sql = `SELECT id, form_type, farmer_name, created_at, status FROM forms WHERE user_id = ?`;
4+
const getpreviewformsData_sql = `SELECT
5+
forms.id,
6+
forms.form_type,
7+
forms.farmer_name,
8+
forms.created_at,
9+
forms.status,
10+
forms.gender,
11+
forms.block,
12+
forms.hamlet,
13+
forms.panchayat
14+
FROM
15+
forms
16+
WHERE
17+
forms.user_id = ?`;
518

619
exports.getpreviewformsData = asyncHandler(async (req, res) => {
720
const connection = await db.getConnection();
@@ -24,19 +37,186 @@ exports.getpreviewformsData = asyncHandler(async (req, res) => {
2437
}
2538
});
2639

27-
const getpreviewspecificformData_sql = ``;
40+
const getpreviewspecificformData_sql = `SELECT
41+
-- Forms Table
42+
forms.id AS form_id,
43+
forms.user_id,
44+
forms.form_type,
45+
forms.farmer_name,
46+
forms.age,
47+
forms.mobile AS form_mobile,
48+
forms.district,
49+
forms.block,
50+
forms.panchayat,
51+
forms.hamlet,
52+
forms.id_type,
53+
forms.id_number,
54+
forms.gender,
55+
forms.spouse,
56+
forms.type_of_households,
57+
forms.h_members,
58+
forms.hh_occupation,
59+
forms.special_catog,
60+
forms.caste,
61+
forms.house_owner,
62+
forms.type_of_house,
63+
forms.drinking_water,
64+
forms.potability,
65+
forms.domestic_water,
66+
forms.toilet_avail,
67+
forms.toilet_cond,
68+
forms.household_education,
69+
forms.created_at,
70+
forms.lat,
71+
forms.lon,
72+
forms.mcode,
73+
forms.status,
74+
75+
-- Users Table (Corrected alias usage)
76+
u.id AS user_id,
77+
u.name AS user_name,
78+
u.email AS user_email,
79+
u.password AS user_password,
80+
u.role AS user_role,
81+
u.mobile AS user_mobile,
82+
u.date_of_joining AS user_date_of_joining,
83+
u.location AS user_location,
84+
u.photo AS user_photo,
85+
86+
-- Files Table
87+
files.id AS file_id,
88+
files.form_id AS file_form_id,
89+
files.identity,
90+
files.geotag,
91+
files.patta,
92+
files.fmb,
93+
files.photo AS file_photo,
94+
files.passbook,
95+
files.passbook_postfunding,
96+
97+
-- Bank Details Table
98+
bank_details.id AS bank_detail_id,
99+
bank_details.form_id AS bank_form_id,
100+
bank_details.account_holder_name,
101+
bank_details.account_number,
102+
bank_details.bank_name,
103+
bank_details.branch,
104+
bank_details.ifsc_code,
105+
bank_details.farmer_ack,
106+
107+
-- Form Lands Table (conditional fields for form_type = 1)
108+
CASE WHEN forms.form_type = 1 THEN form_lands.ownership END AS form_land_ownership,
109+
CASE WHEN forms.form_type = 1 THEN form_lands.well_irrigation END AS form_land_well_irrigation,
110+
CASE WHEN forms.form_type = 1 THEN form_lands.area_irrigated END AS form_land_area_irrigated,
111+
CASE WHEN forms.form_type = 1 THEN form_lands.irrigated_lands END AS form_land_irrigated_lands,
112+
CASE WHEN forms.form_type = 1 THEN form_lands.patta END AS form_land_patta,
113+
CASE WHEN forms.form_type = 1 THEN form_lands.total_area END AS form_land_total_area,
114+
CASE WHEN forms.form_type = 1 THEN form_lands.taluk END AS form_land_taluk,
115+
CASE WHEN forms.form_type = 1 THEN form_lands.firka END AS form_land_firka,
116+
CASE WHEN forms.form_type = 1 THEN form_lands.revenue END AS form_land_revenue,
117+
CASE WHEN forms.form_type = 1 THEN form_lands.crop_season END AS form_land_crop_season,
118+
CASE WHEN forms.form_type = 1 THEN form_lands.livestocks END AS form_land_livestocks,
119+
CASE WHEN forms.form_type = 1 THEN form_lands.sf_number END AS form_land_sf_number,
120+
CASE WHEN forms.form_type = 1 THEN form_lands.soil_type END AS form_land_soil_type,
121+
CASE WHEN forms.form_type = 1 THEN form_lands.land_to_benefit END AS form_land_land_to_benefit,
122+
CASE WHEN forms.form_type = 1 THEN form_lands.date_of_ins END AS form_land_date_of_ins,
123+
CASE WHEN forms.form_type = 1 THEN form_lands.area_benefited END AS form_land_area_benefited,
124+
CASE WHEN forms.form_type = 1 THEN form_lands.type_of_work END AS form_land_type_of_work,
125+
CASE WHEN forms.form_type = 1 THEN form_lands.any_other_works END AS form_land_any_other_works,
126+
CASE WHEN forms.form_type = 1 THEN form_lands.p_contribution END AS form_land_p_contribution,
127+
CASE WHEN forms.form_type = 1 THEN form_lands.f_contribution END AS form_land_f_contribution,
128+
CASE WHEN forms.form_type = 1 THEN form_lands.total_est END AS form_land_total_est,
129+
CASE WHEN forms.form_type = 1 THEN form_lands.field_insp END AS form_land_field_insp,
130+
CASE WHEN forms.form_type = 1 THEN form_lands.site_app END AS form_land_site_app,
131+
CASE WHEN forms.form_type = 1 THEN form_lands.date_of_app END AS form_land_date_of_app,
132+
CASE WHEN forms.form_type = 1 THEN form_lands.area_benefited_postfunding END AS form_land_area_benefited_postfunding,
133+
CASE WHEN forms.form_type = 1 THEN form_lands.verified_by END AS form_land_verified_by,
134+
135+
-- Farm Pond Details Table (conditional fields for form_type = 2)
136+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.ownership END AS farm_pond_ownership,
137+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.well_irrigation END AS farm_pond_well_irrigation,
138+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.area_irrigated END AS farm_pond_area_irrigated,
139+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.irrigated_lands END AS farm_pond_irrigated_lands,
140+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.patta END AS farm_pond_patta,
141+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.total_area END AS farm_pond_total_area,
142+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.taluk END AS farm_pond_taluk,
143+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.firka END AS farm_pond_firka,
144+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.revenue END AS farm_pond_revenue,
145+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.crop_season END AS farm_pond_crop_season,
146+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.livestocks END AS farm_pond_livestocks,
147+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.sf_number END AS farm_pond_sf_number,
148+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.soil_type END AS farm_pond_soil_type,
149+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.land_to_benefit END AS farm_pond_land_to_benefit,
150+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.date_of_ins END AS farm_pond_date_of_ins,
151+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.length END AS farm_pond_length,
152+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.breadth END AS farm_pond_breadth,
153+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.depth END AS farm_pond_depth,
154+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.volume END AS farm_pond_volume,
155+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.p_contribution END AS farm_pond_p_contribution,
156+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.f_contribution END AS farm_pond_f_contribution,
157+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.total_est END AS farm_pond_total_est,
158+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.area_benefited END AS farm_pond_area_benefited,
159+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.field_insp END AS farm_pond_field_insp,
160+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.site_app END AS farm_pond_site_app,
161+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.date_of_app END AS farm_pond_date_of_app,
162+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.len_pf END AS farm_pond_len_pf,
163+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.bre_pf END AS farm_pond_bre_pf,
164+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.dep_pf END AS farm_pond_dep_pf,
165+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.vol_pf END AS farm_pond_vol_pf,
166+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.area_benefited_postfunding END AS farm_pond_area_benefited_postfunding,
167+
CASE WHEN forms.form_type = 2 THEN farm_pond_details.verified_by END AS farm_pond_verified_by,
168+
169+
CASE WHEN forms.form_type = 3 THEN plantation_details.ownership END AS plantation_ownership,
170+
CASE WHEN forms.form_type = 3 THEN plantation_details.well_irrigation END AS plantation_well_irrigation,
171+
CASE WHEN forms.form_type = 3 THEN plantation_details.area_irrigated END AS plantation_area_irrigated,
172+
CASE WHEN forms.form_type = 3 THEN plantation_details.irrigated_lands END AS plantation_irrigated_lands,
173+
CASE WHEN forms.form_type = 3 THEN plantation_details.patta END AS plantation_patta,
174+
CASE WHEN forms.form_type = 3 THEN plantation_details.total_area END AS plantation_total_area,
175+
CASE WHEN forms.form_type = 3 THEN plantation_details.taluk END AS plantation_taluk,
176+
CASE WHEN forms.form_type = 3 THEN plantation_details.firka END AS plantation_firka,
177+
CASE WHEN forms.form_type = 3 THEN plantation_details.revenue END AS plantation_revenue,
178+
CASE WHEN forms.form_type = 3 THEN plantation_details.crop_season END AS plantation_crop_season,
179+
CASE WHEN forms.form_type = 3 THEN plantation_details.livestocks END AS plantation_livestocks,
180+
CASE WHEN forms.form_type = 3 THEN plantation_details.sf_number END AS plantation_sf_number,
181+
CASE WHEN forms.form_type = 3 THEN plantation_details.soil_type END AS plantation_soil_type,
182+
CASE WHEN forms.form_type = 3 THEN plantation_details.land_to_benefit END AS plantation_land_to_benefit,
183+
CASE WHEN forms.form_type = 3 THEN plantation_details.date_of_ins END AS plantation_date_of_ins,
184+
CASE WHEN forms.form_type = 3 THEN plantation_details.area_benefited_by_proposal END AS plantation_area_benefited_by_proposal,
185+
CASE WHEN forms.form_type = 3 THEN plantation_details.any_other_works END AS plantation_any_other_works,
186+
CASE WHEN forms.form_type = 3 THEN plantation_details.p_contribution END AS plantation_p_contribution,
187+
CASE WHEN forms.form_type = 3 THEN plantation_details.f_contribution END AS plantation_f_contribution,
188+
CASE WHEN forms.form_type = 3 THEN plantation_details.total_est END AS plantation_total_est,
189+
CASE WHEN forms.form_type = 3 THEN plantation_details.field_insp END AS plantation_field_insp,
190+
CASE WHEN forms.form_type = 3 THEN plantation_details.site_app END AS plantation_site_app,
191+
CASE WHEN forms.form_type = 3 THEN plantation_details.date_of_app END AS plantation_date_of_app,
192+
CASE WHEN forms.form_type = 3 THEN plantation_details.plantaions END AS plantation_plantaions,
193+
CASE WHEN forms.form_type = 3 THEN plantation_details.nos END AS plantation_nos,
194+
CASE WHEN forms.form_type = 3 THEN plantation_details.price END AS plantation_price,
195+
CASE WHEN forms.form_type = 3 THEN plantation_details.other_exp END AS plantation_other_exp,
196+
CASE WHEN forms.form_type = 3 THEN plantation_details.tot_nos END AS plantation_tot_nos,
197+
CASE WHEN forms.form_type = 3 THEN plantation_details.tot_price END AS plantation_tot_price,
198+
CASE WHEN forms.form_type = 3 THEN plantation_details.verified_by END AS plantation_verified_by
199+
FROM forms
200+
LEFT JOIN users AS u ON u.id = forms.user_id
201+
LEFT JOIN files ON files.form_id = forms.id
202+
LEFT JOIN bank_details ON bank_details.form_id = forms.id
203+
LEFT JOIN form_lands ON form_lands.form_id = forms.id
204+
LEFT JOIN farm_pond_details ON farm_pond_details.form_id = forms.id
205+
LEFT JOIN plantation_details ON plantation_details.form_id = forms.id
206+
WHERE forms.id = ?;
207+
`;
28208

29209
exports.getpreviewspecificformData = asyncHandler(async (req, res) => {
30210
const connection = await db.getConnection();
31211
const form_id = req.query.form_id;
32-
//console.log(data.user_id);
212+
console.log(form_id);
33213

34214
try {
35215
const [results] = await connection.execute(getpreviewspecificformData_sql,[form_id]);
36-
216+
//console.log(results);
37217
if (results.length > 0) {
38-
console.log(results);
39-
// return res.json(results);
218+
// console.log(results);
219+
return res.json(results);
40220
} else {
41221
return res.json(0);
42222
}

0 commit comments

Comments
 (0)