From d154cbfc85540cc1758624a21f01a30dbc670129 Mon Sep 17 00:00:00 2001 From: surya Date: Thu, 16 Sep 2021 13:49:08 +0530 Subject: [PATCH 1/2] Surya: allitem --- app/controllers/master.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/master.controller.js b/app/controllers/master.controller.js index b0097e7..21973ec 100644 --- a/app/controllers/master.controller.js +++ b/app/controllers/master.controller.js @@ -247,7 +247,7 @@ exports.ItemList = (req, res) => { try { //Itemsmaster.findAll() - sequelize.query("SELECT itemsmaster.id,itemsmaster.statement as statement_id,statementsmaster.statement,itemsmaster.section as section_id,sectionsmaster.section,itemsmaster.subsection as subsection_id,subsectionsmaster.subsection,subsectionsmaster.itemtext as subsection_itemtext ,itemsmaster.itemtext,itemsmaster.is_active,pvtltd,llp,others,formula,is_calculated,itemsmaster.createdby,itemsmaster.createdon,itemsmaster.updatedby,itemsmaster.updatedon FROM itemsmaster JOIN statementsmaster ON itemsmaster.statement=statementsmaster.id JOIN sectionsmaster ON itemsmaster.section= sectionsmaster.id JOIN subsectionsmaster ON itemsmaster.subsection= subsectionsmaster.id") + sequelize.query("SELECT itemsmaster.id,itemsmaster.statement as statement_id,statementsmaster.statement,itemsmaster.section as section_id,sectionsmaster.section,itemsmaster.subsection as subsection_id,subsectionsmaster.subsection,subsectionsmaster.itemtext as subsection_itemtext ,itemsmaster.itemtext,itemsmaster.is_active,pvtltd,llp,others,formula,is_calculated,itemsmaster.createdby,itemsmaster.createdon,itemsmaster.updatedby,itemsmaster.updatedon FROM itemsmaster JOIN statementsmaster ON itemsmaster.statement=statementsmaster.id JOIN sectionsmaster ON itemsmaster.section= sectionsmaster.id LEFT JOIN subsectionsmaster ON itemsmaster.subsection= subsectionsmaster.id order by statement_id asc , section_id asc") .then(data => { res.send({'status':200,'message':"success",'data':data}); //logMsg.info("Success :"(data)); From 8d9d6e2801c5d1d42353b3aba0358e163885dcc2 Mon Sep 17 00:00:00 2001 From: surya Date: Fri, 17 Sep 2021 13:59:19 +0530 Subject: [PATCH 2/2] Surya: header,pvtltdissue fixed --- app/controllers/master.controller.js | 33 ++++++++++++++-------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/app/controllers/master.controller.js b/app/controllers/master.controller.js index 21973ec..ec95590 100644 --- a/app/controllers/master.controller.js +++ b/app/controllers/master.controller.js @@ -20,7 +20,7 @@ const { logMsg } = require('../services/logger.js'); }) .catch(err => { - res.send({'status':404, + res.status({'status':404, message: err.message || "Some error occurred while retrieving statements." ,'data': "No data" }); }); }; @@ -60,7 +60,7 @@ exports.Updatestatement = async (req, res) => { logMsg.info("Success :"(data)); }) .catch(err => { - res.send({'status':404, + res.status({'status':404, message: err.message || "Some error occurred while updating statements." ,'data': "No data" }); }); @@ -78,7 +78,7 @@ exports.Deletestatement = async (req, res) => { logMsg.info("Success :"(data)); }) .catch(err => { - res.send({'status':404, + res.status({'status':404, message: err.message || "Some error occurred while deleting statements." ,'data': "No data" }); }); @@ -97,7 +97,7 @@ exports.SectionList = (req, res) => { logMsg.info("Success :"(data)); }) .catch(err => { - res.send({'status':404, + res.status({'status':404, message: err.message || "Some error occurred while retrieving sections." ,'data': "No data" }); }); }; @@ -136,7 +136,7 @@ exports.Updatesection = (req, res) => { logMsg.info("Success :"(data)); }) .catch(err => { - res.send({'status':404, + res.status({'status':404, message: err.message || "Some error occurred while updating sections." ,'data': "No data" }); }); @@ -156,7 +156,7 @@ exports.Deletesection = (req, res) => { }) .catch(err => { - res.send({'status':404, + res.status({'status':404, message: err.message || "Some error occurred while deleting sections." ,'data': "No data" }); }); @@ -175,7 +175,7 @@ exports.SubsectionList = (req, res) => { logMsg.info("Success :"(data)); }) .catch(err => { - res.send({'status':404, + res.status({'status':404, message: err.message || "Some error occurred while retrieving subsections." ,'data': "No data" }); }); }; @@ -198,7 +198,7 @@ exports.Insertsubsection = (req, res) => { logMsg.info("Success :"(data)); }) .catch(err => { - res.send({'status':404, + res.status({'status':404, message: err.message || "Some error occurred while inserting subsection." ,'data': "No data" }); }); @@ -215,7 +215,7 @@ exports.Updatesubsection = (req, res) => { logMsg.info("Success :"(data)); }) .catch(err => { - res.send({'status':404, + res.status({'status':404, message: err.message || "Some error occurred while updating subsection." ,'data': "No data" }); }); @@ -234,7 +234,7 @@ exports.Deletesubsection = (req, res) => { logMsg.info("Success :"(data)); }) .catch(err => { - res.send({'status':404, + res.status({'status':404, message: err.message || "Some error occurred while dleleting subsection." ,'data': "No data" }); }); @@ -282,7 +282,7 @@ exports.Insertitem = (req, res) => { logMsg.info("Success :"(data)); }) .catch(err => { - res.send({'status':404, + res.status({'status':404, message: err.message || "Some error occurred while inserting items." ,'data': "No data" }); }); @@ -299,7 +299,7 @@ exports.Updateitem = (req, res) => { logMsg.info("Success :"(data)); }) .catch(err => { - res.send({'status':404, + res.status({'status':404, message: err.message || "Some error occurred while updating items." ,'data': "No data" }); }); @@ -317,7 +317,7 @@ exports.Deleteitem = (req, res) => { logMsg.info("Success :"(data)); }) .catch(err => { - res.send({'status':404, + res.status({'status':404, message: err.message || "Some error occurred while deleting items." ,'data': "No data" }); }); @@ -335,7 +335,7 @@ exports.ItemFilter = (req, res) => { logMsg.info("Success :"(data)); }) .catch(err => { - res.send({'status':404, + res.status({'status':404, message: err.message || "Some error occurred while retrieving items." ,'data': "No data" }); }); }; @@ -441,7 +441,7 @@ exports.Statementtype_list = (req, res) => { logMsg.info("Success :"(data)); }) .catch(err => { - res.send({'status':404, + res.status({'status':404, message: err.message || "Some error occurred while retrieving items." ,'data': "No data" }); }); }; @@ -459,7 +459,8 @@ exports.Statementtype_insert = (req, res) => { res.send({'status':200,'message':"success",'data':"No data"}); logMsg.info("Statementtype_insert Success"); - }catch(err) { + } + catch(err) { res.status(500).send({'status':404, message: err.message || "Some error occurred while inserting Statementtype_insert." ,'data': "No data" }); }