Skip to content

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

* update sql, srd, xml and src 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@213595 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 51e2d846
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 816 additions and 233 deletions
webitm-adm/module-resource/SQL/w_workshft.sql
View file @ 763615c2
...@@ -26,9 +26,6 @@ update OBJ_ACTIONS set image='ibase/resource/objaction/edit.svg' where OBJ_NAME= ...@@ -26,9 +26,6 @@ update OBJ_ACTIONS set image='ibase/resource/objaction/edit.svg' where OBJ_NAME=
update OBJ_ACTIONS set image='ibase/resource/objaction/Audit-trail.svg' where OBJ_NAME='workshft' and LINE_NO=21; update OBJ_ACTIONS set image='ibase/resource/objaction/Audit-trail.svg' where OBJ_NAME='workshft' and LINE_NO=21;
update OBJ_ACTIONS set image='ibase/resource/objaction/exprtExl.svg' where OBJ_NAME='workshft' and LINE_NO=22; update OBJ_ACTIONS set image='ibase/resource/objaction/exprtExl.svg' where OBJ_NAME='workshft' and LINE_NO=22;
----------------------------------------------------- SYSTEM_EVENTS ----------------------------------------------------- SYSTEM_EVENTS
Insert into SYSTEM_EVENTS (OBJ_NAME,EVENT_CODE,EVENT_CONTEXT,SERVICE_CODE,METHOD_RULE,OVERWRITE_CORE,CHG_DATE,CHG_USER,CHG_TERM,RESULT_HANDLE,COMP_TYPE,COMP_NAME,COMM_FORMAT) values ('workshft','audit_trail','1','project_audit_trail',null,'0',to_date('04-12-07','DD-MM-RR'),'d ','Base45','2',null,null,null); Insert into SYSTEM_EVENTS (OBJ_NAME,EVENT_CODE,EVENT_CONTEXT,SERVICE_CODE,METHOD_RULE,OVERWRITE_CORE,CHG_DATE,CHG_USER,CHG_TERM,RESULT_HANDLE,COMP_TYPE,COMP_NAME,COMM_FORMAT) values ('workshft','audit_trail','1','project_audit_trail',null,'0',to_date('04-12-07','DD-MM-RR'),'d ','Base45','2',null,null,null);
Insert into SYSTEM_EVENTS (OBJ_NAME,EVENT_CODE,EVENT_CONTEXT,SERVICE_CODE,METHOD_RULE,OVERWRITE_CORE,CHG_DATE,CHG_USER,CHG_TERM,RESULT_HANDLE,COMP_TYPE,COMP_NAME,COMM_FORMAT) values ('workshft','export_excel','1','export_excel',null,null,to_date('26-03-15','DD-MM-RR'),'danish ','Base143',null,null,null,null); Insert into SYSTEM_EVENTS (OBJ_NAME,EVENT_CODE,EVENT_CONTEXT,SERVICE_CODE,METHOD_RULE,OVERWRITE_CORE,CHG_DATE,CHG_USER,CHG_TERM,RESULT_HANDLE,COMP_TYPE,COMP_NAME,COMM_FORMAT) values ('workshft','export_excel','1','export_excel',null,null,to_date('26-03-15','DD-MM-RR'),'danish ','Base143',null,null,null,null);
...@@ -109,10 +106,75 @@ Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,E ...@@ -109,10 +106,75 @@ Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,E
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 ('VMTIME ','Invalid Time','Enter valid time','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 ('VMTIME ','Invalid Time','Enter valid time','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 ('VTDESC1 ','Description cannot be empty','Description 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 ('VTDESC1 ','Description cannot be empty','Description cannot be empty','E','Y',null,null,null,to_date('22-10-00','DD-MM-RR'),'SUN ','HDP ',null,null);
----------------------------------------------------- SARITA [31/08/2019] ---------------------- START
update itm2menu set icon_path='workshft.png' , close_icon='workshftwht.png' where win_name='w_workshft';
----------------------------------------------------- SARITA [31/08/2019] ---------------------- END
----------------------------------------------[18/10/19]Start
update transetup set REF_SER ='W-SHFT' where TRAN_WINDOW = 'w_workshft';
----------------------------------------------[18/10/19]Start
----------------------------------------------[16/12/19]Start
update obj_actions set IMAGE='ibase/resource/objaction/add.svg', DISPLAY_MODE=2 where OBJ_NAME='workshft' and LINE_NO=1;
update obj_actions set IMAGE='ibase/resource/objaction/edit.svg', DISPLAY_MODE=2 where OBJ_NAME='workshft' and LINE_NO=2;
update obj_actions set DISPLAY_MODE=2 , Rights_Char='X', title='View Audit', SHOW_IN_PANEL=1 where OBJ_NAME='workshft' and LINE_NO =21;
update obj_actions set IMAGE='ibase/resource/objaction/exprtExl.svg',DESCRIPTION='Export To Excel',SERVICE_CODE='a',INTERACTIVE='a',RIGHTS_CHAR='B',TITLE='Export2XLS',ACTION_TYPE='S', DISPLAY_MODE=1 where OBJ_NAME='workshft' and LINE_NO=22;
Insert into OBJ_ACTIONS (OBJ_NAME,LINE_NO,IMAGE,DESCRIPTION,SERVICE_CODE,INTERACTIVE,RIGHTS_CHAR,TITLE,FORM_NO,SERVICE_HANDLER,PLACEMENT,ACTION_TYPE,TRAN_TYPE,CHG_DATE,CHG_TERM,CHG_USER,IS_CONFIRMATION_REQ,SEP_DUTY_OPT,RE_AUTH_OPT,SHOW_IN_PANEL,PAGE_CONTEXT,TYPE,ACTION_ARG,SWIPE_POSITION,MULTI_ROW_OPT,ACTION_ID,DEF_NODATA,IN_PROC_INTRUPT,ESTIMATED_TIME,ACTION_GROUP,DISPLAY_OPT,DISPLAY_MODE,SHOW_CONFIRM,REC_SPECIFIC) values ('workshft',3,'ibase/resource/objaction/edit.svg','Editing Existing Record','a','a','E','Edit','2',null,null,'S',null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,'2',null,null);
Insert into OBJ_ACTIONS (OBJ_NAME,LINE_NO,IMAGE,DESCRIPTION,SERVICE_CODE,INTERACTIVE,RIGHTS_CHAR,TITLE,FORM_NO,SERVICE_HANDLER,PLACEMENT,ACTION_TYPE,TRAN_TYPE,CHG_DATE,CHG_TERM,CHG_USER,IS_CONFIRMATION_REQ,SEP_DUTY_OPT,RE_AUTH_OPT,SHOW_IN_PANEL,PAGE_CONTEXT,TYPE,ACTION_ARG,SWIPE_POSITION,MULTI_ROW_OPT,ACTION_ID,DEF_NODATA,IN_PROC_INTRUPT,ESTIMATED_TIME,ACTION_GROUP,DISPLAY_OPT,DISPLAY_MODE,SHOW_CONFIRM,REC_SPECIFIC) values ('workshft',4,'ibase/resource/objaction/add.svg','Adding New','a','a','A','Add','2',null,null,'S',null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,'2',null,null);
update itm2menu set ICON_PATH='WorkShifts.png' , CLOSE_ICON='WorkShiftswht.png' where WIN_NAME='w_workshft';
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 ('NEXT_SHIFT','W_WORKSHFT','SELECT SHIFT, DAY_NO 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 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 FLD_VALUE as shift,DESCR as shift_descr FROM GENCODES WHERE MOD_NAME = ''W_TOUR_PORTAL_WIZ''',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);
update pophelp set THUMB_ALT_COL = 'shift_descr', THUMB_IMAGE_COL= 'shift_descr', THUMB_OBJ = 'icon' where mod_name='W_WORKSHFT' AND field_name='SHIFT';
update pophelp set THUMB_ALT_COL = 'SHIFT', THUMB_IMAGE_COL= 'SHIFT', THUMB_OBJ = 'icon' where mod_name='W_WORKSHFT' AND field_name='NEXT_SHIFT';
update obj_forms set disp_metadata=
'<html>
<span style="white-space: normal !important; word-break: break-word; "> <b> {shift} {descr} {day_no} </b> <br/>
Next Shift: <b>{next_shift}</b> , In time : <b>{in_time}</b> , Out Time : <b>{out_time}<b> </br>
</span>
<br/> <span style="float:right;"></b></span>
</html>' where win_name='w_workshft';
update OBJ_FORMS set THUMB_ALT_COL = 'shift', THUMB_IMAGE_COL= 'shift', THUMB_OBJ = 'icon' where WIN_NAME = 'w_workshft';
update TRANSETUP set THUMB_ALT_COL = 'shift', THUMB_IMAGE_COL= 'shift', THUMB_OBJ = 'icon' where TRAN_WINDOW = 'w_workshft';
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 ('VTDAYNO1','empty Day No.','Day No cannot be empty.','E','Y',null,null,null,to_date('22-10-00','DD-MM-RR'),'SUN ','HDP ',null,null);
Insert into OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('workshft','1 ','fd_hrs',null);
Insert into OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('workshft','1 ','hd_hrs',null);
Insert into OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('workshft','1 ','hd_in_time',null);
Insert into OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('workshft','1 ','out_time',null);
Insert into OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('workshft','1 ','in_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 ('GRATIME01','Empty Grace Time!!','Grace 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 ('GRATIME02','negative Grace Time','Grace 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 ('GRANOTIM01','Empty Grace No Time!!','Grace No 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 ('GRANOTIM02','Negative Grace No Time','Grace No 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 ('VEWSH2','Work Shift does not exists!!','Work Shift does not exists in Work Shift table','E','Y',null,null,null,to_date('22-10-00','DD-MM-RR'),'SUN ','HDP ',null,null);
----------------------------------------------[16/12/19]End
......
webitm-adm/module-resource/metadata/workshft21.xml
View file @ 763615c2
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
<dbname>workshft.grace_no_time</dbname> <dbname>workshft.grace_no_time</dbname>
</table_column> </table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;workshft&quot; ) COLUMN(NAME=&quot;workshft.day_no&quot;) COLUMN(NAME=&quot;workshft.shift&quot;) COLUMN(NAME=&quot;workshft.descr&quot;) COLUMN(NAME=&quot;workshft.in_time&quot;) COLUMN(NAME=&quot;workshft.out_time&quot;) COLUMN(NAME=&quot;workshft.fd_hrs&quot;) COLUMN(NAME=&quot;workshft.hd_hrs&quot;) COLUMN(NAME=&quot;workshft.grace_time&quot;) COLUMN(NAME=&quot;workshft.chg_user&quot;) COLUMN(NAME=&quot;workshft.chg_date&quot;) COLUMN(NAME=&quot;workshft.chg_term&quot;) COLUMN(NAME=&quot;workshft.hd_in_time&quot;) COLUMN(NAME=&quot;workshft.next_shift&quot;) COLUMN(NAME=&quot;workshft.site_code&quot;) COLUMN(NAME=&quot;workshft.status&quot;) COLUMN(NAME=&quot;workshft.lunch_time&quot;) COLUMN(NAME=&quot;workshft.work_type&quot;) COLUMN(NAME=&quot;workshft.rotation_type&quot;) COLUMN(NAME=&quot;workshft.grace_no_time&quot;)WHERE( EXP1 =&quot;( workshft.day_no&quot; OP =&quot;=&quot; EXP2 =&quot;:mdayno )&quot; LOGIC =&quot;and&quot; ) WHERE( EXP1 =&quot;( workshft.shift&quot; OP =&quot;=&quot; EXP2 =&quot;:mshift )&quot; ) ) ARG(NAME = &quot;mdayno&quot; TYPE = string) ARG(NAME = &quot;mshift&quot; TYPE = string) </retrieve> <retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;workshft&quot; ) COLUMN(NAME=&quot;workshft.day_no&quot;) COLUMN(NAME=&quot;workshft.shift&quot;) COLUMN(NAME=&quot;workshft.descr&quot;) COLUMN(NAME=&quot;workshft.in_time&quot;) COLUMN(NAME=&quot;workshft.out_time&quot;) COLUMN(NAME=&quot;workshft.fd_hrs&quot;) COLUMN(NAME=&quot;workshft.hd_hrs&quot;) COLUMN(NAME=&quot;workshft.grace_time&quot;) COLUMN(NAME=&quot;workshft.chg_user&quot;) COLUMN(NAME=&quot;workshft.chg_date&quot;) COLUMN(NAME=&quot;workshft.chg_term&quot;) COLUMN(NAME=&quot;workshft.hd_in_time&quot;) COLUMN(NAME=&quot;workshft.next_shift&quot;) COLUMN(NAME=&quot;workshft.site_code&quot;) COLUMN(NAME=&quot;workshft.status&quot;) COLUMN(NAME=&quot;workshft.lunch_time&quot;) COLUMN(NAME=&quot;workshft.work_type&quot;) COLUMN(NAME=&quot;workshft.rotation_type&quot;) COLUMN(NAME=&quot;workshft.grace_no_time&quot;)WHERE( EXP1 =&quot;( workshft.day_no&quot; OP =&quot;=&quot; EXP2 =&quot;:mdayno )&quot; LOGIC =&quot;and&quot; ) WHERE( EXP1 =&quot;( workshft.shift&quot; OP =&quot;=&quot; EXP2 =&quot;:mshift )&quot; ) ) ARG(NAME = &quot;mdayno&quot; TYPE = string) ARG(NAME = &quot;mshift&quot; TYPE = string) </retrieve>
<update>workshft</update> <update>WORKSHFT</update>
<updatewhere>0</updatewhere> <updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace> <updatekeyinplace>no</updatekeyinplace>
<argument> <argument>
...@@ -224,9 +224,9 @@ ...@@ -224,9 +224,9 @@
<text>Others</text> <text>Others</text>
<border>2</border> <border>2</border>
<color>0</color> <color>0</color>
<x>20</x> <x>21</x>
<y>273</y> <y>271</y>
<height>93</height> <height>73</height>
<width>456</width> <width>456</width>
<name>gb_2</name> <name>gb_2</name>
<visible>1</visible> <visible>1</visible>
...@@ -1371,10 +1371,10 @@ ...@@ -1371,10 +1371,10 @@
<text>Chg Date:</text> <text>Chg Date:</text>
<border>0</border> <border>0</border>
<color>0</color> <color>0</color>
<x>57</x> <x>35</x>
<y>291</y> <y>306</y>
<height>16</height> <height>16</height>
<width>102</width> <width>60</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
...@@ -1393,31 +1393,21 @@ ...@@ -1393,31 +1393,21 @@
<color>79741120</color> <color>79741120</color>
</background> </background>
</TextObject> </TextObject>
<ColumnObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<id>10</id> <alignment>1</alignment>
<alignment>0</alignment> <text>Chg User:</text>
<tabsequence>32766</tabsequence> <border>0</border>
<border>5</border>
<color>0</color> <color>0</color>
<x>163</x> <x>180</x>
<y>291</y> <y>306</y>
<height>16</height> <height>16</height>
<width>111</width> <width>60</width>
<format>[shortdate] [time]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>chg_date</name> <name>chg_user_t</name>
<visible expression="0">1</visible> <visible expression="0">1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode>
</EditStyle>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
<height>-10</height> <height>-10</height>
...@@ -1428,23 +1418,23 @@ ...@@ -1428,23 +1418,23 @@
</font> </font>
<background> <background>
<mode>2</mode> <mode>2</mode>
<color>16777215</color> <color>79741120</color>
</background> </background>
</ColumnObject> </TextObject>
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Chg User:</text> <text>Chg Term:</text>
<border>0</border> <border>0</border>
<color>0</color> <color>0</color>
<x>57</x> <x>333</x>
<y>315</y> <y>306</y>
<height>16</height> <height>16</height>
<width>101</width> <width>60</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>chg_user_t</name> <name>chg_term_t</name>
<visible expression="0">1</visible> <visible expression="0">1</visible>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
...@@ -1461,23 +1451,23 @@ ...@@ -1461,23 +1451,23 @@
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>9</id> <id>10</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>255</color>
<x>163</x> <x>99</x>
<y>315</y> <y>306</y>
<height>16</height> <height>16</height>
<width>111</width> <width>60</width>
<format>[general]</format> <format>[shortdate] [time]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>chg_user</name> <name>chg_date</name>
<visible expression="0">1</visible> <visible expression="0">1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>10</limit> <limit>0</limit>
<case>any</case> <case>any</case>
<focusrectangle>no</focusrectangle> <focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect> <autoselect>yes</autoselect>
...@@ -1493,25 +1483,35 @@ ...@@ -1493,25 +1483,35 @@
<charset>0</charset> <charset>0</charset>
</font> </font>
<background> <background>
<mode>2</mode> <mode>1</mode>
<color>16777215</color> <color>553648127</color>
</background> </background>
</ColumnObject> </ColumnObject>
<TextObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <id>9</id>
<text>Chg Term:</text> <alignment>0</alignment>
<border>0</border> <tabsequence>32766</tabsequence>
<color>0</color> <border>5</border>
<x>56</x> <color>255</color>
<y>342</y> <x>243</x>
<y>306</y>
<height>16</height> <height>16</height>
<width>103</width> <width>60</width>
<format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>chg_term_t</name> <name>chg_user</name>
<visible expression="0">1</visible> <visible expression="0">1</visible>
<EditStyle style="edit">
<limit>10</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode>
</EditStyle>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
<height>-10</height> <height>-10</height>
...@@ -1521,21 +1521,21 @@ ...@@ -1521,21 +1521,21 @@
<charset>0</charset> <charset>0</charset>
</font> </font>
<background> <background>
<mode>2</mode> <mode>1</mode>
<color>79741120</color> <color>553648127</color>
</background> </background>
</TextObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>11</id> <id>11</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>255</color>
<x>163</x> <x>397</x>
<y>342</y> <y>306</y>
<height>16</height> <height>16</height>
<width>111</width> <width>60</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
...@@ -1559,8 +1559,8 @@ ...@@ -1559,8 +1559,8 @@
<charset>0</charset> <charset>0</charset>
</font> </font>
<background> <background>
<mode>2</mode> <mode>1</mode>
<color>16777215</color> <color>553648127</color>
</background> </background>
</ColumnObject> </ColumnObject>
<HtmlTable> <HtmlTable>
......
webitm-adm/src/ibase/webitm/ejb/adm/WorkShiftIC.java
View file @ 763615c2
...@@ -80,6 +80,11 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -80,6 +80,11 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
String inTime = ""; String inTime = "";
String outTime = ""; String outTime = "";
String hdInTime = ""; String hdInTime = "";
String graceTimeStr = "";
String graceNoTimeStr = "";
int graceNoTime = 0;
int graceTime = 0;
int currentFormNo = 0; int currentFormNo = 0;
int noOfChilds = 0; int noOfChilds = 0;
int cnt = 0; int cnt = 0;
...@@ -146,12 +151,11 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -146,12 +151,11 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
errList.add("VEWSH1"); errList.add("VEWSH1");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
else else if((shift != null && shift.trim().length() > 0))
{ {
sql = "select count (*) as cnt from workshft where shift= ? and day_no =?"; sql = "select count(*) as cnt from workshft where shift = ?";
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())
...@@ -168,14 +172,89 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -168,14 +172,89 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
if(cnt > 0) if(cnt == 0)
{ {
errList.add("VDWSH1"); errList.add("VEWSH2");
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 ("grace_time".equalsIgnoreCase(childNodeName))
{
graceTimeStr = checkNull(genericUtility.getColumnValue("grace_time", dom));
if(graceTimeStr == null || graceTimeStr.trim().length() == 0)
{
errList.add("GRATIME01");
errFields.add(childNodeName.toLowerCase());
}
try
{
graceTime = Integer.parseInt(graceTimeStr);
}
catch (Exception e)
{
graceTime = 0;
}
if(graceTime < 0)
{
errList.add("GRATIME02");
errFields.add(childNodeName.toLowerCase());
}
}
else if ("grace_no_time".equalsIgnoreCase(childNodeName))
{
graceNoTimeStr = checkNull(genericUtility.getColumnValue("grace_no_time", dom));
if(graceNoTimeStr == null || graceNoTimeStr.trim().length() == 0)
{
errList.add("GRANOTIM01");
errFields.add(childNodeName.toLowerCase());
}
try
{
graceNoTime = Integer.parseInt(graceNoTimeStr);
}
catch (Exception e)
{
graceNoTime = 0;
}
if(graceNoTime < 0)
{
errList.add("GRANOTIM02");
errFields.add(childNodeName.toLowerCase());
}
}
else if ("next_shift".equalsIgnoreCase(childNodeName)) else if ("next_shift".equalsIgnoreCase(childNodeName))
{ {
nextShift = checkNull(genericUtility.getColumnValue("next_shift", dom)); nextShift = checkNull(genericUtility.getColumnValue("next_shift", dom));
...@@ -213,6 +292,15 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -213,6 +292,15 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
errFields.add(childNodeName.toLowerCase()); 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 ("in_time".equalsIgnoreCase(childNodeName)) else if ("in_time".equalsIgnoreCase(childNodeName))
{ {
inTime = checkNull(genericUtility.getColumnValue("in_time", dom)); inTime = checkNull(genericUtility.getColumnValue("in_time", dom));
...@@ -227,7 +315,6 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -227,7 +315,6 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
outTime = checkNull(genericUtility.getColumnValue("out_time", dom)); outTime = checkNull(genericUtility.getColumnValue("out_time", dom));
if(! isTime(outTime)) if(! isTime(outTime))
{ {
//not istime(string(mval,"@@:@@"))
errList.add("VMTIME"); errList.add("VMTIME");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
...@@ -247,7 +334,7 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -247,7 +334,7 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
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) if(hdInTime.indexOf(":") <0 || inTime.indexOf(":") <0 || outTime.indexOf(":") <0)
{ {
errList.add("VMTIME"); errList.add("VMTIME");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
...@@ -408,8 +495,12 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -408,8 +495,12 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
E12GenericUtility genericUtility = null; E12GenericUtility genericUtility = null;
int currentFormNo = 0; int currentFormNo = 0;
String siteCode = ""; String siteCode = "";
String fdHrsStr = "";
String hdHrsStr = "";
String hdInTime = "";
String outTime = "";
String inTime = "";
try try
{ {
genericUtility = new E12GenericUtility(); genericUtility = new E12GenericUtility();
...@@ -433,11 +524,61 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi ...@@ -433,11 +524,61 @@ 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").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");
}
else if("fd_hrs".equalsIgnoreCase(currentColumn))
{
fdHrsStr = checkNull(genericUtility.getColumnValue("fd_hrs", dom));
System.out.println("fdHrsStr:::"+fdHrsStr);
if(fdHrsStr == null || fdHrsStr.trim().length() == 0)
{
valueXmlString.append("<fd_hrs ><![CDATA[").append(0).append("]]></fd_hrs>\r\n");
}
}
else if("hd_hrs".equalsIgnoreCase(currentColumn))
{
hdHrsStr = checkNull(genericUtility.getColumnValue("hd_hrs", dom));
System.out.println("hdHrsStr:::"+hdHrsStr);
if(hdHrsStr == null || hdHrsStr.trim().length() == 0)
{
valueXmlString.append("<hd_hrs ><![CDATA[").append(0).append("]]></hd_hrs>\r\n");
}
}
else if("hd_in_time".equalsIgnoreCase(currentColumn))
{
hdInTime = checkNull(genericUtility.getColumnValue("hd_in_time", dom));
System.out.println("hdInTime:::"+hdInTime);
if(hdInTime == null || hdInTime.trim().length() == 0)
{
valueXmlString.append("<hd_in_time ><![CDATA[").append("00:00").append("]]></hd_in_time>\r\n");
}
}
else if("in_time".equalsIgnoreCase(currentColumn))
{
inTime = checkNull(genericUtility.getColumnValue("in_time", dom));
System.out.println("inTime:::"+inTime);
if(inTime == null || inTime.trim().length() == 0)
{
valueXmlString.append("<in_time ><![CDATA[").append("00:00").append("]]></in_time>\r\n");
}
}
else if("out_time".equalsIgnoreCase(currentColumn))
{
outTime = checkNull(genericUtility.getColumnValue("out_time", dom));
System.out.println("outTime:::"+outTime);
if(outTime == null || outTime.trim().length() == 0)
{
valueXmlString.append("<out_time ><![CDATA[").append("00:00").append("]]></out_time>\r\n");
}
} }
} }
valueXmlString.append("</Detail1>"); valueXmlString.append("</Detail1>");
......
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