Skip to content

B
business-java
Commit 5e46b6d0 authored by abibave's avatar abibave
Browse files
Options

Changes in TreeStructure & Addition of 'Todays Agenda' functionality. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103736 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 39135987
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 199 additions and 31 deletions
webitm-dashboard/ibase/dashboard/sfa/ejb/PlanVsActualLocal.java
View file @ 5e46b6d0
package ibase.dashboard.sfa.ejb;
import ibase.webitm.ejb.ValidatorLocal;
import ibase.webitm.ejb.ValidatorRemote;
import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException;
import javax.ejb.Local;
......@@ -12,5 +11,6 @@ public interface PlanVsActualLocal extends ValidatorLocal
{
public abstract JSONObject getPlanVsActualTreeStructure(String dataSourceName,String loginId,String fromDate,String toDate,String salePersons)throws RemoteException,ITMException;
public JSONObject getTodayAgenda(String dataSourceName,String loginId,String salePersons)throws RemoteException,ITMException;
}
webitm-dashboard/ibase/dashboard/sfa/ejb/PlanVsActualRemote.java
View file @ 5e46b6d0
......@@ -11,7 +11,6 @@ import org.json.simple.JSONObject;
public interface PlanVsActualRemote extends ValidatorRemote
{
public abstract JSONObject getPlanVsActualTreeStructure(String dataSourceName,String loginId,String fromDate,String toDate,String salePersons) throws RemoteException, ITMException;
public JSONObject getTodayAgenda(String dataSourceName,String loginId,String salePersons)throws RemoteException,ITMException;
}
webitm-dashboard/ibase/dashboard/sfa/servlet/PlanVsActualServlet.java
View file @ 5e46b6d0
......@@ -42,13 +42,15 @@ public class PlanVsActualServlet extends HttpServlet
session = request.getSession(true);
userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
loginId = userInfo.getLoginCode();
//loginId = "M00001";
fromDate = request.getParameter("fromDate");
toDate = request.getParameter("toDate");
salePersons = request.getParameter("salePersons");
System.out.println("loginId = "+loginId+"fromDate = "+fromDate+"toDate = "+toDate+"sales person = "+salePersons);
dataSourceName = request.getParameter("dataSourceName");
if(salePersons.length()== 0)
{
salePersons = loginId;
}
context = new InitialContext(appConnectParm.getProperty());
planvsactualRemote = (PlanVsActualRemote) context.lookup("ibase/PlanVsActual/remote");
jsonObjData = (JSONObject) planvsactualRemote.getPlanVsActualTreeStructure(dataSourceName,loginId,fromDate,toDate,salePersons);
......@@ -58,15 +60,6 @@ public class PlanVsActualServlet extends HttpServlet
outputStream.flush();
outputStream.close();
//String jsonObjData = "{'0':{'category':{'plan':null,'unplan':['Vipul Mehotra','Atul Deokar','Tushar Maniar'],'meet':['Vipul Mehotra','Atul Deokar','Tushar Maniar']},'eventdate':'2016-08-17 00:00:00.0'},'1':{'category':{'plan':['K Guptha'],'unplan':['A Deshpande','Rahul Tambe','R Jain','Anil Pichad','Vipul Gandhi'],'meet':['A Deshpande','Rahul Tambe','R Jain','Anil Pichad','Vipul Gandhi']},'eventdate':'2016-08-16 00:00:00.0'},'2':{'category':{'plan':['Vipul Mehotra','Atul Deokar','Varsha Medical'],'unplan':[],'meet':[]},'eventdate':'2016-08-08 00:00:00.0'},'3':{'category':{'plan':['Vipul Mehotra','Amr Anvekar','Vijay Kumar','Philip John','Anil Mehta'],'unplan':['N R Save','Pradeep Rathod'],'meet':['N R Save','Pradeep Rathod']},'eventdate':'2016-08-06 00:00:00.0'}}";
/*String jsonObjData1 = "{'0':{'category':{'plan':null,'unplan':['Vipul Mehotra','Amr Anvekar','Vijay Kumar'],'missed':null},'eventdate':'09-08-16'},'1':{'category':{'plan':['Vipul Mehotra','Amr Anvekar','Vijay Kumar','Philip John','Anil Mehta'],'unplan':['Nishal Shetty','Deepa Bhandarkar'],'missed':['N R Save','Pradeep Rathod']},'eventdate':'06-08-16'},'2':{'category':{'plan':['K Guptha'],'unplan':[],'missed':['A Deshpande','Rahul Tambe','R Jain','Anil Pichad','Vipul Gandhi']},'eventdate':'16-08-16'},'3':{'category':{'plan':null,'unplan':['K Guptha'],'missed':null},'eventdate':'10-08-16'},'4':{'category':{'plan':null,'unplan':['Vipul Mehotra'],'missed':null},'eventdate':'11-08-16'},'5':{'category':{'plan':['Vipul Mehotra'],'unplan':[],'missed':[]},'eventdate':'08-08-16'}}";
System.out.println(" Final data set for PlanVsActualServlet build the Graph is===" + jsonObjData1);
outputStream = response.getOutputStream();
outputStream.write(jsonObjData1.toString().replace('\'', '"').getBytes());
outputStream.flush();
outputStream.close();*/
}
catch (Exception e)
{
......
webitm-dashboard/ibase/dashboard/sfa/servlet/TodayAgendaServlet.java 0 → 100755
View file @ 5e46b6d0
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.OutputStream;
import javax.naming.InitialContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject;
public class TodayAgendaServlet extends HttpServlet
{
private static final long serialVersionUID = 1L;
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException
{
doPost(request, response);
}
public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException
{
PlanVsActualRemote planvsactualRemote = null;
InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm();
String dataSourceName = "";
String loginId = "";
String salePersons = "";
HttpSession session = null;
JSONObject jsonObjData = null;
OutputStream outputStream = null;
UserInfoBean userInfo = null;
try
{
response.setContentType("application/xml");
session = request.getSession(true);
userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
loginId = userInfo.getLoginCode();
salePersons = request.getParameter("salePersons");
System.out.println("loginId = "+loginId+",sales person = "+salePersons);
dataSourceName = request.getParameter("dataSourceName");
/*if(salePersons.length()== 0)
{
salePersons = loginId;
}*/
context = new InitialContext(appConnectParm.getProperty());
planvsactualRemote = (PlanVsActualRemote) context.lookup("ibase/PlanVsActual/remote");
jsonObjData = (JSONObject) planvsactualRemote.getTodayAgenda(dataSourceName,loginId,salePersons);
System.out.println(" Final data set for TodayAgendaServlet build the Graph is===" + jsonObjData);
outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush();
outputStream.close();
}
catch (Exception e)
{
System.out.println("Exception : TodayAgendaServlet :doPost(HttpServletRequest request, HttpServletResponse response) :"+ e);
try
{
throw new ITMException(e);
}
catch (ITMException e1)
{
e1.printStackTrace();
}
}
}
}
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