validations added, query changed to have mobile number

controllers/dvrReportController.js

@@ -1846,7 +1846,7 @@ module.exports.getlastestdvr = async (req, res) => {
 
         if (person_role == 'admin') {
             //admin show all data
-            const query = "SELECT d.dvr_id,d.date_of_visit,d.customer_name,d.contact_name,d.physical_meeting,d.message,s.stage_desc,d.stage_id,d.nextstep,d.second_contact,d.objective,d.est_Date,d.estvalue,d.func,d.person FROM dvr_report d JOIN stage_master s ON d.stage_id=s.stage_id where  d.created_on between '" + startdate + "' and '" + enddate + "' and d.delete_id=0 order by d.date_of_visit desc";
+            const query = "SELECT d.dvr_id,d.date_of_visit,d.customer_name,d.contact_name,c.mobile_number,d.physical_meeting,d.message,s.stage_desc,d.stage_id,d.nextstep,d.second_contact,d.objective,d.est_Date,d.estvalue,d.func,d.person FROM dvr_report d JOIN stage_master s ON d.stage_id=s.stage_id JOIN contact_master c ON d.contact_name = CONCAT(c.first_name, ' ', c.last_name) where  d.created_on between '" + startdate + "' and '" + enddate + "' and d.delete_id=0 order by d.date_of_visit desc";
             const queryresult = await db.executequery(query);
             console.log("query", query);
 
@@ -1883,7 +1883,7 @@ module.exports.getlastestdvr = async (req, res) => {
         } else {
             // other users 
             console.log("other users");
-            const query = "SELECT d.dvr_id,d.date_of_visit,d.customer_name,d.contact_name,d.physical_meeting,d.message,s.stage_desc,d.stage_id,d.nextstep,d.second_contact,d.objective,d.est_Date,d.estvalue,d.func,d.person FROM dvr_report d JOIN stage_master s ON d.stage_id=s.stage_id where d.login_id='" + login_id + "' and d.created_on between '" + startdate + "' and '" + enddate + "' and d.delete_id=0 order by d.date_of_visit desc";
+            const query = "SELECT d.dvr_id,d.date_of_visit,d.customer_name,d.contact_name,c.mobile_number,d.physical_meeting,d.message,s.stage_desc,d.stage_id,d.nextstep,d.second_contact,d.objective,d.est_Date,d.estvalue,d.func,d.person FROM dvr_report d JOIN stage_master s ON d.stage_id=s.stage_id JOIN contact_master c ON d.contact_name = CONCAT(c.first_name, ' ', c.last_name) where d.login_id='" + login_id + "' and d.created_on between '" + startdate + "' and '" + enddate + "' and d.delete_id=0 order by d.date_of_visit desc";
             const queryresult = await db.executequery(query);
             console.log("query", query);
 

controllers/validation.js

@@ -2,10 +2,10 @@
 module.exports.logindatacheck = async function (req, res) {
 
     if (req.body.username == "" || req.body.username == undefined || req.body.username == null) {
-        return { status: false, data: {}, errors: "Please enter Username" }
+        return { status: false, data: {}, error: "Please enter Username" }
     }
     if (req.body.password == "" || req.body.password == undefined || req.body.password == null) {
-        return { status: false, data: {}, errors: "Please enter Password" }
+        return { status: false, data: {}, error: "Please enter Password" }
     }
     return { status: true };
 }
@@ -13,34 +13,34 @@ module.exports.logindatacheck = async function (req, res) {
 module.exports.createContactentrycheck = async function (req, res) {
 
     if (req.body.contact_for == "" || req.body.contact_for == undefined || req.body.contact_for == null) {
-        return { status: false, data: [], errors: "Please enter Customer ID of contact" }
+        return { status: false, data: [], error: "Please enter Customer ID of contact" }
     }
 
     if (req.body.first_name == "" || req.body.first_name == undefined || req.body.first_name == null) {
-        return { status: false, data: [], errors: "Please enter First Name" }
+        return { status: false, data: [], error: "Please enter First Name" }
     }
     if (req.body.last_name == "" || req.body.last_name == undefined || req.body.last_name == null) {
-        return { status: false, data: [], errors: "Please enter Last Name" }
+        return { status: false, data: [], error: "Please enter Last Name" }
     }
     if (req.body.mobile_no == "" || req.body.mobile_no == undefined || req.body.mobile_no == null) {
-        return { status: false, data: [], errors: "Please enter Mobile No." }
+        return { status: false, data: [], error: "Please enter Mobile No." }
     }
     
     if(req.body.mobile_no !=null && req.body.mobile_no !=""){
         if(req.body.mobile_no.length != 10 ){
-            return { status: false, data: [], errors: "Please enter valid Mobile No" }
+            return { status: false, data: [], error: "Please enter valid Mobile No" }
         }
     }
 
     if (req.body.designation == "" || req.body.designation == undefined || req.body.designation == null) {
-        return { status: false, data: [], errors: "Please enter Designation" }
+        return { status: false, data: [], error: "Please enter Designation" }
     }
     
     // console.log("req.body.email_id",req.body.email_id);
     // console.log("req.body.mobile_no",req.body.mobile_no);
 
     if (req.body.email_id == "" || req.body.email_id == undefined || req.body.email_id == null) {
-        return { status: false, data: [], errors: "Please enter Email ID." }
+        return { status: false, data: [], error: "Please enter Email ID." }
     }
 
     if(req.body.email_id != null && req.body.email_id != ""){
@@ -49,21 +49,21 @@ module.exports.createContactentrycheck = async function (req, res) {
             console.log("valid email");
         }else{
             console.log("in vliad email");
-            return { status: false, data: [], errors: "Please enter valid Email ID" }
+            return { status: false, data: [], error: "Please enter valid Email ID" }
 
         }
 
     }
     
     if (req.body.department == "" || req.body.department == undefined || req.body.department == null) {
-        return { status: false, data: [], errors: "Please enter Department" }
+        return { status: false, data: [], error: "Please enter Department" }
     }
     if (req.body.function == "" || req.body.function == undefined || req.body.function == null) {
-        return { status: false, data: [], errors: "Please enter Functional Area" }
+        return { status: false, data: [], error: "Please enter Functional Area" }
     }
 
     if (req.body.created_by == "" || req.body.created_by == undefined || req.body.created_by == null) {
-        return { status: false, data: [], errors: "Please enter Login ID" }
+        return { status: false, data: [], error: "Please enter Login ID" }
     }
 
     return { status: true };
@@ -72,7 +72,7 @@ module.exports.createContactentrycheck = async function (req, res) {
 
 module.exports.getdvrDetailscheck = async (req, res) => {
     if (req.query.dvrid == "" || req.query.dvrid == undefined || req.query.dvrid == null) {
-        return { status: false, data: {}, errors: "Please enter DVR ID" }
+        return { status: false, data: {}, error: "Please enter DVR ID" }
     }
     return { status: true };
 }
@@ -81,49 +81,52 @@ module.exports.getdvrDetailscheck = async (req, res) => {
 module.exports.createDvrentrycheck = async function (req, res) {
 
     if (req.body.visit_date == "" || req.body.visit_date == undefined || req.body.visit_date == null) {
-        return { status: false, data: [], errors: "Please enter Date of visit" }
+        return { status: false, data: [], error: "Please enter Date of visit" }
     }
     if (req.body.customer_name == "" || req.body.customer_name == undefined || req.body.customer_name == null) {
-    return { status: false, data: [], errors: "Please enter Customer Name" }
-
-
+        return { status: false, data: [], error: "Please enter Customer Name" }
     }
-        if (!containsOnlyLetters(req.body.customer_name)) {
-        return { status: false, data: [], errors: " Please Enter Valid Customer Name " }
+    if (!containsOnlyLetters(req.body.customer_name)) {
+        return { status: false, data: [], error: " Please Enter Valid Customer Name " }
     }
     if (req.body.contact_name == "" || req.body.contact_name == undefined || req.body.contact_name == null) {
-        return { status: false, data: [], errors: "Please enter Contact Name" }
+        return { status: false, data: [], error: "Please enter Contact Name" }
     }
-
     if (req.body.message == "" || req.body.message == undefined || req.body.message == null) {
-        return { status: false, data: [], errors: "Please enter Meassage" }
+        return { status: false, data: [], error: "Please enter Meassage" }
     }
     if (req.body.physical_metting == "" || req.body.physical_metting == undefined || req.body.physical_metting == null) {
-        return { status: false, data: [], errors: "Please enter Designation" }
+        return { status: false, data: [], error: "Please enter Designation" }
     }
     if (req.body.stage_id == "" || req.body.stage_id == undefined || req.body.stage_id == null) {
-        return { status: false, data: [], errors: "Please choose Status " }
+        return { status: false, data: [], error: "Please choose Status " }
     }
     if (req.body.created_by == "" || req.body.created_by == undefined || req.body.created_by == null) {
-        return { status: false, data: [], errors: "Please enter Login ID" }
+        return { status: false, data: [], error: "Please enter Login ID" }
+    }
+    if (req.body.func == "" || req.body.func == undefined || req.body.func == null) {
+        return { status: false, data: [], error: "Please choose Next Action On - Function" }
+    }
+    if (req.body.person == "" || req.body.person == undefined || req.body.person == null) {
+        return { status: false, data: [], error: "Please choose Next Action On - Person" }
     }
     // if (req.body.sale_person == "" || req.body.sale_person == undefined || req.body.sale_person == null) {
-    //     return { status: false, data: [], errors: "Please enter Login ID" }
+    //     return { status: false, data: [], error: "Please enter Login ID" }
     // }
     // if (req.body.second_contact == "" || req.body.second_contact == undefined || req.body.second_contact == null) {
-    //     return { status: false, data: [], errors: "Please enter Login ID" }
+    //     return { status: false, data: [], error: "Please enter Login ID" }
     // }
     // if (req.body.nextstep == "" || req.body.nextstep == undefined || req.body.nextstep == null) {
-    //     return { status: false, data: [], errors: "Please enter Login ID" }
+    //     return { status: false, data: [], error: "Please enter Login ID" }
     // }
     // if (req.body.objective == "" || req.body.objective == undefined || req.body.objective == null) {
-    //     return { status: false, data: [], errors: "Please enter Login ID" }
+    //     return { status: false, data: [], error: "Please enter Login ID" }
     // }
     // if (req.body.est_Date == "" || req.body.est_Date == undefined || req.body.est_Date == null) {
-    //     return { status: false, data: [], errors: "Please enter Login ID" }
+    //     return { status: false, data: [], error: "Please enter Login ID" }
     // }
     // if (req.body.estvalue == "" || req.body.estvalue == undefined || req.body.estvalue == null) {
-    //     return { status: false, data: [], errors: "Please enter Login ID" }
+    //     return { status: false, data: [], error: "Please enter Login ID" }
     // }
 
     return { status: true };
@@ -133,29 +136,29 @@ module.exports.createDvrentrycheck = async function (req, res) {
 
 module.exports.updatedvrDetailscheck = async (req, res) => {
     if (req.body.dvr_id == "" || req.body.dvr_id == undefined || req.body.dvr_id == null) {
-        return { status: false, data: [], errors: "Please enter DVR ID" }
+        return { status: false, data: [], error: "Please enter DVR ID" }
     }
     if (req.body.visit_date == "" || req.body.visit_date == undefined || req.body.visit_date == null) {
-        return { status: false, data: [], errors: "Please enter Date of visit" }
+        return { status: false, data: [], error: "Please enter Date of visit" }
     }
     if (req.body.customer_name == "" || req.body.customer_name == undefined || req.body.customer_name == null) {
-        return { status: false, data: [], errors: "Please enter Customer Name" }
+        return { status: false, data: [], error: "Please enter Customer Name" }
     }
     if (req.body.contact_name == "" || req.body.contact_name == undefined || req.body.contact_name == null) {
-        return { status: false, data: [], errors: "Please enter Contact Name" }
+        return { status: false, data: [], error: "Please enter Contact Name" }
     }
     
     if (req.body.message == "" || req.body.message == undefined || req.body.message == null) {
-        return { status: false, data: {}, errors: "Please enter Mesasge" }
+        return { status: false, data: {}, error: "Please enter Mesasge" }
     }
     if (req.body.physical_metting == "" || req.body.physical_metting == undefined || req.body.physical_metting == null) {
-        return { status: false, data: {}, errors: "Please enter Physical Metting status" }
+        return { status: false, data: {}, error: "Please enter Physical Metting status" }
     }
     if (req.body.stage_id == "" || req.body.stage_id == undefined || req.body.stage_id == null) {
-        return { status: false, data: {}, errors: "Please choose Status" }
+        return { status: false, data: {}, error: "Please choose Status" }
     }
     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: false, data: {}, error: "Please enter Login ID for updation." }
     }
 
     return { status: true };
@@ -164,36 +167,36 @@ module.exports.updatedvrDetailscheck = async (req, res) => {
 module.exports.signupCheck = async function (req, res) {
 
     if (req.body.login_id == "" || req.body.login_id == undefined || req.body.login_id == null) {
-        return { status: false, data: {}, errors: "Please enter Login Id" }
+        return { status: false, data: {}, error: "Please enter Login Id" }
     }
     if (req.body.customer_id == "" || req.body.customer_id == undefined || req.body.customer_id == null) {
-        return { status: false, data: {}, errors: "Please enter Customer Id" }
+        return { status: false, data: {}, error: "Please enter Customer Id" }
     }
 
     if (req.body.password == "" || req.body.password == undefined || req.body.password == null) {
-        return { status: false, data: {}, errors: "Please enter Password" }
+        return { status: false, data: {}, error: "Please enter Password" }
     }
 
 
     // if (req.body.password.length != '8'){
-    //    return { status: false, data: {}, errors: "Please enter 8 digits Password" } 
+    //    return { status: false, data: {}, error: "Please enter 8 digits Password" } 
 
     // }
     if (req.body.first_name == "" || req.body.first_name == undefined || req.body.first_name == null) {
-        return { status: false, data: {}, errors: "Please enter First Name" }
+        return { status: false, data: {}, error: "Please enter First Name" }
     }
     if (req.body.last_name == "" || req.body.last_name == undefined || req.body.last_name == null) {
-        return { status: false, data: {}, errors: "Please enter Last Name" }
+        return { status: false, data: {}, error: "Please enter Last Name" }
     }
     if (req.body.email == "" || req.body.email == undefined || req.body.email == null) {
-        return { status: false, data: {}, errors: "Please enter Email" }
+        return { status: false, data: {}, error: "Please enter Email" }
     }
 
     if (req.body.mobile_number == "" || req.body.mobile_number == undefined || req.body.mobile_number == null) {
-        return { status: false, data: {}, errors: "Please enter Mobile Number" }
+        return { status: false, data: {}, error: "Please enter Mobile Number" }
     }
     if (req.body.mobile_number.length != '10') {
-        return { status: false, data: {}, errors: "Please Enter 10 digit Mobile Number" }
+        return { status: false, data: {}, error: "Please Enter 10 digit Mobile Number" }
     }
     return { status: true };
 }
@@ -201,10 +204,10 @@ module.exports.signupCheck = async function (req, res) {
 module.exports.userrolemapcheck = async function (req, res) {
 
     if (req.body.login_id == "" || req.body.login_id == undefined || req.body.login_id == null) {
-        return { status: false, data: {}, errors: "Please enter login id" }
+        return { status: false, data: {}, error: "Please enter login id" }
     }
     if (req.body.user_role_id == "" || req.body.user_role_id == undefined || req.body.user_role_id == null) {
-        return { status: false, data: {}, errors: "Please enter user role id" }
+        return { status: false, data: {}, error: "Please enter user role id" }
     }
     return { status: true };
 }
@@ -212,32 +215,32 @@ module.exports.userrolemapcheck = async function (req, res) {
 module.exports.createCustomerentrycheck = async function (req, res) {
 
     if (req.body.customer_name == "" || req.body.customer_name == undefined || req.body.customer_name == null) {
-        return { status: false, data: {}, errors: "Please enter Valid Customer Name" }
+        return { status: false, data: {}, error: "Please enter Valid Customer Name" }
     }
 
     if (!containsOnlyLetters(req.body.customer_name)) {
-        return { status: false, data: {}, errors: "Please enter Valid Customer Name" }
+        return { status: false, data: {}, error: "Please enter Valid Customer Name" }
     }
 
     if (req.body.sale_person == "" || req.body.sale_person == undefined || req.body.sale_person == null) {
-        return { status: false, data: {}, errors: "Please enter Valid Sales Person Name" }
+        return { status: false, data: {}, error: "Please enter Valid Sales Person Name" }
     }
 
     if (req.body.status == "" || req.body.status == undefined || req.body.status == null) {
-        return { status: false, data: {}, errors: "Please enter Valid Customer Status" }
+        return { status: false, data: {}, error: "Please enter Valid Customer Status" }
     }
 
     if (req.body.created_by == "" || req.body.created_by == undefined || req.body.created_by == null) {
-        return { status: false, data: {}, errors: "Please enter Login ID" }
+        return { status: false, data: {}, error: "Please enter Login ID" }
     }
     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" }
+        return { status: false, data: {}, error: "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: false, data: {}, error: "Please enter Login ID for updation " }
     }
 
     return { status: true };
@@ -247,42 +250,42 @@ module.exports.updateContactDetailscheck = async (req, res) => {
     var validRegex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
 
     if (req.body.contact_id == "" || req.body.contact_id == undefined || req.body.contact_id == null) {
-        return { status: false, data: {}, errors: "Please enter contact Id" }
+        return { status: false, data: {}, error: "Please enter contact Id" }
     }
     if (req.body.customer_id == "" || req.body.customer_id == undefined || req.body.customer_id == null) {
-        return { status: false, data: {}, errors: "Please enter Customer Id" }
+        return { status: false, data: {}, error: "Please enter Customer Id" }
     }
     if (req.body.first_name == "" || req.body.first_name == undefined || req.body.first_name == null) {
-        return { status: false, data: {}, errors: "Please enter First Name" }
+        return { status: false, data: {}, error: "Please enter First Name" }
     }
     if (req.body.last_name == "" || req.body.last_name == undefined || req.body.last_name == null) {
-        return { status: false, data: {}, errors: "Please enter Last Name" }
+        return { status: false, data: {}, error: "Please enter Last Name" }
     }
     if (req.body.mobile_number == "" || req.body.mobile_number == undefined || req.body.mobile_number == null) {
-        return { status: false, data: {}, errors: "Please enter Mobile Number" }
+        return { status: false, data: {}, error: "Please enter Mobile Number" }
     }
     if (req.body.mobile_number.length != '10') {
-        return { status: false, data: {}, errors: "Please enter 10 digits Mobile Number" }
+        return { status: false, data: {}, error: "Please enter 10 digits Mobile Number" }
 
     }
 
     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);
-        return { status: false, data: {}, errors: "Please enter Email Id" }
+        return { status: false, data: {}, error: "Please enter Email Id" }
     }
     // console.log("req.body.email_id",req.body.email_id);
     //console.log("check validation",req.body.email_id.match(validRegex));
     // if(req.body.email_id.match(validRegex) == false){
-    //     return { status: false, data: {}, errors: "Please enter valid Email ID" }
+    //     return { status: false, data: {}, error: "Please enter valid Email ID" }
     // }
     if (req.body.designation == "" || req.body.designation == undefined || req.body.designation == null) {
-        return { status: false, data: {}, errors: "Please enter Designation" }
+        return { status: false, data: {}, error: "Please enter Designation" }
     }
     if (req.body.department == "" || req.body.department == undefined || req.body.department == null) {
-        return { status: false, data: {}, errors: "Please enter Department" }
+        return { status: false, data: {}, error: "Please enter Department" }
     }
     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: false, data: {}, error: "Please enter Login ID for updation " }
     }
 
 
@@ -291,18 +294,18 @@ module.exports.updateContactDetailscheck = async (req, res) => {
 
 module.exports.updateCustomerDetailscheck = async (req, res) => {
     if (req.body.customer_id == "" || req.body.customer_id == undefined || req.body.customer_id == null) {
-        return { status: false, data: {}, errors: "Please enter contact Id" }
+        return { status: false, data: {}, error: "Please enter contact Id" }
     }
     if (req.body.customer_name == "" || req.body.customer_name == undefined || req.body.customer_name == null) {
-        return { status: false, data: {}, errors: "Please enter Customer Name" }
+        return { status: false, data: {}, error: "Please enter Customer Name" }
     }
     if (!containsOnlyLetters(req.body.customer_name)) {
-        return { status: false, data: {}, errors: " Please Enter Valid Customer Name ." }
+        return { status: false, data: {}, error: " Please Enter Valid Customer Name ." }
     }
 
 
     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: false, data: {}, error: "Please enter Login ID for updation " }
     }
 
     return { status: true };
@@ -310,7 +313,7 @@ module.exports.updateCustomerDetailscheck = async (req, res) => {
 
 module.exports.mappingCustomerDetailsCheck = async (req, res) => {
     if (req.query.sale_person == "" || req.query.sale_person == undefined || req.query.sale_person == null) {
-        return { status: false, data: {}, errors: "Please enter sale person" }
+        return { status: false, data: {}, error: "Please enter sale person" }
     } 
     return { status: true };
 }
@@ -318,7 +321,7 @@ module.exports.mappingCustomerDetailsCheck = async (req, res) => {
 
 module.exports.mappingFuncIDToPersonNamesCheck = async (req, res) => {
     if (req.query.func_id == "" || req.query.func_id == undefined || req.query.func_id == null) {
-        return { status: false, data: {}, errors: "Please enter func id" }
+        return { status: false, data: {}, error: "Please enter func id" }
     } 
     return { status: true };
 }