Skip to content

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

* changes done in leave master on [20/08/2019] 

leave11.xml
w_leave.sql
d_leave_brow.srd
LeavesIC.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@205495 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 40d9919d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1185 additions and 46 deletions
webitm-adm/module-resource/SQL/w_leave.sql
View file @ cd32556d
......@@ -74,8 +74,27 @@ Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,E
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 ('VTLVE1 ','Invalid balance option','For payable type of leaves balance maintain must be ''Yes''','W','Y',null,null,null,to_date('21-05-10','DD-MM-RR'),'VISHAL ','VISHAL ',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 ('VTLVUNIT ','Invalid Leave Unit!','Leave Unit can not be null or empty or other than "D" or "H".','E','Y',null,null,null,null,null,null,null,null);
----------------------------------------------------- Dipesh [20/08/2019] Start
Insert into POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,DW_OBJECT,MSG_TITLE,WIDTH,HEIGHT,CHG_DATE,CHG_USER,CHG_TERM,DIST_OPT,FILTER_STRING,SQL_INPUT,DEFAULT_COL,POP_ALIGN,QUERY_MODE,PAGE_CONTEXT,POPHELP_COLS,POPHELP_SOURCE,MULTI_OPT,HELP_OPTION,POPUP_XSL_NAME,AUTO_FILL_LEN,THUMB_OBJ,THUMB_IMAGE_COL,THUMB_ALT_COL,AUTO_MIN_LENGTH,OBJ_NAME__DS,DATA_MODEL_NAME,VALIDATE_DATA,ITEM_CHANGE,MSG_NO,FILTER_EXPR,LAYOUT)
values ('AD_CODE__ENCH','W_LEAVE','SELECT AD_CODE AS AD_CODE__ENCH, DESCR FROM ALLWDEDN',null,'Allowance/Deduction',0,0,to_date('22-OCT-00','DD-MON-RR'),'SUN ','HDP ','1',null,null,null,null,null,null,null,null,1,'2',null,'3','AdCodeImages','ad_code','descr','2 ',null,null,null,null,null,null,null);
delete obj_actions where obj_name='leave' and line_no='8';
delete obj_actions where obj_name='leave' and line_no='41';
delete obj_actions where obj_name='leave' and line_no='42';
delete obj_actions where obj_name='leave' and line_no='43';
delete obj_actions where obj_name='leave' and line_no='40';
delete obj_actions where obj_name='leave' and line_no='39';
update obj_forms set disp_metadata=
'<html>
<span style="white-space: normal !important; word-break: break-word; ">Description : {descr} (<b>{lve_code}</b>) , Payable : {payable} <br/>
Max.Allowed : {max_allowed} , Min.Allowed : {min_allowed}
</span>
<br/> <span style="float:right;"> <b> {chg_date} </b></span>
</html>' where win_name='w_leave';
----------------------------------------------------- Dipesh [20/08/2019] End
......
webitm-adm/src/ibase/webitm/ejb/adm/LeavesIC.java
View file @ cd32556d
......@@ -476,7 +476,7 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal
{
cnt = rs.getInt("cnt");
}
System.out.println("cnt:::: " + cnt);
System.out.println("cnt:::: " + cnt+editFlag);
if (rs != null)
{
rs.close();
......@@ -487,15 +487,13 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal
pstmt.close();
pstmt = null;
}
/*if (cnt == 0)
if (cnt > 0 && !"E".equalsIgnoreCase(editFlag))
{
errList.add("INVLVEDATA");//The leave cannot Blank or Already Existed in Leaves Table
errFields.add(childNodeName.toLowerCase());
}*/
}
}
}
else if (childNodeName.equalsIgnoreCase("encashable"))
{
......@@ -519,13 +517,18 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal
{
adCodeEnch = checkNull(genericUtility.getColumnValue("ad_code__ench", dom));
encashable = checkNull(genericUtility.getColumnValue("encashable", dom));
if (adCodeEnch.trim().equalsIgnoreCase("Y"))
System.out.println("adCodeEnch:::::::"+adCodeEnch);
System.out.println("encashable:::::::"+encashable);
//if (encashable.trim().equalsIgnoreCase("Y"))
if("Y".equalsIgnoreCase(encashable.trim()))
{
sql = "select count(*) as cnt from allwdedn where ad_code =?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, adCodeEnch);
rs = pstmt.executeQuery();
if (rs.next()) {
if (rs.next())
{
cnt = rs.getInt("cnt");
}
System.out.println("cnt:::: " + cnt);
......@@ -555,12 +558,12 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal
if(minAllowed < 0 )
{
errList.add("VMNUMBER1");
errList.add("VMNUMBER2");
errFields.add(childNodeName.toLowerCase());
}
if(maxAllowed < 0 )
{
errList.add("VMNUMBER1");
errList.add("VMNUMBER2");
errFields.add(childNodeName.toLowerCase());
}
if (minAllowed > 0 && maxAllowed > 0 && minAllowed > maxAllowed)
......
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