Skip to content

B
business-java
Commit daaade20 authored by akhokar's avatar akhokar
Browse files
Options

Changes done to add prev shift and to compare with shift for attendance reprocess. 

attd_daily21.xml
d_daily_attd_edit.srd
AttdDailyPos.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@209250 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 2247a72c
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 37 deletions
webitm-adm/module-resource/metadata/attd_daily21.xml
View file @ daaade20
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
<dbname>attendance_day.chg_user</dbname> <dbname>attendance_day.chg_user</dbname>
</table_column> </table_column>
<table_column> <table_column>
<type size="15">char</type> <type size="300">char</type>
<update>yes</update> <update>yes</update>
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
<name>chg_term</name> <name>chg_term</name>
...@@ -214,7 +214,13 @@ ...@@ -214,7 +214,13 @@
<dbname>entry_mode</dbname> <dbname>entry_mode</dbname>
<initial>M</initial> <initial>M</initial>
</table_column> </table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;attendance_day&quot; ) TABLE(NAME=&quot;employee&quot; ) COLUMN(NAME=&quot;attendance_day.emp_code&quot;) COLUMN(NAME=&quot;attendance_day.attd_date&quot;) COLUMN(NAME=&quot;attendance_day.in_time&quot;) COLUMN(NAME=&quot;attendance_day.out_time&quot;) COLUMN(NAME=&quot;attendance_day.status&quot;) COLUMN(NAME=&quot;attendance_day.chg_date&quot;) COLUMN(NAME=&quot;attendance_day.shift&quot;) COLUMN(NAME=&quot;attendance_day.day_no&quot;) COLUMN(NAME=&quot;attendance_day.result&quot;) COLUMN(NAME=&quot;employee.emp_fname&quot;) COLUMN(NAME=&quot;employee.emp_lname&quot;) COLUMN(NAME=&quot;employee.work_site&quot;) COLUMN(NAME=&quot;attendance_day.reason_code&quot;) COLUMN(NAME=&quot;attendance_day.punch_str&quot;) COMPUTE(NAME=&quot;in_time as intime&quot;) COMPUTE(NAME=&quot;out_time as outtime&quot;) COLUMN(NAME=&quot;attendance_day.chg_user&quot;) COLUMN(NAME=&quot;attendance_day.chg_term&quot;) COLUMN(NAME=&quot;attendance_day.lunch_time&quot;) COMPUTE(NAME=&quot;in_time as prev_in_time&quot;) COMPUTE(NAME=&quot;out_time as prev_out_time&quot;) COMPUTE(NAME=&quot;&apos;M&apos; as entry_mode&quot;) JOIN (LEFT=&quot;employee.emp_code&quot; OP =&quot;=&quot;RIGHT=&quot;attendance_day.emp_code&quot; )WHERE( EXP1 =&quot;attendance_day.emp_code&quot; OP =&quot;=&quot; EXP2 =&quot;:memp_code&quot; LOGIC =&quot;and&quot; ) WHERE( EXP1 =&quot;attendance_day.attd_date&quot; OP =&quot;=&quot; EXP2 =&quot;:mattd_date&quot; ) ) ARG(NAME = &quot;memp_code&quot; TYPE = string) ARG(NAME = &quot;mattd_date&quot; TYPE = datetime) </retrieve> <table_column>
<type size="5">char</type>
<updatewhereclause>yes</updatewhereclause>
<name>prev_shift</name>
<dbname>attendance_day.prev_shift</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;attendance_day&quot; ) TABLE(NAME=&quot;employee&quot; ) COLUMN(NAME=&quot;attendance_day.emp_code&quot;) COLUMN(NAME=&quot;attendance_day.attd_date&quot;) COLUMN(NAME=&quot;attendance_day.in_time&quot;) COLUMN(NAME=&quot;attendance_day.out_time&quot;) COLUMN(NAME=&quot;attendance_day.status&quot;) COLUMN(NAME=&quot;attendance_day.chg_date&quot;) COLUMN(NAME=&quot;attendance_day.shift&quot;) COLUMN(NAME=&quot;attendance_day.day_no&quot;) COLUMN(NAME=&quot;attendance_day.result&quot;) COLUMN(NAME=&quot;employee.emp_fname&quot;) COLUMN(NAME=&quot;employee.emp_lname&quot;) COLUMN(NAME=&quot;employee.work_site&quot;) COLUMN(NAME=&quot;attendance_day.reason_code&quot;) COLUMN(NAME=&quot;attendance_day.punch_str&quot;) COMPUTE(NAME=&quot;in_time as intime&quot;) COMPUTE(NAME=&quot;out_time as outtime&quot;) COLUMN(NAME=&quot;attendance_day.chg_user&quot;) COLUMN(NAME=&quot;attendance_day.chg_term&quot;) COLUMN(NAME=&quot;attendance_day.lunch_time&quot;) COMPUTE(NAME=&quot;in_time as prev_in_time&quot;) COMPUTE(NAME=&quot;out_time as prev_out_time&quot;) COMPUTE(NAME=&quot;&apos;M&apos; as entry_mode&quot;) COMPUTE(NAME=&quot;shift as prev_shift&quot;) JOIN (LEFT=&quot;employee.emp_code&quot; OP =&quot;=&quot;RIGHT=&quot;attendance_day.emp_code&quot; )WHERE( EXP1 =&quot;attendance_day.emp_code&quot; OP =&quot;=&quot; EXP2 =&quot;:memp_code&quot; LOGIC =&quot;and&quot; ) WHERE( EXP1 =&quot;attendance_day.attd_date&quot; OP =&quot;=&quot; EXP2 =&quot;:mattd_date&quot; ) ) ARG(NAME = &quot;memp_code&quot; TYPE = string) ARG(NAME = &quot;mattd_date&quot; TYPE = datetime) </retrieve>
<update>attendance_day</update> <update>attendance_day</update>
<updatewhere>0</updatewhere> <updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace> <updatekeyinplace>no</updatekeyinplace>
...@@ -679,34 +685,6 @@ ...@@ -679,34 +685,6 @@
<color>16777215</color> <color>16777215</color>
</background> </background>
</ColumnObject> </ColumnObject>
<TextObject>
<band>Detail</band>
<alignment>1</alignment>
<text>(minutes)</text>
<border>0</border>
<color>0</color>
<x>443</x>
<y>266</y>
<height>16</height>
<width>50</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>t_1</name>
<visible>1</visible>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>79741120</color>
</background>
</TextObject>
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
...@@ -1599,6 +1577,36 @@ ...@@ -1599,6 +1577,36 @@
<color>79741120</color> <color>79741120</color>
</background> </background>
</ColumnObject> </ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>23</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<color>0</color>
<x>441</x>
<y>361</y>
<height>16</height>
<width>25</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>prev_shift</name>
<visible>0</visible>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>16777215</color>
</background>
</ColumnObject>
<HtmlTable> <HtmlTable>
<border>1</border> <border>1</border>
</HtmlTable> </HtmlTable>
......
webitm-adm/module-resource/srd/d_daily_attd_edit.srd
View file @ daaade20
...@@ -21,12 +21,13 @@ table(column=(type=char(10) update=yes updatewhereclause=yes key=yes name=emp_co ...@@ -21,12 +21,13 @@ table(column=(type=char(10) update=yes updatewhereclause=yes key=yes name=emp_co
column=(type=char(5) updatewhereclause=yes name=intime dbname="attendance_day.intime" ) column=(type=char(5) updatewhereclause=yes name=intime dbname="attendance_day.intime" )
column=(type=char(5) updatewhereclause=yes name=outtime dbname="attendance_day.outtime" ) column=(type=char(5) updatewhereclause=yes name=outtime dbname="attendance_day.outtime" )
column=(type=char(10) update=yes updatewhereclause=yes name=chg_user dbname="attendance_day.chg_user" ) column=(type=char(10) update=yes updatewhereclause=yes name=chg_user dbname="attendance_day.chg_user" )
column=(type=char(15) update=yes updatewhereclause=yes name=chg_term dbname="attendance_day.chg_term" ) column=(type=char(300) update=yes updatewhereclause=yes name=chg_term dbname="attendance_day.chg_term" )
column=(type=decimal(2) update=yes updatewhereclause=yes name=lunch_time dbname="attendance_day.lunch_time" ) column=(type=decimal(2) update=yes updatewhereclause=yes name=lunch_time dbname="attendance_day.lunch_time" )
column=(type=char(5) updatewhereclause=yes name=prev_in_time dbname="attendance_day.prev_in_time" ) column=(type=char(5) updatewhereclause=yes name=prev_in_time dbname="attendance_day.prev_in_time" )
column=(type=char(5) updatewhereclause=yes name=prev_out_time dbname="attendance_day.prev_out_time" ) column=(type=char(5) updatewhereclause=yes name=prev_out_time dbname="attendance_day.prev_out_time" )
column=(type=char(1) updatewhereclause=yes name=entry_mode dbname="entry_mode" initial="M" ) column=(type=char(1) updatewhereclause=yes name=entry_mode dbname="entry_mode" initial="M" )
retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"attendance_day~" ) TABLE(NAME=~"employee~" ) COLUMN(NAME=~"attendance_day.emp_code~") COLUMN(NAME=~"attendance_day.attd_date~") COLUMN(NAME=~"attendance_day.in_time~") COLUMN(NAME=~"attendance_day.out_time~") COLUMN(NAME=~"attendance_day.status~") COLUMN(NAME=~"attendance_day.chg_date~") COLUMN(NAME=~"attendance_day.shift~") COLUMN(NAME=~"attendance_day.day_no~") COLUMN(NAME=~"attendance_day.result~") COLUMN(NAME=~"employee.emp_fname~") COLUMN(NAME=~"employee.emp_lname~") COLUMN(NAME=~"employee.work_site~") COLUMN(NAME=~"attendance_day.reason_code~") COLUMN(NAME=~"attendance_day.punch_str~") COMPUTE(NAME=~"in_time as intime~") COMPUTE(NAME=~"out_time as outtime~") COLUMN(NAME=~"attendance_day.chg_user~") COLUMN(NAME=~"attendance_day.chg_term~") COLUMN(NAME=~"attendance_day.lunch_time~") COMPUTE(NAME=~"in_time as prev_in_time~") COMPUTE(NAME=~"out_time as prev_out_time~") COMPUTE(NAME=~"'M' as entry_mode~") JOIN (LEFT=~"employee.emp_code~" OP =~"=~"RIGHT=~"attendance_day.emp_code~" )WHERE( EXP1 =~"attendance_day.emp_code~" OP =~"=~" EXP2 =~":memp_code~" LOGIC =~"and~" ) WHERE( EXP1 =~"attendance_day.attd_date~" OP =~"=~" EXP2 =~":mattd_date~" ) ) ARG(NAME = ~"memp_code~" TYPE = string) ARG(NAME = ~"mattd_date~" TYPE = datetime) " update="attendance_day" updatewhere=0 updatekeyinplace=no arguments=(("memp_code", string),("mattd_date", datetime)) ) column=(type=char(5) updatewhereclause=yes name=prev_shift dbname="attendance_day.prev_shift" )
retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"attendance_day~" ) TABLE(NAME=~"employee~" ) COLUMN(NAME=~"attendance_day.emp_code~") COLUMN(NAME=~"attendance_day.attd_date~") COLUMN(NAME=~"attendance_day.in_time~") COLUMN(NAME=~"attendance_day.out_time~") COLUMN(NAME=~"attendance_day.status~") COLUMN(NAME=~"attendance_day.chg_date~") COLUMN(NAME=~"attendance_day.shift~") COLUMN(NAME=~"attendance_day.day_no~") COLUMN(NAME=~"attendance_day.result~") COLUMN(NAME=~"employee.emp_fname~") COLUMN(NAME=~"employee.emp_lname~") COLUMN(NAME=~"employee.work_site~") COLUMN(NAME=~"attendance_day.reason_code~") COLUMN(NAME=~"attendance_day.punch_str~") COMPUTE(NAME=~"in_time as intime~") COMPUTE(NAME=~"out_time as outtime~") COLUMN(NAME=~"attendance_day.chg_user~") COLUMN(NAME=~"attendance_day.chg_term~") COLUMN(NAME=~"attendance_day.lunch_time~") COMPUTE(NAME=~"in_time as prev_in_time~") COMPUTE(NAME=~"out_time as prev_out_time~") COMPUTE(NAME=~"'M' as entry_mode~") COMPUTE(NAME=~"shift as prev_shift~") JOIN (LEFT=~"employee.emp_code~" OP =~"=~"RIGHT=~"attendance_day.emp_code~" )WHERE( EXP1 =~"attendance_day.emp_code~" OP =~"=~" EXP2 =~":memp_code~" LOGIC =~"and~" ) WHERE( EXP1 =~"attendance_day.attd_date~" OP =~"=~" EXP2 =~":mattd_date~" ) ) ARG(NAME = ~"memp_code~" TYPE = string) ARG(NAME = ~"mattd_date~" TYPE = datetime) " update="attendance_day" updatewhere=0 updatekeyinplace=no arguments=(("memp_code", string),("mattd_date", datetime)) )
groupbox(band=detail text="Basic"border="2" color="0" x="6" y="6" height="153" width="504" name=gb_1 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="67108864" ) groupbox(band=detail text="Basic"border="2" color="0" x="6" y="6" height="153" width="504" name=gb_1 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="67108864" )
groupbox(band=detail text="Others"border="2" color="0" x="6" y="165" height="223" width="504" name=gb_2 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="67108864" ) groupbox(band=detail text="Others"border="2" color="0" x="6" y="165" height="223" width="504" name=gb_2 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="67108864" )
column(band=detail id=1 alignment="0" tabsequence=10 border="5" color="0" x="146" y="36" height="17" width="60" format="[general]" html.valueishtml="0" name=emp_code tag="Code of the employee." visible="1" edit.limit=10 edit.case=upper edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" ) column(band=detail id=1 alignment="0" tabsequence=10 border="5" color="0" x="146" y="36" height="17" width="60" format="[general]" html.valueishtml="0" name=emp_code tag="Code of the employee." visible="1" edit.limit=10 edit.case=upper edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
...@@ -41,7 +42,6 @@ text(band=detail alignment="1" text="Punch String :" border="0" color="0" x="40" ...@@ -41,7 +42,6 @@ text(band=detail alignment="1" text="Punch String :" border="0" color="0" x="40"
column(band=detail id=14 alignment="0" tabsequence=32766 border="5" color="0" x="147" y="191" height="46" width="272" format="[general]" html.valueishtml="0" name=punch_str visible="1" edit.limit=3000 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.autovscroll=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="79741120" ) column(band=detail id=14 alignment="0" tabsequence=32766 border="5" color="0" x="147" y="191" height="46" width="272" format="[general]" html.valueishtml="0" name=punch_str visible="1" edit.limit=3000 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.autovscroll=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="79741120" )
text(band=detail alignment="1" text="Lunch Time :" border="0" color="0" x="255" y="266" height="16" width="101" 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="255" y="266" height="16" width="101" 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" )
column(band=detail id=19 alignment="0" tabsequence=70 border="5" color="0" x="361" y="266" height="16" width="75" format="#0" html.valueishtml="0" name=lunch_time visible="1" editmask.mask="#0" 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=19 alignment="0" tabsequence=70 border="5" color="0" x="361" y="266" height="16" width="75" format="#0" html.valueishtml="0" name=lunch_time visible="1" editmask.mask="#0" 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" )
text(band=detail alignment="1" text="(minutes)" border="0" color="0" x="443" y="266" height="16" width="50" html.valueishtml="0" name=t_1 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="InTime Org :" border="0" color="0" x="40" y="289" height="16" width="101" 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="InTime Org :" border="0" color="0" x="40" y="289" height="16" width="101" 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=3 alignment="0" tabsequence=32766 border="5" color="0" x="147" y="289" height="16" width="75" format="" html.valueishtml="0" protect="0~t1" name=in_time tag="In time of the employee for the shift." 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=3 alignment="0" tabsequence=32766 border="5" color="0" x="147" y="289" height="16" width="75" format="" html.valueishtml="0" protect="0~t1" name=in_time tag="In time of the employee for the shift." 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="OutTime Org :" border="0" color="0" x="255" y="289" height="16" width="101" 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="OutTime Org :" border="0" color="0" x="255" y="289" height="16" width="101" 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" )
...@@ -69,6 +69,7 @@ text(band=detail alignment="1" text="Date :" border="0" color="0" x="39" y="61" ...@@ -69,6 +69,7 @@ text(band=detail alignment="1" text="Date :" border="0" color="0" x="39" y="61"
text(band=detail alignment="1" text="Week Day :" border="0" color="0" x="254" y="61" height="17" width="101" html.valueishtml="0" name=day_no_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="Week Day :" border="0" color="0" x="254" y="61" height="17" width="101" html.valueishtml="0" name=day_no_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=2 alignment="0" tabsequence=20 border="5" color="0" x="146" y="61" height="17" width="60" format="dd/mm/yy" html.valueishtml="0" name=attd_date tag="Date of attendance." visible="1" edit.name="datetime" editmask.mask="dd/mm/yy" 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=2 alignment="0" tabsequence=20 border="5" color="0" x="146" y="61" height="17" width="60" format="dd/mm/yy" html.valueishtml="0" name=attd_date tag="Date of attendance." visible="1" edit.name="datetime" editmask.mask="dd/mm/yy" 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=7 alignment="0" tabsequence=30 border="5" color="255" x="146" y="86" height="17" width="60" format="[general]" html.valueishtml="0" name=shift tag="The shift no. to which employee is working." visible="1" edit.limit=15 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="79741120" ) column(band=detail id=7 alignment="0" tabsequence=30 border="5" color="255" x="146" y="86" height="17" width="60" format="[general]" html.valueishtml="0" name=shift tag="The shift no. to which employee is working." visible="1" edit.limit=15 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="79741120" )
column(band=detail id=23 alignment="0" tabsequence=32766 border="0" color="0" x="441" y="361" height="16" width="25" format="[general]" html.valueishtml="0" name=prev_shift visible="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" )
htmltable(border="1" ) htmltable(border="1" )
htmlgen(clientevents="1" clientvalidation="1" clientcomputedfields="1" clientformatting="0" clientscriptable="0" generatejavascript="1" encodeselflinkargs="1" netscapelayers="0" ) htmlgen(clientevents="1" clientvalidation="1" clientcomputedfields="1" clientformatting="0" clientscriptable="0" generatejavascript="1" encodeselflinkargs="1" netscapelayers="0" )
export.xml(headgroups="1" includewhitespace="0" metadatatype=0 savemetadata=0 ) export.xml(headgroups="1" includewhitespace="0" metadatatype=0 savemetadata=0 )
......
webitm-adm/src/ibase/webitm/ejb/adm/AttdDailyPos.java
View file @ daaade20
...@@ -89,6 +89,9 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att ...@@ -89,6 +89,9 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att
boolean isReproc = false; boolean isReproc = false;
String shiftStr = ""; String shiftStr = "";
String shift = ""; String shift = "";
//Modified by Azhar K. on[10-10-2019][To compare shift with prev shift for reprocess][Start]
String prevShiftStr = "";
//Modified by Azhar K. on[10-10-2019][To compare shift with prev shift for reprocess][End]
//Modified by Rohini Telang on 12/feb/2019[Req ID: A17DSUN001][END] //Modified by Rohini Telang on 12/feb/2019[Req ID: A17DSUN001][END]
int cnt = 0; int cnt = 0;
...@@ -118,6 +121,9 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att ...@@ -118,6 +121,9 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att
punchStr = checkNullAndTrim(genericUtility.getColumnValue("punch_str",headerDom)); punchStr = checkNullAndTrim(genericUtility.getColumnValue("punch_str",headerDom));
//Modified by Rohini T on [20/05/19][start] //Modified by Rohini T on [20/05/19][start]
shiftStr = checkNullAndTrim(genericUtility.getColumnValue("shift",headerDom)); shiftStr = checkNullAndTrim(genericUtility.getColumnValue("shift",headerDom));
//Modified by Azhar K. on[10-10-2019][To compare shift with prev shift for reprocess][Start]
prevShiftStr = checkNullAndTrim(genericUtility.getColumnValue("prev_shift",headerDom));
//Modified by Azhar K. on[10-10-2019][To compare shift with prev shift for reprocess][End]
//Modified by Anjali R. on [04/07/2019][Start] //Modified by Anjali R. on [04/07/2019][Start]
//Modified by sarita on [18/09/2019][START] //Modified by sarita on [18/09/2019][START]
//attdDateStr = genericUtility.getValidDateString(attdDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()); //attdDateStr = genericUtility.getValidDateString(attdDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
...@@ -187,7 +193,8 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att ...@@ -187,7 +193,8 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att
/*attdDateStr = genericUtility.getValidDateString(attdDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()); /*attdDateStr = genericUtility.getValidDateString(attdDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
attdDate = java.sql.Timestamp.valueOf(attdDateStr + " 00:00:00");*/ attdDate = java.sql.Timestamp.valueOf(attdDateStr + " 00:00:00");*/
//Modified by Anjali R. on [04/07/2019][End] //Modified by Anjali R. on [04/07/2019][End]
sql = "SELECT SHIFT FROM ATTENDANCE_DAY WHERE EMP_CODE = ? AND ATTD_DATE = ?"; //Commented by Azhar K. on[10-10-2019][To compare shift with prev shift for reprocess][Start]
/*sql = "SELECT SHIFT FROM ATTENDANCE_DAY WHERE EMP_CODE = ? AND ATTD_DATE = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,empCode); pstmt.setString(1,empCode);
pstmt.setTimestamp(2,attdDate); pstmt.setTimestamp(2,attdDate);
...@@ -206,11 +213,15 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att ...@@ -206,11 +213,15 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att
{ {
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }*/
if(!(shiftStr.equalsIgnoreCase(shift)) ) //Commented by Azhar K. on[10-10-2019][To compare shift with prev shift for reprocess][End]
//Modified by Azhar K. on[10-10-2019][To compare shift with prev shift for reprocess][Start]
//if(!(shiftStr.equalsIgnoreCase(shift)) )
if(!(prevShiftStr.equalsIgnoreCase(shiftStr)) )
//Modified by Azhar K. on[10-10-2019][To compare shift with prev shift for reprocess][End]
{ {
//System.out.println("=======================================Shift Case================="); //System.out.println("=======================================Shift Case=================");
toUpdate = false; //toUpdate = false; Commented by Azhar K. on[10-10-2019][To compare shift with prev shift for reprocess]
isReproc = true; isReproc = true;
} }
} }
......
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