Updated

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

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

 package ibase.dashboard.sfa.ejb;
 
-import java.io.File;
 import java.rmi.RemoteException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.util.Date;
+
 import javax.ejb.Stateless;
 
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import ibase.system.config.ConnDriver;
-import ibase.utility.CommonConstants;
 import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.utility.ITMException;
@@ -218,11 +218,12 @@ public class ImpEvents  extends ValidatorEJB implements ImpEventsRemote, ImpEven
 		JSONArray eventsArray = new JSONArray();
 		try 
 		{
-			String eventSelectPart = "SELECT TO_CHAR(STRG_EVENTS.EVENT_DATE,'DD-MON-YYYY') AS EVENT_DATE,STRG_CUSTOMER.MOBILE_NO AS DR_MOBILE_NO, "
-					+ " TRUNC(TO_DATE( ( TO_CHAR(SYSDATE,'YYYY') || TO_CHAR(EVENT_DATE,'MMDDHH24MISS') ), 'YYYYMMDDHH24MISS' )) AS PRESENT_DATE, "
+			String eventSelectPart = "SELECT TO_CHAR(STRG_EVENTS.EVENT_DATE,'DD-MON-YYYY') AS EVENT_DATE,"
+					+ " STRG_CUSTOMER.MOBILE_NO AS DR_MOBILE_NO, "
+					+ " TO_CHAR(TO_DATE( ( TO_CHAR(SYSDATE,'YYYY') || TO_CHAR(EVENT_DATE,'MMDDHH24MISS') ), 'YYYYMMDDHH24MISS' ),'DD-MON-YYYY') AS PRESENT_DATE, "
 					+ " STRG_CUSTOMER.SC_CODE, "
 					+ " INITCAP(STRG_CUSTOMER.FIRST_NAME||' '||STRG_CUSTOMER.MIDDLE_NAME||' '||STRG_CUSTOMER.LAST_NAME )AS DR_NAME, "
-					+ " LISTAGG(STRG_EVENTS.DESCR, ', ') WITHIN GROUP (ORDER BY STRG_EVENTS.DESCR) as EVENT"
+					+ " INITCAP( 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' "
@@ -244,9 +245,10 @@ public class ImpEvents  extends ValidatorEJB implements ImpEventsRemote, ImpEven
 						+ " STRG_CUSTOMER.FIRST_NAME,"
 						+ " STRG_CUSTOMER.MIDDLE_NAME,"
 						+ " STRG_CUSTOMER.LAST_NAME,"
-						+ " STRG_CUSTOMER.MOBILE_NO ";
+						+ " STRG_CUSTOMER.MOBILE_NO "
+						+ " ORDER BY PRESENT_DATE ";
  
-				JSONArray todaysData = getData(dataSourceName, empCode, todaySql, "TODAY");
+				JSONArray todaysData = getData(dataSourceName, empCode, todaySql, "EV1_TODAY");
 				eventsArray.addAll(todaysData);
 				//EventsDataJson.put("TODAY", todaysData);
 				// End of todays event
@@ -265,9 +267,10 @@ public class ImpEvents  extends ValidatorEJB implements ImpEventsRemote, ImpEven
 						+ " STRG_CUSTOMER.FIRST_NAME,"
 						+ " STRG_CUSTOMER.MIDDLE_NAME,"
 						+ " STRG_CUSTOMER.LAST_NAME,"
-						+ " STRG_CUSTOMER.MOBILE_NO ";
+						+ " STRG_CUSTOMER.MOBILE_NO "
+						+ " ORDER BY PRESENT_DATE ";
 				
-				JSONArray thisWeekData = getData(dataSourceName, empCode, thisWeekSql, "WEEK_DATA");
+				JSONArray thisWeekData = getData(dataSourceName, empCode, thisWeekSql, "EV2_WEEK_DATA");
 				eventsArray.addAll(thisWeekData);
  
 				//EventsDataJson.put("WEEK_DATA", thisWeekData);
@@ -285,9 +288,10 @@ public class ImpEvents  extends ValidatorEJB implements ImpEventsRemote, ImpEven
 						+ " STRG_CUSTOMER.FIRST_NAME,"
 						+ " STRG_CUSTOMER.MIDDLE_NAME,"
 						+ " STRG_CUSTOMER.LAST_NAME,"
-						+ " STRG_CUSTOMER.MOBILE_NO ";
+						+ " STRG_CUSTOMER.MOBILE_NO "
+						+ " ORDER BY PRESENT_DATE ";
 				
-				JSONArray nextWeekData = getData(dataSourceName, empCode, nextWeekSql, "NEXT_WEEK_DATA");
+				JSONArray nextWeekData = getData(dataSourceName, empCode, nextWeekSql, "EV3_NEXT_WEEK_DATA");
 				eventsArray.addAll(nextWeekData);
 				//EventsDataJson.put("NEXT_WEEK_DATA", nextWeekData);
 				// End of nextWeekData
@@ -335,6 +339,13 @@ public class ImpEvents  extends ValidatorEJB implements ImpEventsRemote, ImpEven
  
 				finalDataArray.add(finalDataObject);
 			}
+			
+			if( finalDataArray.isEmpty() )
+			{
+				JSONObject finalDataObject = new JSONObject();
+				finalDataObject.put("EVENT_INTERVAL", eventInterval);
+				finalDataArray.add(finalDataObject);
+			}
 			rs.close();
 			rs = null;
 			pstmt.close();

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

@@ -1580,7 +1580,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
 				"  SS.NO_VISIT," + 
 				"  INITCAP(SS.Class_Code_Descr) AS CLASS_CODE_DESCR," + 
 				"  (" + 
-				"  select max(event_date)  " + 
+				"  select to_char( max(event_date), 'DD-MON-YYYY' )  " + 
 				"  from strg_meet" + 
 				"  where sales_pers = sp.sales_pers" + 
 				"  AND event_date < to_date('1'||'/'|| dm.month||'/'|| dm.year,'dd/mm/yyyy')" + 
@@ -1708,6 +1708,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
 				//	visitSince = lastVisitArr[1];
 				//}
 				//System.out.println("lastVisitStr == > [" +lastVisitStr + "] lastVisit[" + lastVisit + "]visitSince[ "+ visitSince + "]");
+				//lastVisit = e12GenUtility.getValidDateString(lastVisit, "DD-MON-YYYY");
 				missCallObject.put("LAST_VISIT", lastVisit);
 				missCallObject.put("DAYS_SINCE", visitSince);				
 				missCallObject.put("LOCALITY", checkNull(rs.getString("LOCALITY")));
@@ -1760,6 +1761,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
 	}
 	//Added by Priyanka B. as per Prajyot R. [Missed Calls Dashboard] End	
 	
+	
 }