From 92c8cd5fbd90f03bfc2fc4d543dc2d5cbc2cafc7 Mon Sep 17 00:00:00 2001
From: Ratchanok <saopoy@gmail.com>
Date: Tue, 8 Dec 2020 00:43:35 +0700
Subject: [PATCH] [9997,9655] OI ทะเบียนลักษณะงาน - AutoNumber, Workcost, Text

---
 XML/DBXML/COMPANY/CI_01_14.xml            |   2 ++
 XML/PROTABLEXML/MJOBCODE.xml              |  35 ++++++++++++++++++++++++++++++++++-
 hrAppWeb.war/COMPANY/CI_01_14_GPF.jsp     | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------
 hrAppWeb.war/COMPANY/CI_01_GPF.jsp        |  16 ++++++++++++----
 hrAppWeb.war/XML/ENG_COMPANY_SWAPLANG.xml |  14 ++++++++++++++
 hrAppWeb.war/XML/THA_COMPANY_SWAPLANG.xml |  14 ++++++++++++++
 6 files changed, 157 insertions(+), 47 deletions(-)

diff --git a/XML/DBXML/COMPANY/CI_01_14.xml b/XML/DBXML/COMPANY/CI_01_14.xml
index 02cae1e..6888938 100644
--- a/XML/DBXML/COMPANY/CI_01_14.xml
+++ b/XML/DBXML/COMPANY/CI_01_14.xml
@@ -58,6 +58,8 @@
 		<FIELD>EQUALIFICATION</FIELD>
 		<FIELD>INTERVIEW</FIELD>
 		<FIELD>EMP_TYPE</FIELD>
+		<FIELD>WORKCOST1</FIELD>
+		<FIELD>WORKCOST2</FIELD>
 		<ORDER>
 			<FIELD>JOBCODEID</FIELD>
 			<FIELD>COMPANYID</FIELD>
diff --git a/XML/PROTABLEXML/MJOBCODE.xml b/XML/PROTABLEXML/MJOBCODE.xml
index fa89e63..3f301a5 100644
--- a/XML/PROTABLEXML/MJOBCODE.xml
+++ b/XML/PROTABLEXML/MJOBCODE.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MJOBCODE desc_thai="ทะเบียนลักษณะงาน" desc_eng="Master Job Code" editcheck="true" mainhelp="MJOBCODEHELP" referhelp="MJOBCODEHELP" mainkey="JOBCODEID" fieldsystem="*" protype="table" deleteflag="true" dependlevel="true">
 	<FIELD>
-		<JOBCODEID lang="A" encrypt="false" log="false" type="String">
+		<JOBCODEID lang="A" encrypt="false" log="false" type="AutoNumber" table="MJOBCODE" format="JD000000" init="000001">
 			<KEY>2</KEY>
 			<WIDTH>15</WIDTH>
 			<DESC_ENG>Job Code ID</DESC_ENG>
 			<DESC_THAI>รหัสลักษณะงาน</DESC_THAI>
 			<COMPONENT type="text">
+				<READONLY>TRUE</READONLY>
 				<MAXSIZE>15</MAXSIZE>
 				<SIZE>15</SIZE>
 				<!--
@@ -1109,6 +1110,38 @@ REFER_LANG>ERESPONSIBILITY</REFER_LANG
 				<TABLE>MEMPLOYMENT_TYPEHELP,codeid,EDESC, ,codeid</TABLE>
 			</COMPONENT>
 		</EMP_TYPE>
+		<WORKCOST1 lang="A" encrypt="false" log="false" type="Double">
+            <WIDTH>25</WIDTH>
+            <DESC_ENG>Basic Knowledge</DESC_ENG>
+            <DESC_THAI>คุณวุติ/ความรู้พื้นฐาน</DESC_THAI>
+            <COMPONENT type="text">
+                <VALUE>0.00</VALUE>
+                <MAXSIZE>25</MAXSIZE>
+                <SIZE>5</SIZE>
+                <ALT_ENG>Basic Knowledge</ALT_ENG>
+                <ALT_THAI>คุณวุติ/ความรู้พื้นฐาน</ALT_THAI>
+                <ONBLUR>checkNumFloat(this,0.0,900000000);</ONBLUR>
+                <ONKEYPRESS>checkWordNumber(this.value);</ONKEYPRESS>
+                <ONKEYUP>checkComma(this,2);</ONKEYUP>
+                <ONFOCUS>callDelComma(this);</ONFOCUS>
+            </COMPONENT>
+        </WORKCOST1>
+		<WORKCOST2 lang="A" encrypt="false" log="false" type="Double">
+            <WIDTH>25</WIDTH>
+            <DESC_ENG>Operational Capability</DESC_ENG>
+            <DESC_THAI>ความสามารถทางการบริหาร/ปฏิบัติงาน</DESC_THAI>
+            <COMPONENT type="text">
+                <VALUE>0.00</VALUE>
+                <MAXSIZE>25</MAXSIZE>
+                <SIZE>5</SIZE>
+                <ALT_ENG>Operational Capability</ALT_ENG>
+                <ALT_THAI>ความสามารถทางการบริหาร/ปฏิบัติงาน</ALT_THAI>
+                <ONBLUR>checkNumFloat(this,0.0,900000000);</ONBLUR>
+                <ONKEYPRESS>checkWordNumber(this.value);</ONKEYPRESS>
+                <ONKEYUP>checkComma(this,2);</ONKEYUP>
+                <ONFOCUS>callDelComma(this);</ONFOCUS>
+            </COMPONENT>
+        </WORKCOST2>
 	</FIELD>
 	<RELATION>
 
diff --git a/hrAppWeb.war/COMPANY/CI_01_14_GPF.jsp b/hrAppWeb.war/COMPANY/CI_01_14_GPF.jsp
index d31deb6..6e3ac8d 100644
--- a/hrAppWeb.war/COMPANY/CI_01_14_GPF.jsp
+++ b/hrAppWeb.war/COMPANY/CI_01_14_GPF.jsp
@@ -14,9 +14,11 @@
 				screen.getRecord("MJOBCODE").set("jobcodeid",chk.chkNullString(request.getParameter("__jobcodeid")));
 				screen.getRecord("MJOBCODE").search();
 		}
+
+		String lang = chk.chkNullString(screen.getUProfile().get("lang"));
 %>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
+<html ng-app="myHR">
 <head>
 <title></title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -27,6 +29,8 @@
 <script type='text/javascript' src="../JS/bootstrap.js"></script>
 <script type='text/javascript' src='../JS/SCREEN.js'></script>
 <script type='text/javascript' src='../JS/ICONSMENU.js'></script>
+<script src="../JS/angular-1.3.15/angular.js" type="text/javascript"></script>
+<script src="../JS/ANGULAR/SCREEN_ANGULAR.js" type="text/javascript"></script> 
 <script language='javascript'>setLang('<%=screen.getUProfile().get("lang")%>');</script>
 <script language="JavaScript" >
 <!--
@@ -169,9 +173,28 @@ function goHelp(helpName,inputName){
 		*/
 	     linkHelp_Return(helpName,helpReturn);
 }
+
+function sumWorkcost(){
+	with(document.cscform){
+		var sum_workcost = document.getElementById("__sum_workcost");
+		__sum_workcost.value = parseFloat(delComma2(__workcost1.value)) + parseFloat(delComma2(__workcost2.value));
+		checkNumFloat(sum_workcost,0.0,900000000);
+	}
+}
+
+function delComma2(str) {
+	if (typeof str !== 'undefined'){
+		if(str.indexOf(",") > -1){
+			return str.replace(/,/g, '');
+		}else{
+			return str;
+		}
+	}
+}
+
 </script>
 </head>
-<body leftmargin="0" topmargin="0"  onLoad="MM_preloadImages('../IMAGES/BUTTON/SWAP/SEARCH_SWAP24.gif','../IMAGES/BUTTON/SWAP/EXIT_SWAP24.gif','../IMAGES/BUTTON/SWAP/HELP_SWAP24.gif','../IMAGES/BUTTON/SWAP/NEW_SWAP24.gif','../IMAGES/BUTTON/SWAP/EDIT_SWAP24.gif','../IMAGES/BUTTON/SWAP/DEL_SWAP24.gif','../IMAGES/BUTTON/SWAP/PROCESS_SWAP24.gif','TEMP/IMAGES/BUTTON/SWAP/HELP_SWAP20.gif')">
+<body leftmargin="0" topmargin="0"  onLoad="MM_preloadImages('../IMAGES/BUTTON/SWAP/SEARCH_SWAP24.gif','../IMAGES/BUTTON/SWAP/EXIT_SWAP24.gif','../IMAGES/BUTTON/SWAP/HELP_SWAP24.gif','../IMAGES/BUTTON/SWAP/NEW_SWAP24.gif','../IMAGES/BUTTON/SWAP/EDIT_SWAP24.gif','../IMAGES/BUTTON/SWAP/DEL_SWAP24.gif','../IMAGES/BUTTON/SWAP/PROCESS_SWAP24.gif','TEMP/IMAGES/BUTTON/SWAP/HELP_SWAP20.gif');sumWorkcost();">
 <div id="toolTipLayer" style="position:absolute; visibility: hidden"></div>
 <script language="javascript">initToolTips();</script>
 <form name="cscform" method="post" action="CI_01_14_GPF.jsp">
@@ -198,7 +221,7 @@ function goHelp(helpName,inputName){
   <div align="center">
     <table align="center"  cellpadding="0"  cellspacing="0">
       <tr >
-        <td  class="header">CI_01_14_GPF, <script language="javascript">swapLang("Job Description");</script></td>
+        <td  class="header">CI_01_14_GPF, <span swlang code="SW000134">Job Description</span></td>
       </tr>
       <tr >
         <td  colspan="2"><div align="center"><br>
@@ -206,15 +229,22 @@ function goHelp(helpName,inputName){
               <%screen.referLangOn();%>
               <tr>
                 <td width="130" class="columnlabel"><%=screen.getLabel("jobcode_position")%>&nbsp;</td>
-                <td width="500"><font class="normal"> <%=screen.getInput("jobcode_position")%>
+                <td width="200"><font class="normal"> <%=screen.getInput("jobcode_position")%>
                   <input name="MPOSITION@EDESC" type="text" disabled="true" size="30" value="<%=screen.getDataLabel("MPOSITION","TDESC")%>">
-                  </font></td>
+                  </font>
+				</td>
+				<td colspan="2" width="250" class="columnlabel" align="rigth"><b>
+					<%=(lang.equals("eng"))?"Job/Position Assessment":"ผลประเมินค่างาน/ค่าตำแหน่ง"%>&nbsp;</b></font></td>
               </tr>
               <tr>
-                <td  class="columnlabel"><script language="javascript">swapLang('Jobgrade ID');</script><!-- <%=screen.getLabel("jobgradeid")%> -->&nbsp;</td>
+                <td  class="columnlabel"><label><span swlang code="SW001773">Jobgrade ID</span></label><!-- <%=screen.getLabel("jobgradeid")%> -->&nbsp;</td>
                 <td><font class="normal"> <%=screen.getInput("jobgradeid")%>
                   <input name="MJOBGRADE0@EDESC" type="text" disabled="true" size="30" value="<%=screen.getDataLabel("MJOBGRADE0","TDESC")%>">
                   </font></td>
+				<td class="columnlabel"><%=screen.getLabel("workcost1")%>&nbsp;</font></td>
+				<td><font class="normal"><%//=screen.getInput("workcost1")%>
+					<input type="text" name="__workcost1" size="5" maxlength="25" value="<%=chk.chkNullString(screen.getDataLabel("workcost1"),request.getParameter("__workcost1"))%>" class="numeric" onkeypress="checkWordNumber(this.value,event);" onkeyup="sysIsEdit();checkComma(this,2);" onblur="checkNumFloat(this,0.0,900000000);sumWorkcost();" onfocus="callDelComma(this);" alt="คุณวุติ/ความรู้พื้นฐาน" onmousemver="toolTip('คุณวุติ/ความรู้พื้นฐาน')" onmouseout="toolTip()">
+				</font></td>
               </tr >
 			  <!-- <tr>
                 <td  class="columnlabel"><%//=screen.getLabel("corperateid")%>&nbsp;</td>
@@ -227,47 +257,56 @@ function goHelp(helpName,inputName){
                 <td><font class="normal"> <%=screen.getInput("BONUSID")%>
                       <input name="MBONUS@EDESC" type="text" disabled="true" size="30" value="<%=screen.getDataLabel("MBONUS","TDESC")%>">
                 </font></td>
+				<td class="columnlabel"><%=screen.getLabel("workcost2")%>&nbsp;</font></td>
+				<td><font class="normal"><%//=screen.getInput("workcost2")%>
+					<input type="text" name="__workcost2" size="5" maxlength="25" value="<%=chk.chkNullString(screen.getDataLabel("workcost2"),request.getParameter("__workcost2"))%>" class="numeric" onkeypress="checkWordNumber(this.value,event);" onkeyup="sysIsEdit();checkComma(this,2);" onblur="checkNumFloat(this,0.0,900000000);sumWorkcost();" onfocus="callDelComma(this);" alt="ความสามารถทางการบริหาร/ปฏิบัติงาน" onmousemver="toolTip('ความสามารถทางการบริหาร/ปฏิบัติงาน')" onmouseout="toolTip()">
+				</font></td>
               </tr>
               <tr>
                 <td  class="columnlabel"><%=screen.getLabel("BU1")%>&nbsp;</td>
                 <td><font class="normal"> <%=screen.getInput("BU1")%>
                   <input name="MBU1@EDESC" type="text" disabled="true" size="30" value="<%=screen.getDataLabel("MBU1","TDESC")%>">
                   </font></td>
+				<td width="200" class="columnlabel"><b>
+					<%=(lang.equals("eng"))?"Job/Position Assessment Sum":"รวมผลประเมินค่างาน/ค่าตำแหน่ง"%>&nbsp;</b></font></td>
+				<td width="50"><font class="normal">
+					<input type="text" id="__sum_workcost" name="__sum_workcost" size="5" maxlength="25" value="0.00" class="numeric" onkeypress="checkWordNumber(this.value,event);" onkeyup="sysIsEdit();checkComma(this,2);" onblur="checkNumFloat(this,0.0,900000000);" onfocus="callDelComma(this);" onmouseout="toolTip()" disabled="true">
+				</font></td>
               </tr>
               <tr>
                 <td  class="columnlabel"><%=screen.getLabel("BU2")%>&nbsp;</td>
-                <td><font class="normal"> <%=screen.getInput("BU2")%>
+                <td colspan="3"><font class="normal"> <%=screen.getInput("BU2")%>
                   <input name="MBU2@EDESC" type="text" disabled="true" size="30" value="<%=screen.getDataLabel("MBU2","TDESC")%>">
                   </font></td>
               </tr>
               <tr>
                 <td  class="columnlabel"><%=screen.getLabel("BU3")%>&nbsp;</td>
-                <td><font class="normal"> <%=screen.getInput("BU3")%>
+                <td colspan="3"><font class="normal"> <%=screen.getInput("BU3")%>
                   <input name="MBU3@EDESC" type="text" disabled="true" size="30" value="<%=screen.getDataLabel("MBU3","TDESC")%>">
                   </font></td>
               </tr>
               <tr>
                 <td  class="columnlabel"><%=screen.getLabel("BU4")%>&nbsp;</td>
-                <td><font class="normal"> <%=screen.getInput("BU4")%>
+                <td colspan="3"><font class="normal"> <%=screen.getInput("BU4")%>
                   <input name="MBU4@EDESC" type="text" disabled="true" size="30" value="<%=screen.getDataLabel("MBU4","TDESC")%>">
                   </font></td>
               </tr>
               <%screen.referLangOff();%>
               <tr>
                 <td  class="columnlabel"><%=screen.getLabel("BU5")%>&nbsp;</td>
-                <td><font class="normal"> <%=screen.getInput("BU5")%>
+                <td colspan="3"><font class="normal"> <%=screen.getInput("BU5")%>
                       <input name="MBU5@EDESC" type="text" disabled="true" size="30" value="<%=screen.getDataLabel("MBU5","TDESC")%>">
                 </font></td>
               </tr>
               <tr>
                 <td  class="columnlabel"><%=screen.getLabel("BRANCHID")%>&nbsp;</td>
-                <td><font class="normal"> <%=screen.getInput("BRANCHID")%>
+                <td colspan="3"><font class="normal"> <%=screen.getInput("BRANCHID")%>
                       <input name="MBRANCH@EDESC" type="text" disabled="true" size="30" value="<%=screen.getDataLabel("MBRANCH","TDESC")%>">
                 </font></td>
               </tr>
               <tr>
                 <td  class="columnlabel"><%=screen.getLabel("COMPANYID")%>&nbsp;</td>
-                <td><font class="normal"> <%=screen.getInput("COMPANYID")%>
+                <td colspan="3"><font class="normal"> <%=screen.getInput("COMPANYID")%>
                       <input name="MCOMPANY@ENAME" type="text" disabled="true" size="30" value="<%=screen.getDataLabel("MCOMPANY","TNAME")%>">
                 </font></td>
               </tr>
@@ -278,51 +317,51 @@ function goHelp(helpName,inputName){
                 </font></td>
               </tr> -->
 			  <tr>
-                <td  class="columnlabel"><script language="JavaScript">swapLang('Jobcode level')</script>&nbsp;</td>
-                <td><font class="normal"> <%=screen.getInput("JOBCODE_LEVEL")%>
+                <td  class="columnlabel"><label><span swlang code="SW001750">Jobcode level</span></label>&nbsp;</td>
+                <td colspan="3"><font class="normal"> <%=screen.getInput("JOBCODE_LEVEL")%>
                       <input name="MJOBCODE_LEVEL@EDESC" type="text" disabled="true" size="30" value="<%=screen.getDataLabel("MJOBCODE_LEVEL","TDESC")%>">
                 </font></td>
               </tr>
 
               <tr>
                 <td  class="columnlabel"><%=screen.getLabel("RESPONSIBILITY")%>&nbsp;</td>
-                <td><font class="normal"> <%=screen.getInput("RESPONSIBILITY")%></font></td>
+                <td colspan="3"><font class="normal"> <%=screen.getInput("RESPONSIBILITY")%></font></td>
               </tr>
               <tr>
                 <td  class="columnlabel"><%=screen.getLabel("ERESPONSIBILITY")%>&nbsp;</td>
-                <td><font class="normal"> <%=screen.getInput("ERESPONSIBILITY")%></font></td>
+                <td colspan="3"><font class="normal"> <%=screen.getInput("ERESPONSIBILITY")%></font></td>
               </tr>
 
               <tr>
                 <td class="columnlabel"><%=screen.getLabel("JOB_DUTIES")%>&nbsp;</td>
-                <td><font class="normal"><%=screen.getInput("JOB_DUTIES")%></font></td>
+                <td colspan="3"><font class="normal"><%=screen.getInput("JOB_DUTIES")%></font></td>
               </tr>
               <tr>
-					  <td class='columnlabel'><%=screen.getLabel("QUALIFICATION")%>&nbsp;</td>
-					  <td><font class='normal'><%=screen.getInput("QUALIFICATION")%></font></td>
+				<td class='columnlabel'><%=screen.getLabel("QUALIFICATION")%>&nbsp;</td>
+				<td colspan="3"><font class='normal'><%=screen.getInput("QUALIFICATION")%></font></td>
           </tr>
           <tr>
             <td class='columnlabel'><%=screen.getLabel("EQUALIFICATION")%>&nbsp;</td>
-            <td><font class='normal'><%=screen.getInput("EQUALIFICATION")%></font></td>
+            <td colspan="3"><font class='normal'><%=screen.getInput("EQUALIFICATION")%></font></td>
           </tr>
               <tr>
                 <td class='columnlabel'><%=screen.getLabel("EMP_TYPE")%>&nbsp;</td>
-                <td><font class='normal'><%=screen.getInput("EMP_TYPE")%></font></td>
+                <td colspan="3"><font class='normal'><%=screen.getInput("EMP_TYPE")%></font></td>
               </tr>
 
               <tr>
                 <td  class="columnlabel"><%=screen.getLabel("SEX")%>&nbsp;</td>
-                <td><font class="normal"><%=screen.getInput("SEX")%></font> </td>
+                <td colspan="3"><font class="normal"><%=screen.getInput("SEX")%></font> </td>
               </tr>
               <tr>
-                <td  class="columnlabel"><script language="javascript">swapLang('Between Age'); </script></td>
-                <td><%=screen.getInput("age0")%> - <%=screen.getInput("age1")%>&nbsp;<script language="javascript">swapLang('Year'); </script>  </td>
+                <td  class="columnlabel"><label><span swlang code="SW000716">Between Age</span></label></td>
+                <td colspan="3"><%=screen.getInput("age0")%> - <%=screen.getInput("age1")%>&nbsp;<span swlang code="SW000717">year</span></td>
               </tr>
 
               <%screen.referLangOn();%>
               <tr>
                 <td><div align="right"><b>
-                    <script language="JavaScript">swapLang('Education')</script>
+                    <span swlang code="SW000619">Education</span>
                     :</b></div></td>
               </tr>
               <tr>
@@ -338,53 +377,53 @@ function goHelp(helpName,inputName){
               <%screen.referLangOff();%>
               <tr>
                 <td><div align="right"><b>
-                    <script language="JavaScript">swapLang('Experience')</script>
+                    <span swlang code="SW002112">Experience</span>
                     :</b></div></td>
               </tr>
               <tr>
                 <td  class="columnlabel"><%=screen.getLabel("EXPERIENCE")%>&nbsp;</td>
-                <td><font class="normal"> <%=screen.getInput("EXPERIENCE")%></font></td>
+                <td colspan="3"><font class="normal"> <%=screen.getInput("EXPERIENCE")%></font></td>
               </tr>
 
               <tr>
                 <td  class="columnlabel"><%=screen.getLabel("EEXPERIENCE")%>&nbsp;</td>
-                <td><font class="normal"> <%=screen.getInput("EEXPERIENCE")%></font></td>
+                <td colspan="3"><font class="normal"> <%=screen.getInput("EEXPERIENCE")%></font></td>
               </tr>
               <tr>
                 <td  class="columnlabel"><%=screen.getLabel("EXP_YEAR")%></td>
-                <td><font class="normal" > <%=screen.getInput("EXP_YEAR")%> </font>&nbsp;<script language="JavaScript">swapLang('Year')</script></td>
+                <td colspan="3"><font class="normal" > <%=screen.getInput("EXP_YEAR")%> </font>&nbsp;<span swlang code="SW000717">year</span></td>
               </tr>
               <tr>
                 <td><div align="right"><b>
-                    <script language="JavaScript">swapLang('Skill')</script>
+                    <span swlang code="SW013587">Skill</span>
                     :</b></div></td>
               </tr>
               <%screen.referLangOn();%>
               <tr>
                 <td  class="columnlabel"><%=screen.getLabel("KNOWLEDGE")%>&nbsp;</td>
-                <td><font class="normal"> <%=screen.getInput("KNOWLEDGE")%>&nbsp;
+                <td colspan="3"><font class="normal"> <%=screen.getInput("KNOWLEDGE")%>&nbsp;
                       <!-- input name="MEXPERTISE@EDESC" type="textarea" size="30" value="<%//=screen.getDataLabel("MEXPERTIS","TDESC")%>"--></font></td>
               </tr>
               <%screen.referLangOff();%>
               <tr>
                 <td  class="columnlabel"><%=screen.getLabel("SKILL")%>&nbsp;</td>
-                <td><font class="normal"> <%=screen.getInput("SKILL")%></font></td>
+                <td colspan="3"><font class="normal"> <%=screen.getInput("SKILL")%></font></td>
               </tr>
               <tr>
                 <td  class="columnlabel"><%=screen.getLabel("CHARACTERS")%>&nbsp;</td>
-                <td><font class="normal"> <%=screen.getInput("CHARACTERS")%></font></td>
+                <td colspan="3"><font class="normal"> <%=screen.getInput("CHARACTERS")%></font></td>
               </tr>
 
               <tr>
                 <td>&nbsp;</td>
               </tr>
-							<tr>
-								<td class='columnlabel'><%=screen.getLabel("INTERVIEW")%>&nbsp;</td>
-								<td><font class='normal'><%=screen.getInput("INTERVIEW")%></font></td>
-							</tr>
-							<tr>
-								<td>&nbsp;</td>
-							</tr>
+			<tr>
+				<td class='columnlabel'><%=screen.getLabel("INTERVIEW")%>&nbsp;</td>
+				<td colspan="3"><font class='normal'><%=screen.getInput("INTERVIEW")%></font></td>
+			</tr>
+			<tr>
+				<td>&nbsp;</td>
+			</tr>
 
               <tr>
                 <td  class="buttonline" colspan="7"><div align="center">
@@ -394,10 +433,10 @@ function goHelp(helpName,inputName){
                 </td>
               </tr>
               <tr >
-                <td colspan="2" class="blankspace"></td>
+                <td colspan="4" class="blankspace"></td>
               </tr>
               <tr >
-                <td colspan="2" class="blankspace"></td>
+                <td colspan="4" class="blankspace"></td>
               </tr>
             </table>
             <div align="right">&nbsp; </div>
diff --git a/hrAppWeb.war/COMPANY/CI_01_GPF.jsp b/hrAppWeb.war/COMPANY/CI_01_GPF.jsp
index b73574f..595c022 100644
--- a/hrAppWeb.war/COMPANY/CI_01_GPF.jsp
+++ b/hrAppWeb.war/COMPANY/CI_01_GPF.jsp
@@ -173,10 +173,18 @@
 										<td width="100" bgcolor="#E1E1E1">&nbsp;</td>
 									</tr>
 									<tr>
-										<td valign="top" bgcolor="#E1E1E1"><div align="center"><a href="javascript:showHelp('CI_01_14_GPF.jsp');"><strong><script language="javascript">swapLang('Job Description');</script></strong></a></div></td>
-										<td valign="top" bgcolor="#E1E1E1"><div align="center"><strong><a href="javascript:showHelp('CI_01_15.jsp');"><strong><script language="javascript">swapLang('Manpower');</script></strong></a></strong></div></td>
-										<td valign="top" bgcolor="#E1E1E1"><div align="center"><strong><a href="javascript:showHelp('CI_01_26.jsp');"><script language="javascript">swapLang('Online Exam');</script></a></strong></div></td>
-										<td valign="top" bgcolor="#E1E1E1"><div align="center"><strong><a href="javascript:showHelp('CI_01_27.jsp');"><span swlang code='SW012947'>Router Recruitment</span></a></strong></div></td>
+										<td valign="top" bgcolor="#E1E1E1"><div align="center"><strong>
+											<a href="javascript:showHelp('CI_01_14_GPF.jsp');"><p swlang code="SW013398">Job Description</p></a>
+										</strong></div></td>
+										<td valign="top" bgcolor="#E1E1E1"><div align="center"><strong>
+											<a href="javascript:showHelp('CI_01_15.jsp');"><p swlang code="SW013399">Manpower</p></a>
+										</strong></div></td>
+										<td valign="top" bgcolor="#E1E1E1"><div align="center"><strong>
+											<a href="javascript:showHelp('CI_01_26.jsp');"><p swlang code="SW013407">Online Examination</p></a>
+										</strong></div></td>
+										<td valign="top" bgcolor="#E1E1E1"><div align="center"><strong>
+											<a href="javascript:showHelp('CI_01_27.jsp');"><p swlang code="SW012947">Router Recruitment</p></a>
+										</strong></div></td>
 
 <%--										<td valign="top" bgcolor="#E1E1E1"><div align="center"><font size="2" color="#1D95E2"> <a href="javascript:showHelp('CI_01_15.jsp');"><strong><script language="javascript">swapLang('Manpower');</script></strong></a></font></div></td>--%>
 <%--										<td valign="top" bgcolor="#E1E1E1"><div align="center"><strong><a href="javascript:showHelp('CI_01_8.jsp');"><script language="javascript">swapLang('Career Path');</script></a></strong></div></td>--%>
diff --git a/hrAppWeb.war/XML/ENG_COMPANY_SWAPLANG.xml b/hrAppWeb.war/XML/ENG_COMPANY_SWAPLANG.xml
index 7019434..fb1c1c2 100644
--- a/hrAppWeb.war/XML/ENG_COMPANY_SWAPLANG.xml
+++ b/hrAppWeb.war/XML/ENG_COMPANY_SWAPLANG.xml
@@ -2552,4 +2552,18 @@
 		<SW012947><![CDATA[Router Recruitment]]></SW012947>
 		<SW013076><![CDATA[External Links Setup]]></SW013076>
 		<SW013105><![CDATA[Manpower Name(Eng)]]></SW013105>
+		<SW013387><![CDATA[Organization Management]]></SW013387>
+		<SW013398><![CDATA[Job Description]]></SW013398>
+		<SW013399><![CDATA[Manpower]]></SW013399>
+		<SW013400><![CDATA[Career Path]]></SW013400>
+		<SW013401><![CDATA[Subordinate]]></SW013401>
+		<SW013402><![CDATA[Candidate]]></SW013402>
+		<SW013403><![CDATA[Team member in job]]></SW013403>
+		<SW013404><![CDATA[Registration Condition]]></SW013404>
+		<SW013405><![CDATA[Trainning Needs]]></SW013405>
+		<SW013406><![CDATA[Appraisal Form]]></SW013406>
+		<SW013407><![CDATA[Online Exam]]></SW013407>
+		<SW013408><![CDATA[Detail of KC and KPI]]></SW013408>
+		<SW013409><![CDATA[Export Org Plus]]></SW013409>
+		<SW013587><![CDATA[Skill]]></SW013587>
 	</changelanguage>
\ No newline at end of file
diff --git a/hrAppWeb.war/XML/THA_COMPANY_SWAPLANG.xml b/hrAppWeb.war/XML/THA_COMPANY_SWAPLANG.xml
index 92530ed..8755054 100644
--- a/hrAppWeb.war/XML/THA_COMPANY_SWAPLANG.xml
+++ b/hrAppWeb.war/XML/THA_COMPANY_SWAPLANG.xml
@@ -2552,4 +2552,18 @@
 		<SW012947><![CDATA[ขั้นตอนการสมัครงาน]]></SW012947>
 		<SW013076><![CDATA[ทะเบียนจัดเก็บลิงก์ภายนอก]]></SW013076>
 		<SW013105><![CDATA[ชื่องบประมาณกำลังคน(อังกฤษ)]]></SW013105>
+		<SW013387><![CDATA[การกำหนดข้อมูลองค์กร]]></SW013387>
+		<SW013398><![CDATA[รายละเอียดลักษณะงาน]]></SW013398>
+		<SW013399><![CDATA[แผนอัตรากำลัง]]></SW013399>
+		<SW013400><![CDATA[สายการทำงาน]]></SW013400>
+		<SW013401><![CDATA[ผู้ใต้บังคับบัญชา]]></SW013401>
+		<SW013402><![CDATA[รายชื่อผู้สมัคร]]></SW013402>
+		<SW013403><![CDATA[สมาชิกในทีม]]></SW013403>
+		<SW013404><![CDATA[เงื่อนไขการสมัคร]]></SW013404>
+		<SW013405><![CDATA[หลักสูตรที่จำเป็นต้องอบรม]]></SW013405>
+		<SW013406><![CDATA[แบบฟอร์มการประเมิน]]></SW013406>
+		<SW013407><![CDATA[ข้อสอบสำหรับผู้สมัคร]]></SW013407>
+		<SW013408><![CDATA[รายละเอียดของ KC และ KPI]]></SW013408>
+		<SW013409><![CDATA[ส่งออก Org Plus]]></SW013409>
+		<SW013587><![CDATA[ทักษะ]]></SW013587>
 	</changelanguage>
\ No newline at end of file
--
libgit2 0.26.0