Skip to content

B
business-java
Commit e9770ccf authored by nsawalakhe's avatar nsawalakhe
Browse files
Options

Modify DB connection changes in all ejb and add connection changes in servlet . 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@102311 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e0d547cc
Show whitespace changes
Inline Side-by-side
Showing with 482 additions and 1762 deletions
webitm-dashboard/ibase/dashboard/sfa/ejb/AttendanceCompliance.java
View file @ e9770ccf
package ibase.dashboard.sfa.ejb; package ibase.dashboard.sfa.ejb;
import ibase.system.config.ConnDriver; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
...@@ -18,10 +15,10 @@ import org.json.simple.JSONObject; ...@@ -18,10 +15,10 @@ import org.json.simple.JSONObject;
public class AttendanceCompliance extends ValidatorEJB implements AttendanceComplianceLocal, public class AttendanceCompliance extends ValidatorEJB implements AttendanceComplianceLocal,
AttendanceComplianceRemote AttendanceComplianceRemote
{ {
E12GenericUtility e12GenericUtility = new E12GenericUtility();
public AttendanceCompliance() public AttendanceCompliance()
{ {
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public JSONObject getAttendance(String dataSourceName, String empCode) public JSONObject getAttendance(String dataSourceName, String empCode)
throws RemoteException, ITMException throws RemoteException, ITMException
...@@ -32,49 +29,16 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp ...@@ -32,49 +29,16 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
int count = 0; int count = 0;
try try
{ {
SimpleDateFormat convertToDbDate =new SimpleDateFormat(new GenericUtility().getDBDateFormat()); SimpleDateFormat convertToDbDate =new SimpleDateFormat(new E12GenericUtility().getDBDateFormat());
SimpleDateFormat simpleDateFormat =new SimpleDateFormat(new GenericUtility().getApplDateFormat()); SimpleDateFormat simpleDateFormat =new SimpleDateFormat(new E12GenericUtility().getApplDateFormat());
//simpleDateFormat.format(convertToDbDate.parse("")); //simpleDateFormat.format(convertToDbDate.parse(""));
conn = connDriver.getConnectDB(dataSourceName); /*conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; 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," /*add new code for connection DB on dated:16062016 by Nikhil*/
+ " EMP_NAME, MOBILE_NO FROM (SELECT SP.SALES_PERS, SP.SP_NAME,MAX(S.EVENT_DATE) LAST_REPORT," conn = getConnection();
+ " (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 Changes on 150316*/
/*sql = " select A.SALES_PERS, SP.SP_NAME, A.LAST_REPORT, ROUND(TRUNC(sysdate)-TRUNC(A.LAST_REPORT)) " + /*sql = " select A.SALES_PERS, SP.SP_NAME, A.LAST_REPORT, ROUND(TRUNC(sysdate)-TRUNC(A.LAST_REPORT)) " +
...@@ -104,10 +68,21 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp ...@@ -104,10 +68,21 @@ 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 " + " 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 "; " 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*/ /*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, " + " 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 " + " E.MOBILE_NO FROM (SELECT t.SALES_PERS, MAX(T.EVENT_DATE) LAST_REPORT " +
" FROM SPRS_ACT_TRAN T " + " FROM SPRS_ACT_TRAN T " +
...@@ -122,7 +97,7 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp ...@@ -122,7 +97,7 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp
" INNER JOIN ITEMSER I ON I.ITEM_SER=SP.ITEM_SER LEFT " + " INNER JOIN ITEMSER I ON I.ITEM_SER=SP.ITEM_SER LEFT " +
" OUTER JOIN EMPLOYEE E1 ON E1.EMP_CODE = E.REPORT_TO " + " OUTER JOIN EMPLOYEE E1 ON E1.EMP_CODE = E.REPORT_TO " +
" LEFT OUTER JOIN STATE S ON S.STATE_CODE = E.CUR_STATE "; " LEFT OUTER JOIN STATE S ON S.STATE_CODE = E.CUR_STATE ";
*/
System.out.println("sql is =" + sql); System.out.println("sql is =" + sql);
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -130,7 +105,6 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp ...@@ -130,7 +105,6 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp
while (rs.next()) while (rs.next())
{ {
rowData = new JSONObject(); rowData = new JSONObject();
rowData.put("salespersn", checkNull(rs.getString("SALES_PERS"))); rowData.put("salespersn", checkNull(rs.getString("SALES_PERS")));
rowData.put("spname", checkNull(rs.getString("SP_NAME"))); rowData.put("spname", checkNull(rs.getString("SP_NAME")));
......
webitm-dashboard/ibase/dashboard/sfa/ejb/Compliance.java
View file @ e9770ccf
package ibase.dashboard.sfa.ejb; package ibase.dashboard.sfa.ejb;
import ibase.system.config.ConnDriver; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
/** /**
* Session Bean implementation class SalesPersonSales * Session Bean implementation class SalesPersonSales
...@@ -22,7 +18,7 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia ...@@ -22,7 +18,7 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia
public Compliance() { public Compliance() {
// TODO Auto-generated constructor stub // TODO Auto-generated constructor stub
} }
GenericUtility genericUtility = GenericUtility.getInstance(); E12GenericUtility e12GenericUtility = new E12GenericUtility();
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getComplianceDetails(String loginId,String dataSourceName,String period) throws RemoteException, ITMException public JSONObject getComplianceDetails(String loginId,String dataSourceName,String period) throws RemoteException, ITMException
...@@ -33,28 +29,29 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia ...@@ -33,28 +29,29 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
try try
{ {
System.out.println(" Inside ComplianceEJB for getComplianceDetails Data Soruc Name ="+dataSourceName+" loginId=:"+ loginId+"---- month=:"+ period); System.out.println(" Inside ComplianceEJB for getComplianceDetails Data Soruc Namem 11 ="+dataSourceName+" loginId=:"+ loginId+"---- month=:"+ period);
conn = connDriver.getConnectDB(dataSourceName); /*conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null; */
/*add new code for connection DB on dated:17062016 by Nikhil*/
conn = getConnection();
/* sql = " Select FHCODE , FHNAME, FHDESG, NSMCODE, NSMNAME, NSMDESG, SMCODE," + /*old test sql*/
sql = " Select FHCODE , FHNAME, FHDESG, NSMCODE, NSMNAME, NSMDESG, SMCODE," +
" SMNAME, SMDESG, RSECODE, RSENAME, RSEDESG, REPCODE, " + " SMNAME, SMDESG, RSECODE, RSENAME, RSEDESG, REPCODE, " +
" REPNAME, REPDESG, REP_NONREP,CNT " + " REPNAME, REPDESG, REP_NONREP,CNT " +
" FROM Temp_SALES_HIER_JJ_CNT ORDER BY fhcode , nsmcode ,smcode,rsecode, repcode"; " FROM Temp_SALES_HIER_JJ_CNT ORDER BY fhcode , nsmcode ,smcode,rsecode, repcode";
*/
sql = " SELECT FHCODE ,FHNAME ,FHDESG ,NSMCODE ,NSMNAME ,NSMDESG ,SMCODE ,SMNAME ,SMDESG ,RSECODE ,RSENAME ,RSEDESG ,REPCODE ,REPNAME ,REPDESG ,REP_NONREP , COUNT(*) CNT FROM (SELECT DISTINCT FHCODE ,FHNAME ,FHDESG ,NSMCODE ,NSMNAME ,NSMDESG ,SMCODE ,SMNAME ,SMDESG ,RSECODE ,RSENAME ,RSEDESG ,REPCODE ,REPNAME ,REPDESG ,AVAILABLE_DY ,ACTIVITY_CODE ,REP_NONREP ,CUSTOMER_NAME FROM ( SELECT FHCODE ,FHNAME ,FHDESG ,NSMCODE ,NSMNAME ,NSMDESG ,SMCODE ,SMNAME ,SMDESG ,RSECODE ,RSENAME ,RSEDESG ,REPCODE ,REPNAME ,REPDESG ,SALES_PERS_AV.AVAILABLE_DY ,SPRS_ACT_TRAN.ACTIVITY_CODE ,( CASE WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) = 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN 'R' WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) <> 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN '-' ELSE 'NR' END ) AS REP_NONREP ,NVL(STRG_CUSTOMER.FIRST_NAME, '') || NVL(STRG_CUSTOMER.MIDDLE_NAME, '') || NVL(STRG_CUSTOMER.LAST_NAME, '') AS CUSTOMER_NAME FROM ( SELECT VW_SALES_HIER_JJ.REPCODE AS SALESPERS ,AV_DATES.available_dy AS AVAILABLE_DY FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ ) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a FROM sfa_time WHERE dt BETWEEN trunc(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'MM') AND trunc(last_day(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'))) ) AV_DATES WHERE VW_SALES_HIER_JJ.a = AV_DATES.a MINUS SELECT EMPLOYEE.EMP_CODE AS SALESPERS ,holiday.hol_date AS AVAILABLE_DY FROM holiday ,EMPLOYEE WHERE holiday.hol_tblno = EMPLOYEE.hol_tblno AND holiday.hol_date BETWEEN trunc(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'MM') AND trunc(last_day(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'))) AND NOT EXISTS ( SELECT * FROM sprs_act_tran s WHERE s.sales_pers = employee.emp_code AND s.event_date = holiday.hol_date ) ) SALES_PERS_AV LEFT OUTER JOIN ( SELECT S.* FROM SPRS_ACT_TRAN S WHERE S.ACTIVITY_CODE <> 'PR' AND S.CONFIRMED = 'Y' ) SPRS_ACT_TRAN ON SPRS_ACT_TRAN.SALES_PERS = SALES_PERS_AV.SALESPERS AND SPRS_ACT_TRAN.EVENT_DATE = SALES_PERS_AV.AVAILABLE_DY LEFT OUTER JOIN ( SELECT S.* FROM STRG_MEET S WHERE S.EVENT_TYPE <> 'PR' ) STRG_MEET ON SPRS_ACT_TRAN.SALES_PERS = STRG_MEET.SALES_PERS AND SPRS_ACT_TRAN.EVENT_DATE = STRG_MEET.EVENT_DATE AND SPRS_ACT_TRAN.DCR_ID = STRG_MEET.DCR_ID LEFT OUTER JOIN STRG_CUSTOMER ON STRG_MEET.STRG_CODE = STRG_CUSTOMER.SC_CODE ,VW_SALES_HIER_JJ WHERE SALES_PERS_AV.SALESPERS = VW_SALES_HIER_JJ.REPCODE AND VW_SALES_HIER_JJ.FHCODE = '"+loginId+"' " +
/*sql = " SELECT FHCODE ,FHNAME ,FHDESG ,NSMCODE ,NSMNAME ,NSMDESG ,SMCODE ,SMNAME ,SMDESG ,RSECODE ,RSENAME ,RSEDESG ,REPCODE ,REPNAME ,REPDESG ,REP_NONREP , COUNT(*) CNT FROM (SELECT DISTINCT FHCODE ,FHNAME ,FHDESG ,NSMCODE ,NSMNAME ,NSMDESG ,SMCODE ,SMNAME ,SMDESG ,RSECODE ,RSENAME ,RSEDESG ,REPCODE ,REPNAME ,REPDESG ,AVAILABLE_DY ,ACTIVITY_CODE ,REP_NONREP ,CUSTOMER_NAME FROM ( SELECT FHCODE ,FHNAME ,FHDESG ,NSMCODE ,NSMNAME ,NSMDESG ,SMCODE ,SMNAME ,SMDESG ,RSECODE ,RSENAME ,RSEDESG ,REPCODE ,REPNAME ,REPDESG ,SALES_PERS_AV.AVAILABLE_DY ,SPRS_ACT_TRAN.ACTIVITY_CODE ,( CASE WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) = 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN 'R' WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) <> 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN '-' ELSE 'NR' END ) AS REP_NONREP ,NVL(STRG_CUSTOMER.FIRST_NAME, '') || NVL(STRG_CUSTOMER.MIDDLE_NAME, '') || NVL(STRG_CUSTOMER.LAST_NAME, '') AS CUSTOMER_NAME FROM ( SELECT VW_SALES_HIER_JJ.REPCODE AS SALESPERS ,AV_DATES.available_dy AS AVAILABLE_DY FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ ) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a FROM sfa_time WHERE dt BETWEEN trunc(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'MM') AND trunc(last_day(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'))) ) AV_DATES WHERE VW_SALES_HIER_JJ.a = AV_DATES.a MINUS SELECT EMPLOYEE.EMP_CODE AS SALESPERS ,holiday.hol_date AS AVAILABLE_DY FROM holiday ,EMPLOYEE WHERE holiday.hol_tblno = EMPLOYEE.hol_tblno AND holiday.hol_date BETWEEN trunc(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'MM') AND trunc(last_day(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'))) AND NOT EXISTS ( SELECT * FROM sprs_act_tran s WHERE s.sales_pers = employee.emp_code AND s.event_date = holiday.hol_date ) ) SALES_PERS_AV LEFT OUTER JOIN ( SELECT S.* FROM SPRS_ACT_TRAN S WHERE S.ACTIVITY_CODE <> 'PR' AND S.CONFIRMED = 'Y' ) SPRS_ACT_TRAN ON SPRS_ACT_TRAN.SALES_PERS = SALES_PERS_AV.SALESPERS AND SPRS_ACT_TRAN.EVENT_DATE = SALES_PERS_AV.AVAILABLE_DY LEFT OUTER JOIN ( SELECT S.* FROM STRG_MEET S WHERE S.EVENT_TYPE <> 'PR' ) STRG_MEET ON SPRS_ACT_TRAN.SALES_PERS = STRG_MEET.SALES_PERS AND SPRS_ACT_TRAN.EVENT_DATE = STRG_MEET.EVENT_DATE AND SPRS_ACT_TRAN.DCR_ID = STRG_MEET.DCR_ID LEFT OUTER JOIN STRG_CUSTOMER ON STRG_MEET.STRG_CODE = STRG_CUSTOMER.SC_CODE ,VW_SALES_HIER_JJ WHERE SALES_PERS_AV.SALESPERS = VW_SALES_HIER_JJ.REPCODE AND VW_SALES_HIER_JJ.FHCODE = '"+loginId+"' " +
" union all SELECT '' AS FHCODE ,'' AS FHNAME ,'' AS FHDESG ,NSMCODE ,NSMNAME ,NSMDESG ,SMCODE ,SMNAME ,SMDESG ,RSECODE ,RSENAME ,RSEDESG ,REPCODE ,REPNAME ,REPDESG ,SALES_PERS_AV.AVAILABLE_DY ,SPRS_ACT_TRAN.ACTIVITY_CODE ,( CASE WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) = 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN 'R' WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) <> 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN '-' ELSE 'NR' END ) AS REP_NONREP ,NVL(STRG_CUSTOMER.FIRST_NAME, '') || NVL(STRG_CUSTOMER.MIDDLE_NAME, '') || NVL(STRG_CUSTOMER.LAST_NAME, '') AS CUSTOMER_NAME FROM ( SELECT VW_SALES_HIER_JJ.REPCODE AS SALESPERS ,AV_DATES.available_dy AS AVAILABLE_DY FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ ) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a FROM sfa_time WHERE dt BETWEEN trunc(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'MM') AND trunc(last_day(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'))) ) AV_DATES WHERE VW_SALES_HIER_JJ.a = AV_DATES.a MINUS SELECT EMPLOYEE.EMP_CODE AS SALESPERS ,holiday.hol_date AS AVAILABLE_DY FROM holiday ,EMPLOYEE WHERE holiday.hol_tblno = EMPLOYEE.hol_tblno AND holiday.hol_date BETWEEN trunc(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'MM') AND trunc(last_day(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'))) AND NOT EXISTS ( SELECT * FROM sprs_act_tran s WHERE s.sales_pers = employee.emp_code AND s.event_date = holiday.hol_date ) ) SALES_PERS_AV LEFT OUTER JOIN ( SELECT S.* FROM SPRS_ACT_TRAN S WHERE S.ACTIVITY_CODE <> 'PR' AND S.CONFIRMED = 'Y' ) SPRS_ACT_TRAN ON SPRS_ACT_TRAN.SALES_PERS = SALES_PERS_AV.SALESPERS AND SPRS_ACT_TRAN.EVENT_DATE = SALES_PERS_AV.AVAILABLE_DY LEFT OUTER JOIN ( SELECT S.* FROM STRG_MEET S WHERE S.EVENT_TYPE <> 'PR' ) STRG_MEET ON SPRS_ACT_TRAN.SALES_PERS = STRG_MEET.SALES_PERS AND SPRS_ACT_TRAN.EVENT_DATE = STRG_MEET.EVENT_DATE AND SPRS_ACT_TRAN.DCR_ID = STRG_MEET.DCR_ID LEFT OUTER JOIN STRG_CUSTOMER ON STRG_MEET.STRG_CODE = STRG_CUSTOMER.SC_CODE ,VW_SALES_HIER_JJ WHERE SALES_PERS_AV.SALESPERS = VW_SALES_HIER_JJ.REPCODE AND VW_SALES_HIER_JJ.NSMCODE = '"+loginId+"' " + " union all SELECT '' AS FHCODE ,'' AS FHNAME ,'' AS FHDESG ,NSMCODE ,NSMNAME ,NSMDESG ,SMCODE ,SMNAME ,SMDESG ,RSECODE ,RSENAME ,RSEDESG ,REPCODE ,REPNAME ,REPDESG ,SALES_PERS_AV.AVAILABLE_DY ,SPRS_ACT_TRAN.ACTIVITY_CODE ,( CASE WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) = 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN 'R' WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) <> 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN '-' ELSE 'NR' END ) AS REP_NONREP ,NVL(STRG_CUSTOMER.FIRST_NAME, '') || NVL(STRG_CUSTOMER.MIDDLE_NAME, '') || NVL(STRG_CUSTOMER.LAST_NAME, '') AS CUSTOMER_NAME FROM ( SELECT VW_SALES_HIER_JJ.REPCODE AS SALESPERS ,AV_DATES.available_dy AS AVAILABLE_DY FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ ) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a FROM sfa_time WHERE dt BETWEEN trunc(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'MM') AND trunc(last_day(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'))) ) AV_DATES WHERE VW_SALES_HIER_JJ.a = AV_DATES.a MINUS SELECT EMPLOYEE.EMP_CODE AS SALESPERS ,holiday.hol_date AS AVAILABLE_DY FROM holiday ,EMPLOYEE WHERE holiday.hol_tblno = EMPLOYEE.hol_tblno AND holiday.hol_date BETWEEN trunc(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'MM') AND trunc(last_day(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'))) AND NOT EXISTS ( SELECT * FROM sprs_act_tran s WHERE s.sales_pers = employee.emp_code AND s.event_date = holiday.hol_date ) ) SALES_PERS_AV LEFT OUTER JOIN ( SELECT S.* FROM SPRS_ACT_TRAN S WHERE S.ACTIVITY_CODE <> 'PR' AND S.CONFIRMED = 'Y' ) SPRS_ACT_TRAN ON SPRS_ACT_TRAN.SALES_PERS = SALES_PERS_AV.SALESPERS AND SPRS_ACT_TRAN.EVENT_DATE = SALES_PERS_AV.AVAILABLE_DY LEFT OUTER JOIN ( SELECT S.* FROM STRG_MEET S WHERE S.EVENT_TYPE <> 'PR' ) STRG_MEET ON SPRS_ACT_TRAN.SALES_PERS = STRG_MEET.SALES_PERS AND SPRS_ACT_TRAN.EVENT_DATE = STRG_MEET.EVENT_DATE AND SPRS_ACT_TRAN.DCR_ID = STRG_MEET.DCR_ID LEFT OUTER JOIN STRG_CUSTOMER ON STRG_MEET.STRG_CODE = STRG_CUSTOMER.SC_CODE ,VW_SALES_HIER_JJ WHERE SALES_PERS_AV.SALESPERS = VW_SALES_HIER_JJ.REPCODE AND VW_SALES_HIER_JJ.NSMCODE = '"+loginId+"' " +
" union all SELECT '' AS FHCODE ,'' AS FHNAME ,'' AS FHDESG ,'' AS NSMCODE ,'' AS NSMNAME ,'' AS NSMDESG ,SMCODE ,SMNAME ,SMDESG ,RSECODE ,RSENAME ,RSEDESG ,REPCODE ,REPNAME ,REPDESG ,SALES_PERS_AV.AVAILABLE_DY ,SPRS_ACT_TRAN.ACTIVITY_CODE ,( CASE WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) = 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN 'R' WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) <> 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN '-' ELSE 'NR' END ) AS REP_NONREP ,NVL(STRG_CUSTOMER.FIRST_NAME, '') || NVL(STRG_CUSTOMER.MIDDLE_NAME, '') || NVL(STRG_CUSTOMER.LAST_NAME, '') AS CUSTOMER_NAME FROM ( SELECT VW_SALES_HIER_JJ.REPCODE AS SALESPERS ,AV_DATES.available_dy AS AVAILABLE_DY FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ ) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a FROM sfa_time WHERE dt BETWEEN trunc(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'MM') AND trunc(last_day(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'))) ) AV_DATES WHERE VW_SALES_HIER_JJ.a = AV_DATES.a MINUS SELECT EMPLOYEE.EMP_CODE AS SALESPERS ,holiday.hol_date AS AVAILABLE_DY FROM holiday ,EMPLOYEE WHERE holiday.hol_tblno = EMPLOYEE.hol_tblno AND holiday.hol_date BETWEEN trunc(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'MM') AND trunc(last_day(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'))) AND NOT EXISTS ( SELECT * FROM sprs_act_tran s WHERE s.sales_pers = employee.emp_code AND s.event_date = holiday.hol_date ) ) SALES_PERS_AV LEFT OUTER JOIN ( SELECT S.* FROM SPRS_ACT_TRAN S WHERE S.ACTIVITY_CODE <> 'PR' AND S.CONFIRMED = 'Y' ) SPRS_ACT_TRAN ON SPRS_ACT_TRAN.SALES_PERS = SALES_PERS_AV.SALESPERS AND SPRS_ACT_TRAN.EVENT_DATE = SALES_PERS_AV.AVAILABLE_DY LEFT OUTER JOIN ( SELECT S.* FROM STRG_MEET S WHERE S.EVENT_TYPE <> 'PR' ) STRG_MEET ON SPRS_ACT_TRAN.SALES_PERS = STRG_MEET.SALES_PERS AND SPRS_ACT_TRAN.EVENT_DATE = STRG_MEET.EVENT_DATE AND SPRS_ACT_TRAN.DCR_ID = STRG_MEET.DCR_ID LEFT OUTER JOIN STRG_CUSTOMER ON STRG_MEET.STRG_CODE = STRG_CUSTOMER.SC_CODE ,VW_SALES_HIER_JJ WHERE SALES_PERS_AV.SALESPERS = VW_SALES_HIER_JJ.REPCODE AND VW_SALES_HIER_JJ.SMCODE = '"+loginId+"' " + " union all SELECT '' AS FHCODE ,'' AS FHNAME ,'' AS FHDESG ,'' AS NSMCODE ,'' AS NSMNAME ,'' AS NSMDESG ,SMCODE ,SMNAME ,SMDESG ,RSECODE ,RSENAME ,RSEDESG ,REPCODE ,REPNAME ,REPDESG ,SALES_PERS_AV.AVAILABLE_DY ,SPRS_ACT_TRAN.ACTIVITY_CODE ,( CASE WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) = 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN 'R' WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) <> 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN '-' ELSE 'NR' END ) AS REP_NONREP ,NVL(STRG_CUSTOMER.FIRST_NAME, '') || NVL(STRG_CUSTOMER.MIDDLE_NAME, '') || NVL(STRG_CUSTOMER.LAST_NAME, '') AS CUSTOMER_NAME FROM ( SELECT VW_SALES_HIER_JJ.REPCODE AS SALESPERS ,AV_DATES.available_dy AS AVAILABLE_DY FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ ) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a FROM sfa_time WHERE dt BETWEEN trunc(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'MM') AND trunc(last_day(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'))) ) AV_DATES WHERE VW_SALES_HIER_JJ.a = AV_DATES.a MINUS SELECT EMPLOYEE.EMP_CODE AS SALESPERS ,holiday.hol_date AS AVAILABLE_DY FROM holiday ,EMPLOYEE WHERE holiday.hol_tblno = EMPLOYEE.hol_tblno AND holiday.hol_date BETWEEN trunc(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'MM') AND trunc(last_day(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'))) AND NOT EXISTS ( SELECT * FROM sprs_act_tran s WHERE s.sales_pers = employee.emp_code AND s.event_date = holiday.hol_date ) ) SALES_PERS_AV LEFT OUTER JOIN ( SELECT S.* FROM SPRS_ACT_TRAN S WHERE S.ACTIVITY_CODE <> 'PR' AND S.CONFIRMED = 'Y' ) SPRS_ACT_TRAN ON SPRS_ACT_TRAN.SALES_PERS = SALES_PERS_AV.SALESPERS AND SPRS_ACT_TRAN.EVENT_DATE = SALES_PERS_AV.AVAILABLE_DY LEFT OUTER JOIN ( SELECT S.* FROM STRG_MEET S WHERE S.EVENT_TYPE <> 'PR' ) STRG_MEET ON SPRS_ACT_TRAN.SALES_PERS = STRG_MEET.SALES_PERS AND SPRS_ACT_TRAN.EVENT_DATE = STRG_MEET.EVENT_DATE AND SPRS_ACT_TRAN.DCR_ID = STRG_MEET.DCR_ID LEFT OUTER JOIN STRG_CUSTOMER ON STRG_MEET.STRG_CODE = STRG_CUSTOMER.SC_CODE ,VW_SALES_HIER_JJ WHERE SALES_PERS_AV.SALESPERS = VW_SALES_HIER_JJ.REPCODE AND VW_SALES_HIER_JJ.SMCODE = '"+loginId+"' " +
" union all SELECT '' AS FHCODE ,'' AS FHNAME ,'' AS FHDESG ,'' AS NSMCODE ,'' AS NSMNAME ,'' AS NSMDESG ,'' AS SMCODE ,'' AS SMNAME ,'' AS SMDESG ,RSECODE ,RSENAME ,RSEDESG ,REPCODE ,REPNAME ,REPDESG ,SALES_PERS_AV.AVAILABLE_DY ,SPRS_ACT_TRAN.ACTIVITY_CODE ,( CASE WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) = 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN 'R' WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) <> 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN '-' ELSE 'NR' END ) AS REP_NONREP ,NVL(STRG_CUSTOMER.FIRST_NAME, '') || NVL(STRG_CUSTOMER.MIDDLE_NAME, '') || NVL(STRG_CUSTOMER.LAST_NAME, '') AS CUSTOMER_NAME FROM ( SELECT VW_SALES_HIER_JJ.REPCODE AS SALESPERS ,AV_DATES.available_dy AS AVAILABLE_DY FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ ) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a FROM sfa_time WHERE dt BETWEEN trunc(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'MM') AND trunc(last_day(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'))) ) AV_DATES WHERE VW_SALES_HIER_JJ.a = AV_DATES.a MINUS SELECT EMPLOYEE.EMP_CODE AS SALESPERS ,holiday.hol_date AS AVAILABLE_DY FROM holiday ,EMPLOYEE WHERE holiday.hol_tblno = EMPLOYEE.hol_tblno AND holiday.hol_date BETWEEN trunc(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'MM') AND trunc(last_day(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'))) AND NOT EXISTS ( SELECT * FROM sprs_act_tran s WHERE s.sales_pers = employee.emp_code AND s.event_date = holiday.hol_date ) ) SALES_PERS_AV LEFT OUTER JOIN ( SELECT S.* FROM SPRS_ACT_TRAN S WHERE S.ACTIVITY_CODE <> 'PR' AND S.CONFIRMED = 'Y' ) SPRS_ACT_TRAN ON SPRS_ACT_TRAN.SALES_PERS = SALES_PERS_AV.SALESPERS AND SPRS_ACT_TRAN.EVENT_DATE = SALES_PERS_AV.AVAILABLE_DY LEFT OUTER JOIN ( SELECT S.* FROM STRG_MEET S WHERE S.EVENT_TYPE <> 'PR' ) STRG_MEET ON SPRS_ACT_TRAN.SALES_PERS = STRG_MEET.SALES_PERS AND SPRS_ACT_TRAN.EVENT_DATE = STRG_MEET.EVENT_DATE AND SPRS_ACT_TRAN.DCR_ID = STRG_MEET.DCR_ID LEFT OUTER JOIN STRG_CUSTOMER ON STRG_MEET.STRG_CODE = STRG_CUSTOMER.SC_CODE ,VW_SALES_HIER_JJ WHERE SALES_PERS_AV.SALESPERS = VW_SALES_HIER_JJ.REPCODE AND VW_SALES_HIER_JJ.RSECODE = '"+loginId+"' " + " union all SELECT '' AS FHCODE ,'' AS FHNAME ,'' AS FHDESG ,'' AS NSMCODE ,'' AS NSMNAME ,'' AS NSMDESG ,'' AS SMCODE ,'' AS SMNAME ,'' AS SMDESG ,RSECODE ,RSENAME ,RSEDESG ,REPCODE ,REPNAME ,REPDESG ,SALES_PERS_AV.AVAILABLE_DY ,SPRS_ACT_TRAN.ACTIVITY_CODE ,( CASE WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) = 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN 'R' WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) <> 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN '-' ELSE 'NR' END ) AS REP_NONREP ,NVL(STRG_CUSTOMER.FIRST_NAME, '') || NVL(STRG_CUSTOMER.MIDDLE_NAME, '') || NVL(STRG_CUSTOMER.LAST_NAME, '') AS CUSTOMER_NAME FROM ( SELECT VW_SALES_HIER_JJ.REPCODE AS SALESPERS ,AV_DATES.available_dy AS AVAILABLE_DY FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ ) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a FROM sfa_time WHERE dt BETWEEN trunc(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'MM') AND trunc(last_day(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'))) ) AV_DATES WHERE VW_SALES_HIER_JJ.a = AV_DATES.a MINUS SELECT EMPLOYEE.EMP_CODE AS SALESPERS ,holiday.hol_date AS AVAILABLE_DY FROM holiday ,EMPLOYEE WHERE holiday.hol_tblno = EMPLOYEE.hol_tblno AND holiday.hol_date BETWEEN trunc(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'MM') AND trunc(last_day(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'))) AND NOT EXISTS ( SELECT * FROM sprs_act_tran s WHERE s.sales_pers = employee.emp_code AND s.event_date = holiday.hol_date ) ) SALES_PERS_AV LEFT OUTER JOIN ( SELECT S.* FROM SPRS_ACT_TRAN S WHERE S.ACTIVITY_CODE <> 'PR' AND S.CONFIRMED = 'Y' ) SPRS_ACT_TRAN ON SPRS_ACT_TRAN.SALES_PERS = SALES_PERS_AV.SALESPERS AND SPRS_ACT_TRAN.EVENT_DATE = SALES_PERS_AV.AVAILABLE_DY LEFT OUTER JOIN ( SELECT S.* FROM STRG_MEET S WHERE S.EVENT_TYPE <> 'PR' ) STRG_MEET ON SPRS_ACT_TRAN.SALES_PERS = STRG_MEET.SALES_PERS AND SPRS_ACT_TRAN.EVENT_DATE = STRG_MEET.EVENT_DATE AND SPRS_ACT_TRAN.DCR_ID = STRG_MEET.DCR_ID LEFT OUTER JOIN STRG_CUSTOMER ON STRG_MEET.STRG_CODE = STRG_CUSTOMER.SC_CODE ,VW_SALES_HIER_JJ WHERE SALES_PERS_AV.SALESPERS = VW_SALES_HIER_JJ.REPCODE AND VW_SALES_HIER_JJ.RSECODE = '"+loginId+"' " +
" UNION ALL SELECT '' AS FHCODE ,'' AS FHNAME ,'' AS FHDESG ,'' AS NSMCODE ,'' AS NSMNAME ,'' AS NSMDESG ,'' AS SMCODE ,'' AS SMNAME ,'' AS SMDESG ,'' AS RSECODE ,'' AS RSENAME ,'' AS RSEDESG ,REPCODE ,REPNAME ,REPDESG ,SALES_PERS_AV.AVAILABLE_DY ,SPRS_ACT_TRAN.ACTIVITY_CODE ,( CASE WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) = 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN 'R' WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) <> 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN '-' ELSE 'NR' END ) AS REP_NONREP ,NVL(STRG_CUSTOMER.FIRST_NAME, '') || NVL(STRG_CUSTOMER.MIDDLE_NAME, '') || NVL(STRG_CUSTOMER.LAST_NAME, '') AS CUSTOMER_NAME FROM ( SELECT VW_SALES_HIER_JJ.REPCODE AS SALESPERS ,AV_DATES.available_dy AS AVAILABLE_DY FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ ) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a FROM sfa_time WHERE dt BETWEEN trunc(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'MM') AND trunc(last_day(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'))) ) AV_DATES WHERE VW_SALES_HIER_JJ.a = AV_DATES.a MINUS SELECT EMPLOYEE.EMP_CODE AS SALESPERS ,holiday.hol_date AS AVAILABLE_DY FROM holiday ,EMPLOYEE WHERE holiday.hol_tblno = EMPLOYEE.hol_tblno AND holiday.hol_date BETWEEN trunc(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'MM') AND trunc(last_day(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'))) AND NOT EXISTS ( SELECT * FROM sprs_act_tran s WHERE s.sales_pers = employee.emp_code AND s.event_date = holiday.hol_date ) ) SALES_PERS_AV LEFT OUTER JOIN ( SELECT S.* FROM SPRS_ACT_TRAN S WHERE S.ACTIVITY_CODE <> 'PR' AND S.CONFIRMED = 'Y' ) SPRS_ACT_TRAN ON SPRS_ACT_TRAN.SALES_PERS = SALES_PERS_AV.SALESPERS AND SPRS_ACT_TRAN.EVENT_DATE = SALES_PERS_AV.AVAILABLE_DY LEFT OUTER JOIN ( SELECT S.* FROM STRG_MEET S WHERE S.EVENT_TYPE <> 'PR' ) STRG_MEET ON SPRS_ACT_TRAN.SALES_PERS = STRG_MEET.SALES_PERS AND SPRS_ACT_TRAN.EVENT_DATE = STRG_MEET.EVENT_DATE AND SPRS_ACT_TRAN.DCR_ID = STRG_MEET.DCR_ID LEFT OUTER JOIN STRG_CUSTOMER ON STRG_MEET.STRG_CODE = STRG_CUSTOMER.SC_CODE ,VW_SALES_HIER_JJ WHERE SALES_PERS_AV.SALESPERS = VW_SALES_HIER_JJ.REPCODE AND VW_SALES_HIER_JJ.REPCODE = '"+loginId+"' ) where REP_NONREP <> '-') " + " UNION ALL SELECT '' AS FHCODE ,'' AS FHNAME ,'' AS FHDESG ,'' AS NSMCODE ,'' AS NSMNAME ,'' AS NSMDESG ,'' AS SMCODE ,'' AS SMNAME ,'' AS SMDESG ,'' AS RSECODE ,'' AS RSENAME ,'' AS RSEDESG ,REPCODE ,REPNAME ,REPDESG ,SALES_PERS_AV.AVAILABLE_DY ,SPRS_ACT_TRAN.ACTIVITY_CODE ,( CASE WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) = 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN 'R' WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) <> 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN '-' ELSE 'NR' END ) AS REP_NONREP ,NVL(STRG_CUSTOMER.FIRST_NAME, '') || NVL(STRG_CUSTOMER.MIDDLE_NAME, '') || NVL(STRG_CUSTOMER.LAST_NAME, '') AS CUSTOMER_NAME FROM ( SELECT VW_SALES_HIER_JJ.REPCODE AS SALESPERS ,AV_DATES.available_dy AS AVAILABLE_DY FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ ) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a FROM sfa_time WHERE dt BETWEEN trunc(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'MM') AND trunc(last_day(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'))) ) AV_DATES WHERE VW_SALES_HIER_JJ.a = AV_DATES.a MINUS SELECT EMPLOYEE.EMP_CODE AS SALESPERS ,holiday.hol_date AS AVAILABLE_DY FROM holiday ,EMPLOYEE WHERE holiday.hol_tblno = EMPLOYEE.hol_tblno AND holiday.hol_date BETWEEN trunc(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'MM') AND trunc(last_day(TO_DATE(to_char(TO_DATE('01-' || SUBSTR('"+period+"', 5, 6) || '-' || SUBSTR('"+period+"', 1, 4), 'DD-MM-YYYY'), 'DD-MM-YYYY'), 'DD-MM-YYYY'))) AND NOT EXISTS ( SELECT * FROM sprs_act_tran s WHERE s.sales_pers = employee.emp_code AND s.event_date = holiday.hol_date ) ) SALES_PERS_AV LEFT OUTER JOIN ( SELECT S.* FROM SPRS_ACT_TRAN S WHERE S.ACTIVITY_CODE <> 'PR' AND S.CONFIRMED = 'Y' ) SPRS_ACT_TRAN ON SPRS_ACT_TRAN.SALES_PERS = SALES_PERS_AV.SALESPERS AND SPRS_ACT_TRAN.EVENT_DATE = SALES_PERS_AV.AVAILABLE_DY LEFT OUTER JOIN ( SELECT S.* FROM STRG_MEET S WHERE S.EVENT_TYPE <> 'PR' ) STRG_MEET ON SPRS_ACT_TRAN.SALES_PERS = STRG_MEET.SALES_PERS AND SPRS_ACT_TRAN.EVENT_DATE = STRG_MEET.EVENT_DATE AND SPRS_ACT_TRAN.DCR_ID = STRG_MEET.DCR_ID LEFT OUTER JOIN STRG_CUSTOMER ON STRG_MEET.STRG_CODE = STRG_CUSTOMER.SC_CODE ,VW_SALES_HIER_JJ WHERE SALES_PERS_AV.SALESPERS = VW_SALES_HIER_JJ.REPCODE AND VW_SALES_HIER_JJ.REPCODE = '"+loginId+"' ) where REP_NONREP <> '-') " +
" GROUP BY FHCODE ,FHNAME ,FHDESG ,NSMCODE ,NSMNAME ,NSMDESG ,SMCODE ,SMNAME ,SMDESG ,RSECODE ,RSENAME ,RSEDESG ,REPCODE ,REPNAME ,REPDESG ,REP_NONREP " + " GROUP BY FHCODE ,FHNAME ,FHDESG ,NSMCODE ,NSMNAME ,NSMDESG ,SMCODE ,SMNAME ,SMDESG ,RSECODE ,RSENAME ,RSEDESG ,REPCODE ,REPNAME ,REPDESG ,REP_NONREP " +
" ORDER BY FHCODE ,NSMCODE ,SMCODE ,RSECODE ,REPCODE "; " ORDER BY FHCODE ,NSMCODE ,SMCODE ,RSECODE ,REPCODE ";
*/
...@@ -65,23 +62,28 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia ...@@ -65,23 +62,28 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia
{ {
rowData = new JSONObject(); rowData = new JSONObject();
//rowData.put("fhcode", checkNull(rs.getString("FHCODE")).trim()); rowData.put("fhcode", checkNull(rs.getString("FHCODE")).trim());
rowData.put("fhname", checkNull(rs.getString("FHNAME")).trim()); rowData.put("fhname", checkNull(rs.getString("FHNAME")).trim());
rowData.put("fhdesg", checkNull(rs.getString("FHDESG")).trim()); rowData.put("fhdesg", checkNull(rs.getString("FHDESG")).trim());
//rowData.put("nsmcode", checkNull(rs.getString("NSMCODE")).trim()); rowData.put("nsmcode", checkNull(rs.getString("NSMCODE")).trim());
rowData.put("nsmname", checkNull(rs.getString("NSMNAME")).trim()); rowData.put("nsmname", checkNull(rs.getString("NSMNAME")).trim());
rowData.put("nsmdesg", checkNull(rs.getString("NSMDESG")).trim()); rowData.put("nsmdesg", checkNull(rs.getString("NSMDESG")).trim());
//rowData.put("smcode", checkNull(rs.getString("SMCODE")).trim()); rowData.put("smcode", checkNull(rs.getString("SMCODE")).trim());
rowData.put("smname", checkNull(rs.getString("SMNAME")).trim()); rowData.put("smname", checkNull(rs.getString("SMNAME")).trim());
rowData.put("smdesg", checkNull(rs.getString("SMDESG")).trim()); rowData.put("smdesg", checkNull(rs.getString("SMDESG")).trim());
//rowData.put("rsecode", checkNull(rs.getString("RSECODE")).trim()); rowData.put("rsecode", checkNull(rs.getString("RSECODE")).trim());
rowData.put("rsename", checkNull(rs.getString("RSENAME")).trim()); rowData.put("rsename", checkNull(rs.getString("RSENAME")).trim());
rowData.put("rsedesg", checkNull(rs.getString("RSEDESG")).trim()); rowData.put("rsedesg", checkNull(rs.getString("RSEDESG")).trim());
//rowData.put("repcode", checkNull(rs.getString("REPCODE")).trim()); rowData.put("repcode", checkNull(rs.getString("REPCODE")).trim());
rowData.put("repname", checkNull(rs.getString("REPNAME")).trim()); rowData.put("repname", checkNull(rs.getString("REPNAME")).trim());
rowData.put("repdesg", checkNull(rs.getString("REPDESG")).trim()); rowData.put("repdesg", checkNull(rs.getString("REPDESG")).trim());
...@@ -136,12 +138,13 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia ...@@ -136,12 +138,13 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
try try
{ {
System.out.println(" Inside ComplianceEJB for getComplianceCustDetails Data Soruc Name ="+dataSourceName+" firstVal=:"+ firstVal + "===cellVal :"+ cellVal); System.out.println(" Inside ComplianceEJB for getComplianceCustDetails Data Soruc Name ="+dataSourceName+" firstVal=:"+ firstVal + "===cellVal :"+ cellVal);
conn = connDriver.getConnectDB(dataSourceName); /*conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;*/
/*add new code for connection DB on dated:15062016 by Nikhil*/
conn = getConnection();
SimpleDateFormat gridDateFormat = new SimpleDateFormat( "dd-MMM-yy"); SimpleDateFormat gridDateFormat = new SimpleDateFormat( "dd-MMM-yy");
SimpleDateFormat convrtToTimStmDate= new SimpleDateFormat("dd/MM/yy"); SimpleDateFormat convrtToTimStmDate= new SimpleDateFormat("dd/MM/yy");
if(cellVal!=null && cellVal.length()>0) if(cellVal!=null && cellVal.length()>0)
...@@ -150,12 +153,12 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia ...@@ -150,12 +153,12 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia
} }
System.out.println("cellVal :"+cellVal); System.out.println("cellVal :"+cellVal);
//sql = "Select 'DH' as STRG_TYPE, 'Dhanendra' as CUST_NAME from Dual"; sql = "Select 'DH' as STRG_TYPE, 'Dhanendra' as CUST_NAME from Dual";
sql="SELECT SM.STRG_TYPE, (SC.FIRST_NAME ||' '||SC.MIDDLE_NAME ||' '||SC.LAST_NAME) AS CUST_NAME FROM STRG_MEET SM " + /*sql="SELECT SM.STRG_TYPE, (SC.FIRST_NAME ||' '||SC.MIDDLE_NAME ||' '||SC.LAST_NAME) AS CUST_NAME FROM STRG_MEET SM " +
"INNER JOIN STRG_CUSTOMER SC ON SM.STRG_CODE = SC.SC_CODE INNER JOIN VW_SALES_HIER_JJ VW ON SM.SALES_PERS = VW.REPCODE " + "INNER JOIN STRG_CUSTOMER SC ON SM.STRG_CODE = SC.SC_CODE INNER JOIN VW_SALES_HIER_JJ VW ON SM.SALES_PERS = VW.REPCODE " +
"WHERE SM.EVENT_DATE ='"+cellVal+"' AND VW.REPNAME = '"+firstVal.trim()+"' "; "WHERE SM.EVENT_DATE ='"+cellVal+"' AND VW.REPNAME = '"+firstVal.trim()+"' ";
*/
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
int count = 0; int count = 0;
...@@ -213,16 +216,17 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia ...@@ -213,16 +216,17 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
try try
{ {
System.out.println(" Inside ComplianceEJB for getComplianceCustDetails Data Soruc Name ="+dataSourceName+" period=:"+ period + "=== personName :"+ personName); System.out.println(" Inside ComplianceEJB for getComplianceCustDetails Data Soruc Name ="+dataSourceName+" period=:"+ period + "=== personName :"+ personName);
conn = connDriver.getConnectDB(dataSourceName); /*conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;*/
/*add new code for connection DB on dated:15062016 by Nikhil*/
conn = getConnection();
//sql = "Select '01/10/2015' as AVAILABLE_DY, 'FW' as ACTIVITY_CODE from Dual"; sql = "Select '01/10/2015' as AVAILABLE_DY, 'FW' as ACTIVITY_CODE from Dual";
sql=" SELECT REPCODE ,REPNAME ,REPDESG ,REP_NONREP ,to_char(AVAILABLE_DY,'dd/mm/yy') AS AVAILABLE_DY ,ACTIVITY_CODE " + /*sql=" SELECT REPCODE ,REPNAME ,REPDESG ,REP_NONREP ,to_char(AVAILABLE_DY,'dd/mm/yy') AS AVAILABLE_DY ,ACTIVITY_CODE " +
" FROM( SELECT distinct REPCODE ,REPNAME ,REPDESG ,SALES_PERS_AV.AVAILABLE_DY ,SPRS_ACT_TRAN.ACTIVITY_CODE ," + " FROM( SELECT distinct REPCODE ,REPNAME ,REPDESG ,SALES_PERS_AV.AVAILABLE_DY ,SPRS_ACT_TRAN.ACTIVITY_CODE ," +
" ( CASE WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) = 1 " + " ( CASE WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) = 1 " +
" AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN 'R' WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY " + " AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN 'R' WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY " +
...@@ -240,7 +244,7 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia ...@@ -240,7 +244,7 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia
" AND SPRS_ACT_TRAN.EVENT_DATE = SALES_PERS_AV.AVAILABLE_DY LEFT OUTER JOIN ( SELECT S.* FROM STRG_MEET S WHERE S.EVENT_TYPE <> 'PR' ) STRG_MEET ON SPRS_ACT_TRAN.SALES_PERS = STRG_MEET.SALES_PERS " + " AND SPRS_ACT_TRAN.EVENT_DATE = SALES_PERS_AV.AVAILABLE_DY LEFT OUTER JOIN ( SELECT S.* FROM STRG_MEET S WHERE S.EVENT_TYPE <> 'PR' ) STRG_MEET ON SPRS_ACT_TRAN.SALES_PERS = STRG_MEET.SALES_PERS " +
" AND SPRS_ACT_TRAN.EVENT_DATE = STRG_MEET.EVENT_DATE AND SPRS_ACT_TRAN.DCR_ID = STRG_MEET.DCR_ID LEFT OUTER JOIN STRG_CUSTOMER ON STRG_MEET.STRG_CODE = STRG_CUSTOMER.SC_CODE ,VW_SALES_HIER_JJ " + " AND SPRS_ACT_TRAN.EVENT_DATE = STRG_MEET.EVENT_DATE AND SPRS_ACT_TRAN.DCR_ID = STRG_MEET.DCR_ID LEFT OUTER JOIN STRG_CUSTOMER ON STRG_MEET.STRG_CODE = STRG_CUSTOMER.SC_CODE ,VW_SALES_HIER_JJ " +
" WHERE SALES_PERS_AV.SALESPERS = VW_SALES_HIER_JJ.REPCODE AND UPPER(TRIM(VW_SALES_HIER_JJ.REPNAME)) = UPPER(TRIM('"+personName+"')) ) where REP_NONREP <> '-' " + " WHERE SALES_PERS_AV.SALESPERS = VW_SALES_HIER_JJ.REPCODE AND UPPER(TRIM(VW_SALES_HIER_JJ.REPNAME)) = UPPER(TRIM('"+personName+"')) ) where REP_NONREP <> '-' " +
" ORDER BY AVAILABLE_DY "; " ORDER BY AVAILABLE_DY ";*/
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
......
webitm-dashboard/ibase/dashboard/sfa/ejb/ComplianceDB2.java deleted 100755 → 0
View file @ e0d547cc
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 javax.ejb.Stateless;
import org.json.simple.JSONObject;
/**
* Session Bean implementation class SalesPersonSales
*/
@Stateless
public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, ComplianceDB2Remote
{
public ComplianceDB2() {
// TODO Auto-generated constructor stub
}
GenericUtility genericUtility = GenericUtility.getInstance();
/*Start Below 3 methods for Franco Compliance Report by Nikhil
on Dated 21/06/2016*/
@SuppressWarnings("unchecked")
@Override
public JSONObject getComplianceHirarchyDB2(String loginId,String dataSourceName,String period) throws RemoteException, ITMException
{
JSONObject rawDataComplianceHirarchyDB2Json = new JSONObject();
JSONObject rowData = null;
String sql = "";
ResultSet rs = null;
PreparedStatement pstmt = null;
Connection conn = null;
ConnDriver connDriver = new ConnDriver();
try
{
System.out.println(" Inside ComplianceDB2 for getComplianceHirarchyDB2 Data Soruc Namem 11 ="+dataSourceName+" loginId=:"+ loginId+"---- month=:"+ period);
conn = connDriver.getConnectDB(dataSourceName);
connDriver = null;
/*old test sql for Franco*/
/*sql = " Select NSMCODE, NSMNAME, NSMDESG,SMCODE,SMNAME, SMDESG, RSECODE, RSENAME, RSEDESG, REPCODE, " +
" REPNAME, REPDESG, REP_NONREP,CNT " +
" FROM Temp_SALES_HIER_JJ_CNT ORDER BY smcode,rsecode, repcode"; */
/*Final SQL for Franco Compliance by Nikhil on Dated 23 June 2016*/
sql = "SELECT F.NSMCODE ,F.NSMNAME ,F.NSMDESG ,F.SMCODE ,F.SMNAME ,F.SMDESG ," +
"F.RSECODE ,F.RSENAME ,F.RSEDESG ,F.REPCODE ,F.REPNAME ,F.REPDESG ," +
"F.REP_NONREP ,COUNT(*) CNT FROM ( SELECT DISTINCT UF.NSMCODE ,UF.NSMNAME ," +
"UF.NSMDESG ,UF.SMCODE ,UF.SMNAME ,UF.SMDESG ,UF.RSECODE ,UF.RSENAME ," +
"UF.RSEDESG ,UF.REPCODE ,UF.REPNAME ,UF.REPDESG ,UF.AVAILABLE_DY ," +
"UF.ACTIVITY_CODE ,UF.REP_NONREP ,UF.CUSTOMER_NAME " +
"FROM ( SELECT NSMCODE ,NSMNAME ,NSMDESG ,SMCODE ,SMNAME ,SMDESG ,RSECODE ," +
"RSENAME ,RSEDESG ,REPCODE ,REPNAME ,REPDESG ,SALES_PERS_AV.AVAILABLE_DY ," +
"SPRS_ACT_TRAN.ACTIVITY_CODE ,( CASE WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) = 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN 'R' " +
"WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) <> 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL " +
"THEN '-' ELSE 'NR' END ) AS REP_NONREP ,CONCAT(CONCAT(COALESCE(STRG_CUSTOMER.FIRST_NAME, ''), " +
"COALESCE(STRG_CUSTOMER.MIDDLE_NAME, '')), COALESCE(STRG_CUSTOMER.LAST_NAME, '')) AS CUSTOMER_NAME " +
"FROM ( SELECT VW_SALES_HIER_JJ.REPCODE AS SALESPERS ,AV_DATES.available_dy AS AVAILABLE_DY " +
"FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ ) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a " +
"FROM sfa_time WHERE dt > TIMESTAMP(last_day((to_date(('"+period+"'),('YYYYMM'))) - 1 month) ," +
"'00:00:00') AND DT <= TIMESTAMP(last_day(to_date(('"+period+"'),('YYYYMM'))) ,'00:00:00') ) AV_DATES WHERE VW_SALES_HIER_JJ.a = AV_DATES.a EXCEPT " +
"SELECT EMPLOYEE.EMP_CODE AS SALESPERS ,holiday.hol_date AS AVAILABLE_DY " +
"FROM holiday ,EMPLOYEE WHERE holiday.hol_tblno = EMPLOYEE.hol_tblno " +
"AND holiday.hol_date > TIMESTAMP(last_day((to_date(('"+period+"'),('YYYYMM'))) - 1 month) ,'00:00:00') " +
"AND holiday.hol_date <= TIMESTAMP(last_day(to_date(('"+period+"'),('YYYYMM'))) ,'00:00:00') " +
"AND NOT EXISTS ( SELECT * FROM sprs_act_tran s WHERE s.sales_pers = employee.emp_code " +
"AND s.event_date = holiday.hol_date ) ) SALES_PERS_AV LEFT JOIN ( SELECT S.* FROM SPRS_ACT_TRAN S " +
"WHERE S.ACTIVITY_CODE <> 'PR' AND S.CONFIRMED = 'Y' ) SPRS_ACT_TRAN ON SPRS_ACT_TRAN.SALES_PERS = SALES_PERS_AV.SALESPERS AND SPRS_ACT_TRAN.EVENT_DATE = SALES_PERS_AV.AVAILABLE_DY " +
"LEFT JOIN ( SELECT S.* FROM STRG_MEET S WHERE S.EVENT_TYPE <> 'PR' ) STRG_MEET ON SPRS_ACT_TRAN.SALES_PERS = STRG_MEET.SALES_PERS AND SPRS_ACT_TRAN.EVENT_DATE = STRG_MEET.EVENT_DATE " +
"AND SPRS_ACT_TRAN.DCR_ID = STRG_MEET.DCR_ID " +
"LEFT JOIN STRG_CUSTOMER ON STRG_MEET.STRG_CODE = STRG_CUSTOMER.SC_CODE ,VW_SALES_HIER_JJ " +
"WHERE SALES_PERS_AV.SALESPERS = VW_SALES_HIER_JJ.REPCODE " +
"AND VW_SALES_HIER_JJ.NSMCODE = '"+loginId+"' " +
"UNION ALL SELECT '' AS NSMCODE ,'' AS NSMNAME ,'' AS NSMDESG ,SMCODE ,SMNAME ,SMDESG ,RSECODE ,RSENAME ,RSEDESG ,REPCODE ,REPNAME ,REPDESG ,SALES_PERS_AV.AVAILABLE_DY ,SPRS_ACT_TRAN.ACTIVITY_CODE ,( CASE WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) = 1 " +
"AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN 'R' WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ," +
"AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) <> 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL " +
"THEN '-' ELSE 'NR' END ) AS REP_NONREP ,CONCAT(CONCAT(COALESCE(STRG_CUSTOMER.FIRST_NAME, ''), " +
"COALESCE(STRG_CUSTOMER.MIDDLE_NAME, '')), COALESCE(STRG_CUSTOMER.LAST_NAME, '')) AS CUSTOMER_NAME " +
"FROM ( SELECT VW_SALES_HIER_JJ.REPCODE AS SALESPERS ,AV_DATES.available_dy AS AVAILABLE_DY " +
"FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ ) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a " +
"FROM sfa_time WHERE dt > TIMESTAMP(last_day((to_date(('"+period+"'),('YYYYMM'))) - 1 month) ,'00:00:00') " +
"AND DT <= TIMESTAMP(last_day(to_date(('"+period+"'),('YYYYMM'))) ,'00:00:00') ) AV_DATES " +
"WHERE VW_SALES_HIER_JJ.a = AV_DATES.a EXCEPT " +
"SELECT EMPLOYEE.EMP_CODE AS SALESPERS ,holiday.hol_date AS AVAILABLE_DY FROM holiday ," +
"EMPLOYEE WHERE holiday.hol_tblno = EMPLOYEE.hol_tblno " +
"AND holiday.hol_date > TIMESTAMP(last_day((to_date(('"+period+"'),('YYYYMM'))) - 1 month) ,'00:00:00') " +
"AND holiday.hol_date <= TIMESTAMP(last_day(to_date(('"+period+"'),('YYYYMM'))) ,'00:00:00') " +
"AND NOT EXISTS ( SELECT * FROM sprs_act_tran s WHERE s.sales_pers = employee.emp_code " +
"AND s.event_date = holiday.hol_date ) ) SALES_PERS_AV " +
"LEFT JOIN ( SELECT S.* FROM SPRS_ACT_TRAN S WHERE S.ACTIVITY_CODE <> 'PR' " +
"AND S.CONFIRMED = 'Y' ) SPRS_ACT_TRAN ON SPRS_ACT_TRAN.SALES_PERS = SALES_PERS_AV.SALESPERS " +
"AND SPRS_ACT_TRAN.EVENT_DATE = SALES_PERS_AV.AVAILABLE_DY " +
"LEFT JOIN ( SELECT S.* FROM STRG_MEET S WHERE S.EVENT_TYPE <> 'PR' ) STRG_MEET ON SPRS_ACT_TRAN.SALES_PERS = STRG_MEET.SALES_PERS " +
"AND SPRS_ACT_TRAN.EVENT_DATE = STRG_MEET.EVENT_DATE AND SPRS_ACT_TRAN.DCR_ID = STRG_MEET.DCR_ID " +
"LEFT JOIN STRG_CUSTOMER ON STRG_MEET.STRG_CODE = STRG_CUSTOMER.SC_CODE ,VW_SALES_HIER_JJ " +
"WHERE SALES_PERS_AV.SALESPERS = VW_SALES_HIER_JJ.REPCODE " +
"AND VW_SALES_HIER_JJ.SMCODE = '"+loginId+"' " +
"UNION ALL SELECT '' AS NSMCODE ,'' AS NSMNAME ,'' AS NSMDESG ,'' AS SMCODE ,'' AS SMNAME ,'' AS SMDESG ,RSECODE ,RSENAME ,RSEDESG ," +
"REPCODE ,REPNAME ,REPDESG ,SALES_PERS_AV.AVAILABLE_DY ,SPRS_ACT_TRAN.ACTIVITY_CODE ,( CASE WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) = 1 " +
"AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN 'R' " +
"WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ," +
"AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) <> 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL " +
"THEN '-' ELSE 'NR' END ) AS REP_NONREP ,CONCAT(CONCAT(COALESCE(STRG_CUSTOMER.FIRST_NAME, ''), " +
"COALESCE(STRG_CUSTOMER.MIDDLE_NAME, '')), COALESCE(STRG_CUSTOMER.LAST_NAME, '')) AS CUSTOMER_NAME " +
"FROM ( SELECT VW_SALES_HIER_JJ.REPCODE AS SALESPERS ,AV_DATES.available_dy AS AVAILABLE_DY " +
"FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ ) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a FROM sfa_time " +
"WHERE dt > TIMESTAMP(last_day((to_date(('"+period+"'),('YYYYMM'))) - 1 month) ,'00:00:00') " +
"AND DT <= TIMESTAMP(last_day(to_date(('"+period+"'),('YYYYMM'))) ,'00:00:00') ) AV_DATES " +
"WHERE VW_SALES_HIER_JJ.a = AV_DATES.a EXCEPT SELECT EMPLOYEE.EMP_CODE AS SALESPERS ," +
"holiday.hol_date AS AVAILABLE_DY FROM holiday ,EMPLOYEE WHERE holiday.hol_tblno = EMPLOYEE.hol_tblno " +
"AND holiday.hol_date > TIMESTAMP(last_day((to_date(('"+period+"'),('YYYYMM'))) - 1 month) ,'00:00:00') " +
"AND holiday.hol_date <= TIMESTAMP(last_day(to_date(('"+period+"'),('YYYYMM'))) ,'00:00:00') " +
"AND NOT EXISTS ( SELECT * FROM sprs_act_tran s WHERE s.sales_pers = employee.emp_code " +
"AND s.event_date = holiday.hol_date ) ) SALES_PERS_AV LEFT JOIN ( SELECT S.* FROM SPRS_ACT_TRAN S " +
"WHERE S.ACTIVITY_CODE <> 'PR' AND S.CONFIRMED = 'Y' ) SPRS_ACT_TRAN ON SPRS_ACT_TRAN.SALES_PERS = SALES_PERS_AV.SALESPERS " +
"AND SPRS_ACT_TRAN.EVENT_DATE = SALES_PERS_AV.AVAILABLE_DY " +
"LEFT JOIN ( SELECT S.* FROM STRG_MEET S WHERE S.EVENT_TYPE <> 'PR' ) STRG_MEET ON SPRS_ACT_TRAN.SALES_PERS = STRG_MEET.SALES_PERS " +
"AND SPRS_ACT_TRAN.EVENT_DATE = STRG_MEET.EVENT_DATE AND SPRS_ACT_TRAN.DCR_ID = STRG_MEET.DCR_ID " +
"LEFT JOIN STRG_CUSTOMER ON STRG_MEET.STRG_CODE = STRG_CUSTOMER.SC_CODE ,VW_SALES_HIER_JJ " +
"WHERE SALES_PERS_AV.SALESPERS = VW_SALES_HIER_JJ.REPCODE " +
"AND VW_SALES_HIER_JJ.RSECODE = '"+loginId+"' " +
"UNION ALL SELECT '' AS NSMCODE ,'' AS NSMNAME ,'' AS NSMDESG ,'' AS SMCODE ,'' AS SMNAME ,'' AS SMDESG ,'' AS RSECODE ,'' AS RSENAME ,'' AS RSEDESG ," +
"REPCODE ,REPNAME ,REPDESG ,SALES_PERS_AV.AVAILABLE_DY ,SPRS_ACT_TRAN.ACTIVITY_CODE ,( CASE WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY " +
"ORDER BY REPCODE ,AVAILABLE_DY ) ) = 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN 'R' " +
"WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ," +
"AVAILABLE_DY ) ) <> 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL " +
"THEN '-' ELSE 'NR' END ) AS REP_NONREP ,CONCAT(CONCAT(COALESCE(STRG_CUSTOMER.FIRST_NAME, '')," +
" COALESCE(STRG_CUSTOMER.MIDDLE_NAME, '')), COALESCE(STRG_CUSTOMER.LAST_NAME, '')) AS CUSTOMER_NAME " +
"FROM ( SELECT VW_SALES_HIER_JJ.REPCODE AS SALESPERS ,AV_DATES.available_dy AS AVAILABLE_DY " +
"FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ ) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a " +
"FROM sfa_time WHERE dt > TIMESTAMP(last_day((to_date(('"+period+"'),('YYYYMM'))) - 1 month) ,'00:00:00') " +
"AND DT <= TIMESTAMP(last_day(to_date(('"+period+"'),('YYYYMM'))) ,'00:00:00') ) AV_DATES " +
"WHERE VW_SALES_HIER_JJ.a = AV_DATES.a EXCEPT " +
"SELECT EMPLOYEE.EMP_CODE AS SALESPERS ,holiday.hol_date AS AVAILABLE_DY FROM holiday ," +
"EMPLOYEE WHERE holiday.hol_tblno = EMPLOYEE.hol_tblno " +
"AND holiday.hol_date > TIMESTAMP(last_day((to_date(('"+period+"'),('YYYYMM'))) - 1 month) ,'00:00:00') " +
"AND holiday.hol_date <= TIMESTAMP(last_day(to_date(('"+period+"'),('YYYYMM'))) ,'00:00:00') AND NOT EXISTS ( SELECT * FROM sprs_act_tran s " +
"WHERE s.sales_pers = employee.emp_code AND s.event_date = holiday.hol_date ) ) SALES_PERS_AV " +
"LEFT JOIN ( SELECT S.* FROM SPRS_ACT_TRAN S WHERE S.ACTIVITY_CODE <> 'PR' " +
"AND S.CONFIRMED = 'Y' ) SPRS_ACT_TRAN ON SPRS_ACT_TRAN.SALES_PERS = SALES_PERS_AV.SALESPERS " +
"AND SPRS_ACT_TRAN.EVENT_DATE = SALES_PERS_AV.AVAILABLE_DY LEFT JOIN ( SELECT S.* FROM STRG_MEET S " +
"WHERE S.EVENT_TYPE <> 'PR' ) STRG_MEET ON SPRS_ACT_TRAN.SALES_PERS = STRG_MEET.SALES_PERS " +
"AND SPRS_ACT_TRAN.EVENT_DATE = STRG_MEET.EVENT_DATE AND SPRS_ACT_TRAN.DCR_ID = STRG_MEET.DCR_ID " +
"LEFT JOIN STRG_CUSTOMER ON STRG_MEET.STRG_CODE = STRG_CUSTOMER.SC_CODE ,VW_SALES_HIER_JJ " +
"WHERE SALES_PERS_AV.SALESPERS = VW_SALES_HIER_JJ.REPCODE " +
"AND VW_SALES_HIER_JJ.REPCODE = '"+loginId+"' ) UF WHERE UF.REP_NONREP <> '-' ) F " +
"GROUP BY F.NSMCODE ,F.NSMNAME ,F.NSMDESG ,F.SMCODE ,F.SMNAME ,F.SMDESG ," +
"F.RSECODE ,F.RSENAME ,F.RSEDESG ,F.REPCODE ,F.REPNAME ,F.REPDESG ,F.REP_NONREP " +
"ORDER BY F.NSMCODE ,F.SMCODE ,F.RSECODE ,F.REPCODE ";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
int count = 0;
while (rs.next())
{
rowData = new JSONObject();
rowData.put("nsmcode", checkNull(rs.getString("NSMCODE")).trim());
rowData.put("nsmname", checkNull(rs.getString("NSMNAME")).trim());
rowData.put("nsmdesg", checkNull(rs.getString("NSMDESG")).trim());
rowData.put("smcode", checkNull(rs.getString("SMCODE")).trim());
rowData.put("smname", checkNull(rs.getString("SMNAME")).trim());
rowData.put("smdesg", checkNull(rs.getString("SMDESG")).trim());
rowData.put("rsecode", checkNull(rs.getString("RSECODE")).trim());
rowData.put("rsename", checkNull(rs.getString("RSENAME")).trim());
rowData.put("rsedesg", checkNull(rs.getString("RSEDESG")).trim());
rowData.put("repcode", checkNull(rs.getString("REPCODE")).trim());
rowData.put("repname", checkNull(rs.getString("REPNAME")).trim());
rowData.put("repdesg", checkNull(rs.getString("REPDESG")).trim());
rowData.put("rep_nonrep", checkNull(rs.getString("REP_NONREP")).trim());
rowData.put("count", rs.getString("CNT"));
rawDataComplianceHirarchyDB2Json.put(count, rowData);
count++;
}
}
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 :ComplianceDB2:" + d.getMessage());
throw new ITMException(d);
}
}
System.out.println("ComplianceDB2 JSON String======>>"+rawDataComplianceHirarchyDB2Json.toString());
return rawDataComplianceHirarchyDB2Json;
}
@SuppressWarnings("unchecked")
@Override
public JSONObject getComplianceSummaryDB2(String firstVal, String cellVal, String dataSourceName) throws RemoteException, ITMException
{
JSONObject rawDataComplianceSummaryDB2Json = new JSONObject();
JSONObject rowData = null;
String sql = "";
ResultSet rs = null;
PreparedStatement pstmt = null;
Connection conn = null;
ConnDriver connDriver = new ConnDriver();
try
{
System.out.println(" Inside ComplianceEJB for getComplianceSummaryDB2 Data Soruc Name ="+dataSourceName+" firstVal=:"+ firstVal + "===cellVal :"+ cellVal);
conn = connDriver.getConnectDB(dataSourceName);
connDriver = null;
//SimpleDateFormat gridDateFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss");
//SimpleDateFormat convrtToTimStmDate= new SimpleDateFormat("dd/MM/yy");
SimpleDateFormat gridDateFormat = new SimpleDateFormat(genericUtility.getDBDateTimeFormat());
SimpleDateFormat convrtToTimStmDate= new SimpleDateFormat(genericUtility.getApplDateFormat());
if(cellVal!=null && cellVal.length()>0)
{
cellVal = gridDateFormat.format(convrtToTimStmDate.parse(cellVal));
}
System.out.println("cellVal :"+cellVal);
/*sql = "Select 'DH' as STRG_TYPE, 'Dhanendra' as CUST_NAME from Dual";*/
sql = "SELECT SM.STRG_TYPE, (SC.FIRST_NAME ||' '||SC.MIDDLE_NAME ||' '||SC.LAST_NAME) AS CUST_NAME " +
"FROM STRG_MEET SM INNER JOIN STRG_CUSTOMER SC ON SM.STRG_CODE = SC.SC_CODE " +
"INNER JOIN VW_SALES_HIER_JJ VW ON SM.SALES_PERS = VW.REPCODE " +
"WHERE SM.EVENT_DATE = TIMESTAMP('"+cellVal.trim()+"') " +
"AND VW.REPNAME = '"+firstVal.trim()+"' ";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
int count = 0;
while (rs.next())
{
rowData = new JSONObject();
rowData.put("customer_name", checkNull(rs.getString("CUST_NAME")));
rowData.put("strg_type", checkNull(rs.getString("STRG_TYPE")));
rawDataComplianceSummaryDB2Json.put(count, rowData);
count++;
}
}
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 :ComplianceDB2:" + d.getMessage());
throw new ITMException(d);
}
}
System.out.println("ComplianceEJB rawDataComplianceSummaryDB2Json String======>>"+rawDataComplianceSummaryDB2Json.toString());
return rawDataComplianceSummaryDB2Json;
}
@SuppressWarnings("unchecked")
@Override
public JSONObject getComplianceDetailsDB2(String period, String personName, String dataSourceName) throws RemoteException, ITMException
{
JSONObject rawDataComplianceDetailsDB2Json = new JSONObject();
JSONObject rowData = null;
String sql = "";
ResultSet rs = null;
PreparedStatement pstmt = null;
Connection conn = null;
ConnDriver connDriver = new ConnDriver();
try
{
System.out.println(" Inside ComplianceEJB for getComplianceDetailsDB2 Data Soruc Name ="+dataSourceName+" period=:"+ period + "=== personName :"+ personName);
conn = connDriver.getConnectDB(dataSourceName);
connDriver = null;
/*sql = "Select '01/10/2015' as AVAILABLE_DY, 'FW' as ACTIVITY_CODE from Dual";*/
sql = "SELECT F.REPCODE , F.REPNAME , F.REPDESG , F.REP_NONREP , DATE(F.AVAILABLE_DY) AS AVAILABLE_DY ," +
"F.ACTIVITY_CODE FROM ( SELECT DISTINCT REPCODE , REPNAME , REPDESG , SALES_PERS_AV.AVAILABLE_DY ," +
"SPRS_ACT_TRAN.ACTIVITY_CODE , ( CASE WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ," +
"AVAILABLE_DY ORDER BY REPCODE ,AVAILABLE_DY ) ) = 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL " +
"THEN 'R' WHEN ( ROW_NUMBER() OVER ( PARTITION BY REPCODE ,AVAILABLE_DY ORDER BY REPCODE ," +
"AVAILABLE_DY ) ) <> 1 AND SPRS_ACT_TRAN.SALES_PERS IS NOT NULL THEN '-' ELSE 'NR' END ) " +
"AS REP_NONREP ,CONCAT(CONCAT(COALESCE(STRG_CUSTOMER.FIRST_NAME, ''), " +
"COALESCE(STRG_CUSTOMER.MIDDLE_NAME, '')), COALESCE(STRG_CUSTOMER.LAST_NAME, '')) AS CUSTOMER_NAME " +
"FROM ( SELECT VW_SALES_HIER_JJ.REPCODE AS SALESPERS ,AV_DATES.available_dy AS AVAILABLE_DY " +
"FROM ( SELECT REPCODE ,'a' AS a " +
"FROM VW_SALES_HIER_JJ ) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a " +
"FROM sfa_time WHERE dt > TIMESTAMP(last_day((to_date(('"+period+"'),('YYYYMM'))) - 1 month) ,'00:00:00') " +
"AND DT <= TIMESTAMP(last_day(to_date(('"+period+"'),('YYYYMM'))) ,'00:00:00') ) AV_DATES " +
"WHERE VW_SALES_HIER_JJ.a = AV_DATES.a EXCEPT SELECT EMPLOYEE.EMP_CODE AS SALESPERS ," +
"holiday.hol_date AS AVAILABLE_DY " +
"FROM holiday ,EMPLOYEE WHERE holiday.hol_tblno = EMPLOYEE.hol_tblno " +
"AND holiday.hol_date > TIMESTAMP(last_day((to_date(('"+period+"'),('YYYYMM'))) - 1 month) ,'00:00:00') " +
"AND holiday.hol_date <= TIMESTAMP(last_day(to_date(('"+period+"'),('YYYYMM'))) ,'00:00:00') " +
"AND NOT EXISTS ( SELECT * FROM sprs_act_tran s WHERE s.sales_pers = employee.emp_code " +
"AND s.event_date = holiday.hol_date ) ) SALES_PERS_AV " +
"LEFT JOIN ( SELECT S.* FROM SPRS_ACT_TRAN S WHERE S.ACTIVITY_CODE <> 'PR' " +
"AND S.CONFIRMED = 'Y' ) SPRS_ACT_TRAN ON SPRS_ACT_TRAN.SALES_PERS = SALES_PERS_AV.SALESPERS " +
"AND SPRS_ACT_TRAN.EVENT_DATE = SALES_PERS_AV.AVAILABLE_DY " +
"LEFT JOIN ( SELECT S.* FROM STRG_MEET S WHERE S.EVENT_TYPE <> 'PR' ) STRG_MEET ON SPRS_ACT_TRAN.SALES_PERS = STRG_MEET.SALES_PERS " +
"AND SPRS_ACT_TRAN.EVENT_DATE = STRG_MEET.EVENT_DATE AND SPRS_ACT_TRAN.DCR_ID = STRG_MEET.DCR_ID " +
"LEFT JOIN STRG_CUSTOMER ON STRG_MEET.STRG_CODE = STRG_CUSTOMER.SC_CODE ,VW_SALES_HIER_JJ " +
"WHERE SALES_PERS_AV.SALESPERS = VW_SALES_HIER_JJ.REPCODE " +
"AND VW_SALES_HIER_JJ.REPNAME = '"+personName+"' ) F WHERE F.REP_NONREP <> '-' " +
"ORDER BY F.AVAILABLE_DY ";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
int count = 0;
String activityCode = "";
while (rs.next())
{
rowData = new JSONObject();
rowData.put("repcode", checkNull(rs.getString("REPCODE")).trim());
rowData.put("repname", checkNull(rs.getString("REPNAME")).trim());
rowData.put("repdesg", checkNull(rs.getString("REPDESG")).trim());
rowData.put("rep_nonrep", checkNull(rs.getString("REP_NONREP")).trim());
rowData.put("available_dy", checkNull(rs.getString("AVAILABLE_DY")).trim());
activityCode = rs.getString("ACTIVITY_CODE");
System.out.println("activityCode :"+activityCode);
if(activityCode == null)
{
rowData.put("activity_code", "Not-Reported");
}else
{
rowData.put("activity_code", rs.getString("ACTIVITY_CODE"));
}
rawDataComplianceDetailsDB2Json.put(count, rowData);
count++;
}
}
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 :ComplianceDB2: getComplianceDetailsDB2 " + d.getMessage());
throw new ITMException(d);
}
}
return rawDataComplianceDetailsDB2Json;
}
/*End Below 3 methods for Franco Compliance Report by Nikhil
on Dated 21/06/2016*/
private String checkNull(String str)
{
if(str == null)
{
return "";
}
else
{
return str ;
}
}
}
webitm-dashboard/ibase/dashboard/sfa/ejb/ComplianceDB2Local.java deleted 100755 → 0
View file @ e0d547cc
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 deleted 100755 → 0
View file @ e0d547cc
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/CurrentDayWrkSummary.java
View file @ e9770ccf
package ibase.dashboard.sfa.ejb; package ibase.dashboard.sfa.ejb;
import ibase.dashboard.Report.Utility.DashboardUtility; import ibase.dashboard.Report.Utility.DashboardUtility;
import ibase.system.config.ConnDriver;
import ibase.utility.CommonConstants; import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import ibase.utility.CommonConstants;
import java.io.File; import java.io.File;
import java.rmi.RemoteException; import java.rmi.RemoteException;
...@@ -25,11 +23,10 @@ import org.json.simple.JSONObject; ...@@ -25,11 +23,10 @@ import org.json.simple.JSONObject;
@Stateless @Stateless
public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkSummaryLocal, CurrentDayWrkSummaryRemote public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkSummaryLocal, CurrentDayWrkSummaryRemote
{ {
E12GenericUtility e12GenericUtility = new E12GenericUtility();
public CurrentDayWrkSummary() { public CurrentDayWrkSummary() {
// TODO Auto-generated constructor stub // TODO Auto-generated constructor stub
} }
GenericUtility genericUtility = GenericUtility.getInstance();
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getCurrentDayWorkSummary(String dataSourceName, String date, String salePerson) throws RemoteException, ITMException public JSONObject getCurrentDayWorkSummary(String dataSourceName, String date, String salePerson) throws RemoteException, ITMException
...@@ -37,20 +34,18 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -37,20 +34,18 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
JSONObject rawDataEmployeeProdSurveylJson = new JSONObject(); JSONObject rawDataEmployeeProdSurveylJson = new JSONObject();
JSONObject rowData = null; JSONObject rowData = null;
String sql = ""; String sql = "";
int count =0; int count = 0;
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
DashboardUtility dashboardUtility = null; DashboardUtility dashboardUtility = null;
String appendSqlStr = ""; String appendSqlStr = "";
try try
{ {
/*conn = connDriver.getConnectDB(dataSourceName);
conn = connDriver.getConnectDB(dataSourceName); connDriver = null;*/
connDriver = null; /*add new code for connection DB on dated:14062016 by Nikhil*/
conn = getConnection();
dashboardUtility = new DashboardUtility(); dashboardUtility = new DashboardUtility();
salePerson = dashboardUtility.getCommaSeparated(salePerson); salePerson = dashboardUtility.getCommaSeparated(salePerson);
System.out.println("Date getCurrentDayWorkSummary :"+date); System.out.println("Date getCurrentDayWorkSummary :"+date);
...@@ -61,7 +56,7 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -61,7 +56,7 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
DateFormat dtFormat = new SimpleDateFormat(getApplDateFormat()); DateFormat dtFormat = new SimpleDateFormat(getApplDateFormat());
java.util.Date currentDate = Calendar.getInstance().getTime(); java.util.Date currentDate = Calendar.getInstance().getTime();
date = dtFormat.format( currentDate ); date = dtFormat.format( currentDate );
date = genericUtility.getValidDateTimeString( date, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat() ); date = e12GenericUtility.getValidDateTimeString( date, e12GenericUtility.getApplDateFormat(),e12GenericUtility.getDBDateFormat() );
appendSqlStr = " And SM.Sales_Pers In ( Select Emp_Code " + appendSqlStr = " And SM.Sales_Pers In ( Select Emp_Code " +
" From Employee Start With Emp_code = (Select Emp_Code From Users Where Code = "+salePerson+") " + " From Employee Start With Emp_code = (Select Emp_Code From Users Where Code = "+salePerson+") " +
...@@ -70,7 +65,7 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -70,7 +65,7 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
else else
{ {
System.out.println("in else date getCurrentDayWorkSummary"); System.out.println("in else date getCurrentDayWorkSummary");
date = genericUtility.getValidDateTimeString( date, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat() ); date = e12GenericUtility.getValidDateTimeString( date, e12GenericUtility.getApplDateFormat(),e12GenericUtility.getDBDateFormat() );
appendSqlStr = " And SM.Sales_Pers In ("+salePerson+") "; appendSqlStr = " And SM.Sales_Pers In ("+salePerson+") ";
} }
...@@ -127,12 +122,8 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -127,12 +122,8 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
rowData.put("tlsd",checkNull( rs.getString("TLSD"))); rowData.put("tlsd",checkNull( rs.getString("TLSD")));
rowData.put("ordval",checkNull( rs.getString("ORDVAL"))); rowData.put("ordval",checkNull( rs.getString("ORDVAL")));
rowData.put("display",checkNull( rs.getString("DISPLAY"))); rowData.put("display",checkNull( rs.getString("DISPLAY")));
rawDataEmployeeProdSurveylJson.put(count, rowData); rawDataEmployeeProdSurveylJson.put(count, rowData);
count++; count++;
} }
} }
catch (Exception e) catch (Exception e)
...@@ -163,12 +154,8 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -163,12 +154,8 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
throw new ITMException(d); throw new ITMException(d);
} }
} }
return rawDataEmployeeProdSurveylJson; return rawDataEmployeeProdSurveylJson;
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getCurrentDayWorkSummaryDetail(String dataSourceName, String date, String salePerson) throws RemoteException, ITMException public JSONObject getCurrentDayWorkSummaryDetail(String dataSourceName, String date, String salePerson) throws RemoteException, ITMException
...@@ -180,16 +167,14 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -180,16 +167,14 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
DashboardUtility dashboardUtility = null; DashboardUtility dashboardUtility = null;
String appendSqlStr = ""; String appendSqlStr = "";
try try
{ {
/*conn = connDriver.getConnectDB(dataSourceName);
conn = connDriver.getConnectDB(dataSourceName); connDriver = null;*/
connDriver = null; /*add new code for connection DB on dated:12062016 by Nikhil*/
conn = getConnection();
dashboardUtility = new DashboardUtility(); dashboardUtility = new DashboardUtility();
salePerson = dashboardUtility.getCommaSeparated(salePerson); salePerson = dashboardUtility.getCommaSeparated(salePerson);
System.out.println("Date getCurrentDayWorkSummaryDetail:"+date); System.out.println("Date getCurrentDayWorkSummaryDetail:"+date);
...@@ -202,16 +187,16 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -202,16 +187,16 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
DateFormat dtFormat = new SimpleDateFormat(getApplDateFormat()); DateFormat dtFormat = new SimpleDateFormat(getApplDateFormat());
java.util.Date currentDate = Calendar.getInstance().getTime(); java.util.Date currentDate = Calendar.getInstance().getTime();
date = dtFormat.format( currentDate ); date = dtFormat.format( currentDate );
date = genericUtility.getValidDateTimeString( date, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat() ); date = e12GenericUtility.getValidDateTimeString( date, e12GenericUtility.getApplDateFormat(),e12GenericUtility.getDBDateFormat() );
appendSqlStr = " And SM.Sales_Pers In ( Select Emp_Code " + appendSqlStr= " And SM.Sales_Pers In ( Select Emp_Code " +
" From Employee Start With Emp_code = (Select Emp_Code From Users Where Code = "+salePerson+") " + " From Employee Start With Emp_code = (Select Emp_Code From Users Where Code = "+salePerson+") " +
" Connect By Prior Emp_Code =Report_To )"; " Connect By Prior Emp_Code =Report_To )";
} }
else else
{ {
System.out.println("in else date "); System.out.println("in else date ");
date = genericUtility.getValidDateTimeString( date, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat() ); date = e12GenericUtility.getValidDateTimeString( date, e12GenericUtility.getApplDateFormat(),e12GenericUtility.getDBDateFormat() );
appendSqlStr = " And SM.Sales_Pers In ("+salePerson+") "; appendSqlStr = " And SM.Sales_Pers In ("+salePerson+") ";
} }
...@@ -220,7 +205,7 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -220,7 +205,7 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
sql = " Select " + sql = " Select " +
//"To_CHAR(TRUNC(?),'DD-MM-YYYY') as show_Date , " + //"To_CHAR(TRUNC(?),'DD-MM-YYYY') as show_Date , " +
"SalesPerson_Code , To_Calls," + "SalesPerson_Code , " +
" SalesPerson_Name , nvl(SUM(Tot_Calls),0) as Tot_Calls , nvl(SUM(Tot_PC),0) as Tot_PC , " + " SalesPerson_Name , nvl(SUM(Tot_Calls),0) as Tot_Calls , nvl(SUM(Tot_PC),0) as Tot_PC , " +
" nvl(SUM((To_Calls - Tot_Dist_Calls)),0) as Call_Bal , nvl(SUM(TLSD),0) as TLSD , " + " nvl(SUM((To_Calls - Tot_Dist_Calls)),0) as Call_Bal , nvl(SUM(TLSD),0) as TLSD , " +
" nvl(SUM(Ord_Val),0) as Ord_Val , nvl(SUM(Display),0) as Display " + " nvl(SUM(Ord_Val),0) as Ord_Val , nvl(SUM(Display),0) as Display " +
...@@ -245,15 +230,13 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -245,15 +230,13 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
" " + appendSqlStr + " " + " " + appendSqlStr + " " +
" Group By SM.Sales_Pers ," + " Group By SM.Sales_Pers ," +
" SP.SP_Name ,SM.dcr_id ) " + " SP.SP_Name ,SM.dcr_id ) " +
" Group By SalesPerson_Name, To_Calls, SalesPerson_Code Order By SalesPerson_Name"; " Group By SalesPerson_Name, SalesPerson_Code Order By SalesPerson_Name";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1, java.sql.Timestamp.valueOf(date)); pstmt.setTimestamp(1, java.sql.Timestamp.valueOf(date));
pstmt.setTimestamp(2, java.sql.Timestamp.valueOf(date)); pstmt.setTimestamp(2, java.sql.Timestamp.valueOf(date));
//pstmt.setTimestamp(3, java.sql.Timestamp.valueOf(date)); //pstmt.setTimestamp(3, java.sql.Timestamp.valueOf(date));
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while (rs.next()) while (rs.next())
{ {
rowData = new JSONObject(); rowData = new JSONObject();
...@@ -279,18 +262,14 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -279,18 +262,14 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
defaultUserImg = defaultUserImg + ""+splited[1].charAt(0); defaultUserImg = defaultUserImg + ""+splited[1].charAt(0);
} }
System.out.println("defaultUserImg :"+defaultUserImg); System.out.println("defaultUserImg :"+defaultUserImg);
rowData.put("salesperson_code", "<div class='defaultUserImg'> "+defaultUserImg+" </div>"); rowData.put("salesperson_code", "<div class='defaultUserImg'> "+defaultUserImg+" </div>");
} }
rowData.put("tc", checkNull(rs.getString("TOT_CALLS"))); rowData.put("tc", checkNull(rs.getString("TOT_CALLS")));
rowData.put("pc",checkNull( rs.getString("TOT_PC"))); rowData.put("pc", checkNull(rs.getString("TOT_PC")));
rowData.put("callbal", checkNull(rs.getString("CALL_BAL"))); rowData.put("callbal", checkNull(rs.getString("CALL_BAL")));
rowData.put("tlsd",checkNull( rs.getString("TLSD"))); rowData.put("tlsd", checkNull(rs.getString("TLSD")));
rowData.put("ordval",checkNull( rs.getString("ORD_VAL"))); rowData.put("ordval", checkNull(rs.getString("ORD_VAL")));
rowData.put("display",checkNull( rs.getString("DISPLAY"))); rowData.put("display", checkNull(rs.getString("DISPLAY")));
rowData.put("To_Calls",checkNull( rs.getString("To_Calls")));
rawDataCurrentDayWrkSumDtlJson.put(count, rowData); rawDataCurrentDayWrkSumDtlJson.put(count, rowData);
count++; count++;
...@@ -341,16 +320,14 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -341,16 +320,14 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
DashboardUtility dashboardUtility = null; DashboardUtility dashboardUtility = null;
String appendSqlStr = ""; String appendSqlStr = "";
try try
{ {
/*conn = connDriver.getConnectDB(dataSourceName);
conn = connDriver.getConnectDB(dataSourceName); connDriver = null;*/
connDriver = null; /*add new code for connection DB on dated:12062016 by Nikhil*/
conn = getConnection();
dashboardUtility = new DashboardUtility(); dashboardUtility = new DashboardUtility();
salePerson = dashboardUtility.getCommaSeparated(salePerson); salePerson = dashboardUtility.getCommaSeparated(salePerson);
if(date.length() == 0 || date == null) if(date.length() == 0 || date == null)
...@@ -358,7 +335,7 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -358,7 +335,7 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
DateFormat dtFormat = new SimpleDateFormat(getApplDateFormat()); DateFormat dtFormat = new SimpleDateFormat(getApplDateFormat());
java.util.Date currentDate = Calendar.getInstance().getTime(); java.util.Date currentDate = Calendar.getInstance().getTime();
date = dtFormat.format( currentDate ); date = dtFormat.format( currentDate );
date = genericUtility.getValidDateTimeString( date, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat() ); date = e12GenericUtility.getValidDateTimeString( date, e12GenericUtility.getApplDateFormat(),e12GenericUtility.getDBDateFormat() );
appendSqlStr = " And SM.Sales_Pers In ( Select Emp_Code " + appendSqlStr = " And SM.Sales_Pers In ( Select Emp_Code " +
" From Employee Start With Emp_code = (Select Emp_Code From Users Where Code = "+salePerson+") " + " From Employee Start With Emp_code = (Select Emp_Code From Users Where Code = "+salePerson+") " +
...@@ -366,7 +343,7 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -366,7 +343,7 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
} }
else else
{ {
date = genericUtility.getValidDateTimeString( date, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat() ); date = e12GenericUtility.getValidDateTimeString( date, e12GenericUtility.getApplDateFormat(),e12GenericUtility.getDBDateFormat() );
appendSqlStr = " And SM.Sales_Pers In ("+salePerson+") "; appendSqlStr = " And SM.Sales_Pers In ("+salePerson+") ";
} }
...@@ -456,16 +433,14 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -456,16 +433,14 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
DashboardUtility dashboardUtility = null; DashboardUtility dashboardUtility = null;
String appendSqlStr = ""; String appendSqlStr = "";
try try
{ {
/*conn = connDriver.getConnectDB(dataSourceName);
conn = connDriver.getConnectDB(dataSourceName); connDriver = null;*/
connDriver = null; /*add new code for connection DB on dated:12062016 by Nikhil*/
conn = getConnection();
dashboardUtility = new DashboardUtility(); dashboardUtility = new DashboardUtility();
salePerson = dashboardUtility.getCommaSeparated(salePerson); salePerson = dashboardUtility.getCommaSeparated(salePerson);
if(date.length() == 0 || date == null) if(date.length() == 0 || date == null)
...@@ -473,7 +448,7 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -473,7 +448,7 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
DateFormat dtFormat = new SimpleDateFormat(getApplDateFormat()); DateFormat dtFormat = new SimpleDateFormat(getApplDateFormat());
java.util.Date currentDate = Calendar.getInstance().getTime(); java.util.Date currentDate = Calendar.getInstance().getTime();
date = dtFormat.format( currentDate ); date = dtFormat.format( currentDate );
date = genericUtility.getValidDateTimeString( date, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat() ); date = e12GenericUtility.getValidDateTimeString( date, e12GenericUtility.getApplDateFormat(),e12GenericUtility.getDBDateFormat() );
appendSqlStr = " And SM.Sales_Pers In ( Select Emp_Code " + appendSqlStr = " And SM.Sales_Pers In ( Select Emp_Code " +
" From Employee Start With Emp_code = (Select Emp_Code From Users Where Code = "+salePerson+") " + " From Employee Start With Emp_code = (Select Emp_Code From Users Where Code = "+salePerson+") " +
...@@ -481,7 +456,7 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -481,7 +456,7 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
} }
else else
{ {
date = genericUtility.getValidDateTimeString( date, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat() ); date = e12GenericUtility.getValidDateTimeString( date, e12GenericUtility.getApplDateFormat(),e12GenericUtility.getDBDateFormat() );
appendSqlStr = " And SM.Sales_Pers In ("+salePerson+") "; appendSqlStr = " And SM.Sales_Pers In ("+salePerson+") ";
} }
...@@ -518,7 +493,6 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -518,7 +493,6 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
String salesPersnName = ""; String salesPersnName = "";
String prvSalesPersnName = ""; String prvSalesPersnName = "";
String skuName = ""; String skuName = "";
String skuImg = "";
String salesPersCode = ""; String salesPersCode = "";
String userImagePath = CommonConstants.JBOSSHOME + File.separator +"server"+File.separator +"default"+File.separator +"deploy"+File.separator +"ibase.ear"+File.separator + "ibase.war" +File.separator + "resource" + File.separator + "images"+ File.separator + "users"+File.separator; String userImagePath = CommonConstants.JBOSSHOME + File.separator +"server"+File.separator +"default"+File.separator +"deploy"+File.separator +"ibase.ear"+File.separator + "ibase.war" +File.separator + "resource" + File.separator + "images"+ File.separator + "users"+File.separator;
while (rs.next()) while (rs.next())
...@@ -639,9 +613,6 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -639,9 +613,6 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
return rawDataCurrentDayWrkSKUDtlJson; return rawDataCurrentDayWrkSKUDtlJson;
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getMTDWorkParent(String dataSourceName, String month, String year, String salePerson) throws RemoteException, ITMException public JSONObject getMTDWorkParent(String dataSourceName, String month, String year, String salePerson) throws RemoteException, ITMException
...@@ -653,16 +624,16 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -653,16 +624,16 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
DashboardUtility dashboardUtility = null; DashboardUtility dashboardUtility = null;
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
String appendSqlStr = ""; String appendSqlStr = "";
try try
{ {
/*conn = connDriver.getConnectDB(dataSourceName);
connDriver = null;*/
/*add new code for connection DB on dated:12062016 by Nikhil*/
conn = getConnection();
conn = connDriver.getConnectDB(dataSourceName);
connDriver = null;
dashboardUtility = new DashboardUtility(); dashboardUtility = new DashboardUtility();
salePerson = dashboardUtility.getCommaSeparated(salePerson); salePerson = dashboardUtility.getCommaSeparated(salePerson);
if(checkNull(month).length()<1 || checkNull(year).length()<1) if(checkNull(month).length()<1 || checkNull(year).length()<1)
...@@ -790,18 +761,18 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -790,18 +761,18 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
DashboardUtility dashboardUtility = null; DashboardUtility dashboardUtility = null;
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
String appendSqlStr = ""; String appendSqlStr = "";
String userImagePath =""; String userImagePath ="";
String salesPersName = ""; String salesPersName = "";
try try
{ {
/*conn = connDriver.getConnectDB(dataSourceName);
connDriver = null;*/
/*add new code for connection DB on dated:12062016 by Nikhil*/
conn = getConnection();
conn = connDriver.getConnectDB(dataSourceName);
connDriver = null;
dashboardUtility = new DashboardUtility(); dashboardUtility = new DashboardUtility();
salePerson = dashboardUtility.getCommaSeparated(salePerson); salePerson = dashboardUtility.getCommaSeparated(salePerson);
userImagePath = CommonConstants.JBOSSHOME + File.separator +"server"+File.separator +"default"+File.separator +"deploy"+File.separator +"ibase.ear"+File.separator + "ibase.war" +File.separator + "resource" + File.separator + "images"+ File.separator + "users"+File.separator; userImagePath = CommonConstants.JBOSSHOME + File.separator +"server"+File.separator +"default"+File.separator +"deploy"+File.separator +"ibase.ear"+File.separator + "ibase.war" +File.separator + "resource" + File.separator + "images"+ File.separator + "users"+File.separator;
...@@ -950,16 +921,17 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -950,16 +921,17 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
DashboardUtility dashboardUtility = null; DashboardUtility dashboardUtility = null;
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
String appendSqlStr = ""; String appendSqlStr = "";
try try
{ {
conn = connDriver.getConnectDB(dataSourceName); /*conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;*/
/*add new code for connection DB on dated:12062016 by Nikhil*/
conn = getConnection();
dashboardUtility = new DashboardUtility(); dashboardUtility = new DashboardUtility();
salePerson = dashboardUtility.getCommaSeparated(salePerson); salePerson = dashboardUtility.getCommaSeparated(salePerson);
if(checkNull(month).length()<1 || checkNull(year).length()<1) if(checkNull(month).length()<1 || checkNull(year).length()<1)
...@@ -1009,8 +981,6 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -1009,8 +981,6 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while (rs.next()) while (rs.next())
{ {
rowData = new JSONObject(); rowData = new JSONObject();
...@@ -1068,16 +1038,17 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -1068,16 +1038,17 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
DashboardUtility dashboardUtility = null; DashboardUtility dashboardUtility = null;
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
String appendSqlStr = ""; String appendSqlStr = "";
try try
{ {
conn = connDriver.getConnectDB(dataSourceName); /*conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;*/
/*add new code for connection DB on dated:12062016 by Nikhil*/
conn = getConnection();
dashboardUtility = new DashboardUtility(); dashboardUtility = new DashboardUtility();
salePerson = dashboardUtility.getCommaSeparated(salePerson); salePerson = dashboardUtility.getCommaSeparated(salePerson);
if(checkNull(month).length()<1 || checkNull(year).length()<1) if(checkNull(month).length()<1 || checkNull(year).length()<1)
...@@ -1102,20 +1073,16 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -1102,20 +1073,16 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
""+year+" AS Year, " + ""+year+" AS Year, " +
"strg_meet.sales_pers AS sales_pers_code, " + "strg_meet.sales_pers AS sales_pers_code, " +
"sales_pers.sp_name AS SalesPerson, " + "sales_pers.sp_name AS SalesPerson, " +
"to_char(To_Date(strg_meet.Event_Date),'DD-MON-YYYY') as EVENT_DATE, " + "to_char(To_Date(strg_meet.Event_Date),'DD-MM-YYYY') as EVENT_DATE, " +
"Loc.Descr as Locality, " + "Loc.Descr as Locality, " +
"Coalesce((select employee.name_prefix || ' ' || employee.emp_fname || ' ' || employee.emp_lname " + "Coalesce((select employee.name_prefix || ' ' || employee.emp_fname || ' ' || employee.emp_lname " +
"from employee " + "from employee " +
"where employee.emp_code = SALES_PERS1.sales_pers ),'Self') AS Visited_With, " + "where employee.emp_code = SALES_PERS1.sales_pers ),'Self') AS Visited_With, " +
" listagg(strg_meet.strg_code, ',') within group (order by strg_meet.strg_code) as Strg_Code, " +
"nvl(count(strg_meet.strg_code),0) as Tot_Calls ," + "nvl(count(strg_meet.strg_code),0) as Tot_Calls ," +
"nvl((select count(distinct strg_code) from STRG_ITEM_DISPLAY SID where SID.dcr_id=strg_meet.dcr_id),0) as display ,"+
"FN_R_TOT_PC(strg_meet.dcr_id,strg_meet.EVENT_DATE," + "FN_R_TOT_PC(strg_meet.dcr_id,strg_meet.EVENT_DATE," +
"strg_meet.sales_pers,strg_meet.Locality_Code) as Tot_PC ," + "strg_meet.sales_pers,strg_meet.Locality_Code) as Tot_PC ," +
"round((CASE When FN_R_FW_CUMM_DAYS(strg_meet.EVENT_DATE,strg_meet.sales_pers) = 0 then 0 " + "round((CASE When FN_R_FW_CUMM_DAYS(strg_meet.EVENT_DATE,strg_meet.sales_pers) = 0 then 0 " +
"else FN_R_CUMM_SMO(strg_meet.EVENT_DATE,strg_meet.sales_pers)/FN_R_FW_CUMM_DAYS(strg_meet.EVENT_DATE,strg_meet.sales_pers) end),2) as TLSD ," + "else FN_R_CUMM_SMO(strg_meet.EVENT_DATE,strg_meet.sales_pers)/FN_R_FW_CUMM_DAYS(strg_meet.EVENT_DATE,strg_meet.sales_pers) end),2) as TLSD ," +
" FN_R_CUMM_SMO(strg_meet.EVENT_DATE,strg_meet.sales_pers) as day_tlsd," +
" FN_R_FW_CUMM_DAYS(strg_meet.EVENT_DATE,strg_meet.sales_pers) as day_count," +
"FN_R_ORD_VAL(strg_meet.dcr_id,strg_meet.EVENT_DATE,strg_meet.sales_pers,strg_meet.Locality_Code) as Ord_Val " + "FN_R_ORD_VAL(strg_meet.dcr_id,strg_meet.EVENT_DATE,strg_meet.sales_pers,strg_meet.Locality_Code) as Ord_Val " +
"FROM sales_pers " + "FROM sales_pers " +
"INNER JOIN " + "INNER JOIN " +
...@@ -1184,6 +1151,8 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -1184,6 +1151,8 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
rowData.put("salesperson_name", ""); rowData.put("salesperson_name", "");
rowData.put("salesperson_code", ""); rowData.put("salesperson_code", "");
} }
rowData.put("month",checkNull (rs.getString("MONTH"))); rowData.put("month",checkNull (rs.getString("MONTH")));
rowData.put("year", checkNull(rs.getString("YEAR"))); rowData.put("year", checkNull(rs.getString("YEAR")));
rowData.put("sales_pers_code_hidden",checkNull( rs.getString("SALES_PERS_CODE"))); rowData.put("sales_pers_code_hidden",checkNull( rs.getString("SALES_PERS_CODE")));
...@@ -1196,11 +1165,6 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS ...@@ -1196,11 +1165,6 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
rowData.put("tlsd",checkNull( rs.getString("TLSD"))); rowData.put("tlsd",checkNull( rs.getString("TLSD")));
rowData.put("ordval",checkNull( rs.getString("ORD_VAL"))); rowData.put("ordval",checkNull( rs.getString("ORD_VAL")));
rowData.put("day_tlsd",checkNull( rs.getString("day_tlsd"))); //Added by chetan for calculate tlsd
rowData.put("day_count",checkNull( rs.getString("day_count"))); //Added by chetan for calculate tlsd
rowData.put("display",checkNull( rs.getString("display"))); //Added by chetan for calculate display
rowData.put("Strg_Code",checkNull( rs.getString("Strg_Code"))); //Added by chetan for calculate eco
rawDataMTDWorkDtlJson.put(count, rowData); rawDataMTDWorkDtlJson.put(count, rowData);
count++; count++;
} }
......
webitm-dashboard/ibase/dashboard/sfa/ejb/CustomerMeetingTrends.java
View file @ e9770ccf
package ibase.dashboard.sfa.ejb; package ibase.dashboard.sfa.ejb;
import ibase.system.config.ConnDriver; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
...@@ -17,6 +17,7 @@ import javax.ejb.Stateless; ...@@ -17,6 +17,7 @@ import javax.ejb.Stateless;
@Stateless @Stateless
public class CustomerMeetingTrends extends ValidatorEJB implements CustomerMeetingTrendsRemote, CustomerMeetingTrendsLocal public class CustomerMeetingTrends extends ValidatorEJB implements CustomerMeetingTrendsRemote, CustomerMeetingTrendsLocal
{ {
E12GenericUtility e12GenericUtility = new E12GenericUtility();
/** /**
* Default constructor. * Default constructor.
*/ */
...@@ -43,14 +44,12 @@ public class CustomerMeetingTrends extends ValidatorEJB implements CustomerMeeti ...@@ -43,14 +44,12 @@ public class CustomerMeetingTrends extends ValidatorEJB implements CustomerMeeti
return ""; return "";
} }
public String getData(String loginCode) throws RemoteException, ITMException public String getData(String loginCode) throws RemoteException, ITMException
{ {
String sql = ""; String sql = "";
ResultSet rs = null; ResultSet rs = null;
Connection conn = null; Connection conn = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ConnDriver connDriver = new ConnDriver();
StringBuffer xmlData = null; StringBuffer xmlData = null;
List<String> weekList = new ArrayList<String>(); List<String> weekList = new ArrayList<String>();
...@@ -61,16 +60,15 @@ public class CustomerMeetingTrends extends ValidatorEJB implements CustomerMeeti ...@@ -61,16 +60,15 @@ public class CustomerMeetingTrends extends ValidatorEJB implements CustomerMeeti
List<String> unlistedList = new ArrayList<String>(); List<String> unlistedList = new ArrayList<String>();
try try
{ {
conn = connDriver.getConnectDB("DriverITM"); /*conn = connDriver.getConnectDB("DriverITM");
connDriver = null; connDriver = null;*/
/*add new code for connection DB on dated:14062016 by Nikhil*/
conn = getConnection();
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"; 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 = conn.prepareStatement(sql);
pstmt.setString(1, loginCode); pstmt.setString(1, loginCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
xmlData = new StringBuffer("<?xml version='1.0'?> <Root>"); xmlData = new StringBuffer("<?xml version='1.0'?> <Root>");
while (rs.next()) while (rs.next())
{ {
cyearList.add(rs.getString(3)); cyearList.add(rs.getString(3));
...@@ -79,9 +77,7 @@ public class CustomerMeetingTrends extends ValidatorEJB implements CustomerMeeti ...@@ -79,9 +77,7 @@ public class CustomerMeetingTrends extends ValidatorEJB implements CustomerMeeti
chemistList.add(rs.getString(6)); chemistList.add(rs.getString(6));
stockistList.add(rs.getString(7)); stockistList.add(rs.getString(7));
unlistedList.add(rs.getString(8)); unlistedList.add(rs.getString(8));
} }
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
rs.close(); rs.close();
......
webitm-dashboard/ibase/dashboard/sfa/ejb/DoctorsMeetingByClass.java
View file @ e9770ccf
package ibase.dashboard.sfa.ejb; package ibase.dashboard.sfa.ejb;
import javax.ejb.Stateless; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.*; import java.sql.Connection;
import ibase.system.config.ConnDriver; import java.sql.PreparedStatement;
import java.sql.ResultSet;
import javax.ejb.Stateless;
/** /**
* Session Bean implementation class DashboardPortal * Session Bean implementation class DashboardPortal
...@@ -13,6 +15,7 @@ import ibase.system.config.ConnDriver; ...@@ -13,6 +15,7 @@ import ibase.system.config.ConnDriver;
@Stateless @Stateless
public class DoctorsMeetingByClass extends ValidatorEJB implements DoctorsMeetingByClassRemote, DoctorsMeetingByClassLocal public class DoctorsMeetingByClass extends ValidatorEJB implements DoctorsMeetingByClassRemote, DoctorsMeetingByClassLocal
{ {
E12GenericUtility e12GenericUtility = new E12GenericUtility();
/** /**
* Default constructor. * Default constructor.
...@@ -54,12 +57,14 @@ public class DoctorsMeetingByClass extends ValidatorEJB implements DoctorsMeetin ...@@ -54,12 +57,14 @@ public class DoctorsMeetingByClass extends ValidatorEJB implements DoctorsMeetin
ResultSet rs = null; ResultSet rs = null;
Connection conn = null; Connection conn = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ConnDriver connDriver = new ConnDriver();
StringBuffer xmlData = null; StringBuffer xmlData = null;
try try
{ {
conn = connDriver.getConnectDB("DriverITM"); /*conn = connDriver.getConnectDB("DriverITM");
connDriver = null; connDriver = null;*/
/*add new code for connection DB on dated:14062016 by Nikhil*/
conn = getConnection();
/*Calendar c= Calendar.getInstance(); /*Calendar c= Calendar.getInstance();
java.util.Date date = new java.util.Date(c.getTimeInMillis()); java.util.Date date = new java.util.Date(c.getTimeInMillis());
......
webitm-dashboard/ibase/dashboard/sfa/ejb/DoctorsVisit.java
View file @ e9770ccf
package ibase.dashboard.sfa.ejb; package ibase.dashboard.sfa.ejb;
import ibase.dashboard.Report.Utility.DashboardUtility; import ibase.dashboard.Report.Utility.DashboardUtility;
import ibase.system.config.ConnDriver; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
/** /**
* Session Bean implementation class SalesPersonSales * Session Bean implementation class SalesPersonSales
...@@ -20,7 +18,7 @@ public class DoctorsVisit extends ValidatorEJB implements DoctorsVisitRemote, Do ...@@ -20,7 +18,7 @@ public class DoctorsVisit extends ValidatorEJB implements DoctorsVisitRemote, Do
public DoctorsVisit() { public DoctorsVisit() {
// TODO Auto-generated constructor stub // TODO Auto-generated constructor stub
} }
E12GenericUtility e12GenericUtility = new E12GenericUtility();
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getDoctorsVisitDetails(String loginId, String salesPerson, String month, String year,String dataSourceName) throws RemoteException, ITMException public JSONObject getDoctorsVisitDetails(String loginId, String salesPerson, String month, String year,String dataSourceName) throws RemoteException, ITMException
...@@ -31,16 +29,16 @@ public class DoctorsVisit extends ValidatorEJB implements DoctorsVisitRemote, Do ...@@ -31,16 +29,16 @@ public class DoctorsVisit extends ValidatorEJB implements DoctorsVisitRemote, Do
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
DashboardUtility dashbordUtil = null; DashboardUtility dashbordUtil = null;
try try
{ {
System.out.println(" Inside DoctorsVisitEJB for Data Soruc Name ="+dataSourceName+" loginId=:"+ loginId+":=== salesPerson is =" + salesPerson +" month is =" + month +" year is =" + year); System.out.println(" Inside DoctorsVisitEJB for Data Soruc Name ="+dataSourceName+" loginId=:"+ loginId+":=== salesPerson is =" + salesPerson +" month is =" + month +" year is =" + year);
dashbordUtil = new DashboardUtility(); dashbordUtil = new DashboardUtility();
salesPerson = dashbordUtil.getCommaSeparated(salesPerson.trim()); salesPerson = dashbordUtil.getCommaSeparated(salesPerson.trim());
conn = connDriver.getConnectDB(dataSourceName); /*conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null; */
/*add new code for connection DB on dated:17062016 by Nikhil*/
conn = getConnection();
/*sql = " select A.sales_pers, A.SALESPERSON_NAME, " /*sql = " select A.sales_pers, A.SALESPERSON_NAME, "
......
webitm-dashboard/ibase/dashboard/sfa/ejb/ExpenseProcessStatus.java
View file @ e9770ccf
package ibase.dashboard.sfa.ejb; package ibase.dashboard.sfa.ejb;
import javax.ejb.Stateless; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.*; import java.sql.Connection;
import ibase.system.config.ConnDriver; import java.sql.PreparedStatement;
import java.sql.ResultSet;
import javax.ejb.Stateless;
/** /**
* Session Bean implementation class DashboardPortal * Session Bean implementation class DashboardPortal
...@@ -13,7 +17,7 @@ import ibase.system.config.ConnDriver; ...@@ -13,7 +17,7 @@ import ibase.system.config.ConnDriver;
@Stateless @Stateless
public class ExpenseProcessStatus extends ValidatorEJB implements ExpenseProcessStatusRemote, ExpenseProcessStatusLocal public class ExpenseProcessStatus extends ValidatorEJB implements ExpenseProcessStatusRemote, ExpenseProcessStatusLocal
{ {
E12GenericUtility e12GenericUtility = new E12GenericUtility();
/** /**
* Default constructor. * Default constructor.
*/ */
...@@ -56,13 +60,14 @@ public class ExpenseProcessStatus extends ValidatorEJB implements ExpenseProcess ...@@ -56,13 +60,14 @@ public class ExpenseProcessStatus extends ValidatorEJB implements ExpenseProcess
ResultSet rs = null; ResultSet rs = null;
Connection conn = null; Connection conn = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ConnDriver connDriver = new ConnDriver();
StringBuffer xmlData = null; StringBuffer xmlData = null;
try try
{ {
conn = connDriver.getConnectDB("DriverITM"); /*conn = connDriver.getConnectDB("DriverITM");
connDriver = null; connDriver = null;*/
/*add new code for connection DB on dated:14062016 by Nikhil*/
conn = getConnection();
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 "; 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); pstmt = conn.prepareStatement(sql);
......
webitm-dashboard/ibase/dashboard/sfa/ejb/ImpDocMissed.java
View file @ e9770ccf
...@@ -4,11 +4,9 @@ import java.rmi.RemoteException; ...@@ -4,11 +4,9 @@ import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import ibase.utility.E12GenericUtility;
import ibase.system.config.ConnDriver;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import javax.ejb.Stateless; import javax.ejb.Stateless;
/** /**
...@@ -17,6 +15,7 @@ import javax.ejb.Stateless; ...@@ -17,6 +15,7 @@ import javax.ejb.Stateless;
@Stateless @Stateless
public class ImpDocMissed extends ValidatorEJB implements ImpDocMissedRemote, ImpDocMissedLocal public class ImpDocMissed extends ValidatorEJB implements ImpDocMissedRemote, ImpDocMissedLocal
{ {
E12GenericUtility e12GenericUtility = new E12GenericUtility();
/** /**
* Default constructor. * Default constructor.
*/ */
...@@ -51,14 +50,13 @@ public class ImpDocMissed extends ValidatorEJB implements ImpDocMissedRemote, Im ...@@ -51,14 +50,13 @@ public class ImpDocMissed extends ValidatorEJB implements ImpDocMissedRemote, Im
ResultSet rs = null; ResultSet rs = null;
Connection conn = null; Connection conn = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ConnDriver connDriver = new ConnDriver();
StringBuffer xmlData = null; StringBuffer xmlData = null;
try try
{ {
conn = connDriver.getConnectDB("DriverITM"); /*conn = connDriver.getConnectDB("DriverITM");
connDriver = null; connDriver = null;*/
/*add new code for connection DB on dated:14062016 by Nikhil*/
conn = getConnection();
//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 (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 "; 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
View file @ e9770ccf
package ibase.dashboard.sfa.ejb; package ibase.dashboard.sfa.ejb;
import ibase.system.config.ConnDriver; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import javax.ejb.Stateless; import javax.ejb.Stateless;
/** /**
...@@ -16,7 +14,7 @@ import javax.ejb.Stateless; ...@@ -16,7 +14,7 @@ import javax.ejb.Stateless;
*/ */
@Stateless @Stateless
public class ImpEvents extends ValidatorEJB implements ImpEventsRemote, ImpEventsLocal { public class ImpEvents extends ValidatorEJB implements ImpEventsRemote, ImpEventsLocal {
E12GenericUtility e12GenericUtility = new E12GenericUtility();
/** /**
* Default constructor. * Default constructor.
*/ */
...@@ -39,13 +37,13 @@ public class ImpEvents extends ValidatorEJB implements ImpEventsRemote, ImpEven ...@@ -39,13 +37,13 @@ public class ImpEvents extends ValidatorEJB implements ImpEventsRemote, ImpEven
ResultSet rs = null; ResultSet rs = null;
Connection conn = null; Connection conn = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ConnDriver connDriver = new ConnDriver();
StringBuffer xmlData =null; StringBuffer xmlData =null;
try try
{ {
conn = connDriver.getConnectDB("DriverITM"); /*conn = connDriver.getConnectDB("DriverITM");
connDriver = null; connDriver = null;*/
/*add new code for connection DB on dated:14062016 by Nikhil*/
conn = getConnection();
xmlData = new StringBuffer("<?xml version=\"1.0\"?><Root>"); 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"; 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";
...@@ -132,11 +130,7 @@ public class ImpEvents extends ValidatorEJB implements ImpEventsRemote, ImpEven ...@@ -132,11 +130,7 @@ public class ImpEvents extends ValidatorEJB implements ImpEventsRemote, ImpEven
} }
} }
return xmlData.toString(); return xmlData.toString();
} }
private String checkNull(String input) private String checkNull(String input)
{ {
if (input == null) if (input == null)
......
webitm-dashboard/ibase/dashboard/sfa/ejb/OutletsVisitEJB.java
View file @ e9770ccf
package ibase.dashboard.sfa.ejb; package ibase.dashboard.sfa.ejb;
import ibase.dashboard.Report.Utility.DashboardUtility; import ibase.dashboard.Report.Utility.DashboardUtility;
import ibase.system.config.ConnDriver; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
...@@ -22,7 +22,7 @@ public class OutletsVisitEJB extends ValidatorEJB implements OutletsVisitRemote, ...@@ -22,7 +22,7 @@ public class OutletsVisitEJB extends ValidatorEJB implements OutletsVisitRemote,
public OutletsVisitEJB() { public OutletsVisitEJB() {
// TODO Auto-generated constructor stub // TODO Auto-generated constructor stub
} }
E12GenericUtility e12GenericUtility = new E12GenericUtility();
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getOutletVisitDetails(String loginId, String salesPerson, String month, String year,String dataSourceName) throws RemoteException, ITMException public JSONObject getOutletVisitDetails(String loginId, String salesPerson, String month, String year,String dataSourceName) throws RemoteException, ITMException
...@@ -33,7 +33,6 @@ public class OutletsVisitEJB extends ValidatorEJB implements OutletsVisitRemote, ...@@ -33,7 +33,6 @@ public class OutletsVisitEJB extends ValidatorEJB implements OutletsVisitRemote,
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
DashboardUtility dashbordUtil = null; DashboardUtility dashbordUtil = null;
try try
{ {
...@@ -41,9 +40,10 @@ public class OutletsVisitEJB extends ValidatorEJB implements OutletsVisitRemote, ...@@ -41,9 +40,10 @@ public class OutletsVisitEJB extends ValidatorEJB implements OutletsVisitRemote,
salesPerson= dashbordUtil.getCommaSeparated(salesPerson); salesPerson= dashbordUtil.getCommaSeparated(salesPerson);
System.out.println("Data Soruc Name ="+dataSourceName); System.out.println("Data Soruc Name ="+dataSourceName);
System.out.println("salesPerson is =" + salesPerson +"month is =" + month +"year is =" + year ) ; System.out.println("salesPerson is =" + salesPerson +"month is =" + month +"year is =" + year ) ;
conn = connDriver.getConnectDB(dataSourceName); /*conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null; */
/*add new code for connection DB on dated:17062016 by Nikhil*/
conn = getConnection();
/* sql = " SELECT" + /* sql = " SELECT" +
" A.sales_pers," + " A.sales_pers," +
" A.SALESPERSON_NAME," + " A.SALESPERSON_NAME," +
......
webitm-dashboard/ibase/dashboard/sfa/ejb/PendingStatus.java
View file @ e9770ccf
package ibase.dashboard.sfa.ejb; package ibase.dashboard.sfa.ejb;
import ibase.dashboard.Report.Utility.DashboardUtility; import ibase.dashboard.Report.Utility.DashboardUtility;
import ibase.system.config.ConnDriver; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
...@@ -17,6 +15,7 @@ import org.json.simple.JSONObject; ...@@ -17,6 +15,7 @@ import org.json.simple.JSONObject;
public class PendingStatus extends ValidatorEJB implements PendingStatusLocal, public class PendingStatus extends ValidatorEJB implements PendingStatusLocal,
PendingStatusRemote PendingStatusRemote
{ {
E12GenericUtility e12GenericUtility = new E12GenericUtility();
public PendingStatus() public PendingStatus()
{ {
} }
...@@ -31,14 +30,16 @@ PendingStatusRemote ...@@ -31,14 +30,16 @@ PendingStatusRemote
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
int count = 0; int count = 0;
DashboardUtility dashboardUtility = null; DashboardUtility dashboardUtility = null;
try try
{ {
SimpleDateFormat convertToDbDate =new SimpleDateFormat(new GenericUtility().getDBDateFormat()); SimpleDateFormat convertToDbDate =new SimpleDateFormat(new E12GenericUtility().getDBDateFormat());
SimpleDateFormat simpleDateFormat =new SimpleDateFormat(new GenericUtility().getApplDateFormat()); SimpleDateFormat simpleDateFormat =new SimpleDateFormat(new E12GenericUtility().getApplDateFormat());
conn = connDriver.getConnectDB(dataSourceName); /*conn = connDriver.getConnectDB(dataSourceName);*/
/*add new code for connection DB on dated:14062016 by Nikhil*/
conn = getConnection();
dashboardUtility = new DashboardUtility(); dashboardUtility = new DashboardUtility();
empSite = dashboardUtility.getCommaSeparated(empSite); empSite = dashboardUtility.getCommaSeparated(empSite);
sql = " WITH PRD AS " sql = " WITH PRD AS "
......
webitm-dashboard/ibase/dashboard/sfa/ejb/PendingStatusLocal.java
View file @ e9770ccf
...@@ -9,6 +9,6 @@ import org.json.simple.JSONObject; ...@@ -9,6 +9,6 @@ import org.json.simple.JSONObject;
@Local @Local
public abstract interface PendingStatusLocal extends ValidatorLocal 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
View file @ e9770ccf
...@@ -9,7 +9,7 @@ import org.json.simple.JSONObject; ...@@ -9,7 +9,7 @@ import org.json.simple.JSONObject;
@Remote @Remote
public abstract interface PendingStatusRemote extends ValidatorRemote 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
View file @ e9770ccf
package ibase.dashboard.sfa.ejb; package ibase.dashboard.sfa.ejb;
import ibase.system.config.ConnDriver; import ibase.system.config.ConnDriver;
import ibase.utility.E12GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
...@@ -16,6 +17,7 @@ import javax.ejb.Stateless; ...@@ -16,6 +17,7 @@ import javax.ejb.Stateless;
@Stateless @Stateless
public class PlannedVSActualActionTypes implements PlannedVSActualActionTypesRemote, PlannedVSActualActionTypesLocal { public class PlannedVSActualActionTypes implements PlannedVSActualActionTypesRemote, PlannedVSActualActionTypesLocal {
E12GenericUtility e12GenericUtility = new E12GenericUtility();
/** /**
* Default constructor. * Default constructor.
*/ */
......
webitm-dashboard/ibase/dashboard/sfa/ejb/ProductAssessment.java
View file @ e9770ccf
package ibase.dashboard.sfa.ejb; package ibase.dashboard.sfa.ejb;
import ibase.dashboard.Report.Utility.DashboardUtility; import ibase.dashboard.Report.Utility.DashboardUtility;
import ibase.system.config.ConnDriver; import ibase.system.config.ConnDriver;
import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
/** /**
* Session Bean implementation class SalesPersonSales * Session Bean implementation class SalesPersonSales
...@@ -19,10 +16,11 @@ import org.json.simple.JSONObject; ...@@ -19,10 +16,11 @@ import org.json.simple.JSONObject;
@Stateless @Stateless
public class ProductAssessment extends ValidatorEJB implements ProductAssessmentLocal, ProductAssessmentRemote public class ProductAssessment extends ValidatorEJB implements ProductAssessmentLocal, ProductAssessmentRemote
{ {
E12GenericUtility e12GenericUtility = new E12GenericUtility();
public ProductAssessment() { public ProductAssessment() {
// TODO Auto-generated constructor stub // TODO Auto-generated constructor stub
} }
GenericUtility genericUtility = GenericUtility.getInstance();
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getProductAssessmentEventServlet(String loginId, String dataSourceName,String zone,String region,String product,String team,String event) throws RemoteException, ITMException public JSONObject getProductAssessmentEventServlet(String loginId, String dataSourceName,String zone,String region,String product,String team,String event) throws RemoteException, ITMException
...@@ -38,13 +36,16 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment ...@@ -38,13 +36,16 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
DashboardUtility dashbordUtil = new DashboardUtility(); DashboardUtility dashbordUtil = new DashboardUtility();
try try
{ {
conn = connDriver.getConnectDB(dataSourceName); /*conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null; */
/*add new code for connection DB on dated:14062016 by Nikhil*/
conn = getConnection();
if ((product != null) && (product.trim().length() > 0)) if ((product != null) && (product.trim().length() > 0))
{ {
product = dashbordUtil.getCommaSeparated(product); product = dashbordUtil.getCommaSeparated(product);
...@@ -187,13 +188,15 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment ...@@ -187,13 +188,15 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
double percntVal = 0.0; double percntVal = 0.0;
try try
{ {
System.out.println(" Inside ProductAssessment for getProductAssessmentProductPieServlet Data Soruc Name ="+dataSourceName+ "==== personName :"+personName); System.out.println(" Inside ProductAssessment for getProductAssessmentProductPieServlet Data Soruc Name ="+dataSourceName+ "==== personName :"+personName);
conn = connDriver.getConnectDB(dataSourceName); /*conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;*/
/*add new code for connection DB on dated:14062016 by Nikhil*/
conn = getConnection();
/*sql_base = "select MGR, NAME, SURVEY, SUM(RESULT) RESULT from ( SELECT (e1.FIRSTNAME +' '+ e1.LASTNAME) as MGR, " + /*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 " + "(e.FIRSTNAME +' '+ e.LASTNAME) as NAME, sm.descr as SURVEY, CAST(SRD.result AS INT) RESULT " +
...@@ -318,14 +321,14 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment ...@@ -318,14 +321,14 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
double percntVal = 0.0; double percntVal = 0.0;
try try
{ {
System.out.println(" Inside ProductAssessment for getProductAssessmentProductServlet Data Soruc Name ="+dataSourceName+ "==== personName :"+personName); System.out.println(" Inside ProductAssessment for getProductAssessmentProductServlet Data Soruc Name ="+dataSourceName+ "==== personName :"+personName);
conn = connDriver.getConnectDB(dataSourceName); /*conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;*/
/*add new code for connection DB on dated:14062016 by Nikhil*/
conn = getConnection();
/*sql_base = "select MGR, NAME, SURVEY, SUM(RESULT) RESULT from ( SELECT (e1.FIRSTNAME +' '+ e1.LASTNAME) as MGR, " + /*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 " + "(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 " + "FROM hr.hr.dbo.survey_result_EMP SRE INNER JOIN hr.hr.dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " +
...@@ -397,12 +400,6 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment ...@@ -397,12 +400,6 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
while (rs.next()) 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"))); rsltCnt= Double.parseDouble(checkNull( rs.getString("RESULTCNT")));
total= Double.parseDouble(checkNull( rs.getString("TOTAL"))); total= Double.parseDouble(checkNull( rs.getString("TOTAL")));
System.out.println("rsltCnt:"+rsltCnt); System.out.println("rsltCnt:"+rsltCnt);
...@@ -463,14 +460,13 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment ...@@ -463,14 +460,13 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
try try
{ {
System.out.println(" Inside ProductAssessment for getProductAssessmentProductRatingServlet Data Soruc Name ="+dataSourceName+" personName=:"+ personName + "=== productName :"+ productName); System.out.println(" Inside ProductAssessment for getProductAssessmentProductRatingServlet Data Soruc Name ="+dataSourceName+" personName=:"+ personName + "=== productName :"+ productName);
conn = connDriver.getConnectDB(dataSourceName); /*conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;*/
/*add new code for connection DB on dated:14062016 by Nikhil*/
conn = getConnection();
/*sql= "select MGR, SUM(RESULT) RESULT from ( SELECT (e1.FIRSTNAME +' '+ e1.LASTNAME) as MGR, " + /*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 " + "(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 " + "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
View file @ e9770ccf
package ibase.dashboard.sfa.ejb; package ibase.dashboard.sfa.ejb;
import ibase.dashboard.Report.Utility.DashboardUtility; import ibase.dashboard.Report.Utility.DashboardUtility;
import ibase.system.config.ConnDriver; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
...@@ -17,8 +17,10 @@ public class RSRScoreEJB extends ValidatorEJB implements RSRScoreRemote, RSRScor ...@@ -17,8 +17,10 @@ public class RSRScoreEJB extends ValidatorEJB implements RSRScoreRemote, RSRScor
{ {
public RSRScoreEJB() public RSRScoreEJB()
{} {}
E12GenericUtility e12GenericUtility = new E12GenericUtility();
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getRSRScoreDetails(String salesPerson, String month, String year,String dataSourceName) throws RemoteException, ITMException public JSONObject getRSRScoreDetails(String salesPerson, String month, String year,String dataSourceName) throws RemoteException, ITMException
{ {
JSONObject rawDataMnthDivWiseSalesJson = new JSONObject(); JSONObject rawDataMnthDivWiseSalesJson = new JSONObject();
...@@ -27,7 +29,6 @@ public class RSRScoreEJB extends ValidatorEJB implements RSRScoreRemote, RSRScor ...@@ -27,7 +29,6 @@ public class RSRScoreEJB extends ValidatorEJB implements RSRScoreRemote, RSRScor
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
DashboardUtility dashbordUtil = null; DashboardUtility dashbordUtil = null;
...@@ -36,8 +37,10 @@ public class RSRScoreEJB extends ValidatorEJB implements RSRScoreRemote, RSRScor ...@@ -36,8 +37,10 @@ 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); System.out.println(" Inside RSRScoreEJB for Data Soruc Name ="+dataSourceName+" salesPerson is =" + salesPerson +" month is =" + month +" year is =" + year);
dashbordUtil = new DashboardUtility(); dashbordUtil = new DashboardUtility();
salesPerson= dashbordUtil.getCommaSeparated(salesPerson); salesPerson= dashbordUtil.getCommaSeparated(salesPerson);
conn = connDriver.getConnectDB(dataSourceName); /*conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null; */
/*add new code for connection DB on dated:17062016 by Nikhil*/
conn = getConnection();
sql = " Select station.descr as territory, RSR_SCORE.insight_id as insight_id, RSR_SCORE.rep_name as sales_pers, " + 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, " + " sum(field_working_days) as field_working_days, sum(target_outlets) as target_outlets, " +
......
webitm-dashboard/ibase/dashboard/sfa/ejb/RSRSurveyEJB.java
View file @ e9770ccf
package ibase.dashboard.sfa.ejb; package ibase.dashboard.sfa.ejb;
import ibase.dashboard.Report.Utility.DashboardUtility; import ibase.dashboard.Report.Utility.DashboardUtility;
import ibase.system.config.ConnDriver; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
...@@ -16,7 +16,7 @@ import org.json.simple.JSONObject; ...@@ -16,7 +16,7 @@ import org.json.simple.JSONObject;
public class RSRSurveyEJB extends ValidatorEJB implements RSRSurveyRemote, RSRSurveyLocal { public class RSRSurveyEJB extends ValidatorEJB implements RSRSurveyRemote, RSRSurveyLocal {
public RSRSurveyEJB() { public RSRSurveyEJB() {
} }
E12GenericUtility e12GenericUtility = new E12GenericUtility();
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public JSONObject getRSRSurveyDetails(String loginId, String salesPerson, String month, String year,String dataSourceName) throws RemoteException, ITMException public JSONObject getRSRSurveyDetails(String loginId, String salesPerson, String month, String year,String dataSourceName) throws RemoteException, ITMException
{ {
...@@ -26,7 +26,6 @@ public class RSRSurveyEJB extends ValidatorEJB implements RSRSurveyRemote, RSRSu ...@@ -26,7 +26,6 @@ public class RSRSurveyEJB extends ValidatorEJB implements RSRSurveyRemote, RSRSu
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
DashboardUtility dashbordUtil = null; DashboardUtility dashbordUtil = null;
try try
...@@ -34,9 +33,10 @@ public class RSRSurveyEJB extends ValidatorEJB implements RSRSurveyRemote, RSRSu ...@@ -34,9 +33,10 @@ 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); System.out.println(" Inside RSRSurveyEJB for Data Soruc Name ="+dataSourceName+" loginId:"+loginId+" salesPerson is =" + salesPerson +" month is =" + month +" year is =" + year);
dashbordUtil = new DashboardUtility(); dashbordUtil = new DashboardUtility();
salesPerson = dashbordUtil.getCommaSeparated(salesPerson); salesPerson = dashbordUtil.getCommaSeparated(salesPerson);
conn = connDriver.getConnectDB(dataSourceName); /*conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;*/
/*add new code for connection DB on dated:17062016 by Nikhil*/
conn = getConnection();
/*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, " /*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, " +" 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 " +" 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
View file @ e9770ccf
package ibase.dashboard.sfa.ejb; package ibase.dashboard.sfa.ejb;
import ibase.dashboard.Report.Utility.DashboardUtility; import ibase.dashboard.Report.Utility.DashboardUtility;
import ibase.system.config.ConnDriver; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
...@@ -9,10 +9,7 @@ import java.sql.Connection; ...@@ -9,10 +9,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
/** /**
* Session Bean implementation class RXSurvey * Session Bean implementation class RXSurvey
*/ */
...@@ -25,7 +22,7 @@ public class RXSurveyEJB extends ValidatorEJB implements RXSurveyRemote, RXSurve ...@@ -25,7 +22,7 @@ public class RXSurveyEJB extends ValidatorEJB implements RXSurveyRemote, RXSurve
public RXSurveyEJB() { public RXSurveyEJB() {
// TODO Auto-generated constructor stub // TODO Auto-generated constructor stub
} }
E12GenericUtility e12GenericUtility = new E12GenericUtility();
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getRXSurveyDetails(String loginId, String salesPerson, String month, String year,String dataSourceName) throws RemoteException, ITMException public JSONObject getRXSurveyDetails(String loginId, String salesPerson, String month, String year,String dataSourceName) throws RemoteException, ITMException
...@@ -36,7 +33,6 @@ public class RXSurveyEJB extends ValidatorEJB implements RXSurveyRemote, RXSurve ...@@ -36,7 +33,6 @@ public class RXSurveyEJB extends ValidatorEJB implements RXSurveyRemote, RXSurve
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
DashboardUtility dashbordUtil = null; DashboardUtility dashbordUtil = null;
try try
...@@ -44,9 +40,10 @@ public class RXSurveyEJB extends ValidatorEJB implements RXSurveyRemote, RXSurve ...@@ -44,9 +40,10 @@ 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); System.out.println(" Inside RXSurveyEJB for Data Soruc Name ="+dataSourceName+" loginId:"+loginId+" salesPerson is =" + salesPerson +" month is =" + month +" year is =" + year);
dashbordUtil = new DashboardUtility(); dashbordUtil = new DashboardUtility();
salesPerson= dashbordUtil.getCommaSeparated(salesPerson); salesPerson= dashbordUtil.getCommaSeparated(salesPerson);
conn = connDriver.getConnectDB(dataSourceName); /*conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;*/
/*add new code for connection DB on dated:17062016 by Nikhil*/
conn = getConnection();
/*sql = " Select SP.Sales_Pers as Sales_Pers,SP.Sp_Name as Sp_Name,Max(SM.Event_Date) as Max_Event_Date, " /*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, " +" 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, " +" 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
View file @ e9770ccf
package ibase.dashboard.sfa.ejb; package ibase.dashboard.sfa.ejb;
import ibase.utility.E12GenericUtility;
import ibase.system.config.ConnDriver;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
...@@ -18,7 +13,7 @@ import org.json.simple.JSONObject; ...@@ -18,7 +13,7 @@ import org.json.simple.JSONObject;
public class TargetVsAchievement extends ValidatorEJB implements TargetVsAchievementRemote, TargetVsAchievementLocal public class TargetVsAchievement extends ValidatorEJB implements TargetVsAchievementRemote, TargetVsAchievementLocal
{ {
GenericUtility genericUtility = new GenericUtility(); E12GenericUtility e12GenericUtility = new E12GenericUtility();
/********** Start of method getTargetVsAchievement() /********** Start of method getTargetVsAchievement()
* EJB Name : TargetVsAchievement.java * EJB Name : TargetVsAchievement.java
...@@ -37,15 +32,13 @@ public class TargetVsAchievement extends ValidatorEJB implements TargetVsAchiev ...@@ -37,15 +32,13 @@ public class TargetVsAchievement extends ValidatorEJB implements TargetVsAchiev
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
int count=0; int count=0;
SimpleDateFormat simpleDateFormat = null;
Calendar calendar = null;
try try
{ {
conn = connDriver.getConnectDB(dataSourceName); /*conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null; */
/*add new code for connection DB on dated:14062016 by Nikhil*/
conn = getConnection();
System.out.println(" Inside getSDNoAttemptAnalyticsTopServlet() for Data Soruc Name ="+dataSourceName); System.out.println(" Inside getSDNoAttemptAnalyticsTopServlet() for Data Soruc Name ="+dataSourceName);
/*if ( (prdCode == null || prdCode.trim().length()==0 ) ||(prdCode.equals(""))) /*if ( (prdCode == null || prdCode.trim().length()==0 ) ||(prdCode.equals("")))
{ {
......
webitm-dashboard/ibase/dashboard/sfa/ejb/TaskActivity.java
View file @ e9770ccf
package ibase.dashboard.sfa.ejb; package ibase.dashboard.sfa.ejb;
import ibase.system.config.ConnDriver; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
...@@ -12,13 +11,13 @@ import java.text.SimpleDateFormat; ...@@ -12,13 +11,13 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Set; import java.util.Set;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
@Stateless @Stateless
public class TaskActivity extends ValidatorEJB implements TaskActivityLocal, TaskActivityRemote public class TaskActivity extends ValidatorEJB implements TaskActivityLocal, TaskActivityRemote
{ {
E12GenericUtility e12GenericUtility = new E12GenericUtility();
public TaskActivity() public TaskActivity()
{ {
...@@ -34,21 +33,23 @@ public class TaskActivity extends ValidatorEJB implements TaskActivityLocal, Tas ...@@ -34,21 +33,23 @@ public class TaskActivity extends ValidatorEJB implements TaskActivityLocal, Tas
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver();
ArrayList<String> arrayList = null; ArrayList<String> arrayList = null;
HashMap<String, ArrayList<String>> hashMap = new HashMap<String, ArrayList<String>>(); HashMap<String, ArrayList<String>> hashMap = new HashMap<String, ArrayList<String>>();
ArrayList<String> listData = new ArrayList<String>(); ArrayList<String> listData = new ArrayList<String>();
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
String descr = ""; String descr = "";
Set<String> set = null; Set<String> set = null;
GenericUtility genericUtility = GenericUtility.getInstance();
try try
{ {
conn = connDriver.getConnectDB(dataSourceName); /*conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;*/
/*add new code for connection DB on dated:14062016 by Nikhil*/
conn = getConnection();
//SimpleDateFormat gridDateFormat = new SimpleDateFormat( genericUtility.getApplDateFormat()); //SimpleDateFormat gridDateFormat = new SimpleDateFormat( genericUtility.getApplDateFormat());
SimpleDateFormat gridDateFormat = new SimpleDateFormat( "dd-MMM-yy"); SimpleDateFormat gridDateFormat = new SimpleDateFormat( "dd-MMM-yy");
SimpleDateFormat convrtToTimStmDate= new SimpleDateFormat(genericUtility.getDBDateFormat()); SimpleDateFormat convrtToTimStmDate= new SimpleDateFormat(e12GenericUtility.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, 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, " + sql="WITH PRD AS ( SELECT E.EMP_CODE, (E.EMP_FNAME||' '||E.EMP_MNAME||' '||E.EMP_LNAME) AS EMP__NAME, " +
...@@ -168,14 +169,8 @@ public class TaskActivity extends ValidatorEJB implements TaskActivityLocal, Tas ...@@ -168,14 +169,8 @@ public class TaskActivity extends ValidatorEJB implements TaskActivityLocal, Tas
rowData.put("acct_descr", arrayList.get(1)); rowData.put("acct_descr", arrayList.get(1));
rowData.put("month", arrayList.get(2)); 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)); 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("pending_count", pendingCnt);
rowData.put("tran_date", gridDateFormat.format(convrtToTimStmDate.parse(arrayList.get(5)))); rowData.put("tran_date", gridDateFormat.format(convrtToTimStmDate.parse(arrayList.get(5))));
...@@ -230,10 +225,6 @@ public class TaskActivity extends ValidatorEJB implements TaskActivityLocal, Tas ...@@ -230,10 +225,6 @@ public class TaskActivity extends ValidatorEJB implements TaskActivityLocal, Tas
private String getSplitedStr(String str) private String getSplitedStr(String str)
{ {
String detlArr[] = str.split(","); String detlArr[] = str.split(",");
//System.out.println("detlArr is =" + detlArr);
//System.out.println("detlArr length is =" + detlArr.length);
String dataString = ""; String dataString = "";
for (int j = 0; j < 2; j++) for (int j = 0; j < 2; j++)
{ {
......
webitm-dashboard/ibase/dashboard/sfa/ejb/TaskTracking.java deleted 100755 → 0
View file @ e0d547cc
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 deleted 100755 → 0
View file @ e0d547cc
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 deleted 100755 → 0
View file @ e0d547cc
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/ejb/TransitItemDisplay.java deleted 100755 → 0
View file @ e0d547cc
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 javax.ejb.Stateless;
import org.json.simple.JSONObject;
/**
* Session Bean implementation class RecallDetails
*/
@Stateless
public class TransitItemDisplay extends ValidatorEJB implements TransitItemDisplayRemote, TransitItemDisplayLocal
{
/**
* Default constructor.
*/
public TransitItemDisplay()
{
}
GenericUtility genericUtility = GenericUtility.getInstance();
@SuppressWarnings("unchecked")
public JSONObject getTransitItemDetails(String dataSourceName) throws RemoteException, ITMException
{
JSONObject rawDataTransitJson = new JSONObject();
JSONObject rowData = null;
String sql = "";
ResultSet rs = null;
PreparedStatement pstmt = null;
Connection conn = null;
ConnDriver connDriver = new ConnDriver();
String frDate="",toDate="";
try
{
conn = connDriver.getConnectDB(dataSourceName);
connDriver = null;
SimpleDateFormat simpleDateFormat = new SimpleDateFormat( genericUtility.getApplDateFormat());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
sql =" select THDR.SHIPMENT_ID,THDR.SHIPMENT_DATE,THDR.REF_NO DESPATCH_ID,THDR.REF_DATE DESP_DATE, "
+" THDR.INVOICE_ID,THDR.SHIP_DATE EXP_SHIP_DATE,THDR.EXP_DLV_DATE, "
+" THDR.LR_NO,THDR.LR_DATE,THDR.PRO_NO, "
+" CASE WHEN THDR.SITE_CODE IS NULL THEN '' ELSE THDR.SITE_CODE END "
+" SITE_FR, entity_code,entity_name,THDR.DRUG_LIC_NO,DLV_ADD1,DLV_ADD2, "
+" DLV_CITY,DLV_PIN,STATE_CODE__ENTITY STATE,COUNT_CODE__DLV, "
+" TDET.ITEM_CODE,ITEM.DESCR,LOT_NO,QUANTITY__ORD, "
+" TDET.UNIT,TDET.NO_ART,THDR.GROSS_WEIGHT,THDR.TARE_WEIGHT,THDR.NET_WEIGHT, "
+" TDET.MFG_DATE,TDET.EXP_DATE,TRANSPORTER_TYPE,THDR.TRAN_CODE,TRAN_NAME "
+" from TNT_TRAN_INFO THDR,TNT_TRAN_INFODET TDET,ITEM ITEM,TRANSPORTER TRN WHERE THDR.TRAN_ID=TDET.TRAN_ID AND THDR.TRAN_TYPE='S' "
+" AND TDET.ITEM_CODE=ITEM.ITEM_CODE AND THDR.TRAN_CODE=TRN.TRAN_CODE(+) AND case when THDR.CONFIRMED is null then 'N' else THDR.CONFIRMED end='Y' "
+" AND CASE WHEN THDR.DELIVERED IS NULL THEN 'N' ELSE THDR.DELIVERED END='N'"
+" order by REF_DATE ";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
int count = 0;
while (rs.next())
{
rowData = new JSONObject();
rowData.put("shipment_id", checkNull(rs.getString("SHIPMENT_ID")));
String shipDate=checkNull(rs.getString("SHIPMENT_DATE"));
if(shipDate!=null && shipDate.trim().length()>0)
{
rowData.put("shipment_date", simpleDateFormat.format(sdf.parse(shipDate)));
}
else{
rowData.put("shipment_date", shipDate);
}
rowData.put("despatch_id", checkNull(rs.getString("DESPATCH_ID")));
String despDate=checkNull(rs.getString("DESP_DATE"));
if(despDate!=null && despDate.trim().length()>0)
{
rowData.put("desp_date", simpleDateFormat.format(sdf.parse(despDate)));
}
else{
rowData.put("desp_date", despDate);
}
rowData.put("invoice_id", checkNull(rs.getString("INVOICE_ID")));
String expShipDate=checkNull(rs.getString("EXP_SHIP_DATE"));
if(expShipDate!=null && expShipDate.trim().length()>0)
{
rowData.put("exp_ship_date", simpleDateFormat.format(sdf.parse(expShipDate)));
}
else{
rowData.put("exp_ship_date", expShipDate);
}
String expDlvDate=checkNull(rs.getString("EXP_DLV_DATE"));
if(expDlvDate!=null && expDlvDate.trim().length()>0)
{
rowData.put("exp_dlv_date", simpleDateFormat.format(sdf.parse(expDlvDate)));
}
else{
rowData.put("exp_dlv_date", expDlvDate);
}
rowData.put("lr_no", checkNull(rs.getString("LR_NO")));
String lrDate=checkNull(rs.getString("LR_DATE"));
if(lrDate!=null && lrDate.trim().length()>0)
{
rowData.put("lr_date", simpleDateFormat.format(sdf.parse(lrDate)));
}
else{
rowData.put("lr_date", lrDate);
}
rowData.put("pro_no", checkNull(rs.getString("PRO_NO")));
rowData.put("site_fr", checkNull(rs.getString("SITE_FR")));
rowData.put("entity_code", checkNull(rs.getString("entity_code")));
rowData.put("entity_name", checkNull(rs.getString("entity_name")));
rowData.put("drug_lic_no", checkNull(rs.getString("DRUG_LIC_NO")));
rowData.put("dlv_add1", checkNull(rs.getString("DLV_ADD1")));
rowData.put("dlv_add2", checkNull(rs.getString("DLV_ADD2")));
rowData.put("dlv_city", checkNull(rs.getString("DLV_CITY")));
rowData.put("dlv_pin", checkNull(rs.getString("DLV_PIN")));
rowData.put("state", checkNull(rs.getString("STATE")));
rowData.put("count_code_dlv", checkNull(rs.getString("COUNT_CODE__DLV")));
rowData.put("item_code", checkNull(rs.getString("ITEM_CODE")));
rowData.put("descr", checkNull(rs.getString("DESCR")));
rowData.put("lot_no", checkNull(rs.getString("LOT_NO")));
rowData.put("quantity_ord", checkNull(rs.getString("QUANTITY__ORD")));
rowData.put("unit", checkNull(rs.getString("UNIT")));
rowData.put("no_art", checkNull(rs.getString("NO_ART")));
rowData.put("gross_weight", checkNull(rs.getString("GROSS_WEIGHT")));
rowData.put("tare_weight", checkNull(rs.getString("TARE_WEIGHT")));
rowData.put("net_weight", checkNull(rs.getString("NET_WEIGHT")));
String mfgDate = checkNull(rs.getString("MFG_DATE"));
String expDate=checkNull(rs.getString("EXP_DATE"));
if(mfgDate!=null && mfgDate.trim().length()>0)
{
rowData.put("mfg_date", simpleDateFormat.format(sdf.parse(mfgDate)));
}
else
{
rowData.put("mfg_date", mfgDate);
}
if(expDate!=null && expDate.trim().length()>0)
{
rowData.put("exp_date", simpleDateFormat.format(sdf.parse(expDate)));
}
else
{
rowData.put("mfg_date", expDate);
}
rowData.put("transporter_type", checkNull(rs.getString("TRANSPORTER_TYPE")));
rowData.put("tran_code" , checkNull(rs.getString("TRAN_CODE")));
rowData.put("tran_name" , checkNull(rs.getString("TRAN_NAME")));
rawDataTransitJson.put(count, rowData);
count++;
rowData=null;
}
System.out.println("getTransitItemDetails data :"+rawDataTransitJson);
}
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 :TransitItemDisplay : getTransitItemDetails() :" + d.getMessage());
throw new ITMException(d);
}
}
return rawDataTransitJson;
}
private String checkNull(String str)
{
if(str == null)
{
return "";
}
else
{
return str ;
}
}
}
webitm-dashboard/ibase/dashboard/sfa/ejb/TransitItemDisplayLocal.java deleted 100755 → 0
View file @ e0d547cc
package ibase.dashboard.sfa.ejb;
import ibase.webitm.ejb.ValidatorLocal;
import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException;
import javax.ejb.Local;
import org.json.simple.JSONObject;
@Local
public interface TransitItemDisplayLocal extends ValidatorLocal
{
public JSONObject getTransitItemDetails(String dataSourceName) throws RemoteException, ITMException;
}
webitm-dashboard/ibase/dashboard/sfa/ejb/TransitItemDisplayRemote.java deleted 100755 → 0
View file @ e0d547cc
package ibase.dashboard.sfa.ejb;
import ibase.webitm.ejb.ValidatorRemote;
import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException;
import javax.ejb.Remote;
import org.json.simple.JSONObject;
@Remote
public interface TransitItemDisplayRemote extends ValidatorRemote
{
public JSONObject getTransitItemDetails(String dataSourceName) throws RemoteException, ITMException;
}
webitm-dashboard/ibase/dashboard/sfa/servlet/AttendanceComplianceServlet.java
View file @ e9770ccf
...@@ -23,7 +23,6 @@ public class AttendanceComplianceServlet extends HttpServlet ...@@ -23,7 +23,6 @@ public class AttendanceComplianceServlet extends HttpServlet
{ {
doPost(request, response); doPost(request, response);
} }
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException throws IOException, ServletException
{ {
...@@ -38,30 +37,25 @@ public class AttendanceComplianceServlet extends HttpServlet ...@@ -38,30 +37,25 @@ public class AttendanceComplianceServlet extends HttpServlet
UserInfoBean userInfo = null; UserInfoBean userInfo = null;
try try
{ {
response.setContentType("application/xml"); response.setContentType("application/xml");
session = request.getSession(true); session = request.getSession(true);
userInfo = (UserInfoBean) session.getAttribute("USER_INFO"); userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
loginId = userInfo.getLoginCode(); loginId = userInfo.getLoginCode();
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
System.out.println("loginId is =" + loginId);
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
gardeniaRemote = (AttendanceComplianceRemote) context.lookup("ibase/AttendanceCompliance/remote"); 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 = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
outputStream.close(); outputStream.close();
System.out.println(" Final data set for AttendanceComplianceServlet build the Graph is==="+ jsonObjData); System.out.println(" Final data set for AttendanceComplianceServlet build the Graph is==="+ jsonObjData);
} }
catch (Exception e) catch (Exception e)
{ {
System.out System.out.println("Exception : AttendanceComplianceServlet :doPost(HttpServletRequest request, HttpServletResponse response) :"+ e);
.println("Exception : AttendanceComplianceServlet :doPost(HttpServletRequest request, HttpServletResponse response) :"
+ e);
try try
{ {
throw new ITMException(e); throw new ITMException(e);
......
webitm-dashboard/ibase/dashboard/sfa/servlet/ComplianceCustServlet.java
View file @ e9770ccf
...@@ -31,16 +31,15 @@ public class ComplianceCustServlet extends HttpServlet ...@@ -31,16 +31,15 @@ public class ComplianceCustServlet extends HttpServlet
AppConnectParm appConnectParm = new AppConnectParm(); AppConnectParm appConnectParm = new AppConnectParm();
String dataSourceName = ""; String dataSourceName = "";
String loginId = ""; String loginId = "";
String firstIndex =""; String firstIndex = "";
String cellVal = ""; String cellVal = "";
try try
{ {
response.setContentType("application/xml"); response.setContentType("application/xml");
HttpSession session = request.getSession(true); HttpSession session = request.getSession(true);
ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO"); ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
loginId = userInfo.getLoginCode(); loginId = userInfo.getLoginCode();
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
firstIndex = request.getParameter("salesPers"); firstIndex = request.getParameter("salesPers");
cellVal = request.getParameter("date"); cellVal = request.getParameter("date");
...@@ -48,6 +47,8 @@ public class ComplianceCustServlet extends HttpServlet ...@@ -48,6 +47,8 @@ public class ComplianceCustServlet extends HttpServlet
System.out.println("in ComplianceCustServlet firstIndex :"+firstIndex+"===== cellVal :"+cellVal); System.out.println("in ComplianceCustServlet firstIndex :"+firstIndex+"===== cellVal :"+cellVal);
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
complianceRemote = (ComplianceRemote) context.lookup("ibase/Compliance/remote"); 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); JSONObject jsonObjData = (JSONObject) complianceRemote.getComplianceCustDetails(firstIndex, cellVal, dataSourceName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
......
webitm-dashboard/ibase/dashboard/sfa/servlet/ComplianceDetailsDB2Servlet.java deleted 100755 → 0
View file @ e0d547cc
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
View file @ e9770ccf
...@@ -36,7 +36,8 @@ public class ComplianceGridServlet extends HttpServlet ...@@ -36,7 +36,8 @@ public class ComplianceGridServlet extends HttpServlet
try try
{ {
response.setContentType("application/xml"); response.setContentType("application/xml");
HttpSession session = request.getSession(true);
ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
personName = request.getParameter("personname"); personName = request.getParameter("personname");
period = request.getParameter("month"); period = request.getParameter("month");
...@@ -44,6 +45,8 @@ public class ComplianceGridServlet extends HttpServlet ...@@ -44,6 +45,8 @@ public class ComplianceGridServlet extends HttpServlet
System.out.println("in ComplianceGridServlet personName :"+personName+"===== period :"+period); System.out.println("in ComplianceGridServlet personName :"+personName+"===== period :"+period);
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
complianceRemote = (ComplianceRemote) context.lookup("ibase/Compliance/remote"); 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); JSONObject jsonObjData = (JSONObject) complianceRemote.getComplianceGrid(period, personName, dataSourceName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
......
webitm-dashboard/ibase/dashboard/sfa/servlet/ComplianceHirarchyDB2Servlet.java deleted 100755 → 0
View file @ e0d547cc
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
View file @ e9770ccf
...@@ -48,6 +48,8 @@ public class ComplianceServlet extends HttpServlet ...@@ -48,6 +48,8 @@ public class ComplianceServlet extends HttpServlet
System.out.println("period =" + period); System.out.println("period =" + period);
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
complianceRemote = (ComplianceRemote) context.lookup("ibase/Compliance/remote"); 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); jsonObjData = (JSONObject) complianceRemote.getComplianceDetails(loginId, dataSourceName, period);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
......
webitm-dashboard/ibase/dashboard/sfa/servlet/ComplianceSummaryDB2Servlet.java deleted 100755 → 0
View file @ e0d547cc
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
View file @ e9770ccf
...@@ -2,16 +2,13 @@ package ibase.dashboard.sfa.servlet; ...@@ -2,16 +2,13 @@ package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote; import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
import ibase.system.config.AppConnectParm; import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext; import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
public class CurrentDaySummaryDetailServlet extends HttpServlet public class CurrentDaySummaryDetailServlet extends HttpServlet
...@@ -32,7 +29,7 @@ public class CurrentDaySummaryDetailServlet extends HttpServlet ...@@ -32,7 +29,7 @@ public class CurrentDaySummaryDetailServlet extends HttpServlet
InitialContext context = null; InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); AppConnectParm appConnectParm = new AppConnectParm();
String dataSourceName = ""; String dataSourceName = "";
String loginUser =""; String loginUser = "";
String date = ""; String date = "";
String salePerson = ""; String salePerson = "";
try try
...@@ -55,10 +52,10 @@ public class CurrentDaySummaryDetailServlet extends HttpServlet ...@@ -55,10 +52,10 @@ public class CurrentDaySummaryDetailServlet extends HttpServlet
{ {
salePerson = loginUser; 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"); 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 outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
......
webitm-dashboard/ibase/dashboard/sfa/servlet/CurrentDaySummaryServlet.java
View file @ e9770ccf
...@@ -2,16 +2,13 @@ package ibase.dashboard.sfa.servlet; ...@@ -2,16 +2,13 @@ package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote; import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
import ibase.system.config.AppConnectParm; import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext; import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
public class CurrentDaySummaryServlet extends HttpServlet public class CurrentDaySummaryServlet extends HttpServlet
...@@ -24,7 +21,6 @@ public class CurrentDaySummaryServlet extends HttpServlet ...@@ -24,7 +21,6 @@ public class CurrentDaySummaryServlet extends HttpServlet
{ {
doPost(request, response); doPost(request, response);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
...@@ -55,10 +51,11 @@ public class CurrentDaySummaryServlet extends HttpServlet ...@@ -55,10 +51,11 @@ public class CurrentDaySummaryServlet extends HttpServlet
{ {
salePerson = loginUser; salePerson = loginUser;
} }
System.out.println("In CurrentDaySummaryServlet dataSourceName: ---- "+dataSourceName+ " ---- date :"+date+" ---- salePerson :"+salePerson); 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"); 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 outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
......
webitm-dashboard/ibase/dashboard/sfa/servlet/CurrentDayWorkDtlServlet.java
View file @ e9770ccf
...@@ -2,16 +2,13 @@ package ibase.dashboard.sfa.servlet; ...@@ -2,16 +2,13 @@ package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote; import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
import ibase.system.config.AppConnectParm; import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext; import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
public class CurrentDayWorkDtlServlet extends HttpServlet public class CurrentDayWorkDtlServlet extends HttpServlet
...@@ -32,7 +29,7 @@ public class CurrentDayWorkDtlServlet extends HttpServlet ...@@ -32,7 +29,7 @@ public class CurrentDayWorkDtlServlet extends HttpServlet
InitialContext context = null; InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); AppConnectParm appConnectParm = new AppConnectParm();
String dataSourceName = ""; String dataSourceName = "";
String loginUser =""; String loginUser = "";
String date = ""; String date = "";
String salePerson = ""; String salePerson = "";
try try
...@@ -55,10 +52,10 @@ public class CurrentDayWorkDtlServlet extends HttpServlet ...@@ -55,10 +52,10 @@ public class CurrentDayWorkDtlServlet extends HttpServlet
{ {
salePerson = loginUser; 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"); 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 outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
......
webitm-dashboard/ibase/dashboard/sfa/servlet/CurrentDayWorkSKUDtlServlet.java
View file @ e9770ccf
...@@ -2,16 +2,13 @@ package ibase.dashboard.sfa.servlet; ...@@ -2,16 +2,13 @@ package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote; import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
import ibase.system.config.AppConnectParm; import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext; import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
public class CurrentDayWorkSKUDtlServlet extends HttpServlet public class CurrentDayWorkSKUDtlServlet extends HttpServlet
...@@ -24,7 +21,6 @@ public class CurrentDayWorkSKUDtlServlet extends HttpServlet ...@@ -24,7 +21,6 @@ public class CurrentDayWorkSKUDtlServlet extends HttpServlet
{ {
doPost(request, response); doPost(request, response);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
...@@ -56,10 +52,11 @@ public class CurrentDayWorkSKUDtlServlet extends HttpServlet ...@@ -56,10 +52,11 @@ public class CurrentDayWorkSKUDtlServlet extends HttpServlet
{ {
salePerson = loginUser; salePerson = loginUser;
} }
System.out.println("In CurrentDaySummaryServlet dataSourceName: ---- "+dataSourceName+ " ---- date :"+date+" ---- salePerson :"+salePerson); 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"); 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 outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
......
webitm-dashboard/ibase/dashboard/sfa/servlet/DoctorsVisitServlet.java
View file @ e9770ccf
...@@ -65,6 +65,8 @@ public class DoctorsVisitServlet extends HttpServlet ...@@ -65,6 +65,8 @@ public class DoctorsVisitServlet extends HttpServlet
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
System.out.println("inside docotor 1 ="); System.out.println("inside docotor 1 =");
doctorsVisitRemote = (DoctorsVisitRemote) context.lookup("ibase/DoctorsVisit/remote"); 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); JSONObject jsonObjData = (JSONObject) doctorsVisitRemote.getDoctorsVisitDetails(loginId, salesPerson, month, year, dataSourceName);
System.out.println("inside docotor2 ="); System.out.println("inside docotor2 =");
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
......
webitm-dashboard/ibase/dashboard/sfa/servlet/MTDWorkDetailServlet.java
View file @ e9770ccf
...@@ -2,16 +2,13 @@ package ibase.dashboard.sfa.servlet; ...@@ -2,16 +2,13 @@ package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote; import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
import ibase.system.config.AppConnectParm; import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext; import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
public class MTDWorkDetailServlet extends HttpServlet public class MTDWorkDetailServlet extends HttpServlet
...@@ -32,10 +29,9 @@ public class MTDWorkDetailServlet extends HttpServlet ...@@ -32,10 +29,9 @@ public class MTDWorkDetailServlet extends HttpServlet
InitialContext context = null; InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); AppConnectParm appConnectParm = new AppConnectParm();
String dataSourceName = ""; String dataSourceName = "";
String loginUser =""; String loginUser = "";
String month = ""; String month = "";
String year = ""; String year = "";
String date = "";
String salePerson = ""; String salePerson = "";
try try
{ {
...@@ -51,15 +47,8 @@ public class MTDWorkDetailServlet extends HttpServlet ...@@ -51,15 +47,8 @@ public class MTDWorkDetailServlet extends HttpServlet
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
salePerson = (request.getParameter("aseName")); salePerson = (request.getParameter("aseName"));
System.out.println("salePerson :"+salePerson); System.out.println("salePerson :"+salePerson);
//month = request.getParameter("month"); month = request.getParameter("month");
//year = request.getParameter("year"); 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("month = " + month);
System.out.println("year = " + year); System.out.println("year = " + year);
System.out.println("salePerson.lenght() :"+salePerson.length()); System.out.println("salePerson.lenght() :"+salePerson.length());
...@@ -67,9 +56,10 @@ public class MTDWorkDetailServlet extends HttpServlet ...@@ -67,9 +56,10 @@ public class MTDWorkDetailServlet extends HttpServlet
{ {
salePerson = loginUser; salePerson = loginUser;
} }
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote"); 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 outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
......
webitm-dashboard/ibase/dashboard/sfa/servlet/MTDWorkDtlParentServlet.java
View file @ e9770ccf
...@@ -2,16 +2,13 @@ package ibase.dashboard.sfa.servlet; ...@@ -2,16 +2,13 @@ package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote; import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
import ibase.system.config.AppConnectParm; import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext; import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
public class MTDWorkDtlParentServlet extends HttpServlet public class MTDWorkDtlParentServlet extends HttpServlet
...@@ -32,10 +29,9 @@ public class MTDWorkDtlParentServlet extends HttpServlet ...@@ -32,10 +29,9 @@ public class MTDWorkDtlParentServlet extends HttpServlet
InitialContext context = null; InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); AppConnectParm appConnectParm = new AppConnectParm();
String dataSourceName = ""; String dataSourceName = "";
String loginUser =""; String loginUser = "";
String month = ""; String month = "";
String year = ""; String year = "";
String date = "";
String salePerson = ""; String salePerson = "";
try try
{ {
...@@ -51,15 +47,8 @@ public class MTDWorkDtlParentServlet extends HttpServlet ...@@ -51,15 +47,8 @@ public class MTDWorkDtlParentServlet extends HttpServlet
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
salePerson = (request.getParameter("aseName")); salePerson = (request.getParameter("aseName"));
System.out.println("salePerson :"+salePerson); System.out.println("salePerson :"+salePerson);
//month = request.getParameter("month"); month = request.getParameter("month");
//year = request.getParameter("year"); 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("month = " + month);
System.out.println("year = " + year); System.out.println("year = " + year);
System.out.println("salePerson.lenght() :"+salePerson.length()); System.out.println("salePerson.lenght() :"+salePerson.length());
...@@ -70,6 +59,8 @@ public class MTDWorkDtlParentServlet extends HttpServlet ...@@ -70,6 +59,8 @@ public class MTDWorkDtlParentServlet extends HttpServlet
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote"); 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 outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
......
webitm-dashboard/ibase/dashboard/sfa/servlet/MTDWorkParentServlet.java
View file @ e9770ccf
...@@ -32,10 +32,9 @@ public class MTDWorkParentServlet extends HttpServlet ...@@ -32,10 +32,9 @@ public class MTDWorkParentServlet extends HttpServlet
InitialContext context = null; InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); AppConnectParm appConnectParm = new AppConnectParm();
String dataSourceName = ""; String dataSourceName = "";
String loginUser =""; String loginUser = "";
String month = ""; String month = "";
String year = ""; String year = "";
String date = "";
String salePerson = ""; String salePerson = "";
try try
{ {
...@@ -51,15 +50,8 @@ public class MTDWorkParentServlet extends HttpServlet ...@@ -51,15 +50,8 @@ public class MTDWorkParentServlet extends HttpServlet
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
salePerson = (request.getParameter("aseName")); salePerson = (request.getParameter("aseName"));
System.out.println("salePerson :"+salePerson); System.out.println("salePerson :"+salePerson);
//month = request.getParameter("month"); month = request.getParameter("month");
//year = request.getParameter("year"); 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("month = " + month);
System.out.println("year = " + year); System.out.println("year = " + year);
System.out.println("salePerson.lenght() :"+salePerson.length()); System.out.println("salePerson.lenght() :"+salePerson.length());
...@@ -67,9 +59,10 @@ public class MTDWorkParentServlet extends HttpServlet ...@@ -67,9 +59,10 @@ public class MTDWorkParentServlet extends HttpServlet
{ {
salePerson = loginUser; salePerson = loginUser;
} }
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote"); 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 outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
......
webitm-dashboard/ibase/dashboard/sfa/servlet/MTDWorkSummaryServlet.java
View file @ e9770ccf
...@@ -2,16 +2,13 @@ package ibase.dashboard.sfa.servlet; ...@@ -2,16 +2,13 @@ package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote; import ibase.dashboard.sfa.ejb.CurrentDayWrkSummaryRemote;
import ibase.system.config.AppConnectParm; import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext; import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
public class MTDWorkSummaryServlet extends HttpServlet public class MTDWorkSummaryServlet extends HttpServlet
...@@ -32,11 +29,10 @@ public class MTDWorkSummaryServlet extends HttpServlet ...@@ -32,11 +29,10 @@ public class MTDWorkSummaryServlet extends HttpServlet
InitialContext context = null; InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm(); AppConnectParm appConnectParm = new AppConnectParm();
String dataSourceName = ""; String dataSourceName = "";
String loginUser =""; String loginUser = "";
String month = ""; String month = "";
String year = ""; String year = "";
String salePerson = ""; String salePerson = "";
String date = "";
try try
{ {
response.setContentType("application/xml"); response.setContentType("application/xml");
...@@ -51,15 +47,8 @@ public class MTDWorkSummaryServlet extends HttpServlet ...@@ -51,15 +47,8 @@ public class MTDWorkSummaryServlet extends HttpServlet
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
salePerson = (request.getParameter("aseName")); salePerson = (request.getParameter("aseName"));
System.out.println("salePerson :"+salePerson); System.out.println("salePerson :"+salePerson);
//month = request.getParameter("month"); month = request.getParameter("month");
//year = request.getParameter("year"); 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("month = " + month);
System.out.println("year = " + year); System.out.println("year = " + year);
System.out.println("salePerson.lenght() :"+salePerson.length()); System.out.println("salePerson.lenght() :"+salePerson.length());
...@@ -70,6 +59,8 @@ public class MTDWorkSummaryServlet extends HttpServlet ...@@ -70,6 +59,8 @@ public class MTDWorkSummaryServlet extends HttpServlet
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
currencyRemote = (CurrentDayWrkSummaryRemote) context.lookup("ibase/CurrentDayWrkSummary/remote"); 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 outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
......
webitm-dashboard/ibase/dashboard/sfa/servlet/OutletsVisitServlet.java
View file @ e9770ccf
...@@ -42,8 +42,8 @@ public class OutletsVisitServlet extends HttpServlet ...@@ -42,8 +42,8 @@ public class OutletsVisitServlet extends HttpServlet
response.setContentType("application/xml"); response.setContentType("application/xml");
HttpSession session = request.getSession(true); HttpSession session = request.getSession(true);
/*ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO"); ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
loginId = userInfo.getLoginCode(); */ loginId = userInfo.getLoginCode();
dataSourceName =request.getParameter("dataSourceName"); dataSourceName =request.getParameter("dataSourceName");
territory =(request.getParameter("territory")); territory =(request.getParameter("territory"));
...@@ -68,6 +68,8 @@ public class OutletsVisitServlet extends HttpServlet ...@@ -68,6 +68,8 @@ public class OutletsVisitServlet extends HttpServlet
System.out.println("reportName is =" + reportName ); System.out.println("reportName is =" + reportName );
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
outletVisitRemote = (OutletsVisitRemote)context.lookup("ibase/OutletsVisitEJB/remote"); 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); JSONObject jsonObjData = (JSONObject)outletVisitRemote.getOutletVisitDetails(loginId,salesPerson,month,year,dataSourceName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
......
webitm-dashboard/ibase/dashboard/sfa/servlet/PendingStatusServlet.java
View file @ e9770ccf
...@@ -4,17 +4,14 @@ import ibase.dashboard.sfa.ejb.PendingStatusRemote; ...@@ -4,17 +4,14 @@ import ibase.dashboard.sfa.ejb.PendingStatusRemote;
import ibase.system.config.AppConnectParm; import ibase.system.config.AppConnectParm;
import ibase.utility.UserInfoBean; import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext; import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
public class PendingStatusServlet extends HttpServlet public class PendingStatusServlet extends HttpServlet
...@@ -39,7 +36,7 @@ public class PendingStatusServlet extends HttpServlet ...@@ -39,7 +36,7 @@ public class PendingStatusServlet extends HttpServlet
JSONObject jsonObjData = null; JSONObject jsonObjData = null;
OutputStream outputStream = null; OutputStream outputStream = null;
UserInfoBean userInfo = null; UserInfoBean userInfo = null;
String empSite=null; String empSite = null;
try try
{ {
response.setContentType("application/xml"); response.setContentType("application/xml");
...@@ -48,10 +45,11 @@ public class PendingStatusServlet extends HttpServlet ...@@ -48,10 +45,11 @@ public class PendingStatusServlet extends HttpServlet
loginId = userInfo.getLoginCode().trim(); loginId = userInfo.getLoginCode().trim();
empSite = userInfo.getSiteCode(); empSite = userInfo.getSiteCode();
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
//loginId="I99994";
System.out.println("loginId is =" + loginId); System.out.println("loginId is =" + loginId);
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
gardeniaRemote = (PendingStatusRemote) context.lookup("ibase/PendingStatus/remote"); 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 = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
......
webitm-dashboard/ibase/dashboard/sfa/servlet/ProductAssessmentEventServlet.java
View file @ e9770ccf
...@@ -31,7 +31,7 @@ public class ProductAssessmentEventServlet extends HttpServlet ...@@ -31,7 +31,7 @@ public class ProductAssessmentEventServlet extends HttpServlet
AppConnectParm appConnectParm = new AppConnectParm(); AppConnectParm appConnectParm = new AppConnectParm();
String dataSourceName = ""; String dataSourceName = "";
String loginId = ""; String loginId = "";
String zone =""; String zone = "";
String region = ""; String region = "";
String product = ""; String product = "";
String team = ""; String team = "";
...@@ -51,14 +51,11 @@ public class ProductAssessmentEventServlet extends HttpServlet ...@@ -51,14 +51,11 @@ public class ProductAssessmentEventServlet extends HttpServlet
product = request.getParameter("product"); product = request.getParameter("product");
team = request.getParameter("team"); team = request.getParameter("team");
event = request.getParameter("event"); 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()); context = new InitialContext(appConnectParm.getProperty());
productAssessmentRemote = (ProductAssessmentRemote) context.lookup("ibase/ProductAssessment/remote"); productAssessmentRemote = (ProductAssessmentRemote) context.lookup("ibase/ProductAssessment/remote");
//JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getEmployeeEvents( loginId, dataSourceName, zone, region, product, team, event); /*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.getProductAssessmentEventServlet( loginId, dataSourceName, zone, region, product, team, event);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
......
webitm-dashboard/ibase/dashboard/sfa/servlet/ProductAssessmentProductPieServlet.java
View file @ e9770ccf
...@@ -22,7 +22,6 @@ public class ProductAssessmentProductPieServlet extends HttpServlet ...@@ -22,7 +22,6 @@ public class ProductAssessmentProductPieServlet extends HttpServlet
{ {
doPost(request, response); doPost(request, response);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
...@@ -34,13 +33,18 @@ public class ProductAssessmentProductPieServlet extends HttpServlet ...@@ -34,13 +33,18 @@ public class ProductAssessmentProductPieServlet extends HttpServlet
try try
{ {
response.setContentType("application/xml"); 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"); dataSourceName = request.getParameter("dataSourceName");
personName = request.getParameter("CELL_VAL"); personName = request.getParameter("CELL_VAL");
System.out.println(" ProductAssessmentProductPieServlet personName =" + personName + "===== dataSourceName :"+dataSourceName); 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"); productAssessmentRemote = (ProductAssessmentRemote) context.lookup("ibase/ProductAssessment/remote");
//JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getEmployeeProduct(dataSourceName,personName); /*setUserInfo(userInfo) for DB connection on dated:14062016*/
productAssessmentRemote.setUserInfo(userInfo);
JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getProductAssessmentProductPieServlet(dataSourceName,personName); JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getProductAssessmentProductPieServlet(dataSourceName,personName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
...@@ -48,8 +52,6 @@ public class ProductAssessmentProductPieServlet extends HttpServlet ...@@ -48,8 +52,6 @@ public class ProductAssessmentProductPieServlet extends HttpServlet
outputStream.close(); 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) } catch (Exception e)
{ {
System.out.println("Exception : ProductAssessmentProductPieServlet :doPost(HttpServletRequest request, HttpServletResponse response) :" + e); System.out.println("Exception : ProductAssessmentProductPieServlet :doPost(HttpServletRequest request, HttpServletResponse response) :" + e);
......
webitm-dashboard/ibase/dashboard/sfa/servlet/ProductAssessmentProductRatingServlet.java
View file @ e9770ccf
...@@ -35,26 +35,25 @@ public class ProductAssessmentProductRatingServlet extends HttpServlet ...@@ -35,26 +35,25 @@ public class ProductAssessmentProductRatingServlet extends HttpServlet
try try
{ {
response.setContentType("application/xml"); 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"); dataSourceName = request.getParameter("dataSourceName");
personName = request.getParameter("name"); personName = request.getParameter("name");
productName = request.getParameter("productName"); productName = request.getParameter("productName");
System.out.println("personName =" + personName +"==== productName :"+productName);
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
productAssessmentRemote = (ProductAssessmentRemote) context.lookup("ibase/ProductAssessment/remote"); productAssessmentRemote = (ProductAssessmentRemote) context.lookup("ibase/ProductAssessment/remote");
/*setUserInfo(userInfo) for DB connection on dated:14062016*/
productAssessmentRemote.setUserInfo(userInfo);
System.out.println("in ProductAssessmentProductRatingServlet"); System.out.println("in ProductAssessmentProductRatingServlet");
//JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getEmployeeProductRating(dataSourceName,personName,productName);
JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getProductAssessmentProductRatingServlet(dataSourceName,personName,productName); JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getProductAssessmentProductRatingServlet(dataSourceName,personName,productName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
outputStream.close(); 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) } catch (Exception e)
{ {
System.out.println("Exception : ProductAssessmentProductRatingServlet :doPost(HttpServletRequest request, HttpServletResponse response) :" + e); System.out.println("Exception : ProductAssessmentProductRatingServlet :doPost(HttpServletRequest request, HttpServletResponse response) :" + e);
......
webitm-dashboard/ibase/dashboard/sfa/servlet/ProductAssessmentProductServlet.java
View file @ e9770ccf
...@@ -34,14 +34,16 @@ public class ProductAssessmentProductServlet extends HttpServlet ...@@ -34,14 +34,16 @@ public class ProductAssessmentProductServlet extends HttpServlet
try try
{ {
response.setContentType("application/xml"); 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"); 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()); context = new InitialContext(appConnectParm.getProperty());
productAssessmentRemote = (ProductAssessmentRemote) context.lookup("ibase/ProductAssessment/remote"); productAssessmentRemote = (ProductAssessmentRemote) context.lookup("ibase/ProductAssessment/remote");
//JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getEmployeeProduct(dataSourceName,personName); /*setUserInfo(userInfo) for DB connection on dated:14062016*/
productAssessmentRemote.setUserInfo(userInfo);
JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getProductAssessmentProductServlet(dataSourceName,personName); JSONObject jsonObjData = (JSONObject) productAssessmentRemote.getProductAssessmentProductServlet(dataSourceName,personName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
...@@ -49,8 +51,6 @@ public class ProductAssessmentProductServlet extends HttpServlet ...@@ -49,8 +51,6 @@ public class ProductAssessmentProductServlet extends HttpServlet
outputStream.close(); 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) } catch (Exception e)
{ {
System.out.println("Exception : ProductAssessmentProductServlet :doPost(HttpServletRequest request, HttpServletResponse response) :" + e); System.out.println("Exception : ProductAssessmentProductServlet :doPost(HttpServletRequest request, HttpServletResponse response) :" + e);
......
webitm-dashboard/ibase/dashboard/sfa/servlet/RSRScoreServlet.java
View file @ e9770ccf
...@@ -2,17 +2,14 @@ package ibase.dashboard.sfa.servlet; ...@@ -2,17 +2,14 @@ package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.RSRScoreRemote; import ibase.dashboard.sfa.ejb.RSRScoreRemote;
import ibase.system.config.AppConnectParm; import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.naming.InitialContext; import javax.naming.InitialContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
@SuppressWarnings("serial") @SuppressWarnings("serial")
...@@ -64,6 +61,8 @@ public class RSRScoreServlet extends HttpServlet ...@@ -64,6 +61,8 @@ public class RSRScoreServlet extends HttpServlet
System.out.println("reportName is =" + reportName ); System.out.println("reportName is =" + reportName );
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
rsrScoreRemote = (RSRScoreRemote)context.lookup("ibase/RSRScoreEJB/remote"); 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); JSONObject jsonObjData = (JSONObject)rsrScoreRemote.getRSRScoreDetails(salesPerson,month,year,dataSourceName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
......
webitm-dashboard/ibase/dashboard/sfa/servlet/RSRSurveyServlet.java
View file @ e9770ccf
...@@ -64,6 +64,8 @@ public class RSRSurveyServlet extends HttpServlet ...@@ -64,6 +64,8 @@ public class RSRSurveyServlet extends HttpServlet
System.out.println("reportName is =" + reportName ); System.out.println("reportName is =" + reportName );
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
rsrSurveyRemote = (RSRSurveyRemote) context.lookup("ibase/RSRSurveyEJB/remote"); 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); JSONObject jsonObjData = (JSONObject)rsrSurveyRemote.getRSRSurveyDetails(loginId,salesPerson,month,year,dataSourceName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
......
webitm-dashboard/ibase/dashboard/sfa/servlet/RXSurveyServlet.java
View file @ e9770ccf
...@@ -10,7 +10,6 @@ import javax.servlet.http.HttpServlet; ...@@ -10,7 +10,6 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
public class RXSurveyServlet extends HttpServlet public class RXSurveyServlet extends HttpServlet
...@@ -66,6 +65,8 @@ public class RXSurveyServlet extends HttpServlet ...@@ -66,6 +65,8 @@ public class RXSurveyServlet extends HttpServlet
System.out.println("reportName is =" + reportName ); System.out.println("reportName is =" + reportName );
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
rxSurveyRemote = (RXSurveyRemote)context.lookup("ibase/RXSurveyEJB/remote"); 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); JSONObject jsonObjData = (JSONObject)rxSurveyRemote.getRXSurveyDetails(loginId,salesPerson,month,year,dataSourceName);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
......
webitm-dashboard/ibase/dashboard/sfa/servlet/TargetVsAchievementServlet.java
View file @ e9770ccf
package ibase.dashboard.sfa.servlet; package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.TargetVsAchievementRemote; import ibase.dashboard.sfa.ejb.TargetVsAchievementRemote;
import ibase.system.config.AppConnectParm; import ibase.system.config.AppConnectParm;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
...@@ -10,7 +10,8 @@ import ibase.system.config.AppConnectParm; ...@@ -10,7 +10,8 @@ import ibase.system.config.AppConnectParm;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject; import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject;
public class TargetVsAchievementServlet extends HttpServlet public class TargetVsAchievementServlet extends HttpServlet
{ {
...@@ -34,11 +35,16 @@ import org.json.simple.JSONObject; ...@@ -34,11 +35,16 @@ import org.json.simple.JSONObject;
try try
{ {
response.setContentType("application/xml"); 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"); dataSourceName = request.getParameter("dataSourceName");
prdCode = request.getParameter("PRD_SALESDASH"); prdCode = request.getParameter("PRD_SALESDASH");
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
targetVsAchievement = (TargetVsAchievementRemote)context.lookup("ibase/TargetVsAchievement/remote"); targetVsAchievement = (TargetVsAchievementRemote)context.lookup("ibase/TargetVsAchievement/remote");
/*setUserInfo(userInfo) for DB connection on dated:14062016*/
targetVsAchievement.setUserInfo(userInfo);
JSONObject jsonObjData = targetVsAchievement.getTargetVsAchievement(dataSourceName,prdCode); JSONObject jsonObjData = targetVsAchievement.getTargetVsAchievement(dataSourceName,prdCode);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
......
webitm-dashboard/ibase/dashboard/sfa/servlet/TaskActivityServlet.java
View file @ e9770ccf
...@@ -10,6 +10,8 @@ import javax.servlet.ServletException; ...@@ -10,6 +10,8 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
public class TaskActivityServlet extends HttpServlet public class TaskActivityServlet extends HttpServlet
...@@ -30,19 +32,19 @@ public class TaskActivityServlet extends HttpServlet ...@@ -30,19 +32,19 @@ public class TaskActivityServlet extends HttpServlet
String month = ""; String month = "";
try try
{ {
System.out.println("in TaskActivityServlet " );
response.setContentType("application/xml"); 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"); dataSourceName = request.getParameter("dataSourceName");
month = request.getParameter("month"); month = request.getParameter("month");
System.out.println( "month is =" + month ); System.out.println( "month is =" + month );
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
taskActivityRemote = (TaskActivityRemote) context.lookup("ibase/TaskActivity/remote"); 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 outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
......
webitm-dashboard/ibase/dashboard/sfa/servlet/TaskTrackingServlet.java deleted 100755 → 0
View file @ e0d547cc
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
webitm-dashboard/ibase/dashboard/sfa/servlet/TransitItemServlet.java deleted 100755 → 0
View file @ e0d547cc
package ibase.dashboard.sfa.servlet;
import ibase.dashboard.sfa.ejb.TransitItemDisplayRemote;
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")
public class TransitItemServlet extends HttpServlet
{
//private static final long serialVersionUID = 1L;
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
{
TransitItemDisplayRemote transitRemote = null;
InitialContext context = null;
AppConnectParm appConnectParm = new AppConnectParm();
String dataSourceName = "";
String day = "", toDate = "",view="",reportName="";
try
{
response.setContentType("application/xml");
HttpSession session = request.getSession(true);
dataSourceName = request.getParameter("dataSourceName");
reportName = request.getParameter("reportName");
session.setAttribute("reportName", reportName);
System.out.println("reportName is =" + reportName );
System.out.println("in doPost" + "days is =:" + view+":" );
context = new InitialContext(appConnectParm.getProperty());
transitRemote = (TransitItemDisplayRemote) context.lookup("ibase/TransitItemDisplay/remote");
JSONObject jsonObjData = (JSONObject)transitRemote.getTransitItemDetails(dataSourceName);
OutputStream outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush();
outputStream.close();
System.out.println(" Final data set for TransitItemServlet build the Graph is===" + jsonObjData);
} catch (Exception e)
{
System.out.println("Exception : TransitItemServlet :doPost(HttpServletRequest request, HttpServletResponse response) :" + e);
try
{
throw new ITMException(e);
} catch (ITMException e1)
{
e1.printStackTrace();
}
}
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment