Updated changes for tree view component

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

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

@@ -314,9 +314,23 @@ public class ConsumerGoodsCRM extends ValidatorEJB implements ConsumerGoodsCRMLo
 				kpiInfo = new JSONObject();
 				detail = new JSONObject();
 				detail.put("keyName", "Total Calls");
+				detail.put("image", "totCalls.svg");
+				String totCalls=rs.getString("TOT_CALLS");
+				System.out.println(" TOT_CALLS  "+checkNull(rs.getString("TOT_CALLS")));
+				if(totCalls.equalsIgnoreCase("0")) {
+					detail.put("summary", "No Total Calls");
+					detail.put("keyValue", " ");
+				}
+				else {
+					detail.put("summary", "call(s)");
 					detail.put("keyValue", checkNull(rs.getString("TOT_CALLS")));
-				detail.put("color", "#89cbfc");
+				}
+				
+				
+				detail.put("color", "linear-gradient(-45deg, #007bab, #00c9ff)");
+				System.out.println("Inside TOT_CALLS detail "+detail);
 				kpiInfo.put("detail",detail);
+				System.out.println("Inside TOT_CALLS kpiInfo 1 "+kpiInfo);
 				
 				summary = new JSONObject();
 				summary.put("keyName", "Total Lines Sold Daily");
@@ -324,12 +338,25 @@ public class ConsumerGoodsCRM extends ValidatorEJB implements ConsumerGoodsCRMLo
 				summary.put("color", "#c26be9");
 				kpiInfo.put("summary",summary);
 				kpiSummary.add(kpiInfo);
-				
+				System.out.println("Inside TOT_CALLS kpiInfo 2 "+kpiInfo);
 				kpiInfo = new JSONObject();
 				detail = new JSONObject();
 				detail.put("keyName", "Productive Calls");
+				detail.put("image", "productiveCalls.svg");
+				
+				String totPc=checkNull(rs.getString("TOT_PC"));
+				System.out.println(" TOT_PC  "+checkNull(rs.getString("TOT_PC")));
+				if(totPc.equalsIgnoreCase("0")) {
+					detail.put("summary", "No productive Calls");
+					detail.put("keyValue", " ");
+				}
+				else {
+					detail.put("summary", "call(s)");
 					detail.put("keyValue", checkNull(rs.getString("TOT_PC")));
-				detail.put("color", "#86e8c6");
+				}
+				
+				
+				detail.put("color", "linear-gradient(-45deg, #7053cc, #c3b3f7)");
 				kpiInfo.put("detail",detail);
 				
 				if( toDate != null )
@@ -338,7 +365,7 @@ public class ConsumerGoodsCRM extends ValidatorEJB implements ConsumerGoodsCRMLo
 					summary.put("keyName", "Eco");
 					String economy = checkNull(rs.getString("ECO"));
 					economy = economy.length() == 0 ? "0" : economy;
-					detail.put("keyValue", economy );
+					summary.put("keyValue", economy );
 					summary.put("color", "#ffca3b");
 					kpiInfo.put("summary",summary);
 					kpiSummary.add(kpiInfo);
@@ -357,8 +384,21 @@ public class ConsumerGoodsCRM extends ValidatorEJB implements ConsumerGoodsCRMLo
 				kpiInfo = new JSONObject();
 				detail = new JSONObject();
 				detail.put("keyName", "Orders");
+				detail.put("image", "order.svg");
+				
+				String ordQty=checkNull(rs.getString("ORD_QTY"));
+				System.out.println(" ORD_QTY  "+checkNull(rs.getString("ORD_QTY")));
+				if(ordQty.equalsIgnoreCase("0")) {
+					detail.put("summary", "No Orders");
+					detail.put("keyValue", " ");
+				}
+				else {
+					detail.put("summary", "order(s)");
 					detail.put("keyValue", checkNull(rs.getString("ORD_QTY")));
-				detail.put("color", "#c0b9f6");
+				}
+				
+				
+				detail.put("color", "linear-gradient(-45deg, #01a27f, #00e1af)");
 				kpiInfo.put("detail",detail);
 				
 				summary = new JSONObject();
@@ -371,12 +411,25 @@ public class ConsumerGoodsCRM extends ValidatorEJB implements ConsumerGoodsCRMLo
 				kpiInfo = new JSONObject();
 				detail = new JSONObject();
 				detail.put("keyName", "Display");
+				detail.put("image", "display.svg");
+				
+				String display=checkNull(rs.getString("DISPLAY"));
+				System.out.println(" DISPLAY  "+checkNull(rs.getString("DISPLAY")));
+				if(display.equalsIgnoreCase("0")) {
+					detail.put("summary", "No Display");
+					detail.put("keyValue", " ");
+				}
+				else {
+					detail.put("summary", "display");
 					detail.put("keyValue", checkNull(rs.getString("DISPLAY")));
-				detail.put("color", "#f9af92");
+				}
+				
+				detail.put("color", "linear-gradient(-45deg, #e47842, #ffac83)");
 				kpiInfo.put("detail",detail);
 				
 				summary = new JSONObject();
 				summary.put("keyName", "Outlets");
+
 				summary.put("keyValue", workDtl.get("outlet_booked"));
 				summary.put("color", "#3e3f3f");
 				kpiInfo.put("summary",summary);
@@ -745,11 +798,14 @@ public class ConsumerGoodsCRM extends ValidatorEJB implements ConsumerGoodsCRMLo
 				
 				String hostUrl = CommonConstants.TOMCAT_HOME;
 				String salesPersImg = hostUrl+"/ibase/CustomMenuImageServlet?fldValue="+salesPers+"&ALT_FLD_VALUE="+salesPersName;
+				String localityImg = hostUrl+"/ibase/CustomMenuImageServlet?fldValue="+locality+"&ALT_FLD_VALUE="+locality;
+
 				
 				workDetail.put("salesPers", salesPers);
-				workDetail.put("salesPersName", salesPersName);
-				workDetail.put("salesPersImg", salesPersImg);
+				workDetail.put("salesPers_Name", salesPersName);
+				workDetail.put("salesPers_Img", salesPersImg);
 				workDetail.put("eventDate", eventDate);
+				workDetail.put("locality_img", localityImg);
 				workDetail.put("locality", locality);
 				workDetail.put("visitedWith", visitedWith);
 				workDetail.put("strgCode", strgCode);
@@ -763,6 +819,7 @@ public class ConsumerGoodsCRM extends ValidatorEJB implements ConsumerGoodsCRMLo
 				//workDetail.put("orderVal", orderVal);
 				
 				
+				/*
 				JSONArray workDetailsKPI = new JSONArray();
 				JSONObject workDetailKPI = null;
 				
@@ -789,9 +846,26 @@ public class ConsumerGoodsCRM extends ValidatorEJB implements ConsumerGoodsCRMLo
 				workDetailKPI.put("value", "Display");
 				workDetailKPI.put("color", "#f9af92");
 				workDetailsKPI.add(workDetailKPI);
-				
 				workDetail.put("workDetailsKPI", workDetailsKPI);
 				
+				*/
+				workDetail.put("wdkpi0count", totalCalls);
+				workDetail.put("wdkpi0value", "TC");
+				workDetail.put("wdkpi0color", "#89cbfc");
+				
+				workDetail.put("wdkpi1count", totalProdCalls);
+				workDetail.put("wdkpi1value", "PC");
+				workDetail.put("wdkpi1color", "#86e8c6");
+				
+				workDetail.put("wdkpi2count", orderVal);
+				workDetail.put("wdkpi2value", "Orders");
+				workDetail.put("wdkpi2color", "#c0b9f6");
+				
+				workDetail.put("wdkpi3count", checkNull(display));
+				workDetail.put("wdkpi3value", "Display");
+				workDetail.put("wdkpi3color", "#f9af92");
+				
+				
 				finalWorkDetails.add(workDetail);
 			}