Skip to content

B
business-java
Commit c1604e1c authored by pborate's avatar pborate
Browse files
Options

Updated to get visitsummary details based on sfaparm entry in Todays Dashboard 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@196017 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 492506bf
Show whitespace changes
Inline Side-by-side
Showing with 117 additions and 32 deletions
webitm-dashboard/ibase/dashboard/sfa/ejb/PlanVsActual.java
View file @ c1604e1c
......@@ -70,12 +70,12 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
//Added by Anjali R.[End]
//Added by Saitej D [START]
public String getTodaysData(String dataSourceName,String loginId,String salePersons,String dummy,String fromDate, String toDate)throws Exception
public String getTodaysData(String dataSourceName,String loginId,String salePersons,String dummy,String fromDate, String toDate, String enterprise)throws Exception
{
System.out.println("getTodaysCalls==========\n dataSourceName-["+dataSourceName+"]loginId-["+loginId+"]salePersons-["+salePersons+"]");
System.out.println("getTodaysCalls==========\n dataSourceName-["+dataSourceName+"]loginId-["+loginId+"]salePersons-["+salePersons+"] enterprise["+enterprise+"]");
//System.out.println("Result ---3["+getTodaysCalls(dataSourceName, loginId, salePersons).toJSONString()+"]");
//return getTodaysCalls(dataSourceName, loginId, salePersons).toString();
return getTodaysMyData(dataSourceName, loginId, salePersons,fromDate, toDate).toString();
return getTodaysMyData(dataSourceName, loginId, salePersons,fromDate, toDate, enterprise).toString();
}
//Added by Saitej D [END]
......@@ -2078,7 +2078,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
//Added by Priyanka B. [Todays Calls Dashboard] Start
public org.json.JSONObject getTodaysMyData(String dataSourceName,String loginCode,String salePersons,String fromDate, String toDate) throws Exception
public org.json.JSONObject getTodaysMyData(String dataSourceName,String loginCode,String salePersons,String fromDate, String toDate, String enterprise) throws Exception
{
System.out.println("inside getTodaysMyData "+dataSourceName);
......@@ -2139,7 +2139,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
//rawDataPlanDtlJson.put("ACTIVITY_END_LOCALITY",sourceDestination.get("ACTIVITY_END_LOCALITY"));
System.out.println("after rawDataPlanDtlJson 1 "+rawDataPlanDtlJson);
org.json.JSONObject countListed=countOfListedUnlisted(salePersons,validFromDate,validToDate,dataSourceName,targetDateFormat);
org.json.JSONObject countListed=countOfListedUnlisted(salePersons,validFromDate,validToDate,dataSourceName,targetDateFormat, enterprise);
System.out.println("after countListed "+countListed);
rawDataPlanDtlJson.put("TODAYS_SUMMARY",countListed.get("TODAYS_SUMMARY"));
......@@ -2384,7 +2384,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
}
private org.json.JSONObject countOfListedUnlisted(String salePersons,String validFromDate, String validToDate, String dataSourceName,String targetDateFormat)throws Exception {
private org.json.JSONObject countOfListedUnlisted(String salePersons,String validFromDate, String validToDate, String dataSourceName,String targetDateFormat, String enterprise)throws Exception {
System.out.println("Inside getSourceDestination : "+salePersons);
JSONObject listOfCount=new JSONObject();
JSONArray finalArray=new JSONArray();
......@@ -2446,26 +2446,43 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
listedCount=listedCount+count1;
}
String orgUnit = "ENTERPRISE:"+enterprise;
String sfaParmVal = getSfaParmVal(dataSourceName, orgUnit.trim(), "TODAY_CALLS_INFO");
if(sfaParmVal == null || sfaParmVal.length() == 0)
{
sfaParmVal = "D,S,C,U";
}
JSONObject visitSummerObj=new JSONObject();
if(sfaParmVal.indexOf("D") != -1)
{
String drCount = visitSummaryMap.get("DOCTOR");
drCount = drCount != null ? drCount : "0";
JSONObject visitSummerObj=new JSONObject();
visitSummerObj.put("OPTION_NAME", "Doctor");
visitSummerObj.put("OPTION_VALUE", drCount);
visitSummeryArray.add(visitSummerObj);
}
if(sfaParmVal.indexOf("S") != -1)
{
String stkCount = visitSummaryMap.get("STOCKIST");
stkCount = stkCount != null ? stkCount : "0";
visitSummerObj=new JSONObject();
visitSummerObj.put("OPTION_NAME", "Distributer");
visitSummerObj.put("OPTION_VALUE", stkCount);
visitSummeryArray.add(visitSummerObj);
}
if(sfaParmVal.indexOf("C") != -1)
{
String chmCount = visitSummaryMap.get("CHEMIST");
chmCount = chmCount != null ? chmCount : "0";
visitSummerObj=new JSONObject();
visitSummerObj.put("OPTION_NAME", "Retailer");
visitSummerObj.put("OPTION_VALUE", chmCount);
visitSummeryArray.add(visitSummerObj);
}
System.out.println("visitSummeryArray in countOfListedUnlisted 1 "+visitSummeryArray);
System.out.println("listed in countOfListedUnlisted "+listedCount);
......@@ -2511,11 +2528,14 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
}
System.out.println("scCode str ["+ScCodeStr+"] unlisted count ["+unlisted+"]");
if(sfaParmVal.indexOf("U") != -1)
{
visitSummerObj=new JSONObject();
visitSummerObj.put("OPTION_NAME", "Unlisted");
visitSummerObj.put("OPTION_VALUE", unlisted);
visitSummeryArray.add(visitSummerObj);
System.out.println("countOfListedUnlisted 2 visitSummeryArray "+visitSummeryArray);
}
visitObj.put("VISIT_SUMMARY", visitSummeryArray);
JSONObject todaysSummyObjUnList=new JSONObject();
......@@ -2803,6 +2823,70 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
return doctorArray;
}
//Added by Priyanka B. [Todays Calls Dashboard] End
private String getSfaParmVal( String dataSourceName, String orgUnit, String sfaParmName ) throws Exception{
System.out.println("Inside getSfaParmVal");
String sql = "";
ResultSet rs = null;
PreparedStatement pstmt = null;
Connection conn = null;
ConnDriver connDriver = new ConnDriver();
String sfaParmVal = "";
try {
conn = connDriver.getConnectDB(dataSourceName);
connDriver = null;
sql = "select PARM_VALUE from SFAPARM where ORG_UNIT = '" +orgUnit+ "' and PARM_NAME = '"+sfaParmName+"' and ACTIVE = 'Y' and SYSDATE between EFF_FROM and VALID_UPTO";
System.out.println("getSfaParmVal sql "+sql);
pstmt = conn.prepareStatement(sql,ResultSet.TYPE_SCROLL_SENSITIVE,ResultSet.CONCUR_READ_ONLY);
rs = pstmt.executeQuery();
while(rs.next())
{
sfaParmVal = rs.getString("PARM_VALUE");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
} catch (Exception e) {
System.out.println("Exception inside getSfaParmVal"+e);
e.printStackTrace();
}
finally
{
try
{
if (conn != null)
{
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
conn.close();
conn = null;
}
}
catch (Exception d)
{
d.printStackTrace();
System.out.println("Exception in PlanVsActual.getSfaParmVal() " + d.getMessage());
throw new ITMException(d);
}
}
System.out.println("sfaParmVal from getSfaParmVal"+sfaParmVal);
return sfaParmVal;
}
}
......
webitm-dashboard/ibase/dashboard/sfa/servlet/TodaysServlet.java
View file @ c1604e1c
......@@ -34,7 +34,7 @@ public class TodaysServlet extends HttpServlet
PlanVsActual planVsActual = null;
String dataSourceName = "";
String selectedOption = "";
String loginId = "",fromDate = "",salePersons = "", toDate = "",eventDate="";
String loginId = "",fromDate = "",salePersons = "", toDate = "",eventDate="", enterprise="";
HttpSession session = null;
//Changed by Anjali R. on[28/02/2018][To change return type json to string ]
//JSONObject jsonObjData = null;
......@@ -47,6 +47,7 @@ public class TodaysServlet extends HttpServlet
session = request.getSession(true);
userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
loginId = userInfo.getLoginCode();
enterprise = userInfo.getEnterprise();
dataSourceName = userInfo.getTransDB();
/*fromDate = request.getParameter("fromDate");
toDate = request.getParameter("toDate");*/
......@@ -67,7 +68,7 @@ public class TodaysServlet extends HttpServlet
//jsonObjData = planvsactualRemote.getTodaysCalls(dataSourceName,loginId,salePersons);
//jsonObjData = planvsactualRemote.getTodaysCalls(dataSourceName,loginId,salePersons,"",eventDate);
planVsActual = new PlanVsActual();
jsonObjData = planVsActual.getTodaysData(dataSourceName,loginId,salePersons,"",fromDate, toDate);
jsonObjData = planVsActual.getTodaysData(dataSourceName,loginId,salePersons,"",fromDate, toDate, enterprise);
System.out.println(" Final data set for TodaysCallServlet build the Graph is===" + jsonObjData);
......
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