Merge branch 'master' of https://mygit.myhr.co.th/Thitichaipun.w/DHAS

XML/DBXML/RECRUIT/MINTERVIEW_INFORMALHELP.xml

@@ -7,6 +7,7 @@
 		<FIELD>phone</FIELD>
 		<FIELD>email</FIELD>
 		<FIELD>remark</FIELD>
+		<FIELD>interviewdate</FIELD>
 		<ORDER>
 			<FIELD>requestid</FIELD>
 		</ORDER>

XML/DBXML/RECRUIT/REC902.xml

@@ -7,6 +7,7 @@
 		<FIELD>phone</FIELD>
 		<FIELD>email</FIELD>
 		<FIELD>remark</FIELD>
+		<FIELD>interviewdate</FIELD>
 		<ORDER>
 			<FIELD>requestid</FIELD>
 		</ORDER>

XML/HELPXML/RECRUIT/MINTERVIEW_INFORMALHELP.xml

@@ -3,6 +3,7 @@
 	<SHOWN>
 		<COL>minterview_informal.requestid</COL>
 		<COL>minterview_informal.fullname</COL>
+		<COL>minterview_informal.interviewdate</COL>
 	</SHOWN>
 	<ORDER>
 		<COL>minterview_informal.requestid</COL>

XML/PROTABLEXML/MINTERVIEW_INFORMAL.xml

@@ -9,7 +9,7 @@
 			<COMPONENT type="Text">
 				<READONLY>TRUE</READONLY>
 				<MAXSIZE>15</MAXSIZE>
-				<SIZE>15</SIZE>
+				<SIZE>10</SIZE>
 				<ALT_ENG>Request ID</ALT_ENG>
 				<ALT_THAI>รหัสนัดสัมภาษณ์</ALT_THAI>
 			</COMPONENT>
@@ -89,6 +89,22 @@
 				<ALT_THAI>หมายเหตุ</ALT_THAI>
 			</COMPONENT>
         </REMARK>
+		<INTERVIEWDATE lang="A" encrypt="false" log="false" type="Date">
+            <WIDTH>23</WIDTH>
+            <DESC_ENG>Interview Date</DESC_ENG>
+            <DESC_THAI>วันที่นัดสัมภาษณ์</DESC_THAI>
+            <COMPONENT type="text">
+                <MAXSIZE>10</MAXSIZE>
+                <SIZE>10</SIZE>
+                <ALT_ENG>Interview Date</ALT_ENG>
+                <ALT_THAI>วันที่นัดสัมภาษณ์</ALT_THAI>
+                <ONFOCUS>this.select();</ONFOCUS>
+                <ONKEYUP>formatDate(this);</ONKEYUP>
+                <ONBLUR>chkInputDate(this);</ONBLUR>
+                <ONKEYPRESS>chkInteger();</ONKEYPRESS>
+            </COMPONENT>
+			<REQUIRE>true</REQUIRE>
+        </INTERVIEWDATE>
 	</FIELD>
 	<RELATION>
 	</RELATION>

hrAppWeb.war/RECRUIT/REC902.jsp

@@ -74,6 +74,14 @@
             </div>
             <div class="row">
                 <div class="col-xs-4 label-col-csc text-right">
+                    <%=screen.getLabel("interviewdate")%>
+                </div>
+                <div class="col-xs-8">
+                    <%=screen.getInput("interviewdate")%>&nbsp;<a href="javascript:;" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('interviewdate','','../IMAGES/BUTTON/SWAP/CALENDAR_SWAP20.gif',1)" onClick="viewCal('__interviewdate');"><img src="../IMAGES/BUTTON/MAIN/CALENDAR20.gif" alt="Calendar" name="interviewdate" width="20" height="20" border="0" align="absmiddle"></a>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-xs-4 label-col-csc text-right">
                     <%=screen.getLabel("prefix")%>
                 </div>
                 <div class="col-xs-8">