Updated changes for cg crm dashboard

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

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

@@ -145,7 +145,7 @@ public class ConsumerGoodsCRM extends ValidatorEJB implements ConsumerGoodsCRMLo
 				
 				workDetail = new JSONObject();
 				workDetail.put("count", ordVal);
-				workDetail.put("value", "Orders");
+				workDetail.put("value", "Order Value");
 				workDetail.put("color", "#c0b9f6");
 				workDetails.add(workDetail);
 				
@@ -263,7 +263,7 @@ public class ConsumerGoodsCRM extends ValidatorEJB implements ConsumerGoodsCRMLo
 				" (Case When Sum(Tot_FW_Days) = 0 Then 0 Else SUM(TLSD)/Sum(Tot_FW_Days) End) as TLSD , " +
 				" SUM(Ord_Val) Ord_Val ,SUM(Display) Display, SUM(ord_qty) ord_qty " +
 				" From ( Select SM.Sales_Pers as SalesPerson_Code ,SP.SP_Name as SalesPerson_Name ,nvl(count(SM.strg_code),0) as Tot_Calls , " +
-				" nvl((select count(distinct strg_code) from STRG_MEET_ORDER SMO where SMO.dcr_id=SM.dcr_id and SMO.Quantity > 0),0) as Tot_PC , " +
+				" nvl((select count( strg_code) from STRG_MEET_ORDER SMO where SMO.dcr_id=SM.dcr_id and SMO.Quantity > 0),0) as Tot_PC , " +
 				" 0 as ECO ,nvl((select count(*) from STRG_MEET_ORDER SMO where SMO.dcr_id=SM.dcr_id and SMO.Quantity > 0),0) as TLSD , " +
 				" nvl((select sum(value) from STRG_MEET_ORDER SMO where SMO.dcr_id=SM.dcr_id and SMO.Quantity > 0),0) as Ord_Val , " +
 				" nvl((select sum(quantity) from STRG_MEET_ORDER SMO where SMO.dcr_id=SM.dcr_id and SMO.Quantity > 0),0) as Ord_Qty , " +
@@ -387,17 +387,17 @@ public class ConsumerGoodsCRM extends ValidatorEJB implements ConsumerGoodsCRMLo
 				
 				kpiInfo = new JSONObject();
 				detail = new JSONObject();
-				detail.put("keyName", "Orders");
+				detail.put("keyName", "Order Value");
 				detail.put("image", "order.svg");
 				
 				String ordQty=checkNull(rs.getString("Ord_Val"));
 				System.out.println(" Ord_Val  "+checkNull(rs.getString("Ord_Val")));
 				if(ordQty.equalsIgnoreCase("0")) {
-					detail.put("summary", "No Orders");
+					detail.put("summary", "No Order value");
 					detail.put("keyValue", " ");
 				}
 				else {
-					detail.put("summary", " ");
+					detail.put("summary", "Order value");
 					detail.put("keyValue", checkNull(rs.getString("Ord_Val")));
 				}
 				
@@ -744,9 +744,10 @@ public class ConsumerGoodsCRM extends ValidatorEJB implements ConsumerGoodsCRMLo
 			sqlBuff.append(" LOC.DESCR  AS LOCALITY, ");
 			sqlBuff.append(" COALESCE( (SELECT EMPLOYEE.NAME_PREFIX || ' ' || EMPLOYEE.EMP_FNAME || ' ' || EMPLOYEE.EMP_LNAME FROM EMPLOYEE WHERE EMPLOYEE.EMP_CODE = SALES_PERS1.SALES_PERS ),'Self') AS VISITED_WITH, ");
 			sqlBuff.append(" LISTAGG(STRG_MEET.STRG_CODE, ',') WITHIN GROUP (ORDER BY STRG_MEET.STRG_CODE)  AS STRG_CODE, ");
-			sqlBuff.append(" NVL(COUNT(STRG_MEET.STRG_CODE),0) AS TOT_CALLS , ");
+			sqlBuff.append(" NVL(COUNT( DISTINCT STRG_MEET.STRG_CODE),0) AS TOT_CALLS , ");
 			sqlBuff.append(" NVL((SELECT COUNT(DISTINCT STRG_CODE) FROM STRG_ITEM_DISPLAY SID WHERE SID.DCR_ID=STRG_MEET.DCR_ID),0) AS DISPLAY , ");
-			sqlBuff.append(" FN_R_TOT_PC(STRG_MEET.DCR_ID,STRG_MEET.EVENT_DATE,STRG_MEET.SALES_PERS,STRG_MEET.LOCALITY_CODE) AS TOT_PC , ");
+		//	sqlBuff.append(" FN_R_TOT_PC(STRG_MEET.DCR_ID,STRG_MEET.EVENT_DATE,STRG_MEET.SALES_PERS,STRG_MEET.LOCALITY_CODE) AS TOT_PC , ");
+			sqlBuff.append(" NVL( (SELECT COUNT(strg_code) FROM STRG_MEET_ORDER SMO  WHERE SMO.dcr_id =STRG_MEET.dcr_id  AND SMO.Quantity > 0 ),0) AS TOT_PC ,");
 			sqlBuff.append(" ROUND(( CASE WHEN FN_R_FW_CUMM_DAYS(STRG_MEET.EVENT_DATE,STRG_MEET.SALES_PERS) = 0 THEN 0 ");
 			sqlBuff.append(" ELSE FN_R_CUMM_SMO(STRG_MEET.EVENT_DATE,STRG_MEET.SALES_PERS)/FN_R_FW_CUMM_DAYS(STRG_MEET.EVENT_DATE,STRG_MEET.SALES_PERS) END),2) AS TLSD , ");
 			sqlBuff.append(" FN_R_CUMM_SMO(STRG_MEET.EVENT_DATE,STRG_MEET.SALES_PERS)  AS DAY_TLSD, ");
@@ -862,7 +863,7 @@ public class ConsumerGoodsCRM extends ValidatorEJB implements ConsumerGoodsCRMLo
 				workDetail.put("wdkpi1color", "#86e8c6");
 				
 				workDetail.put("wdkpi2count", orderVal);
-				workDetail.put("wdkpi2value", "Orders");
+				workDetail.put("wdkpi2value", "Order Value");
 				workDetail.put("wdkpi2color", "#c0b9f6");
 				
 				workDetail.put("wdkpi3count", checkNull(display));