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

แก้ไข ให้บันทึก เพื่อพิมพ์ได้ก่อน

Browse Source
This commit is contained in:
nakorn
2021-10-26 16:38:42 +07:00
parent 26f416ec46
commit 40d91d2ad2
5 changed files with 57 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Models/external_linkage/Iexternal_linkageService.cs
View File

@@ -24,6 +24,8 @@ namespace TodoAPI2.Models
List<external_linkageViewModel> Getevaluation_accept();
List<external_linkageViewModel> GetAgreeDisagree();
List<external_linkageViewModel> GetAgreeDisagree2();
List<external_linkageViewModel> GetAgreeDisagree3();
List<external_linkageViewModel> GetDepartmentData();
List<external_linkageViewModel> GetDepartmentDataForReport();
List<external_linkageViewModel> GetPositionForReport();

24
Models/external_linkage/external_linkageService.cs
View File

@@ -248,6 +248,30 @@ namespace TodoAPI2.Models
return result;
}
public List<external_linkageViewModel> GetAgreeDisagree3()
{
var result = new List<external_linkageViewModel>();
var i = new external_linkageViewModel();
i.external_id = 1;
i.external_code = "Y";
i.external_name = "เห็นด้วยกับผลการประเมิน";
result.Add(i);
var j = new external_linkageViewModel();
j.external_id = 2;
j.external_code = "N";
j.external_name = "ไม่เห็นด้วยและมีความเห็นต่าง";
result.Add(j);
var k = new external_linkageViewModel();
k.external_id = 3;
k.external_code = "R";
k.external_name = "อยู่ระหว่างพิจารณา แต่ให้พิมพ์ออกได้ก่อน";
result.Add(k);
return result;
}
public List<external_linkageViewModel> GetAgreeDisagree()
{
var result = new List<external_linkageViewModel>();

8
Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml
View File

@@ -648,13 +648,13 @@
}
function Oneva_create_evaluation_detail_review02_supervisor2_resultChanged(a) {
if ($(a).val() == "Y") {
if ($(a).val() === "N") {
$("#eva_create_evaluation_detail_review02_supervisor2_remark").attr("iRequire", "true");
$("#review02x").show();
} else {
$("#eva_create_evaluation_detail_review02_supervisor2_remark").attr("iRequire", "false");
$("#eva_create_evaluation_detail_review02_supervisor2_remark").css('border-color', '');
$("#review02x").hide();
} else {
$("#eva_create_evaluation_detail_review02_supervisor2_remark").attr("iRequire", "true");
$("#review02x").show();
}
}

2
build_command.txt
View File

@@ -1,5 +1,5 @@
docker build -t registry.gitlab.com/zd-team/tb/tb320eva_zd .
docker login registry.gitlab.com -u <your username> -p <your password>
docker login registry.gitlab.com -u nakorn2526 -p
docker push registry.gitlab.com/zd-team/tb/tb320eva_zd

29
wwwroot/js/eva_create_evaluation_detail_review02/eva_create_evaluation_detail_review02_d.js
View File

@@ -4,23 +4,23 @@ var eva_create_evaluation_detail_review02_API = "/api/eva_create_evaluation_deta
//================= Form Data Customizaiton =========================================
function eva_create_evaluation_detail_review02_FeedDataToForm(data) {
$("#eva_create_evaluation_detail_review02_id").val(data.id);
$("#eva_create_evaluation_detail_review02_create_evaluation_id").val(data.create_evaluation_id);
$("#eva_create_evaluation_detail_review02_supervisor2").val(data.supervisor2);
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_detail_review02_supervisor2_result"), data, "external_code", "external_name", "item_supervisor2_result", data.supervisor2_result);
$("#eva_create_evaluation_detail_review02_supervisor2_remark").val(data.supervisor2_remark);
$("#eva_create_evaluation_detail_review02_supervisor2_date").val(formatDate(data.supervisor2_date));
$("#eva_create_evaluation_detail_review02_id").val(data.id);
$("#eva_create_evaluation_detail_review02_create_evaluation_id").val(data.create_evaluation_id);
$("#eva_create_evaluation_detail_review02_supervisor2").val(data.supervisor2);
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_detail_review02_supervisor2_result"), data, "external_code", "external_name", "item_supervisor2_result", data.supervisor2_result);
$("#eva_create_evaluation_detail_review02_supervisor2_remark").val(data.supervisor2_remark);
$("#eva_create_evaluation_detail_review02_supervisor2_date").val(formatDate(data.supervisor2_date));
}
function eva_create_evaluation_detail_review02_GetFromForm() {
var eva_create_evaluation_detail_review02Object = new Object();
eva_create_evaluation_detail_review02Object.id = $("#eva_create_evaluation_detail_review02_id").val();
eva_create_evaluation_detail_review02Object.create_evaluation_id = $("#eva_create_evaluation_detail_review02_create_evaluation_id").val();
eva_create_evaluation_detail_review02Object.supervisor2 = $("#eva_create_evaluation_detail_review02_supervisor2").val();
eva_create_evaluation_detail_review02Object.supervisor2_result = $("#eva_create_evaluation_detail_review02_supervisor2_result").val();
eva_create_evaluation_detail_review02Object.supervisor2_remark = $("#eva_create_evaluation_detail_review02_supervisor2_remark").val();
eva_create_evaluation_detail_review02Object.supervisor2_date = getDate($("#eva_create_evaluation_detail_review02_supervisor2_date").val());
eva_create_evaluation_detail_review02Object.id = $("#eva_create_evaluation_detail_review02_id").val();
eva_create_evaluation_detail_review02Object.create_evaluation_id = $("#eva_create_evaluation_detail_review02_create_evaluation_id").val();
eva_create_evaluation_detail_review02Object.supervisor2 = $("#eva_create_evaluation_detail_review02_supervisor2").val();
eva_create_evaluation_detail_review02Object.supervisor2_result = $("#eva_create_evaluation_detail_review02_supervisor2_result").val();
eva_create_evaluation_detail_review02Object.supervisor2_remark = $("#eva_create_evaluation_detail_review02_supervisor2_remark").val();
eva_create_evaluation_detail_review02Object.supervisor2_date = getDate($("#eva_create_evaluation_detail_review02_supervisor2_date").val());
return eva_create_evaluation_detail_review02Object;
@@ -59,8 +59,7 @@ var eva_create_evaluation_detail_review02_customValidation = function (group) {
};
function eva_create_evaluation_detail_review02_PutUpdate(xx) {
if (!ValidateForm('eva_create_evaluation_detail_review02', eva_create_evaluation_detail_review02_customValidation))
{
if (!ValidateForm('eva_create_evaluation_detail_review02', eva_create_evaluation_detail_review02_customValidation)) {
return;
}
var data = eva_create_evaluation_detail_review02_GetFromForm();
@@ -69,7 +68,7 @@ function eva_create_evaluation_detail_review02_PutUpdate(xx) {
if (eva_create_evaluation_detail_review02_editMode === "UPDATE") {
var successFunc1 = function (result) {
AlertSuccess(result.message);
if(xx) window.location.reload();
if (xx) window.location.reload();
endLoad();
};
startLoad();