* Changes done in leave master on [16/08/2019]

LeavesIC.java
leave21.xml
w_leave.sql
d_leave_edit.srd


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@205257 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-adm/ibase/webitm/ejb/adm/LeavesIC.java

@@ -221,9 +221,9 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal
 						}
 						
 					} 
-					else if (currentColumn.equalsIgnoreCase("ad_code_ench")) 
+					else if (currentColumn.equalsIgnoreCase("ad_code__ench")) 
 					{
-						adCodeEnch = checkNull(genericUtility.getColumnValue("ad_code_ench", dom));
+						adCodeEnch = checkNull(genericUtility.getColumnValue("ad_code__ench", dom));
 						sql = "select descr from allwdedn where ad_code = ?";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1, adCodeEnch);
@@ -448,7 +448,8 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal
 					{
 						childNode = childNodeList.item(ctr);
 						System.out.println("childNode" + childNode);
-						if (childNode.getNodeType() != Node.ELEMENT_NODE) {
+						if (childNode.getNodeType() != Node.ELEMENT_NODE) 
+						{
 							continue;
 						}
 						childNodeName = childNode.getNodeName();
@@ -505,8 +506,8 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal
 						} 
 						else if (childNodeName.equalsIgnoreCase("min_allowed") || (childNodeName.equalsIgnoreCase("max_allowed"))) 
 						{
-							minAllowed = Integer.parseInt(checkNull(genericUtility.getColumnValue("min_allowed", dom)));
-							maxAllowed = Integer.parseInt(checkNull(genericUtility.getColumnValue("max_allowed", dom)));
+							minAllowed = Integer.parseInt(checkInt(genericUtility.getColumnValue("min_allowed", dom)));
+							maxAllowed = Integer.parseInt(checkInt(genericUtility.getColumnValue("max_allowed", dom)));
 
 							if (minAllowed > 0 && maxAllowed > 0 && minAllowed > maxAllowed)
 							{
@@ -719,5 +720,14 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal
 
 		return input;
 	}
+	private String checkInt(String input) 
+	{
+		if (input == null)
+		{
+			input = "0";
+		}
+
+		return input;
+	}
 
 }

webitm-adm/module-resource/metadata/leave21.xml

@@ -382,7 +382,7 @@
 		<name>max_days</name>
 		<visible>1</visible>
 		<EditStyle style="edit">
-			<limit>5</limit>
+			<limit>3</limit>
 			<case>any</case>
 			<format>##0.0</format>
 			<focusrectangle>no</focusrectangle>

webitm-adm/module-resource/srd/d_leave_edit.srd

@@ -32,7 +32,7 @@ groupbox(band=detail text="Basic"border="2" color="0" x="8" y="33" height="254"
 column(band=detail id=1 alignment="0" tabsequence=10 border="5" color="0" x="180" y="60" height="16" width="53" format="[general]" html.valueishtml="0"  name=lve_code visible="1" edit.limit=5 edit.case=upper edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
 text(band=detail alignment="1" text="Leave Code :" border="0" color="0" x="68" y="60" height="16" width="107" html.valueishtml="0"  name=lve_code_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
 text(band=detail alignment="1" text="Leaves / Annum :" border="0" color="0" x="68" y="84" height="16" width="107" html.valueishtml="0"  name=max_days_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
-column(band=detail id=3 alignment="1" tabsequence=30 border="5" color="0" x="180" y="84" height="16" width="53" format="##0.0" html.valueishtml="0"  name=max_days visible="1" edit.limit=5 edit.case=any edit.format="##0.0" edit.focusrectangle=no edit.autoselect=yes edit.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=3 alignment="1" tabsequence=30 border="5" color="0" x="180" y="84" height="16" width="53" format="##0.0" html.valueishtml="0"  name=max_days visible="1" edit.limit=3 edit.case=any edit.format="##0.0" edit.focusrectangle=no edit.autoselect=yes edit.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
 text(band=detail alignment="1" text="Absent Months :" border="0" color="0" x="68" y="108" height="16" width="107" html.valueishtml="0"  name=abs_mth_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
 column(band=detail id=11 alignment="0" tabsequence=60 border="5" color="0" x="180" y="108" height="16" width="55" format="[Yes/No]" html.valueishtml="0"  name=abs_mth visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=no edit.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
 text(band=detail alignment="1" text="Encashable :" border="0" color="0" x="68" y="132" height="16" width="107" html.valueishtml="0"  name=encashable_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )