Skip to content

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

* change done src, srd, xml and sql file 

workshft11.xml
workshft21.xml
w_workshft.sql
d_wrkshift_brow.srd
d_wrkshift_edit.srd
WorkShiftIC.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@214077 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6340351e
Hide whitespace changes
Inline Side-by-side
Showing with 224 additions and 132 deletions
webitm-adm/module-resource/SQL/w_workshft.sql
View file @ 10372f5a
...@@ -178,4 +178,27 @@ values ('VEWSH2','Work Shift does not exists!!','Work Shift does not exists in W ...@@ -178,4 +178,27 @@ values ('VEWSH2','Work Shift does not exists!!','Work Shift does not exists in W
----------------------------------------------[26/12/19]End
update messages set MSG_STR='Shift Number does not exists!!', MSG_DESCR = 'Shift Number does not exists in Work Shift table' where msg_no='VEWSH2';
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 ('SHIFT','W_WORKSHFT','SELECT DISTINCT(SHIFT),DESCR FROM WORKSHFT',null,null,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 OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('workshft','1 ','grace_time',null);
Insert into OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('workshft','1 ','grace_no_time',null);
Insert into OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('workshft','1 ','lunch_time',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 ('LUNTIME01','Empty Lunch Time!!','Lunch Time cannot be empty','E','Y',null,null,null,to_date('22-10-00','DD-MM-RR'),'SUN ','HDP ',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 ('LUNTIME02','Negative Lunch Time!!','Lunch time cannot be negative','E','Y',null,null,null,to_date('22-10-00','DD-MM-RR'),'SUN ','HDP ',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 ('VMHDFD01','Invalid Time!!','Lunch time can not be greater than Half day hours.','E','Y',null,null,null,to_date('22-10-00','DD-MM-RR'),'SUN ','HDP ',null,null);
----------------------------------------------[26/12/19]End
webitm-adm/module-resource/metadata/workshft11.xml
View file @ 10372f5a
...@@ -852,10 +852,10 @@ ...@@ -852,10 +852,10 @@
<tabsequence>40</tabsequence> <tabsequence>40</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>379</x> <x>380</x>
<y>1</y> <y>1</y>
<height>18</height> <height>18</height>
<width>64</width> <width>63</width>
<format>0.00</format> <format>0.00</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
...@@ -887,10 +887,10 @@ ...@@ -887,10 +887,10 @@
<tabsequence>50</tabsequence> <tabsequence>50</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>445</x> <x>446</x>
<y>1</y> <y>1</y>
<height>18</height> <height>18</height>
<width>65</width> <width>64</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
...@@ -1226,7 +1226,7 @@ ...@@ -1226,7 +1226,7 @@
<name>hd_in_time</name> <name>hd_in_time</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>0</limit> <limit>8</limit>
<case>any</case> <case>any</case>
<focusrectangle>no</focusrectangle> <focusrectangle>no</focusrectangle>
<autoselect>no</autoselect> <autoselect>no</autoselect>
......
webitm-adm/module-resource/metadata/workshft21.xml
View file @ 10372f5a
...@@ -510,10 +510,12 @@ ...@@ -510,10 +510,12 @@
</html> </html>
<name>in_time</name> <name>in_time</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="editmask"> <EditStyle style="edit">
<mask>##:##</mask> <limit>5</limit>
<imemode>0</imemode> <case>any</case>
<focusrectangle>no</focusrectangle> <focusrectangle>no</focusrectangle>
<autoselect>no</autoselect>
<imemode>0</imemode>
</EditStyle> </EditStyle>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
...@@ -573,10 +575,12 @@ ...@@ -573,10 +575,12 @@
</html> </html>
<name>out_time</name> <name>out_time</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="editmask"> <EditStyle style="edit">
<mask>##:##</mask> <limit>5</limit>
<imemode>0</imemode> <case>any</case>
<focusrectangle>no</focusrectangle> <focusrectangle>no</focusrectangle>
<autoselect>no</autoselect>
<imemode>0</imemode>
</EditStyle> </EditStyle>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
...@@ -637,7 +641,7 @@ ...@@ -637,7 +641,7 @@
<name>fd_hrs</name> <name>fd_hrs</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>4</limit> <limit>12</limit>
<case>any</case> <case>any</case>
<format>#0.00</format> <format>#0.00</format>
<focusrectangle>no</focusrectangle> <focusrectangle>no</focusrectangle>
...@@ -741,7 +745,7 @@ ...@@ -741,7 +745,7 @@
<name>hd_hrs</name> <name>hd_hrs</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>4</limit> <limit>12</limit>
<case>any</case> <case>any</case>
<format>#0.00</format> <format>#0.00</format>
<focusrectangle>no</focusrectangle> <focusrectangle>no</focusrectangle>
...@@ -807,10 +811,12 @@ ...@@ -807,10 +811,12 @@
</html> </html>
<name>hd_in_time</name> <name>hd_in_time</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="editmask"> <EditStyle style="edit">
<mask>##:##</mask> <limit>8</limit>
<imemode>0</imemode> <case>any</case>
<focusrectangle>no</focusrectangle> <focusrectangle>no</focusrectangle>
<autoselect>no</autoselect>
<imemode>0</imemode>
</EditStyle> </EditStyle>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
...@@ -899,7 +905,7 @@ ...@@ -899,7 +905,7 @@
<name>grace_time</name> <name>grace_time</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>13</limit> <limit>12</limit>
<case>any</case> <case>any</case>
<format>###0</format> <format>###0</format>
<focusrectangle>no</focusrectangle> <focusrectangle>no</focusrectangle>
...@@ -1020,8 +1026,8 @@ ...@@ -1020,8 +1026,8 @@
<tabsequence>130</tabsequence> <tabsequence>130</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>335</x> <x>333</x>
<y>187</y> <y>188</y>
<height>16</height> <height>16</height>
<width>83</width> <width>83</width>
<format>[general]</format> <format>[general]</format>
...@@ -1112,7 +1118,7 @@ ...@@ -1112,7 +1118,7 @@
<tabsequence>120</tabsequence> <tabsequence>120</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>164</x> <x>161</x>
<y>187</y> <y>187</y>
<height>16</height> <height>16</height>
<width>58</width> <width>58</width>
...@@ -1123,7 +1129,7 @@ ...@@ -1123,7 +1129,7 @@
<name>lunch_time</name> <name>lunch_time</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>0</limit> <limit>6</limit>
<case>any</case> <case>any</case>
<format>#0</format> <format>#0</format>
<focusrectangle>no</focusrectangle> <focusrectangle>no</focusrectangle>
......
webitm-adm/module-resource/srd/d_wrkshift_brow.srd
View file @ 10372f5a
...@@ -48,8 +48,8 @@ text(band=header alignment="0" text="Grace No Time" border="0" color="33554432" ...@@ -48,8 +48,8 @@ text(band=header alignment="0" text="Grace No Time" border="0" color="33554432"
column(band=detail id=1 alignment="0" tabsequence=10 border="5" color="0" x="2" y="1" height="18" width="103" format="[general]" html.valueishtml="0" name=day_no visible="1" ddlb.limit=0 ddlb.allowedit=no ddlb.case=any ddlb.vscrollbar=yes 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=1 alignment="0" tabsequence=10 border="5" color="0" x="2" y="1" height="18" width="103" format="[general]" html.valueishtml="0" name=day_no visible="1" ddlb.limit=0 ddlb.allowedit=no ddlb.case=any ddlb.vscrollbar=yes 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=2 alignment="0" tabsequence=20 border="5" color="0" x="107" y="1" height="18" width="166" format="[general]" html.valueishtml="0" name=descr visible="1" edit.limit=20 edit.case=any 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=2 alignment="0" tabsequence=20 border="5" color="0" x="107" y="1" height="18" width="166" format="[general]" html.valueishtml="0" name=descr visible="1" edit.limit=20 edit.case=any 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=3 alignment="0" tabsequence=30 border="5" color="0" x="275" y="1" height="18" width="102" format="[general]" html.valueishtml="0" name=shift visible="1" edit.limit=1 edit.case=any 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=3 alignment="0" tabsequence=30 border="5" color="0" x="275" y="1" height="18" width="102" format="[general]" html.valueishtml="0" name=shift visible="1" edit.limit=1 edit.case=any 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=4 alignment="0" tabsequence=40 border="5" color="0" x="379" y="1" height="18" width="64" format="0.00" html.valueishtml="0" name=in_time visible="1" editmask.mask="xxxxx" editmask.imemode=0 editmask.focusrectangle=no 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=4 alignment="0" tabsequence=40 border="5" color="0" x="380" y="1" height="18" width="63" format="0.00" html.valueishtml="0" name=in_time visible="1" editmask.mask="xxxxx" editmask.imemode=0 editmask.focusrectangle=no 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="445" y="1" height="18" width="65" format="[general]" html.valueishtml="0" name=out_time visible="1" editmask.mask="xxxxx" editmask.imemode=0 editmask.focusrectangle=no 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="446" y="1" height="18" width="64" format="[general]" html.valueishtml="0" name=out_time visible="1" editmask.mask="xxxxx" editmask.imemode=0 editmask.focusrectangle=no 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="0" tabsequence=32766 border="5" color="0" x="1510" y="1" height="18" width="75" format="[shortdate] [time]" html.valueishtml="0" name=chg_date visible="1" edit.limit=0 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=6 alignment="0" tabsequence=32766 border="5" color="0" x="1510" y="1" height="18" width="75" format="[shortdate] [time]" html.valueishtml="0" name=chg_date visible="1" edit.limit=0 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=7 alignment="0" tabsequence=32766 border="5" color="0" x="1433" y="1" height="18" width="75" format="[general]" html.valueishtml="0" name=chg_user visible="1" edit.limit=0 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=7 alignment="0" tabsequence=32766 border="5" color="0" x="1433" y="1" height="18" width="75" format="[general]" html.valueishtml="0" name=chg_user visible="1" edit.limit=0 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=8 alignment="0" tabsequence=32766 border="5" color="0" x="1356" y="1" height="18" width="75" format="[general]" html.valueishtml="0" name=chg_term visible="1" edit.limit=0 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=8 alignment="0" tabsequence=32766 border="5" color="0" x="1356" y="1" height="18" width="75" format="[general]" html.valueishtml="0" name=chg_term visible="1" edit.limit=0 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" )
...@@ -58,7 +58,7 @@ column(band=detail id=10 alignment="0" tabsequence=80 border="5" color="0" x="68 ...@@ -58,7 +58,7 @@ column(band=detail id=10 alignment="0" tabsequence=80 border="5" color="0" x="68
column(band=detail id=11 alignment="0" tabsequence=90 border="5" color="0" x="768" y="1" height="16" width="96" format="0.00" html.valueishtml="0" name=lunch_time visible="1" edit.limit=6 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=11 alignment="0" tabsequence=90 border="5" color="0" x="768" y="1" height="16" width="96" format="0.00" html.valueishtml="0" name=lunch_time visible="1" edit.limit=6 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=12 alignment="0" tabsequence=100 border="5" color="0" x="866" y="1" height="16" width="64" format="[general]" html.valueishtml="0" name=work_type visible="1" ddlb.limit=0 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=12 alignment="0" tabsequence=100 border="5" color="0" x="866" y="1" height="16" width="64" format="[general]" html.valueishtml="0" name=work_type visible="1" ddlb.limit=0 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=13 alignment="0" tabsequence=110 border="5" color="0" x="932" y="1" height="16" width="62" format="[general]" html.valueishtml="0" name=rotation_type 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" ) column(band=detail id=13 alignment="0" tabsequence=110 border="5" color="0" x="932" y="1" height="16" width="62" format="[general]" html.valueishtml="0" name=rotation_type 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" )
column(band=detail id=14 alignment="0" tabsequence=60 border="5" color="0" x="512" y="1" height="16" width="90" format="[general]" html.valueishtml="0" name=hd_in_time 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" ) column(band=detail id=14 alignment="0" tabsequence=60 border="5" color="0" x="512" y="1" height="16" width="90" format="[general]" html.valueishtml="0" name=hd_in_time visible="1" edit.limit=8 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=15 alignment="0" tabsequence=120 border="0" color="0" x="996" y="1" height="16" width="84" format="[general]" html.valueishtml="0" name=grace_time visible="1" edit.limit=0 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=15 alignment="0" tabsequence=120 border="0" color="0" x="996" y="1" height="16" width="84" format="[general]" html.valueishtml="0" name=grace_time visible="1" edit.limit=0 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=16 alignment="0" tabsequence=130 border="0" color="0" x="1082" y="1" height="16" width="47" format="[general]" html.valueishtml="0" name=hd_hrs visible="1" edit.limit=0 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=16 alignment="0" tabsequence=130 border="0" color="0" x="1082" y="1" height="16" width="47" format="[general]" html.valueishtml="0" name=hd_hrs visible="1" edit.limit=0 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=17 alignment="0" tabsequence=140 border="0" color="0" x="1131" y="1" height="16" width="61" format="[general]" html.valueishtml="0" name=fd_hrs visible="1" edit.limit=0 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=17 alignment="0" tabsequence=140 border="0" color="0" x="1131" y="1" height="16" width="61" format="[general]" html.valueishtml="0" name=fd_hrs visible="1" edit.limit=0 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/module-resource/srd/d_wrkshift_edit.srd
View file @ 10372f5a
...@@ -35,26 +35,26 @@ column(band=detail id=2 alignment="0" tabsequence=20 border="5" color="0" x="343 ...@@ -35,26 +35,26 @@ column(band=detail id=2 alignment="0" tabsequence=20 border="5" color="0" x="343
text(band=detail alignment="1" text="Description :" border="0" color="0" x="55" y="47" height="16" width="104" html.valueishtml="0" name=descr_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="Description :" border="0" color="0" x="55" y="47" height="16" width="104" html.valueishtml="0" name=descr_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="0" tabsequence=30 border="5" color="0" x="164" y="47" height="16" width="254" format="[general]" html.valueishtml="0" name=descr visible="1" edit.limit=20 edit.case=any 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=3 alignment="0" tabsequence=30 border="5" color="0" x="164" y="47" height="16" width="254" format="[general]" html.valueishtml="0" name=descr visible="1" edit.limit=20 edit.case=any 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="In Time :" border="0" color="0" x="55" y="75" height="16" width="104" html.valueishtml="0" name=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="In Time :" border="0" color="0" x="55" y="75" height="16" width="104" html.valueishtml="0" name=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" )
column(band=detail id=4 alignment="0" tabsequence=40 border="5" color="0" x="164" y="75" height="16" width="50" format="[general]" html.valueishtml="0" name=in_time visible="1" editmask.mask="##:##" editmask.imemode=0 editmask.focusrectangle=no 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=4 alignment="0" tabsequence=40 border="5" color="0" x="164" y="75" height="16" width="50" format="[general]" html.valueishtml="0" name=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" )
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" editmask.mask="##:##" editmask.imemode=0 editmask.focusrectangle=no 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=4 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="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" )
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=4 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" editmask.mask="##:##" editmask.imemode=0 editmask.focusrectangle=no 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=8 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=13 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" )
text(band=detail alignment="0" text="(minutes)" border="0" color="0" x="212" y="159" height="16" width="60" html.valueishtml="0" name=grace_time_min_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="0" text="(minutes)" border="0" color="0" x="212" y="159" height="16" width="60" html.valueishtml="0" name=grace_time_min_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 No. Time :" border="0" color="0" x="282" y="159" height="16" width="90" html.valueishtml="0" name=grace_no_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 No. Time :" border="0" color="0" x="282" y="159" height="16" width="90" html.valueishtml="0" name=grace_no_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=19 alignment="1" tabsequence=110 border="5" color="0" x="375" y="159" height="16" width="43" format="[general]" html.valueishtml="0" name=grace_no_time visible="1" edit.limit=3 edit.case=upper 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=19 alignment="1" tabsequence=110 border="5" color="0" x="375" y="159" height="16" width="43" format="[general]" html.valueishtml="0" name=grace_no_time visible="1" edit.limit=3 edit.case=upper 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=15 alignment="0" tabsequence=130 border="5" color="0" x="335" y="187" height="16" width="83" format="[general]" html.valueishtml="0" name=status 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=15 alignment="0" tabsequence=130 border="5" color="0" x="333" y="188" height="16" width="83" format="[general]" html.valueishtml="0" name=status 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="Status :" border="0" color="0" x="287" y="187" height="16" width="42" html.valueishtml="0" name=status_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="Status :" border="0" color="0" x="287" y="187" height="16" width="42" html.valueishtml="0" name=status_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="0" text="(minutes)" border="0" color="0" x="226" y="187" height="16" width="53" html.valueishtml="0" name=lunch_time_min_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="0" text="(minutes)" border="0" color="0" x="226" y="187" height="16" width="53" html.valueishtml="0" name=lunch_time_min_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=16 alignment="1" tabsequence=120 border="5" color="0" x="164" y="187" height="16" width="58" format="0.00" html.valueishtml="0" name=lunch_time visible="1" edit.limit=0 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="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" )
......
webitm-adm/src/ibase/webitm/ejb/adm/WorkShiftIC.java
View file @ 10372f5a
...@@ -82,6 +82,7 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -82,6 +82,7 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
String hdInTime = ""; String hdInTime = "";
String graceTimeStr = ""; String graceTimeStr = "";
String graceNoTimeStr = ""; String graceNoTimeStr = "";
String lunchTimeStr = "";
int graceNoTime = 0; int graceNoTime = 0;
int graceTime = 0; int graceTime = 0;
...@@ -93,6 +94,7 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -93,6 +94,7 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
long outTimeMin = 0; long outTimeMin = 0;
long lmin3 = 0; long lmin3 = 0;
long lmin4 = 0; long lmin4 = 0;
double lunchTime = 0.0;
double hdHrs = 0.0; double hdHrs = 0.0;
double fdHrs = 0.0; double fdHrs = 0.0;
...@@ -151,11 +153,12 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -151,11 +153,12 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
errList.add("VEWSH1"); errList.add("VEWSH1");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
else if((shift != null && shift.trim().length() > 0)) else
{ {
sql = "select count(*) as cnt from workshft where shift = ?"; sql = "select count (*) as cnt from workshft where shift= ? and day_no =?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, shift); pstmt.setString(1, shift);
pstmt.setString(2, dayNo);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
...@@ -172,43 +175,60 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -172,43 +175,60 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
if(cnt == 0) if(cnt > 0)
{ {
errList.add("VEWSH2"); errList.add("VDWSH1");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
else
{
sql = "select count (*) as cnt from workshft where shift= ? and day_no =?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, shift);
pstmt.setString(2, dayNo);
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)
{
errList.add("VDWSH1");
errFields.add(childNodeName.toLowerCase());
}
}
} }
} }
} }
else if ("next_shift".equalsIgnoreCase(childNodeName))
{
nextShift = checkNull(genericUtility.getColumnValue("next_shift", dom));
sql= "select count(*) as cnt from workshft where shift = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, nextShift);
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)
{
errList.add("VMSHIFT");
errFields.add(childNodeName.toLowerCase());
}
}
else if ("descr".equalsIgnoreCase(childNodeName))
{
descr = checkNull(genericUtility.getColumnValue("descr", dom));
if(descr.length() == 0 || descr == null)
{
errList.add("VTDESC1");
errFields.add(childNodeName.toLowerCase());
}
}
else if ("day_no".equalsIgnoreCase(childNodeName))
{
dayNo = checkNull(genericUtility.getColumnValue("day_no", dom));
if(dayNo.length() == 0 || dayNo == null)
{
errList.add("VTDAYNO1");
errFields.add(childNodeName.toLowerCase());
}
}
else if ("grace_time".equalsIgnoreCase(childNodeName)) else if ("grace_time".equalsIgnoreCase(childNodeName))
{ {
graceTimeStr = checkNull(genericUtility.getColumnValue("grace_time", dom)); graceTimeStr = checkNull(genericUtility.getColumnValue("grace_time", dom));
...@@ -229,7 +249,7 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -229,7 +249,7 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
if(graceTime < 0) if(graceTime < 0)
{ {
errList.add("GRATIME02"); errList.add("GRATIME02");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
} }
else if ("grace_no_time".equalsIgnoreCase(childNodeName)) else if ("grace_no_time".equalsIgnoreCase(childNodeName))
...@@ -255,56 +275,39 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -255,56 +275,39 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
} }
else if ("next_shift".equalsIgnoreCase(childNodeName)) else if ("lunch_time".equalsIgnoreCase(childNodeName))
{ {
nextShift = checkNull(genericUtility.getColumnValue("next_shift", dom)); lunchTimeStr = checkNull(genericUtility.getColumnValue("lunch_time", dom));
sql= "select count(*) as cnt from workshft where shift = ?"; fdHrs = Double.parseDouble(checkNull(genericUtility.getColumnValue("fd_hrs", dom)));
pstmt = conn.prepareStatement(sql); if(lunchTimeStr == null || lunchTimeStr.trim().length() == 0)
pstmt.setString(1, nextShift);
rs = pstmt.executeQuery();
if (rs.next())
{
cnt = rs.getInt("cnt");
}
if (rs != null)
{ {
rs.close(); errList.add("LUNTIME01");
rs = null; errFields.add(childNodeName.toLowerCase());
} }
if (pstmt != null) try
{ {
pstmt.close(); lunchTime = Double.parseDouble(lunchTimeStr);
pstmt = null; }
} catch (Exception e)
if(cnt == 0)
{ {
errList.add("VMSHIFT"); lunchTime = 0;
errFields.add(childNodeName.toLowerCase());
} }
}
else if ("descr".equalsIgnoreCase(childNodeName)) if(lunchTime < 0)
{
descr = checkNull(genericUtility.getColumnValue("descr", dom));
if(descr.length() == 0 || descr == null)
{ {
errList.add("VTDESC1"); errList.add("LUNTIME02");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
} else if(lunchTime > fdHrs)
else if ("day_no".equalsIgnoreCase(childNodeName))
{
dayNo = checkNull(genericUtility.getColumnValue("day_no", dom));
if(dayNo.length() == 0 || dayNo == null)
{ {
errList.add("VTDAYNO1"); errList.add("VMHDFD01");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
} }
else if ("in_time".equalsIgnoreCase(childNodeName)) else if ("in_time".equalsIgnoreCase(childNodeName))
{ {
inTime = checkNull(genericUtility.getColumnValue("in_time", dom)); inTime = checkNull(genericUtility.getColumnValue("in_time", dom));
if(! isTime(inTime)) if(! isTime(inTime.trim()))
{ {
errList.add("VMTIME"); errList.add("VMTIME");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
...@@ -313,7 +316,7 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -313,7 +316,7 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
else if ("out_time".equalsIgnoreCase(childNodeName)) else if ("out_time".equalsIgnoreCase(childNodeName))
{ {
outTime = checkNull(genericUtility.getColumnValue("out_time", dom)); outTime = checkNull(genericUtility.getColumnValue("out_time", dom));
if(! isTime(outTime)) if(! isTime(outTime.trim()))
{ {
errList.add("VMTIME"); errList.add("VMTIME");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
...@@ -323,18 +326,24 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -323,18 +326,24 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
{ {
hdHrs = Double.parseDouble(checkNull(genericUtility.getColumnValue("hd_hrs", dom))); hdHrs = Double.parseDouble(checkNull(genericUtility.getColumnValue("hd_hrs", dom)));
fdHrs = Double.parseDouble(checkNull(genericUtility.getColumnValue("fd_hrs", dom))); fdHrs = Double.parseDouble(checkNull(genericUtility.getColumnValue("fd_hrs", dom)));
lunchTime = Double.parseDouble(checkNull(genericUtility.getColumnValue("lunch_time", dom)));
if(hdHrs > fdHrs) if(hdHrs > fdHrs)
{ {
errList.add("VMHDFD"); errList.add("VMHDFD");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
} }
else if("hd_in_time".equalsIgnoreCase(childNodeName)) else if("hd_in_time".equalsIgnoreCase(childNodeName))
{ {
hdInTime = checkNull(genericUtility.getColumnValue("hd_in_time", dom)); hdInTime = checkNull(genericUtility.getColumnValue("hd_in_time", dom));
inTime = checkNull(genericUtility.getColumnValue("in_time", dom)); inTime = checkNull(genericUtility.getColumnValue("in_time", dom));
outTime = checkNull(genericUtility.getColumnValue("out_time", dom)); outTime = checkNull(genericUtility.getColumnValue("out_time", dom));
if(hdInTime.indexOf(":") <0 || inTime.indexOf(":") <0 || outTime.indexOf(":") <0) System.out.println("hdInTime:::"+hdInTime);
System.out.println("inTime:::"+inTime);
System.out.println("outTime:::"+outTime);
if( (hdInTime.indexOf(":") == -1) || ( inTime.indexOf(":") == -1 ) || ( outTime.indexOf(":") == -1 ))
{ {
errList.add("VMTIME"); errList.add("VMTIME");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
...@@ -500,6 +509,9 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -500,6 +509,9 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
String hdInTime = ""; String hdInTime = "";
String outTime = ""; String outTime = "";
String inTime = ""; String inTime = "";
String graceTime = "";
String graceNoTime = "";
String lunchTime = "";
try try
{ {
...@@ -524,12 +536,45 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -524,12 +536,45 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
{ {
siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "site_code"); siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "site_code");
valueXmlString.append("<site_code ><![CDATA[").append(siteCode).append("]]></site_code>\r\n"); valueXmlString.append("<site_code ><![CDATA[").append(siteCode).append("]]></site_code>\r\n");
valueXmlString.append("<hd_in_time ><![CDATA[").append("00:00").append("]]></hd_in_time>\r\n"); valueXmlString.append("<hd_in_time ><![CDATA[").append("00:00:00").append("]]></hd_in_time>\r\n");
valueXmlString.append("<in_time ><![CDATA[").append("00:00").append("]]></in_time>\r\n"); valueXmlString.append("<in_time ><![CDATA[").append("00:00").append("]]></in_time>\r\n");
valueXmlString.append("<out_time ><![CDATA[").append("00:00").append("]]></out_time>\r\n"); valueXmlString.append("<out_time ><![CDATA[").append("00:00").append("]]></out_time>\r\n");
valueXmlString.append("<grace_time ><![CDATA[").append("0").append("]]></grace_time>\r\n");
valueXmlString.append("<grace_no_time ><![CDATA[").append("0").append("]]></grace_no_time>\r\n");
valueXmlString.append("<lunch_time ><![CDATA[").append("0").append("]]></lunch_time>\r\n");
}
else if("grace_time".equalsIgnoreCase(currentColumn))
{
graceTime = checkNull(genericUtility.getColumnValue("grace_time", dom));
System.out.println("graceTime:::"+graceTime);
if(graceTime == null || graceTime.trim().length() == 0)
{
valueXmlString.append("<grace_time ><![CDATA[").append(0).append("]]></grace_time>\r\n");
}
}
else if("grace_no_time".equalsIgnoreCase(currentColumn))
{
graceNoTime = checkNull(genericUtility.getColumnValue("grace_no_time", dom));
System.out.println("graceNoTime:::"+graceNoTime);
if(graceNoTime == null || graceNoTime.trim().length() == 0)
{
valueXmlString.append("<grace_no_time ><![CDATA[").append(0).append("]]></grace_no_time>\r\n");
}
}
else if("lunch_time".equalsIgnoreCase(currentColumn))
{
lunchTime = checkNull(genericUtility.getColumnValue("lunch_time", dom));
System.out.println("lunchTime:::"+lunchTime);
if(lunchTime == null || lunchTime.trim().length() == 0)
{
valueXmlString.append("<lunch_time ><![CDATA[").append(0).append("]]></lunch_time>\r\n");
}
} }
else if("fd_hrs".equalsIgnoreCase(currentColumn)) else if("fd_hrs".equalsIgnoreCase(currentColumn))
{ {
fdHrsStr = checkNull(genericUtility.getColumnValue("fd_hrs", dom)); fdHrsStr = checkNull(genericUtility.getColumnValue("fd_hrs", dom));
...@@ -557,7 +602,7 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -557,7 +602,7 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
if(hdInTime == null || hdInTime.trim().length() == 0) if(hdInTime == null || hdInTime.trim().length() == 0)
{ {
valueXmlString.append("<hd_in_time ><![CDATA[").append("00:00").append("]]></hd_in_time>\r\n"); valueXmlString.append("<hd_in_time ><![CDATA[").append("00:00:00").append("]]></hd_in_time>\r\n");
} }
} }
else if("in_time".equalsIgnoreCase(currentColumn)) else if("in_time".equalsIgnoreCase(currentColumn))
...@@ -595,11 +640,6 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -595,11 +640,6 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
{ {
try try
{ {
if (conn != null)
{
conn.close();
conn = null;
}
if (rs != null) if (rs != null)
{ {
rs.close(); rs.close();
...@@ -610,6 +650,11 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -610,6 +650,11 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
if (conn != null)
{
conn.close();
conn = null;
}
} }
catch (Exception e) catch (Exception e)
{ {
...@@ -692,27 +737,35 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -692,27 +737,35 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
try try
{ {
if( ((int)timeHoursMins.charAt(1)<48 || (int)timeHoursMins.charAt(1)>57) || ((int)timeHoursMins.charAt(4)<48 || (int)timeHoursMins.charAt(4)>57) ) if(timeHoursMins.length() > 4)
{ {
flag = false; if( ((int)timeHoursMins.charAt(1)<48 || (int)timeHoursMins.charAt(1)>57) || ((int)timeHoursMins.charAt(4)<48 || (int)timeHoursMins.charAt(4)>57) )
System.out.println("false"); {
} flag = false;
else if((int)timeHoursMins.charAt(3)<48 || (int)timeHoursMins.charAt(3)>53) System.out.println("false");
{ }
flag = false; else if((int)timeHoursMins.charAt(3)<48 || (int)timeHoursMins.charAt(3)>53)
System.out.println("false"); {
flag = false;
System.out.println("false");
} }
else if((int)timeHoursMins.charAt(0)<48 || (int)timeHoursMins.charAt(0)>50 || ( (int)timeHoursMins.charAt(0)==50 && (int)timeHoursMins.charAt(1)>51 ) ) else if((int)timeHoursMins.charAt(0)<48 || (int)timeHoursMins.charAt(0)>50 || ( (int)timeHoursMins.charAt(0)==50 && (int)timeHoursMins.charAt(1)>51 ) )
{ {
flag = false; flag = false;
System.out.println("false"); System.out.println("false");
}
else
{
flag = true;
System.out.println("True");
}
} }
else else
{ {
flag = true; flag = false;
System.out.println("True");
} }
} }
catch (Exception e) catch (Exception e)
{ {
...@@ -749,14 +802,24 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -749,14 +802,24 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
input = ""; input = "";
} }
return input; return input;
} }
private static long toMins(String s) private static long toMins(String s)
{ {
String[] hdInTime = s.split(":"); try
int hour = Integer.parseInt(hdInTime[0]); {
int mins = Integer.parseInt(hdInTime[1]); s = s.trim();
int hoursInMins = hour * 60; System.out.println("inside toMins:: "+s);
return hoursInMins + mins; String[] hdInTime = s.split(":");
int hour = Integer.parseInt(hdInTime[0]);
int mins = Integer.parseInt(hdInTime[1]);
int hoursInMins = hour * 60;
return hoursInMins + mins;
}
catch (Exception e) {
e.printStackTrace();
return 0;
}
} }
} }
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