Skip to content

D
DHAS
Commit a5496baa by peema_phongam
Options

update : interview manger / Ex / seniorEx

parent 43b88a9f
Showing with 145 additions and 57 deletions
XML/CONFIGXML/SYSTEMCODE.xml
...@@ -18254,7 +18254,31 @@ Terminate,พนักงานพ้นสภาพ]]> ...@@ -18254,7 +18254,31 @@ Terminate,พนักงานพ้นสภาพ]]>
<![CDATA[1]]> <![CDATA[1]]>
</KEY> </KEY>
<VALUE> <VALUE>
<![CDATA[ประธาน,ประธาน]]> <![CDATA[ประธาน(ผู้บริหาร/ผู้จัดการฝ่าย),ประธาน(ผู้บริหาร/ผู้จัดการฝ่าย)]]>
</VALUE>
</DATA>
<DATA>
<KEY>
<![CDATA[2]]>
</KEY>
<VALUE>
<![CDATA[หน.ผ./ผจก.ฝ่ายบุคคล,หน.ผ./ผจก.ฝ่ายบุคคล]]>
</VALUE>
</DATA>
<DATA>
<KEY>
<![CDATA[3]]>
</KEY>
<VALUE>
<![CDATA[ผู้บริหาร BU,ผู้บริหาร BU]]>
</VALUE>
</DATA>
<DATA>
<KEY>
<![CDATA[4]]>
</KEY>
<VALUE>
<![CDATA[Senior Ex Director/COO BU,Senior Ex Director/COO BU]]>
</VALUE> </VALUE>
</DATA> </DATA>
</REFEREE_LEVEL> </REFEREE_LEVEL>
......
XML/PROTABLEXML/MREFEREE.xml
...@@ -289,7 +289,7 @@ ...@@ -289,7 +289,7 @@
<DESC_ENG>REFEREE_LEVEL</DESC_ENG> <DESC_ENG>REFEREE_LEVEL</DESC_ENG>
<DESC_THAI>สถานะการประเมิน</DESC_THAI> <DESC_THAI>สถานะการประเมิน</DESC_THAI>
<DEFAULTVALUE>0</DEFAULTVALUE> <DEFAULTVALUE>0</DEFAULTVALUE>
<COMPONENT type="radio"> <COMPONENT type="list">
<ALT_ENG>กำหนดสถานะการประเมิน</ALT_ENG> <ALT_ENG>กำหนดสถานะการประเมิน</ALT_ENG>
<ALT_THAI>กำหนดสถานะการประเมิน</ALT_THAI> <ALT_THAI>กำหนดสถานะการประเมิน</ALT_THAI>
<VALIDCODE>REFEREE_LEVEL</VALIDCODE> <VALIDCODE>REFEREE_LEVEL</VALIDCODE>
......
hrAppWeb.war/APS_FORM_INTERVIEW_DHAS_RESULT.jsp
...@@ -120,15 +120,15 @@ ...@@ -120,15 +120,15 @@
</tr> </tr>
<tr> <tr>
<td class='center' colspan="1">Job Name</td> <td class='center' colspan="1">Job Name</td>
<td class='center' colspan='2'><input ng-disabled='headdata.status == 2 || notedit' type="text" ng-model="formdata.form[0].jobName"></td> <td class='center' colspan='2'><input ng-disabled='headdata.status == 2 || headdata.judge != "1" || notedit ' type="text" ng-model="formdata.form[0].jobName"></td>
<td class='center' colspan='2' rowspan="2"><input ng-disabled='headdata.status == 2 || notedit' type="text" ng-model="formdata.form[0].basicallyScore"> คะแนน</td> <td class='center' colspan='2' rowspan="2"><input ng-disabled='headdata.status == 2 || headdata.judge != "1" || notedit' type="text" ng-model="formdata.form[0].basicallyScore"> คะแนน</td>
<td class='center' colspan='3' rowspan="2"><input ng-disabled='headdata.status == 2 || notedit' type="text" ng-model="formdata.form[0].managementScore"> คะแนน</td> <td class='center' colspan='3' rowspan="2"><input ng-disabled='headdata.status == 2 || headdata.judge != "1" || notedit' type="text" ng-model="formdata.form[0].managementScore"> คะแนน</td>
<td class='center' colspan='2' rowspan="2"><input ng-disabled='headdata.status == 2 || notedit' type="text" ng-model="formdata.form[0].sumScore"> คะแนน</td> <td class='center' colspan='2' rowspan="2"><input ng-disabled='headdata.status == 2 || headdata.judge != "1" || notedit' type="text" ng-model="formdata.form[0].sumScore"> คะแนน</td>
</tr> </tr>
<tr> <tr>
<td class='center' colspan="1">Job Code</td> <td class='center' colspan="1">Job Code</td>
<td class='center' colspan='2'><input ng-disabled='headdata.status == 2 || notedit' type="text" ng-model="formdata.form[0].jobCode"></td> <td class='center' colspan='2'><input ng-disabled='headdata.status == 2 || headdata.judge != "1" || notedit' type="text" ng-model="formdata.form[0].jobCode"></td>
</tr> </tr>
</table> </table>
</div> </div>
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
<th class='text-left' colspan='10'>ประเมินค่างานจากผลสัมภาษณ์ โดยผู้บริหาร / ผู้จัดการฝ่าย</th> <th class='text-left' colspan='10'>ประเมินค่างานจากผลสัมภาษณ์ โดยผู้บริหาร / ผู้จัดการฝ่าย</th>
</tr> </tr>
<tr> <tr>
<td class='text-left' colspan='10'>คาดว่าผู้สมัครจะสามารถปฏิบัติงานได้ตามมาตรฐานงานที่ <input ng-disabled='headdata.status == 2 || notedit' type="text" <td class='text-left' colspan='10'>คาดว่าผู้สมัครจะสามารถปฏิบัติงานได้ตามมาตรฐานงานที่ <input ng-disabled='headdata.status == 2 || headdata.judge != "1" || notedit' type="text"
ng-model="formdata.form[0].estimatePercentJob"> % ของตำแหน่งงาน ng-model="formdata.form[0].estimatePercentJob"> % ของตำแหน่งงาน
</td> </td>
...@@ -146,19 +146,19 @@ ...@@ -146,19 +146,19 @@
<tr> <tr>
<td class='text-left'> <td class='text-left'>
ผลการคัดเลือกจากหน่วยงาน ผลการคัดเลือกจากหน่วยงาน
<input ng-disabled='headdata.status == 2 || notedit' type="radio" name="deptRes" value="1" ng-model="formdata.form[0].resultFromDept"> ควรจ้าง <input ng-disabled='headdata.status == 2 || headdata.judge != "1" || notedit' type="radio" name="deptRes" value="1" ng-model="formdata.form[0].resultFromDept"> ควรจ้าง
<input ng-disabled='headdata.status == 2 || notedit' type="radio" name="deptRes" value="2" ng-model="formdata.form[0].resultFromDept"> ไม่ควรจ้าง <input ng-disabled='headdata.status == 2 || headdata.judge != "1" || notedit' type="radio" name="deptRes" value="2" ng-model="formdata.form[0].resultFromDept"> ไม่ควรจ้าง
<input ng-disabled='headdata.status == 2 || notedit' type="radio" name="deptRes" value="3" ng-model="formdata.form[0].resultFromDept"> สำรอง <input ng-disabled='headdata.status == 2 || headdata.judge != "1" || notedit' type="radio" name="deptRes" value="3" ng-model="formdata.form[0].resultFromDept"> สำรอง
</td> </td>
<td class='text-left'> <td class='text-left'>
ขอจ้างเป็น ขอจ้างเป็น
<input ng-disabled='headdata.status == 2 || notedit' type="radio" name="empRes" value="1" ng-model="formdata.form[0].hire"> รายวัน <input ng-disabled='headdata.status == 2 || headdata.judge != "1" || notedit' type="radio" name="empRes" value="1" ng-model="formdata.form[0].hire"> รายวัน
<input ng-disabled='headdata.status == 2 || notedit' type="radio" name="empRes" value="2" ng-model="formdata.form[0].hire"> รายเดือน <input ng-disabled='headdata.status == 2 || headdata.judge != "1" || notedit' type="radio" name="empRes" value="2" ng-model="formdata.form[0].hire"> รายเดือน
</td> </td>
</tr> </tr>
<tr> <tr>
<td class='text-left' colspan='10'>ความเห็นหน่วยงานเพิ่มเติม <input ng-disabled='headdata.status == 2 || notedit' style="width: 80%" type="text" <td class='text-left' colspan='10'>ความเห็นหน่วยงานเพิ่มเติม <input ng-disabled='headdata.status == 2 || headdata.judge != "1" || notedit' style="width: 80%" type="text"
ng-model="formdata.form[0].remarkFromDept"></td> ng-model="formdata.form[0].remarkFromDept"></td>
<%-- <td class='center' > </td>--%> <%-- <td class='center' > </td>--%>
</tr> </tr>
...@@ -172,13 +172,13 @@ ...@@ -172,13 +172,13 @@
<tr ng-repeat="$item in formdata.form[0].incentives"> <tr ng-repeat="$item in formdata.form[0].incentives">
<td class='center'>{{$index + 1}}</td> <td class='center'>{{$index + 1}}</td>
<td class='center'>{{$item.name}}</td> <td class='center'>{{$item.name}}</td>
<td class='center'><input ng-disabled='headdata.status == 2 || notedit' type="text" ng-model="$item.cost"></td> <td class='center'><input ng-disabled='headdata.status == 2 || headdata.judge != "1" || notedit' type="text" ng-model="$item.cost"></td>
<td class='center'>บาท/วัน/เดือน</td> <td class='center'>บาท/วัน/เดือน</td>
<td class='center'>เริ่มจ่ายตั้งแต่วันที่</td> <td class='center'>เริ่มจ่ายตั้งแต่วันที่</td>
<td class='center'><input ng-disabled='headdata.status == 2 || notedit' type="text" ng-model="$item.startDate"></td> <td class='center'><input ng-disabled='headdata.status == 2 || headdata.judge != "1" || notedit' type="text" ng-model="$item.startDate"></td>
</tr> </tr>
<tr> <tr>
<td class='text-right' colspan='5'>ลงชื่อ <input ng-disabled='headdata.status == 2 || notedit' style="width: 20%" type="text" ng-model="formdata.form[0].sign.manager"></td> <td class='text-right' colspan='5'>ลงชื่อ <input ng-readonly="true" style="width: 20%" type="text" ng-model="formdata.form[0].sign.manager"></td>
<td class='center'> ผู้บริหาร / ผู้จัดการฝ่าย</td> <td class='center'> ผู้บริหาร / ผู้จัดการฝ่าย</td>
</tr> </tr>
...@@ -191,39 +191,39 @@ ...@@ -191,39 +191,39 @@
</tr> </tr>
<tr> <tr>
<td class='center'>ผลการประเมินความสามารถผู้สมัคร</td> <td class='center'>ผลการประเมินความสามารถผู้สมัคร</td>
<td class='center'><input ng-disabled='headdata.status == 2 || notedit' type="text" ng-model="formdata.form[0].hr.score"></td> <td class='center'><input ng-disabled='headdata.status == 2 || headdata.judge != "2" || notedit' type="text" ng-model="formdata.form[0].hr.score"></td>
<td class='center'>คะแนน</td> <td class='center'>คะแนน</td>
<td class='center'>คูณอัตราจ้าง</td> <td class='center'>คูณอัตราจ้าง</td>
<td class='center'><input ng-disabled='headdata.status == 2 || notedit' type="text" ng-model="formdata.form[0].hr.multiple"></td> <td class='center'><input ng-disabled='headdata.status == 2 || headdata.judge != "2" || notedit' type="text" ng-model="formdata.form[0].hr.multiple"></td>
<td class='center'>บาท / Point</td> <td class='center'>บาท / Point</td>
<td class='center'>เท่ากับรายได้พึงประเมิน(รวมเงินโบนัสเฉลี่ย)</td> <td class='center'>เท่ากับรายได้พึงประเมิน(รวมเงินโบนัสเฉลี่ย)</td>
<td class='center'><input ng-disabled='headdata.status == 2 || notedit' type="text" ng-model="formdata.form[0].hr.incomeWithBonus"></td> <td class='center'><input ng-disabled='headdata.status == 2 || headdata.judge != "2" || notedit' type="text" ng-model="formdata.form[0].hr.incomeWithBonus"></td>
<td class='text-left'>บาท</td> <td class='text-left'>บาท</td>
</tr> </tr>
<tr> <tr>
<td class='center' colspan='6'></td> <td class='center' colspan='6'></td>
<td class='center'>ประเมินการรายได้รวมต่อเดือน(ไม่รวมเงินโบนัส)</td> <td class='center'>ประเมินการรายได้รวมต่อเดือน(ไม่รวมเงินโบนัส)</td>
<td class='center'><input ng-disabled='headdata.status == 2 || notedit' type="text" ng-model="formdata.form[0].hr.incomeWithoutBonus"></td> <td class='center'><input ng-disabled='headdata.status == 2 || headdata.judge != "2" || notedit' type="text" ng-model="formdata.form[0].hr.incomeWithoutBonus"></td>
<td class='text-left'>บาท</td> <td class='text-left'>บาท</td>
</tr> </tr>
<tr> <tr>
<td class='center'>1.รายได้คงที่ตามตำแหน่ง = Basic Salary</td> <td class='center'>1.รายได้คงที่ตามตำแหน่ง = Basic Salary</td>
<td class='center'><input ng-disabled='headdata.status == 2 || notedit' type="text" ng-model="formdata.form[0].hr.basicSalary"></td> <td class='center'><input ng-disabled='headdata.status == 2 || headdata.judge != "2" || notedit' type="text" ng-model="formdata.form[0].hr.basicSalary"></td>
<td class='text-left' colspan='4'>บาท</td> <td class='text-left' colspan='4'>บาท</td>
<td class='center'>2.รายได้แปรผันตามผลงาน = M1PI</td> <td class='center'>2.รายได้แปรผันตามผลงาน = M1PI</td>
<td class='center'><input ng-disabled='headdata.status == 2 || notedit' type="text" ng-model="formdata.form[0].hr.m1pi"></td> <td class='center'><input ng-disabled='headdata.status == 2 || headdata.judge != "2" || notedit' type="text" ng-model="formdata.form[0].hr.m1pi"></td>
<td class='text-left'>บาท</td> <td class='text-left'>บาท</td>
</tr> </tr>
<tr> <tr>
<td class='center'> Pre-QPI</td> <td class='center'> Pre-QPI</td>
<td class='center'><input ng-disabled='headdata.status == 2 || notedit' type="text" ng-model="formdata.form[0].hr.qpi"></td> <td class='center'><input ng-disabled='headdata.status == 2 || headdata.judge != "2" || notedit' type="text" ng-model="formdata.form[0].hr.qpi"></td>
<td class='text-left' colspan='4'>บาท</td> <td class='text-left' colspan='4'>บาท</td>
<td class='center'> M3PI</td> <td class='center'> M3PI</td>
<td class='center'><input ng-disabled='headdata.status == 2 || notedit' type="text" ng-model="formdata.form[0].hr.m3pi"></td> <td class='center'><input ng-disabled='headdata.status == 2 || headdata.judge != "2" || notedit' type="text" ng-model="formdata.form[0].hr.m3pi"></td>
<td class='text-left'>บาท</td> <td class='text-left'>บาท</td>
</tr> </tr>
<tr> <tr>
<td class='text-right' colspan='7'>ลงชื่อ <input ng-disabled='headdata.status == 2 || notedit' style="width: 20%" type="text" ng-model="formdata.form[0].sign.hr"></td> <td class='text-right' colspan='7'>ลงชื่อ <input ng-readonly="true" style="width: 20%" type="text" ng-model="formdata.form[0].sign.hr"></td>
<td class='center' colspan='2'> หน.ผ./ ผจก.ฝ่ายบุคคล</td> <td class='center' colspan='2'> หน.ผ./ ผจก.ฝ่ายบุคคล</td>
</tr> </tr>
</table> </table>
...@@ -236,27 +236,27 @@ ...@@ -236,27 +236,27 @@
<tr> <tr>
<td class='text-left' colspan='9'> <td class='text-left' colspan='9'>
1.สรุปผลการพิจารณา 1.สรุปผลการพิจารณา
<input ng-disabled='headdata.status == 2 || notedit' type="radio" name="exRes" value="1" ng-model="formdata.form[0].ex.result"> อนุมัติ <input ng-disabled='headdata.status == 2 || headdata.judge != "3" || notedit' type="radio" name="exRes" value="1" ng-model="formdata.form[0].ex.result"> อนุมัติ
<input ng-disabled='headdata.status == 2 || notedit' type="radio" name="exRes" value="2" ng-model="formdata.form[0].ex.result"> ไม่อนุมัติ <input ng-disabled='headdata.status == 2 || headdata.judge != "3" || notedit' type="radio" name="exRes" value="2" ng-model="formdata.form[0].ex.result"> ไม่อนุมัติ
<input ng-disabled='headdata.status == 2 || notedit' type="radio" name="exRes" value="3" ng-model="formdata.form[0].ex.result"> อื่นๆ (ถ้ามี) <input ng-disabled='headdata.status == 2 || headdata.judge != "3" || notedit' type="radio" name="exRes" value="3" ng-model="formdata.form[0].ex.result"> อื่นๆ (ถ้ามี)
<input ng-disabled='headdata.status == 2 || notedit' type="text" style="width: 70%" ng-model="formdata.form[0].ex.other" ng-disabled="formdata.form[0].ex.result != '3'"> <input ng-disabled='headdata.status == 2 || headdata.judge != "3" || notedit' type="text" style="width: 70%" ng-model="formdata.form[0].ex.other" ng-disabled="formdata.form[0].ex.result != '3'">
</td> </td>
</tr> </tr>
<tr> <tr>
<td rowspan="2" colspan='2'>2.สรุปผลการประเมินรายได้</td> <td rowspan="2" colspan='2'>2.สรุปผลการประเมินรายได้</td>
<td class='text-left' colspan='8'> <td class='text-left' colspan='8'>
<input ng-disabled='headdata.status == 2 || notedit' type="radio" name="esIncome" value="1" ng-model="formdata.form[0].ex.estimateIncome"> ตามมาตรฐานประเมินตำแหน่งงาน <input ng-disabled='headdata.status == 2 || headdata.judge != "3" || notedit' type="radio" name="esIncome" value="1" ng-model="formdata.form[0].ex.estimateIncome"> ตามมาตรฐานประเมินตำแหน่งงาน
</td> </td>
</tr> </tr>
<tr> <tr>
<td class='text-left'> <td class='text-left'>
<input ng-disabled='headdata.status == 2 || notedit' type="radio" name="esIncome" value="2" ng-model="formdata.form[0].ex.estimateIncome"> อื่นๆ (ถ้ามี) <input ng-disabled='headdata.status == 2 || headdata.judge != "3" || notedit' type="radio" name="esIncome" value="2" ng-model="formdata.form[0].ex.estimateIncome"> อื่นๆ (ถ้ามี)
<input ng-disabled='headdata.status == 2 || notedit' type="text" style="width: 50%" ng-model="formdata.form[0].ex.otherEstimateIncome" <input ng-disabled='headdata.status == 2 || headdata.judge != "3" || notedit' type="text" style="width: 50%" ng-model="formdata.form[0].ex.otherEstimateIncome"
ng-disabled="formdata.form[0].ex.estimateIncome != '2'"> ng-disabled="formdata.form[0].ex.estimateIncome != '2'">
</td> </td>
</tr> </tr>
<tr> <tr>
<td class='text-right' colspan='8'>ลงชื่อ <input ng-disabled='headdata.status == 2 || notedit' style="width: 20%" type="text" ng-model="formdata.form[0].sign.ex"></td> <td class='text-right' colspan='8'>ลงชื่อ <input ng-readonly="true" style="width: 20%" type="text" ng-model="formdata.form[0].sign.ex"></td>
<td class='center'> ผู้บริหาร BU</td> <td class='center'> ผู้บริหาร BU</td>
</tr> </tr>
</table> </table>
...@@ -268,11 +268,26 @@ ...@@ -268,11 +268,26 @@
</tr> </tr>
<tr> <tr>
<td class='center' colspan='9'> <td class='center' colspan='9'>
<input ng-disabled='headdata.status == 2 || notedit' type="text" style="width: 100%" ng-model="formdata.form[0].seniorEx.remark"> <input ng-disabled='headdata.status == 2 || headdata.judge != "4" || notedit' type="text" style="width: 100%" ng-model="formdata.form[0].seniorEx.remark">
</td> </td>
</tr> </tr>
<tr> <tr>
<td class='text-right' style="width: 75%">ลงชื่อ <input ng-disabled='headdata.status == 2 || notedit' style="width: 25%" type="text" ng-model="formdata.form[0].sign.seniorEx"></td> <td>
<div class="controls form-inline ">
<input class='score3_1' ng-model='formdata.form[0].appropriate' value='1' type='radio' ng-disabled='headdata.status == 2 || headdata.judge != "4" || notedit'/>
<label class='label1'>เหมาะสม</label>
<input class='score3_2' ng-model='formdata.form[0].appropriate' value='0' type='radio' ng-disabled='headdata.status == 2 || headdata.judge != "4" || notedit'/>
<label class='label2'>ไม่เหมาะสม</label>
<input class='score3_3' ng-model='formdata.form[0].appropriate' value='2' type='radio' ng-disabled='headdata.status == 2 || headdata.judge != "4" || notedit'/>
<label class='label3'>เหมาะกับตำแหน่งอื่น</label>
<label class='label3'>(ระบุ)</label>
<input class='form-control extend3' ng-model='formdata.form[0].job_other' type='text' ng-disabled='headdata.status == 2 || headdata.judge != "4" || notedit'/>
<label id='job_other'></label>
</div>
</td>
</tr>
<tr>
<td class='text-right' style="width: 75%">ลงชื่อ <input ng-readonly="true" style="width: 25%" type="text" ng-model="formdata.form[0].sign.seniorEx"></td>
<td class='center'> Seninor Ex Director / COO BU</td> <td class='center'> Seninor Ex Director / COO BU</td>
</tr> </tr>
</table> </table>
...@@ -282,8 +297,8 @@ ...@@ -282,8 +297,8 @@
<div class='pagebreak'></div> <div class='pagebreak'></div>
<div class="center new-line"> <div class="center new-line">
<button type="button" class="btn btn-info" data-toggle="collapse" data-target="#collapseExample">ผลประเมินก่อนหน้า</button> <button type="button" class="btn btn-info" data-toggle="collapse" data-target="#collapseExample">ผลประเมินก่อนหน้า</button>
<button type="button" class="btn btn-info" ng-click='saveDraff()' swlang code='SW012867' ng-disabled='headdata.status == 2 ' ng-hide='notedit'>Save Draft</button> <button type="button" class="btn btn-info" ng-click='saveDraff()' swlang code='SW012867' ng-disabled='headdata.status == 2' ng-hide='notedit'>Save Draft</button>
<button type="button" class="btn btn-info" ng-click='save()' swlang code='SW012098' ng-disabled='headdata.status == 2 ' ng-hide='notedit'>Submit</button> <button type="button" class="btn btn-info" ng-click='save()' swlang code='SW012098' ng-disabled='headdata.status == 2' ng-hide='notedit'>Submit</button>
<%-- <button type="button" class="btn btn-warning" ng-click='goprint()' swlang code='SW005455'>Print</button> --%> <%-- <button type="button" class="btn btn-warning" ng-click='goprint()' swlang code='SW005455'>Print</button> --%>
</div> </div>
<div class='spece-bot'></div> <div class='spece-bot'></div>
......
hrAppWeb.war/EMPVIEW/JS/APS_INTERVIEW/APS_FORM_INTERVIEW_DHAS_RESULT.Controller.js
...@@ -91,7 +91,9 @@ angular.module('APS_INTERVIEW').controller('APS_FORM_INTERVIEW_DHAS_RESULT', ['$ ...@@ -91,7 +91,9 @@ angular.module('APS_INTERVIEW').controller('APS_FORM_INTERVIEW_DHAS_RESULT', ['$
hr: '', hr: '',
ex: '', ex: '',
seniorEx: '' seniorEx: ''
} },
appropriate: '',
job_other: ''
}] }]
$scope.myparam = { $scope.myparam = {
...@@ -103,11 +105,20 @@ angular.module('APS_INTERVIEW').controller('APS_FORM_INTERVIEW_DHAS_RESULT', ['$ ...@@ -103,11 +105,20 @@ angular.module('APS_INTERVIEW').controller('APS_FORM_INTERVIEW_DHAS_RESULT', ['$
$scope.headdata = data.header $scope.headdata = data.header
$scope.formdata = data.apsform $scope.formdata = data.apsform
$scope.previous = data.previous $scope.previous = data.previous
setFormAPS() setFormAPS()
$scope.isReady = true $scope.isReady = true
}) })
$scope.$watch('formdata.form', function (data) {
let listActor = ['manager', 'hr', 'ex', 'seniorEx']
if (data[0]) {
$scope.formdata.form[0].sign[listActor[parseInt('4')-1]] = $scope.headdata.committee_fullname
}
})
$scope.getResultHr = () => { $scope.getResultHr = () => {
let result = 0 let result = 0
...@@ -128,7 +139,6 @@ angular.module('APS_INTERVIEW').controller('APS_FORM_INTERVIEW_DHAS_RESULT', ['$ ...@@ -128,7 +139,6 @@ angular.module('APS_INTERVIEW').controller('APS_FORM_INTERVIEW_DHAS_RESULT', ['$
let findHr = $scope.previous.find(($item) => { let findHr = $scope.previous.find(($item) => {
return $item.header.dept.toUpperCase() === "DEPT" && $item.header.committeeid === $scope.committeeid return $item.header.dept.toUpperCase() === "DEPT" && $item.header.committeeid === $scope.committeeid
}) })
console.log(findHr)
if(findHr){ if(findHr){
for(var i = 0; i < findHr.apsform.form.length; i++){ for(var i = 0; i < findHr.apsform.form.length; i++){
let form = findHr.apsform.form[i]; let form = findHr.apsform.form[i];
......
hrAppWeb.war/EMPVIEW/JS/APS_INTERVIEW/ListCandidate.Controller.js
...@@ -166,7 +166,7 @@ angular.module('APS_INTERVIEW').controller('listCandidate', ['$scope', '$http', ...@@ -166,7 +166,7 @@ angular.module('APS_INTERVIEW').controller('listCandidate', ['$scope', '$http',
if ($scope.dbName.toUpperCase() === ("STD_NEW")) { if ($scope.dbName.toUpperCase() === ("STD_NEW")) {
pageName = "../APS_FORM_INTERVIEW_DHAS.jsp"; pageName = "../APS_FORM_INTERVIEW_DHAS.jsp";
} else if ($scope.dbName.toUpperCase() === ("DHAS")) { } else if ($scope.dbName.toUpperCase() === ("DHAS")) {
if (list.judge == '1') { if (list.judge > 0) {
pageName = "../APS_FORM_INTERVIEW_DHAS_RESULT.jsp"; pageName = "../APS_FORM_INTERVIEW_DHAS_RESULT.jsp";
} else { } else {
pageName = "../APS_FORM_INTERVIEW_DHAS_DEPT.jsp" pageName = "../APS_FORM_INTERVIEW_DHAS_DEPT.jsp"
......
hrAppWeb.war/RECRUIT/CommitteeSetupForm.jsp
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
<th><swaplang code="SW000057">Position</swaplang></th> <th><swaplang code="SW000057">Position</swaplang></th>
<th ng-hide="chkPage()"><swaplang code="SW000019">Status</swaplang></th> <th ng-hide="chkPage()"><swaplang code="SW000019">Status</swaplang></th>
<th><swaplang code="SW001055">Sequencing</swaplang></th> <th><swaplang code="SW001055">Sequencing</swaplang></th>
<th class="text-center">ประธาน</th> <th class="text-center">สถานะการประเมิน</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -190,9 +190,16 @@ ...@@ -190,9 +190,16 @@
</select> </select>
</td> </td>
<td class="text-center"> <td class="text-center">
<md-checkbox ng-if="committee.referee_level == '1'" ng-disabled="haveJudge() && committee.judge !== '1'" ng-model="committee.judge" ng-false-value="'0'" ng-true-value="'1'" aria-label="Judge" ng-change="changeJudge()"> <%-- <span ng-if="committee.referee_level > 1">--%>
<%-- <input type="text" ng-model="committee.judge">--%> <%-- {{refereeStatus[committee.referee_level]}}--%>
<%-- <i class="fa fa-2x fa-check-circle-o" ng-if="committee.referee_level == '1'"></i>--%> <%-- </span>--%>
<%-- <md-checkbox ng-if="committee.referee_level == '1'" ng-disabled="haveJudge() && committee.judge !== '1'" ng-model="committee.judge" ng-false-value="'0'" ng-true-value="'1'" aria-label="Judge" ng-change="changeJudge()">--%>
<select class="form-control" ng-model="committee.judge">
<option ng-repeat="item in refereeStatus | filter:{id:'0'}" value="{{item.id}}">{{ item.desc }}</option>
<option ng-if="committee.referee_level > '0'" ng-repeat="item in refereeStatus | filter:{id:committee.referee_level}" value="{{item.id}}">{{ item.desc }}</option>
</select>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
hrAppWeb.war/RECRUIT/DIALOGTEMPLATE/SearchCommittee.html
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<th><swaplang code="BU2">bu2</swaplang></th> <th><swaplang code="BU2">bu2</swaplang></th>
<th><swaplang code="BU3">bu3</swaplang></th> <th><swaplang code="BU3">bu3</swaplang></th>
<th><swaplang code="SW003545">job</swaplang></th> <th><swaplang code="SW003545">job</swaplang></th>
<th>ประธาน</th> <th>สถานะการประเมิน</th>
</tr> </tr>
</thead> </thead>
<tfoot> <tfoot>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<th><swaplang code="BU2">bu2</swaplang></th> <th><swaplang code="BU2">bu2</swaplang></th>
<th><swaplang code="BU3">bu3</swaplang></th> <th><swaplang code="BU3">bu3</swaplang></th>
<th><swaplang code="SW000057">Position</swaplang></th> <th><swaplang code="SW000057">Position</swaplang></th>
<th>ประธาน</th> <th>สถานะการประเมิน</th>
</tr> </tr>
</tfoot> </tfoot>
<tbody> <tbody>
...@@ -43,7 +43,10 @@ ...@@ -43,7 +43,10 @@
<td>{{emp.bu2}}</td> <td>{{emp.bu2}}</td>
<td>{{emp.bu3}}</td> <td>{{emp.bu3}}</td>
<td>{{emp.position}}</td> <td>{{emp.position}}</td>
<td><i ng-if="emp.referee_level == '1'" class="fa fa-check-circle-o"></i></td> <td>
<!-- <i ng-if="emp.referee_level == '1'" class="fa fa-check-circle-o"></i>-->
{{refereeStatus[emp.referee_level]}}
</td>
<td class='hide' ng-if='$last'>{{callDataTable()}}</td> <!--call function DataTable After Load Emplist Data--> <td class='hide' ng-if='$last'>{{callDataTable()}}</td> <!--call function DataTable After Load Emplist Data-->
</tr> </tr>
</tbody> </tbody>
......
hrAppWeb.war/RECRUIT/js/CommitteeSetup/CommitteeSetup.Controller.js
...@@ -41,6 +41,20 @@ angular.module('RECRUIT').controller('CommitteeSetup', function ($scope, $mdDial ...@@ -41,6 +41,20 @@ angular.module('RECRUIT').controller('CommitteeSetup', function ($scope, $mdDial
eng: 'Success' eng: 'Success'
} }
}] }]
$scope.refereeStatus = [
{id:'0', desc:'กรรมการ'},
{id:'1', desc:'ประธาน(ผู้บริหาร/ผู้จัดการฝ่าย)'},
{id:'2', desc:'หน.ผ./ผจก.ฝ่ายบุคคล'},
{id:'3', desc:'ผู้บริหาร BU'},
{id:'4', desc:'Senior Ex Director/COO BU'},
]
// $scope.refereeStatus = [
// 'กรรมการ',
// 'ประธาน(ผู้บริหาร/ผู้จัดการฝ่าย)',
// 'หน.ผ./ผจก.ฝ่ายบุคคล',
// 'ผู้บริหาร BU',
// 'Senior Ex Director/COO BU'
// ]
let initSeqCommit = () =>{ let initSeqCommit = () =>{
$scope.seqlist = [] $scope.seqlist = []
...@@ -136,6 +150,13 @@ angular.module('RECRUIT').controller('CommitteeSetup', function ($scope, $mdDial ...@@ -136,6 +150,13 @@ angular.module('RECRUIT').controller('CommitteeSetup', function ($scope, $mdDial
// MD-Dialog Controller // MD-Dialog Controller
$scope.searchCommitteeCtrl = ($scope, $mdDialog, RecService) => { $scope.searchCommitteeCtrl = ($scope, $mdDialog, RecService) => {
$scope.refereeStatus = [
'กรรมการ',
'ประธาน(ผู้บริหาร/ผู้จัดการฝ่าย)',
'หน.ผ./ผจก.ฝ่ายบุคคล',
'ผู้บริหาร BU',
'Senior Ex Director/COO BU'
]
$scope.referrelist = referrelist $scope.referrelist = referrelist
$scope.hide = () => { $scope.hide = () => {
...@@ -154,13 +175,13 @@ angular.module('RECRUIT').controller('CommitteeSetup', function ($scope, $mdDial ...@@ -154,13 +175,13 @@ angular.module('RECRUIT').controller('CommitteeSetup', function ($scope, $mdDial
let setEmptoCOmmitee = (empID, index, ev) => { let setEmptoCOmmitee = (empID, index, ev) => {
let empItem = $filter('filter')(referrelist, {employeeid:empID}, true) let empItem = $filter('filter')(referrelist, {employeeid:empID}, true)
if(chkDuplicateCommittee(empID)){
angular.merge($scope.committee[index], empItem[0] ) angular.merge($scope.committee[index], empItem[0] )
}else{
showAlert(ev) // if(chkDuplicateCommittee(empID)){
} // angular.merge($scope.committee[index], empItem[0] )
// }else{
// showAlert(ev)
// }
// console.log($scope.committee); // console.log($scope.committee);
} }
...@@ -211,7 +232,7 @@ angular.module('RECRUIT').controller('CommitteeSetup', function ($scope, $mdDial ...@@ -211,7 +232,7 @@ angular.module('RECRUIT').controller('CommitteeSetup', function ($scope, $mdDial
}); });
} }
}else{ }else{
alert('กรุณาเลือกกรรมการ') // alert('กรุณาเลือกกรรมการ')
} }
} }
...@@ -219,9 +240,17 @@ angular.module('RECRUIT').controller('CommitteeSetup', function ($scope, $mdDial ...@@ -219,9 +240,17 @@ angular.module('RECRUIT').controller('CommitteeSetup', function ($scope, $mdDial
let result = false let result = false
for(let i=0;i<$scope.committee.length;i++){ for(let i=0;i<$scope.committee.length;i++){
if($scope.committee[i].employeeid != ''){ if($scope.committee[i].employeeid != ''){
let duplicate = $filter('filter')($scope.committee, {employeeid:$scope.committee[i].employeeid, judge:$scope.committee[i].judge}, true)
if (duplicate.length > 1) {
alert('รหัสกรรมการ ' + $scope.committee[i].employeeid + ' มีข้อมูลที่ซ้ำกัน')
result = false
break
}
result = true result = true
}else{ }else{
alert('กรุณาเลือกกรรมการ')
result = false result = false
break
} }
} }
return result return result
...@@ -250,7 +279,7 @@ angular.module('RECRUIT').controller('CommitteeSetup', function ($scope, $mdDial ...@@ -250,7 +279,7 @@ angular.module('RECRUIT').controller('CommitteeSetup', function ($scope, $mdDial
savetype : save_type, savetype : save_type,
del_olddata : $scope.del_olddata del_olddata : $scope.del_olddata
} }
console.log(obj_param); // console.log(obj_param);
return obj_param return obj_param
} }
...@@ -289,7 +318,7 @@ angular.module('RECRUIT').controller('CommitteeSetup', function ($scope, $mdDial ...@@ -289,7 +318,7 @@ angular.module('RECRUIT').controller('CommitteeSetup', function ($scope, $mdDial
if ($scope.dbName.toUpperCase() === ("STD_NEW")) { if ($scope.dbName.toUpperCase() === ("STD_NEW")) {
pageName = "../APS_FORM_INTERVIEW_DHAS.jsp"; pageName = "../APS_FORM_INTERVIEW_DHAS.jsp";
} else if ($scope.dbName.toUpperCase() === ("DHAS")) { } else if ($scope.dbName.toUpperCase() === ("DHAS")) {
if (judge == '1') { if (judge && parseInt(judge) > 0) {
pageName = "../APS_FORM_INTERVIEW_DHAS_RESULT.jsp"; pageName = "../APS_FORM_INTERVIEW_DHAS_RESULT.jsp";
} else { } else {
pageName = "../APS_FORM_INTERVIEW_DHAS_DEPT.jsp" pageName = "../APS_FORM_INTERVIEW_DHAS_DEPT.jsp"
......
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