Skip to content

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

Changes made in below component 

EmpLvePrkBalTrfConf.java
-Return string related changes done in confirm method
-Connection commit related changes

EmpLvePrkBalTrfIC.java
-Validation and itemchange related changes done for user level
-Validation added for balance code for detail record

AD89SUN091.sql
-Added messages table entries.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@190661 ce508802-f39f-4f6c-b175-0d175dae99d5
parent cdb020c6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 219 additions and 38 deletions
webitm-adm/ibase/webitm/ejb/adm/EmpLvePrkBalTrfIC.java
View file @ 7ff7f041
......@@ -117,6 +117,9 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC
String empSiteFrDescr = "";
String userLevel = "";
int count = 0;
String tranDate = "";
String siteCodeFr = "";
int usrLvl = 0;
//Modified by Anjali R. on [14-08-2018][Added to get empSiteFr][End]
E12GenericUtility genericUtility = new E12GenericUtility();
......@@ -249,11 +252,19 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC
String tranIdEdit = checkNull( genericUtility.getColumnValue( "tran_id", dom ) );
String status = checkNull( genericUtility.getColumnValue( "status", dom ) );
tranType = checkNull( getColumnValue( "tran_type", dom, "1" ) ) ;
//Modified by Anjali R. on[11/09/2018][Get values from dom][Start]
tranDate = checkNull(genericUtility.getColumnValue( "tran_date", dom ) );
siteCodeFr = checkNull(genericUtility.getColumnValue("site_code__fr", dom));
//Modified by Anjali R. on[11/09/2018][Get values from dom][End]
valueXmlString.append("<tran_id protect=\"1\"><![CDATA[").append( tranIdEdit ).append("]]></tran_id>\r\n");
valueXmlString.append("<emp_code__fr protect=\"1\"><![CDATA[").append( empCodeFrom ).append("]]></emp_code__fr>\r\n");
valueXmlString.append("<tran_type protect=\"1\"><![CDATA[").append( tranType ).append("]]></tran_type>\r\n");
valueXmlString.append( "<tran_date protect=\"1\"><![CDATA[").append( curDate ).append("]]></tran_date>\r\n" );
valueXmlString.append( "<site_code__fr protect=\"1\"><![CDATA[").append( loginSiteCode ).append("]]></site_code__fr>\r\n" );
//Modified by Anjali R. on[11/09/2018][set dom values ][Start]
/*valueXmlString.append( "<tran_date protect=\"1\"><![CDATA[").append( curDate ).append("]]></tran_date>\r\n" );
valueXmlString.append( "<site_code__fr protect=\"1\"><![CDATA[").append( loginSiteCode ).append("]]></site_code__fr>\r\n" );*/
valueXmlString.append( "<tran_date protect=\"1\"><![CDATA[").append( tranDate ).append("]]></tran_date>\r\n" );
valueXmlString.append( "<site_code__fr protect=\"1\"><![CDATA[").append( siteCodeFr ).append("]]></site_code__fr>\r\n" );
//Modified by Anjali R. on[11/09/2018][set dom values][end]
valueXmlString.append( "<status protect=\"1\"><![CDATA[").append( status ).append("]]></status>\r\n" );
}
else if ( "emp_code__fr".equalsIgnoreCase( currentColumn ) )
......@@ -373,7 +384,20 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC
}
System.out.println("userLevel:::::::["+userLevel+"]");
if( Integer.parseInt( userLevel ) > 1 )
//Modified by Anjali R. on [11/09/2018][Start]
try
{
usrLvl = Integer.parseInt( userLevel );
}
catch(Exception e)
{
System.out.println("usrLvl----["+usrLvl+"]");
usrLvl = 1;
}
//if( Integer.parseInt( userLevel ) > 1 )
if(usrLvl > 1 )
//Modified by Anjali R. on [11/09/2018][End]
{
sql = "select count(SITE_CODE) as cnt from user_site where USER_ID = ? and site_code = ?";
pstmt = conn.prepareStatement(sql);
......@@ -394,13 +418,29 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC
pstmt.close();
pstmt = null;
}
//Modified by Anjali R. on[11/09/2018][To set values user level wise][Start]
if(count <= 0)
{
valueXmlString.append("<emp_name__fr protect=\"1\"><![CDATA[").append( "" ).append("]]></emp_name__fr>\r\n");
valueXmlString.append("<site_code__fr protect=\"1\"><![CDATA[").append( "" ).append("]]></site_code__fr>\r\n");
valueXmlString.append("<site_descr__fr protect=\"1\"><![CDATA[").append( "" ).append("]]></site_descr__fr>\r\n");
}
else
{
valueXmlString.append("<emp_name__fr protect=\"1\"><![CDATA[").append( empNameFrom ).append("]]></emp_name__fr>\r\n");
valueXmlString.append("<site_code__fr protect=\"1\"><![CDATA[").append( empSiteFr ).append("]]></site_code__fr>\r\n");
valueXmlString.append("<site_descr__fr protect=\"1\"><![CDATA[").append( empSiteFrDescr ).append("]]></site_descr__fr>\r\n");
}
//Modified by Anjali R. on[11/09/2018][To set values user level wise][end]
}
if(count <= 0)
//Commented by Anjali R. on[11/09/2018][Start]
/*if(count <= 0)
{
valueXmlString.append("<emp_name__fr protect=\"1\"><![CDATA[").append( "" ).append("]]></emp_name__fr>\r\n");
valueXmlString.append("<site_code__fr protect=\"1\"><![CDATA[").append( "" ).append("]]></site_code__fr>\r\n");
valueXmlString.append("<site_descr__fr protect=\"1\"><![CDATA[").append( "" ).append("]]></site_descr__fr>\r\n");
}
}*/
//Commented by Anjali R. on[11/09/2018][End]
else
{
//Modified by Anjali R. on [07/09/2018][To access user level wise][End]
......@@ -655,6 +695,7 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC
int ctr = 0;
int count = 0;
String userId = "" ;
int usrLvl = 0;//Added by Anjali R. on [11/09/2018]
String objName = "";
String keyFlag = "";
......@@ -854,9 +895,30 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC
{
userLevel = checkNull( rs.getString( "USR_LEV" ) );
}
//Modified by Anjali R. on [11/09/2018][Start]
if( rs != null )
{
rs.close();
rs = null;
}
if( pstmt != null )
{
pstmt.close();
pstmt = null;
}
System.out.println("userLevel:::::::["+userLevel+"]");
if( Integer.parseInt( userLevel ) > 1 )
try
{
usrLvl = Integer.parseInt( userLevel ) ;
}
catch(Exception e)
{
System.out.println("exception while parsing---["+e.getMessage()+"]");
usrLvl = 1;
}
//if( Integer.parseInt( userLevel ) > 1 )
if( usrLvl > 1 )
//Modified by Anjali R. on [11/09/2018][End]
{
siteCodeFrom = checkNull( genericUtility.getColumnValue( "site_code__fr", dom, objContext ) );
//Modified by Anjali R. on[07/09/2018][Start]
......@@ -1161,6 +1223,33 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC
}
}
break;
//Modified by Anjali R. on [11/09/2018][To validate balance code][Start]
case 2 :
parentNodeList = dom1.getElementsByTagName("Detail1");
parentNode = parentNodeList.item(0);
parentNodeList = dom.getElementsByTagName("Detail2");
parentNode = parentNodeList.item(0);
childNodeList = parentNode.getChildNodes();
childNodeListLength = childNodeList.getLength();
for(ctr = 0; ctr < childNodeListLength; ctr ++)
{
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
if(childNodeName.equalsIgnoreCase("balance_code"))
{
String balanceCode = checkNull( genericUtility.getColumnValue("balance_code",dom )) ;
System.out.println("balanceCode---["+balanceCode+"]");
if(balanceCode == null || balanceCode.trim().length() == 0)
{
System.out.println("balanceCode null--["+balanceCode+"]");
retString = itmDBAccess.getErrorString( "", "VTELPTRF26", userId, "", conn );
return retString;
}
}
}
break;
//Modified by Anjali R. on [11/09/2018][To validate balance code][End]
}
/*int errListSize = errList.size();
if ( errList != null && errListSize > 0 )
......
webitm-adm/module-resource/AD89SUN091/AD89SUN091.sql
View file @ 7ff7f041
......@@ -2384,4 +2384,25 @@ Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,E
values ('VTUNCONF01','Already record exist','For this employee unconfirmed record is already present.','E','Y',null,null,null,sysdate,'SUN','SUN',null,null);
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 ('VTELPTRF25','Insufficiant Balance','Employee does not have sufficient balance.','E','Y',null,null,null,sysdate,'SUN','SUN',null,null);
--Added by Anjali R. on[16-08-2018][End]
\ No newline at end of file
--Added by Anjali R. on[16-08-2018][End]
--Added by Anjali R. on[11-09-2018][Start]
SET DEFINE OFF;
update transetup set site_acc_col = null where tran_window = 'w_emp_lveprkbal_trf';
alter table emp_lveprkbal_trfdet add TRAN_ID__REF VARCHAR2(10);
alter table emp_lveprkbal_trfhdr modify status_date date null;
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 ('DS000','Database Exception','Database Error','E','Y',0,NULL,NULL,SYSDATE,'BASE','BASE',NULL,NULL);
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 ('VTELPTRF26','BALANCE CODE BLANK','Please specify balance code,Balance code should not be blank.','E',NULL,NULL,NULL,NULL,SYSDATE,'BASE','BASE',NULL,NULL);
COMMIT;
--Added by Anjali R. on[11-09-2018][End]
\ 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