diff --git a/app/controllers/test.controller.js b/app/controllers/test.controller.js index aa1d51c..9ae3500 100644 --- a/app/controllers/test.controller.js +++ b/app/controllers/test.controller.js @@ -6,7 +6,8 @@ require('dotenv').config(); let dropdown = []; let column_name; let doc; -const tempData = []; +// use in addRow and getRow api +let tempData = []; @@ -45,10 +46,14 @@ exports.getRow = async (req, res) => { try { - // console.log(req.query.email); email = "ajay@gmail.com" + // req.query.email; // arr for ejs const empData = []; + // clear array + tempData = []; + // clear temp data + tempData = []; await doc.loadInfo(); // Index of the sheet let sheet = doc.sheetsByIndex[0]; @@ -94,7 +99,7 @@ exports.getRow = async (req, res) => "milan_shaka" : [...new Set(milan_shaka)], "poruppu" : [...new Set(poruppu)], "blood_group" : [...new Set(blood_group)], - "ganavesh_2w_4w_basg" : ganavesh_2w_4w_basg, + "ganavesh_2w_4w_basg" : [...new Set(ganavesh_2w_4w_basg)], "new_index" : new_index } for (let index = 0; index < rows.length; index++) { @@ -111,18 +116,25 @@ exports.getRow = async (req, res) => tempData.push(obj); } }; - for (let index = 0; index < rows.length; index++) { - const row = rows[index]; - if (row.email == email || row.Gatnayak == tempData[0]['email'] ) { - var obj = {} - for (let i = 0; i < column_name.length; i++){ - // get email position in dynamic array - Object.assign( obj , { [column_name[i]] : row[column_name[i]] }); - } - empData.push(obj); - } - }; - res.render( 'displaydata' , { "data" : empData , "dropdown" : dropdown} , function (err, html ) { res.send(html) }); + if (tempData.length > 0) + { + for (let index = 0; index < rows.length; index++) { + const row = rows[index]; + if (row.email == email || row.Gatnayak == tempData[0]['email'] ) { + var obj = {} + for (let i = 0; i < column_name.length; i++){ + // get email position in dynamic array + Object.assign( obj , { [column_name[i]] : row[column_name[i]] }); + } + empData.push(obj); + } + }; + res.render( 'displaydata' , { "data" : empData , "dropdown" : dropdown} , function (err, html ) { res.send(html) }); + } + else + { + res.send('
No Data
'); + } } catch(err) { res.send({'status':404,message: err.message || "Some error occurred while retrieving data." ,'data': "No data" }); } //end of try catch @@ -136,7 +148,6 @@ exports.addRow = async (req, res) => try { newData = req.body.data; - const empData = []; // key value mapping var obj = {} for (let i = 0; i < column_name.length; i++){ diff --git a/app/views/displaydata.ejs b/app/views/displaydata.ejs index ec42be9..a8d96c8 100644 --- a/app/views/displaydata.ejs +++ b/app/views/displaydata.ejs @@ -818,10 +818,6 @@ select , option {