Updated changes for todays call dashboard

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

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

@@ -2405,7 +2405,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
 		try {
 			conn = connDriver.getConnectDB(dataSourceName);
 			connDriver=null;
-			sql = "SELECT SCT.SH_DESCR," + 
+			sql = "SELECT SCT.TYPE, SCT.SH_DESCR," + 
 					" COUNT(*) AS COUNT" + 
 					" FROM STRG_SERIES SS" + 
 					" INNER JOIN STRG_MEET SM" + 
@@ -2425,7 +2425,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
 					" SELECT ACTIVITY_CODE FROM FIELDACTIVITY WHERE ACTIVITY_TYPE = 'PR'" + 
 					" )" + 
 					" AND SCT.TYPE = SM.STRG_TYPE" + 
-					" GROUP BY SCT.SH_DESCR";
+					" GROUP BY SCT.TYPE,SCT.SH_DESCR";
 			 System.out.println("countOfListedUnlisted 1 sql "+sql);
 			pstmt    = conn.prepareStatement(sql,ResultSet.TYPE_SCROLL_SENSITIVE,ResultSet.CONCUR_READ_ONLY);
             rs       = pstmt.executeQuery();
@@ -2458,7 +2458,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
 			JSONObject visitSummerObj=new JSONObject();
 			if(sfaParmVal.indexOf("D") != -1)
 			{			    
-    			String drCount = visitSummaryMap.get("DOCTOR");
+    			String drCount = visitSummaryMap.get("D");
     			drCount = drCount != null ? drCount : "0";
                 visitSummerObj.put("OPTION_NAME", "Doctor");
     			visitSummerObj.put("OPTION_VALUE", drCount);
@@ -2466,7 +2466,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
 			}
 			if(sfaParmVal.indexOf("S") != -1)
 			{
-    			String stkCount = visitSummaryMap.get("STOCKIST");
+    			String stkCount = visitSummaryMap.get("S");
     			stkCount = stkCount != null ? stkCount : "0";
     			visitSummerObj=new JSONObject();
                 visitSummerObj.put("OPTION_NAME", "Distributer");
@@ -2475,7 +2475,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
 			}
 			if(sfaParmVal.indexOf("C") != -1)
 			{			    
-    			String chmCount = visitSummaryMap.get("CHEMIST");
+    			String chmCount = visitSummaryMap.get("C");
     			chmCount = chmCount != null ? chmCount : "0";
     			visitSummerObj=new JSONObject();
                 visitSummerObj.put("OPTION_NAME", "Retailer");