Changes for making Todays Call Dashboard work for DBR type

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@190033 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dashboard/ibase/dashboard/sfa/ejb/PlanVsActual.java

@@ -48,8 +48,8 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
 	{
 		System.out.println("getTodaysCalls==========\n dataSourceName-["+dataSourceName+"]loginId-["+loginId+"]salePersons-["+salePersons+"]");
 		//System.out.println("Result ---3["+getTodaysCalls(dataSourceName, loginId, salePersons).toJSONString()+"]");
-		//return getTodaysCalls(dataSourceName, loginId, salePersons).toString();
-		return getTodaysMyData(dataSourceName, loginId, salePersons,eventDate).toString();
+		return getTodaysCalls(dataSourceName, loginId, salePersons).toString();
+		//return getTodaysMyData(dataSourceName, loginId, salePersons,eventDate).toString();
 
 	}
 	public String getTodaysCallsSummary(String dataSourceName,String loginId,String salePersons,String dummy)throws RemoteException,ITMException
@@ -59,6 +59,18 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
 		return getTodaysCallsSummary(dataSourceName, loginId, salePersons).toString();
 	}
 	//Added by Anjali R.[End]
+	
+	//Added by Saitej D [START]
+	public String getTodaysData(String dataSourceName,String loginId,String salePersons,String dummy,String eventDate)throws Exception
+	{
+		System.out.println("getTodaysCalls==========\n dataSourceName-["+dataSourceName+"]loginId-["+loginId+"]salePersons-["+salePersons+"]");
+		//System.out.println("Result ---3["+getTodaysCalls(dataSourceName, loginId, salePersons).toJSONString()+"]");
+		//return getTodaysCalls(dataSourceName, loginId, salePersons).toString();
+		return getTodaysMyData(dataSourceName, loginId, salePersons,eventDate).toString();
+
+	}
+	//Added by Saitej D [END]
+	
 	@SuppressWarnings("unchecked")
 	@Override
 	public JSONObject getPlanVsActualTreeStructure(String dataSourceName,String loginId,String fromDate,String toDate,String salePersons) throws RemoteException, ITMException 

webitm-dashboard/ibase/dashboard/sfa/servlet/TodaysServlet.java

+package ibase.dashboard.sfa.servlet;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+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 ibase.dashboard.sfa.ejb.PlanVsActual;
+import ibase.utility.UserInfoBean;
+import ibase.webitm.utility.ITMException;
+
+public class TodaysServlet 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
+	{
+	
+		System.out.println(">>>>>>> INSIDE TODAYS STATUS SERVLET DO POST");
+		//PlanVsActualRemote planvsactualRemote = null;
+		//InitialContext context                = null;
+		//AppConnectParm appConnectParm         = new AppConnectParm();
+		PlanVsActual planVsActual				= null;
+		String dataSourceName                 = "";
+		String selectedOption                 = "";
+		String loginId = "",fromDate = "",salePersons = "", toDate = "",eventDate="";
+		HttpSession session                   = null;
+		//Changed by Anjali R. on[28/02/2018][To change return type json to string ]
+		//JSONObject jsonObjData                = null;
+		String 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();
+			dataSourceName = userInfo.getTransDB();
+			/*fromDate = request.getParameter("fromDate");
+			toDate = request.getParameter("toDate");*/
+			salePersons = request.getParameter("salePersons");
+			System.out.println("loginId = "+loginId+ "sales person = "+salePersons);
+			//dataSourceName = request.getParameter("dataSourceName");
+			selectedOption = request.getParameter("viewOptionSelectd");
+			eventDate=request.getParameter("eventDate");
+            System.out.println("dataSourceName ["+dataSourceName+"] eventDate ["+eventDate+"]");
+            //Commented and added By Varsha V on 06-08-18 for removing lookup
+            //context = new InitialContext(appConnectParm.getProperty());
+			System.out.println("lookup 111111");
+			//planvsactualRemote = (PlanVsActualRemote) context.lookup("ibase/PlanVsActual/remote");
+			System.out.println("lookup 222222");
+			//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,"",eventDate);
+			planVsActual   = new PlanVsActual();
+			jsonObjData =  planVsActual.getTodaysData(dataSourceName,loginId,salePersons,"",eventDate);
+			
+			
+			System.out.println(" Final data set for TodaysCallServlet build the Graph is===" + jsonObjData);
+			outputStream   = response.getOutputStream();			
+		    outputStream.write(jsonObjData.toString().getBytes());
+			outputStream.flush();
+			outputStream.close();
+			
+		}
+		catch (Exception e)
+		{
+			System.out.println("Exception : TodaysCallServlet :doPost(HttpServletRequest request, HttpServletResponse response) :"+ e);
+			try
+			{
+				throw new ITMException(e);
+			}
+			catch (ITMException e1)
+			{
+				e1.printStackTrace();
+			}
+		}
+		finally
+		{
+			if(planVsActual != null)
+			{
+				planVsActual = null;
+			}
+		}
+	}
+
+}