Skip to content

B
business-java
Commit 6ba4549f authored by vvengurlekar's avatar vvengurlekar
Browse files
Options

lookup related changes done in sfadashboard 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@188880 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b20fbb83
Hide whitespace changes
Inline Side-by-side
Showing with 1531 additions and 844 deletions
webitm-dashboard/ibase/dashboard/sfa/bean/ComplDayDetailBean.java
View file @ 6ba4549f
package ibase.dashboard.sfa.bean; package ibase.dashboard.sfa.bean;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import javax.naming.InitialContext; import javax.naming.InitialContext;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.ComplianceDB2Remote;
import ibase.system.config.AppConnectParm; import ibase.dashboard.sfa.ejb.ComplianceDB2;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
public class ComplDayDetailBean public class ComplDayDetailBean
...@@ -29,9 +31,11 @@ public class ComplDayDetailBean ...@@ -29,9 +31,11 @@ public class ComplDayDetailBean
salesPersCode = "X001"; salesPersCode = "X001";
dataSourceName = "DriverITM";*/ dataSourceName = "DriverITM";*/
//For base End //For base End
AppConnectParm appConnect = new AppConnectParm(); //Commented and added By Varsha V on 06-08-18 for removing lookup
ctx = new InitialContext(appConnect.getProperty()); //AppConnectParm appConnect = new AppConnectParm();
ComplianceDB2Remote complMtdDtlSummary = (ComplianceDB2Remote) ctx.lookup("ibase/ComplianceDB2/remote"); //ctx = new InitialContext(appConnect.getProperty());
//ComplianceDB2Remote complMtdDtlSummary = (ComplianceDB2Remote) ctx.lookup("ibase/ComplianceDB2/remote");
ComplianceDB2 complMtdDtlSummary = new ComplianceDB2();
retJsonObject = (JSONObject) complMtdDtlSummary.getComplDayWiseDetail(dataSourceName, eventDate, salesPersCode); retJsonObject = (JSONObject) complMtdDtlSummary.getComplDayWiseDetail(dataSourceName, eventDate, salesPersCode);
System.out.println("ComplDayDetailBean :: getComplDaywiseData == >> retJsonObject = "+retJsonObject); System.out.println("ComplDayDetailBean :: getComplDaywiseData == >> retJsonObject = "+retJsonObject);
} }
......
webitm-dashboard/ibase/dashboard/sfa/servlet/ActiveEventMgrWiseServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.LiveEventMgrWiseDetailsRemote;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.LiveEventMgrWiseDetails;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class ActiveEventMgrWiseServlet extends HttpServlet public class ActiveEventMgrWiseServlet extends HttpServlet
{ {
...@@ -25,9 +26,11 @@ public class ActiveEventMgrWiseServlet extends HttpServlet ...@@ -25,9 +26,11 @@ public class ActiveEventMgrWiseServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
LiveEventMgrWiseDetailsRemote liveEventMgrWiseDetRemote = null; //Commented and added By Varsha V on 06-08-18 for removing lookup
InitialContext context = null; //LiveEventMgrWiseDetailsRemote liveEventMgrWiseDetRemote = null;
AppConnectParm appConnectParm = null; //InitialContext context = null;
//AppConnectParm appConnectParm = null;
LiveEventMgrWiseDetails liveEventMgrWiseDet = null;
String dataSourceName = "",loginId = "",month = "", year = ""; String dataSourceName = "",loginId = "",month = "", year = "";
HttpSession session = null; HttpSession session = null;
UserInfoBean userInfo = null; UserInfoBean userInfo = null;
...@@ -40,11 +43,13 @@ public class ActiveEventMgrWiseServlet extends HttpServlet ...@@ -40,11 +43,13 @@ public class ActiveEventMgrWiseServlet extends HttpServlet
loginId = userInfo.getLoginCode(); loginId = userInfo.getLoginCode();
month = request.getParameter("month"); month = request.getParameter("month");
year = request.getParameter("year"); year = request.getParameter("year");
appConnectParm = new AppConnectParm(); //appConnectParm = new AppConnectParm();
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
context = new InitialContext(appConnectParm.getProperty()); //context = new InitialContext(appConnectParm.getProperty());
liveEventMgrWiseDetRemote = (LiveEventMgrWiseDetailsRemote) context.lookup("ibase/LiveEventMgrWiseDetails/remote"); //liveEventMgrWiseDetRemote = (LiveEventMgrWiseDetailsRemote) context.lookup("ibase/LiveEventMgrWiseDetails/remote");
JSONObject jsonObjData = (JSONObject) liveEventMgrWiseDetRemote.getActiveEvent(dataSourceName,loginId, month, year); //JSONObject jsonObjData = (JSONObject) liveEventMgrWiseDetRemote.getActiveEvent(dataSourceName,loginId, month, year);
liveEventMgrWiseDet = new LiveEventMgrWiseDetails();
JSONObject jsonObjData = (JSONObject) liveEventMgrWiseDet.getActiveEvent(dataSourceName,loginId, month, year);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -62,5 +67,12 @@ public class ActiveEventMgrWiseServlet extends HttpServlet ...@@ -62,5 +67,12 @@ public class ActiveEventMgrWiseServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(liveEventMgrWiseDet != null)
{
liveEventMgrWiseDet = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ActiveEventServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.LiveEventDetailsRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -12,6 +9,9 @@ import javax.servlet.http.HttpServletResponse; ...@@ -12,6 +9,9 @@ import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.LiveEventDetails;
import ibase.webitm.utility.ITMException;
public class ActiveEventServlet extends HttpServlet public class ActiveEventServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -26,9 +26,11 @@ public class ActiveEventServlet extends HttpServlet ...@@ -26,9 +26,11 @@ public class ActiveEventServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
LiveEventDetailsRemote liveEventDetailsRemote = null; //Commented and added By Varsha V on 06-08-18 for removing lookup
InitialContext context = null; //LiveEventDetailsRemote liveEventDetailsRemote = null;
AppConnectParm appConnectParm = new AppConnectParm(); //InitialContext context = null;
//AppConnectParm appConnectParm = new AppConnectParm();
LiveEventDetails liveEventDetails = null;
String dataSourceName = ""; String dataSourceName = "";
...@@ -36,10 +38,12 @@ public class ActiveEventServlet extends HttpServlet ...@@ -36,10 +38,12 @@ public class ActiveEventServlet extends HttpServlet
{ {
response.setContentType("application/xml"); response.setContentType("application/xml");
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
context = new InitialContext(appConnectParm.getProperty()); //context = new InitialContext(appConnectParm.getProperty());
liveEventDetailsRemote = (LiveEventDetailsRemote) context.lookup("ibase/LiveEventDetails/remote"); //liveEventDetailsRemote = (LiveEventDetailsRemote) context.lookup("ibase/LiveEventDetails/remote");
System.out.println("in ActiveEventServlet"); System.out.println("in ActiveEventServlet");
JSONObject jsonObjData = (JSONObject) liveEventDetailsRemote.getActiveEvent(dataSourceName); //JSONObject jsonObjData = (JSONObject) liveEventDetailsRemote.getActiveEvent(dataSourceName);
liveEventDetails = new LiveEventDetails();
JSONObject jsonObjData = (JSONObject) liveEventDetails.getActiveEvent(dataSourceName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -57,7 +61,13 @@ public class ActiveEventServlet extends HttpServlet ...@@ -57,7 +61,13 @@ public class ActiveEventServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(liveEventDetails != null)
{
liveEventDetails = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/AdminPlanDetailServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.AdminPlanRemote;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -14,6 +10,10 @@ import javax.servlet.http.HttpSession; ...@@ -14,6 +10,10 @@ import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.AdminPlan;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
public class AdminPlanDetailServlet extends HttpServlet public class AdminPlanDetailServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -24,9 +24,10 @@ public class AdminPlanDetailServlet extends HttpServlet ...@@ -24,9 +24,10 @@ public class AdminPlanDetailServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
AdminPlanRemote adminPlanRemote = null; //AdminPlanRemote adminPlanRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = null; //AppConnectParm appConnectParm = null;
AdminPlan adminPlan = null;
String dataSourceName = ""; String dataSourceName = "";
String loginId = "",loginEmpCode = "",salePersons = "",period = ""; String loginId = "",loginEmpCode = "",salePersons = "",period = "";
String fromDate = "",toDate = "",spCode = "",prvSpCode = ""; String fromDate = "",toDate = "",spCode = "",prvSpCode = "";
...@@ -38,7 +39,7 @@ public class AdminPlanDetailServlet extends HttpServlet ...@@ -38,7 +39,7 @@ public class AdminPlanDetailServlet extends HttpServlet
{ {
response.setContentType("application/xml"); response.setContentType("application/xml");
session = request.getSession(true); session = request.getSession(true);
appConnectParm = new AppConnectParm(); //appConnectParm = new AppConnectParm();
userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO"); userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
loginId = userInfo.getLoginCode(); loginId = userInfo.getLoginCode();
loginEmpCode = userInfo.getEmpCode(); loginEmpCode = userInfo.getEmpCode();
...@@ -49,9 +50,12 @@ public class AdminPlanDetailServlet extends HttpServlet ...@@ -49,9 +50,12 @@ public class AdminPlanDetailServlet extends HttpServlet
spCode = request.getParameter("spCode"); spCode = request.getParameter("spCode");
prvSpCode = request.getParameter("prvSpCode"); prvSpCode = request.getParameter("prvSpCode");
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
adminPlanRemote = (AdminPlanRemote) context.lookup("ibase/AdminPlan/remote"); //context = new InitialContext(appConnectParm.getProperty());
jsonObjData = (JSONObject) adminPlanRemote.getAdminPlanDetail(dataSourceName,loginId,salePersons,loginEmpCode,period,fromDate,toDate,spCode,prvSpCode); //adminPlanRemote = (AdminPlanRemote) context.lookup("ibase/AdminPlan/remote");
//jsonObjData = (JSONObject) adminPlanRemote.getAdminPlanDetail(dataSourceName,loginId,salePersons,loginEmpCode,period,fromDate,toDate,spCode,prvSpCode);
adminPlan = new AdminPlan();
jsonObjData = (JSONObject) adminPlan.getAdminPlanDetail(dataSourceName,loginId,salePersons,loginEmpCode,period,fromDate,toDate,spCode,prvSpCode);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -71,5 +75,12 @@ public class AdminPlanDetailServlet extends HttpServlet ...@@ -71,5 +75,12 @@ public class AdminPlanDetailServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(adminPlan != null)
{
adminPlan = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/AdminPlanSPDetailServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.AdminPlanRemote;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -14,6 +10,11 @@ import javax.servlet.http.HttpSession; ...@@ -14,6 +10,11 @@ import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.AdminPlan;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
public class AdminPlanSPDetailServlet extends HttpServlet public class AdminPlanSPDetailServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -24,9 +25,10 @@ public class AdminPlanSPDetailServlet extends HttpServlet ...@@ -24,9 +25,10 @@ public class AdminPlanSPDetailServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
AdminPlanRemote adminPlanRemote = null; //AdminPlanRemote adminPlanRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = null; //AppConnectParm appConnectParm = null;
AdminPlan adminPlan = null;
String dataSourceName = ""; String dataSourceName = "";
String loginId = "",loginEmpCode = "",period = ""; String loginId = "",loginEmpCode = "",period = "";
String fromDate = "",toDate = "",spCode = "",prvSpCode = ""; String fromDate = "",toDate = "",spCode = "",prvSpCode = "";
...@@ -38,7 +40,7 @@ public class AdminPlanSPDetailServlet extends HttpServlet ...@@ -38,7 +40,7 @@ public class AdminPlanSPDetailServlet extends HttpServlet
{ {
response.setContentType("application/xml"); response.setContentType("application/xml");
session = request.getSession(true); session = request.getSession(true);
appConnectParm = new AppConnectParm(); //appConnectParm = new AppConnectParm();
userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO"); userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
loginId = userInfo.getLoginCode(); loginId = userInfo.getLoginCode();
loginEmpCode = userInfo.getEmpCode(); loginEmpCode = userInfo.getEmpCode();
...@@ -48,9 +50,12 @@ public class AdminPlanSPDetailServlet extends HttpServlet ...@@ -48,9 +50,12 @@ public class AdminPlanSPDetailServlet extends HttpServlet
spCode = request.getParameter("spCode"); spCode = request.getParameter("spCode");
prvSpCode = request.getParameter("prvSpCode"); prvSpCode = request.getParameter("prvSpCode");
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
adminPlanRemote = (AdminPlanRemote) context.lookup("ibase/AdminPlan/remote"); //context = new InitialContext(appConnectParm.getProperty());
jsonObjData = (JSONObject) adminPlanRemote.getSalePersPlanDetail(dataSourceName,loginId,loginEmpCode,period,fromDate,toDate,spCode,prvSpCode); //adminPlanRemote = (AdminPlanRemote) context.lookup("ibase/AdminPlan/remote");
//jsonObjData = (JSONObject) adminPlanRemote.getSalePersPlanDetail(dataSourceName,loginId,loginEmpCode,period,fromDate,toDate,spCode,prvSpCode);
adminPlan = new AdminPlan();
jsonObjData = (JSONObject) adminPlan.getSalePersPlanDetail(dataSourceName,loginId,loginEmpCode,period,fromDate,toDate,spCode,prvSpCode);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -70,5 +75,12 @@ public class AdminPlanSPDetailServlet extends HttpServlet ...@@ -70,5 +75,12 @@ public class AdminPlanSPDetailServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(adminPlan != null)
{
adminPlan = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/AdminPlanServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.AdminPlanRemote;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -14,6 +10,10 @@ import javax.servlet.http.HttpSession; ...@@ -14,6 +10,10 @@ import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.AdminPlan;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
public class AdminPlanServlet extends HttpServlet public class AdminPlanServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -24,9 +24,10 @@ public class AdminPlanServlet extends HttpServlet ...@@ -24,9 +24,10 @@ public class AdminPlanServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
AdminPlanRemote adminPlanRemote = null; //AdminPlanRemote adminPlanRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = null; //AppConnectParm appConnectParm = null;
AdminPlan adminPlan = null;
String dataSourceName = ""; String dataSourceName = "";
String loginId = "", salePersons = "", loginEmpCode = ""; String loginId = "", salePersons = "", loginEmpCode = "";
HttpSession session = null; HttpSession session = null;
...@@ -37,16 +38,19 @@ public class AdminPlanServlet extends HttpServlet ...@@ -37,16 +38,19 @@ public class AdminPlanServlet extends HttpServlet
{ {
response.setContentType("application/xml"); response.setContentType("application/xml");
session = request.getSession(true); session = request.getSession(true);
appConnectParm = new AppConnectParm(); //appConnectParm = new AppConnectParm();
userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO"); userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
loginId = userInfo.getLoginCode(); loginId = userInfo.getLoginCode();
loginEmpCode = userInfo.getEmpCode(); loginEmpCode = userInfo.getEmpCode();
salePersons = request.getParameter("salePersons"); salePersons = request.getParameter("salePersons");
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
System.out.println("loginId = "+loginId+"sales person = "+salePersons); System.out.println("loginId = "+loginId+"sales person = "+salePersons);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
adminPlanRemote = (AdminPlanRemote) context.lookup("ibase/AdminPlan/remote"); //context = new InitialContext(appConnectParm.getProperty());
jsonObjData = (JSONObject) adminPlanRemote.getAdminPlanSummary(dataSourceName,loginId,salePersons,loginEmpCode); //adminPlanRemote = (AdminPlanRemote) context.lookup("ibase/AdminPlan/remote");
//jsonObjData = (JSONObject) adminPlanRemote.getAdminPlanSummary(dataSourceName,loginId,salePersons,loginEmpCode);
adminPlan = new AdminPlan();
jsonObjData = (JSONObject) adminPlan.getAdminPlanSummary(dataSourceName,loginId,salePersons,loginEmpCode);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -66,5 +70,12 @@ public class AdminPlanServlet extends HttpServlet ...@@ -66,5 +70,12 @@ public class AdminPlanServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(adminPlan != null)
{
adminPlan = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/AllIndiaQTQServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.AllIndiaQTQRemote;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.AllIndiaQTQ;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
public class AllIndiaQTQServlet extends HttpServlet public class AllIndiaQTQServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -27,9 +28,10 @@ public class AllIndiaQTQServlet extends HttpServlet ...@@ -27,9 +28,10 @@ public class AllIndiaQTQServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException throws IOException, ServletException
{ {
AllIndiaQTQRemote gardeniaRemote = null; //AllIndiaQTQRemote gardeniaRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
AllIndiaQTQ allIndiaQTQ = null;
String dataSourceName = ""; String dataSourceName = "";
String loginCode = ""; String loginCode = "";
HttpSession session = null; HttpSession session = null;
...@@ -47,10 +49,13 @@ public class AllIndiaQTQServlet extends HttpServlet ...@@ -47,10 +49,13 @@ public class AllIndiaQTQServlet extends HttpServlet
loginCode = userInfo.getLoginCode(); loginCode = userInfo.getLoginCode();
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
fromDate = request.getParameter("fromDate"); fromDate = request.getParameter("fromDate");
toDate =request.getParameter("toDate"); toDate =request.getParameter("toDate");
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
gardeniaRemote = (AllIndiaQTQRemote) context.lookup("ibase/AllIndiaQTQ/remote"); //context = new InitialContext(appConnectParm.getProperty());
jsonObjData = (JSONObject) gardeniaRemote.getAllIndiaQTQ(loginCode,dataSourceName,fromDate,toDate); //gardeniaRemote = (AllIndiaQTQRemote) context.lookup("ibase/AllIndiaQTQ/remote");
//jsonObjData = (JSONObject) gardeniaRemote.getAllIndiaQTQ(loginCode,dataSourceName,fromDate,toDate);
allIndiaQTQ = new AllIndiaQTQ();
jsonObjData = (JSONObject) allIndiaQTQ.getAllIndiaQTQ(loginCode,dataSourceName,fromDate,toDate);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -72,6 +77,13 @@ public class AllIndiaQTQServlet extends HttpServlet ...@@ -72,6 +77,13 @@ public class AllIndiaQTQServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(allIndiaQTQ != null)
{
allIndiaQTQ = null;
}
}
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/AssessMentGraphServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.utility.E12GenericUtility;
import ibase.dashboard.sfa.ejb.AssessMentEJBLocal;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject;
/* import ibase.dashboard.sfa.ejb.AssessMentEJB;
* Author : Mrunalini S. import ibase.utility.E12GenericUtility;
* Date : 28-06-18 import ibase.utility.UserInfoBean;
* Used to AssessMent Dashboard import ibase.webitm.utility.ITMException;
* */
public class AssessMentGraphServlet extends HttpServlet public class AssessMentGraphServlet extends HttpServlet
{ {
...@@ -34,9 +28,10 @@ public class AssessMentGraphServlet extends HttpServlet ...@@ -34,9 +28,10 @@ public class AssessMentGraphServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException throws IOException, ServletException
{ {
AssessMentEJBLocal assessmentLocal = null; //AssessMentEJBLocal assessmentLocal = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
AssessMentEJB assessment = null;
String dataSourceName = ""; String dataSourceName = "";
String loginCode = ""; String loginCode = "";
HttpSession session = null; HttpSession session = null;
...@@ -66,9 +61,12 @@ public class AssessMentGraphServlet extends HttpServlet ...@@ -66,9 +61,12 @@ public class AssessMentGraphServlet extends HttpServlet
toDate = E12GenericUtility.checkNull(request.getParameter("to_date")); toDate = E12GenericUtility.checkNull(request.getParameter("to_date"));
teamArgs = E12GenericUtility.checkNull(request.getParameter("SALES_PERS")); teamArgs = E12GenericUtility.checkNull(request.getParameter("SALES_PERS"));
surveyId = E12GenericUtility.checkNull(request.getParameter("survey_id")); surveyId = E12GenericUtility.checkNull(request.getParameter("survey_id"));
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
assessmentLocal = (AssessMentEJBLocal) context.lookup("ibase/AssessMentEJB/local"); //context = new InitialContext(appConnectParm.getProperty());
jsonObjData = (String) assessmentLocal.getGraphStructureData(loginCode,dataSourceName,fromDate,toDate,teamArgs,surveyId,profileId); //assessmentLocal = (AssessMentEJBLocal) context.lookup("ibase/AssessMentEJB/local");
//jsonObjData = (String) assessmentLocal.getGraphStructureData(loginCode,dataSourceName,fromDate,toDate,teamArgs,surveyId,profileId);
assessment = new AssessMentEJB();
jsonObjData = (String) assessment.getGraphStructureData(loginCode,dataSourceName,fromDate,toDate,teamArgs,surveyId,profileId);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.getBytes()); outputStream.write(jsonObjData.getBytes());
outputStream.flush(); outputStream.flush();
...@@ -89,6 +87,13 @@ public class AssessMentGraphServlet extends HttpServlet ...@@ -89,6 +87,13 @@ public class AssessMentGraphServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(assessment != null)
{
assessment = null;
}
}
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/AssessMentTreeServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.utility.E12GenericUtility;
import ibase.dashboard.sfa.ejb.AssessMentEJBLocal;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject;
/* import ibase.dashboard.sfa.ejb.AssessMentEJB;
* Author : Mrunalini S. import ibase.utility.E12GenericUtility;
* Date : 28-06-18 import ibase.utility.UserInfoBean;
* Used to AssessMent Dashboard import ibase.webitm.utility.ITMException;
* */
public class AssessMentTreeServlet extends HttpServlet public class AssessMentTreeServlet extends HttpServlet
{ {
...@@ -34,9 +28,10 @@ public class AssessMentTreeServlet extends HttpServlet ...@@ -34,9 +28,10 @@ public class AssessMentTreeServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException throws IOException, ServletException
{ {
AssessMentEJBLocal assessmentLocal = null; //AssessMentEJBLocal assessmentLocal = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
AssessMentEJB assessment = null;
String dataSourceName = ""; String dataSourceName = "";
String loginCode = ""; String loginCode = "";
HttpSession session = null; HttpSession session = null;
...@@ -67,9 +62,12 @@ public class AssessMentTreeServlet extends HttpServlet ...@@ -67,9 +62,12 @@ public class AssessMentTreeServlet extends HttpServlet
toDate = E12GenericUtility.checkNull(request.getParameter("to_date")); toDate = E12GenericUtility.checkNull(request.getParameter("to_date"));
teamArgs = E12GenericUtility.checkNull(request.getParameter("SALES_PERS")); teamArgs = E12GenericUtility.checkNull(request.getParameter("SALES_PERS"));
surveyId = E12GenericUtility.checkNull(request.getParameter("survey_id")); surveyId = E12GenericUtility.checkNull(request.getParameter("survey_id"));
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
assessmentLocal = (AssessMentEJBLocal) context.lookup("ibase/AssessMentEJB/local"); //context = new InitialContext(appConnectParm.getProperty());
jsonObjData = (String) assessmentLocal.getTreeStructureData(loginCode,dataSourceName,fromDate,toDate,teamArgs,surveyId,profileId); //assessmentLocal = (AssessMentEJBLocal) context.lookup("ibase/AssessMentEJB/local");
//jsonObjData = (String) assessmentLocal.getTreeStructureData(loginCode,dataSourceName,fromDate,toDate,teamArgs,surveyId,profileId);
assessment = new AssessMentEJB();
jsonObjData = (String) assessment.getTreeStructureData(loginCode,dataSourceName,fromDate,toDate,teamArgs,surveyId,profileId);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.getBytes()); outputStream.write(jsonObjData.getBytes());
outputStream.flush(); outputStream.flush();
...@@ -90,6 +88,13 @@ public class AssessMentTreeServlet extends HttpServlet ...@@ -90,6 +88,13 @@ public class AssessMentTreeServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(assessment != null)
{
assessment = null;
}
}
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/AttendanceCompSummaryServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.AttendanceComplianceRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.AttendanceCompliance;
import ibase.webitm.utility.ITMException;
public class AttendanceCompSummaryServlet extends HttpServlet public class AttendanceCompSummaryServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -26,9 +27,10 @@ public class AttendanceCompSummaryServlet extends HttpServlet ...@@ -26,9 +27,10 @@ public class AttendanceCompSummaryServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
AttendanceComplianceRemote attenanceComplianceRemote = null; //AttendanceComplianceRemote attenanceComplianceRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
AttendanceCompliance attendanceCompliance = null;
String dataSourceName = ""; String dataSourceName = "";
String loginId = ""; String loginId = "";
String period = "", salesPers = ""; String period = "", salesPers = "";
...@@ -54,12 +56,15 @@ public class AttendanceCompSummaryServlet extends HttpServlet ...@@ -54,12 +56,15 @@ public class AttendanceCompSummaryServlet extends HttpServlet
{ {
salesPers = loginId; salesPers = loginId;
} }
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
attenanceComplianceRemote = (AttendanceComplianceRemote) context.lookup("ibase/AttendanceCompliance/remote"); //context = new InitialContext(appConnectParm.getProperty());
//attenanceComplianceRemote = (AttendanceComplianceRemote) context.lookup("ibase/AttendanceCompliance/remote");
//Changed by Anjali R. on[28/02/2018][To change return type json to string and dummy parameter to call new method] //Changed by Anjali R. on[28/02/2018][To change return type json to string and dummy parameter to call new method]
//JSONObject jsonObjData = attenanceComplianceRemote.getComplianceSummary(dataSourceName, salesPers, period,""); //JSONObject jsonObjData = attenanceComplianceRemote.getComplianceSummary(dataSourceName, salesPers, period,"");
String jsonObjData = attenanceComplianceRemote.getComplianceSummary(dataSourceName, salesPers, period,""); //String jsonObjData = attenanceComplianceRemote.getComplianceSummary(dataSourceName, salesPers, period,"");
OutputStream outputStream = response.getOutputStream(); attendanceCompliance = new AttendanceCompliance();
String jsonObjData = attendanceCompliance.getComplianceSummary(dataSourceName, salesPers, period,"");
OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
outputStream.close(); outputStream.close();
...@@ -76,7 +81,13 @@ public class AttendanceCompSummaryServlet extends HttpServlet ...@@ -76,7 +81,13 @@ public class AttendanceCompSummaryServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(attendanceCompliance != null)
{
attendanceCompliance = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/AttendanceComplianceServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.AttendanceComplianceRemote;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.AttendanceCompliance;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
public class AttendanceComplianceServlet extends HttpServlet public class AttendanceComplianceServlet extends HttpServlet
{ {
...@@ -27,9 +26,10 @@ public class AttendanceComplianceServlet extends HttpServlet ...@@ -27,9 +26,10 @@ public class AttendanceComplianceServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException throws IOException, ServletException
{ {
AttendanceComplianceRemote gardeniaRemote = null; //AttendanceComplianceRemote gardeniaRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
AttendanceCompliance attendanceCompliance = null;
String dataSourceName = "", viewOptionSelectd = ""; String dataSourceName = "", viewOptionSelectd = "";
String loginId = "", salesPers = "", period = ""; String loginId = "", salesPers = "", period = "";
HttpSession session = null; HttpSession session = null;
...@@ -61,12 +61,15 @@ public class AttendanceComplianceServlet extends HttpServlet ...@@ -61,12 +61,15 @@ public class AttendanceComplianceServlet extends HttpServlet
} }
viewOptionSelectd = request.getParameter("viewOptionSelectd"); viewOptionSelectd = request.getParameter("viewOptionSelectd");
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
gardeniaRemote = (AttendanceComplianceRemote) context.lookup("ibase/AttendanceCompliance/remote"); //context = new InitialContext(appConnectParm.getProperty());
//gardeniaRemote = (AttendanceComplianceRemote) context.lookup("ibase/AttendanceCompliance/remote");
//Changed by Anjali R. on[28/02/2018][added dummy parameter to call new method] //Changed by Anjali R. on[28/02/2018][added dummy parameter to call new method]
//jsonObjData = (JSONObject) gardeniaRemote.getAttendance(dataSourceName,salesPers, viewOptionSelectd); //jsonObjData = (JSONObject) gardeniaRemote.getAttendance(dataSourceName,salesPers, viewOptionSelectd);
jsonObjData = gardeniaRemote.getAttendance(dataSourceName,salesPers, viewOptionSelectd,""); //jsonObjData = gardeniaRemote.getAttendance(dataSourceName,salesPers, viewOptionSelectd,"");
outputStream = response.getOutputStream(); attendanceCompliance = new AttendanceCompliance();
jsonObjData = attendanceCompliance.getAttendance(dataSourceName,salesPers, viewOptionSelectd,"");
outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
outputStream.close(); outputStream.close();
...@@ -87,6 +90,13 @@ public class AttendanceComplianceServlet extends HttpServlet ...@@ -87,6 +90,13 @@ public class AttendanceComplianceServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(attendanceCompliance != null)
{
attendanceCompliance = null;
}
}
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/BatteryUsageServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.BatteryUsageEJBRemote;
import ibase.dashboard.sfa.ejb.EDetailingReportEJBRemote;
import ibase.dashboard.sfa.ejb.PlanVsActualRemote;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.rmi.RemoteException;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.BatteryUsageEJB;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
public class BatteryUsageServlet extends HttpServlet public class BatteryUsageServlet extends HttpServlet
{ {
...@@ -32,8 +27,8 @@ public class BatteryUsageServlet extends HttpServlet ...@@ -32,8 +27,8 @@ public class BatteryUsageServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException throws IOException, ServletException
{ {
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
String dataSourceName = ""; String dataSourceName = "";
String loginId = "",fromDate = "",salePersons = "", toDate = ""; String loginId = "",fromDate = "",salePersons = "", toDate = "";
HttpSession session = null; HttpSession session = null;
...@@ -56,9 +51,12 @@ public class BatteryUsageServlet extends HttpServlet ...@@ -56,9 +51,12 @@ public class BatteryUsageServlet extends HttpServlet
{ {
dataSourceName = userInfo.getTransDB(); dataSourceName = userInfo.getTransDB();
} }
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
BatteryUsageEJBRemote batteryUsageEJBRemote = (BatteryUsageEJBRemote) context.lookup("ibase/BatteryUsageEJB/remote"); //context = new InitialContext(appConnectParm.getProperty());
String jsonObjData = (String) batteryUsageEJBRemote.getBatteryUsageData(dataSourceName,loginId, minBatteryStatus, fromDate, toDate, teamArgs); //BatteryUsageEJBRemote batteryUsageEJBRemote = (BatteryUsageEJBRemote) context.lookup("ibase/BatteryUsageEJB/remote");
//String jsonObjData = (String) batteryUsageEJBRemote.getBatteryUsageData(dataSourceName,loginId, minBatteryStatus, fromDate, toDate, teamArgs);
BatteryUsageEJB batteryUsageEJB = new BatteryUsageEJB();
String jsonObjData = (String) batteryUsageEJB.getBatteryUsageData(dataSourceName,loginId, minBatteryStatus, fromDate, toDate, teamArgs);
System.out.println(" Final data set for BatteryUsageEJB build the Graph is===" + jsonObjData); System.out.println(" Final data set for BatteryUsageEJB build the Graph is===" + jsonObjData);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
...@@ -79,6 +77,7 @@ public class BatteryUsageServlet extends HttpServlet ...@@ -79,6 +77,7 @@ public class BatteryUsageServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/CallNotesServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.CallNotesReportLocal;
import ibase.system.config.AppConnectParm;
import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext; import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
...@@ -14,6 +10,12 @@ import javax.servlet.http.HttpServletRequest; ...@@ -14,6 +10,12 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import ibase.dashboard.sfa.ejb.CallNotesReport;
import ibase.dashboard.sfa.ejb.CallNotesReportLocal;
import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
public class CallNotesServlet extends HttpServlet public class CallNotesServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -27,9 +29,10 @@ public class CallNotesServlet extends HttpServlet ...@@ -27,9 +29,10 @@ public class CallNotesServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException throws IOException, ServletException
{ {
CallNotesReportLocal callNotesLocal = null; //CallNotesReportLocal callNotesLocal = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
CallNotesReport callNotes = null;
String dataSourceName = ""; String dataSourceName = "";
String loginCode = ""; String loginCode = "";
HttpSession session = null; HttpSession session = null;
...@@ -56,9 +59,12 @@ public class CallNotesServlet extends HttpServlet ...@@ -56,9 +59,12 @@ public class CallNotesServlet extends HttpServlet
toDate = E12GenericUtility.checkNull(request.getParameter("to_date")); toDate = E12GenericUtility.checkNull(request.getParameter("to_date"));
strgType = E12GenericUtility.checkNull(request.getParameter("strg_type")); strgType = E12GenericUtility.checkNull(request.getParameter("strg_type"));
teamArgs = E12GenericUtility.checkNull(request.getParameter("my_team")); teamArgs = E12GenericUtility.checkNull(request.getParameter("my_team"));
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
callNotesLocal = (CallNotesReportLocal) context.lookup("ibase/CallNotesReport/local"); //context = new InitialContext(appConnectParm.getProperty());
jsonObjData = (String) callNotesLocal.getCallNotesData(dataSourceName,loginCode,fromDate,toDate,strgType,teamArgs); //callNotesLocal = (CallNotesReportLocal) context.lookup("ibase/CallNotesReport/local");
//jsonObjData = (String) callNotesLocal.getCallNotesData(dataSourceName,loginCode,fromDate,toDate,strgType,teamArgs);
callNotes = new CallNotesReport();
jsonObjData = (String) callNotes.getCallNotesData(dataSourceName,loginCode,fromDate,toDate,strgType,teamArgs);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.getBytes()); outputStream.write(jsonObjData.getBytes());
outputStream.flush(); outputStream.flush();
...@@ -79,6 +85,13 @@ public class CallNotesServlet extends HttpServlet ...@@ -79,6 +85,13 @@ public class CallNotesServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(callNotes != null)
{
callNotes = null;
}
}
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/CoachingSummaryServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.utility.E12GenericUtility;
import ibase.dashboard.sfa.ejb.CoachingSummaryEJBLocal;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext; import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.CoachingSummaryEJB;
import ibase.dashboard.sfa.ejb.CoachingSummaryEJBLocal;
import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
/* /*
* Author : Mrunalini S. * Author : Mrunalini S.
* Date : 28-06-18 * Date : 28-06-18
...@@ -33,9 +34,10 @@ public class CoachingSummaryServlet extends HttpServlet ...@@ -33,9 +34,10 @@ public class CoachingSummaryServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException throws IOException, ServletException
{ {
CoachingSummaryEJBLocal coachingLocal = null; //CoachingSummaryEJBLocal coachingLocal = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
CoachingSummaryEJB coaching = null;
String dataSourceName = ""; String dataSourceName = "";
String loginCode = ""; String loginCode = "";
HttpSession session = null; HttpSession session = null;
...@@ -65,10 +67,12 @@ public class CoachingSummaryServlet extends HttpServlet ...@@ -65,10 +67,12 @@ public class CoachingSummaryServlet extends HttpServlet
toDate = E12GenericUtility.checkNull(request.getParameter("to_date")); toDate = E12GenericUtility.checkNull(request.getParameter("to_date"));
teamArgs = E12GenericUtility.checkNull(request.getParameter("SALES_PERS")); teamArgs = E12GenericUtility.checkNull(request.getParameter("SALES_PERS"));
surveyId = E12GenericUtility.checkNull(request.getParameter("survey_id")); surveyId = E12GenericUtility.checkNull(request.getParameter("survey_id"));
//Commented and added By Varsha V on 06-08-18 for removing lookup
context = new InitialContext(appConnectParm.getProperty()); //context = new InitialContext(appConnectParm.getProperty());
coachingLocal = (CoachingSummaryEJBLocal) context.lookup("ibase/CoachingSummaryEJB/local"); //coachingLocal = (CoachingSummaryEJBLocal) context.lookup("ibase/CoachingSummaryEJB/local");
jsonObjData = (String) coachingLocal.getCoachingData(loginCode,dataSourceName,fromDate,toDate,teamArgs,surveyId,profileId); //jsonObjData = (String) coachingLocal.getCoachingData(loginCode,dataSourceName,fromDate,toDate,teamArgs,surveyId,profileId);
coaching = new CoachingSummaryEJB();
jsonObjData = (String) coaching.getCoachingData(loginCode,dataSourceName,fromDate,toDate,teamArgs,surveyId,profileId);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.getBytes()); outputStream.write(jsonObjData.getBytes());
outputStream.flush(); outputStream.flush();
...@@ -89,6 +93,13 @@ public class CoachingSummaryServlet extends HttpServlet ...@@ -89,6 +93,13 @@ public class CoachingSummaryServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(coaching != null)
{
coaching = null;
}
}
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/CompDayWiseDetServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.ComplianceRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.Compliance;
import ibase.webitm.utility.ITMException;
public class CompDayWiseDetServlet extends HttpServlet public class CompDayWiseDetServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -26,9 +27,10 @@ public class CompDayWiseDetServlet extends HttpServlet ...@@ -26,9 +27,10 @@ public class CompDayWiseDetServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
ComplianceRemote complianceRemote = null; //ComplianceRemote complianceRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
Compliance compliance = null;
String dataSourceName = ""; String dataSourceName = "";
String loginId = ""; String loginId = "";
String firstIndex = ""; String firstIndex = "";
...@@ -44,9 +46,12 @@ public class CompDayWiseDetServlet extends HttpServlet ...@@ -44,9 +46,12 @@ public class CompDayWiseDetServlet extends HttpServlet
cellVal = request.getParameter("available_dy"); cellVal = request.getParameter("available_dy");
System.out.println("in CompDayWiseDetServlet firstIndex :"+firstIndex+"===== cellVal :"+cellVal); System.out.println("in CompDayWiseDetServlet firstIndex :"+firstIndex+"===== cellVal :"+cellVal);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
complianceRemote = (ComplianceRemote) context.lookup("ibase/Compliance/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) complianceRemote.getPersonalDetFrmDate(firstIndex, cellVal, dataSourceName); //complianceRemote = (ComplianceRemote) context.lookup("ibase/Compliance/remote");
//JSONObject jsonObjData = (JSONObject) complianceRemote.getPersonalDetFrmDate(firstIndex, cellVal, dataSourceName);
compliance = new Compliance();
JSONObject jsonObjData = (JSONObject) compliance.getPersonalDetFrmDate(firstIndex, cellVal, dataSourceName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -64,7 +69,13 @@ public class CompDayWiseDetServlet extends HttpServlet ...@@ -64,7 +69,13 @@ public class CompDayWiseDetServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(compliance != null)
{
compliance = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/CompDaysWiseDetServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.ComplianceRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import javax.servlet.http.HttpSession;
import ibase.dashboard.sfa.ejb.Compliance;
import ibase.webitm.utility.ITMException;
public class CompDaysWiseDetServlet extends HttpServlet public class CompDaysWiseDetServlet extends HttpServlet
{ {
...@@ -26,9 +26,10 @@ public class CompDaysWiseDetServlet extends HttpServlet ...@@ -26,9 +26,10 @@ public class CompDaysWiseDetServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
ComplianceRemote complianceRemote = null; //ComplianceRemote complianceRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
Compliance compliance = null;
String dataSourceName = ""; String dataSourceName = "";
String personName = ""; String personName = "";
String frmDate = ""; String frmDate = "";
...@@ -43,9 +44,12 @@ public class CompDaysWiseDetServlet extends HttpServlet ...@@ -43,9 +44,12 @@ public class CompDaysWiseDetServlet extends HttpServlet
frmDate = request.getParameter("frmDate"); frmDate = request.getParameter("frmDate");
toDate = request.getParameter("toDate"); toDate = request.getParameter("toDate");
System.out.println("in CompDaysWiseDetServlet personName :"+personName+"===== toDate :"+toDate+"=====frmDate:"+frmDate); System.out.println("in CompDaysWiseDetServlet personName :"+personName+"===== toDate :"+toDate+"=====frmDate:"+frmDate);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
complianceRemote = (ComplianceRemote) context.lookup("ibase/Compliance/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) complianceRemote.getComplianceDetailFrmDate(frmDate,toDate, personName, dataSourceName); //complianceRemote = (ComplianceRemote) context.lookup("ibase/Compliance/remote");
//JSONObject jsonObjData = (JSONObject) complianceRemote.getComplianceDetailFrmDate(frmDate,toDate, personName, dataSourceName);
compliance = new Compliance();
JSONObject jsonObjData = (JSONObject) compliance.getComplianceDetailFrmDate(frmDate,toDate, personName, dataSourceName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -63,7 +67,13 @@ public class CompDaysWiseDetServlet extends HttpServlet ...@@ -63,7 +67,13 @@ public class CompDaysWiseDetServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(compliance != null)
{
compliance = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ComplDayWiseSummaryServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.ComplianceDB2Remote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
...@@ -15,6 +11,10 @@ import javax.servlet.http.HttpServletResponse; ...@@ -15,6 +11,10 @@ import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.ComplianceDB2;
import ibase.dashboard.sfa.ejb.ComplianceDB2Remote;
import ibase.webitm.utility.ITMException;
public class ComplDayWiseSummaryServlet extends HttpServlet { public class ComplDayWiseSummaryServlet extends HttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -28,9 +28,10 @@ public class ComplDayWiseSummaryServlet extends HttpServlet { ...@@ -28,9 +28,10 @@ public class ComplDayWiseSummaryServlet extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
ComplianceDB2Remote complMtdDtlSummary = null; //ComplianceDB2Remote complMtdDtlSummary = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
ComplianceDB2 complMtdDtlSummary = null;
String dataSourceName = ""; String dataSourceName = "";
String loginUser =""; String loginUser ="";
String salePerson = ""; String salePerson = "";
...@@ -56,8 +57,10 @@ public class ComplDayWiseSummaryServlet extends HttpServlet { ...@@ -56,8 +57,10 @@ public class ComplDayWiseSummaryServlet extends HttpServlet {
{ {
salePerson = loginUser; salePerson = loginUser;
} }
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
complMtdDtlSummary = (ComplianceDB2Remote) context.lookup("ibase/ComplianceDB2/remote"); //context = new InitialContext(appConnectParm.getProperty());
//complMtdDtlSummary = (ComplianceDB2Remote) context.lookup("ibase/ComplianceDB2/remote");
complMtdDtlSummary = new ComplianceDB2();
JSONObject jsonObjData = (JSONObject) complMtdDtlSummary.getComplDayWiseSummary(dataSourceName, fromDate, toDate, salePerson); JSONObject jsonObjData = (JSONObject) complMtdDtlSummary.getComplDayWiseSummary(dataSourceName, fromDate, toDate, salePerson);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
...@@ -76,6 +79,13 @@ public class ComplDayWiseSummaryServlet extends HttpServlet { ...@@ -76,6 +79,13 @@ public class ComplDayWiseSummaryServlet extends HttpServlet {
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(complMtdDtlSummary != null)
{
complMtdDtlSummary = null;
}
}
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/ComplMTDSummaryServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.ComplianceDB2Remote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -15,6 +10,9 @@ import javax.servlet.http.HttpServletResponse; ...@@ -15,6 +10,9 @@ import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.ComplianceDB2;
import ibase.webitm.utility.ITMException;
public class ComplMTDSummaryServlet extends HttpServlet { public class ComplMTDSummaryServlet extends HttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -28,9 +26,10 @@ public class ComplMTDSummaryServlet extends HttpServlet { ...@@ -28,9 +26,10 @@ public class ComplMTDSummaryServlet extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{ {
System.out.println("In ComplMTDSummaryServlet"); System.out.println("In ComplMTDSummaryServlet");
ComplianceDB2Remote complMtdDtlSummary = null; //ComplianceDB2Remote complMtdDtlSummary = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
ComplianceDB2 complianceDB2 = null;
String dataSourceName = ""; String dataSourceName = "";
String loginEmpCode =""; String loginEmpCode ="";
String month = ""; String month = "";
...@@ -55,9 +54,12 @@ public class ComplMTDSummaryServlet extends HttpServlet { ...@@ -55,9 +54,12 @@ public class ComplMTDSummaryServlet extends HttpServlet {
} }
System.out.println("ComplMTDSummaryServlet = >> loginEmpCode :: "+loginEmpCode); System.out.println("ComplMTDSummaryServlet = >> loginEmpCode :: "+loginEmpCode);
System.out.println("ComplMTDSummaryServlet = >> salePersons :: "+salePersons); System.out.println("ComplMTDSummaryServlet = >> salePersons :: "+salePersons);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
complMtdDtlSummary = (ComplianceDB2Remote) context.lookup("ibase/ComplianceDB2/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) complMtdDtlSummary.getComplMTDSummary(dataSourceName, "", "", salePersons, loginEmpCode); //complMtdDtlSummary = (ComplianceDB2Remote) context.lookup("ibase/ComplianceDB2/remote");
//JSONObject jsonObjData = (JSONObject) complMtdDtlSummary.getComplMTDSummary(dataSourceName, "", "", salePersons, loginEmpCode);
complianceDB2 = new ComplianceDB2();
JSONObject jsonObjData = (JSONObject) complianceDB2.getComplMTDSummary(dataSourceName, "", "", salePersons, loginEmpCode);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -75,6 +77,13 @@ public class ComplMTDSummaryServlet extends HttpServlet { ...@@ -75,6 +77,13 @@ public class ComplMTDSummaryServlet extends HttpServlet {
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(complianceDB2 != null)
{
complianceDB2 = null;
}
}
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/ComplianceCustServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.ComplianceRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.Compliance;
import ibase.webitm.utility.ITMException;
public class ComplianceCustServlet extends HttpServlet public class ComplianceCustServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -26,9 +27,10 @@ public class ComplianceCustServlet extends HttpServlet ...@@ -26,9 +27,10 @@ public class ComplianceCustServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
ComplianceRemote complianceRemote = null; //ComplianceRemote complianceRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
Compliance compliance = null;
String dataSourceName = ""; String dataSourceName = "";
String loginId = ""; String loginId = "";
String firstIndex =""; String firstIndex ="";
...@@ -46,9 +48,12 @@ public class ComplianceCustServlet extends HttpServlet ...@@ -46,9 +48,12 @@ public class ComplianceCustServlet extends HttpServlet
cellVal = request.getParameter("date"); cellVal = request.getParameter("date");
System.out.println("in ComplianceCustServlet firstIndex :"+firstIndex+"===== cellVal :"+cellVal); System.out.println("in ComplianceCustServlet firstIndex :"+firstIndex+"===== cellVal :"+cellVal);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
complianceRemote = (ComplianceRemote) context.lookup("ibase/Compliance/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) complianceRemote.getComplianceCustDetails(firstIndex, cellVal, dataSourceName); //complianceRemote = (ComplianceRemote) context.lookup("ibase/Compliance/remote");
//JSONObject jsonObjData = (JSONObject) complianceRemote.getComplianceCustDetails(firstIndex, cellVal, dataSourceName);
compliance = new Compliance();
JSONObject jsonObjData = (JSONObject) compliance.getComplianceCustDetails(firstIndex, cellVal, dataSourceName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -66,7 +71,13 @@ public class ComplianceCustServlet extends HttpServlet ...@@ -66,7 +71,13 @@ public class ComplianceCustServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(compliance != null)
{
compliance = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ComplianceCustServlet_Nova.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.Compliance_NovaRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.Compliance_Nova;
import ibase.webitm.utility.ITMException;
public class ComplianceCustServlet_Nova extends HttpServlet public class ComplianceCustServlet_Nova extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -26,9 +27,10 @@ public class ComplianceCustServlet_Nova extends HttpServlet ...@@ -26,9 +27,10 @@ public class ComplianceCustServlet_Nova extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
Compliance_NovaRemote complianceRemote = null; //Compliance_NovaRemote complianceRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
Compliance_Nova compliance = null;
String dataSourceName = ""; String dataSourceName = "";
String loginId = ""; String loginId = "";
String firstIndex =""; String firstIndex ="";
...@@ -46,9 +48,12 @@ public class ComplianceCustServlet_Nova extends HttpServlet ...@@ -46,9 +48,12 @@ public class ComplianceCustServlet_Nova extends HttpServlet
cellVal = request.getParameter("date"); cellVal = request.getParameter("date");
System.out.println("in ComplianceCustServlet firstIndex :"+firstIndex+"===== cellVal :"+cellVal); System.out.println("in ComplianceCustServlet firstIndex :"+firstIndex+"===== cellVal :"+cellVal);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
complianceRemote = (Compliance_NovaRemote) context.lookup("ibase/Compliance_Nova/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) complianceRemote.getComplianceCustDetails(firstIndex, cellVal, dataSourceName); //complianceRemote = (Compliance_NovaRemote) context.lookup("ibase/Compliance_Nova/remote");
//JSONObject jsonObjData = (JSONObject) complianceRemote.getComplianceCustDetails(firstIndex, cellVal, dataSourceName);
compliance = new Compliance_Nova();
JSONObject jsonObjData = (JSONObject) compliance.getComplianceCustDetails(firstIndex, cellVal, dataSourceName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -66,7 +71,13 @@ public class ComplianceCustServlet_Nova extends HttpServlet ...@@ -66,7 +71,13 @@ public class ComplianceCustServlet_Nova extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(compliance != null)
{
compliance = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ComplianceDetailsDB2Servlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.ComplianceDB2Remote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.ComplianceDB2;
import ibase.webitm.utility.ITMException;
public class ComplianceDetailsDB2Servlet extends HttpServlet public class ComplianceDetailsDB2Servlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -25,9 +26,10 @@ public class ComplianceDetailsDB2Servlet extends HttpServlet ...@@ -25,9 +26,10 @@ public class ComplianceDetailsDB2Servlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
ComplianceDB2Remote complianceDB2Remote = null; //ComplianceDB2Remote complianceDB2Remote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
ComplianceDB2 complianceDB2 = null;
String dataSourceName = ""; String dataSourceName = "";
String personName =""; String personName ="";
String period = ""; String period = "";
...@@ -41,9 +43,12 @@ public class ComplianceDetailsDB2Servlet extends HttpServlet ...@@ -41,9 +43,12 @@ public class ComplianceDetailsDB2Servlet extends HttpServlet
period = request.getParameter("month"); period = request.getParameter("month");
System.out.println("in ComplianceDetailsDB2Servlet personName :"+personName+"===== period :"+period); System.out.println("in ComplianceDetailsDB2Servlet personName :"+personName+"===== period :"+period);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
complianceDB2Remote = (ComplianceDB2Remote) context.lookup("ibase/ComplianceDB2/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) complianceDB2Remote.getComplianceDetailsDB2(period, personName, dataSourceName); //complianceDB2Remote = (ComplianceDB2Remote) context.lookup("ibase/ComplianceDB2/remote");
//JSONObject jsonObjData = (JSONObject) complianceDB2Remote.getComplianceDetailsDB2(period, personName, dataSourceName);
complianceDB2 = new ComplianceDB2();
JSONObject jsonObjData = (JSONObject) complianceDB2.getComplianceDetailsDB2(period, personName, dataSourceName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -61,7 +66,13 @@ public class ComplianceDetailsDB2Servlet extends HttpServlet ...@@ -61,7 +66,13 @@ public class ComplianceDetailsDB2Servlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(complianceDB2 != null)
{
complianceDB2 = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ComplianceGridServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.ComplianceRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import javax.servlet.http.HttpSession;
import ibase.dashboard.sfa.ejb.Compliance;
import ibase.webitm.utility.ITMException;
public class ComplianceGridServlet extends HttpServlet public class ComplianceGridServlet extends HttpServlet
{ {
...@@ -26,9 +26,10 @@ public class ComplianceGridServlet extends HttpServlet ...@@ -26,9 +26,10 @@ public class ComplianceGridServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
ComplianceRemote complianceRemote = null; //ComplianceRemote complianceRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
Compliance compliance = null;
String dataSourceName = ""; String dataSourceName = "";
String personName =""; String personName ="";
String period = ""; String period = "";
...@@ -42,9 +43,12 @@ public class ComplianceGridServlet extends HttpServlet ...@@ -42,9 +43,12 @@ public class ComplianceGridServlet extends HttpServlet
period = request.getParameter("month"); period = request.getParameter("month");
System.out.println("in ComplianceGridServlet personName :"+personName+"===== period :"+period); System.out.println("in ComplianceGridServlet personName :"+personName+"===== period :"+period);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
complianceRemote = (ComplianceRemote) context.lookup("ibase/Compliance/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) complianceRemote.getComplianceGrid(period, personName, dataSourceName); //complianceRemote = (ComplianceRemote) context.lookup("ibase/Compliance/remote");
//JSONObject jsonObjData = (JSONObject) complianceRemote.getComplianceGrid(period, personName, dataSourceName);
compliance = new Compliance();
JSONObject jsonObjData = (JSONObject) compliance.getComplianceGrid(period, personName, dataSourceName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -62,7 +66,13 @@ public class ComplianceGridServlet extends HttpServlet ...@@ -62,7 +66,13 @@ public class ComplianceGridServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(compliance != null)
{
compliance = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ComplianceGridServlet_Nova.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.Compliance_NovaRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import javax.servlet.http.HttpSession;
import ibase.dashboard.sfa.ejb.Compliance_Nova;
import ibase.webitm.utility.ITMException;
public class ComplianceGridServlet_Nova extends HttpServlet public class ComplianceGridServlet_Nova extends HttpServlet
{ {
...@@ -26,9 +26,10 @@ public class ComplianceGridServlet_Nova extends HttpServlet ...@@ -26,9 +26,10 @@ public class ComplianceGridServlet_Nova extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
Compliance_NovaRemote complianceRemote = null; //Compliance_NovaRemote complianceRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
Compliance_Nova compliance = null;
String dataSourceName = ""; String dataSourceName = "";
String personName =""; String personName ="";
String period = ""; String period = "";
...@@ -42,9 +43,12 @@ public class ComplianceGridServlet_Nova extends HttpServlet ...@@ -42,9 +43,12 @@ public class ComplianceGridServlet_Nova extends HttpServlet
period = request.getParameter("month"); period = request.getParameter("month");
System.out.println("in ComplianceGridServlet personName :"+personName+"===== period :"+period); System.out.println("in ComplianceGridServlet personName :"+personName+"===== period :"+period);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
complianceRemote = (Compliance_NovaRemote) context.lookup("ibase/Compliance_Nova/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) complianceRemote.getComplianceGrid(period, personName, dataSourceName); //complianceRemote = (Compliance_NovaRemote) context.lookup("ibase/Compliance_Nova/remote");
//JSONObject jsonObjData = (JSONObject) complianceRemote.getComplianceGrid(period, personName, dataSourceName);
compliance = new Compliance_Nova();
JSONObject jsonObjData = (JSONObject) compliance.getComplianceGrid(period, personName, dataSourceName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -62,7 +66,13 @@ public class ComplianceGridServlet_Nova extends HttpServlet ...@@ -62,7 +66,13 @@ public class ComplianceGridServlet_Nova extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(compliance != null)
{
compliance = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ComplianceHirarchyDB2Servlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.ComplianceDB2;
import ibase.dashboard.sfa.ejb.ComplianceDB2Remote; import ibase.dashboard.sfa.ejb.ComplianceDB2Remote;
import ibase.system.config.AppConnectParm; import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
...@@ -24,9 +25,10 @@ public class ComplianceHirarchyDB2Servlet extends HttpServlet ...@@ -24,9 +25,10 @@ public class ComplianceHirarchyDB2Servlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
ComplianceDB2Remote complianceDB2Remote = null; //ComplianceDB2Remote complianceDB2Remote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
ComplianceDB2 complianceDB2 = null;
JSONObject jsonObjData = null; JSONObject jsonObjData = null;
OutputStream outputStream = null; OutputStream outputStream = null;
String dataSourceName = ""; String dataSourceName = "";
...@@ -42,9 +44,12 @@ public class ComplianceHirarchyDB2Servlet extends HttpServlet ...@@ -42,9 +44,12 @@ public class ComplianceHirarchyDB2Servlet extends HttpServlet
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
period = request.getParameter("month"); period = request.getParameter("month");
System.out.println("loginId =" + loginId + "period = "+period); System.out.println("loginId =" + loginId + "period = "+period);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
complianceDB2Remote = (ComplianceDB2Remote) context.lookup("ibase/ComplianceDB2/remote"); //context = new InitialContext(appConnectParm.getProperty());
jsonObjData = (JSONObject) complianceDB2Remote.getComplianceHirarchyDB2(loginId, dataSourceName, period); //complianceDB2Remote = (ComplianceDB2Remote) context.lookup("ibase/ComplianceDB2/remote");
//jsonObjData = (JSONObject) complianceDB2Remote.getComplianceHirarchyDB2(loginId, dataSourceName, period);
complianceDB2 = new ComplianceDB2();
jsonObjData = (JSONObject) complianceDB2.getComplianceHirarchyDB2(loginId, dataSourceName, period);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -62,7 +67,13 @@ public class ComplianceHirarchyDB2Servlet extends HttpServlet ...@@ -62,7 +67,13 @@ public class ComplianceHirarchyDB2Servlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(complianceDB2 != null)
{
complianceDB2 = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ComplianceServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.ComplianceRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.Compliance;
import ibase.webitm.utility.ITMException;
public class ComplianceServlet extends HttpServlet public class ComplianceServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -26,9 +27,10 @@ public class ComplianceServlet extends HttpServlet ...@@ -26,9 +27,10 @@ public class ComplianceServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
ComplianceRemote complianceRemote = null; //ComplianceRemote complianceRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
Compliance compliance = null;
JSONObject jsonObjData = null; JSONObject jsonObjData = null;
OutputStream outputStream = null; OutputStream outputStream = null;
String dataSourceName = ""; String dataSourceName = "";
...@@ -46,9 +48,12 @@ public class ComplianceServlet extends HttpServlet ...@@ -46,9 +48,12 @@ public class ComplianceServlet extends HttpServlet
period = request.getParameter("month"); period = request.getParameter("month");
System.out.println("loginId =" + loginId); System.out.println("loginId =" + loginId);
System.out.println("period =" + period); System.out.println("period =" + period);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
complianceRemote = (ComplianceRemote) context.lookup("ibase/Compliance/remote"); //context = new InitialContext(appConnectParm.getProperty());
jsonObjData = (JSONObject) complianceRemote.getComplianceDetails(loginId, dataSourceName, period); //complianceRemote = (ComplianceRemote) context.lookup("ibase/Compliance/remote");
//jsonObjData = (JSONObject) complianceRemote.getComplianceDetails(loginId, dataSourceName, period);
compliance = new Compliance();
jsonObjData = (JSONObject) compliance.getComplianceDetails(loginId, dataSourceName, period);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -66,7 +71,13 @@ public class ComplianceServlet extends HttpServlet ...@@ -66,7 +71,13 @@ public class ComplianceServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(compliance != null)
{
compliance = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ComplianceServlet_Nova.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.Compliance_NovaRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.Compliance_Nova;
import ibase.webitm.utility.ITMException;
public class ComplianceServlet_Nova extends HttpServlet public class ComplianceServlet_Nova extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -26,9 +27,10 @@ public class ComplianceServlet_Nova extends HttpServlet ...@@ -26,9 +27,10 @@ public class ComplianceServlet_Nova extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
Compliance_NovaRemote complianceRemote = null; //Compliance_NovaRemote complianceRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
Compliance_Nova compliance = null;
JSONObject jsonObjData = null; JSONObject jsonObjData = null;
OutputStream outputStream = null; OutputStream outputStream = null;
String dataSourceName = ""; String dataSourceName = "";
...@@ -46,9 +48,12 @@ public class ComplianceServlet_Nova extends HttpServlet ...@@ -46,9 +48,12 @@ public class ComplianceServlet_Nova extends HttpServlet
period = request.getParameter("month"); period = request.getParameter("month");
System.out.println("loginId =" + loginId); System.out.println("loginId =" + loginId);
System.out.println("period =" + period); System.out.println("period =" + period);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
complianceRemote = (Compliance_NovaRemote) context.lookup("ibase/Compliance_Nova/remote"); //context = new InitialContext(appConnectParm.getProperty());
jsonObjData = (JSONObject) complianceRemote.getComplianceDetails(loginId, dataSourceName, period); //complianceRemote = (Compliance_NovaRemote) context.lookup("ibase/Compliance_Nova/remote");
//jsonObjData = (JSONObject) complianceRemote.getComplianceDetails(loginId, dataSourceName, period);
compliance = new Compliance_Nova();
jsonObjData = (JSONObject) compliance.getComplianceDetails(loginId, dataSourceName, period);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -66,7 +71,13 @@ public class ComplianceServlet_Nova extends HttpServlet ...@@ -66,7 +71,13 @@ public class ComplianceServlet_Nova extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(compliance != null)
{
compliance = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ComplianceSummaryDB2Servlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.ComplianceDB2Remote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.ComplianceDB2;
import ibase.webitm.utility.ITMException;
public class ComplianceSummaryDB2Servlet extends HttpServlet public class ComplianceSummaryDB2Servlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -26,9 +26,10 @@ public class ComplianceSummaryDB2Servlet extends HttpServlet ...@@ -26,9 +26,10 @@ public class ComplianceSummaryDB2Servlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
ComplianceDB2Remote complianceDB2Remote = null; //ComplianceDB2Remote complianceDB2Remote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
ComplianceDB2 complianceDB2 = null;
String dataSourceName = ""; String dataSourceName = "";
String loginId = ""; String loginId = "";
String firstIndex = ""; String firstIndex = "";
...@@ -47,9 +48,12 @@ public class ComplianceSummaryDB2Servlet extends HttpServlet ...@@ -47,9 +48,12 @@ public class ComplianceSummaryDB2Servlet extends HttpServlet
cellVal = request.getParameter("date"); cellVal = request.getParameter("date");
System.out.println("in ComplianceSummaryDB2Servlet firstIndex :"+firstIndex+"===== cellVal :"+cellVal); System.out.println("in ComplianceSummaryDB2Servlet firstIndex :"+firstIndex+"===== cellVal :"+cellVal);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
complianceDB2Remote = (ComplianceDB2Remote) context.lookup("ibase/ComplianceDB2/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) complianceDB2Remote.getComplianceSummaryDB2(firstIndex, cellVal, dataSourceName); //complianceDB2Remote = (ComplianceDB2Remote) context.lookup("ibase/ComplianceDB2/remote");
//JSONObject jsonObjData = (JSONObject) complianceDB2Remote.getComplianceSummaryDB2(firstIndex, cellVal, dataSourceName);
complianceDB2 = new ComplianceDB2();
JSONObject jsonObjData = (JSONObject) complianceDB2.getComplianceSummaryDB2(firstIndex, cellVal, dataSourceName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -67,7 +71,13 @@ public class ComplianceSummaryDB2Servlet extends HttpServlet ...@@ -67,7 +71,13 @@ public class ComplianceSummaryDB2Servlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(complianceDB2 != null)
{
complianceDB2 = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ComplianceSummaryFrmDateServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.Compliance;
import ibase.dashboard.sfa.ejb.ComplianceRemote; import ibase.dashboard.sfa.ejb.ComplianceRemote;
import ibase.system.config.AppConnectParm; import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
...@@ -26,9 +27,10 @@ public class ComplianceSummaryFrmDateServlet extends HttpServlet ...@@ -26,9 +27,10 @@ public class ComplianceSummaryFrmDateServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
ComplianceRemote complianceRemote = null; //ComplianceRemote complianceRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
Compliance compliance = null;
JSONObject jsonObjData = null; JSONObject jsonObjData = null;
OutputStream outputStream = null; OutputStream outputStream = null;
String dataSourceName = ""; String dataSourceName = "";
...@@ -46,9 +48,12 @@ public class ComplianceSummaryFrmDateServlet extends HttpServlet ...@@ -46,9 +48,12 @@ public class ComplianceSummaryFrmDateServlet extends HttpServlet
frmDate = request.getParameter("frmDate"); frmDate = request.getParameter("frmDate");
toDate = request.getParameter("toDate"); toDate = request.getParameter("toDate");
System.out.println("Login code==="+loginId +"frmDate =" + frmDate+" toDate="+toDate); System.out.println("Login code==="+loginId +"frmDate =" + frmDate+" toDate="+toDate);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
complianceRemote = (ComplianceRemote) context.lookup("ibase/Compliance/remote"); //context = new InitialContext(appConnectParm.getProperty());
jsonObjData = (JSONObject) complianceRemote.getComplianceSummaryFrmDate(loginId,dataSourceName,frmDate,toDate); //complianceRemote = (ComplianceRemote) context.lookup("ibase/Compliance/remote");
//jsonObjData = (JSONObject) complianceRemote.getComplianceSummaryFrmDate(loginId,dataSourceName,frmDate,toDate);
compliance = new Compliance();
jsonObjData = (JSONObject) compliance.getComplianceSummaryFrmDate(loginId,dataSourceName,frmDate,toDate);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -66,7 +71,13 @@ public class ComplianceSummaryFrmDateServlet extends HttpServlet ...@@ -66,7 +71,13 @@ public class ComplianceSummaryFrmDateServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(compliance != null)
{
compliance = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/CurrentDaySummaryDetailServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -14,6 +9,9 @@ import javax.servlet.http.HttpServletResponse; ...@@ -14,6 +9,9 @@ import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummary;
import ibase.webitm.utility.ITMException;
public class CurrentDaySummaryDetailServlet extends HttpServlet public class CurrentDaySummaryDetailServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -28,9 +26,10 @@ public class CurrentDaySummaryDetailServlet extends HttpServlet ...@@ -28,9 +26,10 @@ public class CurrentDaySummaryDetailServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
CurrentDayWrkSummaryRemote currencyRemote = null; //CurrentDayWrkSummaryRemote currencyRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
CurrentDayWrkSummary currentDayWrkSummary = null;
String dataSourceName = ""; String dataSourceName = "";
String loginUser =""; String loginUser ="";
String date = ""; String date = "";
...@@ -57,9 +56,12 @@ public class CurrentDaySummaryDetailServlet extends HttpServlet ...@@ -57,9 +56,12 @@ public class CurrentDaySummaryDetailServlet extends HttpServlet
} }
System.out.println("In CurrentDaySummaryServlet dataSourceName: ---- "+dataSourceName+ " ---- date :"+date+" ---- salePerson :"+salePerson); System.out.println("In CurrentDaySummaryServlet dataSourceName: ---- "+dataSourceName+ " ---- date :"+date+" ---- salePerson :"+salePerson);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) currencyRemote.getCurrentDayWorkSummaryDetail(dataSourceName, date, salePerson); //currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote");
//JSONObject jsonObjData = (JSONObject) currencyRemote.getCurrentDayWorkSummaryDetail(dataSourceName, date, salePerson);
currentDayWrkSummary = new CurrentDayWrkSummary();
JSONObject jsonObjData = (JSONObject) currentDayWrkSummary.getCurrentDayWorkSummaryDetail(dataSourceName, date, salePerson);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -77,7 +79,13 @@ public class CurrentDaySummaryDetailServlet extends HttpServlet ...@@ -77,7 +79,13 @@ public class CurrentDaySummaryDetailServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(currentDayWrkSummary != null)
{
currentDayWrkSummary = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/CurrentDaySummaryServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -14,6 +9,9 @@ import javax.servlet.http.HttpServletResponse; ...@@ -14,6 +9,9 @@ import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummary;
import ibase.webitm.utility.ITMException;
public class CurrentDaySummaryServlet extends HttpServlet public class CurrentDaySummaryServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -28,9 +26,10 @@ public class CurrentDaySummaryServlet extends HttpServlet ...@@ -28,9 +26,10 @@ public class CurrentDaySummaryServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
CurrentDayWrkSummaryRemote currencyRemote = null; //CurrentDayWrkSummaryRemote currencyRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
CurrentDayWrkSummary currentDayWrkSummary = null;
String dataSourceName = ""; String dataSourceName = "";
String loginUser =""; String loginUser ="";
String date = ""; String date = "";
...@@ -57,9 +56,12 @@ public class CurrentDaySummaryServlet extends HttpServlet ...@@ -57,9 +56,12 @@ public class CurrentDaySummaryServlet extends HttpServlet
} }
System.out.println("In CurrentDaySummaryServlet dataSourceName: ---- "+dataSourceName+ " ---- date :"+date+" ---- salePerson :"+salePerson); System.out.println("In CurrentDaySummaryServlet dataSourceName: ---- "+dataSourceName+ " ---- date :"+date+" ---- salePerson :"+salePerson);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) currencyRemote.getCurrentDayWorkSummary(dataSourceName, date, salePerson); //currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote");
//JSONObject jsonObjData = (JSONObject) currencyRemote.getCurrentDayWorkSummary(dataSourceName, date, salePerson);
currentDayWrkSummary = new CurrentDayWrkSummary();
JSONObject jsonObjData = (JSONObject) currentDayWrkSummary.getCurrentDayWorkSummary(dataSourceName, date, salePerson);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -77,7 +79,13 @@ public class CurrentDaySummaryServlet extends HttpServlet ...@@ -77,7 +79,13 @@ public class CurrentDaySummaryServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(currentDayWrkSummary != null)
{
currentDayWrkSummary = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/CurrentDayWorkDtlServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -14,6 +9,9 @@ import javax.servlet.http.HttpServletResponse; ...@@ -14,6 +9,9 @@ import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummary;
import ibase.webitm.utility.ITMException;
public class CurrentDayWorkDtlServlet extends HttpServlet public class CurrentDayWorkDtlServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -28,9 +26,10 @@ public class CurrentDayWorkDtlServlet extends HttpServlet ...@@ -28,9 +26,10 @@ public class CurrentDayWorkDtlServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
CurrentDayWrkSummaryRemote currencyRemote = null; //CurrentDayWrkSummaryRemote currencyRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
CurrentDayWrkSummary currentDayWrkSummary = null;
String dataSourceName = ""; String dataSourceName = "";
String loginUser =""; String loginUser ="";
String date = ""; String date = "";
...@@ -57,9 +56,12 @@ public class CurrentDayWorkDtlServlet extends HttpServlet ...@@ -57,9 +56,12 @@ public class CurrentDayWorkDtlServlet extends HttpServlet
} }
System.out.println("In CurrentDaySummaryServlet dataSourceName: ---- "+dataSourceName+ " ---- date :"+date+" ---- salePerson :"+salePerson); System.out.println("In CurrentDaySummaryServlet dataSourceName: ---- "+dataSourceName+ " ---- date :"+date+" ---- salePerson :"+salePerson);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) currencyRemote.getCurrentDayWorkDtl(dataSourceName, date, salePerson); //currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote");
//JSONObject jsonObjData = (JSONObject) currencyRemote.getCurrentDayWorkDtl(dataSourceName, date, salePerson);
currentDayWrkSummary = new CurrentDayWrkSummary();
JSONObject jsonObjData = (JSONObject) currentDayWrkSummary.getCurrentDayWorkDtl(dataSourceName, date, salePerson);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -77,7 +79,13 @@ public class CurrentDayWorkDtlServlet extends HttpServlet ...@@ -77,7 +79,13 @@ public class CurrentDayWorkDtlServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(currentDayWrkSummary != null)
{
currentDayWrkSummary = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/CurrentDayWorkSKUDtlServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -14,6 +9,9 @@ import javax.servlet.http.HttpServletResponse; ...@@ -14,6 +9,9 @@ import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummary;
import ibase.webitm.utility.ITMException;
public class CurrentDayWorkSKUDtlServlet extends HttpServlet public class CurrentDayWorkSKUDtlServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -28,9 +26,10 @@ public class CurrentDayWorkSKUDtlServlet extends HttpServlet ...@@ -28,9 +26,10 @@ public class CurrentDayWorkSKUDtlServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
CurrentDayWrkSummaryRemote currencyRemote = null; //CurrentDayWrkSummaryRemote currencyRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
CurrentDayWrkSummary currentDayWrkSummary = null;
String dataSourceName = ""; String dataSourceName = "";
String loginUser =""; String loginUser ="";
String date = ""; String date = "";
...@@ -58,9 +57,12 @@ public class CurrentDayWorkSKUDtlServlet extends HttpServlet ...@@ -58,9 +57,12 @@ public class CurrentDayWorkSKUDtlServlet extends HttpServlet
} }
System.out.println("In CurrentDaySummaryServlet dataSourceName: ---- "+dataSourceName+ " ---- date :"+date+" ---- salePerson :"+salePerson); System.out.println("In CurrentDaySummaryServlet dataSourceName: ---- "+dataSourceName+ " ---- date :"+date+" ---- salePerson :"+salePerson);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) currencyRemote.getCurrentDayWorkSKUDtl(dataSourceName, date, salePerson); //currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote");
//JSONObject jsonObjData = (JSONObject) currencyRemote.getCurrentDayWorkSKUDtl(dataSourceName, date, salePerson);
currentDayWrkSummary = new CurrentDayWrkSummary();
JSONObject jsonObjData = (JSONObject) currentDayWrkSummary.getCurrentDayWorkSKUDtl(dataSourceName, date, salePerson);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -78,7 +80,13 @@ public class CurrentDayWorkSKUDtlServlet extends HttpServlet ...@@ -78,7 +80,13 @@ public class CurrentDayWorkSKUDtlServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(currentDayWrkSummary != null)
{
currentDayWrkSummary = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/DoctorsVisitServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.DoctorsVisitRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.DoctorsVisit;
import ibase.webitm.utility.ITMException;
public class DoctorsVisitServlet extends HttpServlet public class DoctorsVisitServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -27,9 +28,10 @@ public class DoctorsVisitServlet extends HttpServlet ...@@ -27,9 +28,10 @@ public class DoctorsVisitServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
DoctorsVisitRemote doctorsVisitRemote = null; //DoctorsVisitRemote doctorsVisitRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
DoctorsVisit doctorsVisit = null;
String dataSourceName = ""; String dataSourceName = "";
String salesPerson = ""; String salesPerson = "";
String month = ""; String month = "";
...@@ -62,10 +64,13 @@ public class DoctorsVisitServlet extends HttpServlet ...@@ -62,10 +64,13 @@ public class DoctorsVisitServlet extends HttpServlet
System.out.println("month is =" + month); System.out.println("month is =" + month);
System.out.println("year is =" + year); System.out.println("year is =" + year);
System.out.println("reportName is =" + reportName); System.out.println("reportName is =" + reportName);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
//context = new InitialContext(appConnectParm.getProperty());
System.out.println("inside docotor 1 ="); System.out.println("inside docotor 1 =");
doctorsVisitRemote = (DoctorsVisitRemote) context.lookup("ibase/DoctorsVisit/remote"); //doctorsVisitRemote = (DoctorsVisitRemote) context.lookup("ibase/DoctorsVisit/remote");
JSONObject jsonObjData = (JSONObject) doctorsVisitRemote.getDoctorsVisitDetails(loginId, salesPerson, month, year, dataSourceName); //JSONObject jsonObjData = (JSONObject) doctorsVisitRemote.getDoctorsVisitDetails(loginId, salesPerson, month, year, dataSourceName);
doctorsVisit = new DoctorsVisit();
JSONObject jsonObjData = (JSONObject) doctorsVisit.getDoctorsVisitDetails(loginId, salesPerson, month, year, dataSourceName);
System.out.println("inside docotor2 ="); System.out.println("inside docotor2 =");
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
...@@ -84,7 +89,13 @@ public class DoctorsVisitServlet extends HttpServlet ...@@ -84,7 +89,13 @@ public class DoctorsVisitServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(doctorsVisit != null)
{
doctorsVisit = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/EDetailingServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.EDetailingReportEJBRemote;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import ibase.dashboard.sfa.ejb.EDetailingReportEJB;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
public class EDetailingServlet extends HttpServlet public class EDetailingServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -26,8 +26,8 @@ public class EDetailingServlet extends HttpServlet ...@@ -26,8 +26,8 @@ public class EDetailingServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException throws IOException, ServletException
{ {
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
String dataSourceName = ""; String dataSourceName = "";
String loginId = "",fromDate = "", toDate = ""; String loginId = "",fromDate = "", toDate = "";
HttpSession session = null; HttpSession session = null;
...@@ -49,11 +49,12 @@ public class EDetailingServlet extends HttpServlet ...@@ -49,11 +49,12 @@ public class EDetailingServlet extends HttpServlet
{ {
dataSourceName = userInfo.getTransDB(); dataSourceName = userInfo.getTransDB();
} }
//Commented and added By Varsha V on 06-08-18 for removing lookup
context = new InitialContext(appConnectParm.getProperty()); //context = new InitialContext(appConnectParm.getProperty());
EDetailingReportEJBRemote eDetailingReportEJBRemote = (EDetailingReportEJBRemote) context.lookup("ibase/EDetailingReportEJB/remote"); //EDetailingReportEJBRemote eDetailingReportEJBRemote = (EDetailingReportEJBRemote) context.lookup("ibase/EDetailingReportEJB/remote");
String jsonObjData = (String) eDetailingReportEJBRemote. getEDetailingData( dataSourceName, loginId, fromDate, toDate, teamArgs ); //String jsonObjData = (String) eDetailingReportEJBRemote. getEDetailingData( dataSourceName, loginId, fromDate, toDate, teamArgs );
EDetailingReportEJB eDetailingReportEJB = new EDetailingReportEJB();
String jsonObjData = (String) eDetailingReportEJB. getEDetailingData( dataSourceName, loginId, fromDate, toDate, teamArgs );
System.out.println(" Final data set for EDetailingServlet build the Graph is===" + jsonObjData); System.out.println(" Final data set for EDetailingServlet build the Graph is===" + jsonObjData);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
......
webitm-dashboard/ibase/dashboard/sfa/servlet/EsiKpiServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.utility.E12GenericUtility;
import ibase.dashboard.sfa.ejb.EsiKpiReportEJBLocal;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.EsiKpiReportEJB;
import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
public class EsiKpiServlet extends HttpServlet public class EsiKpiServlet extends HttpServlet
{ {
...@@ -29,9 +28,10 @@ public class EsiKpiServlet extends HttpServlet ...@@ -29,9 +28,10 @@ public class EsiKpiServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException throws IOException, ServletException
{ {
EsiKpiReportEJBLocal esiKpiLocal = null; //EsiKpiReportEJBLocal esiKpiLocal = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
EsiKpiReportEJB esiKpiEJB = null;
String dataSourceName = ""; String dataSourceName = "";
String loginCode = ""; String loginCode = "";
HttpSession session = null; HttpSession session = null;
...@@ -59,9 +59,12 @@ public class EsiKpiServlet extends HttpServlet ...@@ -59,9 +59,12 @@ public class EsiKpiServlet extends HttpServlet
fromDate = E12GenericUtility.checkNull(request.getParameter("from_date")); fromDate = E12GenericUtility.checkNull(request.getParameter("from_date"));
toDate = E12GenericUtility.checkNull(request.getParameter("to_date")); toDate = E12GenericUtility.checkNull(request.getParameter("to_date"));
teamArgs = E12GenericUtility.checkNull(request.getParameter("my_team")); teamArgs = E12GenericUtility.checkNull(request.getParameter("my_team"));
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
esiKpiLocal = (EsiKpiReportEJBLocal) context.lookup("ibase/EsiKpiReportEJB/local"); //context = new InitialContext(appConnectParm.getProperty());
jsonObjData = (String) esiKpiLocal.getEsiKpiData(loginCode,dataSourceName,fromDate,toDate,teamArgs,profileId); //esiKpiLocal = (EsiKpiReportEJBLocal) context.lookup("ibase/EsiKpiReportEJB/local");
//jsonObjData = (String) esiKpiLocal.getEsiKpiData(loginCode,dataSourceName,fromDate,toDate,teamArgs,profileId);
esiKpiEJB = new EsiKpiReportEJB();
jsonObjData = (String) esiKpiEJB.getEsiKpiData(loginCode,dataSourceName,fromDate,toDate,teamArgs,profileId);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.getBytes()); outputStream.write(jsonObjData.getBytes());
outputStream.flush(); outputStream.flush();
...@@ -82,6 +85,13 @@ public class EsiKpiServlet extends HttpServlet ...@@ -82,6 +85,13 @@ public class EsiKpiServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(esiKpiEJB != null)
{
esiKpiEJB = null;
}
}
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/HealtCareServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.utility.E12GenericUtility;
import ibase.dashboard.sfa.ejb.HealthCareEJBLocal;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.HealthCareEJB;
import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
public class HealtCareServlet extends HttpServlet public class HealtCareServlet extends HttpServlet
{ {
...@@ -29,9 +28,10 @@ public class HealtCareServlet extends HttpServlet ...@@ -29,9 +28,10 @@ public class HealtCareServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException throws IOException, ServletException
{ {
HealthCareEJBLocal healthCareLocal = null; //HealthCareEJBLocal healthCareLocal = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
HealthCareEJB healthCare = null;
String dataSourceName = ""; String dataSourceName = "";
String loginCode = ""; String loginCode = "";
HttpSession session = null; HttpSession session = null;
...@@ -59,9 +59,12 @@ public class HealtCareServlet extends HttpServlet ...@@ -59,9 +59,12 @@ public class HealtCareServlet extends HttpServlet
fromDate = E12GenericUtility.checkNull(request.getParameter("from_date")); fromDate = E12GenericUtility.checkNull(request.getParameter("from_date"));
toDate = E12GenericUtility.checkNull(request.getParameter("to_date")); toDate = E12GenericUtility.checkNull(request.getParameter("to_date"));
teamArgs = E12GenericUtility.checkNull(request.getParameter("my_team")); teamArgs = E12GenericUtility.checkNull(request.getParameter("my_team"));
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
healthCareLocal = (HealthCareEJBLocal) context.lookup("ibase/HealthCareEJB/local"); //context = new InitialContext(appConnectParm.getProperty());
jsonObjData = (String) healthCareLocal.getHealthCareData(loginCode,dataSourceName,fromDate,toDate,teamArgs,profileId); //healthCareLocal = (HealthCareEJBLocal) context.lookup("ibase/HealthCareEJB/local");
//jsonObjData = (String) healthCareLocal.getHealthCareData(loginCode,dataSourceName,fromDate,toDate,teamArgs,profileId);
healthCare = new HealthCareEJB();
jsonObjData = (String) healthCare.getHealthCareData(loginCode,dataSourceName,fromDate,toDate,teamArgs,profileId);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.getBytes()); outputStream.write(jsonObjData.getBytes());
outputStream.flush(); outputStream.flush();
...@@ -82,6 +85,13 @@ public class HealtCareServlet extends HttpServlet ...@@ -82,6 +85,13 @@ public class HealtCareServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(healthCare != null)
{
healthCare = null;
}
}
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/ImportantEventServlet.java
View file @ 6ba4549f
...@@ -2,15 +2,16 @@ package ibase.dashboard.sfa.servlet; ...@@ -2,15 +2,16 @@ package ibase.dashboard.sfa.servlet;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.ImpEventsRemote;
import ibase.system.config.AppConnectParm; import ibase.dashboard.sfa.ejb.ImpEvents;
import ibase.utility.UserInfoBean; import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
...@@ -33,9 +34,10 @@ public class ImportantEventServlet extends HttpServlet ...@@ -33,9 +34,10 @@ public class ImportantEventServlet extends HttpServlet
System.out.println("@@@@@@@@@@@@@@@@ImportantEventServlet@@@@@@@@@@@@@@@@ DOPOST @@@@@@@@@"); System.out.println("@@@@@@@@@@@@@@@@ImportantEventServlet@@@@@@@@@@@@@@@@ DOPOST @@@@@@@@@");
ImpEventsRemote impEventsRemote = null; //ImpEventsRemote impEventsRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
ImpEvents impEvents = null;
String dataSourceName = ""; String dataSourceName = "";
String empCode = "" ; String empCode = "" ;
HttpSession session = null; HttpSession session = null;
...@@ -56,11 +58,13 @@ public class ImportantEventServlet extends HttpServlet ...@@ -56,11 +58,13 @@ public class ImportantEventServlet extends HttpServlet
} }
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
impEventsRemote = (ImpEventsRemote)context.lookup("ibase/ImpEvents/remote"); //context = new InitialContext(appConnectParm.getProperty());
//impEventsRemote = (ImpEventsRemote)context.lookup("ibase/ImpEvents/remote");
System.out.println(" userTranDB in ImpEventsRemote ="+ userTranDB); System.out.println(" userTranDB in ImpEventsRemote ="+ userTranDB);
//jsonObjData = impEventsRemote.getEvents(empCode,userTranDB);
jsonObjData = impEventsRemote.getEvents(empCode,userTranDB); impEvents = new ImpEvents();
jsonObjData = impEvents.getEvents(empCode,userTranDB);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -80,6 +84,13 @@ public class ImportantEventServlet extends HttpServlet ...@@ -80,6 +84,13 @@ public class ImportantEventServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(impEvents != null)
{
impEvents = null;
}
}
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/MTDWorkDetailServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -14,6 +9,9 @@ import javax.servlet.http.HttpServletResponse; ...@@ -14,6 +9,9 @@ import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummary;
import ibase.webitm.utility.ITMException;
public class MTDWorkDetailServlet extends HttpServlet public class MTDWorkDetailServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -28,9 +26,10 @@ public class MTDWorkDetailServlet extends HttpServlet ...@@ -28,9 +26,10 @@ public class MTDWorkDetailServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
CurrentDayWrkSummaryRemote currencyRemote = null; //CurrentDayWrkSummaryRemote currencyRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
CurrentDayWrkSummary currentDayWrkSummary = null;
String dataSourceName = ""; String dataSourceName = "";
String loginUser =""; String loginUser ="";
String month = ""; String month = "";
...@@ -67,10 +66,12 @@ public class MTDWorkDetailServlet extends HttpServlet ...@@ -67,10 +66,12 @@ public class MTDWorkDetailServlet extends HttpServlet
{ {
salePerson = loginUser; salePerson = loginUser;
} }
//Commented and added By Varsha V on 06-08-18 for removing lookup
context = new InitialContext(appConnectParm.getProperty()); //context = new InitialContext(appConnectParm.getProperty());
currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote"); //currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote");
JSONObject jsonObjData = (JSONObject) currencyRemote.getMTDWorkDetail(dataSourceName, month, year, salePerson); //JSONObject jsonObjData = (JSONObject) currencyRemote.getMTDWorkDetail(dataSourceName, month, year, salePerson);
currentDayWrkSummary = new CurrentDayWrkSummary();
JSONObject jsonObjData = (JSONObject) currentDayWrkSummary.getMTDWorkDetail(dataSourceName, month, year, salePerson);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -88,7 +89,13 @@ public class MTDWorkDetailServlet extends HttpServlet ...@@ -88,7 +89,13 @@ public class MTDWorkDetailServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(currentDayWrkSummary != null)
{
currentDayWrkSummary = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/MTDWorkDtlParentServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -14,6 +9,9 @@ import javax.servlet.http.HttpServletResponse; ...@@ -14,6 +9,9 @@ import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummary;
import ibase.webitm.utility.ITMException;
public class MTDWorkDtlParentServlet extends HttpServlet public class MTDWorkDtlParentServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -28,9 +26,10 @@ public class MTDWorkDtlParentServlet extends HttpServlet ...@@ -28,9 +26,10 @@ public class MTDWorkDtlParentServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
CurrentDayWrkSummaryRemote currencyRemote = null; //CurrentDayWrkSummaryRemote currencyRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
CurrentDayWrkSummary currentDayWrkSummary = null;
String dataSourceName = ""; String dataSourceName = "";
String loginUser =""; String loginUser ="";
String month = ""; String month = "";
...@@ -67,10 +66,12 @@ public class MTDWorkDtlParentServlet extends HttpServlet ...@@ -67,10 +66,12 @@ public class MTDWorkDtlParentServlet extends HttpServlet
{ {
salePerson = loginUser; salePerson = loginUser;
} }
//Commented and added By Varsha V on 06-08-18 for removing lookup
context = new InitialContext(appConnectParm.getProperty()); //context = new InitialContext(appConnectParm.getProperty());
currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote"); //currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote");
JSONObject jsonObjData = (JSONObject) currencyRemote.getMTDWorkDtlParent(dataSourceName, month, year, salePerson); //JSONObject jsonObjData = (JSONObject) currencyRemote.getMTDWorkDtlParent(dataSourceName, month, year, salePerson);
currentDayWrkSummary = new CurrentDayWrkSummary();
JSONObject jsonObjData = (JSONObject) currentDayWrkSummary.getMTDWorkDtlParent(dataSourceName, month, year, salePerson);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -88,7 +89,13 @@ public class MTDWorkDtlParentServlet extends HttpServlet ...@@ -88,7 +89,13 @@ public class MTDWorkDtlParentServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(currentDayWrkSummary != null)
{
currentDayWrkSummary = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/MTDWorkParentServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -14,6 +9,9 @@ import javax.servlet.http.HttpServletResponse; ...@@ -14,6 +9,9 @@ import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummary;
import ibase.webitm.utility.ITMException;
public class MTDWorkParentServlet extends HttpServlet public class MTDWorkParentServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -28,9 +26,10 @@ public class MTDWorkParentServlet extends HttpServlet ...@@ -28,9 +26,10 @@ public class MTDWorkParentServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
CurrentDayWrkSummaryRemote currencyRemote = null; //CurrentDayWrkSummaryRemote currencyRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
CurrentDayWrkSummary currentDayWrkSummary = null;
String dataSourceName = ""; String dataSourceName = "";
String loginUser =""; String loginUser ="";
String month = ""; String month = "";
...@@ -67,10 +66,12 @@ public class MTDWorkParentServlet extends HttpServlet ...@@ -67,10 +66,12 @@ public class MTDWorkParentServlet extends HttpServlet
{ {
salePerson = loginUser; salePerson = loginUser;
} }
//Commented and added By Varsha V on 06-08-18 for removing lookup
context = new InitialContext(appConnectParm.getProperty()); //context = new InitialContext(appConnectParm.getProperty());
currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote"); //currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote");
JSONObject jsonObjData = (JSONObject) currencyRemote.getMTDWorkParent(dataSourceName, month, year, salePerson); //JSONObject jsonObjData = (JSONObject) currencyRemote.getMTDWorkParent(dataSourceName, month, year, salePerson);
currentDayWrkSummary = new CurrentDayWrkSummary();
JSONObject jsonObjData = (JSONObject) currentDayWrkSummary.getMTDWorkParent(dataSourceName, month, year, salePerson);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -88,7 +89,13 @@ public class MTDWorkParentServlet extends HttpServlet ...@@ -88,7 +89,13 @@ public class MTDWorkParentServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(currentDayWrkSummary != null)
{
currentDayWrkSummary = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/MTDWorkSummaryServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -14,6 +9,9 @@ import javax.servlet.http.HttpServletResponse; ...@@ -14,6 +9,9 @@ import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummary;
import ibase.webitm.utility.ITMException;
public class MTDWorkSummaryServlet extends HttpServlet public class MTDWorkSummaryServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -28,9 +26,10 @@ public class MTDWorkSummaryServlet extends HttpServlet ...@@ -28,9 +26,10 @@ public class MTDWorkSummaryServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
CurrentDayWrkSummaryRemote currencyRemote = null; //CurrentDayWrkSummaryRemote currencyRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
CurrentDayWrkSummary currentDayWrkSummary = null;
String dataSourceName = ""; String dataSourceName = "";
String loginUser =""; String loginUser ="";
String month = ""; String month = "";
...@@ -67,10 +66,12 @@ public class MTDWorkSummaryServlet extends HttpServlet ...@@ -67,10 +66,12 @@ public class MTDWorkSummaryServlet extends HttpServlet
{ {
salePerson = loginUser; salePerson = loginUser;
} }
//Commented and added By Varsha V on 06-08-18 for removing lookup
context = new InitialContext(appConnectParm.getProperty()); //context = new InitialContext(appConnectParm.getProperty());
currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote"); //currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote");
JSONObject jsonObjData = (JSONObject) currencyRemote.getMTDWorkSummary(dataSourceName, month, year, salePerson); //JSONObject jsonObjData = (JSONObject) currencyRemote.getMTDWorkSummary(dataSourceName, month, year, salePerson);
currentDayWrkSummary = new CurrentDayWrkSummary();
JSONObject jsonObjData = (JSONObject) currentDayWrkSummary.getMTDWorkSummary(dataSourceName, month, year, salePerson);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -88,7 +89,13 @@ public class MTDWorkSummaryServlet extends HttpServlet ...@@ -88,7 +89,13 @@ public class MTDWorkSummaryServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(currentDayWrkSummary != null)
{
currentDayWrkSummary = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/MeetVarianceServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.VarianceReportMRLocal;
import ibase.system.config.AppConnectParm;
import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import ibase.dashboard.sfa.ejb.VarianceReportMR;
import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
public class MeetVarianceServlet extends HttpServlet public class MeetVarianceServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -27,9 +27,10 @@ public class MeetVarianceServlet extends HttpServlet ...@@ -27,9 +27,10 @@ public class MeetVarianceServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException throws IOException, ServletException
{ {
VarianceReportMRLocal meetVarianceLocal = null; //VarianceReportMRLocal meetVarianceLocal = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
VarianceReportMR meetVariance = null;
String dataSourceName = ""; String dataSourceName = "";
String loginCode = ""; String loginCode = "";
HttpSession session = null; HttpSession session = null;
...@@ -58,9 +59,12 @@ public class MeetVarianceServlet extends HttpServlet ...@@ -58,9 +59,12 @@ public class MeetVarianceServlet extends HttpServlet
toDate = E12GenericUtility.checkNull(request.getParameter("to_date")); toDate = E12GenericUtility.checkNull(request.getParameter("to_date"));
dist = E12GenericUtility.checkNull(request.getParameter("min_distance")); dist = E12GenericUtility.checkNull(request.getParameter("min_distance"));
teamArgs = E12GenericUtility.checkNull(request.getParameter("my_team")); teamArgs = E12GenericUtility.checkNull(request.getParameter("my_team"));
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
meetVarianceLocal = (VarianceReportMRLocal) context.lookup("ibase/VarianceReportMR/local"); //context = new InitialContext(appConnectParm.getProperty());
jsonObjData = (String) meetVarianceLocal.getVarianceReportOnGeoPos(loginCode,dataSourceName,fromDate,toDate,dist,teamArgs,profileId); //meetVarianceLocal = (VarianceReportMRLocal) context.lookup("ibase/VarianceReportMR/local");
//jsonObjData = (String) meetVarianceLocal.getVarianceReportOnGeoPos(loginCode,dataSourceName,fromDate,toDate,dist,teamArgs,profileId);
meetVariance = new VarianceReportMR();
jsonObjData = (String) meetVariance.getVarianceReportOnGeoPos(loginCode,dataSourceName,fromDate,toDate,dist,teamArgs,profileId);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.getBytes()); outputStream.write(jsonObjData.getBytes());
outputStream.flush(); outputStream.flush();
...@@ -81,6 +85,13 @@ public class MeetVarianceServlet extends HttpServlet ...@@ -81,6 +85,13 @@ public class MeetVarianceServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(meetVariance != null)
{
meetVariance = null;
}
}
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/MissedCallsServlet.java
View file @ 6ba4549f
...@@ -4,15 +4,13 @@ import java.io.IOException; ...@@ -4,15 +4,13 @@ import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.Date; import java.util.Date;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import ibase.dashboard.sfa.ejb.PlanVsActualRemote; import ibase.dashboard.sfa.ejb.PlanVsActual;
import ibase.system.config.AppConnectParm;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean; import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
...@@ -30,9 +28,10 @@ public class MissedCallsServlet extends HttpServlet ...@@ -30,9 +28,10 @@ public class MissedCallsServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException throws IOException, ServletException
{ {
PlanVsActualRemote planvsactualRemote = null; //PlanVsActualRemote planvsactualRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
PlanVsActual planvsactual = null;
String loginId = "",fromMonth = "",salePersons = "", toMonth = ""; String loginId = "",fromMonth = "",salePersons = "", toMonth = "";
HttpSession session = null; HttpSession session = null;
String jsonObjData = null; String jsonObjData = null;
...@@ -63,9 +62,12 @@ public class MissedCallsServlet extends HttpServlet ...@@ -63,9 +62,12 @@ public class MissedCallsServlet extends HttpServlet
toMonth = genUtil.getValidDateString(new Date(), "MMMYYYY"); toMonth = genUtil.getValidDateString(new Date(), "MMMYYYY");
} }
System.out.println("loginId = "+loginId+"fromMonth = "+fromMonth+"toMonth = "+toMonth+"sales person = "+salePersons); System.out.println("loginId = "+loginId+"fromMonth = "+fromMonth+"toMonth = "+toMonth+"sales person = "+salePersons);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
planvsactualRemote = (PlanVsActualRemote) context.lookup("ibase/PlanVsActual/remote"); //context = new InitialContext(appConnectParm.getProperty());
jsonObjData = planvsactualRemote.getMissedCalls(fromMonth, toMonth, salePersons, transDB); //planvsactualRemote = (PlanVsActualRemote) context.lookup("ibase/PlanVsActual/remote");
//jsonObjData = planvsactualRemote.getMissedCalls(fromMonth, toMonth, salePersons, transDB);
planvsactual = new PlanVsActual();
jsonObjData = planvsactual.getMissedCalls(fromMonth, toMonth, salePersons, transDB);
System.out.println(" Final data set for MissedCallsServlet build the Graph is===" + jsonObjData); System.out.println(" Final data set for MissedCallsServlet build the Graph is===" + jsonObjData);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
...@@ -84,6 +86,13 @@ public class MissedCallsServlet extends HttpServlet ...@@ -84,6 +86,13 @@ public class MissedCallsServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(planvsactual != null)
{
planvsactual = null;
}
}
} }
......
webitm-dashboard/ibase/dashboard/sfa/servlet/OutletsVisitServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.OutletsVisitRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -13,6 +10,9 @@ import javax.servlet.http.HttpSession; ...@@ -13,6 +10,9 @@ import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.OutletsVisitEJB;
import ibase.webitm.utility.ITMException;
public class OutletsVisitServlet extends HttpServlet public class OutletsVisitServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -27,9 +27,10 @@ public class OutletsVisitServlet extends HttpServlet ...@@ -27,9 +27,10 @@ public class OutletsVisitServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
OutletsVisitRemote outletVisitRemote = null; //OutletsVisitRemote outletVisitRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
OutletsVisitEJB outletsVisit = null;
String dataSourceName = ""; String dataSourceName = "";
String territory = ""; String territory = "";
String salesPerson = ""; String salesPerson = "";
...@@ -66,9 +67,12 @@ public class OutletsVisitServlet extends HttpServlet ...@@ -66,9 +67,12 @@ public class OutletsVisitServlet extends HttpServlet
System.out.println( "month is =" + month ); System.out.println( "month is =" + month );
System.out.println("year is =" + year ); System.out.println("year is =" + year );
System.out.println("reportName is =" + reportName ); System.out.println("reportName is =" + reportName );
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
outletVisitRemote = (OutletsVisitRemote)context.lookup("ibase/OutletsVisitEJB/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject)outletVisitRemote.getOutletVisitDetails(loginId,salesPerson,month,year,dataSourceName); //outletVisitRemote = (OutletsVisitRemote)context.lookup("ibase/OutletsVisitEJB/remote");
//JSONObject jsonObjData = (JSONObject)outletVisitRemote.getOutletVisitDetails(loginId,salesPerson,month,year,dataSourceName);
outletsVisit = new OutletsVisitEJB();
JSONObject jsonObjData = (JSONObject)outletsVisit.getOutletVisitDetails(loginId,salesPerson,month,year,dataSourceName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -86,7 +90,13 @@ public class OutletsVisitServlet extends HttpServlet ...@@ -86,7 +90,13 @@ public class OutletsVisitServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(outletsVisit != null)
{
outletsVisit = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ParticipentEventDetailServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.LiveEventDetailsRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.LiveEventDetails;
import ibase.webitm.utility.ITMException;
public class ParticipentEventDetailServlet extends HttpServlet public class ParticipentEventDetailServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -25,9 +26,10 @@ public class ParticipentEventDetailServlet extends HttpServlet ...@@ -25,9 +26,10 @@ public class ParticipentEventDetailServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
LiveEventDetailsRemote liveEventDetailsRemote = null; //LiveEventDetailsRemote liveEventDetailsRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
LiveEventDetails liveEventsDetails = null;
String dataSourceName = ""; String dataSourceName = "";
String eventCode = ""; String eventCode = "";
String participentCode = ""; String participentCode = "";
...@@ -49,9 +51,12 @@ public class ParticipentEventDetailServlet extends HttpServlet ...@@ -49,9 +51,12 @@ public class ParticipentEventDetailServlet extends HttpServlet
}*/ }*/
System.out.println("Final data set eventCode in ParticipentEventDetailServlet ==== "+participentCode); System.out.println("Final data set eventCode in ParticipentEventDetailServlet ==== "+participentCode);
System.out.println(" ParticipentEventDetailServlet Employee code or cell value level2 eventCode :"+eventCode+"----participentCode : "+participentCode) ; System.out.println(" ParticipentEventDetailServlet Employee code or cell value level2 eventCode :"+eventCode+"----participentCode : "+participentCode) ;
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
liveEventDetailsRemote = (LiveEventDetailsRemote) context.lookup("ibase/LiveEventDetails/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) liveEventDetailsRemote.getParticipentEventDetail(dataSourceName,eventCode,participentCode); //liveEventDetailsRemote = (LiveEventDetailsRemote) context.lookup("ibase/LiveEventDetails/remote");
//JSONObject jsonObjData = (JSONObject) liveEventDetailsRemote.getParticipentEventDetail(dataSourceName,eventCode,participentCode);
liveEventsDetails = new LiveEventDetails();
JSONObject jsonObjData = (JSONObject) liveEventsDetails.getParticipentEventDetail(dataSourceName,eventCode,participentCode);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -69,7 +74,13 @@ public class ParticipentEventDetailServlet extends HttpServlet ...@@ -69,7 +74,13 @@ public class ParticipentEventDetailServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(liveEventsDetails != null)
{
liveEventsDetails = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ParticipentEventMgrWiseDetailServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.LiveEventMgrWiseDetailsRemote;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext; import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
...@@ -14,6 +11,11 @@ import javax.servlet.http.HttpSession; ...@@ -14,6 +11,11 @@ import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.LiveEventMgrWiseDetails;
import ibase.dashboard.sfa.ejb.LiveEventMgrWiseDetailsRemote;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class ParticipentEventMgrWiseDetailServlet extends HttpServlet public class ParticipentEventMgrWiseDetailServlet extends HttpServlet
{ {
...@@ -24,9 +26,10 @@ public class ParticipentEventMgrWiseDetailServlet extends HttpServlet ...@@ -24,9 +26,10 @@ public class ParticipentEventMgrWiseDetailServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
LiveEventMgrWiseDetailsRemote liveEventDetailsRemote = null; //LiveEventMgrWiseDetailsRemote liveEventDetailsRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = null; //AppConnectParm appConnectParm = null;
LiveEventMgrWiseDetails liveEventMgrWiseDetails = null;
String dataSourceName = ""; String dataSourceName = "";
String eventCode = ""; String eventCode = "";
String participentCode = ""; String participentCode = "";
...@@ -37,7 +40,7 @@ public class ParticipentEventMgrWiseDetailServlet extends HttpServlet ...@@ -37,7 +40,7 @@ public class ParticipentEventMgrWiseDetailServlet extends HttpServlet
try try
{ {
response.setContentType("application/xml"); response.setContentType("application/xml");
appConnectParm = new AppConnectParm(); //appConnectParm = new AppConnectParm();
session = request.getSession(true); session = request.getSession(true);
userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO"); userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
loginId = userInfo.getLoginCode(); loginId = userInfo.getLoginCode();
...@@ -47,9 +50,12 @@ public class ParticipentEventMgrWiseDetailServlet extends HttpServlet ...@@ -47,9 +50,12 @@ public class ParticipentEventMgrWiseDetailServlet extends HttpServlet
rowsValue = request.getParameter("P1").trim(); rowsValue = request.getParameter("P1").trim();
System.out.println("Rows Value==="+rowsValue); System.out.println("Rows Value==="+rowsValue);
System.out.println("Employee code or cell value level2 eventCode :"+eventCode+"----participentCode : "+participentCode) ; System.out.println("Employee code or cell value level2 eventCode :"+eventCode+"----participentCode : "+participentCode) ;
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
liveEventDetailsRemote = (LiveEventMgrWiseDetailsRemote) context.lookup("ibase/LiveEventMgrWiseDetails/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) liveEventDetailsRemote.getParticipentEventDetail(dataSourceName,eventCode,participentCode,loginId); //liveEventDetailsRemote = (LiveEventMgrWiseDetailsRemote) context.lookup("ibase/LiveEventMgrWiseDetails/remote");
//JSONObject jsonObjData = (JSONObject) liveEventDetailsRemote.getParticipentEventDetail(dataSourceName,eventCode,participentCode,loginId);
liveEventMgrWiseDetails = new LiveEventMgrWiseDetails();
JSONObject jsonObjData = (JSONObject) liveEventMgrWiseDetails.getParticipentEventDetail(dataSourceName,eventCode,participentCode,loginId);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -67,5 +73,12 @@ public class ParticipentEventMgrWiseDetailServlet extends HttpServlet ...@@ -67,5 +73,12 @@ public class ParticipentEventMgrWiseDetailServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(liveEventMgrWiseDetails != null)
{
liveEventMgrWiseDetails = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ParticipentEventMgrWiseSummaryServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.LiveEventMgrWiseDetails;
import ibase.dashboard.sfa.ejb.LiveEventMgrWiseDetailsRemote; import ibase.dashboard.sfa.ejb.LiveEventMgrWiseDetailsRemote;
import ibase.system.config.AppConnectParm; import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean; import ibase.utility.UserInfoBean;
...@@ -24,9 +25,10 @@ public class ParticipentEventMgrWiseSummaryServlet extends HttpServlet ...@@ -24,9 +25,10 @@ public class ParticipentEventMgrWiseSummaryServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
LiveEventMgrWiseDetailsRemote liveEventDetailsRemote = null; //LiveEventMgrWiseDetailsRemote liveEventDetailsRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = null; //AppConnectParm appConnectParm = null;
LiveEventMgrWiseDetails liveEventMgrWiseDetails = null;
String dataSourceName = ""; String dataSourceName = "";
String eventCode = ""; String eventCode = "";
String rowsValue = ""; String rowsValue = "";
...@@ -38,20 +40,23 @@ public class ParticipentEventMgrWiseSummaryServlet extends HttpServlet ...@@ -38,20 +40,23 @@ public class ParticipentEventMgrWiseSummaryServlet extends HttpServlet
try try
{ {
response.setContentType("application/xml"); response.setContentType("application/xml");
appConnectParm = new AppConnectParm(); //appConnectParm = new AppConnectParm();
session = request.getSession(true); session = request.getSession(true);
userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO"); userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
loginId = userInfo.getLoginCode(); loginId = userInfo.getLoginCode();
appConnectParm = new AppConnectParm(); //appConnectParm = new AppConnectParm();
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
eventCode = request.getParameter("survey_templ"); eventCode = request.getParameter("survey_templ");
rowsValue = request.getParameter("P1").trim(); rowsValue = request.getParameter("P1").trim();
month = request.getParameter("month"); month = request.getParameter("month");
year = request.getParameter("year"); year = request.getParameter("year");
System.out.println("eventCode == "+eventCode+ "rowsValue=="+rowsValue); System.out.println("eventCode == "+eventCode+ "rowsValue=="+rowsValue);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
liveEventDetailsRemote = (LiveEventMgrWiseDetailsRemote) context.lookup("ibase/LiveEventMgrWiseDetails/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) liveEventDetailsRemote.getParticipentEventSummary(dataSourceName,eventCode,loginId); //liveEventDetailsRemote = (LiveEventMgrWiseDetailsRemote) context.lookup("ibase/LiveEventMgrWiseDetails/remote");
//JSONObject jsonObjData = (JSONObject) liveEventDetailsRemote.getParticipentEventSummary(dataSourceName,eventCode,loginId);
liveEventMgrWiseDetails = new LiveEventMgrWiseDetails();
JSONObject jsonObjData = (JSONObject) liveEventMgrWiseDetails.getParticipentEventSummary(dataSourceName,eventCode,loginId);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -69,5 +74,12 @@ public class ParticipentEventMgrWiseSummaryServlet extends HttpServlet ...@@ -69,5 +74,12 @@ public class ParticipentEventMgrWiseSummaryServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(liveEventMgrWiseDetails != null)
{
liveEventMgrWiseDetails = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ParticipentEventSummaryServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.LiveEventDetailsRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.LiveEventDetails;
import ibase.webitm.utility.ITMException;
public class ParticipentEventSummaryServlet extends HttpServlet public class ParticipentEventSummaryServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -25,9 +26,10 @@ public class ParticipentEventSummaryServlet extends HttpServlet ...@@ -25,9 +26,10 @@ public class ParticipentEventSummaryServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
LiveEventDetailsRemote liveEventDetailsRemote = null; //LiveEventDetailsRemote liveEventDetailsRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
LiveEventDetails liveEventsDetails = null;
String dataSourceName = ""; String dataSourceName = "";
String eventCode = ""; String eventCode = "";
String rowsValue = ""; String rowsValue = "";
...@@ -45,10 +47,12 @@ public class ParticipentEventSummaryServlet extends HttpServlet ...@@ -45,10 +47,12 @@ public class ParticipentEventSummaryServlet extends HttpServlet
}*/ }*/
System.out.println("Final data set eventCode in ParticipentEventSummaryServlet ==== "+eventCode); System.out.println("Final data set eventCode in ParticipentEventSummaryServlet ==== "+eventCode);
//Commented and added By Varsha V on 06-08-18 for removing lookup
context = new InitialContext(appConnectParm.getProperty()); //context = new InitialContext(appConnectParm.getProperty());
liveEventDetailsRemote = (LiveEventDetailsRemote) context.lookup("ibase/LiveEventDetails/remote"); //liveEventDetailsRemote = (LiveEventDetailsRemote) context.lookup("ibase/LiveEventDetails/remote");
JSONObject jsonObjData = (JSONObject) liveEventDetailsRemote.getParticipentEventSummary(dataSourceName,eventCode); //JSONObject jsonObjData = (JSONObject) liveEventDetailsRemote.getParticipentEventSummary(dataSourceName,eventCode);
liveEventsDetails = new LiveEventDetails();
JSONObject jsonObjData = (JSONObject) liveEventsDetails.getParticipentEventSummary(dataSourceName,eventCode);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -66,7 +70,13 @@ public class ParticipentEventSummaryServlet extends HttpServlet ...@@ -66,7 +70,13 @@ public class ParticipentEventSummaryServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(liveEventsDetails != null)
{
liveEventsDetails = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ParticipentProductDetailServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.LiveEventDetailsRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.LiveEventDetails;
import ibase.webitm.utility.ITMException;
public class ParticipentProductDetailServlet extends HttpServlet public class ParticipentProductDetailServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -25,9 +26,10 @@ public class ParticipentProductDetailServlet extends HttpServlet ...@@ -25,9 +26,10 @@ public class ParticipentProductDetailServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
LiveEventDetailsRemote liveEventDetailsRemote = null; //LiveEventDetailsRemote liveEventDetailsRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
LiveEventDetails liveEventsDetails = null;
String dataSourceName = ""; String dataSourceName = "";
String eventCode = ""; String eventCode = "";
String participentCode = ""; String participentCode = "";
...@@ -48,9 +50,12 @@ public class ParticipentProductDetailServlet extends HttpServlet ...@@ -48,9 +50,12 @@ public class ParticipentProductDetailServlet extends HttpServlet
}*/ }*/
System.out.println("Final data set eventCode in ParticipentProductDetailServlet ==== "+eventCode); System.out.println("Final data set eventCode in ParticipentProductDetailServlet ==== "+eventCode);
System.out.println(" ParticipentProductDetailServlet Employee code or cell value level2 eventCode :"+eventCode+"----participentCode : "+participentCode) ; System.out.println(" ParticipentProductDetailServlet Employee code or cell value level2 eventCode :"+eventCode+"----participentCode : "+participentCode) ;
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
liveEventDetailsRemote = (LiveEventDetailsRemote) context.lookup("ibase/LiveEventDetails/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) liveEventDetailsRemote.getParticipentProductDetail(dataSourceName,eventCode,participentCode); //liveEventDetailsRemote = (LiveEventDetailsRemote) context.lookup("ibase/LiveEventDetails/remote");
//JSONObject jsonObjData = (JSONObject) liveEventDetailsRemote.getParticipentProductDetail(dataSourceName,eventCode,participentCode);
liveEventsDetails = new LiveEventDetails();
JSONObject jsonObjData = (JSONObject) liveEventsDetails.getParticipentProductDetail(dataSourceName,eventCode,participentCode);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -68,7 +73,13 @@ public class ParticipentProductDetailServlet extends HttpServlet ...@@ -68,7 +73,13 @@ public class ParticipentProductDetailServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(liveEventsDetails != null)
{
liveEventsDetails = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ParticipentProductMgrWiseDetailServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.LiveEventMgrWiseDetailsRemote;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.LiveEventMgrWiseDetails;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class ParticipentProductMgrWiseDetailServlet extends HttpServlet public class ParticipentProductMgrWiseDetailServlet extends HttpServlet
{ {
...@@ -24,9 +25,10 @@ public class ParticipentProductMgrWiseDetailServlet extends HttpServlet ...@@ -24,9 +25,10 @@ public class ParticipentProductMgrWiseDetailServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
LiveEventMgrWiseDetailsRemote liveEventDetailsRemote = null; //LiveEventMgrWiseDetailsRemote liveEventDetailsRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = null; //AppConnectParm appConnectParm = null;
LiveEventMgrWiseDetails liveEventMgrWiseDetails = null;
String dataSourceName = ""; String dataSourceName = "";
String eventCode = ""; String eventCode = "";
String participentCode = ""; String participentCode = "";
...@@ -38,7 +40,7 @@ public class ParticipentProductMgrWiseDetailServlet extends HttpServlet ...@@ -38,7 +40,7 @@ public class ParticipentProductMgrWiseDetailServlet extends HttpServlet
try try
{ {
response.setContentType("application/xml"); response.setContentType("application/xml");
appConnectParm = new AppConnectParm(); //appConnectParm = new AppConnectParm();
session = request.getSession(true); session = request.getSession(true);
userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO"); userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
loginId = userInfo.getLoginCode(); loginId = userInfo.getLoginCode();
...@@ -47,9 +49,12 @@ public class ParticipentProductMgrWiseDetailServlet extends HttpServlet ...@@ -47,9 +49,12 @@ public class ParticipentProductMgrWiseDetailServlet extends HttpServlet
participentCode = request.getParameter("participants_code"); participentCode = request.getParameter("participants_code");
rowsValue = request.getParameter("P1").trim(); rowsValue = request.getParameter("P1").trim();
System.out.println(" ParticipentProductMgrWiseDetailServlet eventCode :"+eventCode+"----participentCode : "+participentCode+"loginId:"+loginId) ; System.out.println(" ParticipentProductMgrWiseDetailServlet eventCode :"+eventCode+"----participentCode : "+participentCode+"loginId:"+loginId) ;
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
liveEventDetailsRemote = (LiveEventMgrWiseDetailsRemote) context.lookup("ibase/LiveEventMgrWiseDetails/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) liveEventDetailsRemote.getParticipentProductDetail(dataSourceName,eventCode,participentCode,loginId); //liveEventDetailsRemote = (LiveEventMgrWiseDetailsRemote) context.lookup("ibase/LiveEventMgrWiseDetails/remote");
//JSONObject jsonObjData = (JSONObject) liveEventDetailsRemote.getParticipentProductDetail(dataSourceName,eventCode,participentCode,loginId);
liveEventMgrWiseDetails = new LiveEventMgrWiseDetails();
JSONObject jsonObjData = (JSONObject) liveEventMgrWiseDetails.getParticipentProductDetail(dataSourceName,eventCode,participentCode,loginId);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -67,5 +72,12 @@ public class ParticipentProductMgrWiseDetailServlet extends HttpServlet ...@@ -67,5 +72,12 @@ public class ParticipentProductMgrWiseDetailServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(liveEventMgrWiseDetails != null)
{
liveEventMgrWiseDetails = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/PendingStatusServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.PendingStatusRemote;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -17,6 +11,10 @@ import javax.servlet.http.HttpSession; ...@@ -17,6 +11,10 @@ import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.PendingStatus;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
public class PendingStatusServlet extends HttpServlet public class PendingStatusServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -30,9 +28,10 @@ public class PendingStatusServlet extends HttpServlet ...@@ -30,9 +28,10 @@ public class PendingStatusServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException throws IOException, ServletException
{ {
PendingStatusRemote gardeniaRemote = null; //PendingStatusRemote gardeniaRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
PendingStatus pendingStatus = null;
String dataSourceName = ""; String dataSourceName = "";
String loginId = ""; String loginId = "";
HttpSession session = null; HttpSession session = null;
...@@ -50,9 +49,12 @@ public class PendingStatusServlet extends HttpServlet ...@@ -50,9 +49,12 @@ public class PendingStatusServlet extends HttpServlet
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
//loginId="I99994"; //loginId="I99994";
System.out.println("loginId is =" + loginId); System.out.println("loginId is =" + loginId);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
gardeniaRemote = (PendingStatusRemote) context.lookup("ibase/PendingStatus/remote"); //context = new InitialContext(appConnectParm.getProperty());
jsonObjData = (JSONObject) gardeniaRemote.getPendingStatus(dataSourceName,loginId,empSite); //gardeniaRemote = (PendingStatusRemote) context.lookup("ibase/PendingStatus/remote");
//jsonObjData = (JSONObject) gardeniaRemote.getPendingStatus(dataSourceName,loginId,empSite);
pendingStatus = new PendingStatus();
jsonObjData = (JSONObject) pendingStatus.getPendingStatus(dataSourceName,loginId,empSite);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -71,6 +73,13 @@ public class PendingStatusServlet extends HttpServlet ...@@ -71,6 +73,13 @@ public class PendingStatusServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(pendingStatus != null)
{
pendingStatus = null;
}
}
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/PlanVsActualServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.PlanVsActualRemote;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.PlanVsActual;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
public class PlanVsActualServlet extends HttpServlet public class PlanVsActualServlet extends HttpServlet
{ {
...@@ -27,9 +26,10 @@ public class PlanVsActualServlet extends HttpServlet ...@@ -27,9 +26,10 @@ public class PlanVsActualServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException throws IOException, ServletException
{ {
PlanVsActualRemote planvsactualRemote = null; //PlanVsActualRemote planvsactualRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
PlanVsActual planVsActual = null;
String dataSourceName = ""; String dataSourceName = "";
String loginId = "",fromDate = "",salePersons = "", toDate = ""; String loginId = "",fromDate = "",salePersons = "", toDate = "";
HttpSession session = null; HttpSession session = null;
...@@ -53,11 +53,14 @@ public class PlanVsActualServlet extends HttpServlet ...@@ -53,11 +53,14 @@ public class PlanVsActualServlet extends HttpServlet
{ {
salePersons = loginId; salePersons = loginId;
} }
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
planvsactualRemote = (PlanVsActualRemote) context.lookup("ibase/PlanVsActual/remote"); //context = new InitialContext(appConnectParm.getProperty());
//planvsactualRemote = (PlanVsActualRemote) context.lookup("ibase/PlanVsActual/remote");
//Changed by Anjali R. on[28/02/2018][added dummy parameter to call new method] //Changed by Anjali R. on[28/02/2018][added dummy parameter to call new method]
//jsonObjData = planvsactualRemote.getPlanVsActualTreeStructure(dataSourceName,loginId,fromDate,toDate,salePersons); //jsonObjData = planvsactualRemote.getPlanVsActualTreeStructure(dataSourceName,loginId,fromDate,toDate,salePersons);
jsonObjData = planvsactualRemote.getPlanVsActualTreeStructure(dataSourceName,loginId,fromDate,toDate,salePersons,""); //jsonObjData = planvsactualRemote.getPlanVsActualTreeStructure(dataSourceName,loginId,fromDate,toDate,salePersons,"");
planVsActual = new PlanVsActual();
jsonObjData = planVsActual.getPlanVsActualTreeStructure(dataSourceName,loginId,fromDate,toDate,salePersons,"");
System.out.println(" Final data set for PlanVsActualServlet build the Graph is===" + jsonObjData); System.out.println(" Final data set for PlanVsActualServlet build the Graph is===" + jsonObjData);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
...@@ -77,6 +80,13 @@ public class PlanVsActualServlet extends HttpServlet ...@@ -77,6 +80,13 @@ public class PlanVsActualServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(planVsActual != null)
{
planVsActual = null;
}
}
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/ProductAssessmentEventServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.ProductAssessmentRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.ProductAssessment;
import ibase.webitm.utility.ITMException;
public class ProductAssessmentEventServlet extends HttpServlet public class ProductAssessmentEventServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -26,9 +27,10 @@ public class ProductAssessmentEventServlet extends HttpServlet ...@@ -26,9 +27,10 @@ public class ProductAssessmentEventServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
ProductAssessmentRemote productAssessmentRemote = null; //ProductAssessmentRemote productAssessmentRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
ProductAssessment productAssessment = null;
String dataSourceName = ""; String dataSourceName = "";
String loginId = ""; String loginId = "";
String zone =""; String zone ="";
...@@ -55,11 +57,13 @@ public class ProductAssessmentEventServlet extends HttpServlet ...@@ -55,11 +57,13 @@ public class ProductAssessmentEventServlet extends HttpServlet
System.out.println("in ProductAssessmentEventServlet zone :"+zone+"===== region :"+region +"dataSourceName: ="+dataSourceName); System.out.println("in ProductAssessmentEventServlet zone :"+zone+"===== region :"+region +"dataSourceName: ="+dataSourceName);
System.out.println("in ProductAssessmentEventServlet product :"+product+"===== team :"+team +"event: ="+event); System.out.println("in ProductAssessmentEventServlet product :"+product+"===== team :"+team +"event: ="+event);
//Commented and added By Varsha V on 06-08-18 for removing lookup
context = new InitialContext(appConnectParm.getProperty()); //context = new InitialContext(appConnectParm.getProperty());
productAssessmentRemote = (ProductAssessmentRemote) context.lookup("ibase/ProductAssessment/remote"); //productAssessmentRemote = (ProductAssessmentRemote) context.lookup("ibase/ProductAssessment/remote");
//JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getEmployeeEvents( loginId, dataSourceName, zone, region, product, team, event); //JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getEmployeeEvents( loginId, dataSourceName, zone, region, product, team, event);
JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getProductAssessmentEventServlet( loginId, dataSourceName, zone, region, product, team, event); //JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getProductAssessmentEventServlet( loginId, dataSourceName, zone, region, product, team, event);
productAssessment = new ProductAssessment();
JSONObject jsonObjData = (JSONObject) productAssessment.getProductAssessmentEventServlet( loginId, dataSourceName, zone, region, product, team, event);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -77,7 +81,13 @@ public class ProductAssessmentEventServlet extends HttpServlet ...@@ -77,7 +81,13 @@ public class ProductAssessmentEventServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(productAssessment != null)
{
productAssessment = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ProductAssessmentProductPieServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.ProductAssessmentRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import javax.servlet.http.HttpSession;
import ibase.dashboard.sfa.ejb.ProductAssessment;
import ibase.webitm.utility.ITMException;
public class ProductAssessmentProductPieServlet extends HttpServlet public class ProductAssessmentProductPieServlet extends HttpServlet
{ {
...@@ -26,9 +26,10 @@ public class ProductAssessmentProductPieServlet extends HttpServlet ...@@ -26,9 +26,10 @@ public class ProductAssessmentProductPieServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
ProductAssessmentRemote productAssessmentRemote = null; //ProductAssessmentRemote productAssessmentRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
ProductAssessment productAssessment = null;
String dataSourceName = ""; String dataSourceName = "";
String personName = ""; String personName = "";
try try
...@@ -37,11 +38,13 @@ public class ProductAssessmentProductPieServlet extends HttpServlet ...@@ -37,11 +38,13 @@ public class ProductAssessmentProductPieServlet extends HttpServlet
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
personName = request.getParameter("CELL_VAL"); personName = request.getParameter("CELL_VAL");
System.out.println(" ProductAssessmentProductPieServlet personName =" + personName + "===== dataSourceName :"+dataSourceName); System.out.println(" ProductAssessmentProductPieServlet personName =" + personName + "===== dataSourceName :"+dataSourceName);
//Commented and added By Varsha V on 06-08-18 for removing lookup
context = new InitialContext(appConnectParm.getProperty()); //context = new InitialContext(appConnectParm.getProperty());
productAssessmentRemote = (ProductAssessmentRemote) context.lookup("ibase/ProductAssessment/remote"); //productAssessmentRemote = (ProductAssessmentRemote) context.lookup("ibase/ProductAssessment/remote");
//JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getEmployeeProduct(dataSourceName,personName); //JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getEmployeeProduct(dataSourceName,personName);
JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getProductAssessmentProductPieServlet(dataSourceName,personName); //JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getProductAssessmentProductPieServlet(dataSourceName,personName);
productAssessment = new ProductAssessment();
JSONObject jsonObjData = (JSONObject) productAssessment.getProductAssessmentProductPieServlet(dataSourceName,personName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -61,7 +64,13 @@ public class ProductAssessmentProductPieServlet extends HttpServlet ...@@ -61,7 +64,13 @@ public class ProductAssessmentProductPieServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(productAssessment != null)
{
productAssessment = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ProductAssessmentProductRatingServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.ProductAssessmentRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import javax.servlet.http.HttpSession;
import ibase.dashboard.sfa.ejb.ProductAssessment;
import ibase.webitm.utility.ITMException;
public class ProductAssessmentProductRatingServlet extends HttpServlet public class ProductAssessmentProductRatingServlet extends HttpServlet
{ {
...@@ -26,9 +26,10 @@ public class ProductAssessmentProductRatingServlet extends HttpServlet ...@@ -26,9 +26,10 @@ public class ProductAssessmentProductRatingServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
ProductAssessmentRemote productAssessmentRemote = null; //ProductAssessmentRemote productAssessmentRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
ProductAssessment productAssessment = null;
String dataSourceName = ""; String dataSourceName = "";
String personName = ""; String personName = "";
String productName = ""; String productName = "";
...@@ -40,13 +41,15 @@ public class ProductAssessmentProductRatingServlet extends HttpServlet ...@@ -40,13 +41,15 @@ public class ProductAssessmentProductRatingServlet extends HttpServlet
productName = request.getParameter("productName"); productName = request.getParameter("productName");
System.out.println("personName =" + personName +"==== productName :"+productName); System.out.println("personName =" + personName +"==== productName :"+productName);
//Commented and added By Varsha V on 06-08-18 for removing lookup
context = new InitialContext(appConnectParm.getProperty()); //context = new InitialContext(appConnectParm.getProperty());
productAssessmentRemote = (ProductAssessmentRemote) context.lookup("ibase/ProductAssessment/remote"); //productAssessmentRemote = (ProductAssessmentRemote) context.lookup("ibase/ProductAssessment/remote");
System.out.println("in ProductAssessmentProductRatingServlet"); System.out.println("in ProductAssessmentProductRatingServlet");
//JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getEmployeeProductRating(dataSourceName,personName,productName); //JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getEmployeeProductRating(dataSourceName,personName,productName);
JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getProductAssessmentProductRatingServlet(dataSourceName,personName,productName); //JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getProductAssessmentProductRatingServlet(dataSourceName,personName,productName);
productAssessment = new ProductAssessment();
JSONObject jsonObjData = (JSONObject) productAssessment.getProductAssessmentProductRatingServlet(dataSourceName,personName,productName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -66,7 +69,13 @@ public class ProductAssessmentProductRatingServlet extends HttpServlet ...@@ -66,7 +69,13 @@ public class ProductAssessmentProductRatingServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(productAssessment != null)
{
productAssessment = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ProductAssessmentProductServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.ProductAssessmentRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import javax.servlet.http.HttpSession;
import ibase.dashboard.sfa.ejb.ProductAssessment;
import ibase.webitm.utility.ITMException;
public class ProductAssessmentProductServlet extends HttpServlet public class ProductAssessmentProductServlet extends HttpServlet
{ {
...@@ -26,9 +26,10 @@ public class ProductAssessmentProductServlet extends HttpServlet ...@@ -26,9 +26,10 @@ public class ProductAssessmentProductServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
ProductAssessmentRemote productAssessmentRemote = null; //ProductAssessmentRemote productAssessmentRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
ProductAssessment productAssessment = null;
String dataSourceName = ""; String dataSourceName = "";
String personName = ""; String personName = "";
try try
...@@ -38,11 +39,13 @@ public class ProductAssessmentProductServlet extends HttpServlet ...@@ -38,11 +39,13 @@ public class ProductAssessmentProductServlet extends HttpServlet
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
personName = request.getParameter("CELL_VAL"); personName = request.getParameter("CELL_VAL");
System.out.println(" ProductAssessmentProductServlet personName =" + personName + "===== dataSourceName :"+dataSourceName); System.out.println(" ProductAssessmentProductServlet personName =" + personName + "===== dataSourceName :"+dataSourceName);
//Commented and added By Varsha V on 06-08-18 for removing lookup
context = new InitialContext(appConnectParm.getProperty()); //context = new InitialContext(appConnectParm.getProperty());
productAssessmentRemote = (ProductAssessmentRemote) context.lookup("ibase/ProductAssessment/remote"); //productAssessmentRemote = (ProductAssessmentRemote) context.lookup("ibase/ProductAssessment/remote");
//JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getEmployeeProduct(dataSourceName,personName); //JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getEmployeeProduct(dataSourceName,personName);
JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getProductAssessmentProductServlet(dataSourceName,personName); //JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getProductAssessmentProductServlet(dataSourceName,personName);
productAssessment = new ProductAssessment();
JSONObject jsonObjData = (JSONObject) productAssessment.getProductAssessmentProductServlet(dataSourceName,personName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -62,7 +65,13 @@ public class ProductAssessmentProductServlet extends HttpServlet ...@@ -62,7 +65,13 @@ public class ProductAssessmentProductServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(productAssessment != null)
{
productAssessment = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ProductDetailServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.LiveEventDetailsRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.LiveEventDetails;
import ibase.webitm.utility.ITMException;
public class ProductDetailServlet extends HttpServlet public class ProductDetailServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -25,9 +26,10 @@ public class ProductDetailServlet extends HttpServlet ...@@ -25,9 +26,10 @@ public class ProductDetailServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
LiveEventDetailsRemote liveEventDetailsRemote = null; //LiveEventDetailsRemote liveEventDetailsRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
LiveEventDetails liveEventDetails = null;
String dataSourceName = ""; String dataSourceName = "";
String personName = ""; String personName = "";
String productName = ""; String productName = "";
...@@ -45,9 +47,12 @@ public class ProductDetailServlet extends HttpServlet ...@@ -45,9 +47,12 @@ public class ProductDetailServlet extends HttpServlet
newTranId = request.getParameter("newTranId"); newTranId = request.getParameter("newTranId");
System.out.println("uniqueCode==="+uniqueCode); System.out.println("uniqueCode==="+uniqueCode);
System.out.println(" ProductDetailServlet uniqueCode ="+uniqueCode+"=== personName =" + personName + "===== dataSourceName :"+dataSourceName); System.out.println(" ProductDetailServlet uniqueCode ="+uniqueCode+"=== personName =" + personName + "===== dataSourceName :"+dataSourceName);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
liveEventDetailsRemote = (LiveEventDetailsRemote) context.lookup("ibase/LiveEventDetails/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) liveEventDetailsRemote.getProductDetail(dataSourceName,personName,productName,uniqueCode,eventCode,newTranId); //liveEventDetailsRemote = (LiveEventDetailsRemote) context.lookup("ibase/LiveEventDetails/remote");
//JSONObject jsonObjData = (JSONObject) liveEventDetailsRemote.getProductDetail(dataSourceName,personName,productName,uniqueCode,eventCode,newTranId);
liveEventDetails = new LiveEventDetails();
JSONObject jsonObjData = (JSONObject) liveEventDetails.getProductDetail(dataSourceName,personName,productName,uniqueCode,eventCode,newTranId);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -65,7 +70,13 @@ public class ProductDetailServlet extends HttpServlet ...@@ -65,7 +70,13 @@ public class ProductDetailServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(liveEventDetails != null)
{
liveEventDetails = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/ProductMgrWiseDetailServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.LiveEventMgrWiseDetailsRemote;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -14,6 +10,10 @@ import javax.servlet.http.HttpSession; ...@@ -14,6 +10,10 @@ import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.LiveEventMgrWiseDetails;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class ProductMgrWiseDetailServlet extends HttpServlet public class ProductMgrWiseDetailServlet extends HttpServlet
{ {
...@@ -24,9 +24,10 @@ public class ProductMgrWiseDetailServlet extends HttpServlet ...@@ -24,9 +24,10 @@ public class ProductMgrWiseDetailServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
LiveEventMgrWiseDetailsRemote liveEventDetailsRemote = null; //LiveEventMgrWiseDetailsRemote liveEventDetailsRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = null; //AppConnectParm appConnectParm = null;
LiveEventMgrWiseDetails liveEventMgrWiseDetails = null;
String dataSourceName = ""; String dataSourceName = "";
String personName = ""; String personName = "";
String productName = ""; String productName = "";
...@@ -43,7 +44,7 @@ public class ProductMgrWiseDetailServlet extends HttpServlet ...@@ -43,7 +44,7 @@ public class ProductMgrWiseDetailServlet extends HttpServlet
session = request.getSession(true); session = request.getSession(true);
userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO"); userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
loginId = userInfo.getLoginCode(); loginId = userInfo.getLoginCode();
appConnectParm = new AppConnectParm(); //appConnectParm = new AppConnectParm();
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
personName = request.getParameter("personName"); personName = request.getParameter("personName");
productName = request.getParameter("productName"); productName = request.getParameter("productName");
...@@ -51,9 +52,12 @@ public class ProductMgrWiseDetailServlet extends HttpServlet ...@@ -51,9 +52,12 @@ public class ProductMgrWiseDetailServlet extends HttpServlet
eventCode = request.getParameter("eventCode"); eventCode = request.getParameter("eventCode");
newTranId = request.getParameter("newTranId"); newTranId = request.getParameter("newTranId");
System.out.println(" ProductMgrWiseDetailServlet uniqueCode ="+uniqueCode+"=== personName =" + personName + "===== dataSourceName :"+dataSourceName); System.out.println(" ProductMgrWiseDetailServlet uniqueCode ="+uniqueCode+"=== personName =" + personName + "===== dataSourceName :"+dataSourceName);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
liveEventDetailsRemote = (LiveEventMgrWiseDetailsRemote) context.lookup("ibase/LiveEventMgrWiseDetails/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) liveEventDetailsRemote.getProductDetail(dataSourceName,personName,productName,uniqueCode,eventCode,loginId,newTranId); //liveEventDetailsRemote = (LiveEventMgrWiseDetailsRemote) context.lookup("ibase/LiveEventMgrWiseDetails/remote");
//JSONObject jsonObjData = (JSONObject) liveEventDetailsRemote.getProductDetail(dataSourceName,personName,productName,uniqueCode,eventCode,loginId,newTranId);
liveEventMgrWiseDetails = new LiveEventMgrWiseDetails();
JSONObject jsonObjData = (JSONObject) liveEventMgrWiseDetails.getProductDetail(dataSourceName,personName,productName,uniqueCode,eventCode,loginId,newTranId);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -71,7 +75,13 @@ public class ProductMgrWiseDetailServlet extends HttpServlet ...@@ -71,7 +75,13 @@ public class ProductMgrWiseDetailServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(liveEventMgrWiseDetails != null)
{
liveEventMgrWiseDetails = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/RSRScoreServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.RSRScoreRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -15,6 +10,9 @@ import javax.servlet.http.HttpSession; ...@@ -15,6 +10,9 @@ import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.RSRScoreEJB;
import ibase.webitm.utility.ITMException;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class RSRScoreServlet extends HttpServlet public class RSRScoreServlet extends HttpServlet
{ {
...@@ -28,9 +26,10 @@ public class RSRScoreServlet extends HttpServlet ...@@ -28,9 +26,10 @@ public class RSRScoreServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
System.out.println("inside RSRScoreServlet servlet"); System.out.println("inside RSRScoreServlet servlet");
RSRScoreRemote rsrScoreRemote = null; //RSRScoreRemote rsrScoreRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
RSRScoreEJB rSRScoreEJB = null;
String dataSourceName = ""; String dataSourceName = "";
String loginId = ""; String loginId = "";
String salesPerson = ""; String salesPerson = "";
...@@ -62,9 +61,12 @@ public class RSRScoreServlet extends HttpServlet ...@@ -62,9 +61,12 @@ public class RSRScoreServlet extends HttpServlet
System.out.println("year is =" + year ); System.out.println("year is =" + year );
System.out.println("loginId--"+loginId); System.out.println("loginId--"+loginId);
System.out.println("reportName is =" + reportName ); System.out.println("reportName is =" + reportName );
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
rsrScoreRemote = (RSRScoreRemote)context.lookup("ibase/RSRScoreEJB/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject)rsrScoreRemote.getRSRScoreDetails(salesPerson,month,year,dataSourceName); //rsrScoreRemote = (RSRScoreRemote)context.lookup("ibase/RSRScoreEJB/remote");
//JSONObject jsonObjData = (JSONObject)rsrScoreRemote.getRSRScoreDetails(salesPerson,month,year,dataSourceName);
rSRScoreEJB = new RSRScoreEJB();
JSONObject jsonObjData = (JSONObject)rSRScoreEJB.getRSRScoreDetails(salesPerson,month,year,dataSourceName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -82,6 +84,13 @@ public class RSRScoreServlet extends HttpServlet ...@@ -82,6 +84,13 @@ public class RSRScoreServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(rSRScoreEJB != null)
{
rSRScoreEJB = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/RSRSurveyServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.RSRSurveyRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.RSRSurveyEJB;
import ibase.webitm.utility.ITMException;
public class RSRSurveyServlet extends HttpServlet public class RSRSurveyServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -26,9 +27,10 @@ public class RSRSurveyServlet extends HttpServlet ...@@ -26,9 +27,10 @@ public class RSRSurveyServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
RSRSurveyRemote rsrSurveyRemote = null; //RSRSurveyRemote rsrSurveyRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
RSRSurveyEJB rSRSurveyEJB = null;
String dataSourceName = ""; String dataSourceName = "";
String salesPerson = ""; String salesPerson = "";
String month=""; String month="";
...@@ -62,9 +64,12 @@ public class RSRSurveyServlet extends HttpServlet ...@@ -62,9 +64,12 @@ public class RSRSurveyServlet extends HttpServlet
System.out.println( "month is =" + month ); System.out.println( "month is =" + month );
System.out.println("year is =" + year ); System.out.println("year is =" + year );
System.out.println("reportName is =" + reportName ); System.out.println("reportName is =" + reportName );
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
rsrSurveyRemote = (RSRSurveyRemote) context.lookup("ibase/RSRSurveyEJB/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject)rsrSurveyRemote.getRSRSurveyDetails(loginId,salesPerson,month,year,dataSourceName); //rsrSurveyRemote = (RSRSurveyRemote) context.lookup("ibase/RSRSurveyEJB/remote");
//JSONObject jsonObjData = (JSONObject)rsrSurveyRemote.getRSRSurveyDetails(loginId,salesPerson,month,year,dataSourceName);
rSRSurveyEJB = new RSRSurveyEJB();
JSONObject jsonObjData = (JSONObject)rSRSurveyEJB.getRSRSurveyDetails(loginId,salesPerson,month,year,dataSourceName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -82,7 +87,13 @@ public class RSRSurveyServlet extends HttpServlet ...@@ -82,7 +87,13 @@ public class RSRSurveyServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(rSRSurveyEJB != null)
{
rSRSurveyEJB = null;
}
}
} }
......
webitm-dashboard/ibase/dashboard/sfa/servlet/RXSurveyServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.RXSurveyRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -13,6 +10,9 @@ import javax.servlet.http.HttpSession; ...@@ -13,6 +10,9 @@ import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.RXSurveyEJB;
import ibase.webitm.utility.ITMException;
public class RXSurveyServlet extends HttpServlet public class RXSurveyServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -27,9 +27,10 @@ public class RXSurveyServlet extends HttpServlet ...@@ -27,9 +27,10 @@ public class RXSurveyServlet extends HttpServlet
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
RXSurveyRemote rxSurveyRemote = null; //RXSurveyRemote rxSurveyRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
RXSurveyEJB rXSurvey = null;
String dataSourceName = ""; String dataSourceName = "";
String salesPerson = ""; String salesPerson = "";
String month=""; String month="";
...@@ -64,9 +65,12 @@ public class RXSurveyServlet extends HttpServlet ...@@ -64,9 +65,12 @@ public class RXSurveyServlet extends HttpServlet
System.out.println( "month is =" + month ); System.out.println( "month is =" + month );
System.out.println("year is =" + year ); System.out.println("year is =" + year );
System.out.println("reportName is =" + reportName ); System.out.println("reportName is =" + reportName );
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
rxSurveyRemote = (RXSurveyRemote)context.lookup("ibase/RXSurveyEJB/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject)rxSurveyRemote.getRXSurveyDetails(loginId,salesPerson,month,year,dataSourceName); //rxSurveyRemote = (RXSurveyRemote)context.lookup("ibase/RXSurveyEJB/remote");
//JSONObject jsonObjData = (JSONObject)rxSurveyRemote.getRXSurveyDetails(loginId,salesPerson,month,year,dataSourceName);
rXSurvey = new RXSurveyEJB();
JSONObject jsonObjData = (JSONObject)rXSurvey.getRXSurveyDetails(loginId,salesPerson,month,year,dataSourceName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -84,7 +88,13 @@ public class RXSurveyServlet extends HttpServlet ...@@ -84,7 +88,13 @@ public class RXSurveyServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(rXSurvey != null)
{
rXSurvey = null;
}
}
} }
......
webitm-dashboard/ibase/dashboard/sfa/servlet/RejectionTemplDetServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.RejectionTemplSummaryRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -15,6 +10,9 @@ import javax.servlet.http.HttpServletResponse; ...@@ -15,6 +10,9 @@ import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.RejectionTemplSummary;
import ibase.webitm.utility.ITMException;
public class RejectionTemplDetServlet extends HttpServlet public class RejectionTemplDetServlet extends HttpServlet
{ {
...@@ -30,9 +28,10 @@ public class RejectionTemplDetServlet extends HttpServlet ...@@ -30,9 +28,10 @@ public class RejectionTemplDetServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
RejectionTemplSummaryRemote rejectionRemote = null; //RejectionTemplSummaryRemote rejectionRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
RejectionTemplSummary rejectionTemplSummary = null;
String dataSourceName = ""; String dataSourceName = "";
String templateID = "", fromDate = "", toDate = ""; String templateID = "", fromDate = "", toDate = "";
try try
...@@ -43,9 +42,12 @@ public class RejectionTemplDetServlet extends HttpServlet ...@@ -43,9 +42,12 @@ public class RejectionTemplDetServlet extends HttpServlet
fromDate = request.getParameter("fromDate"); fromDate = request.getParameter("fromDate");
toDate = request.getParameter("toDate"); toDate = request.getParameter("toDate");
System.out.println("Template ID====="+templateID +"fromDate==="+fromDate+"toDate=="+toDate); System.out.println("Template ID====="+templateID +"fromDate==="+fromDate+"toDate=="+toDate);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
rejectionRemote = (RejectionTemplSummaryRemote) context.lookup("ibase/RejectionTemplSummary/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) rejectionRemote.getTemplDetail(dataSourceName,fromDate,toDate,templateID); //rejectionRemote = (RejectionTemplSummaryRemote) context.lookup("ibase/RejectionTemplSummary/remote");
//JSONObject jsonObjData = (JSONObject) rejectionRemote.getTemplDetail(dataSourceName,fromDate,toDate,templateID);
rejectionTemplSummary = new RejectionTemplSummary();
JSONObject jsonObjData = (JSONObject) rejectionTemplSummary.getTemplDetail(dataSourceName,fromDate,toDate,templateID);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -65,7 +67,13 @@ public class RejectionTemplDetServlet extends HttpServlet ...@@ -65,7 +67,13 @@ public class RejectionTemplDetServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(rejectionTemplSummary != null)
{
rejectionTemplSummary = null;
}
}
} }
......
webitm-dashboard/ibase/dashboard/sfa/servlet/RejectionTemplSummServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.RejectionTemplSummaryRemote;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -14,6 +10,10 @@ import javax.servlet.http.HttpSession; ...@@ -14,6 +10,10 @@ import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.RejectionTemplSummary;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
public class RejectionTemplSummServlet extends HttpServlet public class RejectionTemplSummServlet extends HttpServlet
{ {
...@@ -30,9 +30,10 @@ public class RejectionTemplSummServlet extends HttpServlet ...@@ -30,9 +30,10 @@ public class RejectionTemplSummServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
RejectionTemplSummaryRemote rejectionRemote = null; //RejectionTemplSummaryRemote rejectionRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
RejectionTemplSummary rejectionTemplSummary = null;
String dataSourceName = ""; String dataSourceName = "";
String projectmngr = "", fromDate = "", toDate = ""; String projectmngr = "", fromDate = "", toDate = "";
HttpSession session = null; HttpSession session = null;
...@@ -50,10 +51,12 @@ public class RejectionTemplSummServlet extends HttpServlet ...@@ -50,10 +51,12 @@ public class RejectionTemplSummServlet extends HttpServlet
userInfo = (UserInfoBean) session.getAttribute("USER_INFO"); userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
projectmngr = userInfo.getEmpCode(); projectmngr = userInfo.getEmpCode();
} }
//Commented and added By Varsha V on 06-08-18 for removing lookup
context = new InitialContext(appConnectParm.getProperty()); //context = new InitialContext(appConnectParm.getProperty());
rejectionRemote = (RejectionTemplSummaryRemote) context.lookup("ibase/RejectionTemplSummary/remote"); //rejectionRemote = (RejectionTemplSummaryRemote) context.lookup("ibase/RejectionTemplSummary/remote");
JSONObject jsonObjData = (JSONObject) rejectionRemote.getTemplSummary(dataSourceName,fromDate,toDate,projectmngr); //JSONObject jsonObjData = (JSONObject) rejectionRemote.getTemplSummary(dataSourceName,fromDate,toDate,projectmngr);
rejectionTemplSummary = new RejectionTemplSummary();
JSONObject jsonObjData = (JSONObject) rejectionTemplSummary.getTemplSummary(dataSourceName,fromDate,toDate,projectmngr);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -73,6 +76,12 @@ public class RejectionTemplSummServlet extends HttpServlet ...@@ -73,6 +76,12 @@ public class RejectionTemplSummServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(rejectionTemplSummary != null)
{
rejectionTemplSummary = null;
}
}
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/TargetVsAchievementServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.TargetVsAchievementRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.TargetVsAchievement;
import ibase.webitm.utility.ITMException;
public class TargetVsAchievementServlet extends HttpServlet public class TargetVsAchievementServlet extends HttpServlet
{ {
...@@ -27,9 +27,10 @@ import org.json.simple.JSONObject; ...@@ -27,9 +27,10 @@ import org.json.simple.JSONObject;
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException throws IOException, ServletException
{ {
TargetVsAchievementRemote targetVsAchievement = null; //TargetVsAchievementRemote targetVsAchievement = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
TargetVsAchievement targetVsAchievement = null;
String dataSourceName = ""; String dataSourceName = "";
String defaultPreCode = ""; String defaultPreCode = "";
String empCode = ""; String empCode = "";
...@@ -40,17 +41,20 @@ import org.json.simple.JSONObject; ...@@ -40,17 +41,20 @@ import org.json.simple.JSONObject;
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
defaultPreCode = request.getParameter("PRD_SALESDASH"); defaultPreCode = request.getParameter("PRD_SALESDASH");
//Create seesion for getting Login Employee Code from session //Create seesion for getting Login Employee Code from session
HttpSession session = request.getSession(true); HttpSession session = request.getSession(true);
ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO"); ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
empCode = userInfo.getEmpCode(); empCode = userInfo.getEmpCode();
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
targetVsAchievement = (TargetVsAchievementRemote)context.lookup("ibase/TargetVsAchievement/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = targetVsAchievement.getTargetVsAchievement(dataSourceName,defaultPreCode,empCode); //targetVsAchievement = (TargetVsAchievementRemote)context.lookup("ibase/TargetVsAchievement/remote");
OutputStream outputStream = response.getOutputStream(); //JSONObject jsonObjData = targetVsAchievement.getTargetVsAchievement(dataSourceName,defaultPreCode,empCode);
outputStream.write(jsonObjData.toString().getBytes()); targetVsAchievement = new TargetVsAchievement();
outputStream.flush(); JSONObject jsonObjData = targetVsAchievement.getTargetVsAchievement(dataSourceName,defaultPreCode,empCode);
outputStream.close(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush();
outputStream.close();
} }
catch (Exception e) catch (Exception e)
{ {
...@@ -63,6 +67,13 @@ import org.json.simple.JSONObject; ...@@ -63,6 +67,13 @@ import org.json.simple.JSONObject;
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(targetVsAchievement != null)
{
targetVsAchievement = null;
}
}
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/TaskActivityServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.TaskActivityRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.TaskActivity;
import ibase.webitm.utility.ITMException;
public class TaskActivityServlet extends HttpServlet public class TaskActivityServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -23,9 +24,10 @@ public class TaskActivityServlet extends HttpServlet ...@@ -23,9 +24,10 @@ public class TaskActivityServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
TaskActivityRemote taskActivityRemote = null; //TaskActivityRemote taskActivityRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
TaskActivity taskActivity = null;
String dataSourceName = ""; String dataSourceName = "";
String month = ""; String month = "";
try try
...@@ -35,9 +37,12 @@ public class TaskActivityServlet extends HttpServlet ...@@ -35,9 +37,12 @@ public class TaskActivityServlet extends HttpServlet
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
month = request.getParameter("month"); month = request.getParameter("month");
System.out.println( "month is =" + month ); System.out.println( "month is =" + month );
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
taskActivityRemote = (TaskActivityRemote) context.lookup("ibase/TaskActivity/remote"); //context = new InitialContext(appConnectParm.getProperty());
JSONObject jsonObjData = (JSONObject) taskActivityRemote.getTask(dataSourceName,month); //taskActivityRemote = (TaskActivityRemote) context.lookup("ibase/TaskActivity/remote");
//JSONObject jsonObjData = (JSONObject) taskActivityRemote.getTask(dataSourceName,month);
taskActivity = new TaskActivity();
JSONObject jsonObjData = (JSONObject) taskActivity.getTask(dataSourceName,month);
/*String jsonObjData= "{'0':{'acct_descr':'CONSIGNMENT ACKNOWLEDGEMENT','det':'R000000168 # DATED # 03-JUL-15 <Br> R000000164 # DATED # 11-JUN-15','tag':'D','month':'','pndig':98,'descr':'R000000168 # DATED # 03-JUL-15 , R000000164 # DATED # 11-JUN-15','completed':2},'1':{'acct_descr':'RECEIPT','det':'R000000150 # DATED # 05-JAN-15 <Br> R000000165 # DATED # 18-JUN-15 <Br> R000000171 # DATED # 09-JUL-15 <Br> R000000170 # DATED # 09-JUL-15 <Br> R000000169 # DATED # 03-JUL-15 <Br> R000000163 # DATED # 17-APR-15 <Br> R000000162 # DATED # 17-APR-15 <Br> R000000152 # DATED # 05-JAN-15 <Br> R000000151 # DATED # 05-JAN-15 <Br> R000000149 # DATED # 05-JAN-15 <Br> R000000148 # DATED # 05-JAN-15 <Br> R000000158 # DATED # 06-JAN-15 <Br> R000000157 # DATED # 06-JAN-15 <Br> R000000159 # DATED # 06-JAN-15 <Br> R000000156 # DATED # 06-JAN-15 <Br> R000000155 # DATED # 06-JAN-15 <Br> R000000154 # DATED # 05-JAN-15','tag':'F','month':'','pndig':83,'descr':'R000000150 # DATED # 05-JAN-15 , R000000165 # DATED # 18-JUN-15 ','completed':17},'2':{'acct_descr':'ADJUSTMENT RECEIPT','det':'A000000129 # DATED # 24-DEC-14 <Br> A000000083 # DATED # 18-OCT-14 <Br> A000000095 # DATED # 03-NOV-14 <Br> A000000082 # DATED # 18-OCT-14 <Br> A000000134 # DATED # 08-JUN-15 <Br> A000000132 # DATED # 08-MAY-15 <Br> A000000130 # DATED # 05-JAN-15 <Br> A000000133 # DATED # 08-MAY-15 <Br> A000000109 # DATED # 20-DEC-14 <Br> A000000135 # DATED # 26-JUN-15 <Br> A000000121 # DATED # 24-DEC-14 <Br> A000000122 # DATED # 24-DEC-14 <Br> A000000125 # DATED # 24-DEC-14 <Br> A000000126 # DATED # 24-DEC-14 <Br> A000000127 # DATED # 24-DEC-14 <Br> A000000128 # DATED # 24-DEC-14 <Br> A000000124 # DATED # 24-DEC-14 <Br> A000000102 # DATED # 12-NOV-14 <Br> A000000101 # DATED # 12-NOV-14 <Br> A000000123 # DATED # 24-DEC-14 <Br> A000000100 # DATED # 12-NOV-14 <Br> A000000097 # DATED # 06-NOV-14 <Br> A000000098 # DATED # 06-NOV-14 <Br> A000000099 # DATED # 11-NOV-14 <Br> A000000092 # DATED # 20-OCT-14 <Br> A000000091 # DATED # 20-OCT-14 <Br> A000000107 # DATED # 05-DEC-14 <Br> A000000106 # DATED # 05-DEC-14 <Br> A000000108 # DATED # 17-DEC-14 <Br> A000000118 # DATED # 24-DEC-14 <Br> A000000116 # DATED # 22-DEC-14 <Br> A000000119 # DATED # 24-DEC-14','tag':'H','month':'','pndig':68,'descr':'A000000129 # DATED # 24-DEC-14 , A000000083 # DATED # 18-OCT-14 ','completed':32}}"; /*String jsonObjData= "{'0':{'acct_descr':'CONSIGNMENT ACKNOWLEDGEMENT','det':'R000000168 # DATED # 03-JUL-15 <Br> R000000164 # DATED # 11-JUN-15','tag':'D','month':'','pndig':98,'descr':'R000000168 # DATED # 03-JUL-15 , R000000164 # DATED # 11-JUN-15','completed':2},'1':{'acct_descr':'RECEIPT','det':'R000000150 # DATED # 05-JAN-15 <Br> R000000165 # DATED # 18-JUN-15 <Br> R000000171 # DATED # 09-JUL-15 <Br> R000000170 # DATED # 09-JUL-15 <Br> R000000169 # DATED # 03-JUL-15 <Br> R000000163 # DATED # 17-APR-15 <Br> R000000162 # DATED # 17-APR-15 <Br> R000000152 # DATED # 05-JAN-15 <Br> R000000151 # DATED # 05-JAN-15 <Br> R000000149 # DATED # 05-JAN-15 <Br> R000000148 # DATED # 05-JAN-15 <Br> R000000158 # DATED # 06-JAN-15 <Br> R000000157 # DATED # 06-JAN-15 <Br> R000000159 # DATED # 06-JAN-15 <Br> R000000156 # DATED # 06-JAN-15 <Br> R000000155 # DATED # 06-JAN-15 <Br> R000000154 # DATED # 05-JAN-15','tag':'F','month':'','pndig':83,'descr':'R000000150 # DATED # 05-JAN-15 , R000000165 # DATED # 18-JUN-15 ','completed':17},'2':{'acct_descr':'ADJUSTMENT RECEIPT','det':'A000000129 # DATED # 24-DEC-14 <Br> A000000083 # DATED # 18-OCT-14 <Br> A000000095 # DATED # 03-NOV-14 <Br> A000000082 # DATED # 18-OCT-14 <Br> A000000134 # DATED # 08-JUN-15 <Br> A000000132 # DATED # 08-MAY-15 <Br> A000000130 # DATED # 05-JAN-15 <Br> A000000133 # DATED # 08-MAY-15 <Br> A000000109 # DATED # 20-DEC-14 <Br> A000000135 # DATED # 26-JUN-15 <Br> A000000121 # DATED # 24-DEC-14 <Br> A000000122 # DATED # 24-DEC-14 <Br> A000000125 # DATED # 24-DEC-14 <Br> A000000126 # DATED # 24-DEC-14 <Br> A000000127 # DATED # 24-DEC-14 <Br> A000000128 # DATED # 24-DEC-14 <Br> A000000124 # DATED # 24-DEC-14 <Br> A000000102 # DATED # 12-NOV-14 <Br> A000000101 # DATED # 12-NOV-14 <Br> A000000123 # DATED # 24-DEC-14 <Br> A000000100 # DATED # 12-NOV-14 <Br> A000000097 # DATED # 06-NOV-14 <Br> A000000098 # DATED # 06-NOV-14 <Br> A000000099 # DATED # 11-NOV-14 <Br> A000000092 # DATED # 20-OCT-14 <Br> A000000091 # DATED # 20-OCT-14 <Br> A000000107 # DATED # 05-DEC-14 <Br> A000000106 # DATED # 05-DEC-14 <Br> A000000108 # DATED # 17-DEC-14 <Br> A000000118 # DATED # 24-DEC-14 <Br> A000000116 # DATED # 22-DEC-14 <Br> A000000119 # DATED # 24-DEC-14','tag':'H','month':'','pndig':68,'descr':'A000000129 # DATED # 24-DEC-14 , A000000083 # DATED # 18-OCT-14 ','completed':32}}";
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().replace('\'', '"').getBytes()); outputStream.write(jsonObjData.toString().replace('\'', '"').getBytes());
...@@ -60,6 +65,13 @@ public class TaskActivityServlet extends HttpServlet ...@@ -60,6 +65,13 @@ public class TaskActivityServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(taskActivity != null)
{
taskActivity = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/TaskTrackingServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.TaskTrackingRemote;
import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.TaskTracking;
import ibase.webitm.utility.ITMException;
public class TaskTrackingServlet extends HttpServlet public class TaskTrackingServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -25,9 +26,10 @@ public class TaskTrackingServlet extends HttpServlet ...@@ -25,9 +26,10 @@ public class TaskTrackingServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
TaskTrackingRemote taskActivityRemote = null; //TaskTrackingRemote taskActivityRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
TaskTracking taskTracking = null;
String dataSourceName = ""; String dataSourceName = "";
String groupId = ""; String groupId = "";
String userId = ""; String userId = "";
...@@ -44,11 +46,13 @@ public class TaskTrackingServlet extends HttpServlet ...@@ -44,11 +46,13 @@ public class TaskTrackingServlet extends HttpServlet
System.out.println("in TaskTrackingServlet groupId :"+groupId+"----userId :"+userId); System.out.println("in TaskTrackingServlet groupId :"+groupId+"----userId :"+userId);
//Commented and added By Varsha V on 06-08-18 for removing lookup
context = new InitialContext(appConnectParm.getProperty()); //context = new InitialContext(appConnectParm.getProperty());
taskActivityRemote = (TaskTrackingRemote) context.lookup("ibase/TaskTracking/remote"); //taskActivityRemote = (TaskTrackingRemote) context.lookup("ibase/TaskTracking/remote");
JSONObject jsonObjData = (JSONObject) taskActivityRemote.getTask( dataSourceName,groupId,userId); //JSONObject jsonObjData = (JSONObject) taskActivityRemote.getTask( dataSourceName,groupId,userId);
OutputStream outputStream = response.getOutputStream(); taskTracking = new TaskTracking();
JSONObject jsonObjData = (JSONObject) taskTracking.getTask( dataSourceName,groupId,userId);
OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
outputStream.close(); outputStream.close();
...@@ -64,6 +68,13 @@ public class TaskTrackingServlet extends HttpServlet ...@@ -64,6 +68,13 @@ public class TaskTrackingServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(taskTracking != null)
{
taskTracking = null;
}
}
} }
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/sfa/servlet/TodayAgendaServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.PlanVsActualRemote;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.PlanVsActual;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
public class TodayAgendaServlet extends HttpServlet public class TodayAgendaServlet extends HttpServlet
{ {
...@@ -27,9 +26,10 @@ public class TodayAgendaServlet extends HttpServlet ...@@ -27,9 +26,10 @@ public class TodayAgendaServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException throws IOException, ServletException
{ {
PlanVsActualRemote planvsactualRemote = null; //PlanVsActualRemote planvsactualRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
PlanVsActual planVsActual = null;
String dataSourceName = ""; String dataSourceName = "";
String loginId = ""; String loginId = "";
String salePersons = ""; String salePersons = "";
...@@ -52,11 +52,14 @@ public class TodayAgendaServlet extends HttpServlet ...@@ -52,11 +52,14 @@ public class TodayAgendaServlet extends HttpServlet
{ {
salePersons = loginId; salePersons = loginId;
}*/ }*/
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
planvsactualRemote = (PlanVsActualRemote) context.lookup("ibase/PlanVsActual/remote"); //context = new InitialContext(appConnectParm.getProperty());
//planvsactualRemote = (PlanVsActualRemote) context.lookup("ibase/PlanVsActual/remote");
//Changed by Anjali R. on[28/02/2018][added dummy parameter to call new method] //Changed by Anjali R. on[28/02/2018][added dummy parameter to call new method]
//jsonObjData = planvsactualRemote.getTodayAgenda(dataSourceName,loginId,salePersons); //jsonObjData = planvsactualRemote.getTodayAgenda(dataSourceName,loginId,salePersons);
jsonObjData = planvsactualRemote.getTodayAgenda(dataSourceName,loginId,salePersons,""); //jsonObjData = planvsactualRemote.getTodayAgenda(dataSourceName,loginId,salePersons,"");
planVsActual = new PlanVsActual();
jsonObjData = planVsActual.getTodayAgenda(dataSourceName,loginId,salePersons,"");
System.out.println(" Final data set for TodayAgendaServlet build the Graph is===" + jsonObjData); System.out.println(" Final data set for TodayAgendaServlet build the Graph is===" + jsonObjData);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
...@@ -75,5 +78,12 @@ public class TodayAgendaServlet extends HttpServlet ...@@ -75,5 +78,12 @@ public class TodayAgendaServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(planVsActual != null)
{
planVsActual = null;
}
}
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/TodaysCallServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.PlanVsActualRemote;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.PlanVsActual;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
public class TodaysCallServlet extends HttpServlet public class TodaysCallServlet extends HttpServlet
{ {
...@@ -29,9 +28,10 @@ public class TodaysCallServlet extends HttpServlet ...@@ -29,9 +28,10 @@ public class TodaysCallServlet extends HttpServlet
{ {
System.out.println(">>>>>>> INSIDE TODAYS STATUS SERVLET DO POST"); System.out.println(">>>>>>> INSIDE TODAYS STATUS SERVLET DO POST");
PlanVsActualRemote planvsactualRemote = null; //PlanVsActualRemote planvsactualRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
PlanVsActual planVsActual = null;
String dataSourceName = ""; String dataSourceName = "";
String selectedOption = ""; String selectedOption = "";
String loginId = "",fromDate = "",salePersons = "", toDate = "",eventDate=""; String loginId = "",fromDate = "",salePersons = "", toDate = "",eventDate="";
...@@ -56,13 +56,16 @@ public class TodaysCallServlet extends HttpServlet ...@@ -56,13 +56,16 @@ public class TodaysCallServlet extends HttpServlet
selectedOption = request.getParameter("viewOptionSelectd"); selectedOption = request.getParameter("viewOptionSelectd");
eventDate=request.getParameter("eventDate"); eventDate=request.getParameter("eventDate");
System.out.println("dataSourceName ["+dataSourceName+"] eventDate ["+eventDate+"]"); System.out.println("dataSourceName ["+dataSourceName+"] eventDate ["+eventDate+"]");
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
//context = new InitialContext(appConnectParm.getProperty());
System.out.println("lookup 111111"); System.out.println("lookup 111111");
planvsactualRemote = (PlanVsActualRemote) context.lookup("ibase/PlanVsActual/remote"); //planvsactualRemote = (PlanVsActualRemote) context.lookup("ibase/PlanVsActual/remote");
System.out.println("lookup 222222"); System.out.println("lookup 222222");
//Changed by Anjali R. on[28/02/2018][added dummy parameter to call new method] //Changed by Anjali R. on[28/02/2018][added dummy parameter to call new method]
//jsonObjData = planvsactualRemote.getTodaysCalls(dataSourceName,loginId,salePersons); //jsonObjData = planvsactualRemote.getTodaysCalls(dataSourceName,loginId,salePersons);
jsonObjData = planvsactualRemote.getTodaysCalls(dataSourceName,loginId,salePersons,"",eventDate); //jsonObjData = planvsactualRemote.getTodaysCalls(dataSourceName,loginId,salePersons,"",eventDate);
planVsActual = new PlanVsActual();
jsonObjData = planVsActual.getTodaysCalls(dataSourceName,loginId,salePersons,"",eventDate);
System.out.println(" Final data set for TodaysCallServlet build the Graph is===" + jsonObjData); System.out.println(" Final data set for TodaysCallServlet build the Graph is===" + jsonObjData);
...@@ -84,6 +87,13 @@ public class TodaysCallServlet extends HttpServlet ...@@ -84,6 +87,13 @@ public class TodaysCallServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(planVsActual != null)
{
planVsActual = null;
}
}
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/TodaysCallSummaryServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.PlanVsActualRemote;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.PlanVsActual;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
public class TodaysCallSummaryServlet extends HttpServlet public class TodaysCallSummaryServlet extends HttpServlet
{ {
...@@ -29,9 +28,10 @@ public class TodaysCallSummaryServlet extends HttpServlet ...@@ -29,9 +28,10 @@ public class TodaysCallSummaryServlet extends HttpServlet
{ {
System.out.println(">>>>>>> INSIDE TodaysCallSummaryServlet DO POST"); System.out.println(">>>>>>> INSIDE TodaysCallSummaryServlet DO POST");
PlanVsActualRemote planvsactualRemote = null; //PlanVsActualRemote planvsactualRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
PlanVsActual planVsActual = null;
String dataSourceName = ""; String dataSourceName = "";
String selectedOption = ""; String selectedOption = "";
String loginId = "",fromDate = "",salePersons = "", toDate = ""; String loginId = "",fromDate = "",salePersons = "", toDate = "";
...@@ -58,11 +58,14 @@ public class TodaysCallSummaryServlet extends HttpServlet ...@@ -58,11 +58,14 @@ public class TodaysCallSummaryServlet extends HttpServlet
{ {
salePersons = loginId; salePersons = loginId;
} }
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
planvsactualRemote = (PlanVsActualRemote) context.lookup("ibase/PlanVsActual/remote"); //context = new InitialContext(appConnectParm.getProperty());
//planvsactualRemote = (PlanVsActualRemote) context.lookup("ibase/PlanVsActual/remote");
//Changed by Anjali R. on[28/02/2018][added dummy parameter to call new method] //Changed by Anjali R. on[28/02/2018][added dummy parameter to call new method]
//jsonObjData = planvsactualRemote.getTodaysCallsSummary(dataSourceName,loginId,salePersons,""); //jsonObjData = planvsactualRemote.getTodaysCallsSummary(dataSourceName,loginId,salePersons,"");
jsonObjData = planvsactualRemote.getTodaysCallsSummary(dataSourceName,loginId,salePersons,""); //jsonObjData = planvsactualRemote.getTodaysCallsSummary(dataSourceName,loginId,salePersons,"");
planVsActual = new PlanVsActual();
jsonObjData = planVsActual.getTodaysCallsSummary(dataSourceName,loginId,salePersons,"");
System.out.println(" Final data set for TodaysCallSummaryServlet build the Graph is===" + jsonObjData); System.out.println(" Final data set for TodaysCallSummaryServlet build the Graph is===" + jsonObjData);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
...@@ -82,6 +85,13 @@ public class TodaysCallSummaryServlet extends HttpServlet ...@@ -82,6 +85,13 @@ public class TodaysCallSummaryServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(planVsActual != null)
{
planVsActual = null;
}
}
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/ZoneWiseQTQServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.ZoneWiseQTQRemote;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.ZoneWiseQTQ;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
public class ZoneWiseQTQServlet extends HttpServlet public class ZoneWiseQTQServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -27,9 +28,10 @@ public class ZoneWiseQTQServlet extends HttpServlet ...@@ -27,9 +28,10 @@ public class ZoneWiseQTQServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException throws IOException, ServletException
{ {
ZoneWiseQTQRemote gardeniaRemote = null; //ZoneWiseQTQRemote gardeniaRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
ZoneWiseQTQ zoneWiseQTQ = null;
String dataSourceName = ""; String dataSourceName = "";
String loginCode = ""; String loginCode = "";
HttpSession session = null; HttpSession session = null;
...@@ -48,9 +50,12 @@ public class ZoneWiseQTQServlet extends HttpServlet ...@@ -48,9 +50,12 @@ public class ZoneWiseQTQServlet extends HttpServlet
dataSourceName= request.getParameter("dataSourceName"); dataSourceName= request.getParameter("dataSourceName");
fromDate = request.getParameter("fromDate"); fromDate = request.getParameter("fromDate");
toDate = request.getParameter("toDate"); toDate = request.getParameter("toDate");
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
gardeniaRemote = (ZoneWiseQTQRemote) context.lookup("ibase/ZoneWiseQTQ/remote"); //context = new InitialContext(appConnectParm.getProperty());
jsonObjData = (JSONObject) gardeniaRemote.getDifAllIndiaQTQ(loginCode,dataSourceName,fromDate,toDate); //gardeniaRemote = (ZoneWiseQTQRemote) context.lookup("ibase/ZoneWiseQTQ/remote");
//jsonObjData = (JSONObject) gardeniaRemote.getDifAllIndiaQTQ(loginCode,dataSourceName,fromDate,toDate);
zoneWiseQTQ = new ZoneWiseQTQ();
jsonObjData = (JSONObject) zoneWiseQTQ.getDifAllIndiaQTQ(loginCode,dataSourceName,fromDate,toDate);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
...@@ -72,6 +77,13 @@ public class ZoneWiseQTQServlet extends HttpServlet ...@@ -72,6 +77,13 @@ public class ZoneWiseQTQServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(zoneWiseQTQ != null)
{
zoneWiseQTQ = null;
}
}
} }
} }
webitm-dashboard/ibase/dashboard/sfa/servlet/ZonewiseCoachingDaysServlet.java
View file @ 6ba4549f
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.ZonewiseCoachingDaysRemote;
import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import ibase.dashboard.sfa.ejb.ZonewiseCoachingDays;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
public class ZonewiseCoachingDaysServlet extends HttpServlet public class ZonewiseCoachingDaysServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -27,9 +28,10 @@ public class ZonewiseCoachingDaysServlet extends HttpServlet ...@@ -27,9 +28,10 @@ public class ZonewiseCoachingDaysServlet extends HttpServlet
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException throws IOException, ServletException
{ {
ZonewiseCoachingDaysRemote zonewisecoachingdaysRemote = null; //ZonewiseCoachingDaysRemote zonewisecoachingdaysRemote = null;
InitialContext context = null; //InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
ZonewiseCoachingDays zonewiseCoachingDays = null;
String dataSourceName = ""; String dataSourceName = "";
String loginCode = ""; String loginCode = "";
String loginEmpCode = ""; String loginEmpCode = "";
...@@ -51,10 +53,13 @@ public class ZonewiseCoachingDaysServlet extends HttpServlet ...@@ -51,10 +53,13 @@ public class ZonewiseCoachingDaysServlet extends HttpServlet
fromDate = request.getParameter("fromDate"); fromDate = request.getParameter("fromDate");
toDate = request.getParameter("toDate"); toDate = request.getParameter("toDate");
System.out.println("fromDate = "+fromDate+" toDate = "+toDate); System.out.println("fromDate = "+fromDate+" toDate = "+toDate);
context = new InitialContext(appConnectParm.getProperty()); //Commented and added By Varsha V on 06-08-18 for removing lookup
zonewisecoachingdaysRemote = (ZonewiseCoachingDaysRemote) context.lookup("ibase/ZonewiseCoachingDays/remote"); //context = new InitialContext(appConnectParm.getProperty());
jsonObjData = (JSONObject) zonewisecoachingdaysRemote.getZonewiseCoachingDay(loginCode,dataSourceName,fromDate,toDate,loginEmpCode); //zonewisecoachingdaysRemote = (ZonewiseCoachingDaysRemote) context.lookup("ibase/ZonewiseCoachingDays/remote");
outputStream = response.getOutputStream(); //jsonObjData = (JSONObject) zonewisecoachingdaysRemote.getZonewiseCoachingDay(loginCode,dataSourceName,fromDate,toDate,loginEmpCode);
zonewiseCoachingDays = new ZonewiseCoachingDays();
jsonObjData = (JSONObject) zonewiseCoachingDays.getZonewiseCoachingDay(loginCode,dataSourceName,fromDate,toDate,loginEmpCode);
outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
outputStream.close(); outputStream.close();
...@@ -72,5 +77,12 @@ public class ZonewiseCoachingDaysServlet extends HttpServlet ...@@ -72,5 +77,12 @@ public class ZonewiseCoachingDaysServlet extends HttpServlet
e1.printStackTrace(); e1.printStackTrace();
} }
} }
finally
{
if(zonewiseCoachingDays != null)
{
zonewiseCoachingDays = null;
}
}
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment