Updated changes in today call query

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

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

@@ -2058,6 +2058,9 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
 				
 				int count1=Integer.parseInt(rs.getString("COUNT"));
 				System.out.println("count in countOfListedUnlisted 1 "+count1);
+				
+				visitSummaryMap.put(shDescr, ""+count1);
+				listedCount=listedCount+count1;
 //				if(shDescr.equalsIgnoreCase("DOCTOR")) {
 //					visitSummerObj.put("OPTION_NAME", "Doctor");
 //					visitSummerObj.put("OPTION_VALUE", count1);
@@ -2070,8 +2073,6 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
 //					visitSummerObj.put("OPTION_NAME", "Distributer");
 //					visitSummerObj.put("OPTION_VALUE", count1);
 //				}
-				visitSummaryMap.put(shDescr, ""+count1);
-				listedCount=listedCount+count1;
 //				visitSummeryArray.add(visitSummerObj);
 			}
 			
@@ -2185,7 +2186,8 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
 					"  LOC.DESCR         AS Locality, " + 
 					"  SCT.SH_DESCR, " + 
 					"  (SM.STRG_TYPE)        AS STRG_TYPE, " + 
-					"  (SM.EVENT_TIME_START) AS START_TIME " + 
+					"  (SM.EVENT_TIME_START) AS START_TIME, " +
+					"  CASE WHEN INSTR(SM.EVENT_TIME_START, 'A') > 0  THEN 1 ELSE 2 END AS TIME_SORT " + 
 					"FROM STRG_MEET SM " + 
 					"INNER JOIN SALES_PERS SP " + 
 					"ON SP.SALES_PERS = SM.SALES_PERS, " + 
@@ -2206,7 +2208,8 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
 					"  LOC.DESCR             AS Locality, " + 
 					"  'MISSED'              AS SH_DESCR, " + 
 					"  SC.CUST_TYPE          AS STRG_TYPE, " + 
-					"  (SPC.PLAN_TIME_START) AS START_TIME " + 
+					"  (SPC.PLAN_TIME_START) AS START_TIME, " +
+					"  CASE WHEN INSTR(SPC.PLAN_TIME_START, 'A') > 0  THEN 1 ELSE 2 END AS TIME_SORT " + 
 					"FROM SPRS_PLAN_HDR SPH " + 
 					"INNER JOIN SPRS_PLAN_CUST SPC " + 
 					"ON SPC.PLAN_ID = SPH.PLAN_ID " + 
@@ -2233,7 +2236,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
 					"    (SELECT ACTIVITY_CODE FROM FIELDACTIVITY WHERE ACTIVITY_TYPE = 'PR' " + 
 					"    ) " + 
 					"  ) " + 
-					"ORDER BY locality";	
+					"ORDER BY locality, TIME_SORT, START_TIME ";	
 			 System.out.println("getTodaysCallData sql "+sql);
 			pstmt    = conn.prepareStatement(sql,ResultSet.TYPE_SCROLL_SENSITIVE,ResultSet.CONCUR_READ_ONLY);
             rs       = pstmt.executeQuery();