JNJ admin plan, plan vs actual, imp events ejb and servlet committed

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

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

@@ -17,7 +17,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.TreeMap;
-
 import javax.ejb.Stateless;
 
 @Stateless
@@ -69,7 +68,8 @@ public class AdminPlan extends ValidatorEJB implements AdminPlanLocal,AdminPlanR
 					  "INNER JOIN SPRS_ROUTE SR ON SR.LOCALITY_CODE  = L.LOCALITY_CODE WHERE SPRS_CODE__FOR  in (select emp_code from employee start with emp_code = (select emp_code from users where code='"+loginId+"') connect by prior emp_code = report_to) " +
 					  "AND SP.PLAN_DATE BETWEEN '"+fromDate+"' AND '"+toDate+"' GROUP BY SR.STATION_TYPE,SP.SPRS_CODE__FOR ORDER BY SR.STATION_TYPE ) Query1 " +
 					  "RIGHT JOIN (SELECT SPPS.STAN_TYPE, SPPS.WORK_DAYS FROM SF_PLAN_PARAM_STAN SPPS JOIN sf_plan_param SPP ON SPPS.PRD_CODE  = SPP.PRD_CODE " +
-					  "WHERE SPPS.PARAM_TABLE = SPP.PARAM_TABLE AND SPP.PARAM_TABLE    = (SELECT PROP_VALUE FROM PROPERTIES WHERE PROP_NAME = 'PARAM_TABLE') AND SPP.PRD_CODE  = '"+periodCode+"' " +
+					  "WHERE SPPS.PARAM_TABLE = SPP.PARAM_TABLE " +
+					  "AND SPP.PARAM_TABLE    = (SELECT PROP_VALUE FROM PROPERTIES WHERE PROP_NAME = 'PARAM_TABLE') AND SPP.PRD_CODE  = '"+periodCode+"' " +
 					  "ORDER BY SPPS.stan_type ) Query2 ON Query1.STATION_TYPE = Query2.STAN_TYPE) ORDER BY Query2.STAN_TYPE) group by emp_name";
 			}
 			else {
@@ -79,11 +79,17 @@ public class AdminPlan extends ValidatorEJB implements AdminPlanLocal,AdminPlanR
 					  " AS WORK_DAYS, Query2.WORK_DAYS AS ADM_WORK_DAYS, (select emp_fname || ' ' || emp_lname from employee " +
 					  "where emp_code = '"+salePersons+"') AS emp_name FROM ((SELECT COUNT(SR.STATION_TYPE) AS WORK_DAYS, " +
 					  "SR.STATION_TYPE, SP.SPRS_CODE__FOR FROM SPRS_PLAN SP INNER JOIN LOCALITY L ON SP.LOCALITY_CODE = L.LOCALITY_CODE " +
-					  "INNER JOIN SPRS_ROUTE SR ON SR.LOCALITY_CODE  = L.LOCALITY_CODE WHERE SPRS_CODE__FOR  in (select emp_code from employee start with emp_code = '"+salePersons+"' connect by prior emp_code = report_to) " +
-					  "AND SP.PLAN_DATE BETWEEN '"+fromDate+"' AND '"+toDate+"' GROUP BY SR.STATION_TYPE,SP.SPRS_CODE__FOR ORDER BY SR.STATION_TYPE ) Query1 " +
+					  "INNER JOIN SPRS_ROUTE SR ON SR.LOCALITY_CODE  = L.LOCALITY_CODE " +
+					  "WHERE SPRS_CODE__FOR  in (select emp_code from employee start with emp_code = '"+salePersons+"' connect by prior emp_code = report_to) " +
+					  "AND SP.PLAN_DATE BETWEEN '"+fromDate+"' AND '"+toDate+"' " +
+					  "GROUP BY SR.STATION_TYPE,SP.SPRS_CODE__FOR ORDER BY SR.STATION_TYPE ) Query1 " +
 					  "RIGHT JOIN (SELECT SPPS.STAN_TYPE, SPPS.WORK_DAYS FROM SF_PLAN_PARAM_STAN SPPS JOIN sf_plan_param SPP ON SPPS.PRD_CODE       = SPP.PRD_CODE " +
-					  "WHERE SPPS.PARAM_TABLE = SPP.PARAM_TABLE AND SPP.PARAM_TABLE    = (SELECT PROP_VALUE FROM PROPERTIES WHERE PROP_NAME = 'PARAM_TABLE') AND SPP.PRD_CODE  = '"+periodCode+"' " +
+					  "WHERE SPPS.PARAM_TABLE = SPP.PARAM_TABLE " +
+					  "AND SPP.PARAM_TABLE    = (SELECT PROP_VALUE FROM PROPERTIES WHERE PROP_NAME = 'PARAM_TABLE') AND SPP.PRD_CODE  = '"+periodCode+"' " +
 					  "ORDER BY SPPS.stan_type ) Query2 ON Query1.STATION_TYPE = Query2.STAN_TYPE) ORDER BY Query2.STAN_TYPE) group by emp_name";
+			
+				
+				
 			}
 			
 			pstmt = conn.prepareStatement(sql);
@@ -122,10 +128,8 @@ public class AdminPlan extends ValidatorEJB implements AdminPlanLocal,AdminPlanR
 		        rawDataAdminPlanDtlJson.put(count, rowData);
 		        count++;
 			}
-			rs.close();
-			rs=null;
-			pstmt.close();
-			pstmt=null;
+			rs    = null;
+			pstmt = null;
 			
 			System.out.println("rawDataPlanDtlJson :"+rawDataAdminPlanDtlJson);
 			
@@ -241,7 +245,8 @@ public class AdminPlan extends ValidatorEJB implements AdminPlanLocal,AdminPlanR
 				  "INNER JOIN SPRS_ROUTE SR ON SR.LOCALITY_CODE  = L.LOCALITY_CODE INNER JOIN EMPLOYEE E ON E.EMP_CODE   = SP.SPRS_CODE__FOR " +
 				  "WHERE SPRS_CODE__FOR  in "+appendSQL+" AND SP.PLAN_DATE BETWEEN '"+fromDate+"' AND '"+toDate+"' GROUP BY SR.STATION_TYPE,SP.SPRS_CODE__FOR," +
 				  "e.emp_fname,e.emp_lname ORDER BY SR.STATION_TYPE ) Query1 RIGHT JOIN (SELECT SPPS.STAN_TYPE, SPPS.WORK_DAYS FROM SF_PLAN_PARAM_STAN SPPS " +
-				  "JOIN sf_plan_param SPP ON SPPS.PRD_CODE = SPP.PRD_CODE WHERE SPPS.PARAM_TABLE = SPP.PARAM_TABLE AND SPP.PARAM_TABLE    = (" +
+				  "JOIN sf_plan_param SPP ON SPPS.PRD_CODE = SPP.PRD_CODE WHERE SPPS.PARAM_TABLE = SPP.PARAM_TABLE " +
+				  "AND SPP.PARAM_TABLE    = (" +
 				  "SELECT PROP_VALUE FROM PROPERTIES WHERE PROP_NAME = 'PARAM_TABLE') AND SPP.PRD_CODE  = '"+period+"' ORDER BY SPPS.stan_type ) Query2 " +
 				  "ON Query1.STATION_TYPE = Query2.STAN_TYPE) WHERE Query1.SPRS_CODE__FOR IS NOT NULL ORDER BY Query1.EMP_NAME,Query2.STAN_TYPE";
 			
@@ -306,10 +311,8 @@ public class AdminPlan extends ValidatorEJB implements AdminPlanLocal,AdminPlanR
 					salPersMap.put(salesPersCode, spStatDetailList);
 				}
 			}
-			rs.close();
-			rs=null;
-			pstmt.close();
-			pstmt=null;
+			rs    = null;
+			pstmt = null;
 			
 			for (Map.Entry<String, ArrayList<HashMap<String, String>>> entry : salPersMap.entrySet()) {
 				salesPersCode = entry.getKey();
@@ -433,6 +436,7 @@ public class AdminPlan extends ValidatorEJB implements AdminPlanLocal,AdminPlanR
 			System.out.println("fromDate:"+fromDate+" toDate:"+toDate+" period:"+period);
 			
 			appendSQL = " (select emp_code from employee where report_to = '"+spCode+"')";
+			
 			sql = "SELECT CASE WHEN TO_CHAR(Query1.WORK_DAYS) IS NULL THEN '0' ELSE TO_CHAR(Query1.WORK_DAYS) END AS WORK_DAYS, " +
 				  "Query2.STAN_TYPE AS STATION_TYPE, Query2.WORK_DAYS AS ADM_WORK_DAYS, Query1.SPRS_CODE__FOR AS SPRS_CODE, " +
 				  "Query1.emp_name FROM( (SELECT COUNT(SR.STATION_TYPE) AS WORK_DAYS, SR.STATION_TYPE, SP.SPRS_CODE__FOR, " +
@@ -505,10 +509,8 @@ public class AdminPlan extends ValidatorEJB implements AdminPlanLocal,AdminPlanR
 					salPersMap.put(salesPersCode, spStatDetailList);
 				}
 			}
-			rs.close();
-			rs=null;
-			pstmt.close();
-			pstmt=null;
+			rs    = null;
+			pstmt = null;
 			
 			for (Map.Entry<String, ArrayList<HashMap<String, String>>> entry : salPersMap.entrySet()) {
 				salesPersCode = entry.getKey();

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

 package ibase.dashboard.sfa.ejb;
-
 import ibase.system.config.ConnDriver;
+import ibase.utility.CommonConstants;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.utility.ITMException;
-
+import java.io.File;
 import java.rmi.RemoteException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-
+import java.util.Arrays;
 import javax.ejb.Stateless;
-
+import org.json.simple.JSONObject;
 /**
  * Session Bean implementation class ImpEvents
  */
@@ -24,14 +24,254 @@ public class ImpEvents  extends ValidatorEJB implements ImpEventsRemote, ImpEven
         // TODO Auto-generated constructor stub
     }
 
+
+	
+    @SuppressWarnings("unchecked")
 	@Override
-    public String getData() throws RemoteException, ITMException
+	public JSONObject getEvents(String empCode, String dataSourceName) throws RemoteException, ITMException {
+		
+    	System.out.println("@@@@@@@@@@@@ImpEvents@@@@@@@@@@@ImpEvents@@@@@@@@@@");
+    	
+    	JSONObject rawDataTomorrowEventsJson = new JSONObject();
+    	JSONObject rowData = null;
+    	String sql         = "";
+    	ResultSet rs       = null;
+    	PreparedStatement pstmt = null;
+    	Connection conn = null;
+    	ConnDriver connDriver = new ConnDriver();
+    	String tranType = "",  tran_image = "";
+    	StringBuffer createHtmlData =null;
+    	
+    	try
+    	{
+    		
+    	System.out.println(" Inside ImpEvents for getTomorrowEvents Data Source Name ="+dataSourceName+" Employee Code="+ empCode);
+    	conn = connDriver.getConnectDB(dataSourceName);
+    	connDriver = null;	
+    	createHtmlData = new StringBuffer();
+    	String userImagePath    = CommonConstants.JBOSSHOME + File.separator +"server"+File.separator +"default"+File.separator +"deploy"+File.separator +"ibase.ear"+File.separator + "ibase.war" +File.separator +  "resource" + File.separator + "images"+ File.separator + "users"+File.separator;
+        if (empCode!=null)
+        {
+    	
+        	sql = "select STRG_EVENTS.EVENT_DATE as Event_Date, STRG_CUSTOMER.SC_CODE, INITCAP(strg_customer.first_name||' '||strg_customer.middle_name||' '||strg_customer.last_name )AS DrName, LISTAGG(STRG_EVENTS.DESCR, ', ') WITHIN GROUP (ORDER BY STRG_EVENTS.DESCR) as Event FROM SALES_PERS INNER JOIN STRG_SERIES on STRG_SERIES.SALES_PERS = SALES_PERS.SALES_PERS and STRG_SERIES.Cust_Type = 'D' and STRG_SERIES.Status = 'Y' INNER JOIN STRG_CUSTOMER ON STRG_CUSTOMER.SC_CODE = STRG_SERIES.SC_CODE INNER JOIN STRG_EVENTS ON STRG_CUSTOMER.SC_CODE = STRG_EVENTS.SC_CODE "
+        			+ "WHERE SALES_PERS.SALES_PERS = ?"
+        			+ " AND STRG_EVENTS.EVENT_DATE  <= TO_DATE(sysdate,'dd/mm/yy HH24:MI:SS') group by STRG_EVENTS.EVENT_DATE , STRG_CUSTOMER.SC_CODE, strg_customer.first_name, strg_customer.middle_name, strg_customer.last_name";
+        	
+    	pstmt = conn.prepareStatement(sql);
+    	//pstmt.setString(1, empCode);
+    	rs = pstmt.executeQuery();
+    	
+    	int count = 0;	
+    	String doctorName = "";
+    	createHtmlData.append("<table  cellspacing='1' style='color:#000; width:100%; margin:auto; ' align='center' width='100%'>"
+    			+ "<tr><td class='defaultTitle'>Today</td>"
+    			+ "</tr>");
+    	rowData = new JSONObject();
+    	File file =null;
+    	while (rs.next())
+    	{
+    		doctorName = checkNull(rs.getString("DrName"));
+    	     file      = new File(userImagePath+tranType+".png");
+		if(file.exists())
 		{
-	    // TODO Auto-generated method stub
-	    return null;
+			tran_image = "<img class='cardProdImg2' src='"+CommonConstants.TOMCAT_HOME+"/ibase/resource/images/users/"+doctorName+".png'/>";
 		}
+		else
+		{
+			String[] splited = doctorName.split(" ");
+			System.out.println("::::::::::::::::splitted getTodayEvents : "+Arrays.toString(splited));
+			String defaultUserImg = ""+splited[0].charAt(0);
+			if(splited.length==2)
+			{
+				String lastWord = ""+splited[1].charAt(0);
+				System.out.println("lastWord  getTodayAgenda :"+lastWord);
+				defaultUserImg = defaultUserImg + ""+lastWord.charAt(0);
+			}
+			else if(splited.length>2)
+			{
+				defaultUserImg = defaultUserImg + splited[splited.length - 1].charAt(0);
+			}
+			defaultUserImg = defaultUserImg.toUpperCase();
+			System.out.println("defaultUserImg :"+defaultUserImg);
 			
-	@Override
+			tran_image = "<span class='defaultIconImage'> "+defaultUserImg+" </span>";
+			
+		}
+		createHtmlData.append(""
+				+ "<tr class='row'> <td><table style='border-bottom:1px solid #E8E8E8;' width='100%' >"
+				+ "<td width = '4%'>"+tran_image+"</td><td align = 'left'>"
+				+ "<table cellspacing='0' cellpadding='0'  ><tr><td class='defaultIconTitle'> "+doctorName+"</td></tr>"
+				+ "<tr><td class='defaultIconSubTitle' >"+checkNull(rs.getString("Event"))+" "+checkNull(rs.getString("EVENT_DATE"))+"</td></tr></table>"
+				+ "</td></table></td></tr>");
+    	
+    	}
+    	rs.close();
+    	rs=null;
+    	pstmt.close();
+    	pstmt=null;
+    	//End of todays event
+    	
+    	createHtmlData.append(
+    			  "<tr><td class='defaultTitle' >Tommorow</td>"
+    			+ "</tr>");
+    	//Start of Tommorow events
+    	sql="select STRG_EVENTS.EVENT_DATE as Event_Date, STRG_CUSTOMER.SC_CODE, INITCAP(strg_customer.first_name||' '||strg_customer.middle_name||' '||strg_customer.last_name )AS DrName, LISTAGG(STRG_EVENTS.DESCR, ', ') WITHIN GROUP (ORDER BY STRG_EVENTS.DESCR) as Event FROM SALES_PERS INNER JOIN STRG_SERIES on STRG_SERIES.SALES_PERS = SALES_PERS.SALES_PERS and STRG_SERIES.Cust_Type = 'D' and STRG_SERIES.Status = 'Y' INNER JOIN STRG_CUSTOMER ON STRG_CUSTOMER.SC_CODE = STRG_SERIES.SC_CODE INNER JOIN STRG_EVENTS ON STRG_CUSTOMER.SC_CODE = STRG_EVENTS.SC_CODE "
+    			+ "WHERE SALES_PERS.SALES_PERS = ?  "
+    			+ "AND STRG_EVENTS.EVENT_DATE  <= TO_DATE(sysdate,'dd/mm/yy HH24:MI:SS') + 1 group by STRG_EVENTS.EVENT_DATE , STRG_CUSTOMER.SC_CODE, strg_customer.first_name, strg_customer.middle_name, strg_customer.last_name";
+    	
+    	pstmt = conn.prepareStatement(sql);
+    	//pstmt.setString(1, empCode);
+    	rs = pstmt.executeQuery();
+    	
+    	while(rs.next()) 
+    	{
+
+    	doctorName = checkNull(rs.getString("DrName"));
+    	file      = new File(userImagePath+tranType+".png");
+		if(file.exists())
+		{
+			tran_image = "<img class='cardProdImg2' src='"+CommonConstants.TOMCAT_HOME+"/ibase/resource/images/users/"+doctorName+".png'/>";
+		}
+		else
+		{
+			String[] splited = doctorName.split(" ");
+			System.out.println("::::::::::::::::splitted getTomorrowEvents : "+Arrays.toString(splited));
+			String defaultUserImg = ""+splited[0].charAt(0);
+			if(splited.length==2)
+			{
+				String lastWord = ""+splited[1].charAt(0);
+				System.out.println("lastWord  getTodayAgenda :"+lastWord);
+				defaultUserImg = defaultUserImg + ""+lastWord.charAt(0);
+			}
+			else if(splited.length>2)
+			{
+				defaultUserImg = defaultUserImg + splited[splited.length - 1].charAt(0);
+			}
+			defaultUserImg = defaultUserImg.toUpperCase();
+			System.out.println("defaultUserImg :"+defaultUserImg);
+			
+			tran_image = "<span class='defaultIconImage'> "+defaultUserImg+" </span>";
+			
+		}
+		createHtmlData.append(""
+				+ "<tr class='row'> <td><table style='border-bottom:1px solid #E8E8E8;' width='100%' >"
+				+ "<td width = '4%'>"+tran_image+"</td><td align = 'left'>"
+				+ "<table cellspacing='0' cellpadding='0 width='70%' style='padding-left:10px;' ><tr><td class='defaultIconTitle' >"+doctorName+"</td></tr>"
+				+ "<tr><td class='defaultIconSubTitle'  >"+checkNull(rs.getString("Event"))+" "+checkNull(rs.getString("EVENT_DATE"))+"</td></tr></table>"
+				+ "</td></table></td></tr>");
+		
+		/*createHtmlData.append(""
+				+ "<tr class='row'> <td><table style='border-bottom:1px solid #E8E8E8;' width='100%' >"
+				+ "<td width = '6%'>"+tran_image+"</td><td align = 'left'>"
+				+ "<table cellspacing='0' cellpadding='0 width='70%' style='padding-left:10px;' ><tr><td>"+doctorName+"</td></tr>"
+				+ "<tr align='left' style='color: gray;' ><td>"+checkNull(rs.getString("Event"))+" "+checkNull(rs.getString("EVENT_DATE"))+"</td></tr></table>"
+				+ "</td></table></td></tr>");*/
+		
+    	}
+    	rs.close();
+    	rs=null;
+    	pstmt.close();
+    	pstmt=null;
+    	//End of Tommorows events
+    	
+    	
+    	createHtmlData.append(
+  			  "<tr><td  class='defaultTitle' >Upcoming Events</td>"
+  			+ "</tr>");
+    	//Start of Upcoming events
+   
+    	sql="select STRG_EVENTS.EVENT_DATE as Event_Date, STRG_CUSTOMER.SC_CODE, INITCAP(strg_customer.first_name||' '||strg_customer.middle_name||' '||strg_customer.last_name )AS DrName, LISTAGG(STRG_EVENTS.DESCR, ', ') WITHIN GROUP (ORDER BY STRG_EVENTS.DESCR) as Event FROM SALES_PERS INNER JOIN STRG_SERIES on STRG_SERIES.SALES_PERS = SALES_PERS.SALES_PERS and STRG_SERIES.Cust_Type = 'D' and STRG_SERIES.Status = 'Y' INNER JOIN STRG_CUSTOMER ON STRG_CUSTOMER.SC_CODE = STRG_SERIES.SC_CODE INNER JOIN STRG_EVENTS ON STRG_CUSTOMER.SC_CODE = STRG_EVENTS.SC_CODE "
+    			+ " WHERE SALES_PERS.SALES_PERS = ? "
+    			+ " AND STRG_EVENTS.EVENT_DATE >= TO_DATE(sysdate,'dd/mm/yy HH24:MI:SS')+2 AND STRG_EVENTS.EVENT_DATE <= TO_DATE(sysdate,'dd/mm/yy HH24:MI:SS')+8 group by STRG_EVENTS.EVENT_DATE, STRG_CUSTOMER.SC_CODE, strg_customer.first_name, strg_customer.middle_name, strg_customer.last_name";
+    	pstmt = conn.prepareStatement(sql);
+    	//pstmt.setString(1, empCode);
+    	rs = pstmt.executeQuery();
+    	
+    	while(rs.next())
+    	{
+
+    		doctorName = checkNull(rs.getString("DrName"));
+    	   file       = new File(userImagePath+tranType+".png");
+		if(file.exists())
+		{
+			tran_image = "<img class='cardProdImg2' src='"+CommonConstants.TOMCAT_HOME+"/ibase/resource/images/users/"+doctorName+".png'/>";
+		}
+		else
+		{
+			String[] splited = doctorName.split(" ");
+			System.out.println("::::::::::::::::splitted Upcoming events : "+Arrays.toString(splited));
+			String defaultUserImg = ""+splited[0].charAt(0);
+			if(splited.length==2)
+			{
+				String lastWord = ""+splited[1].charAt(0);
+				System.out.println("lastWord  getTodayAgenda :"+lastWord);
+				defaultUserImg = defaultUserImg + ""+lastWord.charAt(0);
+			}
+			else if(splited.length>2)
+			{
+				defaultUserImg = defaultUserImg + splited[splited.length - 1].charAt(0);
+			}
+			defaultUserImg = defaultUserImg.toUpperCase();
+			System.out.println("defaultUserImg :"+defaultUserImg);
+			
+			tran_image = "<span class='defaultIconImage'> "+defaultUserImg+" </span>";
+			
+		}
+		createHtmlData.append(""
+				+ "<tr class='row'> <td><table style='border-bottom:1px solid #E8E8E8;' width='100%' >"
+				+ "<td width = '4%'>"+tran_image+"</td><td align = 'left'>"
+				+ "<table cellspacing='0' cellpadding='0 width='70%' style='padding-left:10px;' ><tr class='defaultIconTitle' ><td>"+doctorName+"</td></tr>"
+				+ "<tr><td class='defaultIconSubTitle'>"+checkNull(rs.getString("Event"))+" "+checkNull(rs.getString("EVENT_DATE"))+"</td></tr></table>"
+				+ "</td></table></td></tr>");
+    		
+    	}
+    	rs.close();
+    	rs=null;
+    	pstmt.close();
+    	pstmt=null;
+        	
+    	createHtmlData.append("</table>");
+    	rowData.put("todayEvent", createHtmlData.toString());
+    	rawDataTomorrowEventsJson.put(count, rowData);
+    	count++;
+    	  }
+    	}
+    	catch (Exception e)
+    	{
+    	e.printStackTrace();
+    	throw new ITMException(e);
+    	}
+    	finally
+    	{
+    	try
+    	{
+    	if (conn != null)
+    	{
+    	if (rs != null)
+    	rs.close();
+    	rs = null;
+    	if (pstmt != null)
+    	pstmt.close();
+    	pstmt = null;
+    	conn.close();
+    	conn = null;
+    	}
+    	conn = null;
+    	} catch (Exception d)
+    	{
+    	d.printStackTrace();
+    	System.out.println("Exception in :ImpEvents:" + d.getMessage());
+    	throw new ITMException(d);
+    	}
+    	}
+    	System.out.println("ImpEvents JSON String======>>"+rawDataTomorrowEventsJson.toString());
+    	return rawDataTomorrowEventsJson;
+
+    	}
+
+	
+	
+	/*@Override
     public String getData(String loginCode) throws RemoteException, ITMException
     {
 
@@ -48,6 +288,7 @@ public class ImpEvents  extends ValidatorEJB implements ImpEventsRemote, ImpEven
 			connDriver = null;
 				
 			    xmlData = new StringBuffer("<?xml version=\"1.0\"?><Root>");
+			    
 				sql = "select STRG_EVENTS.EVENT_DATE as Event_Date, STRG_CUSTOMER.SC_CODE, INITCAP(strg_customer.first_name||' '||strg_customer.middle_name||' '||strg_customer.last_name )AS DrName, LISTAGG(STRG_EVENTS.DESCR, ', ') WITHIN GROUP (ORDER BY STRG_EVENTS.DESCR) as Event FROM SALES_PERS INNER JOIN STRG_SERIES on STRG_SERIES.SALES_PERS = SALES_PERS.SALES_PERS and STRG_SERIES.Cust_Type = 'D' and STRG_SERIES.Status = 'Y' INNER JOIN STRG_CUSTOMER ON STRG_CUSTOMER.SC_CODE = STRG_SERIES.SC_CODE INNER JOIN STRG_EVENTS ON STRG_CUSTOMER.SC_CODE = STRG_EVENTS.SC_CODE WHERE SALES_PERS.SALES_PERS = ? AND STRG_EVENTS.EVENT_DATE  = TO_DATE(sysdate,'dd/mm/yy HH24:MI:SS') group by STRG_EVENTS.EVENT_DATE , STRG_CUSTOMER.SC_CODE, strg_customer.first_name, strg_customer.middle_name, strg_customer.last_name";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, loginCode);
@@ -71,6 +312,7 @@ public class ImpEvents  extends ValidatorEJB implements ImpEventsRemote, ImpEven
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, loginCode);
 				rs = pstmt.executeQuery();
+				
 				while (rs.next())
 				{
 					xmlData.append("<Detail2>");
@@ -135,7 +377,7 @@ public class ImpEvents  extends ValidatorEJB implements ImpEventsRemote, ImpEven
 	
     
     
-    }
+    }*/
 	
 	private String checkNull(String input)
 	{
@@ -149,4 +391,20 @@ public class ImpEvents  extends ValidatorEJB implements ImpEventsRemote, ImpEven
 		return input;
 	}
 
+
+
+/*	createHtmlData.append("<tr><td><div style='background-color: #89ccff; color:#FFF; padding: 3px 0px 0px 0px;'>"
+			+ "<div style='border-radius: 50%; background-color: #7bc6ff; height: 30px; width: 30px; padding: 2px;"
+			+ " margin-left:3px;'>{imageName0}</div><div align='right' style='padding: 10px;color:#FFF;'> <span style='font-size:2em; "
+			+ "color:#FFF; padding-left: 5px; font-weight: 600;'>{totalAmount0}</span></div><div style='height:15px;'></div><div style='text-align: center; background-color: #7bc6ff;"
+			+ " font-size:14px; padding: 0.5em; color:#FFF;'>{labelTitleType0}</div></div></td></tr>");
+
+*/
+
+	
+
+	
+
+	
+
 }

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

@@ -5,10 +5,13 @@ import java.rmi.RemoteException;
 
 import javax.ejb.Local;
 
+import org.json.simple.JSONObject;
+
 @Local
 public interface ImpEventsLocal {
 	
-	public String getData(String loginCode) throws RemoteException, ITMException;
-	public String getData() throws RemoteException,ITMException;
+	public JSONObject getEvents(String loginCode, String dataSourceName) throws RemoteException, ITMException;
+	//public String getData(String loginCode) throws RemoteException, ITMException;
+	
 
 }

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

@@ -6,12 +6,16 @@ import java.rmi.RemoteException;
 
 import javax.ejb.Remote;
 
+import org.json.simple.JSONObject;
+
 @Remote
 public interface ImpEventsRemote
 {
 
-	public String getData(String loginCode) throws RemoteException, ITMException;
+	//public String getData(String loginCode) throws RemoteException, ITMException;
+	
+	public JSONObject getEvents(String loginCode, String dataSourceName) throws RemoteException, ITMException;
+
 	
-	public String getData() throws RemoteException, ITMException;
 
 }

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

@@ -129,6 +129,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
 				docNamewithImage = getImageStrfromName(docName);
 				locality = rs.getString("LOCALITY");
 				speciality = rs.getString("SPECIALITY");
+				
 				planHashMap = new  HashMap<String, ArrayList<String>>();
 				if(finalMap!=null && finalMap.containsKey(eventDate))
 				{
@@ -258,7 +259,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
 		String retString = "";
 		if(file.exists())
 		{
-			retString = "<img class='cardProdImg1' src='"+CommonConstants.TOMCAT_HOME+"/ibase/resource/images/users/"+doctorName+".png'/>";
+			retString = "<img class='defaultIconImage' src='"+CommonConstants.TOMCAT_HOME+"/ibase/resource/images/users/"+doctorName+".png'/>";
 		}else
 		{
 			doctorName = doctorName.trim();
@@ -274,7 +275,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
 			}
 			System.out.println("defaultUserImg :"+defaultUserImg);
 			
-			retString = "<div class='defaultUserImg1'> "+defaultUserImg+" </div>";
+			retString = "<div class='defaultIconImage'> "+defaultUserImg+" </div>";
 		}
 		System.out.println("doctorName = "+doctorName+"retString ="+retString);
 		retString = doctorName+"~"+retString;
@@ -332,7 +333,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
 			    if(!locality.equalsIgnoreCase(prvlocality))
 				{
 			    	rawJson.put("locality", locality);
-			    	rawJson.put("cardSalesPersonTitle", "cardSalesPersonTitle");
+			    	rawJson.put("defaultIconTitle", "defaultIconTitle");
 					System.out.println("locality :"+locality);
 					prvlocality  = locality;
 				}else
@@ -343,7 +344,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
 				File file = new File(userImagePath+doctorName+".png");
 				if(file.exists())
 				{
-					rawJson.put("doctor_image", "<img class='cardProdImg1' src='"+CommonConstants.TOMCAT_HOME+"/ibase/resource/images/users/"+doctorName+".png'/>");
+					rawJson.put("doctor_image", "<img class='defaultIconImage' src='"+CommonConstants.TOMCAT_HOME+"/ibase/resource/images/users/"+doctorName+".png'/>");
 				}else
 				{
 					doctorName = doctorName.trim();
@@ -359,16 +360,19 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
 					}
 					System.out.println("defaultUserImg :"+defaultUserImg);
 					
-					rawJson.put("doctor_image", "<div class='defaultUserImg1'> "+defaultUserImg+" </div>");
+					rawJson.put("doctor_image", "<div class='defaultIconImage'> "+defaultUserImg+" </div>");
 				}
+				//doctorName = "<div class='defaultIconTitle'> "+doctorName+" </div>";
+				//String speciality = "<div class='defaultIconSubTitle'> "+rs.getString("SPECIALITY")+" </div>";
 				
 				rawJson.put("doctorName", doctorName);
 				rawJson.put("time", "10:00 am");
-				rawJson.put("speciality", rs.getString("SPECIALITY"));
+				
+				//rawJson.put("speciality", rs.getString("SPECIALITY"));
+				//rawJson.put("speciality", speciality);
+				
 				if(strgCodeList.contains(scCode)){
-					//Changes done due to redirection of IP at client side
-					//rawJson.put("meet_status", "<img class='cardProdImg1' src='"+CommonConstants.TOMCAT_HOME+"/ibase/dwh/FusionChart/images/Tick-mark.png'/>");
-					rawJson.put("meet_status", "<img class='cardProdImg1' src='/ibase/dwh/FusionChart/images/Tick-mark.png'/>");
+					rawJson.put("meet_status", "<img class='defaultIconImage' src='/ibase/dwh/FusionChart/images/Tick-mark.png'/>");
 				}
 				else{
 					rawJson.put("meet_status", "");

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

+package ibase.dashboard.sfa.servlet;
+
+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;
+import ibase.dashboard.sfa.ejb.ImpEventsRemote;
+import ibase.system.config.AppConnectParm;
+import ibase.utility.UserInfoBean;
+import ibase.webitm.utility.ITMException;
+
+public class ImportantEventServlet extends HttpServlet
+{	
+	
+	
+	private static final long serialVersionUID = 1L;
+	JSONObject jsonObjMetaData = null;
+	JSONObject jsonMetaData = null;
+	
+	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("@@@@@@@@@@@@@@@@ImportantEventServlet@@@@@@@@@@@@@@@@ DOPOST @@@@@@@@@");
+		
+		ImpEventsRemote impEventsRemote = null;
+		InitialContext context           = null;
+		AppConnectParm appConnectParm    = new AppConnectParm();
+		String dataSourceName      = "";
+		String empCode             = "" ;
+		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");			
+			if(userInfo != null)
+			{
+				empCode = userInfo.getEmpCode();
+			}	
+			else {
+				
+				empCode ="BASE";
+			}
+			dataSourceName = request.getParameter("dataSourceName");			
+			context        = new InitialContext(appConnectParm.getProperty());	
+			System.out.println("do post 1");
+			impEventsRemote =  (ImpEventsRemote)context.lookup("ibase/ImpEvents/remote");	
+			System.out.println("do post 2");
+			jsonObjData    = (JSONObject) impEventsRemote.getEvents(empCode,dataSourceName);
+			outputStream   = response.getOutputStream();
+			outputStream.write(jsonObjData.toString().getBytes());
+			outputStream.flush();
+			outputStream.close();
+			System.out.println(" Final data set in ImpEventsRemote  build the Graph ="+ jsonObjData);
+
+		}
+		catch (Exception e)
+		{
+			System.out
+					.println("Exception : ImpEventsRemote :doPost(HttpServletRequest request, HttpServletResponse response) :"
+							+ e);
+			try
+			{
+				throw new ITMException(e);
+			}
+			catch (ITMException e1)
+			{
+				e1.printStackTrace();
+			}
+		}
+	}
+
+}