Skip to content

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

* updated done in leave table on [21/08/2019] 

lvetable21.xml
w_lvetable.sql
d_lvetable_edit.srd
LeaveTableIC.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@205603 ce508802-f39f-4f6c-b175-0d175dae99d5
parent bf71dc80
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 306 additions and 296 deletions
webitm-adm/module-resource/SQL/w_lvetable.sql
View file @ ec1f166b
...@@ -92,18 +92,26 @@ Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,E ...@@ -92,18 +92,26 @@ Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,E
---------------------------------------------------Dipesh [21/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 ('LVE_CODE','W_LVETABLE','SELECT LVE_CODE, DESCR FROM LEAVES',null,'Leave Code',0,0,to_date('27-05-00','DD-MM-RR'),'SUN ','CLIENT1 ','0',null,null,null,null,null,null,null,null,null,'2',null,'3',null,null,null,'2 ',null,null,null,null,null,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
('VMLVECD3 ','Leave code already exsist...','This leave code already exsist in given leave table no.','E','Y',null,null,null,to_date('22-10-00','DD-MM-RR'),'SUN ','HDP ',null,null);
update obj_forms set disp_metadata=
'<html>
<span style="white-space: normal !important; word-break: break-word; "> <b>Leave Table No :</b> {lve_tblno} (<b>{lve_code}</b>), <b>Encashable :</b> {encashable} <br/>
<b>Max.Allowed :</b> {max_allowed} , </b>Min.Allowed :</b> {min_allowed}
</span>
<br/> <span style="float:right;"> <b> {chg_date} </b></span>
</html>' where win_name='w_lvetable';
---------------------------------------------------Dipesh [21/08/2019]End
......
webitm-adm/src/ibase/webitm/ejb/adm/LeaveTableIC.java
View file @ ec1f166b
...@@ -87,6 +87,7 @@ public class LeaveTableIC extends ValidatorEJB implements LeaveTableRemote, Leav ...@@ -87,6 +87,7 @@ public class LeaveTableIC extends ValidatorEJB implements LeaveTableRemote, Leav
String minAllowedStr = ""; String minAllowedStr = "";
String maxAllowedStr = ""; String maxAllowedStr = "";
String leaveOnDaysStr=""; String leaveOnDaysStr="";
String lveTbNo = "";
E12GenericUtility genericUtility = null; E12GenericUtility genericUtility = null;
errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>"); errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>");
...@@ -141,6 +142,8 @@ public class LeaveTableIC extends ValidatorEJB implements LeaveTableRemote, Leav ...@@ -141,6 +142,8 @@ public class LeaveTableIC extends ValidatorEJB implements LeaveTableRemote, Leav
if ("lve_code".equalsIgnoreCase(childNodeName)) if ("lve_code".equalsIgnoreCase(childNodeName))
{ {
lveCode = checkNull(genericUtility.getColumnValue("lve_code", dom)); lveCode = checkNull(genericUtility.getColumnValue("lve_code", dom));
lveTbNo = checkNull(genericUtility.getColumnValue("lve_tblno", dom));
sql="select count(*) as cnt from leaves where lve_code=?"; sql="select count(*) as cnt from leaves where lve_code=?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, lveCode); pstmt.setString(1, lveCode);
...@@ -161,16 +164,47 @@ public class LeaveTableIC extends ValidatorEJB implements LeaveTableRemote, Leav ...@@ -161,16 +164,47 @@ public class LeaveTableIC extends ValidatorEJB implements LeaveTableRemote, Leav
pstmt = null; pstmt = null;
} }
if(cnt == 0) if(cnt == 0 )
{ {
errList.add("VMLVECD1"); errList.add("VMLVECD1");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
else
{
cnt = 0;
sql = "select count(*) as cnt from lvetable where lve_tblno=? and lve_code=?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, lveTbNo);
pstmt.setString(2, lveCode);
rs = pstmt.executeQuery();
if (rs.next())
{
cnt = rs.getInt("cnt");
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(cnt > 0 && !"E".equalsIgnoreCase(editFlag))
{
errList.add("VMLVECD3");
errFields.add(childNodeName.toLowerCase());
}
}
} }
else if ("max_allowed".equalsIgnoreCase(childNodeName) || ("min_allowed".equalsIgnoreCase(childNodeName))) else if ("max_allowed".equalsIgnoreCase(childNodeName) || ("min_allowed".equalsIgnoreCase(childNodeName)))
{ {
minAllowedStr = checkNull(genericUtility.getColumnValue("min_allowed", dom)); minAllowedStr = checkNull(genericUtility.getColumnValue("min_allowed", dom));
maxAllowedStr = checkNull(genericUtility.getColumnValue("max_allowed", dom)); maxAllowedStr = checkNull(genericUtility.getColumnValue("max_allowed", dom));
System.out.println("minAllowed:::::::"+minAllowed);
System.out.println("maxAllowed:::::::"+maxAllowed);
try try
{ {
minAllowed = Integer.parseInt(minAllowedStr); minAllowed = Integer.parseInt(minAllowedStr);
...@@ -187,6 +221,17 @@ public class LeaveTableIC extends ValidatorEJB implements LeaveTableRemote, Leav ...@@ -187,6 +221,17 @@ public class LeaveTableIC extends ValidatorEJB implements LeaveTableRemote, Leav
{ {
maxAllowed = 0; maxAllowed = 0;
} }
if(minAllowed < 0 )
{
errList.add("VMNUMBER2");
errFields.add(childNodeName.toLowerCase());
}
if(maxAllowed < 0 )
{
errList.add("VMNUMBER2");
errFields.add(childNodeName.toLowerCase());
}
if (minAllowed > 0 && maxAllowed > 0 && minAllowed > maxAllowed) if (minAllowed > 0 && maxAllowed > 0 && minAllowed > maxAllowed)
{ {
errList.add("VMNUMBER1"); errList.add("VMNUMBER1");
......
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