Skip to content

B
business-java
Commit 96219690 authored by arawankar's avatar arawankar
Browse files
Options

*Changes made in Leave confirmation and leave Cancellation as per pb code.( pb... 

*Changes made in Leave confirmation and leave Cancellation as per pb code.( pb changes incorporated done upto 28th of june)

EmpLeaveCancel.java
EmpLeaveConf.java

*Leave Encashment Confirmation component as per pb code migrated .( pb changes incorporated done upto 28th of june)
LeaveEncashmentConfirmation.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@204061 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0e8f1c27
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2423 additions and 50 deletions
webitm-adm/ibase/webitm/ejb/adm/adv/EmpLeaveCancel.java
View file @ 96219690
......@@ -528,7 +528,10 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
pstmt.close();
pstmt = null;
}
if(status.equals("C"))
//Modified by Anjali R. on [18/07/2019][Start]
//if(status.equals("C"))
if(status.equalsIgnoreCase("C"))
//Modified by Anjali R. on [18/07/2019][End]
{
errCode = "VTEMPLVE13";
break;
......@@ -813,16 +816,23 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
pstmt.close();
pstmt = null;
}
if(status.equals("C"))
//Modified by Anjali R. on [18/07/2019][Start]
//if(status.equals("C"))
if(status.equalsIgnoreCase("C"))
//Modified by Anjali R. on [18/07/2019][End]
{
errCode = "VTEMPLVE13";
this.errList.add(errCode);
this.fldList.add("");
break;
}
else if(useFlag.equals("E"))
//Modified by Anjali R. on [18/07/2019][Start]
//else if(useFlag.equals("E"))
else if("E".equalsIgnoreCase(useFlag))
{
if(status.equals("A"))
//if(status.equals("A"))
if("A".equalsIgnoreCase(status))
//Modified by Anjali R. on [18/07/2019][End]
{
//Modified by Anjali R. on [04/01/2019][Not allow to cancel the leave encashment][Start]
errCode = "VTEMPLVE21";
......@@ -926,14 +936,20 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
//Modified by Anjali R. on [04/01/2019][Not allow to cancel the leave encashment][End]
}
}
else if(useFlag.equals("L"))
//Modified by Anjali R. on [18/07/2019][Start]
//else if(useFlag.equals("L"))
else if(useFlag.equalsIgnoreCase("L"))
//Modified by Anjali R. on [18/07/2019][End]
{
errCode = "VTLVE16";
this.errList.add(errCode);
this.fldList.add("");
break;
}
else if(useFlag.equals("V") && status.equals("A"))
//Modified by Anjali R. on [18/07/2019][Start]
//else if(useFlag.equals("V") && status.equals("A"))
else if(useFlag.equalsIgnoreCase("V") && status.equalsIgnoreCase("A"))
//Modified by Anjali R. on [18/07/2019][End]
{
errCode ="VTLVE16";
this.errList.add(errCode);
......@@ -944,7 +960,10 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
pstmt = connectionObject.prepareStatement(sql);
pstmt.setString(1,empCode);
resultSet = pstmt.executeQuery();
while(resultSet.next())
//Modified by Anjali r. on [18/07/2019][Start]
//while(resultSet.next())
if(resultSet.next())
//Modified by Anjali r. on [18/07/2019][End]
{
empStatus = checkNull(resultSet.getString("status"));
}
......@@ -958,7 +977,10 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
pstmt.close();
pstmt = null;
}
if(empStatus.equals("S"))
//Modified by Anjali R. on [18/07/2019][Start]
//if(empStatus.equals("S"))
if(empStatus.equalsIgnoreCase("S"))
//Modified by Anjali R. on [18/07/2019][end]
{
errCode = "VTEMPSEP1";
this.errList.add(errCode);
......@@ -1110,14 +1132,18 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
}
if(rowsUpdate > 0)
{
if(status.equals("A"))
//Modified by Anjali R. on [18/07/2019][Start]
//if(status.equals("A"))
if(status.equalsIgnoreCase("A"))
//Modified by Anjali R. on [18/07/2019][End]
{
hmap = cancelLve(tranId , 2 , connectionObject);
if(errCode != null && errCode.trim().length() > 0 &&utilMethod.pos(errCode , "<Errors>") > 0)
{
break;
}
//Modified by Anjali R.on [03/06/2019][Start]
/*
else
{
noRows = 0;
......@@ -1146,14 +1172,14 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
this.errList.add(errCode);
this.fldList.add("");
break;
}*/
}
if(ediOption > 0 )
{
empLveCancel = new StringBuffer();
/*empLveCancel.dataobject = "d_empleave_cancel_edit";
empLveCancel.settransobject(sqlca);
empLveCancel.retrieve(tranId);
*/
if(ediOption == 2)
{
//To be done later on
......@@ -1165,6 +1191,8 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
//functionsAdv.nf_create_edi_multi("w_empleave_cancel",empLveCancel.describe("datawindow.syntax") +"\r"+empLveCancel.describe("datawindow.syntax.data"),'E',ediOption, 1, "","","","","","");
}
}
}*/
//Modified by Anjali R.on [03/06/2019][End]
}
}
else if(status.equals("R"))
......
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