Skip to content

B
business-java
Commit 8cba988d authored by dpingle's avatar dpingle
Browse files
Options

* changes done in leave balance on [31/08/19] 

w_leavebal.sql
leaveBalIC.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@206625 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f1e5145c
Show whitespace changes
Inline Side-by-side
Showing with 625 additions and 592 deletions
webitm-adm/module-resource/SQL/w_leavebal.sql
View file @ 8cba988d
......@@ -52,7 +52,7 @@ Insert into SYSTEM_EVENT_SERVICES (SERVICE_CODE,SERVICE_DESCR,SERVICE_URI,SERVIC
---------------------------------------------------- SYSTEM_SERVICE_ARGS
Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('poic_default_ejb',1,'COMPONENT_TYPE','I',null,'S',null,null,null,null,'JB');
Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('poic_default_ejb',2,'COMPONENT_NAME','I',null,'S',null,null,null,null,);
Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('poic_default_ejb',2,'COMPONENT_NAME','I',null,'S',null,null,null,null,null);
Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('poic_default_ejb',3,'XML_DATA','I',null,'S',null,null,null,null,null);
Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('poic_default_ejb',4,'XML_DATA_1','I',null,'S',null,null,null,null,null);
Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('poic_default_ejb',5,'XML_DATA_ALL','I',null,'S',null,null,null,null,null);
......@@ -109,5 +109,35 @@ Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,E
----------------------------------------------------- Dipesh [31/08/2019] Start
delete OBJ_ACTIONS WHERE OBJ_NAME ='leavebal' and line_no=3;
delete OBJ_ACTIONS WHERE OBJ_NAME ='leavebal' and line_no=21;
delete OBJ_ACTIONS WHERE OBJ_NAME ='leavebal' and line_no=22;
delete OBJ_ACTIONS WHERE OBJ_NAME ='leavebal' and line_no=40;
Insert into OBJ_ACTIONS (OBJ_NAME,LINE_NO,IMAGE,DESCRIPTION,SERVICE_CODE,INTERACTIVE,RIGHTS_CHAR,TITLE,FORM_NO,SERVICE_HANDLER,PLACEMENT,ACTION_TYPE,TRAN_TYPE,CHG_DATE,CHG_TERM,CHG_USER,IS_CONFIRMATION_REQ,SEP_DUTY_OPT,RE_AUTH_OPT,SHOW_IN_PANEL,PAGE_CONTEXT,TYPE,ACTION_ARG,SWIPE_POSITION,MULTI_ROW_OPT,ACTION_ID,DEF_NODATA,IN_PROC_INTRUPT,ESTIMATED_TIME,ACTION_GROUP,DISPLAY_OPT,DISPLAY_MODE,SHOW_CONFIRM,REC_SPECIFIC) values ('leavebal',39,'ibase/resource/objaction/exprtExl.svg','Export To Excel','a','a','B','Export2XLS','1',null,null,'S',null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,'2',null,null);
Insert into OBJ_ACTIONS (OBJ_NAME,LINE_NO,IMAGE,DESCRIPTION,SERVICE_CODE,INTERACTIVE,RIGHTS_CHAR,TITLE,FORM_NO,SERVICE_HANDLER,PLACEMENT,ACTION_TYPE,TRAN_TYPE,CHG_DATE,CHG_TERM,CHG_USER,IS_CONFIRMATION_REQ,SEP_DUTY_OPT,RE_AUTH_OPT,SHOW_IN_PANEL,PAGE_CONTEXT,TYPE,ACTION_ARG,SWIPE_POSITION,MULTI_ROW_OPT,ACTION_ID,DEF_NODATA,IN_PROC_INTRUPT,ESTIMATED_TIME,ACTION_GROUP,DISPLAY_OPT,DISPLAY_MODE,SHOW_CONFIRM,REC_SPECIFIC) values ('leavebal',40,'ibase/resource/objaction/Audit-trail.svg','View Audit Trail','audit_trail','1','X','Audit Trail','1','1','1','U',null,null,null,null,null,null,null,'1',null,null,null,null,null,null,null,null,null,null,null,'2',null,null);
Insert into TRANS_COPY_SETUP (OBJ_NAME,FORM_NO,FIELD_NAME,DEF_VALUE,COPY_FLAG) values ('leavebal','1','emp_fname',null,'N');
Insert into TRANS_COPY_SETUP (OBJ_NAME,FORM_NO,FIELD_NAME,DEF_VALUE,COPY_FLAG) values ('leavebal','1','emp_lname',null,'N');
Insert into TRANS_COPY_SETUP (OBJ_NAME,FORM_NO,FIELD_NAME,DEF_VALUE,COPY_FLAG) values ('leavebal','1','leaves_descr',null,'N');
update TRANSETUP set ref_ser='E-LOAN' where TRAN_WINDOW='w_leavebal';
Insert into TRANS_COPY_SETUP (OBJ_NAME,FORM_NO,FIELD_NAME,DEF_VALUE,COPY_FLAG) values ('emp_work_info','1','emp_fname_long',null,'N');
Insert into TRANS_COPY_SETUP (OBJ_NAME,FORM_NO,FIELD_NAME,DEF_VALUE,COPY_FLAG) values ('emp_work_info','1','emp_mname_long',null,'N');
Insert into TRANS_COPY_SETUP (OBJ_NAME,FORM_NO,FIELD_NAME,DEF_VALUE,COPY_FLAG) values ('emp_work_info','1','emp_lname_long',null,'N');
update messages set MSG_DESCR='Eff Date cannot be less the Upto date.' where msg_no='VTLVEDATE1';
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 ('VTLVEDATE4','Invalid Date !','Upto Date cannot be less the Exp date..','E','Y',null,null,null,to_date('22-10-00','DD-MM-RR'),'SUN ','HDP ',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 ('INVLVDATA3','Invalid Date !','Data Already existed in Employee, Eff Date and Leave code.','E','Y',null,null,null,to_date('22-10-00','DD-MM-RR'),'SUN ','HDP ',null,null);
----------------------------------------------------- Dipesh [31/08/2019] End
webitm-adm/src/ibase/webitm/ejb/adm/leaveBalIC.java
View file @ 8cba988d
......@@ -97,7 +97,8 @@ public class leaveBalIC extends ValidatorEJB implements leaveBalRemote,leaveBalL
int noOfChilds = 0;
int counter;
int cnt = 0;
Date expDate = null;
Date uptoDate = null;
E12GenericUtility genericUtility = null;
errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>");
......@@ -155,7 +156,6 @@ public class leaveBalIC extends ValidatorEJB implements leaveBalRemote,leaveBalL
if ("emp_code".equalsIgnoreCase(childNodeName))
{
uptoDateStr = checkNull(genericUtility.getColumnValue("upto_date", dom));
Date uptoDate = null;
uptoDate = uptoDateStr!= null && uptoDateStr.length() > 0 ? sdf.parse(uptoDateStr) : uptoDate;
empCode = checkNull(genericUtility.getColumnValue("emp_code", dom));
......@@ -183,12 +183,6 @@ public class leaveBalIC extends ValidatorEJB implements leaveBalRemote,leaveBalL
{
errList.add(lsErrorCode);
errFields.add(childNodeName.toLowerCase());
msgType = errorType( conn , "lsErrorCode" );
if ( msgType.equalsIgnoreCase("E"))
{
break;
}
}
}
else if ("lve_code".equalsIgnoreCase(childNodeName))
......@@ -269,35 +263,53 @@ public class leaveBalIC extends ValidatorEJB implements leaveBalRemote,leaveBalL
errList.add("VMLVECD1");
errFields.add(childNodeName.toLowerCase());
}
msgType = errorType( conn , "VMLVECD1" );
if ( msgType.equalsIgnoreCase("E"))
{
break;
}
}
}
else if ("upto_date".equalsIgnoreCase(childNodeName))
{
uptoDateStr = checkNull(genericUtility.getColumnValue("upto_date", dom));
effDateStr = checkNull(genericUtility.getColumnValue("eff_date", dom));
System.out.println("upto_date :: ["+uptoDateStr+"] \t eff_date :: ["+effDateStr+"]");
if(uptoDateStr != null && effDateStr != null)
{
if(uptoDateStr.trim().length() > 0 && effDateStr.trim().length() > 0)
{
Date uptoDate = sdf.parse( uptoDateStr );
uptoDate = sdf.parse( uptoDateStr );
Date effDate = sdf.parse( effDateStr );
if(uptoDate.before(effDate))
{
errList.add("VTLVEDATE1");
errFields.add(childNodeName.toLowerCase());
}
msgType = errorType( conn , "VTLVEDATE1" );
if ( msgType.equalsIgnoreCase("E"))
}
cnt = 0 ;
sql="select count(*) as cnt from leavebal where exp_date=? and upto_date= ? and lve_code= ? and emp_code= ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, expDateStr);
pstmt.setString(2, uptoDateStr);
pstmt.setString(3, lveCode);
pstmt.setString(4, empCode);
rs = pstmt.executeQuery();
if (rs.next())
{
break;
cnt = rs.getInt("cnt");
}
System.out.println("cnt:::: " + cnt+editFlag);
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
if (cnt > 0 && !"E".equalsIgnoreCase(editFlag))
{
errList.add("INVLVEDATA");
errFields.add(childNodeName.toLowerCase());
}
}
}
......@@ -305,24 +317,21 @@ public class leaveBalIC extends ValidatorEJB implements leaveBalRemote,leaveBalL
{
expDateStr = checkNull(genericUtility.getColumnValue("exp_date", dom));
uptoDateStr = checkNull(genericUtility.getColumnValue("upto_date", dom));
System.out.println("upto_date :: ["+uptoDateStr+"] \t exp_date :: ["+expDateStr+"]");
if(expDateStr != null && uptoDateStr != null)
{
if(expDateStr.trim().length() > 0 && uptoDateStr.trim().length() > 0)
{
Date expDate = sdf.parse( expDateStr );
Date uptoDate = sdf.parse( uptoDateStr );
expDate = sdf.parse( expDateStr );
uptoDate = sdf.parse( uptoDateStr );
if(expDate.before(uptoDate))
{
errList.add("VTLVEDATE1");
errList.add("VTLVEDATE4");
errFields.add(childNodeName.toLowerCase());
}
msgType = errorType( conn , "VTLVEDATE1" );
if ( msgType.equalsIgnoreCase("E"))
{
break;
}
}
}
}
......@@ -334,11 +343,6 @@ public class leaveBalIC extends ValidatorEJB implements leaveBalRemote,leaveBalL
errList.add("VTBALDAYS");
errFields.add(childNodeName.toLowerCase());
}
msgType = errorType( conn , "VTBALDAYS" );
if ( msgType.equalsIgnoreCase("E"))
{
break;
}
}
}
break;
......@@ -1199,4 +1203,3 @@ public class leaveBalIC extends ValidatorEJB implements leaveBalRemote,leaveBalL
}
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