Skip to content

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

* updated srd, xml and src file 

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


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@214167 ce508802-f39f-4f6c-b175-0d175dae99d5
parent bad090a6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 70 deletions
webitm-adm/module-resource/metadata/workshft11.xml
View file @ dfcac903
......@@ -295,7 +295,7 @@
<x>379</x>
<y>3</y>
<height>16</height>
<width>64</width>
<width>63</width>
<html>
<valueishtml>0</valueishtml>
</html>
......@@ -320,10 +320,10 @@
<text>Out Time</text>
<border>6</border>
<color>0</color>
<x>445</x>
<x>444</x>
<y>3</y>
<height>16</height>
<width>65</width>
<width>64</width>
<html>
<valueishtml>0</valueishtml>
</html>
......@@ -348,7 +348,7 @@
<text>Change Date</text>
<border>6</border>
<color>0</color>
<x>1510</x>
<x>1508</x>
<y>3</y>
<height>16</height>
<width>75</width>
......@@ -376,7 +376,7 @@
<text>Change User</text>
<border>6</border>
<color>0</color>
<x>1433</x>
<x>1431</x>
<y>3</y>
<height>16</height>
<width>75</width>
......@@ -404,7 +404,7 @@
<text>Change Term</text>
<border>6</border>
<color>0</color>
<x>1356</x>
<x>1354</x>
<y>3</y>
<height>16</height>
<width>75</width>
......@@ -432,7 +432,7 @@
<text>Site</text>
<border>6</border>
<color>0</color>
<x>604</x>
<x>602</x>
<y>3</y>
<height>16</height>
<width>75</width>
......@@ -460,7 +460,7 @@
<text>Status</text>
<border>6</border>
<color>0</color>
<x>681</x>
<x>679</x>
<y>3</y>
<height>16</height>
<width>85</width>
......@@ -488,7 +488,7 @@
<text>Lunch Time (min.)</text>
<border>6</border>
<color>33554432</color>
<x>768</x>
<x>766</x>
<y>3</y>
<height>16</height>
<width>96</width>
......@@ -516,7 +516,7 @@
<text>Work Type</text>
<border>6</border>
<color>0</color>
<x>866</x>
<x>864</x>
<y>3</y>
<height>16</height>
<width>64</width>
......@@ -544,7 +544,7 @@
<text>Rot.Type</text>
<border>6</border>
<color>33554432</color>
<x>932</x>
<x>930</x>
<y>3</y>
<height>16</height>
<width>62</width>
......@@ -572,7 +572,7 @@
<text>Half Day In Time</text>
<border>6</border>
<color>33554432</color>
<x>512</x>
<x>510</x>
<y>3</y>
<height>16</height>
<width>90</width>
......@@ -600,7 +600,7 @@
<text>Grace Time</text>
<border>0</border>
<color>33554432</color>
<x>996</x>
<x>994</x>
<y>3</y>
<height>16</height>
<width>84</width>
......@@ -628,7 +628,7 @@
<text>Hd Hrs</text>
<border>0</border>
<color>33554432</color>
<x>1082</x>
<x>1080</x>
<y>3</y>
<height>16</height>
<width>47</width>
......@@ -656,7 +656,7 @@
<text>Fd Hrs</text>
<border>0</border>
<color>33554432</color>
<x>1131</x>
<x>1129</x>
<y>3</y>
<height>16</height>
<width>61</width>
......@@ -684,7 +684,7 @@
<text>Next Shift</text>
<border>0</border>
<color>33554432</color>
<x>1194</x>
<x>1192</x>
<y>3</y>
<height>16</height>
<width>67</width>
......@@ -712,7 +712,7 @@
<text>Grace No Time</text>
<border>0</border>
<color>33554432</color>
<x>1263</x>
<x>1261</x>
<y>3</y>
<height>16</height>
<width>91</width>
......@@ -852,7 +852,7 @@
<tabsequence>40</tabsequence>
<border>5</border>
<color>0</color>
<x>380</x>
<x>379</x>
<y>1</y>
<height>18</height>
<width>63</width>
......@@ -887,7 +887,7 @@
<tabsequence>50</tabsequence>
<border>5</border>
<color>0</color>
<x>446</x>
<x>444</x>
<y>1</y>
<height>18</height>
<width>64</width>
......@@ -922,7 +922,7 @@
<tabsequence>32766</tabsequence>
<border>5</border>
<color>0</color>
<x>1510</x>
<x>1508</x>
<y>1</y>
<height>18</height>
<width>75</width>
......@@ -958,7 +958,7 @@
<tabsequence>32766</tabsequence>
<border>5</border>
<color>0</color>
<x>1433</x>
<x>1431</x>
<y>1</y>
<height>18</height>
<width>75</width>
......@@ -994,7 +994,7 @@
<tabsequence>32766</tabsequence>
<border>5</border>
<color>0</color>
<x>1356</x>
<x>1354</x>
<y>1</y>
<height>18</height>
<width>75</width>
......@@ -1030,7 +1030,7 @@
<tabsequence>70</tabsequence>
<border>5</border>
<color>0</color>
<x>604</x>
<x>602</x>
<y>1</y>
<height>18</height>
<width>75</width>
......@@ -1066,7 +1066,7 @@
<tabsequence>80</tabsequence>
<border>5</border>
<color>0</color>
<x>681</x>
<x>679</x>
<y>1</y>
<height>16</height>
<width>85</width>
......@@ -1103,7 +1103,7 @@
<tabsequence>90</tabsequence>
<border>5</border>
<color>0</color>
<x>768</x>
<x>766</x>
<y>1</y>
<height>16</height>
<width>96</width>
......@@ -1142,7 +1142,7 @@
<tabsequence>100</tabsequence>
<border>5</border>
<color>0</color>
<x>866</x>
<x>864</x>
<y>1</y>
<height>16</height>
<width>64</width>
......@@ -1178,7 +1178,7 @@
<tabsequence>110</tabsequence>
<border>5</border>
<color>0</color>
<x>932</x>
<x>930</x>
<y>1</y>
<height>16</height>
<width>62</width>
......@@ -1215,7 +1215,7 @@
<tabsequence>60</tabsequence>
<border>5</border>
<color>0</color>
<x>512</x>
<x>510</x>
<y>1</y>
<height>16</height>
<width>90</width>
......@@ -1226,7 +1226,7 @@
<name>hd_in_time</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>8</limit>
<limit>5</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>no</autoselect>
......@@ -1252,7 +1252,7 @@
<tabsequence>120</tabsequence>
<border>0</border>
<color>0</color>
<x>996</x>
<x>994</x>
<y>1</y>
<height>16</height>
<width>84</width>
......@@ -1288,7 +1288,7 @@
<tabsequence>130</tabsequence>
<border>0</border>
<color>0</color>
<x>1082</x>
<x>1080</x>
<y>1</y>
<height>16</height>
<width>47</width>
......@@ -1324,7 +1324,7 @@
<tabsequence>140</tabsequence>
<border>0</border>
<color>0</color>
<x>1131</x>
<x>1129</x>
<y>1</y>
<height>16</height>
<width>61</width>
......@@ -1360,7 +1360,7 @@
<tabsequence>150</tabsequence>
<border>0</border>
<color>0</color>
<x>1194</x>
<x>1192</x>
<y>1</y>
<height>16</height>
<width>67</width>
......@@ -1396,7 +1396,7 @@
<tabsequence>160</tabsequence>
<border>0</border>
<color>0</color>
<x>1263</x>
<x>1261</x>
<y>1</y>
<height>16</height>
<width>91</width>
......
webitm-adm/module-resource/metadata/workshft21.xml
View file @ dfcac903
......@@ -812,7 +812,7 @@
<name>hd_in_time</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>8</limit>
<limit>5</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>no</autoselect>
......
webitm-adm/module-resource/srd/d_wrkshift_edit.srd
View file @ dfcac903
......@@ -44,7 +44,7 @@ text(band=detail alignment="1" text="Next Shift :" border="0" color="0" x="260"
column(band=detail id=13 alignment="0" tabsequence=70 border="5" color="0" x="368" y="103" height="16" width="50" format="[general]" html.valueishtml="0" name=next_shift visible="1" edit.limit=5 edit.case=upper edit.focusrectangle=no edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=7 alignment="1" tabsequence=90 border="5" color="0" x="358" y="131" height="16" width="60" format="0.00" html.valueishtml="0" name=hd_hrs visible="1" edit.limit=12 edit.case=any edit.format="#0.00" edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
text(band=detail alignment="1" text="Half Day Hours :" border="0" color="0" x="262" y="131" height="16" width="92" html.valueishtml="0" name=hd_hrs_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
column(band=detail id=12 alignment="0" tabsequence=80 border="5" color="0" x="164" y="131" height="16" width="50" format="[general]" html.valueishtml="0" name=hd_in_time visible="1" edit.limit=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=12 alignment="0" tabsequence=80 border="5" color="0" x="164" y="131" height="16" width="50" format="[general]" html.valueishtml="0" name=hd_in_time visible="1" edit.limit=5 edit.case=any edit.focusrectangle=no edit.autoselect=no edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
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" )
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" )
......
webitm-adm/src/ibase/webitm/ejb/adm/WorkShiftIC.java
View file @ dfcac903
......@@ -537,7 +537,7 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "site_code");
valueXmlString.append("<site_code ><![CDATA[").append(siteCode).append("]]></site_code>\r\n");
valueXmlString.append("<hd_in_time ><![CDATA[").append("00: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("<out_time ><![CDATA[").append("00:00").append("]]></out_time>\r\n");
valueXmlString.append("<grace_time ><![CDATA[").append("0").append("]]></grace_time>\r\n");
......@@ -602,7 +602,7 @@ public class WorkShiftIC extends ValidatorEJB implements WorkShiftLocal, WorkShi
if(hdInTime == null || hdInTime.trim().length() == 0)
{
valueXmlString.append("<hd_in_time ><![CDATA[").append("00:00:00").append("]]></hd_in_time>\r\n");
valueXmlString.append("<hd_in_time ><![CDATA[").append("00:00").append("]]></hd_in_time>\r\n");
}
}
else if("in_time".equalsIgnoreCase(currentColumn))
......
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