Skip to content

B
business-java
Commit b5edc843 authored by vbhosale's avatar vbhosale
Browse files
Options

changes made in get todays call as per requirement 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@177161 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 046f4353
Show whitespace changes
Inline Side-by-side
Showing with 128 additions and 40 deletions
webitm-dashboard/ibase/dashboard/sfa/ejb/PlanVsActual.java
View file @ b5edc843
......@@ -18,7 +18,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.TreeMap;
import java.util.Calendar;
import javax.ejb.Stateless;
@Stateless
......@@ -781,8 +780,11 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
DashboardUtility dashboardUtility = null;
int count = 0;
String salesPersonCode = "", salesPersonName = "", salesPerson_image = "";
String salesPersonCode = "", salesPersonName = "", salesPerson_image = "" ;
String customerCode = "", customerName = "" , customer_Image = "";
StringBuffer rowBuffer = new StringBuffer();
StringBuffer listedBuffer = new StringBuffer();
int planned=0, unplanned=0,listed=0, unListed=0;
int totalCalls=0;
String localSQL="";
......@@ -790,6 +792,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
try
{
rowBuffer.append("<div>");
listedBuffer.append("<div>");
salePersons = salePersons == null ? "": salePersons.trim();
dashboardUtility = new DashboardUtility();
salePersons = dashboardUtility.getCommaSeparated(salePersons);
......@@ -808,7 +811,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
/*----------Planned doctors visited-----Planned--------*/
sql = "(SELECT TO_CHAR(SM.EVENT_DATE,'DD-MON-YYYY') AS EVENTDATE , " +
/*sql = "(SELECT TO_CHAR(SM.EVENT_DATE,'DD-MON-YYYY') AS EVENTDATE , " +
"SP.SALES_PERS ,SP.SP_NAME ,SM.STRG_CODE ," +
"INITCAP(SC.FIRST_NAME||' '||SC.MIDDLE_NAME||' '||SC.LAST_NAME )" +
"AS DOCTORNAME ,L.DESCR AS LOCALITY ,SPL.DESCR AS SPECIALITY " +
......@@ -830,7 +833,16 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
"LOCALITY L ON L.LOCALITY_CODE=SC.LOCALITY_CODE INNER JOIN " +
"STRG_SERIES SS ON SS.SC_CODE=SC.SC_CODE INNER JOIN " +
"SPECIALITY SPL ON SPL.SPL_CODE=SS.SPL_CODE " +
"WHERE SPH.PLAN_DATE <= sysdate "+localSQL+")";
"WHERE SPH.PLAN_DATE <= sysdate "+localSQL+")";*/
// ADDED ROWNUM < 10 REMOVE WHILE RELEASE AND SYSDATE <= CHANGE TO =
// new sql query provided by sagar
sql ="SELECT SM.EVENT_DATE, SM.SALES_PERS, SP.SP_NAME, SM.STRG_CODE, (SC.FIRST_NAME ||' '||SC.LAST_NAME)AS NAME "
+ " FROM STRG_MEET SM INNER JOIN SALES_PERS SP ON SP.SALES_PERS = SM.SALES_PERS INNER JOIN STRG_CUSTOMER SC ON SC.SC_CODE=SM.STRG_CODE "
+ " INNER JOIN SPRS_PLAN_HDR SPH ON SPH.SPRS_CODE__PLAN = SM.SALES_PERS AND SPH.PLAN_DATE=SM.EVENT_DATE "
+ " WHERE SM.EVENT_DATE <= sysdate AND SM.SALES_PERS= SP.SALES_PERS "
+ " AND NOT EXISTS (SELECT SPC.SC_CODE FROM SPRS_PLAN_CUST SPC "
+ " WHERE SPC.SC_CODE=SM.STRG_CODE AND SPC.PLAN_ID = SPH.PLAN_ID) and ROWNUM < 10 ";
pstmt = conn.prepareStatement(sql,ResultSet.TYPE_SCROLL_SENSITIVE,ResultSet.CONCUR_READ_ONLY);
......@@ -841,6 +853,8 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
System.out.println("get planned visited count" + planned);
rs.beforeFirst();
if(planned > 0)
{
rowBuffer.append("<table cellspacing='0' cellpadding='0' width='100%' ><tr rowspan='2'><td class='defaultTitle'>Planned</td></tr>");
......@@ -865,9 +879,9 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
/*----------Unplanned doctors visited.Pleas replace the SQL Jaffer--*/
/*----------Unplanned doctors visited.--*/
sql = "(SELECT TO_CHAR(SM.EVENT_DATE,'DD-MON-YYYY') AS EVENTDATE , " +
/*sql = "(SELECT TO_CHAR(SM.EVENT_DATE,'DD-MON-YYYY') AS EVENTDATE , " +
"SP.SALES_PERS ,SP.SP_NAME ,SM.STRG_CODE ," +
"INITCAP(SC.FIRST_NAME||' '||SC.MIDDLE_NAME||' '||SC.LAST_NAME )" +
"AS DOCTORNAME ,L.DESCR AS LOCALITY ,SPL.DESCR AS SPECIALITY " +
......@@ -889,7 +903,12 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
"LOCALITY L ON L.LOCALITY_CODE=SC.LOCALITY_CODE INNER JOIN " +
"STRG_SERIES SS ON SS.SC_CODE=SC.SC_CODE INNER JOIN " +
"SPECIALITY SPL ON SPL.SPL_CODE=SS.SPL_CODE " +
"WHERE SPH.PLAN_DATE <= sysdate "+localSQL+")";
"WHERE SPH.PLAN_DATE <= sysdate "+localSQL+")";*/
// sql for unplanned by sagar
sql = " SELECT SM.EVENT_DATE, SM.SALES_PERS, SP.SP_NAME, SM.STRG_CODE, (SC.FIRST_NAME ||' '||SC.LAST_NAME)AS NAME "
+ " FROM STRG_MEET SM INNER JOIN SALES_PERS SP ON SP.SALES_PERS = SM.SALES_PERS INNER JOIN STRG_CUSTOMER SC ON SC.SC_CODE=SM.STRG_CODE INNER JOIN SPRS_PLAN_HDR SPH ON SPH.SPRS_CODE__PLAN = SM.SALES_PERS AND SPH.PLAN_DATE=SM.EVENT_DATE "
+ " WHERE SM.EVENT_DATE = sysdate AND SM.SALES_PERS = SP.SALES_PERS AND NOT EXISTS (SELECT SPC.SC_CODE FROM SPRS_PLAN_CUST SPC WHERE SPC.SC_CODE=SM.STRG_CODE AND SPC.PLAN_ID = SPH.PLAN_ID) ";
pstmt = conn.prepareStatement(sql,ResultSet.TYPE_SCROLL_SENSITIVE,ResultSet.CONCUR_READ_ONLY);
......@@ -922,37 +941,45 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
pstmt = null;
/*----------Listed doctors visited.Please replace the SQL Jaffer--*/
/*----------Listed doctors visited.--*/
sql = "SELECT sm.tran_id, TO_CHAR(sm.event_date, 'dd-mon-yyyy') AS Event_Date, "
/*sql = "SELECT sm.tran_id, TO_CHAR(sm.event_date, 'dd-mon-yyyy') AS Event_Date, "
+ "sm.strg_code, sm.sales_pers, sp.sc_code, SS.SP_NAME "
+ "FROM SALES_PERS SS INNER JOIN STRG_MEET SM ON SS.SALES_PERS=SM.SALES_PERS "
+ "INNER JOIN strg_series SP ON sp.sales_pers = sm.sales_pers "
+ "WHERE sm.strg_code =sp.sc_code AND sm.event_date <= sysdate "+localSQL+" and ROWNUM <10 ";
+ "WHERE sm.strg_code =sp.sc_code AND sm.event_date <= sysdate "+localSQL+" and ROWNUM <10 ";*/
//Listed Query by SAGAR
sql = "SELECT SM.EVENT_DATE, SM.SALES_PERS, SP.SP_NAME ,SM.STRG_CODE ,(SC.FIRST_NAME ||' '||SC.LAST_NAME)AS NAME "
+ " FROM STRG_SERIES SS INNER JOIN STRG_MEET SM ON SM.STRG_CODE=SS.SC_CODE AND SM.SALES_PERS=SS.SALES_PERS INNER JOIN SALES_PERS SP ON SP.SALES_PERS=SS.SALES_PERS INNER JOIN STRG_CUSTOMER SC ON SC.SC_CODE=SM.STRG_CODE "
+ " WHERE SM.SALES_PERS = SP.SALES_PERS AND SM.EVENT_DATE = sysdate AND SS.STATUS='Y' ";
pstmt = conn.prepareStatement(sql,ResultSet.TYPE_SCROLL_SENSITIVE,ResultSet.CONCUR_READ_ONLY);
rs = pstmt.executeQuery();
rs.last();
listed = rs.getRow();
String listedDocImagePath = "";// Please define proper variable name
String listedDocImagePath = "";
System.out.println("get listed doctor visited count" + listed);
rs.beforeFirst();
if(listed > 0)
{
rowBuffer.append("<table cellspacing='0' cellpadding='0' width='100%' ><tr rowspan='2'><td class='defaultTitle'>Listed</td></tr>");
listedBuffer.append("<table cellspacing='0' cellpadding='0' width='100%' ><tr rowspan='2'><td class='defaultTitle'>Listed</td></tr>");
while(rs.next())
{
salesPersonCode = checkNull(rs.getString("SALES_PERS")) ;
salesPersonName = checkNull(rs.getString("SP_NAME")) ;
//salesPersonCode = checkNull(rs.getString("SALES_PERS")) ;
//salesPersonName = checkNull(rs.getString("SP_NAME")) ;
customerCode = checkNull(rs.getString("STRG_CODE"));
customerName = checkNull(rs.getString("NAME"));
String object = "images"+ File.separator + "users";
listedDocImagePath = "/ibase/CustomMenuImageServlet?fldValue="+salesPersonCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersonName;
salesPerson_image = "<img class='cardProdImg2' src='"+listedDocImagePath+"'/>";
rowBuffer.append("<tr><td><table cellspacing='0' cellpadding='0' " +
listedDocImagePath = "/ibase/CustomMenuImageServlet?fldValue="+customerCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+customerName;
customer_Image = "<img class='cardProdImg2' src='"+listedDocImagePath+"'/>";
listedBuffer.append("<tr><td><table cellspacing='0' cellpadding='0' " +
"style='border-bottom:1px solid #E8E8E8;' width='100%'><tr>" +
"<td width='2%'>"+salesPerson_image+"</td>" +
"<td>"+salesPersonName.toUpperCase()+"</td></tr></table></td></tr>");
"<td width='2%'>"+customer_Image+"</td>" +
"<td>"+customerName.toUpperCase()+"</td></tr></table></td></tr>");
}
rowBuffer.append("</table>");
listedBuffer.append("</table>");
}
rs.close();
rs = null;
......@@ -960,25 +987,29 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
pstmt = null;
/*----------Unlisted doctors visited.Please replace the SQL Jaffer--*/
/*----------Unlisted doctors visited.--*/
sql = "SELECT sm.tran_id, TO_CHAR(sm.event_date, 'dd-mon-yyyy') AS Event_Date, "
/*sql = "SELECT sm.tran_id, TO_CHAR(sm.event_date, 'dd-mon-yyyy') AS Event_Date, "
+ "sm.strg_code, sm.sales_pers, sp.sc_code, SS.SP_NAME "
+ "FROM SALES_PERS SS INNER JOIN STRG_MEET SM ON SS.SALES_PERS=SM.SALES_PERS "
+ "INNER JOIN strg_series SP ON sp.sales_pers = sm.sales_pers "
+ "WHERE sm.strg_code !=sp.sc_code AND sm.event_date <= sysdate "+localSQL+" and ROWNUM <10 ";
+ "WHERE sm.strg_code !=sp.sc_code AND sm.event_date <= sysdate "+localSQL+" and ROWNUM <10 ";*/
// Unlisted query by Sagar
sql = "SELECT SM.EVENT_DATE ,SP.SALES_PERS ,SP.SP_NAME,SM.STRG_CODE,SM.STRG_NAME "
+ " FROM STRG_MEET SM INNER JOIN SALES_PERS SP ON SP.SALES_PERS=SM.SALES_PERS "
+ " WHERE SM.SALES_PERS= SP.SALES_PERS AND SM.EVENT_DATE = sysdate AND NOT EXISTS (SELECT SC_CODE FROM STRG_CUSTOMER SC WHERE SC.SC_CODE = SM.STRG_CODE) ";
pstmt = conn.prepareStatement(sql,ResultSet.TYPE_SCROLL_SENSITIVE,ResultSet.CONCUR_READ_ONLY);
rs = pstmt.executeQuery();
rs.last();
unListed = rs.getRow();
String unlistedDocImagePath = "";// Please define proper variable name
System.out.println("get listed doctor visited count" + listed);
String unlistedDocImagePath = "";
System.out.println("get listed doctor visited count" + unListed);
rs.beforeFirst();
if(unListed > 0)
{
rowBuffer.append("<table cellspacing='0' cellpadding='0' width='100%' ><tr rowspan='2'><td class='defaultTitle'>Unlisted</td></tr>");
listedBuffer.append("<table cellspacing='0' cellpadding='0' width='100%' ><tr rowspan='2'><td class='defaultTitle'>Unlisted</td></tr>");
while(rs.next())
{
salesPersonCode = checkNull(rs.getString("SALES_PERS")) ;
......@@ -986,12 +1017,12 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
String object = "images"+ File.separator + "users";
unlistedDocImagePath = "/ibase/CustomMenuImageServlet?fldValue="+salesPersonCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersonName;
salesPerson_image = "<img class='cardProdImg2' src='"+unlistedDocImagePath+"'/>";
rowBuffer.append("<tr><td><table cellspacing='0' cellpadding='0' " +
listedBuffer.append("<tr><td><table cellspacing='0' cellpadding='0' " +
"style='border-bottom:1px solid #E8E8E8;' width='100%'><tr>" +
"<td width='2%'>"+salesPerson_image+"</td>" +
"<td>"+salesPersonName.toUpperCase()+"</td></tr></table></td></tr>");
}
rowBuffer.append("</table>");
listedBuffer.append("</table>");
}
rs.close();
rs = null;
......@@ -999,18 +1030,54 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
pstmt = null;
rowBuffer.append("</div>");
listedBuffer.append("</div>");
System.out.println("rowbuffer ======> "+rowBuffer);
rawJson.put("todaystatus", rowBuffer.toString());
double totalCount = planned+unplanned;
System.out.println("TotalCount======= : "+totalCount);
System.out.println("listed buffer =========> " + listedBuffer);
if(planned > 0)
{
rawJson.put("plannedtodaystatus", rowBuffer.toString());
rawJson.put("listedtodaystatus", "");
}
else
{
rawJson.put("listedtodaystatus", listedBuffer.toString());
rawJson.put("plannedtodaystatus", "");
}
double planDashArray = (planned/totalCount)*342;
double totalCountPlanning = planned+unplanned;
System.out.println("TotalCount======= : "+totalCountPlanning);
double planDashArray = (planned/totalCountPlanning)*342;
System.out.println("planDashArray ====== : "+planDashArray);
totalCount = listed+unListed;
double listedDashArray = (listed/totalCount)*280;
double totalCountListing = listed+unListed;
double listedDashArray = (listed/totalCountListing)*280;
System.out.println("listedDashArray ====== : "+listedDashArray);
String planning = "<td style='width: 29%;'> <div style='display: inline-flex; padding: 6px;float: left;'> <label style='padding:5px 0px 5px 12px;float:right;display:block font-size: 12px;text-align: right;'>Planned</label> <div class='color-box' style='position: absolute;margin-top:8px;background-color: #3BC806;width: 8px;height: 8px;margin-right: 5px;vertical-align: middle;border-radius: 8px;display:block;text-align: right;float: right;'></div> </div> <div style='display: inline-flex;padding: 6px;float: left;'> <label style='padding:5px 0px 5px 12px; float:right; display:block font-size: 12px;'>Unplanned</label> <div class='color-box' style='position: absolute; margin-top:8px; background-color: #FFA200; width: 8px;height: 8px; margin-right: 5px; vertical-align: middle;border-radius: 8px; display:block;'></div> </div> <div> </div> <div> </div> </td>";
String listing = "<td style='width: 29%;'> <div style='display: inline-flex; padding: 6px;float: left;'> <label style='padding:5px 0px 5px 12px;float:right;display:block font-size: 12px;text-align: right;'>Listed</label> <div class='color-box' style='position: absolute;margin-top:8px;background-color: #2F9EFC;width: 8px;height: 8px;margin-right: 5px;vertical-align: middle;border-radius: 8px;display:block;text-align: right;float: right;'></div> </div> <div style='display: inline-flex;padding: 6px;float: left;'> <label style='padding:5px 0px 5px 12px; float:right; display:block font-size: 12px;'>Unlisted</label> <div class='color-box' style='position: absolute; margin-top:8px; background-color: #FF6715; width: 8px;height: 8px; margin-right: 5px; vertical-align: middle;border-radius: 8px; display:block;'></div> </div> <div> </div> <div> </div> </td>";
// display data according to planning and listing if planning data is available then only planned & unplanned data will be displayed or else listed & unlisted data will be displayed
if(totalCountPlanning > 0 )
{
rawJson.put("planDashArray", planDashArray);
rawJson.put("strokeWidthPlan", 10);
rawJson.put("strokeWidthList", 0);
rawJson.put("Planning", planning);
rawJson.put("Listing", "");
}
else
{
rawJson.put("listedDashArray", listedDashArray);
rawJson.put("strokeWidthPlan", 0);
rawJson.put("strokeWidthList", 10);
rawJson.put("Listing", listing);
rawJson.put("Planning", "");
}
rawJson.put("total", planned+unplanned+listed+unListed);
rawDataPlanDtlJson.put(count, rawJson);
}
......@@ -1061,3 +1128,24 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
}
}
/*<td style="width: 20%;">
<div style="display: inline-flex; padding: 6px;float: left;"> <label style="padding:5px 0px 5px 12px;float:right;display:block font-size: 12px;text-align: right;">Planned</label> <div class="color-box" style="position: absolute;margin-top:8px;background-color: #3BC806;width: 8px;height: 8px;margin-right: 5px;vertical-align: middle;border-radius: 8px;display:block;text-align: right;float: right;"></div> </div>
<div style="display: inline-flex;padding: 6px;float: left;"> <label style="padding:5px 0px 5px 12px; float:right; display:block font-size: 12px;">Unplanned</label> <div class="color-box" style="position: absolute; margin-top:8px; background-color: #FFA200; width: 8px;height: 8px; margin-right: 5px; vertical-align: middle;border-radius: 8px; display:block;"></div> </div>
<div> </div>
<div> </div>
</td>*/
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