Merge branch 'main' of https://github.com/Churchill427/pradan_forms_processing_system_backend

Author: Churchill427

controllers/dashboardData.controller.js

@@ -0,0 +1,78 @@
+const mysql = require("mysql2");
+const db = require("../configs/mysql_config");
+const asyncHandler = require("../middlewares/asyncHandler");
+
+
+const getTotalFormsStatusCount_sql = `SELECT s.status, COUNT(f.status) AS count
+  FROM (
+    SELECT 1 AS status
+    UNION ALL
+    SELECT 2
+    UNION ALL
+    SELECT 3
+    UNION ALL
+    SELECT 4
+    UNION ALL
+    SELECT 6
+    UNION ALL
+    SELECT 7
+    UNION ALL
+    SELECT 8
+    UNION ALL
+    SELECT 9
+  ) AS s
+  LEFT JOIN forms f ON f.status = s.status AND f.user_id = ?
+  GROUP BY s.status
+  ORDER BY s.status`;
+
+exports.getTotalFormsStatusCount = asyncHandler(async (req, res) => {
+    const userId = req.params.userId;
+    //console.log("userId (status count total):", userId);
+    db.query(getTotalFormsStatusCount_sql, [userId], (err, results) => {
+        if (err) {
+        return res.status(500).json({ error: err.message });
+        }
+        //console.log("results:", results);
+        if (results.length > 0) {
+        return res.json(results);
+        } else {
+        return res.json(0);
+        }
+    });
+});
+
+const getTodayFormsStatusCount_sql = `SELECT s.status, COUNT(f.status) AS count
+  FROM (
+    SELECT 1 AS status UNION ALL
+    SELECT 2 UNION ALL
+    SELECT 3 UNION ALL
+    SELECT 4 UNION ALL
+    SELECT 6 UNION ALL
+    SELECT 7 UNION ALL
+    SELECT 8 UNION ALL
+    SELECT 9
+  ) AS s
+  LEFT JOIN forms f ON f.status = s.status AND f.user_id = ? AND f.created_at = ?
+  GROUP BY s.status
+  ORDER BY s.status`;
+
+
+exports.getTodayFormsStatusCount = asyncHandler(async (req, res) => {
+    const userId = req.params.userId;
+    const date = new Date();
+    const today = new Date(date.getFullYear(), date.getMonth(), date.getDate()).toLocaleDateString('en-CA');
+    //const today = '17-04-2025'
+    // console.log("today:", today);
+    // console.log("userId (status count today):", userId);
+    db.query(getTodayFormsStatusCount_sql, [userId,today], (err, results) => {
+        if (err) {
+        return res.status(500).json({ error: err.message });
+        }
+        //console.log("results (today):", results);
+        if (results.length > 0) {
+        return res.json(results);
+        } else {
+        return res.json(0);
+        }
+    });
+});

index.js

@@ -13,6 +13,9 @@ app.use(express.json());
 const userRoutes = require('./routes/users.route');
 app.use('/api/users', userRoutes);
 
+const dashboardRoutes = require('./routes/dashboardData.route');
+app.use('/api/dashboard', dashboardRoutes);
+
 app.get("/", (req, res) => {
     res.send("✅ Backend is running and ready!");
   });

readme

@@ -9,9 +9,11 @@ configs/
     |__mysql_config.js
 routes/
     |__users.routes.js
+    |__dashboardData.route.js
 controllers/
     |__users.controller.js
     |__userData.controller.js
+    |__dashboardData.controller.js    
 middlewares/
     |__asyncHandler.js
 

routes/dashboardData.route.js

@@ -0,0 +1,9 @@
+const express = require("express");
+const router = express.Router();
+const { getTotalFormsStatusCount, getTodayFormsStatusCount } = require("../controllers/dashboardData.controller");
+
+
+router.route('/getTotalFormsStatusCount/:userId').get(getTotalFormsStatusCount);
+router.route('/getTodayFormsStatusCount/:userId').get(getTodayFormsStatusCount);
+
+module.exports = router;

sql_queries/insertion_in_forms.sql

@@ -8,13 +8,13 @@ async function insertAllFormData() {
 
     // 1. Insert into forms
     const [formResult] = await connection.execute(
-      `INSERT INTO forms (
-        form_type, farmer_name, age, mobile, district, block, panchayat, hamlet,
+     `INSERT INTO forms (
+        farmer_name, age, mobile, district, block, panchayat, hamlet,
         id_type, id_number, gender, spouse, type_of_households, h_members,
         hh_occupation, special_catog, caste, house_owner, type_of_house,
         drinking_water, potability, domestic_water, toilet_avail, toilet_cond,
-        household_education, user_id, created_at, lat, lon, mcode, status
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+        household_education, user_id, created_at, lat, lon, status, form_type
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
       [2, 'FARMER_NAME', 'AGE', 9876543210, 'DISTRICT', 'BLOCK', 'PANCHAYAT', 'HAMLET',
        'ID_TYPE', 'ID_NUMBER', 'GENDER', 'SPOUSE', 'HOUSEHOLD_TYPE', 5,
        'OCCUPATION', 'SPECIAL_CAT', 'CASTE', 'OWNER', 'HOUSE_TYPE',
@@ -47,9 +47,9 @@ async function insertAllFormData() {
       `INSERT INTO form_lands (
         form_id, ownership, well_irrigation, area_irrigated, irrigated_lands,
         patta, total_area, taluk, firka, revenue, crop_season, livestocks,
-        sf_number, soil_type, land_to_benefit, date_of_ins, area_benefited,
+        sf_number, soil_type, land_to_benefit, area_benefited,
         type_of_work, any_other_works, p_contribution, f_contribution,
-        total_est, field_insp, site_app, date_of_app, area_benefited_postfunding, verified_by
+        total_est, field_insp, date_of_app
       ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
       [formId, 'OWNERSHIP', 'WELL_IRR', 'AREA_IRR', 'IRRIG_LAND',
        'PATTA', 'TOT_AREA', 'TALUK', 'FIRKA', 'REVENUE', 'CROP_SEASON', 'LIVESTOCK',