Commit 7eb007b5 authored by vvengurlekar's avatar vvengurlekar

PlanVsActual.java- logic changed only planned and unplanned data will display even if value is 0


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@180601 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f8460770
...@@ -1246,8 +1246,8 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S ...@@ -1246,8 +1246,8 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
DashboardUtility dashboardUtility = null; DashboardUtility dashboardUtility = null;
int count = 0; int count = 0;
Map<String, Integer> plannedHashMap = new LinkedHashMap<String, Integer>(); Map<String, Integer> plannedHashMap = new LinkedHashMap<String, Integer>();
Map<String, Integer> listedHashMap = new LinkedHashMap<String, Integer>(); //Map<String, Integer> listedHashMap = new LinkedHashMap<String, Integer>();
int planned=0, unplanned=0,listed=0, unListed=0; int planned=0, unplanned=0;//listed=0, unListed=0;
String currentDate=""; String currentDate="";
SimpleDateFormat convertToDBDate = null; SimpleDateFormat convertToDBDate = null;
try try
...@@ -1319,7 +1319,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S ...@@ -1319,7 +1319,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
/*----------Listed doctors visited.--*/ /*----------Listed doctors visited.--*/
sql = "SELECT SM.TRAN_ID, SM.EVENT_DATE ,SM.SALES_PERS ,SP.SP_NAME ,SM.STRG_CODE ," + /*sql = "SELECT SM.TRAN_ID, SM.EVENT_DATE ,SM.SALES_PERS ,SP.SP_NAME ,SM.STRG_CODE ," +
"(SC.FIRST_NAME ||' '||SC.LAST_NAME)AS NAME FROM STRG_SERIES SS " + "(SC.FIRST_NAME ||' '||SC.LAST_NAME)AS NAME FROM STRG_SERIES SS " +
"INNER JOIN STRG_MEET SM ON SM.STRG_CODE=SS.SC_CODE " + "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 " + "AND SM.SALES_PERS=SS.SALES_PERS INNER JOIN SALES_PERS SP ON " +
...@@ -1338,10 +1338,10 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S ...@@ -1338,10 +1338,10 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
*/
/*----------Unlisted doctors visited.--*/ /*----------Unlisted doctors visited.--*/
sql = "SELECT SM.TRAN_ID, SM.EVENT_DATE ,SP.SALES_PERS ,SP.SP_NAME ,SM.STRG_CODE ," + /*sql = "SELECT SM.TRAN_ID, SM.EVENT_DATE ,SP.SALES_PERS ,SP.SP_NAME ,SM.STRG_CODE ," +
"SM.STRG_NAME FROM STRG_MEET SM LEFT JOIN STRG_CUSTOMER SC " + "SM.STRG_NAME FROM STRG_MEET SM LEFT JOIN STRG_CUSTOMER SC " +
"ON SC.SC_CODE = SM.STRG_CODE INNER JOIN SALES_PERS SP ON " + "ON SC.SC_CODE = SM.STRG_CODE INNER JOIN SALES_PERS SP ON " +
"SP.SALES_PERS=SM.SALES_PERS WHERE SM.SALES_PERS="+salePersons+" " + "SP.SALES_PERS=SM.SALES_PERS WHERE SM.SALES_PERS="+salePersons+" " +
...@@ -1358,27 +1358,27 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S ...@@ -1358,27 +1358,27 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;*/
plannedHashMap.put("Planned", planned); plannedHashMap.put("Planned", planned);
plannedHashMap.put("Unplanned", unplanned); plannedHashMap.put("Unplanned", unplanned);
listedHashMap.put("Listed", listed); //listedHashMap.put("Listed", listed);
listedHashMap.put("Unlisted", unListed); //listedHashMap.put("Unlisted", unListed);
System.out.println("plannedHashMap: "+plannedHashMap.toString()+" listedHashMap: "+listedHashMap.toString()); System.out.println("plannedHashMap: "+plannedHashMap.toString());//+" listedHashMap: "+listedHashMap.toString());
if(planned > 0 || unplanned > 0) /*if(planned > 0 || unplanned > 0)
{ {*/
for (Map.Entry<String, Integer> entry : plannedHashMap.entrySet()) for (Map.Entry<String, Integer> entry : plannedHashMap.entrySet())
{ {
System.out.print("plannedHashMap entry: "+entry.getKey() + ": "+entry.getValue()); System.out.print("plannedHashMap entry: "+entry.getKey() + ": "+entry.getValue());
rawJson = new JSONObject(); rawJson = new JSONObject();
rawJson.put("label", entry.getKey()); rawJson.put("label", entry.getKey());
rawJson.put("value", entry.getValue()); rawJson.put("value", entry.getValue());
rawDataPlanDtlJson.put(count, rawJson); rawDataPlanDtlJson.put(count, rawJson);
count ++; count ++;
} }
} /*}
else else
{ {
for (Map.Entry<String, Integer> entry : listedHashMap.entrySet()) for (Map.Entry<String, Integer> entry : listedHashMap.entrySet())
...@@ -1390,7 +1390,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S ...@@ -1390,7 +1390,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
rawDataPlanDtlJson.put(count, rawJson); rawDataPlanDtlJson.put(count, rawJson);
count ++; count ++;
} }
} }*/
} }
catch (Exception e) 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