thamming_dev01/hrm_eva
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

รวม code ที่แก้ไขทั้งหมดในทุกจุด

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-08-16 23:17:10 +07:00
parent a1ff729171
commit 4ef17d0300
54 changed files with 293 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml
View File

@@ -162,14 +162,20 @@
</tr>
</thead>
<tfoot>
<tr>
<th></th>
<th></th>
<th></th>
<th></th>
<th>
<label id='h_eva_evaluation_achievement_process_score'></label>
</th>
</tr>
<tr>
<th>รวม</th>
<th><label id='h_eva_evaluation_achievement_process_achievement'></label></th>
<th><label id='h_eva_evaluation_achievement_process_weight'></label></th>
<th><label id='h_eva_evaluation_achievement_process_score'></label></th>
<th></th>
<th>
<p id="eva_create_evaluation_detail_summary1_total_summary_chief" />
</th>
@@ -184,7 +190,7 @@
<div class="row">
<div class="form-group col-md-12">
<button id="btn01" type="button" class="btn btn-primary" onclick="javascript:eva_evaluation_achievement_process_Save(getUrlParameter('id'))">บันทึก</button>
<button style="display:none;" id="btn01" type="button" class="btn btn-primary" onclick="javascript:eva_evaluation_achievement_process_Save(getUrlParameter('id'))">บันทึก</button>
</div>
</div>
@@ -208,12 +214,20 @@
</tr>
</thead>
<tfoot>
<tr>
<th></th>
<th></th>
<th></th>
<th></th>
<th>
<label id='h_eva_evaluation_behavior_process_score'></label>
</th>
</tr>
<tr>
<th></th>
<th><label id='h_eva_evaluation_behavior_process_behavior'>รวม</label></th>
<th><label id='h_eva_evaluation_behavior_process_weight'></label></th>
<th><label id='h_eva_evaluation_behavior_process_score'></label></th>
<th></th>
<th>
<p id="eva_create_evaluation_detail_summary1_total_summary_competency_chief" />
</th>
@@ -227,7 +241,7 @@
<div class="row">
<div class="form-group col-md-12">
<button id="btn02" type="button" class="btn btn-primary" onclick="javascript:eva_evaluation_behavior_process_Save(getUrlParameter('id'))">บันทึก</button>
<button style="display:none;" id="btn02" type="button" class="btn btn-primary" onclick="javascript:eva_evaluation_behavior_process_Save(getUrlParameter('id'))">บันทึก</button>
</div>
</div>
@@ -281,7 +295,7 @@
<div class="row">
<div class="form-group col-md-12">
<button id="btn03" type="button" class="btn btn-submit" onclick="javascript:eva_create_evaluation_detail_summary1_PutUpdate()">บันทึก</button>
<button style="display:none;" id="btn03" type="button" class="btn btn-submit" onclick="javascript:eva_create_evaluation_detail_summary1_PutUpdate()">บันทึก</button>
</div>
</div>
@@ -304,7 +318,7 @@
<div class='row'>
<div class="form-group col-md-6">
<label id="lab_eva_create_evaluation_detail_review01_supervisor1_date" for="eva_create_evaluation_detail_review01_supervisor1_date">วันที่ประเมิน</label>
<input class="form-control" type="text" id="eva_create_evaluation_detail_review01_supervisor1_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ประเมิน" iRequire="false" iGroup="eva_create_evaluation_detail_review01" />
<input disabled class="form-control" type="text" id="eva_create_evaluation_detail_review01_supervisor1_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ประเมิน" iRequire="false" iGroup="eva_create_evaluation_detail_review01" />
</div>
</div>
<div class='row'>
@@ -329,11 +343,11 @@
<div class="row">
<div class="form-group col-md-12">
<button id="btna01" type="button" class="btn btn-submit" onclick="javascript:saveAll()">บันทึก</button>
<button id="btna01" type="button" class="btn btn-submit mycontrol01" onclick="javascript:saveAll()">บันทึก</button>
<button id="btna02" type="button" class="btn btn-submit" onclick="javascript:saveStatus('next1')">ส่งแบบประเมิน</button>
<button id="btna02" type="button" class="btn btn-submit mycontrol01" onclick="javascript:saveStatus('next1')">ส่งแบบประเมิน</button>
<button id="btna03" type="button" class="btn btn-submit" onclick="javascript:saveStatus('back1')">ตีกลับแบบประเมิน</button>
<button id="btna03" type="button" class="btn btn-submit mycontrol01" onclick="javascript:saveStatus('back1')">ตีกลับแบบประเมิน</button>
</div>
</div>
@@ -371,7 +385,6 @@
searchVacationObject.start_date = formatDateForGetParameter(getDate($("#date_from").val()));
searchVacationObject.end_date = formatDateForGetParameter(getDate($("#date_to").val()));
searchVacationObject.employee_id = $("#eva_create_evaluation_detail_process_employee_id").val();
console.log(searchVacationObject);
return searchVacationObject;
}
@@ -413,6 +426,10 @@
}
function saveStatus(s){
if (!ValidateForm('eva_create_evaluation_detail_review01', eva_create_evaluation_detail_review01_customValidation))
{
return;
}
saveAll();
eva_create_evaluation_detail_status_PutUpdate(s);
}

79
Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml
View File

@@ -201,10 +201,8 @@
<thead>
<tr>
<th>ลำดับ</th>
<th><label>ผลสัมฤทธิ์ตัวชี้วัดผลงาน</label></th>
<th><label>น้ำหนัก (%)</label></th>
<th><label>คะแนน</label></th>
<th><label>รวมคะแนน</label></th>
<th><label>คะแนน <br />(ระบุ 1.00-5.00)</label></th>
@@ -214,14 +212,22 @@
</thead>
<tfoot>
<tr>
<th>รวม</th>
<th></th>
<th></th>
<th></th>
<th></th>
<th><label id='h_eva_evaluation_achievement_process2_score'></label></th>
<th></th>
<th><label id='h_eva_evaluation_achievement_process2_score2'></label></th>
</tr>
<tr>
<th>รวม</th>
<th><label id='h_eva_evaluation_achievement_process2_achievement'></label></th>
<th><label id='h_eva_evaluation_achievement_process2_weight'></label></th>
<th><label id='h_eva_evaluation_achievement_process2_score'></label></th>
<th></th>
<th><label id='x1'></label></th>
<th><label id='h_eva_evaluation_achievement_process2_score2'></label></th>
<th></th>
<th><p id="eva_create_evaluation_detail_summary2_total_summary_supervisor" /></th>
</tr>
@@ -234,7 +240,7 @@
<div class="row">
<div class="form-group col-md-12">
<button id="btn01" type="button" class="btn btn-primary" onclick="javascript:eva_evaluation_achievement_process2_Save(getUrlParameter('id'))">บันทึก</button>
<button style="display:none;" id="btn01" type="button" class="btn btn-primary" onclick="javascript:eva_evaluation_achievement_process2_Save(getUrlParameter('id'))">บันทึก</button>
</div>
</div>
@@ -260,13 +266,22 @@
</tr>
</thead>
<tfoot>
<tr>
<th></th>
<th></th>
<th></th>
<th></th>
<th><label id='h_eva_evaluation_behavior_process2_score'></label></th>
<th></th>
<th><label id='h_eva_evaluation_behavior_process2_score2'></label></th>
</tr>
<tr>
<th></th>
<th><label id='h_eva_evaluation_behavior_process2_behavior'>รวม</label></th>
<th><label id='h_eva_evaluation_behavior_process2_weight'></label></th>
<th><label id='h_eva_evaluation_behavior_process2_score'></label></th>
<th></th>
<th><p id="x2" /></th>
<th><label id='h_eva_evaluation_behavior_process2_score2'></label></th>
<th></th>
<th><p id="eva_create_evaluation_detail_summary2_total_summary_competency_supervisor" /></th>
</tr>
</tfoot>
@@ -278,7 +293,7 @@
<div class="row">
<div class="form-group col-md-12">
<button id="btn02" type="button" class="btn btn-primary" onclick="javascript:eva_evaluation_behavior_process2_Save(getUrlParameter('id'))">บันทึก</button>
<button style="display:none;" id="btn02" type="button" class="btn btn-primary" onclick="javascript:eva_evaluation_behavior_process2_Save(getUrlParameter('id'))">บันทึก</button>
</div>
</div>
@@ -331,7 +346,7 @@
<div class="row">
<div class="form-group col-md-12">
<button id="btn03" type="button" class="btn btn-submit" onclick="javascript:eva_create_evaluation_detail_summary2_PutUpdate()">บันทึก</button>
<button style="display:none;" id="btn03" type="button" class="btn btn-submit" onclick="javascript:eva_create_evaluation_detail_summary2_PutUpdate()">บันทึก</button>
</div>
</div>
@@ -405,7 +420,7 @@
<br />
<section class="wrapper">
<div class="title col-md-12"><div class="line"></div>ความเห็นผู้ประเมินสูงสุด</div>
<div class="title col-md-12"><div class="line"></div>ความเห็นผู้ประเมินสูงสุด <span style="color:red;" id="thestatus2"></span></div>
<section class="card no-border">
<div class="card-body" style="">
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_review02_id" />
@@ -483,7 +498,7 @@
<div class="form-group col-md-6">
<label id="lab_eva_create_evaluation_detail_review03_supervisor1A_date" for="eva_create_evaluation_detail_review03_supervisor1A_date">วันที่ประเมิน</label>
<input class="form-control" type="text" id="eva_create_evaluation_detail_review03_supervisor1A_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ประเมิน" iRequire="true" iGroup="eva_create_evaluation_detail_review03" />
<input disabled class="form-control" type="text" id="eva_create_evaluation_detail_review03_supervisor1A_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ประเมิน" iRequire="false" iGroup="eva_create_evaluation_detail_review03" />
</div>
</div>
<div class='row'>
@@ -531,7 +546,7 @@
<div class="form-group col-md-6">
<label id="lab_eva_create_evaluation_detail_review04_supervisor2A_date" for="eva_create_evaluation_detail_review04_supervisor2A_date">วันที่ประเมิน</label>
<input class="form-control" type="text" id="eva_create_evaluation_detail_review04_supervisor2A_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ประเมิน" iRequire="true" iGroup="eva_create_evaluation_detail_review04" />
<input disabled class="form-control" type="text" id="eva_create_evaluation_detail_review04_supervisor2A_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ประเมิน" iRequire="false" iGroup="eva_create_evaluation_detail_review04" />
</div>
</div>
<div class='row'>
@@ -685,22 +700,44 @@
function saveReview02(){
saveAll();
eva_create_evaluation_detail_review02_PutUpdate();
eva_create_evaluation_detail_review02_PutUpdate(true);
}
function saveReview03(){
saveAll();
eva_create_evaluation_detail_review03_PutUpdate();
//saveAll();
eva_create_evaluation_detail_review03_PutUpdate(true);
}
function saveReview04(){
saveAll();
eva_create_evaluation_detail_review04_PutUpdate();
//saveAll();
eva_create_evaluation_detail_review04_PutUpdate(true);
}
function saveStatus(s){
saveAll();
eva_create_evaluation_detail_status_PutUpdate(s);
if(s === "next2" || s === "back2"){
if (!ValidateForm('eva_create_evaluation_detail_review02', eva_create_evaluation_detail_review02_customValidation))
{
return;
}
saveAll();
eva_create_evaluation_detail_status_PutUpdate(s);
}
else if(s === "next3"){
if (!ValidateForm('eva_create_evaluation_detail_review03', eva_create_evaluation_detail_review03_customValidation))
{
return;
}
eva_create_evaluation_detail_review03_PutUpdate(false);
eva_create_evaluation_detail_status_PutUpdate(s);
}
else if(s === "next4"){
if (!ValidateForm('eva_create_evaluation_detail_review04', eva_create_evaluation_detail_review04_customValidation))
{
return;
}
eva_create_evaluation_detail_review04_PutUpdate(false);
eva_create_evaluation_detail_status_PutUpdate(s);
}
}
function saveAll(){