Replace code from branch because in head code is not proper which development done in branch.

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

webitm-dashboard/ibase/dashboard/sfa/ejb/AttendanceCompliance.java

 package ibase.dashboard.sfa.ejb;
 
-import ibase.utility.E12GenericUtility;
+import ibase.system.config.ConnDriver;
 import ibase.webitm.ejb.ValidatorEJB;
+import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 import java.rmi.RemoteException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.text.SimpleDateFormat;
+
+
 import javax.ejb.Stateless;
 import org.json.simple.JSONObject;
 
@@ -15,30 +18,63 @@ import org.json.simple.JSONObject;
 public class AttendanceCompliance extends ValidatorEJB implements AttendanceComplianceLocal,
 		AttendanceComplianceRemote
 {
-	E12GenericUtility e12GenericUtility = new E12GenericUtility();
 	public AttendanceCompliance()
 	{
 	}
+
 	@SuppressWarnings("unchecked")
 	public JSONObject getAttendance(String dataSourceName, String empCode)
 			throws RemoteException, ITMException
 	{
 		JSONObject rowDataPendingTaskJson = new JSONObject();
-		JSONObject rowData      = null;
-		String sql              = "";
-		ResultSet rs            = null;
+		JSONObject rowData = null;
+		String sql = "";
+		ResultSet rs = null;
 		PreparedStatement pstmt = null;
-		Connection conn         = null;
+		Connection conn = null;
+		ConnDriver connDriver = new ConnDriver();
 		int count = 0;
 		try
 		{
-			SimpleDateFormat convertToDbDate  =new SimpleDateFormat(new E12GenericUtility().getDBDateFormat());
-			SimpleDateFormat simpleDateFormat =new SimpleDateFormat(new E12GenericUtility().getApplDateFormat());
+			SimpleDateFormat convertToDbDate =new SimpleDateFormat(new GenericUtility().getDBDateFormat());
+			SimpleDateFormat simpleDateFormat =new SimpleDateFormat(new GenericUtility().getApplDateFormat());
 			//simpleDateFormat.format(convertToDbDate.parse(""));
-			/*conn = connDriver.getConnectDB(dataSourceName);
-			connDriver = null;*/			
-			/*add new code for connection DB on dated:16062016 by Nikhil*/
-			conn = getConnection();
+			conn = connDriver.getConnectDB(dataSourceName);
+			connDriver = null;
+	/*sql_main =   " SELECT  SALES_PERS, SP_NAME, to_char(LAST_REPORT,'dd/mm/yyyy') AS LAST_REPORT, ROUND(TRUNC(SYSDATE)-TRUNC(LAST_REPORT)) NOT_REPORTED,"
+			+ " EMP_NAME, MOBILE_NO FROM (SELECT  SP.SALES_PERS, SP.SP_NAME,MAX(S.EVENT_DATE) LAST_REPORT,"
+			+ " (NVL(TRIM(E1.EMP_FNAME),'')||NVL(TRIM(E1.EMP_MNAME),' ')||NVL(TRIM(E1.EMP_LNAME),'')) EMP_NAME, "
+			+ " E.MOBILE_NO FROM SPRS_ACT_TRAN S INNER JOIN EMPLOYEE E ON S.SALES_PERS = E.EMP_CODE "
+			+ " INNER JOIN SALES_PERS SP ON E.EMP_CODE = SP.SALES_PERS LEFT "
+			+ " OUTER JOIN EMPLOYEE E1 ON E1.EMP_CODE = E.REPORT_TO "
+			+ " WHERE E.REPORT_TO = '" + empCode + "'"
+			+ " GROUP BY SP.SALES_PERS, SP.SP_NAME, (NVL(TRIM(E1.EMP_FNAME),'')||NVL(TRIM(E1.EMP_MNAME),' ')||NVL(TRIM(E1.EMP_LNAME),'')), E.MOBILE_NO) A order by to_date(LAST_REPORT)";
+    */
+	
+	/*sql = "SELECT SALES_PERS, sp_name, LAST_REPORT  AS LAST_REPORT, ROUND(TRUNC(SYSDATE)-TRUNC(LAST_REPORT)) NOT_REPORTED, " +
+			"EMP_NAME, mobile_no  FROM (SELECT SP.SALES_PERS, SP.SP_NAME, MAX(S.EVENT_DATE) LAST_REPORT, (NVL(TRIM(E1.EMP_FNAME),'') ||NVL(TRIM(E1.EMP_MNAME),' ') ||NVL(TRIM(E1.EMP_LNAME),'')) EMP_NAME, " +
+			"E.MOBILE_NO, to_char(MAX(S.EVENT_DATE),'dd/mm/yy') LAST_REPORT1 FROM SPRS_ACT_TRAN S INNER JOIN EMPLOYEE E ON S.SALES_PERS = E.EMP_CODE INNER JOIN SALES_PERS SP ON E.EMP_CODE = SP.SALES_PERS LEFT OUTER JOIN EMPLOYEE E1 ON E1.EMP_CODE    = E.REPORT_TO " +
+			//"WHERE E.REPORT_TO = 'G009' " +
+			"GROUP BY SP.SALES_PERS, SP.SP_NAME, (NVL(TRIM(E1.EMP_FNAME),'') ||NVL(TRIM(E1.EMP_MNAME),' ') ||NVL(TRIM(E1.EMP_LNAME),'')), E.MOBILE_NO ) a order by last_report desc ";
+	
+	sql_local =   "SELECT SALES_PERS, sp_name, TRUNC(LAST_REPORT )AS LAST_REPORT, " +
+			"ROUND(TRUNC(SYSDATE)-TRUNC(LAST_REPORT)) NOT_REPORTED, EMP_NAME, mobile_no FROM (SELECT SP.SALES_PERS, SP.SP_NAME, MAX(S.EVENT_DATE) LAST_REPORT, (NVL(TRIM(E1.EMP_FNAME),'') ||NVL(TRIM(E1.EMP_MNAME),' ') ||NVL(TRIM(E1.EMP_LNAME),'')) EMP_NAME, " +
+			"E.MOBILE_NO, TO_CHAR(MAX(S.EVENT_DATE),'dd/mm/yy') LAST_REPORT1 FROM SPRS_ACT_TRAN S INNER JOIN EMPLOYEE E ON S.SALES_PERS = E.EMP_CODE INNER JOIN SALES_PERS SP ON E.EMP_CODE = SP.SALES_PERS LEFT OUTER JOIN EMPLOYEE E1 ON E1.EMP_CODE    = E.REPORT_TO " +
+			"WHERE E.REPORT_TO = 'G009' " +
+			"GROUP BY SP.SALES_PERS, SP.SP_NAME, (NVL(TRIM(E1.EMP_FNAME),'') ||NVL(TRIM(E1.EMP_MNAME),' ') ||NVL(TRIM(E1.EMP_LNAME),'')), E.MOBILE_NO ) a order by trunc(last_report) desc ";
+	*/
+	
+	
+	/*sql_160316 =   " select A.SALES_PERS, SP.SP_NAME, A.LAST_REPORT, " +
+			" ROUND(TRUNC(sysdate)-TRUNC(A.LAST_REPORT)) NOT_REPORTED, I.DESCR ITEM_SERIES," +
+			" E.HOBBY1 REGION, E.CUR_STATE STATE, (NVL(TRIM(E1.EMP_FNAME),'')||NVL(TRIM(E1.EMP_MNAME),' ')||NVL(TRIM(E1.EMP_LNAME),'')) EMP_NAME, E.MOBILE_NO " +
+			" FROM (SELECT t.SALES_PERS,Max(T.EVENT_DATE) LAST_REPORT FROM SPRS_ACT_TRAN T " +
+			" WhERE T.SALEs_PERS IN (SELECT S.SALES_pERS FROM SALES_PErS S  INNER JOIN  EMPLOYEE E ON S.SALES_PERS = E.EMP_CODE " +
+			" WHERE S.ACTIVE_YN='Y' " +
+			" start with e.emp_code = '" + empCode + "' " +
+			" connect by prior E.EMP_CODE = E.REPORT_TO) " +
+			" GRoup by t.SALES_PERS)A INNER JOIN SALES_PERS SP ON A.SALES_PERS = SP.SALES_PERS INNER  JOIN EMPLOYEE E ON SP.SALES_PERS = E.EMP_CODE INNER JOIN ITEMSER I ON I.ITEM_SER=SP.ITEM_SER LEFT OUTER JOIN EMPLOYEE E1 ON E1.EMP_CODE = E.REPORT_TO ";
+	*/
 			
 	/*Sql Changes on 150316*/
 	/*sql =   " select A.SALES_PERS, SP.SP_NAME, A.LAST_REPORT, ROUND(TRUNC(sysdate)-TRUNC(A.LAST_REPORT)) " +
@@ -68,21 +104,10 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp
 			" GRoup by t.SALES_PERS )A INNER JOIN SALES_PERS SP ON A.SALES_PERS = SP.SALES_PERS INNER  JOIN EMPLOYEE E ON SP.SALES_PERS = E.EMP_CODE " +
 			" INNER JOIN ITEMSER I ON I.ITEM_SER=SP.ITEM_SER LEFT OUTER JOIN EMPLOYEE E1 ON E1.EMP_CODE = E.REPORT_TO LEFT OUTER JOIN STATE S ON S.STATE_CODE = E.CUR_STATE ";
 	*/
- sql =  "SELECT A.SALES_PERS, SP.SP_NAME, A.LAST_REPORT, ROUND(TRUNC(sysdate)-TRUNC(A.LAST_REPORT)) NOT_REPORTED_DAYS, " +
- 		"I.DESCR DIVISION,E1.HOBBY1 REGION, S.DESCR STATE, (NVL(TRIM(E1.EMP_FNAME),'') ||NVL(TRIM(E1.EMP_MNAME),' ') ||NVL(TRIM(E1.EMP_LNAME),'')) EMP_NAME, " +
- 		"E1.MOBILE_NO FROM (SELECT t.SALES_PERS, MAX(T.EVENT_DATE) LAST_REPORT " +
- 		"FROM SPRS_ACT_TRAN T WHERE T.SALEs_PERS IN (SELECT S.SALES_pERS FROM SALES_PErS S " +
- 		"INNER JOIN EMPLOYEE E ON S.SALES_PERS = E.EMP_CODE " +
- 		"WHERE E.STATUS ='Y' START WITH e.emp_code = '1313' CONNECT BY prior E.EMP_CODE = E.REPORT_TO ) " +
- 		"AND T.CONFIRMED='Y' GROUP BY t.SALES_PERS )A " +
- 		"INNER JOIN SALES_PERS SP ON A.SALES_PERS = SP.SALES_PERS " +
- 		"INNER JOIN ITEMSER I ON I.ITEM_SER=SP.ITEM_SER LEFT " +
- 		"OUTER JOIN EMPLOYEE E1 ON E1.EMP_CODE = E1.REPORT_TO " +
- 		"LEFT OUTER JOIN STATE S ON S.STATE_CODE = E1.CUR_STATE  ";
-						
+	
 	/*Final SQL After E.STATUS ='Y' changes in SQL  On dated 050516*/
 	
-	/*sql =   " SELECT A.SALES_PERS, SP.SP_NAME, A.LAST_REPORT, ROUND(TRUNC(sysdate)-TRUNC(A.LAST_REPORT)) NOT_REPORTED_DAYS," +
+	sql =   " SELECT A.SALES_PERS, SP.SP_NAME, A.LAST_REPORT, ROUND(TRUNC(sysdate)-TRUNC(A.LAST_REPORT)) NOT_REPORTED_DAYS," +
 			" I.DESCR DIVISION , E.HOBBY1 REGION, S.DESCR STATE, (NVL(TRIM(E1.EMP_FNAME),'') ||NVL(TRIM(E1.EMP_MNAME),' ') ||NVL(TRIM(E1.EMP_LNAME),'')) EMP_NAME, " +
 			" E.MOBILE_NO FROM (SELECT t.SALES_PERS, MAX(T.EVENT_DATE) LAST_REPORT " +
 			" FROM SPRS_ACT_TRAN T " +
@@ -97,14 +122,15 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp
 			" INNER JOIN ITEMSER I ON I.ITEM_SER=SP.ITEM_SER LEFT " +
 			" OUTER JOIN EMPLOYEE E1 ON E1.EMP_CODE = E.REPORT_TO " +
 			" LEFT OUTER JOIN STATE S ON S.STATE_CODE = E.CUR_STATE ";
-*/
+
 	
 	System.out.println("sql is =" + sql);
 	pstmt = conn.prepareStatement(sql);
-	rs    = pstmt.executeQuery();
+	rs = pstmt.executeQuery();
 
 	while (rs.next())
 	{
+
 		rowData = new JSONObject();
 		rowData.put("salespersn",   checkNull(rs.getString("SALES_PERS")));
 		rowData.put("spname",       checkNull(rs.getString("SP_NAME")));

webitm-dashboard/ibase/dashboard/sfa/ejb/ComplianceDB2Local.java

+package ibase.dashboard.sfa.ejb;
+import java.rmi.RemoteException;
+import ibase.webitm.ejb.ValidatorLocal;
+import ibase.webitm.utility.ITMException;
+
+import javax.ejb.Local;
+
+import org.json.simple.JSONObject;
+
+@Local
+public interface ComplianceDB2Local extends ValidatorLocal 
+{
+	public JSONObject getComplianceHirarchyDB2(String loginId, String dataSourceName,String month) throws RemoteException, ITMException;
+	public JSONObject getComplianceSummaryDB2(String firstVal, String cellVal, String dataSourceName) throws RemoteException, ITMException;
+	public JSONObject getComplianceDetailsDB2(String month, String personName, String dataSourceName) throws RemoteException, ITMException;
+}

webitm-dashboard/ibase/dashboard/sfa/ejb/ComplianceDB2Remote.java

+package ibase.dashboard.sfa.ejb;
+
+import java.rmi.RemoteException;
+import ibase.webitm.ejb.ValidatorRemote;
+import ibase.webitm.utility.ITMException;
+import javax.ejb.Remote;
+import org.json.simple.JSONObject;
+
+@Remote
+public interface ComplianceDB2Remote extends ValidatorRemote
+{
+	public JSONObject getComplianceHirarchyDB2(String loginId, String dataSourceName,String month) throws RemoteException, ITMException;
+	public JSONObject getComplianceSummaryDB2(String firstVal, String cellVal, String dataSourceName) throws RemoteException, ITMException;
+	public JSONObject getComplianceDetailsDB2(String month, String personName, String dataSourceName) throws RemoteException, ITMException;
+}

webitm-dashboard/ibase/dashboard/sfa/ejb/CustomerMeetingTrends.java

 package ibase.dashboard.sfa.ejb;
-import ibase.utility.E12GenericUtility;
+import ibase.system.config.ConnDriver;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.utility.ITMException;
 import java.rmi.RemoteException;
@@ -17,7 +17,6 @@ import javax.ejb.Stateless;
 @Stateless
 public class CustomerMeetingTrends extends ValidatorEJB implements CustomerMeetingTrendsRemote, CustomerMeetingTrendsLocal
 {
-	E12GenericUtility e12GenericUtility = new E12GenericUtility();
 	/**
 	 * Default constructor.
 	 */
@@ -44,12 +43,14 @@ public class CustomerMeetingTrends extends ValidatorEJB implements CustomerMeeti
 		return "";
 	}
 	
+
 	public String getData(String loginCode) throws RemoteException, ITMException
 	{
 		String sql = "";
 		ResultSet rs = null;
 		Connection conn = null;
 		PreparedStatement pstmt = null;
+		ConnDriver connDriver = new ConnDriver();
 		StringBuffer xmlData = null;
 	
 		List<String> weekList     = new ArrayList<String>();
@@ -60,15 +61,16 @@ public class CustomerMeetingTrends extends ValidatorEJB implements CustomerMeeti
 		List<String> unlistedList = new ArrayList<String>();
 		try
 		{
-			/*conn = connDriver.getConnectDB("DriverITM");
-			connDriver = null;*/
-			/*add new code for connection DB on dated:14062016 by Nikhil*/
-			conn = getConnection();	
+			conn = connDriver.getConnectDB("DriverITM");
+			connDriver = null;
+
 			sql = "select sp.sales_pers, sp.sp_name, sp.year, sp.week, Sum(Case When Strg_Meet.Strg_Type = 'D' and Strg_Meet.Strg_Code Not Like 'UL%'  then 1 Else 0 End) as Doctors, Sum(Case When Strg_Meet.Strg_Type = 'C' and Strg_Meet.Strg_Code Not Like 'UL%'  then 1 Else 0 End) as Chemist, Sum(Case When Strg_Meet.Strg_Type = 'S' and Strg_Meet.Strg_Code Not Like 'UL%'  then 1 Else 0 End) as STockist, Sum(Case When Strg_Meet.Strg_Type = 'D' and Strg_Meet.Strg_Code Like 'UL%'  then 1 Else 0 End) as Unlisted from ( select sales_pers, SP_NAME, Dt, to_char(dt,'WW') as Week, month_no AS Month, TO_CHAR(DT,'MON') as Month_Mon, year from sales_pers cross join sfa_time where sales_pers =? and Sfa_time.dt >= (trunc(sysdate,'WW')+6)-41 and Sfa_time.dt <= to_Date(sysdate) ) sp left Join strg_meet on strg_meet.sales_pers=sp.sales_pers and strg_meet.event_date = sp.dt Group by sp.sales_pers, sp.sp_name, sp.year, sp.week Order by Year asc , Week asc";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, loginCode);
-			rs = pstmt.executeQuery();			
-			xmlData = new StringBuffer("<?xml version='1.0'?> <Root>");			
+			rs = pstmt.executeQuery();
+			
+			xmlData = new StringBuffer("<?xml version='1.0'?> <Root>");
+			
 			while (rs.next())
 			{
 				cyearList.add(rs.getString(3));
@@ -76,8 +78,10 @@ public class CustomerMeetingTrends extends ValidatorEJB implements CustomerMeeti
 				doctorList.add(rs.getString(5));
 				chemistList.add(rs.getString(6));
 				stockistList.add(rs.getString(7));
-				unlistedList.add(rs.getString(8));								
-			}			
+				unlistedList.add(rs.getString(8));				
+				
+			}
+			
 			pstmt.close();
 			pstmt = null;
 			rs.close();

webitm-dashboard/ibase/dashboard/sfa/ejb/DoctorsMeetingByClass.java

 package ibase.dashboard.sfa.ejb;
 
-import ibase.utility.E12GenericUtility;
+import javax.ejb.Stateless;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.utility.ITMException;
 import java.rmi.RemoteException;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import javax.ejb.Stateless;
+import java.sql.*;
+import ibase.system.config.ConnDriver;
 
 /**
  * Session Bean implementation class DashboardPortal
@@ -15,7 +13,6 @@ import javax.ejb.Stateless;
 @Stateless
 public class DoctorsMeetingByClass extends ValidatorEJB implements DoctorsMeetingByClassRemote, DoctorsMeetingByClassLocal
 {
-	E12GenericUtility e12GenericUtility = new E12GenericUtility();
 
 	/**
 	 * Default constructor.
@@ -57,14 +54,12 @@ public class DoctorsMeetingByClass extends ValidatorEJB implements DoctorsMeetin
 		ResultSet rs = null;
 		Connection conn = null;
 		PreparedStatement pstmt = null;
+		ConnDriver connDriver = new ConnDriver();
 		StringBuffer xmlData = null;
 		try
 		{
-			/*conn = connDriver.getConnectDB("DriverITM");
-			connDriver = null;*/
-			/*add new code for connection DB on dated:14062016 by Nikhil*/
-			conn = getConnection();	
-
+			conn = connDriver.getConnectDB("DriverITM");
+			connDriver = null;
 			/*Calendar c= Calendar.getInstance();
 			 java.util.Date date = new java.util.Date(c.getTimeInMillis());
 			

webitm-dashboard/ibase/dashboard/sfa/ejb/DoctorsVisit.java

 package ibase.dashboard.sfa.ejb;
 import ibase.dashboard.Report.Utility.DashboardUtility;
-import ibase.utility.E12GenericUtility;
+import ibase.system.config.ConnDriver;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.utility.ITMException;
 import java.rmi.RemoteException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+
 import javax.ejb.Stateless;
+
 import org.json.simple.JSONObject;
 /**
  * Session Bean implementation class SalesPersonSales
@@ -18,7 +20,7 @@ public class DoctorsVisit extends ValidatorEJB implements DoctorsVisitRemote, Do
 	public DoctorsVisit() {
         // TODO Auto-generated constructor stub
     }
-	E12GenericUtility e12GenericUtility = new E12GenericUtility();
+    
     @SuppressWarnings("unchecked")
 	@Override
     public JSONObject getDoctorsVisitDetails(String loginId, String salesPerson, String month, String year,String dataSourceName) throws RemoteException, ITMException
@@ -29,16 +31,16 @@ public class DoctorsVisit extends ValidatorEJB implements DoctorsVisitRemote, Do
 		ResultSet rs = null;
 		PreparedStatement pstmt = null;
 		Connection conn = null;
+		ConnDriver connDriver = new ConnDriver();
 		DashboardUtility dashbordUtil = null;
 		try
 		{
 			System.out.println(" Inside DoctorsVisitEJB for Data Soruc Name ="+dataSourceName+" loginId=:"+ loginId+":=== salesPerson is =" + salesPerson +" month is =" + month +" year is =" + year);
 			dashbordUtil = new DashboardUtility();
 			salesPerson  = dashbordUtil.getCommaSeparated(salesPerson.trim());
-			/*conn         = connDriver.getConnectDB(dataSourceName);
-			connDriver   = null;	*/
-			/*add new code for connection DB on dated:17062016 by Nikhil*/
-			conn = getConnection(); 
+			conn         = connDriver.getConnectDB(dataSourceName);
+			connDriver   = null;	
+			  
 			
 			
 			/*sql = 	" select A.sales_pers, A.SALESPERSON_NAME, "

webitm-dashboard/ibase/dashboard/sfa/ejb/ExpenseProcessStatus.java

 package ibase.dashboard.sfa.ejb;
 
-import ibase.utility.E12GenericUtility;
+import javax.ejb.Stateless;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.utility.ITMException;
-
 import java.rmi.RemoteException;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-
-import javax.ejb.Stateless;
+import java.sql.*;
+import ibase.system.config.ConnDriver;
 
 /**
  * Session Bean implementation class DashboardPortal
@@ -17,7 +13,7 @@ import javax.ejb.Stateless;
 @Stateless
 public class ExpenseProcessStatus extends ValidatorEJB implements ExpenseProcessStatusRemote, ExpenseProcessStatusLocal
 {
-	E12GenericUtility e12GenericUtility = new E12GenericUtility();
+
 	/**
 	 * Default constructor.
 	 */
@@ -60,14 +56,13 @@ public class ExpenseProcessStatus extends ValidatorEJB implements ExpenseProcess
 		ResultSet rs = null;
 		Connection conn = null;
 		PreparedStatement pstmt = null;
+		ConnDriver connDriver = new ConnDriver();
 		StringBuffer xmlData = null;
 
 		try
 		{
-			/*conn = connDriver.getConnectDB("DriverITM");
-			connDriver = null;*/
-			/*add new code for connection DB on dated:14062016 by Nikhil*/
-			conn = getConnection();	
+			conn = connDriver.getConnectDB("DriverITM");
+			connDriver = null;
 
 			sql = "Select sp_period.sales_pers as sales_code, initcap(sp_period.sp_name) as salesperson_name, to_char(sp_period.fr_date,'YY') as Period1, to_char(sp_period.fr_date,'MM') as Period2, to_char(sp_period.fr_date,'YYYYMM') as Period3, concat(concat((concat('  ',trim(to_char(sp_period.fr_date,'Month')))),' - '),to_char(sp_period.fr_date,'YY')) as Period, Tour.Net_Amt as Amount, to_char(Tour.Chg_Date,'dd/mm/yy') as Submitted_Date, Obj_Sign_Trans_1.Sign_Status as Apporval_Status, to_char(Max(Wf_Prc_Status.Status_Date),'dd/mm/yy') as Status_Date from ( select sales_pers,sp_name,active_yn, fr_date,to_date from sales_pers,period where fr_date >= to_char(last_day(add_months(sysdate,-4))+1) and to_date < = to_char(last_day(add_months(sysdate,-1))) ) sp_period left join Tour on Tour.emp_code = sp_period.sales_pers and Tour.Date_from = sp_period.fr_date and Tour.Date_to = sp_period.to_date left join Wf_Prc_Status on Wf_Prc_Status.ref_id = Tour.Tour_Id left join Obj_Sign_Trans on Obj_Sign_Trans.Ref_Id = Tour.Tour_Id inner join ( select Ref_Id,Sign_Status,line_no from Obj_Sign_Trans ) Obj_Sign_Trans_1 on Obj_Sign_Trans_1.Ref_Id = Obj_Sign_Trans.Ref_Id where sp_period.active_yn = 'Y' and sp_period.sales_pers = ? " + " group by sp_period.sales_pers, sp_period.sp_name, to_char(sp_period.fr_date,'YY'), to_char(sp_period.fr_date,'MM'), to_char(sp_period.fr_date,'YYYYMM'), to_char(sp_period.fr_date,'Month'), Tour.Net_Amt, Obj_Sign_Trans_1.Line_No, to_char(Tour.Chg_Date,'dd/mm/yy'), Obj_Sign_Trans_1.Sign_Status having (Obj_Sign_Trans_1.line_no = max(Obj_Sign_Trans.line_no)) UNION ALL Select sp_period.sales_pers as sales_code, initcap(sp_period.sp_name) as salesperson_name, to_char(sp_period.fr_date,'YY') as Period1, to_char(sp_period.fr_date,'MM') as Period2, to_char(sp_period.fr_date,'YYYYMM') as Period3, concat(concat((concat('  ',trim(to_char(sp_period.fr_date,'Month')))),' - '),to_char(sp_period.fr_date,'YY')) as Period, Tour.Net_Amt as Amount, to_char(Tour.Chg_Date,'dd/mm/yy') as Submitted_Date, 'NOT' as Apporval_Status, to_char(Max(Wf_Prc_Status.Status_Date),'dd/mm/yy') as Status_Date from ( select sales_pers,sp_name,active_yn, fr_date,to_date from sales_pers,period where fr_date >= to_char(last_day(add_months(sysdate,-4))+1) and to_date < = to_char(last_day(add_months(sysdate,-1))) ) sp_period left join Tour on Tour.emp_code = sp_period.sales_pers and Tour.Date_from = sp_period.fr_date and Tour.Date_to = sp_period.to_date left join Wf_Prc_Status on Wf_Prc_Status.ref_id = Tour.Tour_Id left join Obj_Sign_Trans on Obj_Sign_Trans.Ref_Id = Tour.Tour_Id where sp_period.active_yn = 'Y' and sp_period.sales_pers = ? " + " group by sp_period.sales_pers, sp_period.sp_name, to_char(sp_period.fr_date,'YY'), to_char(sp_period.fr_date,'MM'), to_char(sp_period.fr_date,'YYYYMM'), to_char(sp_period.fr_date,'Month'), Tour.Net_Amt, to_char(Tour.Chg_Date,'dd/mm/yy'), 'NOT' having ( max(Obj_Sign_Trans.line_no) IS NULL) ORDER BY Period1, Period2, Period3, Period ";
 			pstmt = conn.prepareStatement(sql);

webitm-dashboard/ibase/dashboard/sfa/ejb/ImpDocMissed.java

@@ -4,9 +4,11 @@ import java.rmi.RemoteException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import ibase.utility.E12GenericUtility;
+
+import ibase.system.config.ConnDriver;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.utility.ITMException;
+
 import javax.ejb.Stateless;
 
 /**
@@ -15,7 +17,6 @@ import javax.ejb.Stateless;
 @Stateless
 public class ImpDocMissed extends ValidatorEJB implements ImpDocMissedRemote, ImpDocMissedLocal
 {
-	E12GenericUtility e12GenericUtility = new E12GenericUtility();
 	/**
 	 * Default constructor.
 	 */
@@ -50,13 +51,14 @@ public class ImpDocMissed extends ValidatorEJB implements ImpDocMissedRemote, Im
 		ResultSet rs = null;
 		Connection conn = null;
 		PreparedStatement pstmt = null;
+		ConnDriver connDriver = new ConnDriver();
 		StringBuffer xmlData = null;
+
 		try
 		{
-			/*conn = connDriver.getConnectDB("DriverITM");
-			connDriver = null;*/
-			/*add new code for connection DB on dated:14062016 by Nikhil*/
-			conn = getConnection();	
+			conn = connDriver.getConnectDB("DriverITM");
+			connDriver = null;
+
 			//sql (old Sql)= "SELECT initcap(SALES_PERS.SP_NAME) AS SALESPERSON_NAME, SYSDATE AS CURRENT_DATE, FN_R_CHECK_PRINT2(STRG_SERIES.SALES_PERS,SYSDATE,STRG_SERIES.NO_VISIT,STRG_SERIES.SC_CODE) AS ACTUAL_VISITS, FN_R_CHECK_COUNT(SYSDATE,STRG_SERIES.NO_VISIT) AS ACTUAL_CHECK, (CASE WHEN (FN_R_CHECK_PRINT2(STRG_SERIES.SALES_PERS,SYSDATE,STRG_SERIES.NO_VISIT,STRG_SERIES.SC_CODE)) < FN_R_CHECK_COUNT(SYSDATE,STRG_SERIES.NO_VISIT) THEN initcap(STRG_CUSTOMER.FIRST_NAME||' '||STRG_CUSTOMER.LAST_NAME ) ELSE ' ' END) AS DOCTORS_NAME, FN_R_DAYS_SINCE_NOT_MET(STRG_SERIES.SALES_PERS,SYSDATE,STRG_SERIES.SC_CODE) AS DAYS_SINCE_NOT_MET_n, (case when (FN_R_CHECK_COUNT(SYSDATE,STRG_SERIES.NO_VISIT) - FN_R_CHECK_PRINT2(STRG_SERIES.SALES_PERS,To_Date(SYSDATE),STRG_SERIES.NO_VISIT,STRG_SERIES.SC_CODE) ) <0 then 0 else (FN_R_CHECK_COUNT(SYSDATE,STRG_SERIES.NO_VISIT) -FN_R_CHECK_PRINT2(STRG_SERIES.SALES_PERS,To_Date(SYSDATE),STRG_SERIES.NO_VISIT,STRG_SERIES.SC_CODE) ) end ) - (CASE WHEN FN_R_CHECK_PRINT2_NEW(STRG_SERIES.SALES_PERS,To_Date(SYSDATE),STRG_SERIES.NO_VISIT,STRG_SERIES.SC_CODE,FN_R_CHECK_COUNT(SYSDATE,STRG_SERIES.NO_VISIT)) = 0 THEN 1 ELSE 0 END) as VISITS_MISSED, STRG_SERIES.NO_VISIT - FN_R_CHECK_COUNT(SYSDATE,STRG_SERIES.NO_VISIT) + (CASE WHEN FN_R_CHECK_PRINT2_NEW(STRG_SERIES.SALES_PERS,To_Date(SYSDATE),STRG_SERIES.NO_VISIT,STRG_SERIES.SC_CODE,FN_R_CHECK_COUNT(SYSDATE,STRG_SERIES.NO_VISIT)) = 0 THEN 1 ELSE 0 END) AS Pending_Visits_for_the_Month FROM STRG_SERIES, SALES_PERS, STRG_CUSTOMER WHERE STRG_SERIES.SALES_PERS=SALES_PERS.SALES_PERS AND STRG_SERIES.SC_CODE=STRG_CUSTOMER.SC_CODE AND STRG_SERIES.CUST_TYPE = 'D' AND STRG_SERIES.STATUS = 'Y' AND STRG_SERIES.CLASS_CODE = 'A' AND STRG_SERIES.SALES_PERS IN ( select emp_code from employee start with emp_code = (select emp_code from users where code= ?) connect by prior emp_code = report_to ) and (case when (FN_R_CHECK_COUNT(SYSDATE,STRG_SERIES.NO_VISIT) - FN_R_CHECK_PRINT2(STRG_SERIES.SALES_PERS,To_Date(SYSDATE),STRG_SERIES.NO_VISIT,STRG_SERIES.SC_CODE) ) <0 then 0 else (FN_R_CHECK_COUNT(SYSDATE,STRG_SERIES.NO_VISIT) -FN_R_CHECK_PRINT2(STRG_SERIES.SALES_PERS,To_Date(SYSDATE),STRG_SERIES.NO_VISIT,STRG_SERIES.SC_CODE) ) end ) - (CASE WHEN FN_R_CHECK_PRINT2_NEW(STRG_SERIES.SALES_PERS,To_Date(SYSDATE),STRG_SERIES.NO_VISIT,STRG_SERIES.SC_CODE,FN_R_CHECK_COUNT(SYSDATE,STRG_SERIES.NO_VISIT)) = 0 THEN 1 ELSE 0 END)<>0 ";
 					
 			sql = "SELECT initcap(SALES_PERS.SP_NAME) AS SALESPERSON_NAME, SYSDATE AS CURRENT_DATE, FN_R_CHECK_PRINT2(STRG_SERIES.SALES_PERS,To_Date(SYSDATE),STRG_SERIES.NO_VISIT,STRG_SERIES.SC_CODE) AS ACTUAL_VISITS, FN_R_CHECK_COUNT(SYSDATE,STRG_SERIES.NO_VISIT) AS ACTUAL_CHECK, initcap(STRG_CUSTOMER.FIRST_NAME||' '||STRG_CUSTOMER.LAST_NAME) AS DOCTORS_NAME, FN_R_DAYS_SINCE_NOT_MET(STRG_SERIES.SALES_PERS,SYSDATE,STRG_SERIES.SC_CODE) AS DAYS_SINCE_NOT_MET_n, (case when (FN_R_CHECK_COUNT(SYSDATE,STRG_SERIES.NO_VISIT) - FN_R_CHECK_PRINT2(STRG_SERIES.SALES_PERS,To_Date(SYSDATE),STRG_SERIES.NO_VISIT,STRG_SERIES.SC_CODE) ) <0 then 0 else (FN_R_CHECK_COUNT(SYSDATE,STRG_SERIES.NO_VISIT) -FN_R_CHECK_PRINT2(STRG_SERIES.SALES_PERS,To_Date(SYSDATE),STRG_SERIES.NO_VISIT,STRG_SERIES.SC_CODE) ) end ) - (CASE WHEN FN_R_CHECK_PRINT2_NEW(STRG_SERIES.SALES_PERS,To_Date(SYSDATE),STRG_SERIES.NO_VISIT,STRG_SERIES.SC_CODE,FN_R_CHECK_COUNT(SYSDATE,STRG_SERIES.NO_VISIT)) = 0 THEN 1 ELSE 0 END) as VISITS_MISSED, STRG_SERIES.NO_VISIT - FN_R_CHECK_COUNT(SYSDATE,STRG_SERIES.NO_VISIT) + (CASE WHEN FN_R_CHECK_PRINT2_NEW(STRG_SERIES.SALES_PERS,To_Date(SYSDATE),STRG_SERIES.NO_VISIT,STRG_SERIES.SC_CODE,FN_R_CHECK_COUNT(SYSDATE,STRG_SERIES.NO_VISIT)) = 0 THEN 1 ELSE 0 END) AS Pending_Visits_for_the_Month FROM STRG_SERIES, SALES_PERS, STRG_CUSTOMER WHERE STRG_SERIES.SALES_PERS=SALES_PERS.SALES_PERS AND STRG_SERIES.SC_CODE=STRG_CUSTOMER.SC_CODE AND STRG_SERIES.CUST_TYPE = 'D' AND STRG_SERIES.STATUS = 'Y' AND STRG_SERIES.CLASS_CODE = 'A' AND STRG_SERIES.SALES_PERS IN ( select emp_code from employee start with emp_code = (select emp_code from users where code=? ) connect by prior emp_code = report_to ) and ( STRG_SERIES.NO_VISIT - FN_R_CHECK_COUNT(SYSDATE,STRG_SERIES.NO_VISIT) + (CASE WHEN FN_R_CHECK_PRINT2_NEW(STRG_SERIES.SALES_PERS,To_Date(SYSDATE),STRG_SERIES.NO_VISIT,STRG_SERIES.SC_CODE,FN_R_CHECK_COUNT(SYSDATE,STRG_SERIES.NO_VISIT)) = 0 THEN 1 ELSE 0 END) )<>0 ";

webitm-dashboard/ibase/dashboard/sfa/ejb/ImpEvents.java

 package ibase.dashboard.sfa.ejb;
 
-import ibase.utility.E12GenericUtility;
+import ibase.system.config.ConnDriver;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.utility.ITMException;
+
 import java.rmi.RemoteException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+
 import javax.ejb.Stateless;
 
 /**
@@ -14,7 +16,7 @@ import javax.ejb.Stateless;
  */
 @Stateless
 public class ImpEvents  extends ValidatorEJB implements ImpEventsRemote, ImpEventsLocal {
-	E12GenericUtility e12GenericUtility = new E12GenericUtility();
+
     /**
      * Default constructor. 
      */
@@ -37,13 +39,13 @@ public class ImpEvents  extends ValidatorEJB implements ImpEventsRemote, ImpEven
 		ResultSet rs = null;
 		Connection conn = null;
 		PreparedStatement pstmt = null;
+		ConnDriver connDriver = new ConnDriver();
 		StringBuffer xmlData =null;
+
 		try
 		{
-			/*conn = connDriver.getConnectDB("DriverITM");
-			connDriver = null;*/
-			/*add new code for connection DB on dated:14062016 by Nikhil*/
-			conn = getConnection();	
+			conn = connDriver.getConnectDB("DriverITM");
+			connDriver = null;
 				
 			    xmlData = new StringBuffer("<?xml version=\"1.0\"?><Root>");
 				sql = "select STRG_EVENTS.EVENT_DATE as Event_Date, STRG_CUSTOMER.SC_CODE, INITCAP(strg_customer.first_name||' '||strg_customer.middle_name||' '||strg_customer.last_name )AS DrName, LISTAGG(STRG_EVENTS.DESCR, ', ') WITHIN GROUP (ORDER BY STRG_EVENTS.DESCR) as Event FROM SALES_PERS INNER JOIN STRG_SERIES on STRG_SERIES.SALES_PERS = SALES_PERS.SALES_PERS and STRG_SERIES.Cust_Type = 'D' and STRG_SERIES.Status = 'Y' INNER JOIN STRG_CUSTOMER ON STRG_CUSTOMER.SC_CODE = STRG_SERIES.SC_CODE INNER JOIN STRG_EVENTS ON STRG_CUSTOMER.SC_CODE = STRG_EVENTS.SC_CODE WHERE SALES_PERS.SALES_PERS = ? AND STRG_EVENTS.EVENT_DATE  = TO_DATE(sysdate,'dd/mm/yy HH24:MI:SS') group by STRG_EVENTS.EVENT_DATE , STRG_CUSTOMER.SC_CODE, strg_customer.first_name, strg_customer.middle_name, strg_customer.last_name";
@@ -129,8 +131,12 @@ public class ImpEvents  extends ValidatorEJB implements ImpEventsRemote, ImpEven
 				throw new ITMException(d);
 			}
 		}
-		return xmlData.toString();	       
-    }	
+		return xmlData.toString();
+	
+    
+    
+    }
+	
 	private String checkNull(String input)
 	{
 		if (input == null)

webitm-dashboard/ibase/dashboard/sfa/ejb/OutletsVisitEJB.java

 package ibase.dashboard.sfa.ejb;
 import ibase.dashboard.Report.Utility.DashboardUtility;
-import ibase.utility.E12GenericUtility;
+import ibase.system.config.ConnDriver;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.utility.ITMException;
 import java.rmi.RemoteException;
@@ -22,7 +22,7 @@ public class OutletsVisitEJB extends ValidatorEJB implements OutletsVisitRemote,
     public OutletsVisitEJB() {
         // TODO Auto-generated constructor stub
     }
-    E12GenericUtility e12GenericUtility = new E12GenericUtility();
+    
     @SuppressWarnings("unchecked")
 	@Override
     public JSONObject getOutletVisitDetails(String loginId, String salesPerson, String month, String year,String dataSourceName) throws RemoteException, ITMException
@@ -33,6 +33,7 @@ public class OutletsVisitEJB extends ValidatorEJB implements OutletsVisitRemote,
 		ResultSet rs = null;
 		PreparedStatement pstmt = null;
 		Connection conn = null;
+		ConnDriver connDriver = new ConnDriver();
 		DashboardUtility dashbordUtil = null;
 		try
 		{
@@ -40,10 +41,9 @@ public class OutletsVisitEJB extends ValidatorEJB implements OutletsVisitRemote,
 			salesPerson= dashbordUtil.getCommaSeparated(salesPerson);
 			System.out.println("Data Soruc Name ="+dataSourceName);			
 			System.out.println("salesPerson is =" + salesPerson +"month is =" + month +"year is =" + year ) ;			
-			/*conn = connDriver.getConnectDB(dataSourceName);
-			connDriver = null;	*/
-			/*add new code for connection DB on dated:17062016 by Nikhil*/
-			conn = getConnection();
+			conn = connDriver.getConnectDB(dataSourceName);
+			connDriver = null;	
+			
 		/*	sql = " SELECT" +
 					" A.sales_pers," +
 					" A.SALESPERSON_NAME," +

webitm-dashboard/ibase/dashboard/sfa/ejb/PendingStatus.java

 package ibase.dashboard.sfa.ejb;
+
 import ibase.dashboard.Report.Utility.DashboardUtility;
-import ibase.utility.E12GenericUtility;
+import ibase.system.config.ConnDriver;
 import ibase.webitm.ejb.ValidatorEJB;
+import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 import java.rmi.RemoteException;
 import java.sql.Connection;
@@ -15,7 +17,6 @@ import org.json.simple.JSONObject;
 public class PendingStatus extends ValidatorEJB implements PendingStatusLocal,
 PendingStatusRemote
 {
-	E12GenericUtility e12GenericUtility = new E12GenericUtility();
 	public PendingStatus()
 	{
 	}
@@ -30,16 +31,14 @@ PendingStatusRemote
 		ResultSet rs = null;
 		PreparedStatement pstmt = null;
 		Connection conn = null;
+		ConnDriver connDriver = new ConnDriver();
 		int count = 0;
 		DashboardUtility dashboardUtility = null;
 		try
 		{
-			SimpleDateFormat convertToDbDate =new SimpleDateFormat(new E12GenericUtility().getDBDateFormat());
-			SimpleDateFormat simpleDateFormat =new SimpleDateFormat(new E12GenericUtility().getApplDateFormat());
-			/*conn = connDriver.getConnectDB(dataSourceName);*/
-			/*add new code for connection DB on dated:14062016 by Nikhil*/
-			conn = getConnection();	
-
+			SimpleDateFormat convertToDbDate =new SimpleDateFormat(new GenericUtility().getDBDateFormat());
+			SimpleDateFormat simpleDateFormat =new SimpleDateFormat(new GenericUtility().getApplDateFormat());
+			conn = connDriver.getConnectDB(dataSourceName);
 			dashboardUtility = new DashboardUtility();
 			empSite = dashboardUtility.getCommaSeparated(empSite);
 	sql =   " WITH PRD AS  "

webitm-dashboard/ibase/dashboard/sfa/ejb/PendingStatusLocal.java

@@ -9,6 +9,6 @@ import org.json.simple.JSONObject;
 @Local
 public abstract interface PendingStatusLocal extends ValidatorLocal
 {
-  public abstract JSONObject getPendingStatus(String dataSourceName, String empCode,String empSite)throws RemoteException, ITMException;
+  public abstract JSONObject getPendingStatus(String dataSourceName,String empCode,String empSite)throws RemoteException, ITMException;
 }
 

webitm-dashboard/ibase/dashboard/sfa/ejb/PendingStatusRemote.java

@@ -9,7 +9,7 @@ import org.json.simple.JSONObject;
 @Remote
 public abstract interface PendingStatusRemote extends ValidatorRemote
 {
-  public abstract JSONObject getPendingStatus(String dataSourceName, String empCode,String empSite) throws RemoteException, ITMException;
+  public abstract JSONObject getPendingStatus(String dataSourceName,String empCode,String empSite) throws RemoteException, ITMException;
 
   
 }

webitm-dashboard/ibase/dashboard/sfa/ejb/PlannedVSActualActionTypes.java

 package ibase.dashboard.sfa.ejb;
 
 import ibase.system.config.ConnDriver;
-import ibase.utility.E12GenericUtility;
 import ibase.webitm.utility.ITMException;
 
 import java.rmi.RemoteException;
@@ -17,7 +16,6 @@ import javax.ejb.Stateless;
 @Stateless
 public class PlannedVSActualActionTypes implements PlannedVSActualActionTypesRemote, PlannedVSActualActionTypesLocal {
 
-	E12GenericUtility e12GenericUtility = new E12GenericUtility();
     /**
      * Default constructor. 
      */

webitm-dashboard/ibase/dashboard/sfa/ejb/ProductAssessment.java

 package ibase.dashboard.sfa.ejb;
 import ibase.dashboard.Report.Utility.DashboardUtility;
 import ibase.system.config.ConnDriver;
-import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.ValidatorEJB;
+import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
+
 import java.rmi.RemoteException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+
 import javax.ejb.Stateless;
+
 import org.json.simple.JSONObject;
 /**
  * Session Bean implementation class SalesPersonSales
@@ -16,11 +19,10 @@ import org.json.simple.JSONObject;
 @Stateless
 public class ProductAssessment extends ValidatorEJB implements ProductAssessmentLocal, ProductAssessmentRemote
 {
-	E12GenericUtility e12GenericUtility = new E12GenericUtility();
 	public ProductAssessment() {
         // TODO Auto-generated constructor stub
     }
-	 
+	 GenericUtility genericUtility = GenericUtility.getInstance();
     @SuppressWarnings("unchecked")
 	@Override
     public JSONObject getProductAssessmentEventServlet(String loginId, String dataSourceName,String zone,String region,String product,String team,String event) throws RemoteException, ITMException
@@ -36,16 +38,13 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
 		ResultSet rs = null;
 		PreparedStatement pstmt = null;
 		Connection conn = null;
+		ConnDriver connDriver = new ConnDriver();
 		DashboardUtility dashbordUtil = new DashboardUtility();
 		try
 		{
 			
-			/*conn = connDriver.getConnectDB(dataSourceName);
-			connDriver = null;	*/
-			
-			/*add new code for connection DB on dated:14062016 by Nikhil*/
-			conn = getConnection();	
-			
+			conn = connDriver.getConnectDB(dataSourceName);
+			connDriver = null;	
 			if ((product != null) && (product.trim().length() > 0))
 			{
 				product = dashbordUtil.getCommaSeparated(product);
@@ -188,15 +187,13 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
 		ResultSet rs = null;
 		PreparedStatement pstmt = null;
 		Connection conn = null;
+		ConnDriver connDriver = new ConnDriver();
 		double percntVal = 0.0;
 		try
 		{
 			System.out.println(" Inside ProductAssessment for getProductAssessmentProductPieServlet Data Soruc Name ="+dataSourceName+ "==== personName :"+personName);
-			/*conn = connDriver.getConnectDB(dataSourceName);
-			connDriver = null;*/
-			
-			/*add new code for connection DB on dated:14062016 by Nikhil*/
-			conn = getConnection();	
+			conn = connDriver.getConnectDB(dataSourceName);
+			connDriver = null;
 		
 			/*sql_base = "select MGR, NAME, SURVEY, SUM(RESULT) RESULT from ( SELECT (e1.FIRSTNAME +' '+ e1.LASTNAME) as MGR, " +
 					"(e.FIRSTNAME +' '+ e.LASTNAME) as NAME, sm.descr as SURVEY, CAST(SRD.result AS INT) RESULT " +
@@ -321,14 +318,14 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
 		ResultSet rs = null;
 		PreparedStatement pstmt = null;
 		Connection conn = null;
+		ConnDriver connDriver = new ConnDriver();
 		double percntVal = 0.0;
 		try
 		{
 			System.out.println(" Inside ProductAssessment for getProductAssessmentProductServlet Data Soruc Name ="+dataSourceName+ "==== personName :"+personName);
-			/*conn = connDriver.getConnectDB(dataSourceName);
-			connDriver = null;*/
-			/*add new code for connection DB on dated:14062016 by Nikhil*/
-			conn = getConnection();	
+			conn = connDriver.getConnectDB(dataSourceName);
+			connDriver = null;
+		
 			/*sql_base = "select MGR, NAME, SURVEY, SUM(RESULT) RESULT from ( SELECT (e1.FIRSTNAME +' '+ e1.LASTNAME) as MGR, " +
 					"(e.FIRSTNAME +' '+ e.LASTNAME) as NAME, sm.descr as SURVEY, CAST(SRD.result AS INT) RESULT " +
 					"FROM hr.hr.dbo.survey_result_EMP SRE INNER JOIN hr.hr.dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " +
@@ -399,7 +396,13 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
 			double rsltCnt=0,total=0;
 			while (rs.next())
 			{
-				 rowData = new JSONObject();
+				rowData = new JSONObject();
+		/*		rowData.put("prd_name", checkNull(rs.getString("PRD_NAME")));
+				rowData.put("name", checkNull(rs.getString("NAME")));
+				rowData.put("perc", checkNull(rs.getString("PERC")));	
+				rowData.put("report", checkNull( rs.getString("RESULTCNT"))+" "+ checkNull( rs.getString("REPORT"))+" out of "+checkNull( rs.getString("TOTAL")));
+				rowData.put("resultcnt", checkNull(rs.getString("RESULTCNT")));
+				rowData.put("tooltext",checkNull( rs.getString("TOTAL")));*/
 				 rsltCnt= Double.parseDouble(checkNull( rs.getString("RESULTCNT")));
 				 total= Double.parseDouble(checkNull( rs.getString("TOTAL")));
 				 System.out.println("rsltCnt:"+rsltCnt);
@@ -460,13 +463,14 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
 		ResultSet rs = null;
 		PreparedStatement pstmt = null;
 		Connection conn = null;
+		ConnDriver connDriver = new ConnDriver();
 		try
 		{
 			System.out.println(" Inside ProductAssessment for getProductAssessmentProductRatingServlet Data Soruc Name ="+dataSourceName+" personName=:"+ personName + "=== productName :"+ productName);
-			/*conn = connDriver.getConnectDB(dataSourceName);
-			connDriver = null;*/
-			/*add new code for connection DB on dated:14062016 by Nikhil*/
-			conn = getConnection();				
+			conn = connDriver.getConnectDB(dataSourceName);
+			connDriver = null;
+			
+			
 			/*sql=  "select MGR, SUM(RESULT) RESULT from ( SELECT (e1.FIRSTNAME +' '+ e1.LASTNAME) as MGR, " +
 					"(e.FIRSTNAME +' '+ e.LASTNAME) as NAME, sm.descr as SURVEY, CAST(SRD.result AS INT) RESULT " +
 					"FROM hr.hr.dbo.survey_result_EMP SRE INNER JOIN hr.hr.dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " +

webitm-dashboard/ibase/dashboard/sfa/ejb/RSRScoreEJB.java

 package ibase.dashboard.sfa.ejb;
 import ibase.dashboard.Report.Utility.DashboardUtility;
-import ibase.utility.E12GenericUtility;
+import ibase.system.config.ConnDriver;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.utility.ITMException;
 import java.rmi.RemoteException;
@@ -17,10 +17,8 @@ public class RSRScoreEJB extends ValidatorEJB implements RSRScoreRemote, RSRScor
 {
 	public RSRScoreEJB()
 	{}
-	E12GenericUtility e12GenericUtility = new E12GenericUtility();
 	@SuppressWarnings("unchecked")
 	@Override
-	
     public JSONObject getRSRScoreDetails(String salesPerson, String month, String year,String dataSourceName) throws RemoteException, ITMException
     {
 		JSONObject rawDataMnthDivWiseSalesJson = new JSONObject();
@@ -29,6 +27,7 @@ public class RSRScoreEJB extends ValidatorEJB implements RSRScoreRemote, RSRScor
 		ResultSet rs = null;
 		PreparedStatement pstmt = null;
 		Connection conn = null;
+		ConnDriver connDriver = new ConnDriver();
 		DashboardUtility dashbordUtil = null;
 		
 		
@@ -37,10 +36,8 @@ public class RSRScoreEJB extends ValidatorEJB implements RSRScoreRemote, RSRScor
 			System.out.println(" Inside RSRScoreEJB for Data Soruc Name ="+dataSourceName+" salesPerson is =" + salesPerson +" month is =" + month +" year is =" + year);
 			dashbordUtil = new DashboardUtility();
 			salesPerson= dashbordUtil.getCommaSeparated(salesPerson);
-			/*conn = connDriver.getConnectDB(dataSourceName);
-			connDriver = null;	*/
-			/*add new code for connection DB on dated:17062016 by Nikhil*/
-			conn = getConnection();
+			conn = connDriver.getConnectDB(dataSourceName);
+			connDriver = null;	
 			
 			sql = 	" Select station.descr as territory, RSR_SCORE.insight_id as insight_id, RSR_SCORE.rep_name as sales_pers, "  +
 					" sum(field_working_days) as field_working_days, sum(target_outlets) as target_outlets,  "  +

webitm-dashboard/ibase/dashboard/sfa/ejb/RSRSurveyEJB.java

 package ibase.dashboard.sfa.ejb;
 import ibase.dashboard.Report.Utility.DashboardUtility;
-import ibase.utility.E12GenericUtility;
+import ibase.system.config.ConnDriver;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.utility.ITMException;
 import java.rmi.RemoteException;
@@ -16,7 +16,7 @@ import org.json.simple.JSONObject;
 public class RSRSurveyEJB extends ValidatorEJB implements RSRSurveyRemote, RSRSurveyLocal {
     public RSRSurveyEJB() {
     }
-    E12GenericUtility e12GenericUtility = new E12GenericUtility();
+    
     @SuppressWarnings("unchecked")
 	public JSONObject getRSRSurveyDetails(String loginId, String salesPerson, String month, String year,String dataSourceName) throws RemoteException, ITMException
     {
@@ -26,6 +26,7 @@ public class RSRSurveyEJB extends ValidatorEJB implements RSRSurveyRemote, RSRSu
 		ResultSet rs = null;
 		PreparedStatement pstmt = null;
 		Connection conn = null;
+		ConnDriver connDriver = new ConnDriver();
 		DashboardUtility dashbordUtil = null;
 		
 		try
@@ -33,10 +34,9 @@ public class RSRSurveyEJB extends ValidatorEJB implements RSRSurveyRemote, RSRSu
 			System.out.println(" Inside RSRSurveyEJB for Data Soruc Name ="+dataSourceName+" loginId:"+loginId+" salesPerson is =" + salesPerson +" month is =" + month +" year is =" + year);			
 			dashbordUtil = new DashboardUtility();
 			salesPerson  = dashbordUtil.getCommaSeparated(salesPerson);
-			/*conn         = connDriver.getConnectDB(dataSourceName);
-			connDriver   = null;*/	
-			/*add new code for connection DB on dated:17062016 by Nikhil*/
-			conn = getConnection();
+			conn         = connDriver.getConnectDB(dataSourceName);
+			connDriver   = null;	
+			
 			/*sql = 	" select a.date_1,a.sales_pers as insight_id,sales_pers.sp_name as sales_person_name,a. strg_code as strg_code, "
 					+" nvl(strg_customer.first_name,' ') ||nvl(strg_customer.middle_name,' ') || nvl(strg_customer.last_name,' ')  as strg_name, "
 					+" survey_master.descr as Questions,a.answer as answers,station.descr as territory,a.dcr_id,a.question_code "

webitm-dashboard/ibase/dashboard/sfa/ejb/RXSurveyEJB.java

 package ibase.dashboard.sfa.ejb;
 
 import ibase.dashboard.Report.Utility.DashboardUtility;
-import ibase.utility.E12GenericUtility;
+import ibase.system.config.ConnDriver;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.utility.ITMException;
 import java.rmi.RemoteException;
@@ -9,7 +9,10 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import javax.ejb.Stateless;
+
 import org.json.simple.JSONObject;
+
+
 /**
  * Session Bean implementation class RXSurvey
  */
@@ -22,7 +25,7 @@ public class RXSurveyEJB extends ValidatorEJB implements RXSurveyRemote, RXSurve
     public RXSurveyEJB() {
         // TODO Auto-generated constructor stub
     }
-    E12GenericUtility e12GenericUtility = new E12GenericUtility();
+    
     @SuppressWarnings("unchecked")
 	@Override
     public JSONObject getRXSurveyDetails(String loginId, String salesPerson, String month, String year,String dataSourceName) throws RemoteException, ITMException
@@ -33,6 +36,7 @@ public class RXSurveyEJB extends ValidatorEJB implements RXSurveyRemote, RXSurve
 		ResultSet rs = null;
 		PreparedStatement pstmt = null;
 		Connection conn = null;
+		ConnDriver connDriver = new ConnDriver();
 		DashboardUtility dashbordUtil = null;
 		
 		try
@@ -40,10 +44,9 @@ public class RXSurveyEJB extends ValidatorEJB implements RXSurveyRemote, RXSurve
 			System.out.println(" Inside RXSurveyEJB for Data Soruc Name ="+dataSourceName+" loginId:"+loginId+" salesPerson is =" + salesPerson +" month is =" + month +" year is =" + year);
 			dashbordUtil = new DashboardUtility();
 			salesPerson= dashbordUtil.getCommaSeparated(salesPerson);
-			/*conn = connDriver.getConnectDB(dataSourceName);
-			connDriver = null;*/	
-			/*add new code for connection DB on dated:17062016 by Nikhil*/
-			conn = getConnection();
+			conn = connDriver.getConnectDB(dataSourceName);
+			connDriver = null;	
+			
 			/*sql = " Select SP.Sales_Pers as Sales_Pers,SP.Sp_Name as Sp_Name,Max(SM.Event_Date) as Max_Event_Date, "
 					+" To_Char(Max(SM.Event_Date),'YYYYMM') as YYYYMM, To_Char(Max(SM.Event_Date),'MON-YYYY') as MONYYYY, "
 					+" SMI.Sales_Prod_Grp as Brand_Code,SPG.Descr as Brand,SM.Strg_Code as Doc_Code, "

webitm-dashboard/ibase/dashboard/sfa/ejb/TargetVsAchievement.java

-package ibase.dashboard.sfa.ejb; 
-import ibase.utility.E12GenericUtility;
+ package ibase.dashboard.sfa.ejb;
+ 
+import ibase.system.config.ConnDriver;
 import ibase.webitm.ejb.ValidatorEJB;
+import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 import java.rmi.RemoteException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
 import javax.ejb.Stateless;
 import org.json.simple.JSONObject;
  
@@ -13,7 +18,7 @@ import org.json.simple.JSONObject;
 public class TargetVsAchievement extends ValidatorEJB  implements TargetVsAchievementRemote, TargetVsAchievementLocal
 
 {
-	E12GenericUtility e12GenericUtility = new E12GenericUtility();
+	GenericUtility genericUtility = new GenericUtility();
 	
 	/********** Start of method getTargetVsAchievement()
 	* EJB Name           : TargetVsAchievement.java
@@ -32,13 +37,15 @@ public class TargetVsAchievement extends ValidatorEJB  implements TargetVsAchiev
 		ResultSet rs = null;
 		PreparedStatement pstmt = null;
 		Connection conn = null;
+		ConnDriver connDriver = new ConnDriver();
 		int count=0;
+		SimpleDateFormat simpleDateFormat = null;
+		Calendar calendar = null;
 		try
 		{
-			/*conn = connDriver.getConnectDB(dataSourceName);
-			connDriver = null;	*/
-			/*add new code for connection DB on dated:14062016 by Nikhil*/
-			conn = getConnection();				
+			conn = connDriver.getConnectDB(dataSourceName);
+			connDriver = null;	
+			
 			System.out.println(" Inside getSDNoAttemptAnalyticsTopServlet()  for Data Soruc Name ="+dataSourceName);
 			/*if ( (prdCode == null || prdCode.trim().length()==0 ) ||(prdCode.equals("")))
 			 {

webitm-dashboard/ibase/dashboard/sfa/ejb/TaskActivity.java

 package ibase.dashboard.sfa.ejb;
 
-import ibase.utility.E12GenericUtility;
+import ibase.system.config.ConnDriver;
 import ibase.webitm.ejb.ValidatorEJB;
+import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 import java.rmi.RemoteException;
 import java.sql.Connection;
@@ -11,13 +12,13 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Set;
+
 import javax.ejb.Stateless;
 import org.json.simple.JSONObject;
 
 @Stateless
 public class TaskActivity extends ValidatorEJB implements TaskActivityLocal, TaskActivityRemote
 {
-	E12GenericUtility e12GenericUtility = new E12GenericUtility();
 
 	public TaskActivity()
 	{
@@ -33,23 +34,21 @@ public class TaskActivity extends ValidatorEJB implements TaskActivityLocal, Tas
 		ResultSet rs = null;
 		PreparedStatement pstmt = null;
 		Connection conn = null;
+		ConnDriver connDriver = new ConnDriver();
 		ArrayList<String> arrayList = null;
 		HashMap<String, ArrayList<String>> hashMap = new HashMap<String, ArrayList<String>>();
 		ArrayList<String> listData = new ArrayList<String>();
 		StringBuffer buffer = new StringBuffer();
 		String descr = "";
 		Set<String> set = null;
-		
+		GenericUtility genericUtility = GenericUtility.getInstance();
 		try
 		{
-			/*conn = connDriver.getConnectDB(dataSourceName);
-			connDriver = null;*/
-			/*add new code for connection DB on dated:14062016 by Nikhil*/
-			conn = getConnection();	
-
+			conn = connDriver.getConnectDB(dataSourceName);
+			connDriver = null;
 			//SimpleDateFormat gridDateFormat = new SimpleDateFormat( genericUtility.getApplDateFormat());
 			SimpleDateFormat gridDateFormat = new SimpleDateFormat( "dd-MMM-yy");
-			SimpleDateFormat convrtToTimStmDate= new SimpleDateFormat(e12GenericUtility.getDBDateFormat());
+			SimpleDateFormat convrtToTimStmDate= new SimpleDateFormat(genericUtility.getDBDateFormat());
 			
 			//sql = "WITH  PRD AS ( SELECT E.EMP_CODE, (E.EMP_FNAME||' '||E.EMP_MNAME||' '||E.EMP_LNAME) AS EMP__NAME, E.DATE_JOIN, E.EMP_SITE, E.CCTR_CODE__SAL AS DIV, E.RELIEVE_DATE, SYSDATE AS CURR_DATE, TO_CHAR(SYSDATE,'YYYYMM') AS CMON, G.CODE, G.FR_DATE, G.TO_DATE FROM EMPLOYEE E, ( SELECT MIN(X.ADATE) AS FR_DATE, MAX(X.ADATE) AS TO_DATE FROM NSRNO X WHERE X.ADATE >= TRUNC(SYSDATE-365) AND X.ADATE <= ADD_MONTHS(SYSDATE,1) ) F, PERIOD G WHERE E.EMP_CODE = 'E00014' AND G.FR_DATE >= (CASE WHEN E.DATE_JOIN > F.FR_DATE THEN TRUNC(E.DATE_JOIN,'MONTH') ELSE TRUNC(F.FR_DATE,'MONTH') END) AND G.TO_DATE <= (CASE WHEN E.RELIEVE_DATE IS NULL THEN LAST_DAY(F.TO_DATE) WHEN E.RELIEVE_DATE <= F.TO_DATE THEN LAST_DAY(E.RELIEVE_DATE) ELSE LAST_DAY(F.TO_DATE) END) ), DATA AS (SELECT 'C' AS TAG, 'EXPENSES STATUS' AS ACCT_DSCR, A.CODE AS MONTH, 'PENDING' AS DET FROM PRD A WHERE 0 = NVL( ( SELECT MAX(1) AS CC FROM MISC_VOUCHER B WHERE B.SUNDRY_TYPE IN('E','P') AND (B.SUNDRY_CODE = A.EMP_CODE) AND B.BILL_NO = A.CODE AND B.VOUCH_TYPE = 'F' AND (CASE WHEN B.TRAN_ID IS NULL THEN 0 ELSE 1 END) = 1 ) ,0) AND A.CODE < TO_CHAR(SYSDATE,'YYYYMM') AND A.EMP_SITE = 'SP876' UNION ALL SELECT 'A' AS TAG, 'DAILY ACTIVITY REPORT' AS ACCT_DSCR, A.CODE AS MONTH, GET_MISSING_REPORT(A.EMP_CODE, (CASE WHEN A.DATE_JOIN >= A.FR_DATE THEN A.DATE_JOIN ELSE A.FR_DATE END), (CASE WHEN A.RELIEVE_DATE IS NULL AND A.CMON > A.CODE THEN A.TO_DATE WHEN A.RELIEVE_DATE IS NULL AND A.CMON = A.CODE THEN SYSDATE-1 WHEN A.TO_DATE >= A.RELIEVE_DATE THEN A.RELIEVE_DATE ELSE A.TO_DATE END)) AS DET FROM PRD A  WHERE GET_MISSING_REPORT(A.EMP_CODE, (CASE WHEN A.DATE_JOIN >= A.FR_DATE THEN A.DATE_JOIN ELSE A.FR_DATE END), (CASE WHEN A.RELIEVE_DATE IS NULL AND A.CMON > A.CODE THEN A.TO_DATE WHEN A.RELIEVE_DATE IS NULL AND A.CMON = A.CODE THEN SYSDATE-1 WHEN A.TO_DATE >= A.RELIEVE_DATE THEN A.RELIEVE_DATE ELSE A.TO_DATE END)) IS NOT NULL AND A.CODE <= TO_CHAR(SYSDATE,'YYYYMM') AND A.EMP_SITE IN('SP876','SP895') UNION ALL SELECT 'B' AS TAG, 'MONTHLY ACTIVITY REPORT' AS ACCT_DSCR, A.CODE AS MONTH, 'PENDING' AS DET FROM PRD A WHERE 0 = NVL( ( SELECT MAX(1) AS TT FROM SPRS_PLAN_FROZEN WHERE SPRS_PLAN_FROZEN.PLAN_DATE >= A.FR_DATE AND SPRS_PLAN_FROZEN.PLAN_DATE <= A.TO_DATE AND SPRS_PLAN_FROZEN.SPRS_CODE__FOR = A.EMP_CODE ) ,0) AND TO_CHAR(A.DATE_JOIN,'YYYYMM') < A.CODE AND 1 = (CASE WHEN STR_TO_NUM(TO_CHAR(SYSDATE,'DD')) > 20  AND A.CODE > TO_CHAR(SYSDATE,'YYYYMM') THEN 1 WHEN A.CODE <= TO_CHAR(SYSDATE,'YYYYMM') THEN 1 ELSE 0 END) AND A.EMP_SITE = 'SP876' AND A.DIV <> 'H205' UNION ALL SELECT (CASE WHEN SAMPLE_RCP.TRAN_TYPE = 'R' AND SAMPLE_RCP.LR_NO IS NULL THEN 'F' WHEN SAMPLE_RCP.TRAN_TYPE = 'R' AND SAMPLE_RCP.LR_NO IS NOT NULL THEN 'D' ELSE 'H' END) AS TAG, (CASE WHEN SAMPLE_RCP.TRAN_TYPE = 'R' AND SAMPLE_RCP.LR_NO IS NULL THEN 'RECEIPT' WHEN SAMPLE_RCP.TRAN_TYPE = 'R' AND SAMPLE_RCP.LR_NO IS NOT NULL THEN 'CONSIGNMENT ACKNOWLEDGEMENT' ELSE 'ADJUSTMENT RECEIPT' END) AS ACCT_DSCR, NULL AS MONTH, (SAMPLE_RCP.TRAN_ID||' # DATED # '||TO_CHAR(SAMPLE_RCP.TRAN_DATE,'DD-MON-YY')) AS DET FROM SAMPLE_RCP , EMPLOYEE E WHERE 'N' = (CASE WHEN E.WITH_HELD = 'Y' OR E.RELIEVE_DATE IS NOT NULL OR E.RESI_DATE IS NOT NULL THEN 'Y' ELSE 'N' END) AND  SAMPLE_RCP.CONFIRMED = 'N' AND SAMPLE_RCP.TRAN_DATE >= TRUNC(SYSDATE-365) AND SAMPLE_RCP.TRAN_DATE <= TRUNC(SYSDATE) AND SAMPLE_RCP.EMP_CODE__RCP = E.EMP_CODE AND SAMPLE_RCP.STATUS = 'O' AND E.CCTR_CODE__SAL <> 'H205' UNION ALL SELECT (CASE WHEN SAMPLE_ISS.TRAN_TYPE = 'I' THEN 'E' ELSE 'G' END) AS TAG, (CASE WHEN SAMPLE_ISS.TRAN_TYPE = 'I' THEN 'ISSUE' ELSE 'ADJUSTMENT ISSUE' END) AS ACCT_DSCR, NULL AS MONTH, SAMPLE_ISS.TRAN_ID||' # DATED # '||TO_CHAR(SAMPLE_ISS.TRAN_DATE,'DD-MON-YY') AS DET FROM SAMPLE_ISS , EMPLOYEE E WHERE (E.EMP_CODE ='E00014')  AND 'N' = (CASE WHEN E.WITH_HELD = 'Y' OR E.RELIEVE_DATE IS NOT NULL OR E.RESI_DATE IS NOT NULL THEN 'Y' ELSE 'N' END) AND SAMPLE_ISS.TRAN_TYPE IN ('A','I') AND SAMPLE_ISS.EMP_CODE__ISS = E.EMP_CODE AND SAMPLE_ISS.TRAN_DATE >= TRUNC(SYSDATE-365) AND SAMPLE_ISS.TRAN_DATE <= TRUNC(SYSDATE)  AND SAMPLE_ISS.CONFIRMED = 'N' AND SAMPLE_ISS.STATUS = 'O' AND E.CCTR_CODE__SAL <> 'H205' UNION ALL SELECT 'I' AS TAG, 'STOCK TRANSFER RECEIVER' AS ACCT_DSCR, NULL AS MONTH, SAMPLE_ISS.TRAN_ID||' # DATED # '||TO_CHAR(SAMPLE_ISS.TRAN_DATE,'DD-MON-YY') AS DET FROM SAMPLE_ISS , EMPLOYEE E WHERE (E.EMP_CODE ='E00014') AND 'N' = (CASE WHEN E.WITH_HELD = 'Y' OR E.RELIEVE_DATE IS NOT NULL OR E.RESI_DATE IS NOT NULL THEN 'Y' ELSE 'N' END) AND SAMPLE_ISS.TRAN_TYPE = 'T' AND SAMPLE_ISS.EMP_CODE__RCP = E.EMP_CODE AND SAMPLE_ISS.TRAN_DATE >= TRUNC(SYSDATE-365) AND SAMPLE_ISS.TRAN_DATE <= TRUNC(SYSDATE) AND SAMPLE_ISS.CONFIRMED = 'N' AND SAMPLE_ISS.STATUS = 'O' AND E.CCTR_CODE__SAL <> 'H205') SELECT TAG, ACCT_DSCR, MONTH, DET FROM DATA UNION ALL SELECT NULL AS TAG, 'NOTHING PENDING' AS ACCT_DSCR, NULL AS MONTH, NULL AS DET FROM DUAL  WHERE NOT EXISTS (SELECT 1 FROM DATA WHERE ROWNUM = 1) ORDER BY TAG";
 			sql="WITH  PRD AS ( SELECT E.EMP_CODE, (E.EMP_FNAME||' '||E.EMP_MNAME||' '||E.EMP_LNAME) AS EMP__NAME, " +
@@ -168,9 +167,15 @@ public class TaskActivity extends ValidatorEJB implements TaskActivityLocal, Tas
 				rowData.put("tag", string);
 				rowData.put("acct_descr", arrayList.get(1));
 				rowData.put("month", arrayList.get(2));
-				rowData.put("expand", getSplitedDescStr(descr,2,0 ).replace(",", "<Br>"));				
+				rowData.put("expand", getSplitedDescStr(descr,2,0 ).replace(",", "<Br>"));
+				//rowData.put("expand", descr);
 				rowData.put("descr", getSplitedStr(descr));
-				pendingCnt = Integer.parseInt(arrayList.get(4));												
+
+				pendingCnt = Integer.parseInt(arrayList.get(4));
+				
+				/*rowData.put("completed", pendingCnt);
+				rowData.put("pndig", (100 - pendingCnt));*/
+				
 				rowData.put("pending_count", pendingCnt);
 				rowData.put("tran_date", gridDateFormat.format(convrtToTimStmDate.parse(arrayList.get(5))));
 
@@ -225,6 +230,10 @@ public class TaskActivity extends ValidatorEJB implements TaskActivityLocal, Tas
 	private String getSplitedStr(String str)
 	{
 		String detlArr[] = str.split(",");
+
+		//System.out.println("detlArr is =" + detlArr);
+
+		//System.out.println("detlArr length is =" + detlArr.length);
 		String dataString = "";
 		for (int j = 0; j < 2; j++)
 		{

webitm-dashboard/ibase/dashboard/sfa/ejb/TaskTracking.java

+package ibase.dashboard.sfa.ejb;
+
+import ibase.system.config.ConnDriver;
+import ibase.webitm.utility.ITMException;
+import java.rmi.RemoteException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import javax.ejb.Stateless;
+import org.json.simple.JSONObject;
+
+@Stateless
+public class TaskTracking  implements TaskTrackingLocal, TaskTrackingRemote
+{
+
+	public TaskTracking()
+	{
+	}
+
+	@SuppressWarnings("unchecked")
+	public JSONObject getTask(String dataSourceName, String groupid, String userid) throws RemoteException, ITMException
+	{
+		JSONObject rowDataPendingTaskJson = new JSONObject();
+		JSONObject rowData = null;
+		String sql = "";
+		ResultSet rs = null;
+		PreparedStatement pstmt = null;
+		Connection conn = null;
+		ConnDriver connDriver = new ConnDriver();
+		try
+		{
+			conn = connDriver.getConnectDB(dataSourceName);
+			connDriver = null;
+			sql = "SELECT TASK_ID,DESCR, TO_CHAR(TASK_DATE,'DD-MM-YYYY') AS TASK_DATE,PROGRESS,TASK_STATUS,PRIORITY,TASK_ID__PARENT,PLAN_START_DATE,PLAN_END_DATE,( PLAN_END_DATE-PLAN_START_DATE) AS DURATION  FROM  TASK_TRACK WHERE Group_ID = '"+groupid+"' AND User_ID = '"+userid+"'"; 
+			
+			
+			System.out.println("sql is in new Interface =" + sql);
+			pstmt = conn.prepareStatement(sql);
+			rs = pstmt.executeQuery();
+			int count = 0;
+			while (rs.next())
+			{
+				rowData = new JSONObject();
+				rowData.put("id", checkNull(rs.getString("TASK_ID")));
+				rowData.put("text",  checkNull(rs.getString("DESCR")));
+				rowData.put("start_date", checkNull(rs.getString("TASK_DATE")));
+				rowData.put("duration",  checkNull(rs.getString("DURATION")));
+				rowData.put("order",  checkNull(rs.getString("TASK_ID")));
+				rowData.put("progress", checkNull(rs.getString("PROGRESS")));
+				rowData.put("open", checkNull(rs.getString("TASK_STATUS")));
+				rowData.put("priority", checkNull(rs.getString("PRIORITY")));
+				rowData.put("parent", checkNull(rs.getString("TASK_ID__PARENT")));
+
+				rowDataPendingTaskJson.put(Integer.valueOf(count),rowData);
+				count++;
+			}
+			System.out.println(" rowDataPendingTaskJson is =" + rowDataPendingTaskJson);
+
+		} catch (Exception e)
+		{
+			e.printStackTrace();
+			throw new ITMException(e);
+		} finally
+		{
+			try
+			{
+				if (conn != null)
+				{
+					if (rs != null)
+						rs.close();
+					rs = null;
+					if (pstmt != null)
+						pstmt.close();
+					pstmt = null;
+					conn.close();
+					conn = null;
+				}
+				conn = null;
+			} catch (Exception d)
+			{
+				d.printStackTrace();
+				System.out.println("Exception in :TaskActivity:getTask():" + d.getMessage());
+				throw new ITMException(d);
+			}
+		}
+
+		return rowDataPendingTaskJson;
+	}
+
+	private String checkNull(String str)
+	{
+		if (str == null)
+		{
+			return "";
+		} else
+		{
+			return str;
+		}
+
+	}
+}
\ No newline at end of file

webitm-dashboard/ibase/dashboard/sfa/ejb/TaskTrackingLocal.java

+package ibase.dashboard.sfa.ejb;
+
+import ibase.webitm.utility.ITMException;
+import java.rmi.RemoteException;
+
+import org.json.simple.JSONObject;
+
+@javax.ejb.Local
+public  interface TaskTrackingLocal 
+{
+  public  JSONObject getTask(String dataSourceName, String groupid, String userid)throws RemoteException, ITMException;
+}
+

webitm-dashboard/ibase/dashboard/sfa/ejb/TaskTrackingRemote.java

+package ibase.dashboard.sfa.ejb;
+
+import ibase.webitm.utility.ITMException;
+import java.rmi.RemoteException;
+import org.json.simple.JSONObject;
+
+@javax.ejb.Remote 
+public  interface TaskTrackingRemote 
+{
+  public  JSONObject getTask(String dataSourceName, String groupid, String userid) throws RemoteException, ITMException;
+
+  
+}
+

webitm-dashboard/ibase/dashboard/sfa/servlet/AttendanceComplianceServlet.java

@@ -23,39 +23,45 @@ public class AttendanceComplianceServlet extends HttpServlet
 	{
 		doPost(request, response);
 	}
+
 	public void doPost(HttpServletRequest request, HttpServletResponse response)
 			throws IOException, ServletException
 	{
 		AttendanceComplianceRemote gardeniaRemote = null;
-		InitialContext context                    = null;
-		AppConnectParm appConnectParm             = new AppConnectParm();
-		String dataSourceName                     = "";
-		String loginId                            = "";
-		HttpSession session                       = null;
-		JSONObject jsonObjData                    = null;
-		OutputStream outputStream                 = null;
-		UserInfoBean userInfo                     = null;
+		InitialContext context = null;
+		AppConnectParm appConnectParm = new AppConnectParm();
+		String dataSourceName = "";
+		String loginId = "";
+		HttpSession session = null;
+		JSONObject jsonObjData = null;
+		OutputStream outputStream = null;
+		UserInfoBean userInfo = null;
 		try
-		{			
+		{
+			
 			response.setContentType("application/xml");
-			session  = request.getSession(true);
+			session = request.getSession(true);
 			userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
-			loginId  = userInfo.getLoginCode();
-			dataSourceName = request.getParameter("dataSourceName");			
+			loginId = userInfo.getLoginCode();
+			dataSourceName = request.getParameter("dataSourceName");
+
+			System.out.println("loginId is =" + loginId);
+			
 			context = new InitialContext(appConnectParm.getProperty());
 			gardeniaRemote = (AttendanceComplianceRemote) context.lookup("ibase/AttendanceCompliance/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			gardeniaRemote.setUserInfo(userInfo);
-			jsonObjData  = (JSONObject) gardeniaRemote.getAttendance(dataSourceName,loginId);
+			jsonObjData = (JSONObject) gardeniaRemote.getAttendance(dataSourceName,loginId);
 			outputStream = response.getOutputStream();
 			outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();
 			outputStream.close();
 			System.out.println(" Final data set for AttendanceComplianceServlet  build the Graph is==="+ jsonObjData);
+
 		}
 		catch (Exception e)
 		{
-			System.out.println("Exception : AttendanceComplianceServlet :doPost(HttpServletRequest request, HttpServletResponse response) :"+ e);
+			System.out
+					.println("Exception : AttendanceComplianceServlet :doPost(HttpServletRequest request, HttpServletResponse response) :"
+							+ e);
 			try
 			{
 				throw new ITMException(e);

webitm-dashboard/ibase/dashboard/sfa/servlet/ComplianceCustServlet.java

@@ -30,16 +30,17 @@ public class ComplianceCustServlet extends HttpServlet
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
-		String loginId        = "";
-		String firstIndex     = "";
-		String cellVal        = "";		
+		String loginId = "";
+		String firstIndex ="";
+		String cellVal = "";
+		
 		try
 		{
 			response.setContentType("application/xml");
+
 			HttpSession session = request.getSession(true);
 			ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
 			loginId = userInfo.getLoginCode();
-			
 			dataSourceName = request.getParameter("dataSourceName");
 			firstIndex 	   = request.getParameter("salesPers");
 			cellVal 	   = request.getParameter("date");
@@ -47,8 +48,6 @@ public class ComplianceCustServlet extends HttpServlet
 			System.out.println("in ComplianceCustServlet  firstIndex :"+firstIndex+"===== cellVal :"+cellVal);
 			context = new InitialContext(appConnectParm.getProperty());
 			complianceRemote = (ComplianceRemote) context.lookup("ibase/Compliance/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			complianceRemote.setUserInfo(userInfo);
 			JSONObject jsonObjData = (JSONObject) complianceRemote.getComplianceCustDetails(firstIndex, cellVal, dataSourceName);
 			OutputStream outputStream   = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());

webitm-dashboard/ibase/dashboard/sfa/servlet/ComplianceDetailsDB2Servlet.java

+package ibase.dashboard.sfa.servlet;
+import ibase.dashboard.sfa.ejb.ComplianceDB2Remote;
+import ibase.system.config.AppConnectParm;
+import ibase.webitm.utility.ITMException;
+import java.io.IOException;
+import java.io.OutputStream;
+import javax.naming.InitialContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.json.simple.JSONObject;
+
+public class ComplianceDetailsDB2Servlet extends HttpServlet
+{
+	private static final long serialVersionUID = 1L;
+	JSONObject jsonObjMetaData = null;
+	JSONObject jsonMetaData = null;
+
+	public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
+	{
+		doPost(request, response);
+	}
+
+	@SuppressWarnings("unchecked")
+	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
+	{
+		ComplianceDB2Remote complianceDB2Remote = null;
+		InitialContext context = null;
+		AppConnectParm appConnectParm = new AppConnectParm();
+		String dataSourceName = "";
+		String personName ="";
+		String period = "";
+		
+		try
+		{
+			response.setContentType("application/xml");
+
+			dataSourceName = request.getParameter("dataSourceName");
+			personName 	   = request.getParameter("personname");
+			period 	   = request.getParameter("month");
+			
+			System.out.println("in ComplianceDetailsDB2Servlet  personName :"+personName+"===== period :"+period);
+			context = new InitialContext(appConnectParm.getProperty());
+			complianceDB2Remote = (ComplianceDB2Remote) context.lookup("ibase/ComplianceDB2/remote");
+			JSONObject jsonObjData = (JSONObject) complianceDB2Remote.getComplianceDetailsDB2(period, personName, dataSourceName);
+			OutputStream outputStream   = response.getOutputStream();
+		    outputStream.write(jsonObjData.toString().getBytes());
+			outputStream.flush();
+			outputStream.close();
+			System.out.println("Final data set for ComplianceDetailsDB2Servlet build the Graph is ===" + jsonObjData);
+ 
+		} catch (Exception e)
+		{
+			System.out.println("Exception : ComplianceDetailsDB2Servlet :doPost(HttpServletRequest request, HttpServletResponse response) :" + e);
+			try
+			{
+				throw new ITMException(e);
+			} catch (ITMException e1)
+			{
+				e1.printStackTrace();
+			}
+		}
+
+	}
+
+}
\ No newline at end of file

webitm-dashboard/ibase/dashboard/sfa/servlet/ComplianceGridServlet.java

@@ -36,8 +36,7 @@ public class ComplianceGridServlet extends HttpServlet
 		try
 		{
 			response.setContentType("application/xml");
-			HttpSession session = request.getSession(true);
-			ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
+
 			dataSourceName = request.getParameter("dataSourceName");
 			personName 	   = request.getParameter("personname");
 			period 	   = request.getParameter("month");
@@ -45,8 +44,6 @@ public class ComplianceGridServlet extends HttpServlet
 			System.out.println("in ComplianceGridServlet  personName :"+personName+"===== period :"+period);
 			context = new InitialContext(appConnectParm.getProperty());
 			complianceRemote = (ComplianceRemote) context.lookup("ibase/Compliance/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			complianceRemote.setUserInfo(userInfo);
 			JSONObject jsonObjData = (JSONObject) complianceRemote.getComplianceGrid(period, personName, dataSourceName);
 			OutputStream outputStream   = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());

webitm-dashboard/ibase/dashboard/sfa/servlet/ComplianceHirarchyDB2Servlet.java

+package ibase.dashboard.sfa.servlet;
+import ibase.dashboard.sfa.ejb.ComplianceDB2Remote;
+import ibase.system.config.AppConnectParm;
+import ibase.webitm.utility.ITMException;
+import java.io.IOException;
+import java.io.OutputStream;
+import javax.naming.InitialContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import org.json.simple.JSONObject;
+
+public class ComplianceHirarchyDB2Servlet extends HttpServlet
+{
+	private static final long serialVersionUID = 1L;
+	JSONObject jsonObjMetaData = null;
+	JSONObject jsonMetaData = null;
+	public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
+	{
+		doPost(request, response);
+	}
+	@SuppressWarnings("unchecked")
+	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
+	{
+		ComplianceDB2Remote complianceDB2Remote = null;
+		InitialContext context = null;
+		AppConnectParm appConnectParm = new AppConnectParm();
+		JSONObject jsonObjData = null;
+		OutputStream outputStream = null;
+		String dataSourceName = "";
+		String loginId = "";
+		String period = "";
+		try
+		{
+			response.setContentType("application/xml");			
+			HttpSession session = request.getSession(true);
+			ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
+			loginId = userInfo.getLoginCode();
+			
+			dataSourceName      = request.getParameter("dataSourceName");
+			period              = request.getParameter("month");
+			System.out.println("loginId =" + loginId + "period = "+period);
+			context             = new InitialContext(appConnectParm.getProperty());
+			complianceDB2Remote    = (ComplianceDB2Remote) context.lookup("ibase/ComplianceDB2/remote");
+			jsonObjData         = (JSONObject) complianceDB2Remote.getComplianceHirarchyDB2(loginId,  dataSourceName, period);
+			outputStream        = response.getOutputStream();
+		    outputStream.write(jsonObjData.toString().getBytes());
+			outputStream.flush();
+			outputStream.close();
+			System.out.println("Final data set for ComplianceHirarchyDB2Servlet build the Graph is===" + jsonObjData);
+
+		} catch (Exception e)
+		{
+			System.out.println("Exception : ComplianceHirarchyDB2Servlet :doPost(HttpServletRequest request, HttpServletResponse response) :" + e);
+			try
+			{
+				throw new ITMException(e);
+			} catch (ITMException e1)
+			{
+				e1.printStackTrace();
+			}
+		}
+
+	}
+
+}
\ No newline at end of file

webitm-dashboard/ibase/dashboard/sfa/servlet/ComplianceServlet.java

@@ -48,8 +48,6 @@ public class ComplianceServlet extends HttpServlet
 			System.out.println("period =" + period);
 			context             = new InitialContext(appConnectParm.getProperty());
 			complianceRemote    = (ComplianceRemote) context.lookup("ibase/Compliance/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			complianceRemote.setUserInfo(userInfo);
 			jsonObjData         = (JSONObject) complianceRemote.getComplianceDetails(loginId,  dataSourceName, period);
 			outputStream        = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());

webitm-dashboard/ibase/dashboard/sfa/servlet/ComplianceSummaryDB2Servlet.java

+package ibase.dashboard.sfa.servlet;
+import ibase.dashboard.sfa.ejb.ComplianceDB2Remote;
+import ibase.system.config.AppConnectParm;
+import ibase.webitm.utility.ITMException;
+import java.io.IOException;
+import java.io.OutputStream;
+import javax.naming.InitialContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import org.json.simple.JSONObject;
+
+public class ComplianceSummaryDB2Servlet extends HttpServlet
+{
+	private static final long serialVersionUID = 1L;
+	JSONObject jsonObjMetaData = null;
+	JSONObject jsonMetaData = null;
+
+	public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
+	{
+		doPost(request, response);
+	}
+
+	@SuppressWarnings("unchecked")
+	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
+	{
+		ComplianceDB2Remote complianceDB2Remote = null;
+		InitialContext context            = null;
+		AppConnectParm appConnectParm     = new AppConnectParm();
+		String dataSourceName = "";
+		String loginId        = "";
+		String firstIndex     = "";
+		String cellVal        = "";
+		
+		try
+		{
+			response.setContentType("application/xml");
+
+			/*HttpSession session = request.getSession(true);
+			ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
+			loginId = userInfo.getLoginCode();*/
+			
+			dataSourceName = request.getParameter("dataSourceName");
+			firstIndex 	   = request.getParameter("salesPers");
+			cellVal 	   = request.getParameter("date");
+			
+			System.out.println("in ComplianceSummaryDB2Servlet  firstIndex :"+firstIndex+"===== cellVal :"+cellVal);
+			context                 = new InitialContext(appConnectParm.getProperty());
+			complianceDB2Remote        = (ComplianceDB2Remote) context.lookup("ibase/ComplianceDB2/remote");
+			JSONObject jsonObjData  = (JSONObject) complianceDB2Remote.getComplianceSummaryDB2(firstIndex, cellVal, dataSourceName);
+			OutputStream outputStream   = response.getOutputStream();
+		    outputStream.write(jsonObjData.toString().getBytes());
+			outputStream.flush();
+			outputStream.close();
+			System.out.println("Final data set for ComplianceSummaryDB2Servlet build the Graph is===" + jsonObjData);
+
+		} catch (Exception e)
+		{
+			System.out.println("Exception : ComplianceSummaryDB2Servlet :doPost(HttpServletRequest request, HttpServletResponse response) :" + e);
+			try
+			{
+				throw new ITMException(e);
+			} catch (ITMException e1)
+			{
+				e1.printStackTrace();
+			}
+		}
+
+	}
+
+}
\ No newline at end of file

webitm-dashboard/ibase/dashboard/sfa/servlet/CurrentDaySummaryDetailServlet.java

@@ -2,13 +2,16 @@ package ibase.dashboard.sfa.servlet;
 import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
+
 import java.io.IOException;
 import java.io.OutputStream;
+
 import javax.naming.InitialContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.json.simple.JSONObject;
 
 public class CurrentDaySummaryDetailServlet extends HttpServlet
@@ -29,9 +32,9 @@ public class CurrentDaySummaryDetailServlet extends HttpServlet
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
-		String loginUser      = "";
-		String date           = "";
-		String salePerson     = "";
+		String loginUser ="";
+		String date = "";
+		String salePerson = "";
 		try
 		{
 			response.setContentType("application/xml");
@@ -45,18 +48,18 @@ public class CurrentDaySummaryDetailServlet extends HttpServlet
 			
 			date = request.getParameter("curDate");
 			dataSourceName = request.getParameter("dataSourceName");
-			salePerson     = (request.getParameter("aseName"));
+			salePerson = (request.getParameter("aseName"));
 			System.out.println("salePerson :"+salePerson);
 			System.out.println("salePerson.lenght()  :"+salePerson.length());
 			if(salePerson.length()== 0)
 			{
 				salePerson = loginUser;
 			}
-			context        = new InitialContext(appConnectParm.getProperty());
+			
+			System.out.println("In CurrentDaySummaryServlet dataSourceName: ---- "+dataSourceName+ " ---- date :"+date+" ---- salePerson :"+salePerson);
+			context = new InitialContext(appConnectParm.getProperty());
 			currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			currencyRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject) currencyRemote.getCurrentDayWorkSummaryDetail(dataSourceName, date, salePerson);
+			JSONObject jsonObjData = (JSONObject) currencyRemote.getCurrentDayWorkSummaryDetail(dataSourceName, date, salePerson);
 			OutputStream outputStream   = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/sfa/servlet/CurrentDaySummaryServlet.java

@@ -2,13 +2,16 @@ package ibase.dashboard.sfa.servlet;
 import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
+
 import java.io.IOException;
 import java.io.OutputStream;
+
 import javax.naming.InitialContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.json.simple.JSONObject;
 
 public class CurrentDaySummaryServlet extends HttpServlet
@@ -21,6 +24,7 @@ public class CurrentDaySummaryServlet extends HttpServlet
 	{
 		doPost(request, response);
 	}
+
 	@SuppressWarnings("unchecked")
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
@@ -28,9 +32,9 @@ public class CurrentDaySummaryServlet extends HttpServlet
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
-		String loginUser      ="";
-		String date           = "";
-		String salePerson     = "";
+		String loginUser ="";
+		String date = "";
+		String salePerson = "";
 		try
 		{
 			response.setContentType("application/xml");
@@ -44,19 +48,18 @@ public class CurrentDaySummaryServlet extends HttpServlet
 			
 			date = request.getParameter("curDate");
 			dataSourceName = request.getParameter("dataSourceName");
-			salePerson     = (request.getParameter("aseName"));
+			salePerson = (request.getParameter("aseName"));
 			System.out.println("salePerson :"+salePerson);
 			System.out.println("salePerson.lenght()  :"+salePerson.length());
 			if(salePerson.length()== 0)
 			{
 				salePerson = loginUser;
-			}			
+			}
+			
 			System.out.println("In CurrentDaySummaryServlet dataSourceName: ---- "+dataSourceName+ " ---- date :"+date+" ---- salePerson :"+salePerson);
 			context = new InitialContext(appConnectParm.getProperty());
 			currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			currencyRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject) currencyRemote.getCurrentDayWorkSummary(dataSourceName, date, salePerson);
+			JSONObject jsonObjData = (JSONObject) currencyRemote.getCurrentDayWorkSummary(dataSourceName, date, salePerson);
 			OutputStream outputStream   = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/sfa/servlet/CurrentDayWorkDtlServlet.java

@@ -2,13 +2,16 @@ package ibase.dashboard.sfa.servlet;
 import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
+
 import java.io.IOException;
 import java.io.OutputStream;
+
 import javax.naming.InitialContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.json.simple.JSONObject;
 
 public class CurrentDayWorkDtlServlet extends HttpServlet
@@ -29,9 +32,9 @@ public class CurrentDayWorkDtlServlet extends HttpServlet
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
-		String loginUser      = "";
-		String date           = "";
-		String salePerson     = "";
+		String loginUser ="";
+		String date = "";
+		String salePerson = "";
 		try
 		{
 			response.setContentType("application/xml");
@@ -43,20 +46,20 @@ public class CurrentDayWorkDtlServlet extends HttpServlet
 				loginUser = userInfo.getLoginCode();
 			}
 			
-			date           = request.getParameter("curDate");
+			date = request.getParameter("curDate");
 			dataSourceName = request.getParameter("dataSourceName");
-			salePerson     = (request.getParameter("aseName"));
+			salePerson = (request.getParameter("aseName"));
 			System.out.println("salePerson :"+salePerson);
 			System.out.println("salePerson.lenght()  :"+salePerson.length());
 			if(salePerson.length()== 0)
 			{
 				salePerson = loginUser;
 			}
-			context        = new InitialContext(appConnectParm.getProperty());
+			
+			System.out.println("In CurrentDaySummaryServlet dataSourceName: ---- "+dataSourceName+ " ---- date :"+date+" ---- salePerson :"+salePerson);
+			context = new InitialContext(appConnectParm.getProperty());
 			currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			currencyRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject) currencyRemote.getCurrentDayWorkDtl(dataSourceName, date, salePerson);
+			JSONObject jsonObjData = (JSONObject) currencyRemote.getCurrentDayWorkDtl(dataSourceName, date, salePerson);
 			OutputStream outputStream   = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/sfa/servlet/CurrentDayWorkSKUDtlServlet.java

@@ -2,13 +2,16 @@ package ibase.dashboard.sfa.servlet;
 import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
+
 import java.io.IOException;
 import java.io.OutputStream;
+
 import javax.naming.InitialContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.json.simple.JSONObject;
 
 public class CurrentDayWorkSKUDtlServlet extends HttpServlet
@@ -21,6 +24,7 @@ public class CurrentDayWorkSKUDtlServlet extends HttpServlet
 	{
 		doPost(request, response);
 	}
+
 	@SuppressWarnings("unchecked")
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
@@ -42,22 +46,21 @@ public class CurrentDayWorkSKUDtlServlet extends HttpServlet
 				loginUser = userInfo.getLoginCode();
 			}
 			
-			date           = request.getParameter("curDate");
+			date = request.getParameter("curDate");
 			dataSourceName = request.getParameter("dataSourceName");
-			salePerson     = (request.getParameter("aseName"));
+			salePerson = (request.getParameter("aseName"));
 			System.out.println("salePerson :"+salePerson);
 			System.out.println("salePerson.lenght()  :"+salePerson.length());
 			
 		    if(salePerson.length()== 0)
 			{
 				salePerson = loginUser;
-			}			
+			}
+			
 			System.out.println("In CurrentDaySummaryServlet dataSourceName: ---- "+dataSourceName+ " ---- date :"+date+" ---- salePerson :"+salePerson);
-			context        = new InitialContext(appConnectParm.getProperty());
+			context = new InitialContext(appConnectParm.getProperty());
 			currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			currencyRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject) currencyRemote.getCurrentDayWorkSKUDtl(dataSourceName, date, salePerson);
+			JSONObject jsonObjData = (JSONObject) currencyRemote.getCurrentDayWorkSKUDtl(dataSourceName, date, salePerson);
 			OutputStream outputStream   = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/sfa/servlet/DoctorsVisitServlet.java

@@ -65,8 +65,6 @@ public class DoctorsVisitServlet extends HttpServlet
 			context = new InitialContext(appConnectParm.getProperty());
 			System.out.println("inside docotor 1 =");
 			doctorsVisitRemote = (DoctorsVisitRemote) context.lookup("ibase/DoctorsVisit/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			doctorsVisitRemote.setUserInfo(userInfo);
 			JSONObject jsonObjData = (JSONObject) doctorsVisitRemote.getDoctorsVisitDetails(loginId, salesPerson, month, year, dataSourceName);
 			System.out.println("inside docotor2 =");
 			OutputStream outputStream = response.getOutputStream();

webitm-dashboard/ibase/dashboard/sfa/servlet/MTDWorkDetailServlet.java

@@ -2,13 +2,16 @@ package ibase.dashboard.sfa.servlet;
 import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
+
 import java.io.IOException;
 import java.io.OutputStream;
+
 import javax.naming.InitialContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.json.simple.JSONObject;
 
 public class MTDWorkDetailServlet extends HttpServlet
@@ -29,10 +32,11 @@ public class MTDWorkDetailServlet extends HttpServlet
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
-		String loginUser      = "";
-		String month          = "";
-		String year           = "";
-		String salePerson     = "";
+		String loginUser ="";
+		String month = "";
+		String year = "";
+		String date = "";
+		String salePerson = "";
 		try
 		{
 			response.setContentType("application/xml");
@@ -45,22 +49,28 @@ public class MTDWorkDetailServlet extends HttpServlet
 			}
 			
 			dataSourceName = request.getParameter("dataSourceName");
-			salePerson     = (request.getParameter("aseName"));
+			salePerson = (request.getParameter("aseName"));
 			System.out.println("salePerson :"+salePerson);
-			month          = request.getParameter("month");
-			year           = request.getParameter("year");
+			//month = request.getParameter("month");
+			//year = request.getParameter("year");
+			date = request.getParameter("curDate");
+			String []inputDateArray = date.split("-");
+			if(inputDateArray.length>1)
+			{
+				month = inputDateArray[1];
+				year = inputDateArray[2];
+			}
 			System.out.println("month = " + month);
 			System.out.println("year = " + year);
 			System.out.println("salePerson.lenght()  :"+salePerson.length());
 			if(salePerson.length()== 0)
 			{
 				salePerson = loginUser;
-			}			
-			context        = new InitialContext(appConnectParm.getProperty());
+			}
+			
+			context = new InitialContext(appConnectParm.getProperty());
 			currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			currencyRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject) currencyRemote.getMTDWorkDetail(dataSourceName, month, year, salePerson);
+			JSONObject jsonObjData = (JSONObject) currencyRemote.getMTDWorkDetail(dataSourceName, month, year, salePerson);
 			OutputStream outputStream   = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/sfa/servlet/MTDWorkDtlParentServlet.java

@@ -2,13 +2,16 @@ package ibase.dashboard.sfa.servlet;
 import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
+
 import java.io.IOException;
 import java.io.OutputStream;
+
 import javax.naming.InitialContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.json.simple.JSONObject;
 
 public class MTDWorkDtlParentServlet extends HttpServlet
@@ -29,10 +32,11 @@ public class MTDWorkDtlParentServlet extends HttpServlet
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
-		String loginUser      = "";
-		String month          = "";
-		String year           = "";
-		String salePerson     = "";
+		String loginUser ="";
+		String month = "";
+		String year = "";
+		String date = "";
+		String salePerson = "";
 		try
 		{
 			response.setContentType("application/xml");
@@ -45,10 +49,17 @@ public class MTDWorkDtlParentServlet extends HttpServlet
 			}
 			
 			dataSourceName = request.getParameter("dataSourceName");
-			salePerson     = (request.getParameter("aseName"));
+			salePerson = (request.getParameter("aseName"));
 			System.out.println("salePerson :"+salePerson);
-			month = request.getParameter("month");
-			year = request.getParameter("year");
+			//month = request.getParameter("month");
+			//year = request.getParameter("year");
+			date = request.getParameter("curDate");
+			String []inputDateArray = date.split("-");
+			if(inputDateArray.length>1)
+			{
+				month = inputDateArray[1];
+				year = inputDateArray[2];
+			}
 			System.out.println("month = " + month);
 			System.out.println("year = " + year);
 			System.out.println("salePerson.lenght()  :"+salePerson.length());
@@ -57,11 +68,9 @@ public class MTDWorkDtlParentServlet extends HttpServlet
 				salePerson = loginUser;
 			}
 			
-			context        = new InitialContext(appConnectParm.getProperty());
+			context = new InitialContext(appConnectParm.getProperty());
 			currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			currencyRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject) currencyRemote.getMTDWorkDtlParent(dataSourceName, month, year, salePerson);
+			JSONObject jsonObjData = (JSONObject) currencyRemote.getMTDWorkDtlParent(dataSourceName, month, year, salePerson);
 			OutputStream outputStream   = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/sfa/servlet/MTDWorkParentServlet.java

@@ -32,10 +32,11 @@ public class MTDWorkParentServlet extends HttpServlet
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
-		String loginUser      = "";
-		String month          = "";
-		String year           = "";
-		String salePerson     = "";
+		String loginUser ="";
+		String month = "";
+		String year = "";
+		String date = "";
+		String salePerson = "";
 		try
 		{
 			response.setContentType("application/xml");
@@ -48,22 +49,28 @@ public class MTDWorkParentServlet extends HttpServlet
 			}
 			
 			dataSourceName = request.getParameter("dataSourceName");
-			salePerson     = (request.getParameter("aseName"));
+			salePerson = (request.getParameter("aseName"));
 			System.out.println("salePerson :"+salePerson);
-			month = request.getParameter("month");
-			year  = request.getParameter("year");
+			//month = request.getParameter("month");
+			//year = request.getParameter("year");
+			date = request.getParameter("curDate");
+			String []inputDateArray = date.split("-");
+			if(inputDateArray.length>1)
+			{
+				month = inputDateArray[1];
+				year = inputDateArray[2];
+			}
 			System.out.println("month = " + month);
 			System.out.println("year = " + year);
 			System.out.println("salePerson.lenght()  :"+salePerson.length());
 			if(salePerson.length()== 0)
 			{
 				salePerson = loginUser;
-			}			
-			context        = new InitialContext(appConnectParm.getProperty());
+			}
+			
+			context = new InitialContext(appConnectParm.getProperty());
 			currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			currencyRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject) currencyRemote.getMTDWorkParent(dataSourceName, month, year, salePerson);
+			JSONObject jsonObjData = (JSONObject) currencyRemote.getMTDWorkParent(dataSourceName, month, year, salePerson);
 			OutputStream outputStream   = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/sfa/servlet/MTDWorkSummaryServlet.java

@@ -2,13 +2,16 @@ package ibase.dashboard.sfa.servlet;
 import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
+
 import java.io.IOException;
 import java.io.OutputStream;
+
 import javax.naming.InitialContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.json.simple.JSONObject;
 
 public class MTDWorkSummaryServlet extends HttpServlet
@@ -29,10 +32,11 @@ public class MTDWorkSummaryServlet extends HttpServlet
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
-		String loginUser      = "";
-		String month          = "";
-		String year           = "";
-		String salePerson     = "";
+		String loginUser ="";
+		String month = "";
+		String year = "";
+		String salePerson = "";
+		String date = "";
 		try
 		{
 			response.setContentType("application/xml");
@@ -45,10 +49,17 @@ public class MTDWorkSummaryServlet extends HttpServlet
 			}
 			
 			dataSourceName = request.getParameter("dataSourceName");
-			salePerson     = (request.getParameter("aseName"));
+			salePerson = (request.getParameter("aseName"));
 			System.out.println("salePerson :"+salePerson);
-			month = request.getParameter("month");
-			year  = request.getParameter("year");
+			//month = request.getParameter("month");
+			//year = request.getParameter("year");
+			date = request.getParameter("curDate");
+			String []inputDateArray = date.split("-");
+			if(inputDateArray.length>1)
+			{
+				month = inputDateArray[1];
+				year = inputDateArray[2];
+			}
 			System.out.println("month = " + month);
 			System.out.println("year = " + year);
 			System.out.println("salePerson.lenght()  :"+salePerson.length());
@@ -57,11 +68,9 @@ public class MTDWorkSummaryServlet extends HttpServlet
 				salePerson = loginUser;
 			}
 			
-			context        = new InitialContext(appConnectParm.getProperty());
+			context = new InitialContext(appConnectParm.getProperty());
 			currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			currencyRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject) currencyRemote.getMTDWorkSummary(dataSourceName, month, year, salePerson);
+			JSONObject jsonObjData = (JSONObject) currencyRemote.getMTDWorkSummary(dataSourceName, month, year, salePerson);
 			OutputStream outputStream   = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/sfa/servlet/OutletsVisitServlet.java

@@ -42,8 +42,8 @@ public class OutletsVisitServlet extends HttpServlet
 			response.setContentType("application/xml");
 			
 			HttpSession session = request.getSession(true);
-			ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
-			loginId     = userInfo.getLoginCode(); 
+			/*ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
+			loginId     = userInfo.getLoginCode(); */
 			
 			dataSourceName   	=request.getParameter("dataSourceName"); 
 			territory 			=(request.getParameter("territory"));
@@ -68,8 +68,6 @@ public class OutletsVisitServlet extends HttpServlet
 			System.out.println("reportName is =" + reportName );
 			context = new InitialContext(appConnectParm.getProperty());
 			outletVisitRemote = (OutletsVisitRemote)context.lookup("ibase/OutletsVisitEJB/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			outletVisitRemote.setUserInfo(userInfo);
 			JSONObject jsonObjData      = (JSONObject)outletVisitRemote.getOutletVisitDetails(loginId,salesPerson,month,year,dataSourceName);
 			OutputStream outputStream   = response.getOutputStream();			
 		    outputStream.write(jsonObjData.toString().getBytes());

webitm-dashboard/ibase/dashboard/sfa/servlet/PendingStatusServlet.java

@@ -4,14 +4,17 @@ import ibase.dashboard.sfa.ejb.PendingStatusRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.utility.UserInfoBean;
 import ibase.webitm.utility.ITMException;
+
 import java.io.IOException;
 import java.io.OutputStream;
+
 import javax.naming.InitialContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+
 import org.json.simple.JSONObject;
 
 public class PendingStatusServlet extends HttpServlet
@@ -28,29 +31,28 @@ public class PendingStatusServlet extends HttpServlet
 			throws IOException, ServletException
 	{
 		PendingStatusRemote gardeniaRemote = null;
-		InitialContext context             = null;
+		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
-		String loginId        = "";
-		HttpSession session       = null;
-		JSONObject jsonObjData    = null;
+		String loginId = "";
+		HttpSession session = null;
+		JSONObject jsonObjData = null;
 		OutputStream outputStream = null;
-		UserInfoBean userInfo     = null;
-		String empSite            = null;
+		UserInfoBean userInfo = null;
+		String empSite=null;
 		try
 		{
 			response.setContentType("application/xml");
-			session  = request.getSession(true);
+			session = request.getSession(true);
 			userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
-			loginId  = userInfo.getLoginCode().trim();
-			empSite  = userInfo.getSiteCode();
+			loginId = userInfo.getLoginCode().trim();
+			empSite = userInfo.getSiteCode();
 			dataSourceName = request.getParameter("dataSourceName");
+			//loginId="I99994";
 			System.out.println("loginId is =" + loginId);			
 			context = new InitialContext(appConnectParm.getProperty());
 			gardeniaRemote = (PendingStatusRemote) context.lookup("ibase/PendingStatus/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			gardeniaRemote.setUserInfo(userInfo);
-			jsonObjData  = (JSONObject) gardeniaRemote.getPendingStatus(dataSourceName,loginId,empSite);
+			jsonObjData = (JSONObject) gardeniaRemote.getPendingStatus(dataSourceName,loginId,empSite);
 			outputStream = response.getOutputStream();
 			outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/sfa/servlet/ProductAssessmentEventServlet.java

@@ -30,12 +30,12 @@ public class ProductAssessmentEventServlet extends HttpServlet
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
-		String loginId        = "";
-		String zone           = "";
-		String region         = "";
-		String product        = "";
-		String team           = "";
-		String event          = "";
+		String loginId = "";
+		String zone ="";
+		String region = "";
+		String product = "";
+		String team = "";
+		String event = "";
 		
 		
 		try
@@ -51,12 +51,15 @@ public class ProductAssessmentEventServlet extends HttpServlet
 			product    = request.getParameter("product");
 			team 	   = request.getParameter("team");
 			event 	   = request.getParameter("event");
+			//period 	   = request.getParameter("period");
+		
+			System.out.println("in ProductAssessmentEventServlet  zone :"+zone+"===== region :"+region +"dataSourceName: ="+dataSourceName);
+			System.out.println("in ProductAssessmentEventServlet  product :"+product+"===== team :"+team +"event: ="+event);
 			
 			context = new InitialContext(appConnectParm.getProperty());
 			productAssessmentRemote = (ProductAssessmentRemote) context.lookup("ibase/ProductAssessment/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			productAssessmentRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject) productAssessmentRemote.getProductAssessmentEventServlet( loginId,  dataSourceName, zone, region, product, team, event);
+			//JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getEmployeeEvents( loginId,  dataSourceName, zone, region, product, team, event);
+			JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getProductAssessmentEventServlet( loginId,  dataSourceName, zone, region, product, team, event);
 			OutputStream outputStream   = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/sfa/servlet/ProductAssessmentProductPieServlet.java

@@ -22,6 +22,7 @@ public class ProductAssessmentProductPieServlet extends HttpServlet
 	{
 		doPost(request, response);
 	}
+
 	@SuppressWarnings("unchecked")
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
@@ -29,28 +30,25 @@ public class ProductAssessmentProductPieServlet extends HttpServlet
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
-		String personName     = "";
+		String personName = "";
 		try
 		{
 			response.setContentType("application/xml");
-			/*Added session by Nikhil On dated 13 June 2016*/
-			HttpSession session = request.getSession(true);
-			ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
-			/*Ended session by Nikhil On dated 13 June 2016*/
 			dataSourceName = request.getParameter("dataSourceName");
-			personName     = request.getParameter("CELL_VAL");
+			personName = request.getParameter("CELL_VAL");
 			System.out.println(" ProductAssessmentProductPieServlet personName =" + personName + "===== dataSourceName :"+dataSourceName);
 		
-			context                 = new InitialContext(appConnectParm.getProperty());
+			context = new InitialContext(appConnectParm.getProperty());
 			productAssessmentRemote = (ProductAssessmentRemote) context.lookup("ibase/ProductAssessment/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			productAssessmentRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject) productAssessmentRemote.getProductAssessmentProductPieServlet(dataSourceName,personName);
+			//JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getEmployeeProduct(dataSourceName,personName);
+			JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getProductAssessmentProductPieServlet(dataSourceName,personName);
 			OutputStream outputStream   = response.getOutputStream();
 			outputStream.write(jsonObjData.toString().getBytes());
 		    outputStream.flush();
 			outputStream.close();
-			System.out.println(" Final data set for ProductAssessmentProductPieServlet build the Graph is===" + jsonObjData);					
+			System.out.println(" Final data set for ProductAssessmentProductPieServlet build the Graph is===" + jsonObjData);
+		
+			
 
 		} catch (Exception e)
 		{

webitm-dashboard/ibase/dashboard/sfa/servlet/ProductAssessmentProductRatingServlet.java

@@ -30,30 +30,31 @@ public class ProductAssessmentProductRatingServlet extends HttpServlet
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
-		String personName     = "";
-		String productName    = "";
+		String personName = "";
+		String productName = "";
 		try
 		{
 			response.setContentType("application/xml");
-			/*Added session by Nikhil On dated 13 June 2016*/
-			HttpSession session = request.getSession(true);
-			ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
-			/*Ended session by Nikhil On dated 13 June 2016*/
 			dataSourceName = request.getParameter("dataSourceName");
-			personName     =  request.getParameter("name");
-			productName    =  request.getParameter("productName");
-						
+			personName =  request.getParameter("name");
+			productName =  request.getParameter("productName");
+			
+			System.out.println("personName =" + personName +"==== productName :"+productName);
+			
 			context = new InitialContext(appConnectParm.getProperty());
 			productAssessmentRemote = (ProductAssessmentRemote) context.lookup("ibase/ProductAssessment/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			productAssessmentRemote.setUserInfo(userInfo);
 			System.out.println("in ProductAssessmentProductRatingServlet");
-			JSONObject jsonObjData      = (JSONObject) productAssessmentRemote.getProductAssessmentProductRatingServlet(dataSourceName,personName,productName);
+			
+			//JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getEmployeeProductRating(dataSourceName,personName,productName);
+			JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getProductAssessmentProductRatingServlet(dataSourceName,personName,productName);
 			OutputStream outputStream   = response.getOutputStream();			
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();
 			outputStream.close();
-			System.out.println(" Final data set for ProductAssessmentProductRatingServlet build the Graph is===" + jsonObjData);					
+			System.out.println(" Final data set for ProductAssessmentProductRatingServlet build the Graph is===" + jsonObjData);
+		
+			
+
 		} catch (Exception e)
 		{
 			System.out.println("Exception : ProductAssessmentProductRatingServlet :doPost(HttpServletRequest request, HttpServletResponse response) :" + e);

webitm-dashboard/ibase/dashboard/sfa/servlet/ProductAssessmentProductServlet.java

@@ -34,22 +34,22 @@ public class ProductAssessmentProductServlet extends HttpServlet
 		try
 		{
 			response.setContentType("application/xml");
-			/*Added session by Nikhil On dated 13 June 2016*/
-			HttpSession session = request.getSession(true);
-			ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
-			/*Ended session by Nikhil On dated 13 June 2016*/
+
 			dataSourceName = request.getParameter("dataSourceName");
-			personName     = request.getParameter("CELL_VAL");
+			personName = request.getParameter("CELL_VAL");
+			System.out.println(" ProductAssessmentProductServlet personName =" + personName + "===== dataSourceName :"+dataSourceName);
+		
 			context = new InitialContext(appConnectParm.getProperty());
 			productAssessmentRemote = (ProductAssessmentRemote) context.lookup("ibase/ProductAssessment/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			productAssessmentRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject) productAssessmentRemote.getProductAssessmentProductServlet(dataSourceName,personName);
+			//JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getEmployeeProduct(dataSourceName,personName);
+			JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getProductAssessmentProductServlet(dataSourceName,personName);
 			OutputStream outputStream   = response.getOutputStream();
 			outputStream.write(jsonObjData.toString().getBytes());
 		    outputStream.flush();
 			outputStream.close();
-			System.out.println(" Final data set for ProductAssessmentProductServlet build the Graph is===" + jsonObjData);				
+			System.out.println(" Final data set for ProductAssessmentProductServlet build the Graph is===" + jsonObjData);
+		
+			
 
 		} catch (Exception e)
 		{

webitm-dashboard/ibase/dashboard/sfa/servlet/RSRScoreServlet.java

@@ -2,14 +2,17 @@ package ibase.dashboard.sfa.servlet;
 import ibase.dashboard.sfa.ejb.RSRScoreRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
+
 import java.io.IOException;
 import java.io.OutputStream;
+
 import javax.naming.InitialContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+
 import org.json.simple.JSONObject;
 
 @SuppressWarnings("serial")
@@ -61,8 +64,6 @@ public class RSRScoreServlet extends HttpServlet
 			System.out.println("reportName is =" + reportName );
 			context = new InitialContext(appConnectParm.getProperty());
 			rsrScoreRemote = (RSRScoreRemote)context.lookup("ibase/RSRScoreEJB/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			rsrScoreRemote.setUserInfo(userInfo);
 			JSONObject jsonObjData      = (JSONObject)rsrScoreRemote.getRSRScoreDetails(salesPerson,month,year,dataSourceName);
 			OutputStream outputStream   = response.getOutputStream();			
 		    outputStream.write(jsonObjData.toString().getBytes());

webitm-dashboard/ibase/dashboard/sfa/servlet/RSRSurveyServlet.java

@@ -64,8 +64,6 @@ public class RSRSurveyServlet extends HttpServlet
 			System.out.println("reportName is =" + reportName );
 			context = new InitialContext(appConnectParm.getProperty());
 			rsrSurveyRemote = (RSRSurveyRemote) context.lookup("ibase/RSRSurveyEJB/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			rsrSurveyRemote.setUserInfo(userInfo);
 			JSONObject jsonObjData      = (JSONObject)rsrSurveyRemote.getRSRSurveyDetails(loginId,salesPerson,month,year,dataSourceName);
 			OutputStream outputStream   = response.getOutputStream();			
 		    outputStream.write(jsonObjData.toString().getBytes());

webitm-dashboard/ibase/dashboard/sfa/servlet/RXSurveyServlet.java

@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+
 import org.json.simple.JSONObject;
 
 public class RXSurveyServlet extends HttpServlet
@@ -65,8 +66,6 @@ public class RXSurveyServlet extends HttpServlet
 			System.out.println("reportName is =" + reportName );
 			context = new InitialContext(appConnectParm.getProperty());
 			rxSurveyRemote = (RXSurveyRemote)context.lookup("ibase/RXSurveyEJB/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			rxSurveyRemote.setUserInfo(userInfo);
 			JSONObject jsonObjData      = (JSONObject)rxSurveyRemote.getRXSurveyDetails(loginId,salesPerson,month,year,dataSourceName);
 			OutputStream outputStream   = response.getOutputStream();			
 		    outputStream.write(jsonObjData.toString().getBytes());

webitm-dashboard/ibase/dashboard/sfa/servlet/TargetVsAchievementServlet.java

   package ibase.dashboard.sfa.servlet;
   
   import ibase.dashboard.sfa.ejb.TargetVsAchievementRemote;
-  import ibase.system.config.AppConnectParm;
+import ibase.system.config.AppConnectParm;
   import ibase.webitm.utility.ITMException;
   import java.io.IOException;
   import java.io.OutputStream;
@@ -10,8 +10,7 @@
   import javax.servlet.http.HttpServlet;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
-  import javax.servlet.http.HttpSession;
-  import org.json.simple.JSONObject;
+import org.json.simple.JSONObject;
   
   public class TargetVsAchievementServlet extends HttpServlet
   {
@@ -27,25 +26,20 @@
       throws IOException, ServletException
     {
     	TargetVsAchievementRemote targetVsAchievement = null;
-        InitialContext context        = null;
-        AppConnectParm appConnectParm = new AppConnectParm();
-        String dataSourceName = "";
-        String prdCode        = "";
+     InitialContext context = null;
+    AppConnectParm appConnectParm = new AppConnectParm();
+     String dataSourceName = "";
+     String prdCode = "";
      
       try
       {
-        response.setContentType("application/xml");
-       /*Added session by Nikhil On dated 13 June 2016*/
-		HttpSession session = request.getSession(true);
-		ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
-		/*Ended session by Nikhil On dated 13 June 2016*/
-        dataSourceName = request.getParameter("dataSourceName");
-        prdCode        = request.getParameter("PRD_SALESDASH");      
-        context = new InitialContext(appConnectParm.getProperty());
-        targetVsAchievement = (TargetVsAchievementRemote)context.lookup("ibase/TargetVsAchievement/remote");
-       /*setUserInfo(userInfo) for DB connection on dated:14062016*/
-       targetVsAchievement.setUserInfo(userInfo);
-       JSONObject jsonObjData    = targetVsAchievement.getTargetVsAchievement(dataSourceName,prdCode);
+       response.setContentType("application/xml");
+       dataSourceName = request.getParameter("dataSourceName");
+       prdCode = request.getParameter("PRD_SALESDASH");
+       
+       context = new InitialContext(appConnectParm.getProperty());
+       targetVsAchievement = (TargetVsAchievementRemote)context.lookup("ibase/TargetVsAchievement/remote");
+       JSONObject jsonObjData = targetVsAchievement.getTargetVsAchievement(dataSourceName,prdCode);
        OutputStream outputStream = response.getOutputStream();
        outputStream.write(jsonObjData.toString().getBytes());
        outputStream.flush();

webitm-dashboard/ibase/dashboard/sfa/servlet/TaskActivityServlet.java

@@ -10,8 +10,6 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
 import org.json.simple.JSONObject;
 
 public class TaskActivityServlet extends HttpServlet
@@ -32,19 +30,19 @@ public class TaskActivityServlet extends HttpServlet
 		String month = "";
 		try
 		{
+			System.out.println("in  TaskActivityServlet  " );
 			response.setContentType("application/xml");
-			/*Added session by Nikhil On dated 13 June 2016*/
-			HttpSession session = request.getSession(true);
-			ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
-			/*Ended session by Nikhil On dated 13 June 2016*/
 			dataSourceName = request.getParameter("dataSourceName");
 			month = request.getParameter("month");
 			System.out.println( "month is =" + month );
 			context = new InitialContext(appConnectParm.getProperty());
 			taskActivityRemote = (TaskActivityRemote) context.lookup("ibase/TaskActivity/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			taskActivityRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject) taskActivityRemote.getTask(dataSourceName,month);
+			JSONObject jsonObjData = (JSONObject) taskActivityRemote.getTask(dataSourceName,month);
+			/*String jsonObjData= "{'0':{'acct_descr':'CONSIGNMENT ACKNOWLEDGEMENT','det':'R000000168 # DATED # 03-JUL-15 <Br> R000000164 # DATED # 11-JUN-15','tag':'D','month':'','pndig':98,'descr':'R000000168 # DATED # 03-JUL-15 , R000000164 # DATED # 11-JUN-15','completed':2},'1':{'acct_descr':'RECEIPT','det':'R000000150 # DATED # 05-JAN-15 <Br> R000000165 # DATED # 18-JUN-15 <Br> R000000171 # DATED # 09-JUL-15 <Br> R000000170 # DATED # 09-JUL-15 <Br> R000000169 # DATED # 03-JUL-15 <Br> R000000163 # DATED # 17-APR-15 <Br> R000000162 # DATED # 17-APR-15 <Br> R000000152 # DATED # 05-JAN-15 <Br> R000000151 # DATED # 05-JAN-15 <Br> R000000149 # DATED # 05-JAN-15 <Br> R000000148 # DATED # 05-JAN-15 <Br> R000000158 # DATED # 06-JAN-15 <Br> R000000157 # DATED # 06-JAN-15 <Br> R000000159 # DATED # 06-JAN-15 <Br> R000000156 # DATED # 06-JAN-15 <Br> R000000155 # DATED # 06-JAN-15 <Br> R000000154 # DATED # 05-JAN-15','tag':'F','month':'','pndig':83,'descr':'R000000150 # DATED # 05-JAN-15 , R000000165 # DATED # 18-JUN-15 ','completed':17},'2':{'acct_descr':'ADJUSTMENT RECEIPT','det':'A000000129 # DATED # 24-DEC-14 <Br> A000000083 # DATED # 18-OCT-14 <Br> A000000095 # DATED # 03-NOV-14 <Br> A000000082 # DATED # 18-OCT-14 <Br> A000000134 # DATED # 08-JUN-15 <Br> A000000132 # DATED # 08-MAY-15 <Br> A000000130 # DATED # 05-JAN-15 <Br> A000000133 # DATED # 08-MAY-15 <Br> A000000109 # DATED # 20-DEC-14 <Br> A000000135 # DATED # 26-JUN-15 <Br> A000000121 # DATED # 24-DEC-14 <Br> A000000122 # DATED # 24-DEC-14 <Br> A000000125 # DATED # 24-DEC-14 <Br> A000000126 # DATED # 24-DEC-14 <Br> A000000127 # DATED # 24-DEC-14 <Br> A000000128 # DATED # 24-DEC-14 <Br> A000000124 # DATED # 24-DEC-14 <Br> A000000102 # DATED # 12-NOV-14 <Br> A000000101 # DATED # 12-NOV-14 <Br> A000000123 # DATED # 24-DEC-14 <Br> A000000100 # DATED # 12-NOV-14 <Br> A000000097 # DATED # 06-NOV-14 <Br> A000000098 # DATED # 06-NOV-14 <Br> A000000099 # DATED # 11-NOV-14 <Br> A000000092 # DATED # 20-OCT-14 <Br> A000000091 # DATED # 20-OCT-14 <Br> A000000107 # DATED # 05-DEC-14 <Br> A000000106 # DATED # 05-DEC-14 <Br> A000000108 # DATED # 17-DEC-14 <Br> A000000118 # DATED # 24-DEC-14 <Br> A000000116 # DATED # 22-DEC-14 <Br> A000000119 # DATED # 24-DEC-14','tag':'H','month':'','pndig':68,'descr':'A000000129 # DATED # 24-DEC-14 , A000000083 # DATED # 18-OCT-14 ','completed':32}}";
+			OutputStream outputStream = response.getOutputStream();
+			outputStream.write(jsonObjData.toString().replace('\'', '"').getBytes());
+			outputStream.flush();
+			outputStream.close();*/
 			OutputStream outputStream   = response.getOutputStream();			
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/sfa/servlet/TaskTrackingServlet.java

+package ibase.dashboard.sfa.servlet;
+
+import ibase.dashboard.sfa.ejb.TaskTrackingRemote;
+import ibase.system.config.AppConnectParm;
+import ibase.webitm.utility.ITMException;
+import java.io.IOException;
+import java.io.OutputStream;
+import javax.naming.InitialContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.json.simple.JSONObject;
+
+public class TaskTrackingServlet extends HttpServlet
+{
+	private static final long serialVersionUID = 1L;
+
+	
+	
+	public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
+	{
+		doPost(request, response);
+	}
+
+	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
+	{
+		TaskTrackingRemote taskActivityRemote = null;
+		InitialContext context = null;
+		AppConnectParm appConnectParm = new AppConnectParm();
+		String dataSourceName = "";
+		String groupId = "";
+		String userId = "";
+		
+		
+		try
+		{
+			System.out.println("in  TaskActivityServlet  " );
+			response.setContentType("application/xml");
+			
+			dataSourceName 	= request.getParameter("dataSourceName");
+			groupId 		= request.getParameter("groupId");
+			userId 			= request.getParameter("userId");
+			
+			
+			System.out.println("in TaskTrackingServlet groupId :"+groupId+"----userId :"+userId);
+			
+			context = new InitialContext(appConnectParm.getProperty());
+			taskActivityRemote = (TaskTrackingRemote) context.lookup("ibase/TaskTracking/remote");
+			JSONObject jsonObjData = (JSONObject) taskActivityRemote.getTask( dataSourceName,groupId,userId);
+			OutputStream outputStream = response.getOutputStream();
+			outputStream.write(jsonObjData.toString().getBytes());
+			outputStream.flush();
+			outputStream.close();
+			System.out.println("  in servlet Final data set for TaskTrackingServlet  build the Graph is===" + jsonObjData);
+		} catch (Exception e)
+		{
+			System.out.println("Exception : TaskTrackingServlet :doPost(HttpServletRequest request, HttpServletResponse response) :" + e);
+			try
+			{
+				throw new ITMException(e);
+			} catch (ITMException e1)
+			{
+				e1.printStackTrace();
+			}
+		}
+	}
+
+}
\ No newline at end of file