Changes made in SFA for jnj dashboard component

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

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

@@ -28,6 +28,14 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp
 	{
 	}
 	
+	//Added by Anjali R.[Start]
+	public String getAttendance(String dataSourceName, String empCode, String viewOptionSelectd,String dummy) throws RemoteException, ITMException
+	{
+		System.out.println("dataSourceName--["+dataSourceName+"]empCode---["+empCode+"]viewOptionSelectd["+viewOptionSelectd+"]");
+		return getAttendance(dataSourceName, empCode, "JNJ").toJSONString();
+	}
+	//Added by Anjali R.[End]
+	
 	@SuppressWarnings("unchecked")
 	public JSONObject getAttendance(String dataSourceName, String empCode, String viewOptionSelectd)
 			throws RemoteException, ITMException
@@ -45,6 +53,7 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp
 		ArrayList<String> complianceReport = null;
 		String salesPersCode = "", salesPersName = "", userImagePath = "", tran_image = "";
 		String state = "", reportHead = "", notReportingDays = "", mobileNo = "";
+		viewOptionSelectd = "JNJ";
 		try
 		{
 			SimpleDateFormat convertToDbDate =new SimpleDateFormat(new GenericUtility().getDBDateFormat());
@@ -89,11 +98,13 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp
 			rowCount = rs.getRow();
 			rs.beforeFirst();
 			rowBuffer = new StringBuffer();
+			System.out.println("rowCount------["+rowCount+"]");
 			if(rowCount == 0)
 			{
 				rowBuffer = new StringBuffer("<table  id='htmlTable' cellpadding='2' align='center'><tr><td align = 'center' class='gwt-ScrollTable'>No Data to Display</td></tr>");
 			}
-			if(viewOptionSelectd != null && viewOptionSelectd.equalsIgnoreCase("JNJ"))
+			//Commented by Anjali R. on[01/03/2018][To shown dashboard in pie chart format]
+			/*if(viewOptionSelectd != null && viewOptionSelectd.equalsIgnoreCase("JNJ"))*/
 			{
 				rowData = new JSONObject();
 				regionWiseAttendanceMap = new LinkedHashMap<String, ArrayList<String>>();
@@ -146,7 +157,7 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp
 									"</table></td>" +
 								"<td align='right' style='padding-right:10px;'><div style='margin-top:-15px;'> "+notReportingDays+" days </div></td></tr></table></div>");
 					}
-					else
+					/*else
 					{
 						complianceReport = new ArrayList<String>();
 						complianceReport.add("<div class='tdMousehover'>" +
@@ -173,7 +184,7 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp
 					
 					}
 			     	regionWiseAttendanceMap.put(devisonWiseRegion, complianceReport);
-				}
+				}*/
 				for (Map.Entry<String, ArrayList<String>> entry : regionWiseAttendanceMap.entrySet())
 	            {
 	                System.out.print(entry.getKey() + ": "+entry.getValue());
@@ -256,8 +267,13 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp
 
 		return rowDataPendingTaskJson;
 	}
-
-	
+	//Added by Anjali R.[Start]	
+	public String getComplianceSummary(String dataSourceName, String loginId, String period,String dummy) throws RemoteException, ITMException
+    {
+		System.out.println("getComplianceSummary=============\n dataSourceName-["+dataSourceName+"]loginId-["+loginId+"]period-["+period+"]");
+		return getComplianceSummary(dataSourceName, loginId, period).toJSONString();
+    }
+	//Added by Anjali R.[end]
 	@SuppressWarnings("unchecked")
 	@Override
     public JSONObject getComplianceSummary(String dataSourceName, String loginId, String period) throws RemoteException, ITMException

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

@@ -11,5 +11,9 @@ public abstract interface AttendanceComplianceLocal extends ValidatorLocal
 {
   public abstract JSONObject getAttendance(String dataSourceName,String empCode, String viewOptionSelectd)throws RemoteException, ITMException;
   public abstract JSONObject getComplianceSummary(String dataSourceName, String empCode, String period) throws RemoteException, ITMException;
+  //Added by Anjali R.[Start]
+  public String getAttendance(String dataSourceName, String empCode, String viewOptionSelectd,String dummy)throws RemoteException, ITMException;
+  public String getComplianceSummary(String dataSourceName, String loginId, String period,String dummy) throws RemoteException, ITMException;
+  //Added by Anjali R.[End]
 }
 

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

@@ -11,6 +11,9 @@ public abstract interface AttendanceComplianceRemote extends ValidatorRemote
 {
   public abstract JSONObject getAttendance(String dataSourceName,String empCode, String viewOptionSelectd) throws RemoteException, ITMException;
   public abstract JSONObject getComplianceSummary(String dataSourceName, String empCode, String period) throws RemoteException, ITMException;
-  
+  //Added by Anjali R.[Start]
+  public String getAttendance(String dataSourceName, String empCode, String viewOptionSelectd,String dummy)throws RemoteException, ITMException;
+  public String getComplianceSummary(String dataSourceName, String loginId, String period,String dummy) throws RemoteException, ITMException;
+//Added by Anjali R.[End]
 }
 

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

@@ -25,6 +25,32 @@ import javax.ejb.Stateless;
 public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,PlanVsActualRemote 
 {
 
+	//Added by Anjali R.[Start]
+	public String getPlanVsActualTreeStructure(String dataSourceName,String loginId,String fromDate,String toDate,String salePersons,String dummy)throws RemoteException,ITMException
+	{
+		System.out.println("getPlanVsActualTreeStructure=========\n dataSourceName-["+dataSourceName+"]loginId-["+loginId+"]fromDate-["+fromDate+"]toDate-["+toDate+"]salePersons-["+salePersons+"]");
+		//System.out.println("Result ---1["+getPlanVsActualTreeStructure(dataSourceName, loginId, fromDate, toDate, salePersons).toJSONString()+"]");
+		return getPlanVsActualTreeStructure(dataSourceName, loginId, fromDate, toDate, salePersons).toString();
+	}
+	public String getTodayAgenda(String dataSourceName,String loginId,String salePersons,String dummy)throws RemoteException,ITMException
+	{
+		System.out.println("getTodayAgenda==================\n dataSourceName-["+dataSourceName+"]loginId-["+loginId+"]salePersons-["+salePersons+"]");
+		//System.out.println("Result ---2["+getTodayAgenda(dataSourceName, loginId, salePersons).toJSONString()+"]");
+		return getTodayAgenda(dataSourceName, loginId, salePersons).toString();
+	}
+	public String getTodaysCalls(String dataSourceName,String loginId,String salePersons,String dummy)throws RemoteException,ITMException
+	{
+		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();
+	}
+	public String getTodaysCallsSummary(String dataSourceName,String loginId,String salePersons,String dummy)throws RemoteException,ITMException
+	{
+		System.out.println("getTodaysCallsSummary=========\n dataSourceName-["+dataSourceName+"]loginId-["+loginId+"]salePersons-["+salePersons+"]");
+		//System.out.println("Result ---4["+getTodaysCallsSummary(dataSourceName, loginId, salePersons).toJSONString()+"]");
+		return getTodaysCallsSummary(dataSourceName, loginId, salePersons).toString();
+	}
+	//Added by Anjali R.[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/ejb/PlanVsActualLocal.java

@@ -10,10 +10,16 @@ import org.json.simple.JSONObject;
 public  interface PlanVsActualLocal extends ValidatorLocal
 
 {
-  public abstract 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;
 	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;
-}
 
+	//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 getTodayAgenda(String dataSourceName,String loginId,String salePersons,String dummy)throws RemoteException,ITMException;
+	public String getTodaysCalls(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;
+	//Added by Anjali R.[End]
+}
\ No newline at end of file

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

@@ -7,13 +7,20 @@ import javax.ejb.Remote;
 import org.json.simple.JSONObject;
 
 @Remote
-
 public interface PlanVsActualRemote extends ValidatorRemote
 {
-  public abstract 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;
 	  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;
+	//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 getTodayAgenda(String dataSourceName,String loginId,String salePersons,String dummy)throws RemoteException,ITMException;
+	  public String getTodaysCalls(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;
+	//Added by Anjali R.[End]
+
 }
 
+

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

@@ -56,7 +56,9 @@ public class AttendanceCompSummaryServlet extends HttpServlet
 			}
 			context                         = new InitialContext(appConnectParm.getProperty());
 			attenanceComplianceRemote       = (AttendanceComplianceRemote) context.lookup("ibase/AttendanceCompliance/remote");
-			JSONObject jsonObjData    		= (JSONObject) attenanceComplianceRemote.getComplianceSummary(dataSourceName, salesPers, period);
+			//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,"");
+			String jsonObjData    		=  attenanceComplianceRemote.getComplianceSummary(dataSourceName, salesPers, period,"");
 			OutputStream outputStream   	= response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

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

@@ -33,7 +33,9 @@ public class AttendanceComplianceServlet extends HttpServlet
 		String dataSourceName = "", viewOptionSelectd = "";
 		String loginId = "", salesPers = "", period = "";
 		HttpSession session = null;
-		JSONObject jsonObjData = 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
@@ -61,7 +63,9 @@ public class AttendanceComplianceServlet extends HttpServlet
 			
 			context = new InitialContext(appConnectParm.getProperty());
 			gardeniaRemote = (AttendanceComplianceRemote) context.lookup("ibase/AttendanceCompliance/remote");
-			jsonObjData = (JSONObject) gardeniaRemote.getAttendance(dataSourceName,salesPers, viewOptionSelectd);
+			//Changed by Anjali R. on[28/02/2018][added dummy parameter to call new method]
+			//jsonObjData = (JSONObject) gardeniaRemote.getAttendance(dataSourceName,salesPers, viewOptionSelectd);
+			jsonObjData = gardeniaRemote.getAttendance(dataSourceName,salesPers, viewOptionSelectd,"");
 			outputStream = response.getOutputStream();
 			outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

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

@@ -33,7 +33,9 @@ public class PlanVsActualServlet extends HttpServlet
 		String dataSourceName                 = "";
 		String loginId = "",fromDate = "",salePersons = "", toDate = "";
 		HttpSession session                   = null;
-		JSONObject jsonObjData                = null;
+		//Added 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
@@ -53,7 +55,9 @@ public class PlanVsActualServlet extends HttpServlet
 			}
 			context = new InitialContext(appConnectParm.getProperty());
 			planvsactualRemote = (PlanVsActualRemote) context.lookup("ibase/PlanVsActual/remote");
-			jsonObjData = (JSONObject) planvsactualRemote.getPlanVsActualTreeStructure(dataSourceName,loginId,fromDate,toDate,salePersons);
+			//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,"");
 			System.out.println(" Final data set for PlanVsActualServlet build the Graph is===" + jsonObjData);
 			outputStream   = response.getOutputStream();			
 		    outputStream.write(jsonObjData.toString().getBytes());

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

@@ -34,7 +34,9 @@ public class TodayAgendaServlet extends HttpServlet
 	    String loginId 						  = "";
 	    String salePersons 					  = "";
 		HttpSession session                   = null;
-		JSONObject jsonObjData                = null;
+		//Added 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
@@ -52,7 +54,9 @@ public class TodayAgendaServlet extends HttpServlet
 			}*/
 			context = new InitialContext(appConnectParm.getProperty());
 			planvsactualRemote = (PlanVsActualRemote) context.lookup("ibase/PlanVsActual/remote");
-			jsonObjData = (JSONObject) planvsactualRemote.getTodayAgenda(dataSourceName,loginId,salePersons);
+			//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,"");
 			System.out.println(" Final data set for TodayAgendaServlet build the Graph is===" + jsonObjData);
 			outputStream   = response.getOutputStream();			
 		    outputStream.write(jsonObjData.toString().getBytes());

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

@@ -36,7 +36,9 @@ public class TodaysCallServlet extends HttpServlet
 		String selectedOption                 = "";
 		String loginId = "",fromDate = "",salePersons = "", toDate = "";
 		HttpSession session                   = null;
-		JSONObject jsonObjData                = 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
@@ -60,7 +62,9 @@ public class TodaysCallServlet extends HttpServlet
 			System.out.println("lookup 111111");
 			planvsactualRemote = (PlanVsActualRemote) context.lookup("ibase/PlanVsActual/remote");
 			System.out.println("lookup 222222");
-			jsonObjData = (JSONObject) planvsactualRemote.getTodaysCalls(dataSourceName,loginId,salePersons);
+			//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,"");
 			
 			
 			System.out.println(" Final data set for TodaysCallServlet build the Graph is===" + jsonObjData);

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

@@ -36,7 +36,9 @@ public class TodaysCallSummaryServlet extends HttpServlet
 		String selectedOption                 = "";
 		String loginId = "",fromDate = "",salePersons = "", toDate = "";
 		HttpSession session                   = null;
-		JSONObject jsonObjData                = 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
@@ -58,9 +60,9 @@ public class TodaysCallSummaryServlet extends HttpServlet
 			}
 			context = new InitialContext(appConnectParm.getProperty());
 			planvsactualRemote = (PlanVsActualRemote) context.lookup("ibase/PlanVsActual/remote");
-			jsonObjData = (JSONObject) planvsactualRemote.getTodaysCallsSummary(dataSourceName,loginId,salePersons);
-			
-			
+			//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,"");
 			System.out.println(" Final data set for TodaysCallSummaryServlet build the Graph is===" + jsonObjData);
 			outputStream   = response.getOutputStream();			
 		    outputStream.write(jsonObjData.toString().getBytes());