Pārlūkot izejas kodu

changes on contact page - update/delete contacts for admin

Devansh Vakharia 2 nedēļas atpakaļ
vecāks
revīzija
d654c15857

+ 1 - 1
configs/config_local.json

@@ -2,7 +2,7 @@
     "database": {
     "database": {
         "host": "localhost",
         "host": "localhost",
         "user": "root",
         "user": "root",
-        "password": "root@123",
+        "password": "root",
         "database": "dvr"
         "database": "dvr"
     },
     },
     "token_header_key":"ABCDEF$123",
     "token_header_key":"ABCDEF$123",

+ 53 - 12
controllers/dvrReportController.js

@@ -1627,12 +1627,13 @@ module.exports.createCustomerentry = async (req, res) => {
 }
 }
 
 
 module.exports.updateContactDetails = async (req, res) => {
 module.exports.updateContactDetails = async (req, res) => {
+    console.log(req);
     const validationResp = await validation.updateContactDetailscheck(req);
     const validationResp = await validation.updateContactDetailscheck(req);
     const updatedDate = await getcurrentDate();
     const updatedDate = await getcurrentDate();
 
 
     if (validationResp.status) {
     if (validationResp.status) {
         try {
         try {
-            const query = "UPDATE contact_master SET customer_id= '" + req.body.customer_id + "',first_name= '" + req.body.first_name + "',last_name= '" + req.body.last_name + "' ,mobile_number= '" + req.body.mobile_number + "' ,email_id= '" + req.body.email_id + "', designation= '" + req.body.designation + "', department= '" + req.body.department + "', updated_on= '" + updatedDate + "' , mob_no= '" + req.body.mob_no + "'  where customer_id= '" + req.body.customer_id + "'";
+            const query = "UPDATE contact_master SET customer_id= '" + req.body.customer_id + "',first_name= '" + req.body.first_name + "',last_name= '" + req.body.last_name + "' ,mobile_number= '" + req.body.mobile_number + "' ,email_id= '" + req.body.email_Id + "', designation= '" + req.body.designation + "', department= '" + req.body.department + "', updated_by= '" + req.body.updated_by + "', updated_on= '" + updatedDate + "' , mob_no= '" + req.body.mob_no + "'  where contact_id= '" + req.body.contact_id + "'";
             console.log("query", query);
             console.log("query", query);
             const queryresult = await db.executequery(query);
             const queryresult = await db.executequery(query);
             console.log("queryresult", queryresult);
             console.log("queryresult", queryresult);
@@ -1662,6 +1663,46 @@ module.exports.updateContactDetails = async (req, res) => {
     }
     }
 }
 }
 
 
+module.exports.deleteContactDetails = async (req, res) => {
+    console.log(req);
+    const validationResp = await validation.deleteContactDetailscheck(req);
+
+    if (validationResp.status) {
+        try {
+            const query1 = "UPDATE contact_master SET updated_by='" + req.body.updated_by + "' WHERE contact_id = '" + req.body.contact_id +"';";
+            console.log("query", query1);
+            const query2 = "DELETE FROM contact_master WHERE contact_id = '" + req.body.contact_id +"';";
+            const queryresult1 = await db.executequery(query1);
+            const queryresult = await db.executequery(query2);
+            console.log("query", query2);
+            console.log("queryresult1", queryresult1);
+            console.log("queryresult2", queryresult);
+
+            if (queryresult) {
+                res.send({
+                    deleteContactStatus: '0',
+                    mesasge: "Contact Entry deleted suceesfully."
+                })
+
+            } else {
+                res.send({
+                    deleteContactStatus: '1',
+                    mesasge: "Contact Entry not deleted."
+
+                })
+            }
+        }
+        catch (err) {
+            console.log(err)
+            res.send({
+                status: true, data: []
+            })
+        }
+    } else {
+        res.send(validationResp)
+    }
+}
+
 module.exports.updateCustomerDetails = async (req, res) => {
 module.exports.updateCustomerDetails = async (req, res) => {
     const validationResp = await validation.updateCustomerDetailscheck(req);
     const validationResp = await validation.updateCustomerDetailscheck(req);
     const updatedDate = await getcurrentDate();
     const updatedDate = await getcurrentDate();
@@ -1821,7 +1862,7 @@ module.exports.getcontactDetails = async (req, res) => {
             console.log("query", query);
             console.log("query", query);
 
 
             for (var i = 0; i < queryresult.length; i++) {
             for (var i = 0; i < queryresult.length; i++) {
-                console.log(queryresult[i]);
+                // console.log(queryresult[i]);
                 insertedRecord.push(queryresult[i])
                 insertedRecord.push(queryresult[i])
             }
             }
             if (queryresult.length > 0) {
             if (queryresult.length > 0) {
@@ -1855,7 +1896,7 @@ module.exports.getcontactDetails = async (req, res) => {
             console.log("query", query);
             console.log("query", query);
 
 
             for (var i = 0; i < queryresult.length; i++) {
             for (var i = 0; i < queryresult.length; i++) {
-                console.log(queryresult[i]);
+                // console.log(queryresult[i]);
                 insertedRecord.push(queryresult[i])
                 insertedRecord.push(queryresult[i])
             }
             }
             if (queryresult.length > 0) {
             if (queryresult.length > 0) {
@@ -1950,19 +1991,19 @@ module.exports.getCustcontactDetails = async (req, res) => {
 
 
             const query = "SELECT customer_id,customer_name FROM customer_master where customer_name=  '" + customer_id + "' ";
             const query = "SELECT customer_id,customer_name FROM customer_master where customer_name=  '" + customer_id + "' ";
             const queryresult = await db.executequery(query);
             const queryresult = await db.executequery(query);
-            console.log("queryresult", queryresult);
+            // console.log("queryresult", queryresult);
 
 
             console.log("result------>", queryresult[0].customer_id);
             console.log("result------>", queryresult[0].customer_id);
             passing_id = queryresult[0].customer_id;
             passing_id = queryresult[0].customer_id;
 
 
 
 
             // const query_id = "SELECT first_name,last_name,mobile_number,email_id,designation,department,function_area,mob_no,stage_id FROM contact_master where customer_id=  '" + passing_id + "' order by first_name";
             // const query_id = "SELECT first_name,last_name,mobile_number,email_id,designation,department,function_area,mob_no,stage_id FROM contact_master where customer_id=  '" + passing_id + "' order by first_name";
-            const query_id = "SELECT customer_name,first_name,last_name,mobile_number,email_id,designation,department,function_area,mob_no,stage_id FROM contact_master JOIN customer_master ON contact_master.customer_id=customer_master.customer_id where contact_master.customer_id= '" + passing_id + "' order by first_name;"
+            const query_id = "SELECT contact_id,customer_name,first_name,last_name,mobile_number,email_id,designation,department,function_area,mob_no,stage_id FROM contact_master JOIN customer_master ON contact_master.customer_id=customer_master.customer_id where contact_master.customer_id= '" + passing_id + "' order by first_name;"
             const queryresult_id = await db.executequery(query_id);
             const queryresult_id = await db.executequery(query_id);
             console.log("query", query);
             console.log("query", query);
 
 
             for (var i = 0; i < queryresult_id.length; i++) {
             for (var i = 0; i < queryresult_id.length; i++) {
-                console.log(queryresult_id[i]);
+                // console.log(queryresult_id[i]);
                 contactdetails.push(queryresult_id[i])
                 contactdetails.push(queryresult_id[i])
             }
             }
             if (queryresult.length > 0) {
             if (queryresult.length > 0) {
@@ -1995,13 +2036,13 @@ module.exports.getCustcontactDetails = async (req, res) => {
             if (customer_id == 0) {
             if (customer_id == 0) {
                 console.log("getting all contact data");
                 console.log("getting all contact data");
                 // const query = "SELECT first_name,last_name,mobile_number,email_id,designation,department,function_area,mob_no,stage_id FROM contact_master order by first_name";
                 // const query = "SELECT first_name,last_name,mobile_number,email_id,designation,department,function_area,mob_no,stage_id FROM contact_master order by first_name";
-                const query = "SELECT customer_name,first_name,last_name,mobile_number,email_id,designation,department,function_area,mob_no,stage_id FROM contact_master JOIN customer_master ON contact_master.customer_id=customer_master.customer_id order by first_name;"
+                const query = "SELECT contact_id,customer_name,first_name,last_name,mobile_number,email_id,designation,department,function_area,mob_no,stage_id FROM contact_master JOIN customer_master ON contact_master.customer_id=customer_master.customer_id order by first_name;"
 
 
                 const queryresult = await db.executequery(query);
                 const queryresult = await db.executequery(query);
                 console.log("query", query);
                 console.log("query", query);
 
 
                 for (var i = 0; i < queryresult.length; i++) {
                 for (var i = 0; i < queryresult.length; i++) {
-                    console.log(queryresult[i]);
+                    // console.log(queryresult[i]);
                     contactdetails.push(queryresult[i])
                     contactdetails.push(queryresult[i])
                 }
                 }
                 if (queryresult.length > 0) {
                 if (queryresult.length > 0) {
@@ -2031,13 +2072,13 @@ module.exports.getCustcontactDetails = async (req, res) => {
             } else {
             } else {
                 console.log("getting only specific customer contact data");
                 console.log("getting only specific customer contact data");
                 // const query = "SELECT first_name,last_name,mobile_number,email_id,designation,department,function_area,mob_no,stage_id FROM contact_master where customer_id=  '" + customer_id + "' order by first_name";
                 // const query = "SELECT first_name,last_name,mobile_number,email_id,designation,department,function_area,mob_no,stage_id FROM contact_master where customer_id=  '" + customer_id + "' order by first_name";
-                const query = "SELECT customer_name,first_name,last_name,mobile_number,email_id,designation,department,function_area,mob_no,stage_id FROM contact_master JOIN customer_master ON contact_master.customer_id=customer_master.customer_id where contact_master.customer_id= '" + customer_id + "' order by first_name;"
+                const query = "SELECT contact_id,customer_name,first_name,last_name,mobile_number,email_id,designation,department,function_area,mob_no,stage_id FROM contact_master JOIN customer_master ON contact_master.customer_id=customer_master.customer_id where contact_master.customer_id= '" + customer_id + "' order by first_name;"
 
 
                 const queryresult = await db.executequery(query);
                 const queryresult = await db.executequery(query);
                 console.log("query", query);
                 console.log("query", query);
 
 
                 for (var i = 0; i < queryresult.length; i++) {
                 for (var i = 0; i < queryresult.length; i++) {
-                    console.log(queryresult[i]);
+                    // console.log(queryresult[i]);
                     contactdetails.push(queryresult[i])
                     contactdetails.push(queryresult[i])
                 }
                 }
                 if (queryresult.length > 0) {
                 if (queryresult.length > 0) {
@@ -2110,7 +2151,7 @@ module.exports.createUpdateCustomerentry = async (req, res) => {
                         "VALUES(?,?,?)";
                         "VALUES(?,?,?)";
                     const values = [req.body.customer_name, req.body.created_by, createdate]
                     const values = [req.body.customer_name, req.body.created_by, createdate]
                     const res3 = await db.executevaluesquery(query, values);
                     const res3 = await db.executevaluesquery(query, values);
-                    console.log("response", res3);
+                    // console.log("response", res3);
                     if (res3) {
                     if (res3) {
 
 
                         const query = "select customer_id from customer_master order by customer_id desc limit 1";
                         const query = "select customer_id from customer_master order by customer_id desc limit 1";
@@ -2139,7 +2180,7 @@ module.exports.createUpdateCustomerentry = async (req, res) => {
                                 "VALUES(?,?,?,?)";
                                 "VALUES(?,?,?,?)";
                             const values = [queryresult[0].customer_id, queryresultID[0].user_id, req.body.created_by, createdate]
                             const values = [queryresult[0].customer_id, queryresultID[0].user_id, req.body.created_by, createdate]
                             const res3 = await db.executevaluesquery(finalquery, values);
                             const res3 = await db.executevaluesquery(finalquery, values);
-                            console.log("res3", res3);
+                            // console.log("res3", res3);
                             if (res3) {
                             if (res3) {
                                 res.send({
                                 res.send({
 
 

+ 14 - 1
controllers/validation.js

@@ -32,6 +32,9 @@ module.exports.createContactentrycheck = async function (req, res) {
         }
         }
     }
     }
 
 
+    if (req.body.designation == "" || req.body.designation == undefined || req.body.designation == null) {
+        return { status: false, data: [], errors: "Please enter Designation" }
+    }
     
     
     // console.log("req.body.email_id",req.body.email_id);
     // console.log("req.body.email_id",req.body.email_id);
     // console.log("req.body.mobile_no",req.body.mobile_no);
     // console.log("req.body.mobile_no",req.body.mobile_no);
@@ -225,6 +228,16 @@ module.exports.createCustomerentrycheck = async function (req, res) {
     }
     }
     return { status: true };
     return { status: true };
 }
 }
+module.exports.deleteContactDetailscheck = async (req, res) => {
+    if (req.body.contact_id == "" || req.body.contact_id == undefined || req.body.contact_id == null) {
+        return { status: false, data: {}, errors: "Please enter contact Id" }
+    }
+    if (req.body.updated_by == "" || req.body.updated_by == undefined || req.body.updated_by == null) {
+        return { status: false, data: {}, errors: "Please enter Login ID for updation " }
+    }
+
+    return { status: true };
+}
 
 
 module.exports.updateContactDetailscheck = async (req, res) => {
 module.exports.updateContactDetailscheck = async (req, res) => {
     var validRegex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
     var validRegex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
@@ -249,7 +262,7 @@ module.exports.updateContactDetailscheck = async (req, res) => {
 
 
     }
     }
 
 
-    if (req.body.email_id == "" || req.body.email_id == undefined || req.body.email_id == null) {
+    if (req.body.email_Id == "" || req.body.email_Id == undefined || req.body.email_Id == null) {
         console.log("req.body.email_id", req.body.email_id);
         console.log("req.body.email_id", req.body.email_id);
         return { status: false, data: {}, errors: "Please enter Email Id" }
         return { status: false, data: {}, errors: "Please enter Email Id" }
     }
     }

+ 1 - 0
middlewares/authorize.js

@@ -3,6 +3,7 @@ const jwt = require("jsonwebtoken");
 const config = require("../configs/config.json");
 const config = require("../configs/config.json");
 
 
 const verifyToken = (req, res, next) => {
 const verifyToken = (req, res, next) => {
+  console.log("Checking Token");
   const token =
   const token =
     req.body.token || req.query.token || req.headers["token"];
     req.body.token || req.query.token || req.headers["token"];
 
 

+ 1 - 0
routes/route.js

@@ -28,6 +28,7 @@ router.post("/api/userrolemap",auth ,loginController.userrolemap);
 router.post("/api/createCustomerEntry",auth,dvrController.createCustomerentry);
 router.post("/api/createCustomerEntry",auth,dvrController.createCustomerentry);
 
 
 router.put("/api/updateContactDetails",auth,dvrController.updateContactDetails);
 router.put("/api/updateContactDetails",auth,dvrController.updateContactDetails);
+router.delete("/api/deleteContactDetails",auth,dvrController.deleteContactDetails);
 router.put("/api/updateCustomerDetails",auth,dvrController.updateCustomerDetails);
 router.put("/api/updateCustomerDetails",auth,dvrController.updateCustomerDetails);
 router.get("/api/getlastestdvr",auth,dvrController.getlastestdvr);
 router.get("/api/getlastestdvr",auth,dvrController.getlastestdvr);