Merge pull request pradanvirudhunagar#34 from akshaykumar059004/main

Fix: Dashboard count, field_insp, date formats

Author: Churchill427

controllers/dashboardData.controller.js

@@ -59,9 +59,21 @@ const getTodayFormsStatusCount_sql = `
 
 exports.getTodayFormsStatusCount = asyncHandler(async (req, res) => {
   const connection = await db.getConnection();
-  const date = new Date();
+  //const date = new Date();
   const user_id = req.query.user_id;
-  const today =  new Date(date.getFullYear(), date.getMonth(), date.getDate()).toLocaleDateString('en-CA');// 'YYYY-MM-DD'
+  //const today =  new Date(date.getFullYear(), date.getMonth(), date.getDate()).toLocaleDateString('en-CA');// 'YYYY-MM-DD'
+  const getFormattedDate = () => {
+    const today = new Date();
+    const day = String(today.getDate()).padStart(2, '0');  // Add leading zero if day < 10
+    const month = String(today.getMonth() + 1).padStart(2, '0');  // Get month (0-11), so +1
+    const year = today.getFullYear();
+
+    return `${day}/${month}/${year}`;
+};
+
+//console.log(getFormattedDate());  // Output: 11/05/2025 (depending on today's date)
+
+   const today = getFormattedDate();
 
   try {
     const [results] = await connection.execute(getTodayFormsStatusCount_sql, [user_id, today]);

controllers/landformData.controller.js

@@ -15,8 +15,8 @@ const postLandformData_landdetails_sql = `INSERT INTO form_lands (
   patta, total_area, taluk, firka, revenue, crop_season, livestocks,
   sf_number, soil_type, land_to_benefit, area_benefited,
   type_of_work, any_other_works, p_contribution, f_contribution,
-  total_est, date_of_ins
-) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
+  total_est, date_of_ins, field_insp
+) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
 
 const postLandformData_bankdetails_sql = `INSERT INTO bank_details (
   form_id, account_holder_name, account_number, bank_name,
@@ -99,7 +99,8 @@ exports.postLandformData = asyncHandler(async (req, res) => {
       safe(landformData.landDevelopment.pradanContribution),
       safe(landformData.landDevelopment.farmerContribution),
       safe(landformData.landDevelopment.totalEstimate),
-      safe(today)
+      safe(landformData.landDevelopment.date),
+      safe(landformData.user_id)
     ]);
 
     //console.log("form id:", form_id);

controllers/plantationformData.controller.js

@@ -33,8 +33,8 @@ exports.postPlantationformData = asyncHandler(async (req, res) => {
 
   try {
     const plantationformData = req.body;
-    const date = new Date();
-    const today = new Date(date.getFullYear(), date.getMonth(), date.getDate()).toLocaleDateString('en-CA');
+    // const date = new Date();
+    // const today = new Date(date.getFullYear(), date.getMonth(), date.getDate()).toLocaleDateString('en-CA');
     console.log("Received landform data:", plantationformData);
 
     const safe = (value) => value === undefined ? null : value;
@@ -95,13 +95,13 @@ exports.postPlantationformData = asyncHandler(async (req, res) => {
       safe(plantationformData.landDevelopment.sfNumber),
       safe(plantationformData.landDevelopment.soilTypeCombined),
       safe(plantationformData.landDevelopment.landBenefit),
-      safe(today),
+      safe(plantationformData.landDevelopment.date),
       safe(plantationformData.landDevelopment.proposalArea),
       safe(plantationformData.landDevelopment.otherWorks),
       safe(plantationformData.landDevelopment.pradanContribution),
       safe(plantationformData.landDevelopment.farmerContribution),
       safe(plantationformData.landDevelopment.totalEstimate),
-      safe(today),
+      safe(plantationformData.user_id),
       safe(plantationformData.landDevelopment.workType2)
     ]);
 
@@ -118,7 +118,7 @@ exports.postPlantationformData = asyncHandler(async (req, res) => {
       safe(plantationformData.bankDetails.farmerAgreed),
     ]);
 
-    console.log(plantationformData.bankDetails.submittedFiles.patta.name);
+    //console.log(plantationformData.bankDetails.submittedFiles.patta.name);
     //Optional: Insert files if present
     if (plantationformData.bankDetails.submittedFiles) {
       await connection.execute(postLandformData_files_sql, [

controllers/pondformData.controller.js

@@ -93,7 +93,7 @@ exports.postPondformData = asyncHandler(async (req, res) => {
       safe(pondformData.landDevelopment.sfNumber),
       safe(pondformData.landDevelopment.soilTypeCombined),
       safe(pondformData.landDevelopment.landBenefit),
-      safe(today),
+      safe(pondformData.landDevelopment.date),
       safe(pondformData.landDevelopment.length),
       safe(pondformData.landDevelopment.breadth),
       safe(pondformData.landDevelopment.depth),
@@ -102,7 +102,7 @@ exports.postPondformData = asyncHandler(async (req, res) => {
       safe(pondformData.landDevelopment.farmerContribution),
       safe(pondformData.landDevelopment.totalEstimate),
       safe(pondformData.landDevelopment.landBenefit),
-      safe(today)
+      safe(pondformData.user_id)
     ]);
 
     //console.log("form id:", form_id);

controllers/previewformsData.controller.js

@@ -48,7 +48,7 @@ const getbasicdetails_sql = `SELECT
       forms.panchayat,
       forms.hamlet,
       forms.id_type as idCardType,
-      forms.id_number as IdCardNumber,
+      forms.id_number as idCardNumber,
       forms.gender,
       forms.spouse as fatherSpouse,
       forms.type_of_households as householdType,
@@ -68,18 +68,20 @@ const getbasicdetails_sql = `SELECT
     WHERE id = ?
   `;
 
-  const getbankdetails_sql = `    SELECT
-      bank_details.account_holder_name AS accountHolderName,
-      bank_details.account_number AS accountNumber,
-      bank_details.bank_name AS bankName,
-      bank_details.branch,
-      bank_details.ifsc_code AS ifscCode,
-      bank_details.farmer_ack AS farmerAgreed
-    FROM bank_details
-    WHERE id = ?
+  const getbankdetails_sql = `SELECT
+    bank_details.account_holder_name AS accountHolderName,
+    bank_details.account_number AS accountNumber,
+    bank_details.bank_name AS bankName,
+    bank_details.branch,
+    bank_details.ifsc_code AS ifscCode,
+    bank_details.farmer_ack AS farmerAgreed,
+    forms.status AS formStatus
+  FROM bank_details
+  JOIN forms ON bank_details.form_id = forms.id
+  WHERE bank_details.id = ?
   `;
 
-  const getlandownwershipdetails_sql = `SELECT
+  const getlandownwershipdetail_land_sql = `SELECT
       form_lands.ownership AS landOwnershipType,
       form_lands.well_irrigation AS hasWell,
       form_lands.area_irrigated AS areaIrrigated,
@@ -93,6 +95,36 @@ const getbasicdetails_sql = `SELECT
       form_lands.livestocks AS livestockCombined
     FROM form_lands
     WHERE form_id = ?`;
+
+    const getlandownwershipdetail_pond_sql = `SELECT 
+      ownership AS landOwnershipType,
+      well_irrigation AS hasWell,
+      area_irrigated AS areaIrrigated,
+      irrigated_lands AS irrigatedLandCombined,
+      patta AS pattaNumber,
+      total_area AS totalArea,
+      taluk,
+      firka,
+      revenue AS revenueVillage,
+      crop_season AS cropSeasonCombined,
+      livestocks AS livestockCombined
+    FROM farm_pond_details
+    WHERE form_id = ?`;
+
+    const getlandownwershipdetail_plant_sql = ` SELECT 
+      ownership AS landOwnershipType,
+      well_irrigation AS hasWell,
+      area_irrigated AS areaIrrigated,
+      irrigated_lands AS irrigatedLandCombined,
+      patta AS pattaNumber,
+      total_area AS totalArea,
+      taluk,
+      firka,
+      revenue AS revenueVillage,
+      crop_season AS cropSeasonCombined,
+      livestocks AS livestockCombined
+    FROM plantation_details
+    WHERE form_id = ?`;
 
   const getlandformdetails_sql = `SELECT 
       forms.created_at AS date,
@@ -153,8 +185,8 @@ const getbasicdetails_sql = `SELECT
 exports.getpreviewspecificformData = asyncHandler( async (req, res) => {
   const  id  = req.query.form_id;
   const form_type = req.query.form_type;
-  console.log("Form ID",id);
-  console.log("Form type",typeof(form_type));
+  //console.log("Form ID",id);
+  //console.log("Form type",typeof(form_type));
   const connection = await db.getConnection();
 
   try {
@@ -163,40 +195,54 @@ exports.getpreviewspecificformData = asyncHandler( async (req, res) => {
       getbankdetails_sql,
       [id]
     );
-
+   // console.log(bankDetails);
     const [[basicDetails]] = await connection.execute(
       getbasicdetails_sql,
       [id]
     );
+    
     //fetch based on form type
     let landDevelopment;
+    let landOwnership;
     if (form_type == 1) {
       //fetch land form
       [[landDevelopment]] = await connection.execute(
       getlandformdetails_sql,
       [id,form_type]
     );
+      [[landOwnership]] = await connection.execute(
+      getlandownwershipdetail_land_sql,
+      [id]
+    );
+    console.log("land:",landOwnership);
     } else if (form_type == 2) {
       //fetch pond form
       [[landDevelopment]] = await connection.execute(
       getpondformdetails_sql,
       [id,form_type]
     );
+    [[landOwnership]] = await connection.execute(
+      getlandownwershipdetail_pond_sql,
+      [id]
+    );
+    console.log("pond:",landOwnership);
     } else if (form_type == 3) {
       //fetch plantation form
       [[landDevelopment]] = await connection.execute(
       getplantationformdetails_sql,
       [id,form_type]
     );
-    console.log(landDevelopment);
+    [[landOwnership]] = await connection.execute(
+      getlandownwershipdetail_plant_sql,
+      [id]
+    );
+    console.log("plantation:",landOwnership);
+    //console.log(landDevelopment);
     } else {
       return res.status(400).json({ error: 'Unknown form type' });
     }
 
-    const [[landOwnership]] = await connection.execute(
-      getlandownwershipdetails_sql,
-      [id]
-    );
+
 
     // 2. Fetch submitted files from separate table
     // const [[submittedFiles]] = await connection.execute(
@@ -226,7 +272,7 @@ exports.getpreviewspecificformData = asyncHandler( async (req, res) => {
       landDevelopment,
       landOwnership
     };
-    console.log(result);
+    //console.log(result);
     res.json(result);
 
   } catch (err) {

index.js

@@ -30,6 +30,6 @@ app.get("/", (req, res) => {
 // const errorHandler = require('./middlewares/errorHandler');
 // app.use(errorHandler);
 
-app.listen(PORT, () => {
+app.listen(PORT,'0.0.0.0', () => {
   console.log(`🚀 Server is running on http://localhost:${PORT}`);
 });