Skip to content

B
business-java
Commit f9969daf authored by vkadam's avatar vkadam
Browse files
Options

Source from SUN cvs 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@44308 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b5426f29
Expand all Show whitespace changes
Inline Side-by-side
Showing with 6535 additions and 4863 deletions
webitm-adm/ibase/webitm/ejb/adm/AdmCommon.java
View file @ f9969daf
......@@ -406,6 +406,10 @@ public class AdmCommon
if (rs.next())
{
voucherNo = rs.getString("VOUCHER_NO");
//Modified by Ahmed on 22/Mar/2017[As instructed by Piyush sir for trimmed value of voucher no as PAYROLL]
if(voucherNo != null && !(voucherNo.trim().equalsIgnoreCase("PAYROLL")))
{
// Modified by chetna on [06-09-2014][To incorporate changes of ITM in RCP Migration]
// if ((voucherNo != null && voucherNo.trim().length() > 0) || procType.equals("PY"))
if ((voucherNo != null && voucherNo.trim().length() > 0) || procType.equals("PY") || winName.equals("W_ATTD_PROC_NORULE") || winName.equals("W_ATTD_MON"))
......@@ -495,6 +499,7 @@ public class AdmCommon
pstmt.close();
pstmt = null;
}
}
}//End Of If Block
rs.close();
rs = null;
......@@ -982,7 +987,12 @@ public class AdmCommon
validUpTo = relativeDate(dateJoin , 5475);
validUpTo = genericUtility.getValidDateTimeString(validUpTo,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat() );
System.out.println("validUpTo::::::"+validUpTo);
//Modified by Ahmed on 27/Apr/2017 to set valid upto value based on parameter[start]
validUpTo = getEnv("999999", "VALID_UPTO_ORG_STRUC", conn);
System.out.println("validUpTo From PAYRPARM::"+validUpTo);
validUpTo = genericUtility.getValidDateTimeString(validUpTo, "yyyy-MM-dd hh:mm:ss", genericUtility.getDBDateFormat());
System.out.println("validUpTo From PAYRPARM::After conversion::"+validUpTo);
//Modified by Ahmed on 27/Apr/2017 to set valid upto value based on parameter[end]
if(posCodeOld.equalsIgnoreCase(posCode) && deptCodeOld.equalsIgnoreCase(deptCode))
{
......
webitm-adm/ibase/webitm/ejb/adm/EmpAdPrs.java
View file @ f9969daf
......@@ -87,10 +87,25 @@ public class EmpAdPrs extends ValidatorEJB implements EmpAdPrsLocal,EmpAdPrsRemo
System.out.println("updateStatus......:: "+ updateStatus);
if (currDetail != null)
{
if(updateStatus.equalsIgnoreCase("A") || updateStatus.equalsIgnoreCase("E"))
/*Modified by Anjali Rawankar on [10/04/2017][Start]
*[Purpose : while upload excel file update status 'N' for add and 'O' for edit is coming in new framework.Changes done against issue reported by Jimil from fortune and as discussed with Gulzar.
*/
//if(updateStatus.equalsIgnoreCase("A") || updateStatus.equalsIgnoreCase("E"))
if(updateStatus.equalsIgnoreCase("A") || updateStatus.equalsIgnoreCase("E") || updateStatus.equalsIgnoreCase("N") || updateStatus.equalsIgnoreCase("O"))
/*[Purpose : while upload excel file update status 'N' for add and 'O' for edit is coming in new framework.Changes done against issue reported by Jimil from fortune and as discussed with Gulzar.
* Modified by Anjali Rawankar on [10/04/2017][End]
*/
{
empStatus = true; // Added by Piyush on 30/06/2015[To make implication same as ITM]
if(updateStatus.equals("A"))
/*Modified by Anjali Rawankar on [10/04/2017][Start]
*[Purpose : while upload excel file update status 'N' for add and 'O' for edit is coming in new framework.Changes done against issue reported by Jimil from fortune and as discussed with Gulzar.
*/
//if(updateStatus.equals("A"))
if(updateStatus.equals("A") || updateStatus.equals("N"))
/*[Purpose : while upload excel file update status 'N' for add and 'O' for edit is coming in new framework.Changes done against issue reported by Jimil from fortune and as discussed with Gulzar.
* Modified by Anjali Rawankar on [10/04/2017][End]
*/
{
empCode = genericUtility.getColumnValueFromNode("emp_code",currDetail);
adCode = genericUtility.getColumnValueFromNode("ad_code",currDetail);
......
webitm-adm/ibase/webitm/ejb/adm/EmpCompletePrs.java
View file @ f9969daf
......@@ -176,8 +176,18 @@ public class EmpCompletePrs extends ValidatorEJB implements EmpCompletePrsLocal,
// Modified on 11/08/2016 [To resolve bug of position code not getting updated in case of made blank in edit mode]
// if((posCode != null && posCode.length() > 0 ) && dateJoindb != null)
if(dateJoindb != null && ((posCode != null && posCode.length() > 0 ) || (posCodeOld != null && posCodeOld.length() > 0 )))
//Modified by Ahmed on 25/MAY/2017[When new employee added][start]
//if(dateJoindb != null && ((posCode != null && posCode.length() > 0 ) || (posCodeOld != null && posCodeOld.length() > 0 )))
if((dateJoindb != null || "A".equalsIgnoreCase(editFlag)) && ((posCode != null && posCode.length() > 0 ) || (posCodeOld != null && posCodeOld.length() > 0 )))
{
if("A".equalsIgnoreCase(editFlag))
{
if(dateJoinOld == null || dateJoinOld.trim().length() == 0)
{
dateJoinOld = sdf.format(dateJoin);
}
}
//Modified by Ahmed on 25/MAY/2017[When new employee added][end]
AdmCommon ad = new AdmCommon();
retString = ad.updateOrgStructure( domString, empCode, posCode, deptCode, dateJoin, posCodeOld, deptCodeOld, dateJoinOld, userId, chgTerm, "EMPMST", conn ) ;
}
......
webitm-adm/ibase/webitm/ejb/adm/EmpMaritalStatusConfIC.java
View file @ f9969daf
......@@ -99,7 +99,12 @@ public class EmpMaritalStatusConfIC extends ValidatorEJB implements EmpMaritalSt
for(counterChild = 0; counterChild < noOfChilds; counterChild++)
{
childNode = childList.item(counterChild);
if (childNode.getNodeType() != Node.ELEMENT_NODE)
{
continue;
}
childNodeName = childNode.getNodeName();
System.out.println("childNodeName.editFlag." + childNodeName + ".." + editFlag);
switch(currentFormNo)
{
case 1:
......@@ -111,6 +116,8 @@ public class EmpMaritalStatusConfIC extends ValidatorEJB implements EmpMaritalSt
tranDate = java.sql.Timestamp.valueOf(genericUtility.getValidDateTimeString(tranDateStr, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()));
System.out.println("tranDate after parsing::"+tranDate);
if("emp_code".equalsIgnoreCase(childNodeName))
{
sql = "SELECT CONFIRM FROM EMP_MARITALCHG WHERE EMP_CODE = ? AND TRAN_DATE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCode);
......@@ -127,6 +134,16 @@ public class EmpMaritalStatusConfIC extends ValidatorEJB implements EmpMaritalSt
return errString;
}
}
else if("generate_voucher".equalsIgnoreCase(childNodeName))
{
String genVoucher = genericUtility.getColumnValue("generate_voucher", dom);
if(genVoucher == null || genVoucher.trim().length() == 0)
{
errString = itmDBAccessEJB.getErrorString("","VTMARSCH04","","",conn);
return errString;
}
}
}
}
}
catch(Exception e)
......@@ -303,12 +320,14 @@ public class EmpMaritalStatusConfIC extends ValidatorEJB implements EmpMaritalSt
valueXmlString.append("<new_status><![CDATA[" + newStatus + "]]></new_status>\r\n");
valueXmlString.append("<emp_name><![CDATA[" + empName + "]]></emp_name>\r\n");
if(!("Y".equalsIgnoreCase(confirm)))
//if(!("Y".equalsIgnoreCase(confirm)))
if(!("Y".equalsIgnoreCase(confirm)) && !("X".equalsIgnoreCase(confirm)))//Modified by Ahmed on 19-Jun-2017 to set blank value in dropdown
{
if("M".equalsIgnoreCase(newStatus.trim()))
{
valueXmlString.append("<gift_amount><![CDATA[" + amount + "]]></gift_amount>\r\n");
valueXmlString.append("<generate_voucher protect=\"0\"><![CDATA[N]]></generate_voucher>\r\n");
//valueXmlString.append("<generate_voucher protect=\"0\"><![CDATA[N]]></generate_voucher>\r\n");
valueXmlString.append("<generate_voucher protect=\"0\"><![CDATA[]]></generate_voucher>\r\n");//Modified by Ahmed on 19-Jun-2017 to set blank value in dropdown
}
else
{
......
webitm-adm/ibase/webitm/ejb/adm/EmpStatusDateChgPrc.java 0 → 100755
View file @ f9969daf
/* Developed By VALLABH KADAM
* Date : 07-MAR-2017
* Component Name : EmpStatusDateChgPrc
*/
package ibase.webitm.ejb.adm;
import ibase.system.config.AppConnectParm;
import ibase.system.config.ConnDriver;
import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ITMDBAccessLocal;
import ibase.webitm.ejb.ProcessEJB;
import ibase.webitm.ejb.adm.adv.EmpMaritalStatusConfLocal;
import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import javax.ejb.Stateless;
import javax.naming.InitialContext;
import org.w3c.dom.Document;
/**
* Session Bean implementation class EmpStatusDateChgPrc
*/
@Stateless
public class EmpStatusDateChgPrc extends ProcessEJB implements EmpStatusDateChgPrcLocal, EmpStatusDateChgPrcRemote
{
E12GenericUtility genericUtility=new E12GenericUtility();
public String process() throws RemoteException,ITMException
{
return "";
}
public String process(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException, ITMException
{
String retString = "";
Document detailDom = null;
Document headerDom = null;
// E12GenericUtility genericUtility = new E12GenericUtility();
try
{
if(xmlString != null && xmlString.trim().length() != 0)
{
headerDom = genericUtility.parseString(xmlString);
System.out.println("headerDom" + headerDom);
}
if(xmlString2 != null && xmlString2.trim().length() != 0)
{
detailDom = genericUtility.parseString(xmlString2);
System.out.println("detailDom" + detailDom);
}
retString = process(headerDom, detailDom, windowName, xtraParams);
}
catch (Exception e)
{
System.out.println("Exception :EmpStatusDateChgPrc :process(String xmlString, String xmlString2, String windowName, String xtraParams):" + e.getMessage() + ":");
e.printStackTrace();
throw new ITMException(e);
}
return retString;
}
public String process(Document headerDom, Document detailDom, String windowName, String xtraParams) throws RemoteException, ITMException
{
String returnString = "",confirm="",empCode="",tranDate="",sql="",statusDateStr="",chgTerm="",chgUser="";
Timestamp tranDateTimestamp=null,statusDateTimestamp=null,chgDate=null;
boolean isError = false;
Connection connection = null;
ConnDriver connDriver = null;
AppConnectParm appConnect = null;
InitialContext initialCtx = null;
EmpMaritalStatusConfLocal empMaritalStatusConf = null;
ITMDBAccessLocal itmDBAccess = null;
PreparedStatement pstmt=null;
ResultSet rs=null;
int updCnt=0,updateCnt=0;
try
{
connDriver = new ConnDriver();
connection = connDriver.getConnectDB("DriverITM");
connection.setAutoCommit(false);
appConnect = new AppConnectParm();
initialCtx = new InitialContext(appConnect.getProperty());
itmDBAccess = (ITMDBAccessLocal)initialCtx.lookup("ibase/ITMDBAccessEJB/local");
empCode = checkNull(genericUtility.getColumnValue("emp_code", headerDom));
tranDate = checkNull(genericUtility.getColumnValue("tran_date", headerDom));
System.out.println("@V@ VALLABH empCode :- ["+empCode+"]");
System.out.println("@V@ VALLABH tranDate :- ["+tranDate+"]");
tranDateTimestamp = Timestamp.valueOf(genericUtility.getValidDateTimeString(tranDate, genericUtility.getApplDateFormat()
,genericUtility.getDBDateFormat()));
statusDateStr = genericUtility.getColumnValue("status_date", headerDom);
System.out.println("statusDateStr from Dom::"+statusDateStr);
statusDateTimestamp = java.sql.Timestamp.valueOf(genericUtility.getValidDateTimeString(statusDateStr, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()));
System.out.println("tranDate after parsing::"+tranDate);
Calendar currentDate = Calendar.getInstance();
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
String sysDateStr = sdf.format(currentDate.getTime());
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId");
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
chgDate=Timestamp.valueOf(genericUtility.getValidDateString(sysDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat())
+ " 00:00:00.0");
// sql = "SELECT CONFIRM FROM EMP_MARITALCHG WHERE EMP_CODE = ? AND TRAN_DATE = ?";
// pstmt = connection.prepareStatement(sql);
// pstmt.setString(1, empCode);
// pstmt.setTimestamp(2, tranDateTimestamp);
// rs = pstmt.executeQuery();
// if(rs.next())
// {
// confirm = checkNull(rs.getString("CONFIRM"));
// }
// pstmt.close();
// pstmt=null;
// rs.close();
// rs=null;
// System.out.println("@V@ VALLABH confirm :- ["+confirm+"]");
// if(!"X".equalsIgnoreCase(confirm))
// {
// empMaritalStatusConf = (EmpMaritalStatusConfLocal)initialCtx.lookup("ibase/EmpMaritalStatusConf/local");
// returnString = checkNull(empMaritalStatusConf.actionHandler("", headerDom, detailDom, xtraParams, "N", connection));
// System.out.println("EmpStatusDateChgPrc returnString ::[" + returnString + "]");
// }
// else
// {
// returnString = itmDBAccess.getErrorString("", "VTALRDCACL", "", "", connection);
// return returnString;
// }
sql="update EMP_MARITALCHG set status_date=?,chg_date=?,chg_user=?,chg_term=? where emp_code=? and tran_date=?";
pstmt=connection.prepareStatement(sql);
pstmt.setTimestamp(1, statusDateTimestamp);
pstmt.setTimestamp(2, chgDate);
pstmt.setString(3, chgUser);
pstmt.setString(4, chgTerm);
pstmt.setString(5,empCode);
pstmt.setTimestamp(6,tranDateTimestamp);
updCnt=pstmt.executeUpdate();
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
System.out.println("@V@ EMP_MARITALCHG Update count :- ["+updCnt+"]");
sql="Update employee set M_STATUS_DATE=?,chg_date=?,chg_user=?,chg_term=? where emp_code=?";
pstmt=connection.prepareStatement(sql);
pstmt.setTimestamp(1, statusDateTimestamp);
pstmt.setTimestamp(2, chgDate);
pstmt.setString(3, chgUser);
pstmt.setString(4, chgTerm);
pstmt.setString(5, empCode);
updateCnt=pstmt.executeUpdate();
System.out.println("@V@ Employee Update count :- ["+updateCnt+"]");
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(updCnt<=0 && updateCnt<=0)
{
returnString = itmDBAccess.getErrorString("", "VTMARPRFL", "", "", connection);
}
if(returnString.length() > 0)
{
isError = true;
System.out.println("EmpStatusDateChgPrc isError ::[" + isError + "]");
}
else
{
returnString = itmDBAccess.getErrorString("", "VTMARPRSCS", "", "", connection);
}
}
catch(Exception e)
{
isError = true;
System.out.println("Exception :EmpStatusDateChgPrc :process(String xmlString2, String xmlString2, String windowName, String xtraParams):" + e.getMessage() + ":");
e.printStackTrace();
throw new ITMException(e);
}
finally
{
System.out.println("Closing Connection....");
try
{
if(isError)
{
connection.rollback();
System.out.println("EmpStatusDateChgPrc connection rollback");
}
else
{
connection.commit();
System.out.println("EmpStatusDateChgPrc connection committed");
}
if(connection != null)
{
connection.close();
connection = null;
}
}
catch(Exception e)
{
returnString = e.getMessage();
e.printStackTrace();
}
}
System.out.println("errString...:: "+returnString);
return returnString;
}
private String checkNull(String input)
{
if (input == null || ("null").equalsIgnoreCase(input.trim()))
{
input = "";
}
else
{
input = input.trim();
}
return input;
}
}
webitm-adm/ibase/webitm/ejb/adm/EmpStatusDateChgPrcLocal.java 0 → 100755
View file @ f9969daf
/* Developed By VALLABH KADAM
* Date : 07-MAR-2017
* Component Name : EmpStatusDateChgPrcLocal
*/
package ibase.webitm.ejb.adm;
import ibase.webitm.ejb.ProcessLocal;
import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException;
import javax.ejb.Local;
import org.w3c.dom.Document;
@Local
public interface EmpStatusDateChgPrcLocal extends ProcessLocal
{
public String process() throws RemoteException,ITMException;
public String process(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException, ITMException;
public String process(Document headerDom, Document detailDom, String windowName, String xtraParams) throws RemoteException, ITMException;
}
webitm-adm/ibase/webitm/ejb/adm/EmpStatusDateChgPrcRemote.java 0 → 100755
View file @ f9969daf
/* Developed By VALLABH KADAM
* Date : 07-MAR-2017
* Component Name : EmpStatusDateChgPrcRemote
*/
package ibase.webitm.ejb.adm;
import ibase.webitm.ejb.ProcessRemote;
import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException;
import javax.ejb.Remote;
import org.w3c.dom.Document;
@Remote
public interface EmpStatusDateChgPrcRemote extends ProcessRemote
{
public String process() throws RemoteException,ITMException;
public String process(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException, ITMException;
public String process(Document headerDom, Document detailDom, String windowName, String xtraParams) throws RemoteException, ITMException;
}
webitm-adm/ibase/webitm/ejb/adm/EmployeeEJB.java
View file @ f9969daf
......@@ -1651,6 +1651,15 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
else if(childNodeName.equalsIgnoreCase("tot_exp"))
{
String totExp = genericUtility.getColumnValue("tot_exp",dom);
/*Modified by Anjali Rawankar on[10/04/2017][Start]
*[Purpose : system should allow tot_exp as null]
*/
//if(totExp != null && totExp.trim().length() > 0)
if(totExp != null && totExp.length() > 0)
{
/*[Purpose : system should allow tot_exp as null]
*Modified by Anjali Rawankar on[10/04/2017][End]
*/
float totExpFloat = 0f;
try
{
......@@ -1676,6 +1685,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
break;
}
}
}//Modified by Anjali Rawankar on[10/04/2017]
}
else if(childNodeName.equalsIgnoreCase("training_prd"))
{
......@@ -2625,6 +2635,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
String gratNominee="",seqNo="",pfNominee="",penNominee="",gratPerc="",pfPerc="",qlfCode="",penPerc="",bankCode="";
String gs_runmode = "I",mName="";
String sql = "",editFlg="",loginSite="";
ResultSet rs = null;
PreparedStatement pstmt = null;
......@@ -2698,11 +2709,20 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
reportToAdmin = genericUtility.getColumnValue("report_to__admin", dom);
empClass = genericUtility.getColumnValue("emp_class", dom);
occuCode = genericUtility.getColumnValue("occupation_code", dom);
//Added by Anjali Rawankar on[04/04/2017][Start]
lname="";
fname="";
//Added by Anjali Rawankar on[04/04/2017][End]
if(reportToAdmin != null && reportToAdmin.trim().length() > 0)
{
/*Modified by Anjali Rawankar on [04/04/2017][Start]
* [Purpose : To Resolve the issue of employee master reported by aditi]
String sqldefEdit="SELECT EMP_LNAME,EMP_FNAME,TRAINING_PRD,"
+ "PROBATION_PRD,NOTICE_PRD FROM EMPLOYEE WHERE EMP_CODE=?";
String sqldefEdit="SELECT EMP_LNAME,EMP_FNAME FROM EMPLOYEE WHERE EMP_CODE=?";
pstmt = connection.prepareStatement(sqldefEdit);
pstmt.setString(1, reportToAdmin);
rs = pstmt.executeQuery();
......@@ -2713,8 +2733,61 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
trainPrd=rs.getString("TRAINING_PRD");
probPrd=rs.getString("PROBATION_PRD");
noticePrd=rs.getString("NOTICE_PRD");
}*/
String sqldefEdit="SELECT EMP_LNAME,EMP_FNAME FROM EMPLOYEE WHERE EMP_CODE=?";
pstmt = connection.prepareStatement(sqldefEdit);
pstmt.setString(1, reportToAdmin);
rs = pstmt.executeQuery();
if(rs.next())
{
lname=rs.getString("EMP_LNAME");
fname=rs.getString("EMP_FNAME");
}
/*Modified by Anjali Rawankar on [04/04/2017][End]
* [Purpose : To Resolve the issue of employee master reported by aditi]
*/
close(pstmt, rs);
valueXmlString.append("<admin_fname>").append("<![CDATA[" + fname + "]]>").append("</admin_fname>");
valueXmlString.append("<admin_lname>").append("<![CDATA[" + lname + "]]>").append("</admin_lname>");
}
/*Added by Anjali Rawankar on [04/04/2017][Start]
* [Purpose : To Resolve the issue of employee master reported by aditi]
*/
empCode = genericUtility.getColumnValue("emp_code", dom);
String totExp = "0";
sql = "SELECT TRAINING_PRD,PROBATION_PRD,NOTICE_PRD,GRADE,TOT_EXP FROM EMPLOYEE WHERE EMP_CODE = ?";
pstmt = connection.prepareStatement(sql);
pstmt.setString(1, empCode);
rs = pstmt.executeQuery();
if(rs.next())
{
trainPrd = rs.getString("TRAINING_PRD");
probPrd = rs.getString("PROBATION_PRD");
noticePrd = rs.getString("NOTICE_PRD");
gradeCode = rs.getString("GRADE");
totExp = rs.getString("TOT_EXP");
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
sql = "";
if(totExp == null || totExp.trim().length() == 0)
{
totExp="0";
valueXmlString.append("<tot_exp>").append("<![CDATA[" + totExp + "]]>").append("</tot_exp>");
}
/*Added by Anjali Rawankar on [04/04/2017][End]
* [Purpose : To Resolve the issue of employee master reported by aditi]
*/
if(trainPrd == null)
{
trainPrd=Integer.toString(0);
......@@ -2725,18 +2798,60 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
probPrd=Integer.toString(0);
valueXmlString.append("<probation_prd>").append("<![CDATA[" + probPrd + "]]>").append("</probation_prd>");
}
if(noticePrd == null)
if(noticePrd == null || noticePrd.trim().length() == 0)
{
/*Added by Anjali Rawankar on [04/04/2017][Start]
* [Purpose : To Resolve the issue of employee master reported by aditi]
*/
// noticePrd=Integer.toString(0);
noticePrd="0";
/*
if(gradeCode != null)
{
sql = "SELECT NOTICE_PRD FROM GRADE WHERE GRADE_CODE = ?";
pstmt = connection.prepareStatement(sql);
pstmt.setString(1, gradeCode);
rs = pstmt.executeQuery();
if(rs.next())
{
noticePrd = rs.getString("NOTICE_PRD");
if(noticePrd == null || noticePrd.trim().length() == 0)
{
noticePrd = "0";
}
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
noticePrd=Integer.toString(0);
pstmt.close();
pstmt = null;
}
}
*/
valueXmlString.append("<notice_prd>").append("<![CDATA[" + noticePrd + "]]>").append("</notice_prd>");
/*Added by Anjali Rawankar on [04/04/2017][End]
* [Purpose : To Resolve the issue of employee master reported by aditi]
*/
}
/*Commented by anjali Rawankar on[04/04/2017][Start]
* [Purpose : To Resolve the issue of employee master reported by aditi]
valueXmlString.append("<admin_fname>").append("<![CDATA[" + fname + "]]>").append("</admin_fname>");
valueXmlString.append("<admin_lname>").append("<![CDATA[" + lname + "]]>").append("</admin_lname>");
valueXmlString.append("<training_prd>").append("<![CDATA[" + trainPrd + "]]>").append("</training_prd>");
valueXmlString.append("<probation_prd>").append("<![CDATA[" + probPrd + "]]>").append("</probation_prd>");
valueXmlString.append("<notice_prd>").append("<![CDATA[" + noticePrd + "]]>").append("</notice_prd>");
}
Commented by anjali Rawankar on[04/04/2017][End]
* [Purpose : To Resolve the issue of employee master reported by aditi]
*/
if(empClass != null && empClass.trim().length() > 0)
{
......@@ -4569,10 +4684,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
System.out.println("EmployeeMAster :itemChanged(Document,String):return valueXmlString"+valueXmlString);
return valueXmlString.toString();
}
}
private String checkNull(String input)
{
private String checkNull(String input)
{
if (input == null)
{
input = "";
......@@ -4582,7 +4697,7 @@ private String checkNull(String input)
input =input.trim();
}
return input;
}
}
private String getFieldValue(String column,String tableName, String columnName, String columnValue,Connection conn)
......@@ -4789,7 +4904,7 @@ private String checkNull(String input)
}
return msgType;
}
//Added by Suraj [03/06/2015] [Method to validate pssition code][Start]
//Added by Suraj [03/06/2015] [Method to validate pssition code][Start]
private String validatePosition(String empCode , String posCode , String deptCode , Date joinDate , Connection conn) throws ITMException
{
String sql = "";
......
webitm-adm/ibase/webitm/ejb/adm/EmployeeSecurityIC.java
View file @ f9969daf
......@@ -291,11 +291,16 @@ public class EmployeeSecurityIC extends ValidatorEJB implements EmployeeSecurity
{
boolean folioNoFlg=false;
folioNoFlg=checkDuplicate(currDom,allDom,folioNo,"folio_no");
if(folioNoFlg)
{
errString = getErrorString("folio_no","VTDUPLFLO",userId);
break;
}
System.out.println("folioNoFlg :-["+folioNoFlg+"]");
/**
* Santosh Gupta(14/4/17)
* Duplicated Folio No is commeted
* */
// if(folioNoFlg)
// {
// errString = getErrorString("folio_no","VTDUPLFLO",userId);
// break;
// }
}
}
// else if("dp_id".equalsIgnoreCase(childNodeName))
......@@ -329,12 +334,20 @@ public class EmployeeSecurityIC extends ValidatorEJB implements EmployeeSecurity
else if("mode_of_security".equalsIgnoreCase(childNodeName))
{
modeOfSec = checkNull(genericUtility.getColumnValue("mode_of_security", allDom ));
typeOfSec = checkNull(genericUtility.getColumnValue("type_of_security", allDom ));
if(modeOfSec == null || modeOfSec.length() == 0)
{
errString = getErrorString("mode_of_security", "VTEMPSEC04", userId);
break;
}
else
{
/**
* Check type of security first
* if it is other than 'N'
* system must validate mode of security
* */
if(!"N".equalsIgnoreCase(typeOfSec))
{
sql = "SELECT COUNT(*) AS COUNT FROM GENCODES WHERE MOD_NAME = 'W_EMP_SECURITIES' AND FLD_NAME='MODE_OF_SECURITY' AND TRIM(FLD_VALUE)=? ";
pstmt = conn.prepareStatement(sql);
......@@ -359,6 +372,8 @@ public class EmployeeSecurityIC extends ValidatorEJB implements EmployeeSecurity
rs = null;
}
}
}
}
else if("type_of_security".equalsIgnoreCase(childNodeName))
{
......@@ -705,7 +720,7 @@ public class EmployeeSecurityIC extends ValidatorEJB implements EmployeeSecurity
String columnValue = "";
String childNodeName = null, childNodeValue = null;
int ctr = 0, childNodeListLength = 0, remCount = 0;
String lastRemindDate = "" , grade = "" , empSite = "" , deptCode = "" , empCode = "" , tranDate ="" ,modeOfSecStr = "" , folioId = "" ,
String lastRemindDate = "" , grade = "" , empSite = "" , deptCode = "" , empCode = "" , tranDate ="" ,modeOfSecStr = "" ,typeOfSecStr = "" , folioId = "" ,
panNo = "" , clientId = "" , dpId = "" , empName = "" , sql = "" , shareHoldPercStr = "",acntPrd="" , dtJoinStr = "" ;
char status = 'O' ;
double shareHoldPerc = 0.0;
......@@ -1104,7 +1119,37 @@ public class EmployeeSecurityIC extends ValidatorEJB implements EmployeeSecurity
//valueXmlString.append("<pan_no>").append("<![CDATA[]]>").append("</pan_no>");
}
}
// Modified By Santosh Gupta added not applicable to type of security (12/4/17)start
else if("type_of_security".equalsIgnoreCase(currentColumn))
{
typeOfSecStr = checkNull(genericUtility.getColumnValue("type_of_security", dom , "2"));
System.out.println("type of security"+typeOfSecStr);
if( typeOfSecStr.length() > 0 )
{
if("N".equalsIgnoreCase(typeOfSecStr))
{
valueXmlString.append("<mode_of_security protect=\"1\"><![CDATA["+typeOfSecStr+ "]]></mode_of_security>\r\n");
valueXmlString.append("<folio_no protect=\"1\"><![CDATA["+typeOfSecStr+ "]]></folio_no>\r\n");
valueXmlString.append("<client_id protect=\"0\"><![CDATA[]]></client_id>\r\n");
valueXmlString.append("<dp_id protect=\"0\"><![CDATA[]]></dp_id>\r\n");
}
else{
valueXmlString.append("<mode_of_security protect=\"0\"><![CDATA[]]></mode_of_security>\r\n");
valueXmlString.append("<folio_no protect=\"0\"><![CDATA[]]></folio_no>\r\n");
valueXmlString.append("<client_id protect=\"0\"><![CDATA[]]></client_id>\r\n");
valueXmlString.append("<dp_id protect=\"0\"><![CDATA[]]></dp_id>\r\n");
}
}
else
{
valueXmlString.append("<mode_of_security protect=\"0\"><![CDATA[]]></mode_of_security>\r\n");
valueXmlString.append("<folio_no protect=\"0\"><![CDATA[]]></folio_no>\r\n");
valueXmlString.append("<client_id protect=\"0\"><![CDATA[]]></client_id>\r\n");
valueXmlString.append("<dp_id protect=\"0\"><![CDATA[]]></dp_id>\r\n");
}
}
//Santosh Gupta End
else if( "mode_of_security".equalsIgnoreCase(currentColumn) )
{
modeOfSecStr = checkNull(genericUtility.getColumnValue("mode_of_security", dom , "2"));
......@@ -1122,6 +1167,8 @@ public class EmployeeSecurityIC extends ValidatorEJB implements EmployeeSecurity
valueXmlString.append("<dp_id protect=\"1\"><![CDATA["+ dpId + "]]></dp_id>\r\n");
valueXmlString.append("<folio_no protect=\"0\"><![CDATA[]]></folio_no>\r\n");
}
}
else
{
......
webitm-adm/ibase/webitm/ejb/adm/adv/EmpMaritalStatusConf.java
View file @ f9969daf
......@@ -282,7 +282,8 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
retString = itmDBAccess.getErrorString("", "VSENVAR1", "", "", connection);
return retString;
}
autoPost = checkNull(admCommon.getEnv("999999", "AUTO_POST", connection));
// autoPost = checkNull(admCommon.getEnv("999999", "AUTO_POST", connection));
autoPost=getAutoPostValue(empCode,"AUTO_POST",connection);
if("NULLFOUND".equalsIgnoreCase(autoPost))
{
retString = itmDBAccess.getErrorString("", "VSENVAR1", "", "", connection);
......@@ -295,7 +296,10 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
return retString;
}
sql = "SELECT CCTR_CODE__SAL, BANK_CODE, DEPT_CODE, RELIEVE_DATE, WITH_HELD, PAY_SITE FROM EMPLOYEE WHERE EMP_CODE = ?";
//Modified by Ahmed on 02/DEC/2016[To fetch pay mode from employee master][start]
//sql = "SELECT CCTR_CODE__SAL, BANK_CODE, DEPT_CODE, RELIEVE_DATE, WITH_HELD, PAY_SITE FROM EMPLOYEE WHERE EMP_CODE = ?";
sql = "SELECT CCTR_CODE__SAL, BANK_CODE, DEPT_CODE, RELIEVE_DATE, WITH_HELD, PAY_SITE, PAY_MODE FROM EMPLOYEE WHERE EMP_CODE = ?";
//Modified by Ahmed on 02/DEC/2016[To fetch pay mode from employee master][end]
pstmt = connection.prepareStatement(sql);
pstmt.setString(1, empCode);
rs = pstmt.executeQuery();
......@@ -307,6 +311,7 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
empCctrCodeSal = rs.getString("CCTR_CODE__SAL");
empBankCode = checkNull(rs.getString("BANK_CODE"));
empDeptCode = checkNull(rs.getString("DEPT_CODE"));
payMode = checkNull(rs.getString("PAY_MODE"));//Modified by Ahmed on 02/DEC/2016[To fetch pay mode from employee master]
}
close(pstmt, rs);
......@@ -417,11 +422,22 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
totalAmountBC = totalAmount * exchangeRate;
String adCode = "";
//Modified by Santosh Gupta START
String refId="";
if(statusDate==null || statusDate.trim().length()==0)
{
refId=tranId;
System.out.println("refId is:"+refId);
}else{
refId=statusDate;
System.out.println("refId is:"+refId);
}
// Santosh Gupta END
Calendar currentDate = Calendar.getInstance();
SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getApplDateFormat());
String sysDateStr = sdf1.format(currentDate.getTime());
sql = " INSERT INTO PAYR_VOUCHER (TRAN_ID, TRAN_DATE, TRAN_TYPE, EFF_DATE, EMP_CODE, REF_NO, REF_DATE, " +
"BANK_CODE, AUTO_PAY, PAY_MODE, CHG_DATE, CHG_USER, CHG_TERM, SITE_CODE, FIN_ENTITY, REMARKS, " +
"ANAL_CODE, CONFIRMED, PAID, ACCT_CODE__PAY, CCTR_CODE__PAY, TOT_AMT, ENTRY_BATCH_NO, VOUCH_TYPE, " +
......@@ -434,8 +450,8 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
pstmt.setString(3, tranType);
pstmt.setTimestamp(4, tranDateTimestamp);
pstmt.setString(5, empCode);
// pstmt.setString(6, tranId);
pstmt.setString(6, statusDate);
// pstmt.setString(6, tranId);
pstmt.setString(6, refId);
pstmt.setTimestamp(7, tranDateTimestamp);
pstmt.setString(8, empBankCode);
pstmt.setString(9, autoPay);
......@@ -542,7 +558,53 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
}
return retString;
}
private String getAutoPostValue(String empCode, String varName, Connection conn) throws ITMException
{
// TODO Auto-generated method stub
String autoPost="",sql="";
PreparedStatement pstmt=null;
ResultSet rs=null;
try {
sql="select ddf_hr_site_env_value(?,SYSDATE,?)as var_value from dual";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, empCode);
pstmt.setString(2, varName);
rs=pstmt.executeQuery();
if(rs.next())
{
autoPost=rs.getString("var_value");
}
pstmt.close();
pstmt=null;
rs.close();
rs=null;
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try {
if(pstmt!=null)
{
pstmt.close();
pstmt=null;
}
if(rs!=null)
{
rs.close();
rs=null;
}
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
throw new ITMException(e);
}
}
return autoPost;
}
private String generateTranId( String windowName, String siteCode, String tranDateStr, Connection conn) throws ITMException
{
PreparedStatement pstmt = null;
......
webitm-adm/ibase/webitm/ejb/adm/adv/PayrollVoucherConf.java
View file @ f9969daf
......@@ -276,7 +276,9 @@ public class PayrollVoucherConf extends ActionHandlerEJB implements PayrollVouch
{
if (profileIdArg.trim().length() > 0)
{
sql = "SELECT RIGHTS FROM USER_RIGHTS WHERE PROFILE_ID = ?";
//Modified by santosh to cancel the Marital status to Unmarital status(10/4/17)
//sql = "SELECT RIGHTS FROM USER_RIGHTS WHERE PROFILE_ID = ?
sql = "SELECT RIGHTS FROM USER_RIGHTS WHERE PROFILE_ID = ? AND OBJ_NAME='payr_voucher'";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, profileIdArg);
rs = pstmt.executeQuery();
......
webitm-adm/module-resource/SQL/A16HSUN008.sql
View file @ f9969daf
......@@ -360,3 +360,22 @@ COMMIT;
update transetup set confirm_col='STATUS',confirm_val='S',def_view='T' where tran_window ='w_emp_securities';
--------------------------------------------- VALLABH KADAM [13/FEB/17]END ---------------------------------------------------------
---------------------------------------------VALLABH KADAM [30/MAR/17]--------------------------------------------------------------
delete from messages where msg_no='VTEMPACCT';
Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION)
values ('VTEMPACCT ','Transaction not allowed','Record is already exist for same accounting period','E','Y',0,null,null,SYSDATE,'SUN ','HDP ',null,null);
---------------------------------------------VALLABH KADAM [30/MAR/17] END--------------------------------------------------------------
---------------------------------------------SANTOSH GUPTA [14/APR/17]--------------------------------------------------------------
Insert into OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY)
values ('emp_securities','2 ','type_of_security','Y');
INSERT INTO GENCODES (FLD_NAME,MOD_NAME,FLD_VALUE,DESCR,SH_DESCR,CHG_DATE,CHG_USER,CHG_TERM,ACTIVE,UDF_STR1,UDF_STR2,UDF_STR3)
VALUES ('TYPE_OF_SECURITY','W_EMP_SECURITIES','N','Not Applicable','Not Applicable',SYSDATE,'BASE ','BASE ','Y',NULL,NULL,NULL);
---------------------------------------------SANTOSH GUPTA [14/APR/17] END--------------------------------------------------------------
webitm-adm/module-resource/SQL/ADM-RCP-DATA-DML.SQL
View file @ f9969daf
......@@ -19646,3 +19646,9 @@ update transetup set confirm_col = 'confirmed', confirm_val = 'Y' where tran_win
--- Request ID:A16HSUN006. Migration of IT Declaration to RCP and IT Declaration through Upload END ---
------ ADM-RCP-DATA-V34.SQL.End ------
--Modified by Ahmed on 03/May/2017[start]
INSERT INTO PAYRPARM (PRD_CODE,VAR_NAME,VAR_TYPE,VAR_VALUE,DESCR,VAR_SUBS,CHG_DATE,CHG_USER,CHG_TERM) VALUES ('999999','VALID_UPTO_ORG_STRUC','S','2099-12-31','Valid Upto Date of Org Structure [YYYY-MM-DD]',null,FN_SYSDATE(),'AHMED','AHMED');
COMMIT;
--Modified by Ahmed on 03/May/2017[end]
\ No newline at end of file
webitm-adm/module-resource/metadata/emp_marital_status_conf11.xml
View file @ f9969daf
......@@ -92,7 +92,6 @@
<updatewhereclause>yes</updatewhereclause>
<name>generate_voucher</name>
<dbname>generate_voucher</dbname>
<initial>N</initial>
<values>
<item display="Yes" data="Y"/>
<item display="No" data="N"/>
......
webitm-adm/module-resource/metadata/emp_securities12.xml
View file @ f9969daf
......@@ -162,7 +162,7 @@
<name>value_option</name>
<dbname>emp_securities_dtl.value_option</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;emp_securities_dtl&quot; ) COLUMN(NAME=&quot;emp_securities_dtl.tran_id&quot;) COLUMN(NAME=&quot;emp_securities_dtl.line_no&quot;) COLUMN(NAME=&quot;emp_securities_dtl.relative_name&quot;) COLUMN(NAME=&quot;emp_securities_dtl.relationship&quot;) COLUMN(NAME=&quot;emp_securities_dtl.pan_no&quot;) COLUMN(NAME=&quot;emp_securities_dtl.mode_of_security&quot;) COLUMN(NAME=&quot;emp_securities_dtl.folio_no&quot;) COLUMN(NAME=&quot;emp_securities_dtl.dp_id&quot;) COLUMN(NAME=&quot;emp_securities_dtl.client_id&quot;) COLUMN(NAME=&quot;emp_securities_dtl.type_of_security&quot;) COLUMN(NAME=&quot;emp_securities_dtl.no_of_securities&quot;) COLUMN(NAME=&quot;emp_securities_dtl.shareholding_perc&quot;) COLUMN(NAME=&quot;emp_securities_dtl.units_future&quot;) COLUMN(NAME=&quot;emp_securities_dtl.units_option&quot;) COLUMN(NAME=&quot;emp_securities_dtl.value_future&quot;) COLUMN(NAME=&quot;emp_securities_dtl.value_option&quot;)WHERE( EXP1 =&quot;EMP_SECURITIES_DTL.TRAN_ID&quot; OP =&quot;=&quot; EXP2 =&quot;:tran_id&quot; ) ) ARG(NAME = &quot;tran_id&quot; TYPE = string) </retrieve>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;emp_securities_dtl&quot; ) COLUMN(NAME=&quot;emp_securities_dtl.tran_id&quot;) COLUMN(NAME=&quot;emp_securities_dtl.line_no&quot;) COLUMN(NAME=&quot;emp_securities_dtl.relative_name&quot;) COLUMN(NAME=&quot;emp_securities_dtl.relationship&quot;) COLUMN(NAME=&quot;emp_securities_dtl.pan_no&quot;) COLUMN(NAME=&quot;emp_securities_dtl.mode_of_security&quot;) COLUMN(NAME=&quot;emp_securities_dtl.folio_no&quot;) COLUMN(NAME=&quot;emp_securities_dtl.dp_id&quot;) COLUMN(NAME=&quot;emp_securities_dtl.client_id&quot;) COLUMN(NAME=&quot;emp_securities_dtl.type_of_security&quot;) COLUMN(NAME=&quot;emp_securities_dtl.no_of_securities&quot;) COLUMN(NAME=&quot;emp_securities_dtl.shareholding_perc&quot;) COLUMN(NAME=&quot;emp_securities_dtl.units_future&quot;) COLUMN(NAME=&quot;emp_securities_dtl.units_option&quot;) COLUMN(NAME=&quot;emp_securities_dtl.value_future&quot;) COLUMN(NAME=&quot;emp_securities_dtl.value_option&quot;)WHERE( EXP1 =&quot;~&quot;EMP_SECURITIES_DTL~&quot;.~&quot;TRAN_ID~&quot;&quot; OP =&quot;=&quot; EXP2 =&quot;:tran_id&quot; ) ) ARG(NAME = &quot;tran_id&quot; TYPE = string) </retrieve>
<update>EMP_SECURITIES_DTL</update>
<updatewhere>1</updatewhere>
<updatekeyinplace>no</updatekeyinplace>
......
webitm-adm/module-resource/srd/d_emp_marital_edit.srd 0 → 100755
View file @ f9969daf
This diff is collapsed.
webitm-adm/module-resource/srd/d_emp_marital_status_conf11.srd
View file @ f9969daf
......@@ -9,7 +9,7 @@ table(column=(type=char(40) updatewhereclause=yes name=emp_name dbname="emp_name
column=(type=char(1) updatewhereclause=yes name=old_status dbname="old_status" values="Married M/Unmarried U/Divorced D/Separated S/Unknown K/" )
column=(type=char(1) updatewhereclause=yes name=new_status dbname="new_status" values="Married M/Unmarried U/Divorced D/Separated S/Unknown K/" )
column=(type=number updatewhereclause=yes name=gift_amount dbname="gift_amount" )
column=(type=char(1) updatewhereclause=yes name=generate_voucher dbname="generate_voucher" initial="N" values="Yes Y/No N/" )
column=(type=char(1) updatewhereclause=yes name=generate_voucher dbname="generate_voucher" values="Yes Y/No N/" )
column=(type=datetime updatewhereclause=yes name=status_date dbname="status_date" )
column=(type=char(10) updatewhereclause=yes name=emp_code dbname="emp_code" )
)
......
webitm-adm/module-resource/srd/d_emp_securities12.srd
View file @ f9969daf
......@@ -21,7 +21,7 @@ table(column=(type=char(10) update=yes updatewhereclause=yes key=yes name=tran_i
column=(type=decimal(0) update=yes updatewhereclause=yes name=units_option dbname="emp_securities_dtl.units_option" )
column=(type=decimal(2) update=yes updatewhereclause=yes name=value_future dbname="emp_securities_dtl.value_future" )
column=(type=decimal(2) update=yes updatewhereclause=yes name=value_option dbname="emp_securities_dtl.value_option" )
retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"emp_securities_dtl~" ) COLUMN(NAME=~"emp_securities_dtl.tran_id~") COLUMN(NAME=~"emp_securities_dtl.line_no~") COLUMN(NAME=~"emp_securities_dtl.relative_name~") COLUMN(NAME=~"emp_securities_dtl.relationship~") COLUMN(NAME=~"emp_securities_dtl.pan_no~") COLUMN(NAME=~"emp_securities_dtl.mode_of_security~") COLUMN(NAME=~"emp_securities_dtl.folio_no~") COLUMN(NAME=~"emp_securities_dtl.dp_id~") COLUMN(NAME=~"emp_securities_dtl.client_id~") COLUMN(NAME=~"emp_securities_dtl.type_of_security~") COLUMN(NAME=~"emp_securities_dtl.no_of_securities~") COLUMN(NAME=~"emp_securities_dtl.shareholding_perc~") COLUMN(NAME=~"emp_securities_dtl.units_future~") COLUMN(NAME=~"emp_securities_dtl.units_option~") COLUMN(NAME=~"emp_securities_dtl.value_future~") COLUMN(NAME=~"emp_securities_dtl.value_option~")WHERE( EXP1 =~"EMP_SECURITIES_DTL.TRAN_ID~" OP =~"=~" EXP2 =~":tran_id~" ) ) ARG(NAME = ~"tran_id~" TYPE = string) " update="EMP_SECURITIES_DTL" updatewhere=1 updatekeyinplace=no arguments=(("tran_id", string)) )
retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"emp_securities_dtl~" ) COLUMN(NAME=~"emp_securities_dtl.tran_id~") COLUMN(NAME=~"emp_securities_dtl.line_no~") COLUMN(NAME=~"emp_securities_dtl.relative_name~") COLUMN(NAME=~"emp_securities_dtl.relationship~") COLUMN(NAME=~"emp_securities_dtl.pan_no~") COLUMN(NAME=~"emp_securities_dtl.mode_of_security~") COLUMN(NAME=~"emp_securities_dtl.folio_no~") COLUMN(NAME=~"emp_securities_dtl.dp_id~") COLUMN(NAME=~"emp_securities_dtl.client_id~") COLUMN(NAME=~"emp_securities_dtl.type_of_security~") COLUMN(NAME=~"emp_securities_dtl.no_of_securities~") COLUMN(NAME=~"emp_securities_dtl.shareholding_perc~") COLUMN(NAME=~"emp_securities_dtl.units_future~") COLUMN(NAME=~"emp_securities_dtl.units_option~") COLUMN(NAME=~"emp_securities_dtl.value_future~") COLUMN(NAME=~"emp_securities_dtl.value_option~")WHERE( EXP1 =~"~~~"EMP_SECURITIES_DTL~~~".~~~"TRAN_ID~~~"~" OP =~"=~" EXP2 =~":tran_id~" ) ) ARG(NAME = ~"tran_id~" TYPE = string) " update="EMP_SECURITIES_DTL" updatewhere=1 updatekeyinplace=no arguments=(("tran_id", string)) )
text(band=header alignment="2" text="Tran Id" border="0" color="33554432" x="2" y="2" height="16" width="66" html.valueishtml="0" name=tran_id_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
text(band=header alignment="2" text="Line No" border="0" color="33554432" x="70" y="2" height="16" width="69" html.valueishtml="0" name=line_no_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
text(band=header alignment="2" text="Relative Name" border="0" color="33554432" x="141" y="2" height="16" width="421" html.valueishtml="0" name=relative_name_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
......
webitm-adm/module-resource/srd/d_emp_staus_date_chg11.srd 0 → 100755
View file @ f9969daf
This diff is collapsed.
webitm-adm/web/webitm/jsp/PerkProcessWizard.jsp
View file @ f9969daf
......@@ -11,7 +11,8 @@
<script type="text/javascript" src="/ibase/webitm/js/json2.min.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/l10n.min.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/localizations.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery.min.js"></script>
<!-- <script type="text/javascript" src="/ibase/webitm/js/jquery.min.js"></script>-->
<script type="text/javascript" src="/ibase/webitm/js/jquery-1.11.1.min.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/PerkProcessWizard.js"></script>
</head>
<!-- Changed by Pawan .start -->
......@@ -37,12 +38,25 @@
String objName = ( String ) request.getParameter("OBJ_NAME");
System.out.println("objName ............"+objName);
//Modified by Ahmed
String minDbId = ( String ) request.getParameter("minDbId");
System.out.println("minDbId ............"+minDbId);
String maxDbId = ( String ) request.getParameter("maxDbId");
System.out.println("maxDbId ............"+maxDbId);
//
%>
<script language="JavaScript" type="text/javascript">
var minDbId = <%=minDbId%>;
var maxDbId = <%=maxDbId%>;
</script>
<%
PerkProcessWizardBean PerkProcessWizardBean = new PerkProcessWizardBean(objName,httpsession);
System.out.println("Got bean");
//htmlData = PerkProcessWizardBean.getDataForRefNo(RefNo,lineNo,tranId,selectedData,det2DbId);
htmlData = PerkProcessWizardBean.getDataForRefNo(EmpCode,lineNo,tranId,selectedData,det2DbId);
%>
%>
<!-- <div style="width=100%;position:absolute;height=85%;left=1%;overflow=auto;border:thin ridge lightgray;" > -->
<div style="width:100%;height:85%;left:2%;margin-top:10px;margin-bottom:2px;overflow:-moz-scrollbars-vertical;overflow-x:scroll;overflow-y:scroll;border:thin ridge lightgray;" >
......
webitm-adm/web/webitm/xsl/Standard/WIZARD/claim_proc_multiple_wiz1_wiz_en_US_A.xsl
View file @ f9969daf
......@@ -12,24 +12,24 @@
<link type="text/css" rel="stylesheet" href="/ibase/webitm/css/PerkClaimProcess.css"/>
<link type="text/css" rel="stylesheet" href="/ibase/webitm/css/fonts.css"></link>
<script type="text/javascript" src="/ibase/webitm/js/jquery-1.11.1.min.js"></script>
<!-- <script type="text/javascript" src="/ibase/webitm/js/SavexWizard.js"></script> -->
<script type="text/javascript" src="/ibase/webitm/js/SavexWizardCalendar.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/GlobalFunc.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/GlobalVar.js"></script>
<!-- <script type="text/javascript" src="/ibase/webitm/js/PerkProcessWizard.js"></script> -->
<script type="text/javascript" src="/ibase/webitm/js/PerkProcessWizard.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/StatelessItemChange.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/MultiPerkProcessWizard.js"></script>
<script language="Javascript" type="text/javascript">
window.onload=function()
<!-- window.onload=function()-->
$(document).ready(function()
{
global_obj_name=document.getElementById("OBJ_NAME").value;
openDet3 = document.getElementById("loanWin").value ;
document.getElementById("Detail1.1.emp_code").focus();
makeFiledReadOnly(1);
};
});
</script>
<!-- document.getElementById("Detail1.1.payroll_prd").readOnly = true;
......
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