Updated

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

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

@@ -5,7 +5,7 @@
 <%@page import="ibase.utility.*"%>
 <%@page import="ibase.utility.UserInfoBean"%>
 <%@page import="ibase.ejb.CommonDBAccessEJB"%>
-<%@page import="java.io.*,java.util.*,java.util.Calendar,java.util.zip.*"%>
+<%@page import="java.io.*,java.text.*,java.util.*,java.util.Calendar,java.util.zip.*"%>
 <%@page import="java.text.SimpleDateFormat"%>
 <%@page import="java.sql.Connection"%>
 <%@page import="java.sql.*"%>
@@ -53,8 +53,16 @@ public HashMap getSQLResultData(String sqlStr, String transDB)
 				{
 					dataCols.put(ctr, rsmd.getColumnName(ctr));
 				}
+				String colName = rsmd.getColumnName(ctr);
+				if( colName.endsWith("VALUE") )
+				{
+					rowDataMap.put(rsmd.getColumnName(ctr), formatValue(rs.getString(ctr)));
+				}
+				else
+				{
 					rowDataMap.put(rsmd.getColumnName(ctr), rs.getString(ctr));
 				}
+			}
 			//System.out.println("Result dataMap !" + dataMap);
 			dataRows.add(rowDataMap);
 			noOfRows++;
@@ -92,6 +100,24 @@ public HashMap getSQLResultData(String sqlStr, String transDB)
 	return sqlDataMap;
 }
 
+private String formatValue(String value)
+{
+	try
+	{
+		if( !"0".equalsIgnoreCase(value) )
+		{
+			NumberFormat nf = NumberFormat.getCurrencyInstance();
+		    nf.setMaximumFractionDigits(0);
+		    value = nf.format(Double.parseDouble(value));
+		}
+	}
+	catch(Exception e)
+	{
+		
+	}
+    return value;
+}
+
 private String getMonth(String selectedMonth, int selectedYear)
 {
 	  System.out.println(" selectedMonth = "+selectedMonth);
@@ -395,7 +421,7 @@ private String getMonth(String selectedMonth, int selectedYear)
 	
 	StringBuffer htmlHeadBuff = new StringBuffer();
 	htmlHeadBuff.append("<div class=\"db-kpi-header\"> ");
-	htmlHeadBuff.append("	<div class=\"db-kpi-header-title\">Sales Trends Data</div>");
+	htmlHeadBuff.append("	<div class=\"db-kpi-header-title\">Current Sales Summary</div>");
 	htmlHeadBuff.append("	<div class=\"db-kpi-header-info\">");
 	htmlHeadBuff.append("		<span>").append(empDetail).append("</span>");
 	htmlHeadBuff.append("		<span>").append(siteDetail).append("</span>");
@@ -575,6 +601,8 @@ private String getMonth(String selectedMonth, int selectedYear)
 	catch(Exception e)
 	{
 		e.printStackTrace();
+		 htmlStrBuff.append(htmlHeadBuff);
+         htmlStrBuff.append("<div class=\"nodata-msg-cont\"> An error occured : " + e.getMessage()+ "</div>");
 	}
 %>
 <%=htmlStrBuff.toString()%>

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

@@ -95,7 +95,7 @@ body{
 	
 	<div style="padding: 10px 0 10px 10px;">
 		<div class="ang-dbtitle">
-			Sales Trends Data
+			Current Sales Summary
 		</div>			
 	</div>
 	<form method="POST" action="executeSaleTrends.jsp">