Skip to content

B
business-java
Commit 00efc579 authored by vvengurlekar's avatar vvengurlekar
Browse files
Options

PlanVsActual.java 

PlanVsActualLocal.java
PlanVsActualRemote.java
PlanVsActualServlet.java - Added code for showing tree locality wise


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@191949 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b7c1202d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 293 additions and 3 deletions
webitm-dashboard/ibase/dashboard/sfa/ejb/PlanVsActualLocal.java
View file @ 00efc579
...@@ -11,6 +11,8 @@ public interface PlanVsActualLocal extends ValidatorLocal ...@@ -11,6 +11,8 @@ public interface PlanVsActualLocal extends ValidatorLocal
{ {
public JSONObject getPlanVsActualTreeStructure(String dataSourceName,String loginId,String fromDate,String toDate,String salePersons)throws RemoteException,ITMException; public JSONObject getPlanVsActualTreeStructure(String dataSourceName,String loginId,String fromDate,String toDate,String salePersons)throws RemoteException,ITMException;
//Added method by Varsha V to show data locality wise for particular client
public JSONObject getPlanVsActualTreeStructureRpharma(String dataSourceName,String loginId,String fromDate,String toDate,String salePersons, String viewOptionSelectd)throws RemoteException,ITMException;
public JSONObject getTodayAgenda(String dataSourceName,String loginId,String salePersons)throws RemoteException,ITMException; public JSONObject getTodayAgenda(String dataSourceName,String loginId,String salePersons)throws RemoteException,ITMException;
//public JSONObject getTodaysCalls(String dataSourceName,String loginId,String salePersons)throws RemoteException,ITMException; //public JSONObject getTodaysCalls(String dataSourceName,String loginId,String salePersons)throws RemoteException,ITMException;
public JSONObject getTodaysCalls(String dataSourceName,String loginId,String salePersons)throws RemoteException,ITMException; public JSONObject getTodaysCalls(String dataSourceName,String loginId,String salePersons)throws RemoteException,ITMException;
...@@ -18,6 +20,8 @@ public interface PlanVsActualLocal extends ValidatorLocal ...@@ -18,6 +20,8 @@ public interface PlanVsActualLocal extends ValidatorLocal
//Added by Anjali R.[Start] //Added by Anjali R.[Start]
public String getPlanVsActualTreeStructure(String dataSourceName,String loginId,String fromDate,String toDate,String salePersons,String dummy)throws RemoteException,ITMException; public String getPlanVsActualTreeStructure(String dataSourceName,String loginId,String fromDate,String toDate,String salePersons,String dummy)throws RemoteException,ITMException;
//Added method by Varsha V to show data locality wise for particular client
public String getPlanVsActualTreeStructureRpharma(String dataSourceName,String loginId,String fromDate,String toDate,String salePersons,String dummy, String viewOptionSelectd)throws RemoteException,ITMException;
public String getTodayAgenda(String dataSourceName,String loginId,String salePersons,String dummy)throws RemoteException,ITMException; public String getTodayAgenda(String dataSourceName,String loginId,String salePersons,String dummy)throws RemoteException,ITMException;
public String getTodaysCalls(String dataSourceName,String loginId,String salePersons,String dummy,String eventDate)throws RemoteException,ITMException, Exception; public String getTodaysCalls(String dataSourceName,String loginId,String salePersons,String dummy,String eventDate)throws RemoteException,ITMException, Exception;
public String getTodaysCallsSummary(String dataSourceName,String loginId,String salePersons,String dummy)throws RemoteException,ITMException; public String getTodaysCallsSummary(String dataSourceName,String loginId,String salePersons,String dummy)throws RemoteException,ITMException;
......
webitm-dashboard/ibase/dashboard/sfa/ejb/PlanVsActualRemote.java
View file @ 00efc579
...@@ -11,11 +11,15 @@ public interface PlanVsActualRemote extends ValidatorRemote ...@@ -11,11 +11,15 @@ public interface PlanVsActualRemote extends ValidatorRemote
{ {
public JSONObject getPlanVsActualTreeStructure(String dataSourceName,String loginId,String fromDate,String toDate,String salePersons) throws RemoteException, ITMException; public JSONObject getPlanVsActualTreeStructure(String dataSourceName,String loginId,String fromDate,String toDate,String salePersons) throws RemoteException, ITMException;
//Added method by Varsha V to show data locality wise for particular client
public JSONObject getPlanVsActualTreeStructureRpharma(String dataSourceName,String loginId,String fromDate,String toDate,String salePersons, String viewOptionSelectd)throws RemoteException,ITMException;
public JSONObject getTodayAgenda(String dataSourceName,String loginId,String salePersons)throws RemoteException,ITMException; public JSONObject getTodayAgenda(String dataSourceName,String loginId,String salePersons)throws RemoteException,ITMException;
public JSONObject getTodaysCalls(String dataSourceName,String loginId,String salePersons)throws RemoteException,ITMException; public JSONObject getTodaysCalls(String dataSourceName,String loginId,String salePersons)throws RemoteException,ITMException;
public JSONObject getTodaysCallsSummary(String dataSourceName,String loginId,String salePersons)throws RemoteException,ITMException; public JSONObject getTodaysCallsSummary(String dataSourceName,String loginId,String salePersons)throws RemoteException,ITMException;
//Added by Anjali R.[Start] //Added by Anjali R.[Start]
public String getPlanVsActualTreeStructure(String dataSourceName,String loginId,String fromDate,String toDate,String salePersons,String dummy)throws RemoteException,ITMException; public String getPlanVsActualTreeStructure(String dataSourceName,String loginId,String fromDate,String toDate,String salePersons,String dummy)throws RemoteException,ITMException;
//Added method by Varsha V to show data locality wise for particular client
public String getPlanVsActualTreeStructureRpharma(String dataSourceName,String loginId,String fromDate,String toDate,String salePersons,String dummy, String viewOptionSelectd)throws RemoteException,ITMException;
public String getTodayAgenda(String dataSourceName,String loginId,String salePersons,String dummy)throws RemoteException,ITMException; public String getTodayAgenda(String dataSourceName,String loginId,String salePersons,String dummy)throws RemoteException,ITMException;
public String getTodaysCalls(String dataSourceName,String loginId,String salePersons,String dummy,String eventDate)throws RemoteException,ITMException,Exception; public String getTodaysCalls(String dataSourceName,String loginId,String salePersons,String dummy,String eventDate)throws RemoteException,ITMException,Exception;
public String getTodaysCallsSummary(String dataSourceName,String loginId,String salePersons,String dummy)throws RemoteException,ITMException; public String getTodaysCallsSummary(String dataSourceName,String loginId,String salePersons,String dummy)throws RemoteException,ITMException;
......
webitm-dashboard/ibase/dashboard/sfa/servlet/PlanVsActualServlet.java
View file @ 00efc579
...@@ -31,7 +31,7 @@ public class PlanVsActualServlet extends HttpServlet ...@@ -31,7 +31,7 @@ public class PlanVsActualServlet extends HttpServlet
//AppConnectParm appConnectParm = new AppConnectParm(); //AppConnectParm appConnectParm = new AppConnectParm();
PlanVsActual planVsActual = null; PlanVsActual planVsActual = null;
String dataSourceName = ""; String dataSourceName = "";
String loginId = "",fromDate = "",salePersons = "", toDate = ""; String loginId = "",fromDate = "",salePersons = "", toDate = "", viewOptionSelectd = "";
HttpSession session = null; HttpSession session = null;
//Added by Anjali R. on[28/02/2018][To change return type json to string ] //Added by Anjali R. on[28/02/2018][To change return type json to string ]
//JSONObject jsonObjData = null; //JSONObject jsonObjData = null;
...@@ -47,7 +47,8 @@ public class PlanVsActualServlet extends HttpServlet ...@@ -47,7 +47,8 @@ public class PlanVsActualServlet extends HttpServlet
fromDate = request.getParameter("fromDate"); fromDate = request.getParameter("fromDate");
toDate = request.getParameter("toDate"); toDate = request.getParameter("toDate");
salePersons = request.getParameter("salePersons"); salePersons = request.getParameter("salePersons");
System.out.println("loginId = "+loginId+"fromDate = "+fromDate+"toDate = "+toDate+"sales person = "+salePersons); viewOptionSelectd = request.getParameter("viewOptionSelectd");
System.out.println("loginId = "+loginId+"fromDate = "+fromDate+"toDate = "+toDate+"sales person = "+salePersons+" viewOptionSelectd = "+viewOptionSelectd);
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
if(salePersons.length()== 0) if(salePersons.length()== 0)
{ {
...@@ -60,7 +61,17 @@ public class PlanVsActualServlet extends HttpServlet ...@@ -60,7 +61,17 @@ public class PlanVsActualServlet extends HttpServlet
//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(); planVsActual = new PlanVsActual();
jsonObjData = planVsActual.getPlanVsActualTreeStructure(dataSourceName,loginId,fromDate,toDate,salePersons,""); //commented and added by varsha to show tree locality wise on 12-10-18
//jsonObjData = planVsActual.getPlanVsActualTreeStructure(dataSourceName,loginId,fromDate,toDate,salePersons,"");
if(viewOptionSelectd != null && viewOptionSelectd.trim().equalsIgnoreCase("rpharma"))
{
jsonObjData = planVsActual.getPlanVsActualTreeStructureRpharma(dataSourceName,loginId,fromDate,toDate,salePersons,"", viewOptionSelectd);
}
else
{
jsonObjData = planVsActual.getPlanVsActualTreeStructure(dataSourceName,loginId,fromDate,toDate,salePersons,"");
}
//Ended by varsha v to show tree locality wise
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());
......
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