Merge branch 'pradanvirudhunagar:main' into main

Author: Churchill427

controllers/dashboardData.controller.js

@@ -20,7 +20,8 @@ const getTotalFormsStatusCount_sql = `
 
 exports.getTotalFormsStatusCount = asyncHandler(async (req, res) => {
   const connection = await db.getConnection();
-  const userId = req.params.userId;
+  const userId = req.query.user_id;
+  console.log(userId);
 
   try {
     const [results] = await connection.execute(getTotalFormsStatusCount_sql, [userId]);
@@ -59,11 +60,11 @@ const getTodayFormsStatusCount_sql = `
 exports.getTodayFormsStatusCount = asyncHandler(async (req, res) => {
   const connection = await db.getConnection();
   const date = new Date();
-  const userId = req.params.userId;
+  const user_id = req.query.user_id;
   const today =  new Date(date.getFullYear(), date.getMonth(), date.getDate()).toLocaleDateString('en-CA');// 'YYYY-MM-DD'
 
   try {
-    const [results] = await connection.execute(getTodayFormsStatusCount_sql, [userId, today]);
+    const [results] = await connection.execute(getTodayFormsStatusCount_sql, [user_id, today]);
     if (results.length > 0) {
       res.json(results);
     } else {

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_app, date_of_ins
-) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?)`;
+  total_est, date_of_ins
+) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
 
 const postLandformData_bankdetails_sql = `INSERT INTO bank_details (
   form_id, account_holder_name, account_number, bank_name,
@@ -99,7 +99,6 @@ exports.postLandformData = asyncHandler(async (req, res) => {
       safe(landformData.landDevelopment.pradanContribution),
       safe(landformData.landDevelopment.farmerContribution),
       safe(landformData.landDevelopment.totalEstimate),
-      safe(today),
       safe(today)
     ]);
 

controllers/plantationformData.controller.js

@@ -15,8 +15,8 @@ const postPlantationformData_plantation_details_sql = `INSERT INTO plantation_de
   patta, total_area, taluk, firka, revenue, crop_season, livestocks,
   sf_number, soil_type, land_to_benefit, date_of_ins,
   area_benefited_by_proposal, any_other_works, p_contribution, f_contribution,
-  total_est, field_insp, date_of_app, plantaions
-) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
+  total_est, field_insp, plantaions
+) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
 
 const postPlantationformData_bankdetails_sql = `INSERT INTO bank_details (
   form_id, account_holder_name, account_number, bank_name,
@@ -102,7 +102,6 @@ exports.postPlantationformData = asyncHandler(async (req, res) => {
       safe(plantationformData.landDevelopment.farmerContribution),
       safe(plantationformData.landDevelopment.totalEstimate),
       safe(today),
-      safe(today),
       safe(plantationformData.landDevelopment.workType2)
     ]);
 

controllers/pondformData.controller.js

@@ -15,8 +15,8 @@ const postPondformData_farm_pond_details_sql = `INSERT INTO farm_pond_details (
         patta, total_area, taluk, firka, revenue, crop_season, livestocks,
         sf_number, soil_type, land_to_benefit, date_of_ins, length, breadth,
         depth, volume, p_contribution, f_contribution, total_est, area_benefited,
-        field_insp, date_of_app
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
+        field_insp
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
 
 const postLandformData_bankdetails_sql = `INSERT INTO bank_details (
   form_id, account_holder_name, account_number, bank_name,
@@ -102,7 +102,6 @@ exports.postPondformData = asyncHandler(async (req, res) => {
       safe(pondformData.landDevelopment.farmerContribution),
       safe(pondformData.landDevelopment.totalEstimate),
       safe(pondformData.landDevelopment.landBenefit),
-      safe(today),
       safe(today)
     ]);
 

controllers/previewformsData.controller.js

@@ -0,0 +1,48 @@
+const db = require("../configs/mysql_config");
+const asyncHandler = require("../middlewares/asyncHandler");
+
+const getpreviewformsData_sql = `SELECT id, form_type, farmer_name, created_at, status FROM forms WHERE user_id = ?`;
+
+exports.getpreviewformsData = asyncHandler(async (req, res) => {
+    const connection = await db.getConnection();
+    const user_id = req.query.user_id;
+   // console.log(user_id);
+  
+    try {
+      const [results] = await connection.execute(getpreviewformsData_sql,[user_id]);
+  
+      if (results.length > 0) {
+        //console.log(results);
+        return res.json(results);
+      } else {
+        return res.json(0);
+      }
+    } catch (err) {
+      return res.status(500).json({ error: err.message });
+    } finally {
+      connection.release(); // Always release the connection
+    }
+  });
+
+  const getpreviewspecificformData_sql = ``;
+
+  exports.getpreviewspecificformData = asyncHandler(async (req, res) => {
+    const connection = await db.getConnection();
+    const form_id = req.query.form_id;
+    //console.log(data.user_id);
+  
+    try {
+      const [results] = await connection.execute(getpreviewspecificformData_sql,[form_id]);
+  
+      if (results.length > 0) {
+        console.log(results);
+       // return res.json(results);
+      } else {
+        return res.json(0);
+      }
+    } catch (err) {
+      return res.status(500).json({ error: err.message });
+    } finally {
+      connection.release(); // Always release the connection
+    }
+  });

routes/dashboardData.route.js

@@ -1,9 +1,14 @@
 const express = require("express");
 const router = express.Router();
 const { getTotalFormsStatusCount, getTodayFormsStatusCount } = require("../controllers/dashboardData.controller");
+const { getpreviewformsData, getpreviewspecificformData } = require("../controllers/previewformsData.controller");
 
 
-router.route('/getTotalFormsStatusCount/:userId').get(getTotalFormsStatusCount);
-router.route('/getTodayFormsStatusCount/:userId').get(getTodayFormsStatusCount);
+router.route('/getTotalFormsStatusCount').get(getTotalFormsStatusCount);
+router.route('/getTodayFormsStatusCount').get(getTodayFormsStatusCount);
+
+//forms fetch for preview
+router.route('/getpreviewformsData').get(getpreviewformsData);
+router.route('/getpreviewspecificformData').get(getpreviewspecificformData);
 
 module.exports = router;

routes/formData.route.js

@@ -4,8 +4,13 @@ const {postLandformData} = require("../controllers/landformData.controller");
 const {postPondformData} = require("../controllers/pondformData.controller");
 const {postPlantationformData} = require("../controllers/plantationformData.controller");
 
+
+//forms submission routes
 router.route('/postLandformData').post(postLandformData);
 router.route('/postPondformData').post(postPondformData);
 router.route('/postPlantationformData').post(postPlantationformData);
 
+//forms fetch routes
+
+
 module.exports = router;