* changes done in work shift component

workshft21.xml
d_wrkshift_edit.srd
WorkShiftIC.java


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

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

@@ -54,6 +54,7 @@
 			<key>yes</key>
 			<name>day_no</name>
 			<dbname>workshft.day_no</dbname>
+			<initial>2</initial>
 			<values>
 				<item display="Monday" data="2"/>
 				<item display="Tuesday" data="3"/>
@@ -187,6 +188,7 @@
 			<updatewhereclause>yes</updatewhereclause>
 			<name>work_type</name>
 			<dbname>workshft.work_type</dbname>
+			<initial>X</initial>
 			<values>
 				<item display="Fixed" data="X"/>
 				<item display="Flexible" data="F"/>
@@ -631,7 +633,7 @@
 		<border>5</border>
 		<color>0</color>
 		<x>163</x>
-		<y>103</y>
+		<y>102</y>
 		<height>16</height>
 		<width>50</width>
 		<format>0.00</format>
@@ -812,7 +814,7 @@
 		<name>hd_in_time</name>
 		<visible>1</visible>
 		<EditStyle style="edit">
-			<limit>5</limit>
+			<limit>7</limit>
 			<case>any</case>
 			<focusrectangle>no</focusrectangle>
 			<autoselect>no</autoselect>
@@ -1213,8 +1215,8 @@
 		<tabsequence>140</tabsequence>
 		<border>5</border>
 		<color>0</color>
-		<x>164</x>
-		<y>215</y>
+		<x>161</x>
+		<y>214</y>
 		<height>16</height>
 		<width>58</width>
 		<format>[general]</format>

webitm-adm/src/ibase/webitm/ejb/adm/WorkShiftIC.java

@@ -278,7 +278,7 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
 					else if ("lunch_time".equalsIgnoreCase(childNodeName))
 					{
 						lunchTimeStr = checkNull(genericUtility.getColumnValue("lunch_time", dom));
-						fdHrs = Double.parseDouble(checkNull(genericUtility.getColumnValue("fd_hrs", dom)));
+						hdHrs = Double.parseDouble(checkNull(genericUtility.getColumnValue("hd_hrs", dom)));
 						if(lunchTimeStr == null || lunchTimeStr.trim().length() == 0)
 						{
 							errList.add("LUNTIME01");
@@ -298,7 +298,7 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
 							errList.add("LUNTIME02");
 							errFields.add(childNodeName.toLowerCase());
 						}
-						else if(lunchTime > fdHrs)
+						else if(lunchTime > hdHrs)
 						{
 							errList.add("VMHDFD01");
 							errFields.add(childNodeName.toLowerCase());