Skip to content

B
business-java
Commit 650c7982 authored by pbhosale's avatar pbhosale
Browse files
Options

Updated on [23/10/2019] 

w_emp_ad.sql
w_emp_complete.sql
w_emp_other_detail.sql
w_emp_temp.sql
w_finent_acctprd.sql
EmpAdPrs.java
EmployeeAdIC.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@210445 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c51d5dc4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 410 additions and 62 deletions
webitm-adm/module-resource/SQL/w_emp_ad.sql
View file @ 650c7982
......@@ -105,5 +105,27 @@ update ITM2MENU set OBJ_TYPE = 'T',ICON_PATH = 'EmployeewisePaystructure.png', C
----------------------------------------------------[17/10/19][END]
----------------------------------------------------[21/10/19][START]
update TRANSETUP set PERIOD_OPTION = 'M',THUMB_ALT_COL = 'emp_fname', THUMB_IMAGE_COL= 'emp_code', THUMB_OBJ = 'EmpImages' where TRAN_WINDOW = 'w_emp_ad';
update TRANSETUP set REF_SER = 'E-AD' where TRAN_WINDOW = 'w_emp_ad';
update OBJ_FORMS set THUMB_ALT_COL = 'emp_fname', THUMB_IMAGE_COL= 'emp_code', THUMB_OBJ = 'EmpImages' where WIN_NAME = 'w_emp_ad';
UPDATE obj_forms
SET disp_metadata = '<html>
<span style="white-space: normal !important; word-break: break-word; "> <b>{emp_fname} {emp_lname} </b> (<b>{emp_code}</b>) <br/>
Amount : <b>{amount}</b> Type : <b>{type}</b> Effective From : <b>{eff_date}</b> To : <b>{exp_date}</b>
</span>
</html>' WHERE win_name ='w_emp_ad';
update POPHELP set AUTO_FILL_LEN = '3', AUTO_MIN_LENGTH = 2 , HELP_OPTION = 2 where MOD_NAME = 'W_EMP_AD';
update POPHELP set THUMB_ALT_COL = 'name',THUMB_IMAGE_COL= 'code',THUMB_OBJ = 'EmpImages' where MOD_NAME = 'W_EMP_AD' and FIELD_NAME= 'EMP_CODE';
update POPHELP set THUMB_ALT_COL = 'descr', THUMB_IMAGE_COL= 'ad_code',THUMB_OBJ = 'AdCodeImages' where MOD_NAME = 'W_EMP_AD' and FIELD_NAME= 'AD_CODE';
----------------------------------------------------[21/10/19][END]
webitm-adm/module-resource/SQL/w_finent_acctprd.sql
View file @ 650c7982
......@@ -66,3 +66,15 @@ Insert into POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,DW_OBJECT,MSG_TITLE,WIDTH,HEIGH
update ITM2MENU set ICON_PATH = 'FinancialEntitywiseAccountingPeriod.png', CLOSE_ICON ='FinancialEntitywiseAccountingPeriodwht.png' where WIN_NAME= 'w_finent_acctprd';
----------------------------------------------------[17/10/19][END]
----------------------------------------------------[21/10/19][START]
update POPHELP set AUTO_FILL_LEN = '3', AUTO_MIN_LENGTH = 2 , HELP_OPTION = 2 where MOD_NAME = 'W_FINENT_ACCTPRD';
update POPHELP set THUMB_ALT_COL = 'descr',THUMB_IMAGE_COL= 'fin_entity',THUMB_OBJ = 'FinentImages' where MOD_NAME = 'W_FINENT_ACCTPRD' and FIELD_NAME= 'FIN_ENTITY';
update POPHELP set THUMB_ALT_COL = 'descr', THUMB_IMAGE_COL= 'code',THUMB_OBJ = 'AcctPrdImages' where MOD_NAME = 'W_FINENT_ACCTPRD' and FIELD_NAME= 'ACCT_PRD';
----------------------------------------------------[21/10/19][END]
webitm-adm/src/ibase/webitm/ejb/adm/EmpAdPrs.java
View file @ 650c7982
......@@ -4,36 +4,33 @@
package ibase.webitm.ejb.adm;
import java.rmi.RemoteException;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ValidatorEJB;
import java.sql.*;
//import javax.ejb.*;
import org.w3c.dom.*;
import ibase.webitm.utility.ITMException;
import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.*;
import javax.ejb.Stateless; // added for ejb3
@Stateless // added for ejb3
//Modified by Poonam Bhosale on [27/06/2019][Start]
//@Stateless // added for ejb3
//Modified by Poonam Bhosale on [27/06/2019][End]
public class EmpAdPrs extends ValidatorEJB implements EmpAdPrsLocal,EmpAdPrsRemote // SessionBean
{
E12GenericUtility genericUtility = new E12GenericUtility();//Modified by Poonam B.
/*
public void ejbCreate() throws RemoteException, CreateException
{
}
public void ejbRemove()
{
}
public void ejbActivate()
{
}
public void ejbPassivate()
{
}*/
......@@ -52,10 +49,11 @@ public class EmpAdPrs extends ValidatorEJB implements EmpAdPrsLocal,EmpAdPrsRemo
{
if (xmlString1 != null && xmlString1.trim().length() > 0)
{
//Modified by Poonam Bhosale on [27/06/2019][Start]
//Modified by Poonam B on [21/10/2019][START]
//dom = GenericUtility.getInstance().parseString(xmlString1);
dom = parseString(xmlString1);
//Modified by Poonam Bhosale on [27/06/2019][End]
dom = genericUtility.parseString(xmlString1);
System.out.println("headerDom ["+dom+"]");
//Modified by Poonam B on [21/10/2019][END]
retString = executepreSaveRec(dom,domId,objContext,editFlag,xtraParams,conn);
}
}
......@@ -73,36 +71,18 @@ public class EmpAdPrs extends ValidatorEJB implements EmpAdPrsLocal,EmpAdPrsRemo
Statement stmt = null;
PreparedStatement pstmt = null;
ResultSet rs = null;
String empCode = "";
String adCode = "";
String effDate = "";
String expDate = "";
String periodFrom = "";
String periodTo = "";
String sqlStr = "";
String amt = "";
String keyString = "";
String errorCode = "";
String updateStatus = "";
String userId = "";
String retString = "";
double originalAmt = 0d;
double amount = 0d;
String empCode = "", adCode = "", effDate = "", expDate = "", periodFrom = "", periodTo = "";
String sqlStr = "", amt = "", keyString = "", errorCode = "";
String updateStatus = "", userId = "", retString = "";
double originalAmt = 0d, amount = 0d;
boolean empStatus = false;
int count = 0;
java.sql.Timestamp effectiveDate = null, expiryDate = null;
Node currDetail = null;
//Modified by Poonam Bhosale on [27/06/2019][Start]
ITMDBAccessEJB itmdbAccessEJB= new ITMDBAccessEJB();
//Modified by Poonam Bhosale on [27/06/2019][End]
try
{
conn.setAutoCommit(false);
//Modified by Poonam Bhosale on [27/06/2019][Start]
//conn.setAutoCommit(false);
//GenericUtility genericUtility = GenericUtility.getInstance();
E12GenericUtility genericUtility= new E12GenericUtility();
//Modified by Poonam Bhosale on [27/06/2019][End]
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"userId");
AdmCommon admCommon = new AdmCommon();
System.out.println("dom.............:: "+ dom);
......@@ -199,10 +179,7 @@ public class EmpAdPrs extends ValidatorEJB implements EmpAdPrsLocal,EmpAdPrsRemo
if (errorCode.trim().length() > 0)
{
conn.rollback();
//
//retString = getErrorString("",errorCode,userId);
retString = itmdbAccessEJB.getErrorString("", errorCode, userId, "", conn);
//
retString = getErrorString("",errorCode,userId);
System.out.println("Ret String: " + retString);
}
else if (errorCode.trim().length() == 0)
......@@ -227,10 +204,7 @@ public class EmpAdPrs extends ValidatorEJB implements EmpAdPrsLocal,EmpAdPrsRemo
if (count != 0)
{
errorCode = "VTPAYFND";
///Modified by Poonam Bhosale on [27/06/2019][Start]
//retString = getErrorString("",errorCode,userId);
retString = itmdbAccessEJB.getErrorString("", errorCode, userId, "", conn);
///Modified by Poonam Bhosale on [27/06/2019][End]
retString = getErrorString("",errorCode,userId);
System.out.println("Ret String: " + retString);
}
}
......
webitm-adm/src/ibase/webitm/ejb/adm/EmployeeAdIC.java
View file @ 650c7982
......@@ -721,7 +721,7 @@ public class EmployeeAdIC extends ValidatorEJB implements EmployeeAdICLocal,Empl
try
{
System.out.println("************** Inside itemChanged method ****************");
System.out.println("xmlString: "+xmlString+" \nxmlString1: "+xmlString1+" \nxmlString2: "+xmlString2+" \nxtraParams: "+xtraParams);
System.out.println("xmlString: "+xmlString+" \nxmlString1: "+xmlString1+" \n xmlString2: "+xmlString2+" \nxtraParams: "+xtraParams);
if(xmlString != null && xmlString.trim().length() > 0)
{
dom = genericUtility.parseString(xmlString);
......@@ -1027,8 +1027,9 @@ public class EmployeeAdIC extends ValidatorEJB implements EmployeeAdICLocal,Empl
effDateStr = todayDate;
effDate=todayTm;
System.out.println("effDateStr:::::"+ effDateStr + " effDate:::::" + effDate);
// Modified By Poonam B on [21/10/2019][START][to append emp_name while adding new record]
sql = "select pay_site,date_join from employee where emp_code = ?";
/*sql = "select pay_site,date_join from employee where emp_code = ?";
pstmt= conn.prepareStatement(sql);
pstmt.setString(1,empCode);
rs = pstmt.executeQuery();
......@@ -1037,7 +1038,19 @@ public class EmployeeAdIC extends ValidatorEJB implements EmployeeAdICLocal,Empl
paySite= checkNull(rs.getString("pay_site"));
joinDate= rs.getTimestamp("date_join");
}*/
sql = "select pay_site,date_join, FN_GET_EMP_NAME(?,'FL1') as emp_name from employee where emp_code= ?";
pstmt= conn.prepareStatement(sql);
pstmt.setString(1,empCode);
pstmt.setString(2,empCode);
rs = pstmt.executeQuery();
if(rs.next())
{
joinDate = rs.getTimestamp("date_join");
empName = rs.getString("emp_name");
System.out.println("joinDate:::::"+ joinDate + " empName::::: "+empName);
}
// Modified By Poonam B on [21/10/2019][END][to append emp_name while adding new record]
if(rs != null)
{
......@@ -1091,6 +1104,10 @@ public class EmployeeAdIC extends ValidatorEJB implements EmployeeAdICLocal,Empl
}
}
// Modified By Poonam B on [21/10/2019][START][to append emp_name while adding new record]
valueXmlString.append("<emp_name>").append("<![CDATA["+empName+"]]>").append("</emp_name>");
// Modified By Poonam B on [21/10/2019][END][to append emp_name while adding new record]
valueXmlString.append("<pay_site>").append("<![CDATA["+paySite+"]]>").append("</pay_site>");
}
}
......
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