Updated

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

webitm-dashboard/ibase/dashboard/module-resource/scm/SUN - Sales Trends/dashboard/salestrends/executeSaleTrends.jsp

@@ -149,16 +149,17 @@ private String getSalesInfoSQL(String empCode, String monthStr, boolean isGroupB
 	String schemaName = "";
 	
 	StringBuffer summarySqlBuff = new StringBuffer();
-	summarySqlBuff.append(" SELECT SUM(NET_VAL) NET_VAL, ");
+	summarySqlBuff.append(" SELECT NVL(SUM(NET_VAL), 0) AS NET_VAL, ");
 	if( isGroupByDate ) summarySqlBuff.append("  TRAN_DATE, ");
-	summarySqlBuff.append(" SUM(SALES_VAL) SALES_VAL, ");
-	summarySqlBuff.append(" SUM(RETURN_VAL) RETURN_VAL, ");
-	summarySqlBuff.append(" SUM(REPLACEMENT_VAL) REPLACEMENT_VAL, ");
-	summarySqlBuff.append(" SUM(FREE_VAL) FREE_VAL ");
+	summarySqlBuff.append(" NVL(SUM(SALES_VAL), 0) AS SALES_VAL, ");
+	summarySqlBuff.append(" NVL(SUM(RETURN_VAL), 0) AS RETURN_VAL, ");
+	summarySqlBuff.append(" NVL(SUM(REPLACEMENT_VAL), 0) AS REPLACEMENT_VAL, ");
+	summarySqlBuff.append(" NVL(SUM(FREE_VAL), 0) AS FREE_VAL ");
 	summarySqlBuff.append(" FROM " + schemaName + "DWH_INV_SRET_SUM ");
 	summarySqlBuff.append(" WHERE EMP_CODE = '" + empCode + "' ");
 	summarySqlBuff.append(" AND TO_CHAR(TRAN_DATE, 'MM/YYYY')= '"+ monthStr +"' ");
-	if( isGroupByDate ) summarySqlBuff.append("  GROUP BY TRAN_DATE ORDER BY TRAN_DATE ");
+    summarySqlBuff.append(" GROUP BY EMP_CODE ");
+	if( isGroupByDate ) summarySqlBuff.append(", TRAN_DATE ORDER BY TRAN_DATE ");
 
 	System.out.println("summarySqlBuff !" + summarySqlBuff.toString());
 
@@ -588,7 +589,7 @@ private String format(String pattern, Object value)
      display: block;
      color: #fff;
      text-align: center;
-     height: 250px;
+     height: 350px;
      width: calc(100% - 32px);
      position: relative;
      MIN-WIDTH: 0;
@@ -704,10 +705,7 @@ private String format(String pattern, Object value)
             htmlStrBuff.append(htmlHeadBuff);
             htmlStrBuff.append("<div class=\"nodata-msg-cont\">No data to display</div>");
         }
-        else //Temporary
-        {
-        	noOfRows = 1;
-        }
+        
 
 		for( int rowNum = 0; rowNum < noOfRows; rowNum++ ) 
 		{
@@ -729,22 +727,12 @@ private String format(String pattern, Object value)
 			htmlStrBuff.append("            </div>");
             htmlStrBuff.append("         </div>");
             htmlStrBuff.append("       </div>");
-            /*
             htmlStrBuff.append("   	   <div class=\"chart-2 column kpi-card-containers\">");
             htmlStrBuff.append("         <div id=\"sales-info-chart-container\" class=\"detail-box\" >");
             htmlStrBuff.append("             <canvas id=\"sales-info-chart\" width=\"100%\" height=\"100%\"></canvas>");
             htmlStrBuff.append("         	 <img src=\"images/fullscreen_enter.svg\" class=\"maximize-button\" onClick=\"toggleFullscreen('sales-info-chart-container', this);\"/>");
             htmlStrBuff.append("         </div>");
             htmlStrBuff.append("       </div>");
-            */
-            //TOP Brands Chart added
-            htmlStrBuff.append("   	   <div class=\"chart-2 column kpi-card-containers\">");
-            htmlStrBuff.append("         <div id=\"top-brand-chart-container\" class=\"detail-box\">");
-            htmlStrBuff.append("             <canvas id=\"top-brand-chart\" width=\"100%\" height=\"100%\"></canvas>");
-            //htmlStrBuff.append("         	 <img src=\"images/fullscreen_enter.svg\" class=\"maximize-button\" onClick=\"toggleFullscreen('top-brand-chart-container', this);\"/>");
-            htmlStrBuff.append("         </div>");
-            htmlStrBuff.append("       </div>");
-            
             htmlStrBuff.append("    </div>");
             htmlStrBuff.append("</div>");
             
@@ -831,22 +819,8 @@ private String format(String pattern, Object value)
             htmlStrBuff.append("    </div>");
             htmlStrBuff.append("</div>");
             */
-
-            //Sales Info Chart added
-	        htmlStrBuff.append("<div class=\"db-kpi-container\">");
-	        htmlStrBuff.append("    <div class=\"kpi-container\">");
-	        htmlStrBuff.append("   	   <div class=\"chart-1 column kpi-card-containers\">");
-	        htmlStrBuff.append("         <div id=\"sales-info-chart-container\" class=\"chart-detail-box\" >");
-	        htmlStrBuff.append("             <canvas id=\"sales-info-chart\" width=\"100%\" height=\"100%\"></canvas>");
-	        htmlStrBuff.append("         	 <img src=\"images/fullscreen_enter.svg\" class=\"maximize-button\" onClick=\"toggleFullscreen('sales-info-chart-container', this);\"/>");
-	        htmlStrBuff.append("         </div>");
-	        htmlStrBuff.append("       </div>");      
-	        htmlStrBuff.append("    </div>");
-	        htmlStrBuff.append("</div>");
 		}
 		
-		htmlStrBuff.append("</div>");
-		
 		//salesSummarySql = getSalesSummarySQL(empCode, siteCode, monthStr, true);
 		salesSummarySql = getSalesInfoSQL(empCode, monthStr, true);
 		//sqlDataMap = updtDwhSalesObj.getSQLResultData(salesSummarySql, transDB);
@@ -915,7 +889,22 @@ private String format(String pattern, Object value)
 		}
 		brandsLable = brandsLableList.toString();
 		brandsData = brandsDataList.toString();
-		//Top Brands Data Calculation Ends
+
+        if(brandsData != null && brandsData != "[]") 
+        {
+            htmlStrBuff.append("<div class=\"db-kpi-container\">");
+            htmlStrBuff.append("    <div class=\"kpi-container\">");
+            htmlStrBuff.append("   	   <div class=\"chart-1 column kpi-card-containers\">");
+            htmlStrBuff.append("         <div id=\"top-brand-chart-container\" class=\"chart-detail-box\">");
+            htmlStrBuff.append("             <canvas id=\"top-brand-chart\" width=\"100%\" height=\"100%\"></canvas>");
+            htmlStrBuff.append("         	 <img src=\"images/fullscreen_enter.svg\" class=\"maximize-button\" onClick=\"toggleFullscreen('top-brand-chart-container', this);\"/>");
+            htmlStrBuff.append("         </div>");
+            htmlStrBuff.append("       </div>");
+            htmlStrBuff.append("    </div>");
+            htmlStrBuff.append("</div>");
+        }
+        htmlStrBuff.append("</div>");
+
 	}
 	catch(Exception e)
 	{
@@ -928,7 +917,16 @@ private String format(String pattern, Object value)
 
     <script>
     var isFullscreen = false;
+
+<% if(lables != null && lables != "[]") { %>
     loadChart("sales-info-chart");
+<%}%>
+
+    
+<% if(brandsData != null && brandsData != "[]") { %>
+    loadBrands('top-brand-chart');
+<%}%>
+
     function loadChart(elmId)
     {
 		new Chart(document.getElementById(elmId), {
@@ -994,8 +992,6 @@ private String format(String pattern, Object value)
     	});
 	}
 
-    //Top Brands Chart Configuration Starts
-    loadBrands('top-brand-chart');
     function loadBrands(elmId) {
 
     	//Blue : background-image: linear-gradient(-45deg, #007bab, #00c9ff);

webitm-dashboard/ibase/dashboard/module-resource/scm/SUN - Sales Trends/dashboard/salestrends/index.jsp

@@ -110,10 +110,12 @@ body{
 		    <label>Employee Code : </label>
 			<input type="text" name="empCode" id="empCode" value="<%=empCode%>"/>
 			</div>
+			<!--
 			<div class="input-field">
 		    <label>Site Code : </label>
 			<input type="text" name="siteCode" id="siteCode" value="<%=siteCode%>"/>
 			</div>
+			-->
 			<div class="input-field">
 		    <label>Month : </label>
 			<input type="text" placeholder="MM/YYYY" name="month" id="month" value="<%=monthStr%>"/>