Commit 75da2a9f authored by prumde's avatar prumde

Updated

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@211038 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 917b0e2e
......@@ -4,6 +4,7 @@
<%@page import="ibase.webitm.utility.ITMException"%>
<%@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.text.SimpleDateFormat"%>
<%@page import="java.sql.Connection"%>
......@@ -91,6 +92,69 @@ public HashMap getSQLResultData(String sqlStr, String transDB)
return sqlDataMap;
}
private String getMonth(String selectedMonth, int selectedYear)
{
System.out.println(" selectedMonth = "+selectedMonth);
String monthInChar = "";
try
{
if (selectedMonth.equals("1"))
{
monthInChar = "Jan";
}
if (selectedMonth.equals("2"))
{
monthInChar = "Feb";
}
if (selectedMonth.equals("3"))
{
monthInChar = "Mar";
}
if (selectedMonth.equals("4"))
{
monthInChar = "Apr";
}
if (selectedMonth.equals("5"))
{
monthInChar = "May";
}
if (selectedMonth.equals("6"))
{
monthInChar = "Jun";
}
if (selectedMonth.equals("7"))
{
monthInChar = "Jul";
}
if (selectedMonth.equals("8"))
{
monthInChar = "Aug";
}
if (selectedMonth.equals("9"))
{
monthInChar = "Sep";
}
if (selectedMonth.equals("10"))
{
monthInChar = "Oct";
}
if (selectedMonth.equals("11"))
{
monthInChar = "Nov";
}
if (selectedMonth.equals("12"))
{
monthInChar = "Dec";
}
}
catch(Exception e)
{
System.out.println("Inside SaleTrendsDetails:: getMonth :: "+ e.getMessage());
}
String resultStr = monthInChar + " " + selectedYear;
System.out.println(" resultStr = "+resultStr);
return resultStr;
}
%>
<html>
......@@ -201,6 +265,9 @@ public HashMap getSQLResultData(String sqlStr, String transDB)
width: calc(33.33% - 5px) !important;
margin: 0 21% !important;
}
.db-kpi-header{
width: calc( 75% - 20px);
}
}
......@@ -229,27 +296,37 @@ public HashMap getSQLResultData(String sqlStr, String transDB)
float: left;
}
.ang-dbtitle {
.db-kpi-header-title {
font-size: 18px;
color: #666;
}
.ang-dbSubTitleLbl {
.db-kpi-header-info {
font-size: 14px;
font-weight: 400;
color: #787878;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
display: flex;
flex-direction: column;
}
.db-kpi-header{
padding: 10px;
display: flex;
justify-content: space-between;
}
.nodata-msg-cont {
height: 100px;
width: auto;
line-height: 100px;
text-align: left;
text-align: center;
font-size: 12px;
padding: 10px 0 10px 10px;
box-shadow: 0 0 1px 0px #666;
}
</style>
......@@ -283,11 +360,11 @@ public HashMap getSQLResultData(String sqlStr, String transDB)
siteCode = site;
}
String monthStr = request.getParameter("month");
if( monthStr == null || monthStr.trim().length() == 0)
{
Calendar cal = Calendar.getInstance();
int month = cal.get(Calendar.MONTH) + 1 ;
int year = cal.get(Calendar.YEAR) ;
if( monthStr == null || monthStr.trim().length() == 0)
{
if( month < 10 )
{
monthStr = "0" + month + "/" + year;
......@@ -297,6 +374,34 @@ public HashMap getSQLResultData(String sqlStr, String transDB)
monthStr = month + "/" + year;
}
}
else
{
try{
String[] monthArr = monthStr.split("/");
month = Integer.parseInt(monthArr[0]) ;
year = Integer.parseInt(monthArr[1]) ;
}
catch(Exception e){
System.out.println("Exception monthStr ==>" + e.getMessage());
e.printStackTrace();
}
}
System.out.println("monthStr ==>" + monthStr);
System.out.println("monthStr ==>" + month);
System.out.println("monthStr ==>" + year);
CommonDBAccessEJB localCDBAccess = new CommonDBAccessEJB();
String empDetail = localCDBAccess.getDBColumnValue( " EMPLOYEE ", " EMP_FNAME || ' ' || EMP_LNAME || ' (' || trim(EMP_CODE) || ')' AS EMP_NAME ", " WHERE EMP_CODE = '"+empCode+"' ", transDB);
String siteDetail = localCDBAccess.getDBColumnValue( " SITE ", " DESCR || ' (' || TRIM(SITE_CODE) || ')' AS SITE_DESCR ", " WHERE SITE_CODE = '"+siteCode+"' ", transDB);
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-info\">");
htmlHeadBuff.append(" <span>").append(empDetail).append("</span>");
htmlHeadBuff.append(" <span>").append(siteDetail).append("</span>");
htmlHeadBuff.append(" <span>").append(getMonth(month+"", year)).append("</span>");
htmlHeadBuff.append(" </div>");
htmlHeadBuff.append("</div>");
StringBuffer htmlStrBuff = new StringBuffer();
try
......@@ -366,28 +471,14 @@ public HashMap getSQLResultData(String sqlStr, String transDB)
if( noOfRows == 0 )
{
htmlStrBuff.append("<div style=\"padding: 10px 0 10px 10px;\"> ");
htmlStrBuff.append(" <div class=\"ang-dbtitle\">Sales Trends Data</div>");
htmlStrBuff.append(" <div class=\"ang-dbSubTitleLbl\">");
htmlStrBuff.append(" Employee Code : ").append(empCode);
htmlStrBuff.append(", Site Code : ").append(siteCode);
htmlStrBuff.append(", Month : ").append(monthStr);
htmlStrBuff.append(" </div>");
htmlStrBuff.append("</div>");
htmlStrBuff.append(htmlHeadBuff);
htmlStrBuff.append("<div class=\"nodata-msg-cont\">No data to display</div>");
}
for( int rowNum = 0; rowNum < noOfRows; rowNum++ ) {
HashMap<String, String> dataMap = dataRows.get(rowNum);
htmlStrBuff.append("<div style=\"padding: 10px 0 10px 10px;\"> ");
htmlStrBuff.append(" <div class=\"ang-dbtitle\">Sales Trends Data</div>");
htmlStrBuff.append(" <div class=\"ang-dbSubTitleLbl\">");
htmlStrBuff.append(" Employee Code : ").append(empCode);
htmlStrBuff.append(", Site Code : ").append(siteCode);
htmlStrBuff.append(", Month : ").append(monthStr);
htmlStrBuff.append(" </div>");
htmlStrBuff.append("</div>");
htmlStrBuff.append(htmlHeadBuff);
//htmlStrBuff.append("<details open style=\"padding: 10px 0;\" >");
htmlStrBuff.append("<div class=\"db-kpi-container\">");
......@@ -480,45 +571,6 @@ public HashMap getSQLResultData(String sqlStr, String transDB)
//htmlStrBuff.append("</summary>");
//htmlStrBuff.append("</details>");
}
/*
89cbfc
c26be9
86e8c6
ffca3b
c0b9f6
f37487
f9af92
3e3f3f
POS_CODE
LV1_DESCR
SALES VALUE SALES QUANTITY
FREE SALES VALUE FREE QUANTITY
GROSS SALES VALUE
SALEABLE RETURN QUANTITY SALEABLE RETURN VALUE
DAMAGED RETURN QUANTITY DAMAGED RETURN VALUE
EXPIRY RETURN QUANTITY EXPIRY RETURN VALUE
CANCELED RETURN QUANTITY CANCELED RETURN VALUE
REPLACEMENT RETURN QUANTITY REPLACEMENT RETURN VALUE
RETURN QUANTITY RETURN VALUE
GROSS RETURN VALUE
NET RETURN VALUE
NET SALES VALUE
NET SALES QUANTITY
CGST Amount
SGST Amount
IGST Amount
*/
}
catch(Exception e)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment