Skip to content

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

* 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
parent 470f0e4a
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 11 deletions
webitm-adm/module-resource/metadata/workshft21.xml
View file @ b39c7c11
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
<key>yes</key> <key>yes</key>
<name>day_no</name> <name>day_no</name>
<dbname>workshft.day_no</dbname> <dbname>workshft.day_no</dbname>
<initial>2</initial>
<values> <values>
<item display="Monday" data="2"/> <item display="Monday" data="2"/>
<item display="Tuesday" data="3"/> <item display="Tuesday" data="3"/>
...@@ -187,6 +188,7 @@ ...@@ -187,6 +188,7 @@
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
<name>work_type</name> <name>work_type</name>
<dbname>workshft.work_type</dbname> <dbname>workshft.work_type</dbname>
<initial>X</initial>
<values> <values>
<item display="Fixed" data="X"/> <item display="Fixed" data="X"/>
<item display="Flexible" data="F"/> <item display="Flexible" data="F"/>
...@@ -631,7 +633,7 @@ ...@@ -631,7 +633,7 @@
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>163</x> <x>163</x>
<y>103</y> <y>102</y>
<height>16</height> <height>16</height>
<width>50</width> <width>50</width>
<format>0.00</format> <format>0.00</format>
...@@ -812,7 +814,7 @@ ...@@ -812,7 +814,7 @@
<name>hd_in_time</name> <name>hd_in_time</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>5</limit> <limit>7</limit>
<case>any</case> <case>any</case>
<focusrectangle>no</focusrectangle> <focusrectangle>no</focusrectangle>
<autoselect>no</autoselect> <autoselect>no</autoselect>
...@@ -1213,8 +1215,8 @@ ...@@ -1213,8 +1215,8 @@
<tabsequence>140</tabsequence> <tabsequence>140</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>164</x> <x>161</x>
<y>215</y> <y>214</y>
<height>16</height> <height>16</height>
<width>58</width> <width>58</width>
<format>[general]</format> <format>[general]</format>
......
webitm-adm/module-resource/srd/d_wrkshift_edit.srd
View file @ b39c7c11
...@@ -6,7 +6,7 @@ header(height=4 color="536870912" ) ...@@ -6,7 +6,7 @@ header(height=4 color="536870912" )
summary(height=34 color="536870912" ) summary(height=34 color="536870912" )
footer(height=0 color="536870912" ) footer(height=0 color="536870912" )
detail(height=380 color="536870912" ) detail(height=380 color="536870912" )
table(column=(type=char(1) update=yes updatewhereclause=yes key=yes name=day_no dbname="workshft.day_no" values="Monday 2/Tuesday 3/Wednesday 4/Thursday 5/Friday 6/Saturday 7/Sunday 1/" ) table(column=(type=char(1) update=yes updatewhereclause=yes key=yes name=day_no dbname="workshft.day_no" initial="2" values="Monday 2/Tuesday 3/Wednesday 4/Thursday 5/Friday 6/Saturday 7/Sunday 1/" )
column=(type=char(5) update=yes updatewhereclause=yes key=yes name=shift dbname="workshft.shift" ) column=(type=char(5) update=yes updatewhereclause=yes key=yes name=shift dbname="workshft.shift" )
column=(type=char(20) update=yes updatewhereclause=yes name=descr dbname="workshft.descr" ) column=(type=char(20) update=yes updatewhereclause=yes name=descr dbname="workshft.descr" )
column=(type=char(5) update=yes updatewhereclause=yes name=in_time dbname="workshft.in_time" ) column=(type=char(5) update=yes updatewhereclause=yes name=in_time dbname="workshft.in_time" )
...@@ -22,7 +22,7 @@ table(column=(type=char(1) update=yes updatewhereclause=yes key=yes name=day_no ...@@ -22,7 +22,7 @@ table(column=(type=char(1) update=yes updatewhereclause=yes key=yes name=day_no
column=(type=char(5) update=yes updatewhereclause=yes name=site_code dbname="workshft.site_code" ) column=(type=char(5) update=yes updatewhereclause=yes name=site_code dbname="workshft.site_code" )
column=(type=char(1) update=yes updatewhereclause=yes name=status dbname="workshft.status" initial="A" values="Active A/Inactive I/" ) column=(type=char(1) update=yes updatewhereclause=yes name=status dbname="workshft.status" initial="A" values="Active A/Inactive I/" )
column=(type=decimal(2) update=yes updatewhereclause=yes name=lunch_time dbname="workshft.lunch_time" ) column=(type=decimal(2) update=yes updatewhereclause=yes name=lunch_time dbname="workshft.lunch_time" )
column=(type=char(1) update=yes updatewhereclause=yes name=work_type dbname="workshft.work_type" values="Fixed X/Flexible F/" ) column=(type=char(1) update=yes updatewhereclause=yes name=work_type dbname="workshft.work_type" initial="X" values="Fixed X/Flexible F/" )
column=(type=char(1) update=yes updatewhereclause=yes name=rotation_type dbname="workshft.rotation_type" ) column=(type=char(1) update=yes updatewhereclause=yes name=rotation_type dbname="workshft.rotation_type" )
column=(type=decimal(0) update=yes updatewhereclause=yes name=grace_no_time dbname="workshft.grace_no_time" ) column=(type=decimal(0) update=yes updatewhereclause=yes name=grace_no_time dbname="workshft.grace_no_time" )
retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"workshft~" ) COLUMN(NAME=~"workshft.day_no~") COLUMN(NAME=~"workshft.shift~") COLUMN(NAME=~"workshft.descr~") COLUMN(NAME=~"workshft.in_time~") COLUMN(NAME=~"workshft.out_time~") COLUMN(NAME=~"workshft.fd_hrs~") COLUMN(NAME=~"workshft.hd_hrs~") COLUMN(NAME=~"workshft.grace_time~") COLUMN(NAME=~"workshft.chg_user~") COLUMN(NAME=~"workshft.chg_date~") COLUMN(NAME=~"workshft.chg_term~") COLUMN(NAME=~"workshft.hd_in_time~") COLUMN(NAME=~"workshft.next_shift~") COLUMN(NAME=~"workshft.site_code~") COLUMN(NAME=~"workshft.status~") COLUMN(NAME=~"workshft.lunch_time~") COLUMN(NAME=~"workshft.work_type~") COLUMN(NAME=~"workshft.rotation_type~") COLUMN(NAME=~"workshft.grace_no_time~")WHERE( EXP1 =~"( workshft.day_no~" OP =~"=~" EXP2 =~":mdayno )~" LOGIC =~"and~" ) WHERE( EXP1 =~"( workshft.shift~" OP =~"=~" EXP2 =~":mshift )~" ) ) ARG(NAME = ~"mdayno~" TYPE = string) ARG(NAME = ~"mshift~" TYPE = string) " update="WORKSHFT" updatewhere=0 updatekeyinplace=no arguments=(("mdayno", string),("mshift", string)) ) retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"workshft~" ) COLUMN(NAME=~"workshft.day_no~") COLUMN(NAME=~"workshft.shift~") COLUMN(NAME=~"workshft.descr~") COLUMN(NAME=~"workshft.in_time~") COLUMN(NAME=~"workshft.out_time~") COLUMN(NAME=~"workshft.fd_hrs~") COLUMN(NAME=~"workshft.hd_hrs~") COLUMN(NAME=~"workshft.grace_time~") COLUMN(NAME=~"workshft.chg_user~") COLUMN(NAME=~"workshft.chg_date~") COLUMN(NAME=~"workshft.chg_term~") COLUMN(NAME=~"workshft.hd_in_time~") COLUMN(NAME=~"workshft.next_shift~") COLUMN(NAME=~"workshft.site_code~") COLUMN(NAME=~"workshft.status~") COLUMN(NAME=~"workshft.lunch_time~") COLUMN(NAME=~"workshft.work_type~") COLUMN(NAME=~"workshft.rotation_type~") COLUMN(NAME=~"workshft.grace_no_time~")WHERE( EXP1 =~"( workshft.day_no~" OP =~"=~" EXP2 =~":mdayno )~" LOGIC =~"and~" ) WHERE( EXP1 =~"( workshft.shift~" OP =~"=~" EXP2 =~":mshift )~" ) ) ARG(NAME = ~"mdayno~" TYPE = string) ARG(NAME = ~"mshift~" TYPE = string) " update="WORKSHFT" updatewhere=0 updatekeyinplace=no arguments=(("mdayno", string),("mshift", string)) )
...@@ -39,12 +39,12 @@ column(band=detail id=4 alignment="0" tabsequence=40 border="5" color="0" x="164 ...@@ -39,12 +39,12 @@ column(band=detail id=4 alignment="0" tabsequence=40 border="5" color="0" x="164
text(band=detail alignment="1" text="Out Time :" border="0" color="0" x="260" y="75" height="16" width="104" html.valueishtml="0" name=out_time_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="Out Time :" border="0" color="0" x="260" y="75" height="16" width="104" html.valueishtml="0" name=out_time_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=5 alignment="0" tabsequence=50 border="5" color="0" x="368" y="75" height="16" width="50" format="[general]" html.valueishtml="0" name=out_time visible="1" edit.limit=5 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" ) column(band=detail id=5 alignment="0" tabsequence=50 border="5" color="0" x="368" y="75" height="16" width="50" format="[general]" html.valueishtml="0" name=out_time visible="1" edit.limit=5 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="Full Day Hours :" border="0" color="0" x="55" y="103" height="16" width="104" html.valueishtml="0" name=fd_hrs_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="Full Day Hours :" border="0" color="0" x="55" y="103" height="16" width="104" html.valueishtml="0" name=fd_hrs_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=6 alignment="1" tabsequence=60 border="5" color="0" x="163" y="103" height="16" width="50" format="0.00" html.valueishtml="0" name=fd_hrs visible="1" edit.limit=12 edit.case=any edit.format="#0.00" 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" ) column(band=detail id=6 alignment="1" tabsequence=60 border="5" color="0" x="163" y="102" height="16" width="50" format="0.00" html.valueishtml="0" name=fd_hrs visible="1" edit.limit=12 edit.case=any edit.format="#0.00" 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="Next Shift :" border="0" color="0" x="260" y="103" height="16" width="104" html.valueishtml="0" name=next_shift_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="Next Shift :" border="0" color="0" x="260" y="103" height="16" width="104" html.valueishtml="0" name=next_shift_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=13 alignment="0" tabsequence=70 border="5" color="0" x="368" y="103" height="16" width="50" format="[general]" html.valueishtml="0" name=next_shift visible="1" edit.limit=5 edit.case=upper 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=13 alignment="0" tabsequence=70 border="5" color="0" x="368" y="103" height="16" width="50" format="[general]" html.valueishtml="0" name=next_shift visible="1" edit.limit=5 edit.case=upper 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=7 alignment="1" tabsequence=90 border="5" color="0" x="358" y="131" height="16" width="60" format="0.00" html.valueishtml="0" name=hd_hrs visible="1" edit.limit=12 edit.case=any edit.format="#0.00" 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" ) column(band=detail id=7 alignment="1" tabsequence=90 border="5" color="0" x="358" y="131" height="16" width="60" format="0.00" html.valueishtml="0" name=hd_hrs visible="1" edit.limit=12 edit.case=any edit.format="#0.00" 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="Half Day Hours :" border="0" color="0" x="262" y="131" height="16" width="92" html.valueishtml="0" name=hd_hrs_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="Half Day Hours :" border="0" color="0" x="262" y="131" height="16" width="92" html.valueishtml="0" name=hd_hrs_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=12 alignment="0" tabsequence=80 border="5" color="0" x="164" y="131" height="16" width="50" format="[general]" html.valueishtml="0" name=hd_in_time visible="1" edit.limit=5 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" ) column(band=detail id=12 alignment="0" tabsequence=80 border="5" color="0" x="164" y="131" height="16" width="50" format="[general]" html.valueishtml="0" name=hd_in_time visible="1" edit.limit=7 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="Half Day In Time :" border="0" color="0" x="55" y="131" height="16" width="104" html.valueishtml="0" name=hd_in_time_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="Half Day In Time :" border="0" color="0" x="55" y="131" height="16" width="104" html.valueishtml="0" name=hd_in_time_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="Grace Time :" border="0" color="0" x="55" y="159" height="16" width="104" html.valueishtml="0" name=grace_time_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="Grace Time :" border="0" color="0" x="55" y="159" height="16" width="104" html.valueishtml="0" name=grace_time_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=8 alignment="1" tabsequence=100 border="5" color="0" x="164" y="159" height="16" width="43" format="0" html.valueishtml="0" name=grace_time visible="1" edit.limit=12 edit.case=any edit.format="###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=8 alignment="1" tabsequence=100 border="5" color="0" x="164" y="159" height="16" width="43" format="0" html.valueishtml="0" name=grace_time visible="1" edit.limit=12 edit.case=any edit.format="###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" )
...@@ -57,7 +57,7 @@ text(band=detail alignment="0" text="(minutes)" border="0" color="0" x="226" y=" ...@@ -57,7 +57,7 @@ text(band=detail alignment="0" text="(minutes)" border="0" color="0" x="226" y="
column(band=detail id=16 alignment="1" tabsequence=120 border="5" color="0" x="161" y="187" height="16" width="58" format="0.00" html.valueishtml="0" name=lunch_time visible="1" edit.limit=6 edit.case=any edit.format="#0" 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" ) column(band=detail id=16 alignment="1" tabsequence=120 border="5" color="0" x="161" y="187" height="16" width="58" format="0.00" html.valueishtml="0" name=lunch_time visible="1" edit.limit=6 edit.case=any edit.format="#0" 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="Lunch Time :" border="0" color="0" x="55" y="187" height="16" width="104" html.valueishtml="0" name=lunch_time_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="Lunch Time :" border="0" color="0" x="55" y="187" height="16" width="104" html.valueishtml="0" name=lunch_time_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="Work Type :" border="0" color="0" x="55" y="215" height="16" width="104" html.valueishtml="0" name=work_type_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="Work Type :" border="0" color="0" x="55" y="215" height="16" width="104" html.valueishtml="0" name=work_type_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=17 alignment="0" tabsequence=140 border="5" color="0" x="164" y="215" height="16" width="58" format="[general]" html.valueishtml="0" name=work_type visible="1" ddlb.limit=1 ddlb.allowedit=no ddlb.case=any ddlb.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=17 alignment="0" tabsequence=140 border="5" color="0" x="161" y="214" height="16" width="58" format="[general]" html.valueishtml="0" name=work_type visible="1" ddlb.limit=1 ddlb.allowedit=no ddlb.case=any ddlb.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="Rotation Type :" border="0" color="0" x="247" y="215" height="16" width="83" html.valueishtml="0" name=rotation_type_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="Rotation Type :" border="0" color="0" x="247" y="215" height="16" width="83" html.valueishtml="0" name=rotation_type_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=18 alignment="0" tabsequence=150 border="5" color="0" x="335" y="215" height="16" width="83" format="[general]" html.valueishtml="0" name=rotation_type visible="1" edit.limit=1 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" ) column(band=detail id=18 alignment="0" tabsequence=150 border="5" color="0" x="335" y="215" height="16" width="83" format="[general]" html.valueishtml="0" name=rotation_type visible="1" edit.limit=1 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" )
column(band=detail id=14 alignment="0" tabsequence=32766 border="5" color="0" x="164" y="240" height="16" width="58" format="[general]" html.valueishtml="0" name=site_code visible="1~t0" edit.limit=5 edit.case=any 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=14 alignment="0" tabsequence=32766 border="5" color="0" x="164" y="240" height="16" width="58" format="[general]" html.valueishtml="0" name=site_code visible="1~t0" edit.limit=5 edit.case=any 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" )
......
webitm-adm/src/ibase/webitm/ejb/adm/WorkShiftIC.java
View file @ b39c7c11
...@@ -278,7 +278,7 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -278,7 +278,7 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
else if ("lunch_time".equalsIgnoreCase(childNodeName)) else if ("lunch_time".equalsIgnoreCase(childNodeName))
{ {
lunchTimeStr = checkNull(genericUtility.getColumnValue("lunch_time", dom)); 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) if(lunchTimeStr == null || lunchTimeStr.trim().length() == 0)
{ {
errList.add("LUNTIME01"); errList.add("LUNTIME01");
...@@ -298,7 +298,7 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -298,7 +298,7 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
errList.add("LUNTIME02"); errList.add("LUNTIME02");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
else if(lunchTime > fdHrs) else if(lunchTime > hdHrs)
{ {
errList.add("VMHDFD01"); errList.add("VMHDFD01");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
......
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