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

Last commit

Browse Source
This commit is contained in:
nakorn
2022-08-27 11:22:12 +07:00
parent 804bb7d9f2
commit 8f2e0af11b
10 changed files with 109 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ApiControllers/rep_eva_self_reviewControllers.cs
View File

@@ -101,20 +101,20 @@ namespace TodoAPI2.Controllers
if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized();
var httpclient = new WebClient();
var stream = new MemoryStream();
Document document = new Document();
PdfCopy writer = new PdfCopy(document, stream);
document.Open();
//var stream = new MemoryStream();
//Document document = new Document();
//PdfCopy writer = new PdfCopy(document, stream);
//document.Open();
var data1 = GetReport01(model);
PdfReader reader1 = new PdfReader(data1);
reader1.ConsolidateNamedDestinations();
for (int i = 1; i <= reader1.NumberOfPages; i++)
{
PdfImportedPage page = writer.GetImportedPage(reader1, i);
writer.AddPage(page);
}
reader1.Close();
//PdfReader reader1 = new PdfReader(data1);
//reader1.ConsolidateNamedDestinations();
//for (int i = 1; i <= reader1.NumberOfPages; i++)
//{
// PdfImportedPage page = writer.GetImportedPage(reader1, i);
// writer.AddPage(page);
//}
//reader1.Close();
//var data2 = GetReport02(model);
//PdfReader reader2 = new PdfReader(data2);
@@ -126,13 +126,15 @@ namespace TodoAPI2.Controllers
//}
//reader2.Close();
writer.Close();
document.Close();
//writer.Close();
//document.Close();
var datax = stream.ToArray();
var streamx = new MemoryStream(datax);
//var datax = stream.ToArray();
//var streamx = new MemoryStream(datax);
return File(streamx, model.contentType);
var stream = new MemoryStream(data1);
return File(stream, model.contentType);
}
catch (Exception ex)
{

5
Models/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2Service.cs
View File

@@ -275,6 +275,11 @@ namespace TodoAPI2.Models
existingEntity.score4 = i.score2;
existingEntity.sumary4 = i.sumary2;
}
else if (i.who_update == "5")
{
existingEntity.score4 = i.score2;
existingEntity.sumary4 = i.sumary2;
}
//existingEntity.target_score1 = i.target_score1;
//existingEntity.target_score2 = i.target_score2;

26
ViewControllers/eva_self_reviewViewControllers.cs
View File

@@ -40,20 +40,20 @@ namespace TodoAPI2.Controllers
MyHelper.get_login(HttpContext, emp, Response);
if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView
if(HttpContext.Request.Cookies["emp_id"] == "152" // ผอ กลาง
|| HttpContext.Request.Cookies["emp_id"] == "180" // ประยูร สีสด
|| HttpContext.Request.Cookies["emp_id"] == "107" // ประเดิมสวัสดิ์
|| HttpContext.Request.Cookies["emp_id"] == "70" // อังคณา
|| HttpContext.Request.Cookies["emp_id"] == "69" // สาริกา
|| HttpContext.Request.Cookies["emp_id"] == "64" // ขวัญพิชา
|| HttpContext.Request.Cookies["emp_id"] == "161" // อุบลวรรณ
)
{
return View();
}
//if(HttpContext.Request.Cookies["emp_id"] == "152" // ผอ กลาง
// || HttpContext.Request.Cookies["emp_id"] == "180" // ประยูร สีสด
// || HttpContext.Request.Cookies["emp_id"] == "107" // ประเดิมสวัสดิ์
// || HttpContext.Request.Cookies["emp_id"] == "70" // อังคณา
// || HttpContext.Request.Cookies["emp_id"] == "69" // สาริกา
// || HttpContext.Request.Cookies["emp_id"] == "64" // ขวัญพิชา
// || HttpContext.Request.Cookies["emp_id"] == "161" // อุบลวรรณ
// )
//{
// return View();
//}
return View("eva_self_review_close");
//return View();
//return View("eva_self_review_close");
return View();
}
// public IActionResult eva_self_review_d()

3
Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml
View File

@@ -236,7 +236,8 @@
<div class="col-md-12">
<button style="display:none;" class="btn btn-info" type="button" onclick="javascript:CalculateRemainQuota(true)">คำนวณค่าครองชีพใหม่ ตามเกณฑ์เงินเดือน 13,285</button>
<button type="button" class="btn btn-submit" onclick="javascript:rep_eva_savemessage_DoSearch('pdf')">พิมพ์ วงเงินที่กันไว้</button>
<button class="btn btn-info thesubmit" onclick="javascript:eva_adjust_quota_update_status_GoEdit(getUrlParameter('id'), true);">อนุมัติและส่งเงินเดือน</button>
<button class="btn btn-info thesubmit" onclick="javascript:makeApprove();">อนุมัติและส่งเงินเดือน</button>
<button style="display:none;" class="btn btn-info" onclick="javascript:makeWaiting();">รอพิจารณาเงินเดือน</button>
<span id="statusapprove" class="thesubmit"></span>
<!--
<button class="btn btn-info thesubmit2" onclick="javascript:eva_adjust_quota_update_final_status_GoEdit(getUrlParameter('id'), true);">อนุมัติและแสดงแก่พนักงาน</button>

1
Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml
View File

@@ -735,6 +735,7 @@
}
function Oneva_create_evaluation_detail_review05_supervisor3A_resultChanged(a) {
console.log("Oneva_create_evaluation_detail_review05_supervisor3A_resultChanged = " + $(a).val());
if ($(a).val() == "Y") {
$("#eva_create_evaluation_detail_review05_supervisor3A_remark").attr("iRequire", "false");
$("#eva_create_evaluation_detail_review05_supervisor3A_remark").css('border-color', '');

19
wwwroot/js/eva_adjust_quota_update_status/eva_adjust_quota_update_status.js
View File

@@ -31,6 +31,7 @@ function eva_adjust_quota_update_status_FeedDataToForm(data) {
if (statusText != "กรุณาเลือก โดย กรุณาเลือก") $("#statusapprove").text(statusText);
console.log(data);
}
function eva_adjust_quota_update_status_GetFromForm() {
@@ -61,6 +62,18 @@ function eva_adjust_quota_update_status_InitialForm(s) {
//================= Form Mode Setup and Flow =========================================
function makeApprove() {
if (confirm("ท่านต้องการอนุมัติวงเงินที่กันไว้ และแสดงแก่เจ้าหน้าที่แห่งเนติบัณฑิตยสภา ใช่หรือไม่?")) {
$("#eva_adjust_quota_update_status_quota_status").val("Y");
eva_adjust_quota_update_status_PutUpdate();
}
}
function makeWaiting() {
$("#eva_adjust_quota_update_status_quota_status").val("W");
eva_adjust_quota_update_status_PutUpdate();
}
function eva_adjust_quota_update_status_GoCreate() {
// Incase model popup
eva_adjust_quota_update_status_SetCreateForm(true);
@@ -116,9 +129,9 @@ var eva_adjust_quota_update_status_customValidation = function (group) {
function eva_adjust_quota_update_status_PutUpdate() {
if (!confirm("คุณยืนยันการบันทึกสถานะการอนุมัติ ใช่หรือไม่?")) {
return;
}
//if (!confirm("คุณยืนยันการบันทึกสถานะการอนุมัติ ใช่หรือไม่?")) {
// return;
//}
if (!ValidateForm('eva_adjust_quota_update_status', eva_adjust_quota_update_status_customValidation)) {
return;

55
wwwroot/js/eva_create_evaluation_detail_review05/eva_create_evaluation_detail_review05_d.js
View File

@@ -4,23 +4,23 @@ var eva_create_evaluation_detail_review05_API = "/api/eva_create_evaluation_deta
//================= Form Data Customizaiton =========================================
function eva_create_evaluation_detail_review05_FeedDataToForm(data) {
$("#eva_create_evaluation_detail_review05_id").val(data.id);
$("#eva_create_evaluation_detail_review05_create_evaluation_id").val(data.create_evaluation_id);
$("#eva_create_evaluation_detail_review05_supervisor3A").val(data.supervisor3A);
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_detail_review05_supervisor3A_result"), data, "id", "external_name", "item_supervisor3A_result", data.supervisor3A_result);
$("#eva_create_evaluation_detail_review05_supervisor3A_remark").val(data.supervisor3A_remark);
$("#eva_create_evaluation_detail_review05_supervisor3A_date").val(formatDate(data.supervisor3A_date));
$("#eva_create_evaluation_detail_review05_id").val(data.id);
$("#eva_create_evaluation_detail_review05_create_evaluation_id").val(data.create_evaluation_id);
$("#eva_create_evaluation_detail_review05_supervisor3A").val(data.supervisor3A);
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_detail_review05_supervisor3A_result"), data, "external_code", "external_name", "item_supervisor3A_result", data.supervisor3A_result);
$("#eva_create_evaluation_detail_review05_supervisor3A_remark").val(data.supervisor3A_remark);
$("#eva_create_evaluation_detail_review05_supervisor3A_date").val(formatDate(data.supervisor3A_date));
}
function eva_create_evaluation_detail_review05_GetFromForm() {
var eva_create_evaluation_detail_review05Object = new Object();
eva_create_evaluation_detail_review05Object.id = $("#eva_create_evaluation_detail_review05_id").val();
eva_create_evaluation_detail_review05Object.create_evaluation_id = $("#eva_create_evaluation_detail_review05_create_evaluation_id").val();
eva_create_evaluation_detail_review05Object.supervisor3A = $("#eva_create_evaluation_detail_review05_supervisor3A").val();
eva_create_evaluation_detail_review05Object.supervisor3A_result = $("#eva_create_evaluation_detail_review05_supervisor3A_result").val();
eva_create_evaluation_detail_review05Object.supervisor3A_remark = $("#eva_create_evaluation_detail_review05_supervisor3A_remark").val();
eva_create_evaluation_detail_review05Object.supervisor3A_date = getDate($("#eva_create_evaluation_detail_review05_supervisor3A_date").val());
eva_create_evaluation_detail_review05Object.id = $("#eva_create_evaluation_detail_review05_id").val();
eva_create_evaluation_detail_review05Object.create_evaluation_id = $("#eva_create_evaluation_detail_review05_create_evaluation_id").val();
eva_create_evaluation_detail_review05Object.supervisor3A = $("#eva_create_evaluation_detail_review05_supervisor3A").val();
eva_create_evaluation_detail_review05Object.supervisor3A_result = $("#eva_create_evaluation_detail_review05_supervisor3A_result").val();
eva_create_evaluation_detail_review05Object.supervisor3A_remark = $("#eva_create_evaluation_detail_review05_supervisor3A_remark").val();
eva_create_evaluation_detail_review05Object.supervisor3A_date = getDate($("#eva_create_evaluation_detail_review05_supervisor3A_date").val());
return eva_create_evaluation_detail_review05Object;
@@ -29,9 +29,9 @@ eva_create_evaluation_detail_review05Object.supervisor3A_date = getDate($("#eva_
function eva_create_evaluation_detail_review05_InitialForm() {
var successFunc = function (result) {
eva_create_evaluation_detail_review05_FeedDataToForm(result);
endLoad();
endLoad();
};
startLoad();
startLoad();
AjaxGetRequest(apisite + eva_create_evaluation_detail_review05_API + "GetBlankItem", successFunc, AlertDanger);
}
@@ -41,15 +41,15 @@ function eva_create_evaluation_detail_review05_SetEditForm(a) {
var successFunc = function (result) {
eva_create_evaluation_detail_review05_editMode = "UPDATE";
eva_create_evaluation_detail_review05_FeedDataToForm(result);
endLoad();
endLoad();
};
startLoad();
startLoad();
AjaxGetRequest(apisite + eva_create_evaluation_detail_review05_API + a, successFunc, AlertDanger);
}
function eva_create_evaluation_detail_review05_SetCreateForm() {
eva_create_evaluation_detail_review05_editMode = "CREATE";
eva_create_evaluation_detail_review05_InitialForm();
eva_create_evaluation_detail_review05_InitialForm();
}
//================= Update and Delete =========================================
@@ -59,8 +59,7 @@ var eva_create_evaluation_detail_review05_customValidation = function (group) {
};
function eva_create_evaluation_detail_review05_PutUpdate() {
if (!ValidateForm('eva_create_evaluation_detail_review05', eva_create_evaluation_detail_review05_customValidation))
{
if (!ValidateForm('eva_create_evaluation_detail_review05', eva_create_evaluation_detail_review05_customValidation)) {
return;
}
var data = eva_create_evaluation_detail_review05_GetFromForm();
@@ -68,19 +67,19 @@ function eva_create_evaluation_detail_review05_PutUpdate() {
//Update Mode
if (eva_create_evaluation_detail_review05_editMode === "UPDATE") {
var successFunc1 = function (result) {
AlertSuccess(result.code+" "+result.message);
endLoad();
AlertSuccess(result.code + " " + result.message);
endLoad();
};
startLoad();
startLoad();
AjaxPutRequest(apisite + eva_create_evaluation_detail_review05_API + data.id, data, successFunc1, AlertDanger);
}
// Create mode
else {
var successFunc2 = function (result) {
AlertSuccess(result.code+" "+result.message);
endLoad();
AlertSuccess(result.code + " " + result.message);
endLoad();
};
startLoad();
startLoad();
AjaxPostRequest(apisite + eva_create_evaluation_detail_review05_API, data, successFunc2, AlertDanger);
}
}
@@ -88,11 +87,11 @@ function eva_create_evaluation_detail_review05_PutUpdate() {
function eva_create_evaluation_detail_review05_GoDelete(a) {
if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) {
var successFunc = function (result) {
AlertSuccess(result.code+" "+result.message);
AlertSuccess(result.code + " " + result.message);
eva_create_evaluation_detail_review05_RefreshTable();
endLoad();
endLoad();
};
startLoad();
startLoad();
AjaxDeleteRequest(apisite + eva_create_evaluation_detail_review05_API + a, null, successFunc, AlertDanger);
}
}

2
wwwroot/js/eva_create_evaluation_detail_summary2/eva_create_evaluation_detail_summary2_d.js
View File

@@ -27,7 +27,7 @@ function eva_create_evaluation_detail_summary2_FeedDataToForm(data, role_code) {
$("#eva_create_evaluation_detail_summary2_score_supervisor").text(data.score_supervisor1A);
$("#eva_create_evaluation_detail_summary2_level_score_supervisor").text(data.level_score_supervisor1A);
}
else if(role_code === "4"){
else if (role_code === "4" || role_code === "5"){
$("#eva_create_evaluation_detail_summary2_total_summary_supervisor").text(data.total_summary_supervisor2A);
$("#eva_create_evaluation_detail_summary2_Final_summary_supervisor").text(data.Final_summary_supervisor2A);
$("#eva_create_evaluation_detail_summary2_total_summary_competency_supervisor").text(data.total_summary_competency_supervisor2A);

25
wwwroot/js/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2_inline.js
View File

@@ -34,8 +34,8 @@ function eva_evaluation_achievement_process2_FeedDataToForm(data, i, blankItem,
data.score4 = Number(data.score4).toFixed(3);
data.sumary4 = Number(data.sumary4).toFixed(3);
//console.log(role_code);
//console.log(data);
console.log(role_code);
console.log(data);
if (role_code === "2") {
$("#eva_evaluation_achievement_process2_score_" + i).text(data.score);
@@ -55,7 +55,7 @@ function eva_evaluation_achievement_process2_FeedDataToForm(data, i, blankItem,
$("#eva_evaluation_achievement_process2_score2_" + i).val(data.score3);
}
$("#eva_evaluation_achievement_process2_sumary2_" + i).text(data.sumary3);
} else if (role_code === "4") {
} else if (role_code === "4" || role_code === "5") {
$("#eva_evaluation_achievement_process2_score_" + i).text(data.score3);
$("#eva_evaluation_achievement_process2_sumary_" + i).text(data.sumary3);
if (data.score4 === "0.000") {
@@ -64,16 +64,17 @@ function eva_evaluation_achievement_process2_FeedDataToForm(data, i, blankItem,
$("#eva_evaluation_achievement_process2_score2_" + i).val(data.score4);
}
$("#eva_evaluation_achievement_process2_sumary2_" + i).text(data.sumary4);
} else if (role_code === "5") {
$("#eva_evaluation_achievement_process2_score_" + i).text(data.score4);
$("#eva_evaluation_achievement_process2_sumary_" + i).text(data.sumary4);
if (data.score5 === "0.000") {
$("#eva_evaluation_achievement_process2_score2_" + i).val(data.score4);
} else {
$("#eva_evaluation_achievement_process2_score2_" + i).val(data.score5);
}
$("#eva_evaluation_achievement_process2_sumary2_" + i).text(data.sumary5);
}
//else if (role_code === "5") {
// $("#eva_evaluation_achievement_process2_score_" + i).text(data.score4);
// $("#eva_evaluation_achievement_process2_sumary_" + i).text(data.sumary4);
// if (data.score5 === "0.000") {
// $("#eva_evaluation_achievement_process2_score2_" + i).val(data.score4);
// } else {
// $("#eva_evaluation_achievement_process2_score2_" + i).val(data.score5);
// }
// $("#eva_evaluation_achievement_process2_sumary2_" + i).text(data.sumary5);
//}
//$("#eva_evaluation_achievement_process2_target_score1_" + i).val(data.target_score1);
//$("#eva_evaluation_achievement_process2_target_score2_" + i).val(data.target_score2);

22
wwwroot/js/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2_inline.js
View File

@@ -52,7 +52,7 @@ function eva_evaluation_behavior_process2_FeedDataToForm(data, i, blankItem, rol
$("#eva_evaluation_behavior_process2_score2_" + i).val(data.score3);
}
$("#eva_evaluation_behavior_process2_sumary2_" + i).text(data.sumary3);
} else if (role_code === "4") {
} else if (role_code === "4" || role_code === "5") {
$("#eva_evaluation_behavior_process2_score_" + i).text(data.score3);
$("#eva_evaluation_behavior_process2_sumary_" + i).text(data.sumary3);
if (data.score4 === "0.000") {
@@ -61,17 +61,19 @@ function eva_evaluation_behavior_process2_FeedDataToForm(data, i, blankItem, rol
$("#eva_evaluation_behavior_process2_score2_" + i).val(data.score4);
}
$("#eva_evaluation_behavior_process2_sumary2_" + i).text(data.sumary4);
} else if (role_code === "5") {
$("#eva_evaluation_behavior_process2_score_" + i).text(data.score4);
$("#eva_evaluation_behavior_process2_sumary_" + i).text(data.sumary4);
if (data.score5 === "0.000") {
$("#eva_evaluation_behavior_process2_score2_" + i).val(data.score4);
} else {
$("#eva_evaluation_behavior_process2_score2_" + i).val(data.score5);
}
$("#eva_evaluation_behavior_process2_sumary2_" + i).text(data.sumary5);
}
//else if (role_code === "5") {
// $("#eva_evaluation_behavior_process2_score_" + i).text(data.score4);
// $("#eva_evaluation_behavior_process2_sumary_" + i).text(data.sumary4);
// if (data.score5 === "0.000") {
// $("#eva_evaluation_behavior_process2_score2_" + i).val(data.score4);
// } else {
// $("#eva_evaluation_behavior_process2_score2_" + i).val(data.score5);
// }
// $("#eva_evaluation_behavior_process2_sumary2_" + i).text(data.sumary5);
//}
//$("#eva_evaluation_behavior_process2_target_score1_" + i).val(data.target_score1);
//$("#eva_evaluation_behavior_process2_target_score2_" + i).val(data.target_score2);
//$("#eva_evaluation_behavior_process2_target_score3_" + i).val(data.target_score3);