diff --git a/ApiControllers/rep_eva02Controllers.cs b/ApiControllers/rep_eva02Controllers.cs index e64a685..1998869 100644 --- a/ApiControllers/rep_eva02Controllers.cs +++ b/ApiControllers/rep_eva02Controllers.cs @@ -101,6 +101,9 @@ namespace TodoAPI2.Controllers string reportsite = MyHelper.GetConfig(Configuration, "JasperReportServer:reportsite"); string username = MyHelper.GetConfig(Configuration, "JasperReportServer:username"); string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password"); + + _repository.SetEvaDate(model); + string url = $"{mainurl}{reportsite}/rep_eva02.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; var data = httpclient.DownloadData(url); diff --git a/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs b/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs index 86e7121..148f28e 100644 --- a/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs +++ b/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs @@ -519,11 +519,11 @@ namespace TodoAPI2.Models model.decimal_limit_quota = Convert.ToDecimal(model.limit_quota); var postponement_data = (from postponement in _repository.Context.eva_adjust_postponement - join create_evaluation in _repository.Context.eva_create_evaluation on postponement.create_evaluation_id equals create_evaluation.id + //join create_evaluation in _repository.Context.eva_create_evaluation on postponement.create_evaluation_id equals create_evaluation.id where postponement.id == model.quota_id select new { - create_evaluation.performance_plan_id, + //create_evaluation.performance_plan_id, postponement.fiscal_year, postponement.theDate, postponement.limit_frame, @@ -532,34 +532,29 @@ namespace TodoAPI2.Models if(postponement_data != null) { - var plan_id = postponement_data.performance_plan_id; - - if(plan_id == null) - { - plan_id = (from plan_in_db in _repository.Context.eva_performance_plan + var plan_id = (from plan_in_db in _repository.Context.eva_performance_plan where plan_in_db.fiscal_year == postponement_data.fiscal_year && plan_in_db.theTime == plan_in_db.theTime select plan_in_db.id).FirstOrDefault(); - } - if (plan_id.HasValue) + var plan = (from eva_p_p in _repository.Context.eva_performance_plan + where eva_p_p.id == plan_id + select eva_p_p).FirstOrDefault(); + + if(plan != null) { - var plan = (from eva_p_p in _repository.Context.eva_performance_plan - where eva_p_p.id == plan_id - select eva_p_p).FirstOrDefault(); - var start_plan = (from s in _repository.Context.eva_performance_plan_detail - where s.performance_plan_id == postponement_data.performance_plan_id + where s.performance_plan_id == plan_id select s.start_date).Min(); var end_plan = (from s in _repository.Context.eva_performance_plan_detail - where s.performance_plan_id == postponement_data.performance_plan_id + where s.performance_plan_id == plan_id select s.end_date).Max(); model.theTime = plan.theTime; model.min_plan_start_date = MyHelper.GetDateStringForReport(start_plan); model.max_plan_end_date = MyHelper.GetDateStringForReport(end_plan); - } + } } return model; diff --git a/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs b/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs index 570baf6..2476528 100644 --- a/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs +++ b/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs @@ -102,6 +102,12 @@ namespace TodoAPI2.Models public List GetListBySearch(eva_limit_frame_groupSearchModel model) { + var group_count = (from i in _repository.Context.eva_limit_frame_employee + join j in _repository.Context.eva_limit_frame_group on i.frame_group_guid equals j.id + where j.frame_plan_guid == model.frame_plan_guid + group i.id by j.id into g + select new { gid = g.Key, emp = g.Count() }).ToList(); + var data = ( from m_eva_limit_frame_group in _repository.Context.eva_limit_frame_group @@ -114,13 +120,13 @@ namespace TodoAPI2.Models from fk_eva_evaluation_groupResult2 in eva_evaluation_groupResult2.DefaultIfEmpty() - where - 1 == 1 + where + 1 == 1 && (!model.frame_plan_guid.HasValue || m_eva_limit_frame_group.frame_plan_guid == model.frame_plan_guid) && (!model.group_guid.HasValue || m_eva_limit_frame_group.group_guid == model.group_guid) - orderby fk_eva_evaluation_groupResult2.code + orderby fk_eva_evaluation_groupResult2.code select new eva_limit_frame_groupViewModel() { id = m_eva_limit_frame_group.id, @@ -135,6 +141,8 @@ namespace TodoAPI2.Models frame_plan_guid_eva_limit_frame_plan_executed_date = fk_eva_limit_frame_planResult1.executed_date, group_guid_eva_evaluation_group_code = fk_eva_evaluation_groupResult2.thegroup, + emp_qty = (from x in group_count where x.gid == m_eva_limit_frame_group.id select x.emp).FirstOrDefault(), + isActive = m_eva_limit_frame_group.isActive, Created = m_eva_limit_frame_group.created, Updated = m_eva_limit_frame_group.updated diff --git a/Models/eva_limit_frame_group/eva_limit_frame_groupViewModel.cs b/Models/eva_limit_frame_group/eva_limit_frame_groupViewModel.cs index d2a548b..371172c 100644 --- a/Models/eva_limit_frame_group/eva_limit_frame_groupViewModel.cs +++ b/Models/eva_limit_frame_group/eva_limit_frame_groupViewModel.cs @@ -31,6 +31,8 @@ namespace TodoAPI2.Models public DateTime? frame_plan_guid_eva_limit_frame_plan_executed_date { get; set; } public string group_guid_eva_evaluation_group_code { get; set; } + public int? emp_qty { get; set; } + public string remark_formatted { get { diff --git a/Models/eva_salary_cylinder/eva_salary_cylinderService.cs b/Models/eva_salary_cylinder/eva_salary_cylinderService.cs index 68e8634..5e17e6c 100644 --- a/Models/eva_salary_cylinder/eva_salary_cylinderService.cs +++ b/Models/eva_salary_cylinder/eva_salary_cylinderService.cs @@ -95,7 +95,7 @@ namespace TodoAPI2.Models where m_eva_salary_cylinder.position_type == position_type || !position_type.HasValue - orderby m_eva_salary_cylinder.created descending + orderby fk_external_linkageResult1.external_code, fk_external_linkageResult2.external_code select new eva_salary_cylinderViewModel() { id = m_eva_salary_cylinder.id, @@ -139,7 +139,7 @@ namespace TodoAPI2.Models && (m_eva_salary_cylinder.position_type == model.position_type || !model.position_type.HasValue) - orderby m_eva_salary_cylinder.created descending + orderby fk_external_linkageResult1.external_code, fk_external_linkageResult2.external_code select new eva_salary_cylinderViewModel() { id = m_eva_salary_cylinder.id, diff --git a/Models/rep_eva02/Irep_eva02Service.cs b/Models/rep_eva02/Irep_eva02Service.cs index 1febf79..a2c1ffa 100644 --- a/Models/rep_eva02/Irep_eva02Service.cs +++ b/Models/rep_eva02/Irep_eva02Service.cs @@ -16,7 +16,7 @@ namespace TodoAPI2.Models rep_eva02WithSelectionViewModel GetWithSelection(Guid id); rep_eva02WithSelectionViewModel GetBlankItem(); - + void SetEvaDate(rep_eva02ReportRequestModel model); } } diff --git a/Models/rep_eva02/rep_eva02SearchModel.cs b/Models/rep_eva02/rep_eva02SearchModel.cs index f6c686a..8ac55c8 100644 --- a/Models/rep_eva02/rep_eva02SearchModel.cs +++ b/Models/rep_eva02/rep_eva02SearchModel.cs @@ -18,7 +18,7 @@ namespace TodoAPI2.Models public int? round_id { get; set; } public string round_text { get; set; } - + public string eva_date { get; set; } } } diff --git a/Models/rep_eva02/rep_eva02Service.cs b/Models/rep_eva02/rep_eva02Service.cs index 544d7e6..97f02b4 100644 --- a/Models/rep_eva02/rep_eva02Service.cs +++ b/Models/rep_eva02/rep_eva02Service.cs @@ -73,6 +73,13 @@ namespace TodoAPI2.Models return i; } + public void SetEvaDate(rep_eva02ReportRequestModel model) + { + model.eva_date = (from i in _repository.Context.eva_adjust_postponement + where i.id == model.round_id + select MyHelper.GetDateStringForReport(i.theDate)).FirstOrDefault(); + } + #endregion #endregion diff --git a/Views/vw_limit_frame_planView/vw_limit_frame_plan_d.cshtml b/Views/vw_limit_frame_planView/vw_limit_frame_plan_d.cshtml index 0a4cf40..2a1ee1e 100644 --- a/Views/vw_limit_frame_planView/vw_limit_frame_plan_d.cshtml +++ b/Views/vw_limit_frame_planView/vw_limit_frame_plan_d.cshtml @@ -44,12 +44,13 @@ +
+
-
บันทึกข้อมูล วงเงินที่ใช้ในการเลื่อนเงินเดือน
+
วงเงินที่ใช้ในการเลื่อนเงินเดือนของพนักงานเนติบัณฑิตยสภา ของแต่ละกอง/ส่วนงาน
-
@@ -57,7 +58,7 @@
- +
@@ -76,16 +77,10 @@
+
-
- -
- -
-
วงเงินที่ใช้ในการเลื่อนเงินเดือนของแต่ละกอง/ส่วนงาน
- diff --git a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js index 601045f..794456c 100644 --- a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js +++ b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js @@ -5,62 +5,62 @@ var eva_create_evaluation_detail_process_API = "/api/eva_create_evaluation_detai function eva_create_evaluation_detail_process_GetSearchParameter() { var eva_create_evaluation_detail_processSearchObject = new Object(); -eva_create_evaluation_detail_processSearchObject.create_evaluation_id = $("#s_eva_create_evaluation_detail_process_create_evaluation_id").val(); -eva_create_evaluation_detail_processSearchObject.org_id = $("#s_eva_create_evaluation_detail_process_org_id").val(); -eva_create_evaluation_detail_processSearchObject.search_employee_code = $("#s_eva_create_evaluation_detail_process_search_employee_code").val(); -eva_create_evaluation_detail_processSearchObject.search_employee_fullname = $("#s_eva_create_evaluation_detail_process_search_employee_fullname").val(); -eva_create_evaluation_detail_processSearchObject.employee_id = $("#s_eva_create_evaluation_detail_process_employee_id").val(); + eva_create_evaluation_detail_processSearchObject.create_evaluation_id = $("#s_eva_create_evaluation_detail_process_create_evaluation_id").val(); + eva_create_evaluation_detail_processSearchObject.org_id = $("#s_eva_create_evaluation_detail_process_org_id").val(); + eva_create_evaluation_detail_processSearchObject.search_employee_code = $("#s_eva_create_evaluation_detail_process_search_employee_code").val(); + eva_create_evaluation_detail_processSearchObject.search_employee_fullname = $("#s_eva_create_evaluation_detail_process_search_employee_fullname").val(); + eva_create_evaluation_detail_processSearchObject.employee_id = $("#s_eva_create_evaluation_detail_process_employee_id").val(); -eva_create_evaluation_detail_processSearchObject.path = "d"; + eva_create_evaluation_detail_processSearchObject.path = "d"; return eva_create_evaluation_detail_processSearchObject; } function eva_create_evaluation_detail_process_FeedDataToSearchForm(data) { -$("#s_eva_create_evaluation_detail_process_create_evaluation_id").val(data.create_evaluation_id); -DropDownClearFormAndFeedWithData($("#s_eva_create_evaluation_detail_process_org_id"), data, "id", "external_name", "item_org_id", data.org_id); -$("#s_eva_create_evaluation_detail_process_search_employee_code").val(data.search_employee_code); -$("#s_eva_create_evaluation_detail_process_search_employee_fullname").val(data.search_employee_fullname); -DropDownClearFormAndFeedWithData($("#s_eva_create_evaluation_detail_process_employee_id"), data, "id", "fullname", "item_employee_id", data.employee_id); -console.log(data.item_employee_id); + $("#s_eva_create_evaluation_detail_process_create_evaluation_id").val(data.create_evaluation_id); + DropDownClearFormAndFeedWithData($("#s_eva_create_evaluation_detail_process_org_id"), data, "id", "external_name", "item_org_id", data.org_id); + $("#s_eva_create_evaluation_detail_process_search_employee_code").val(data.search_employee_code); + $("#s_eva_create_evaluation_detail_process_search_employee_fullname").val(data.search_employee_fullname); + DropDownClearFormAndFeedWithData($("#s_eva_create_evaluation_detail_process_employee_id"), data, "id", "fullname", "item_employee_id", data.employee_id); + console.log(data.item_employee_id); } //================= Form Data Customizaiton ========================================= function eva_create_evaluation_detail_process_FeedDataToForm(data) { -$("#eva_create_evaluation_detail_process_id").val(data.id); -$("#eva_create_evaluation_detail_process_evaluation_round").text(data.evaluation_round); -$("#eva_create_evaluation_detail_process_employee_code").text(data.employee_code); -$("#eva_create_evaluation_detail_process_employee_fullname").text(data.employee_fullname); -$("#eva_create_evaluation_detail_process_employee_position").text(data.employee_position); -$("#eva_create_evaluation_detail_process_employee_position_type").text(data.employee_position_type); -$("#eva_create_evaluation_detail_process_employee_position_level").text(data.employee_position_level); -$("#eva_create_evaluation_detail_process_employee_org").text(data.employee_org); -$("#eva_create_evaluation_detail_process_chief_fullname").text(data.chief_fullname); -$("#eva_create_evaluation_detail_process_chief_position").text(data.chief_position); -$("#eva_create_evaluation_detail_process_create_evaluation_id").val(data.create_evaluation_id); -DropDownClearFormAndFeedWithData($("#eva_create_evaluation_detail_process_org_id"), data, "id", "external_name", "item_org_id", data.org_id); -$("#eva_create_evaluation_detail_process_search_employee_code").val(data.search_employee_code); -$("#eva_create_evaluation_detail_process_search_employee_fullname").val(data.search_employee_fullname); + $("#eva_create_evaluation_detail_process_id").val(data.id); + $("#eva_create_evaluation_detail_process_evaluation_round").text(data.evaluation_round); + $("#eva_create_evaluation_detail_process_employee_code").text(data.employee_code); + $("#eva_create_evaluation_detail_process_employee_fullname").text(data.employee_fullname); + $("#eva_create_evaluation_detail_process_employee_position").text(data.employee_position); + $("#eva_create_evaluation_detail_process_employee_position_type").text(data.employee_position_type); + $("#eva_create_evaluation_detail_process_employee_position_level").text(data.employee_position_level); + $("#eva_create_evaluation_detail_process_employee_org").text(data.employee_org); + $("#eva_create_evaluation_detail_process_chief_fullname").text(data.chief_fullname); + $("#eva_create_evaluation_detail_process_chief_position").text(data.chief_position); + $("#eva_create_evaluation_detail_process_create_evaluation_id").val(data.create_evaluation_id); + DropDownClearFormAndFeedWithData($("#eva_create_evaluation_detail_process_org_id"), data, "id", "external_name", "item_org_id", data.org_id); + $("#eva_create_evaluation_detail_process_search_employee_code").val(data.search_employee_code); + $("#eva_create_evaluation_detail_process_search_employee_fullname").val(data.search_employee_fullname); } function eva_create_evaluation_detail_process_GetFromForm() { var eva_create_evaluation_detail_processObject = new Object(); -eva_create_evaluation_detail_processObject.id = $("#eva_create_evaluation_detail_process_id").val(); -eva_create_evaluation_detail_processObject.evaluation_round = $("#eva_create_evaluation_detail_process_evaluation_round").text(); -eva_create_evaluation_detail_processObject.employee_code = $("#eva_create_evaluation_detail_process_employee_code").text(); -eva_create_evaluation_detail_processObject.employee_fullname = $("#eva_create_evaluation_detail_process_employee_fullname").text(); -eva_create_evaluation_detail_processObject.employee_position = $("#eva_create_evaluation_detail_process_employee_position").text(); -eva_create_evaluation_detail_processObject.employee_position_type = $("#eva_create_evaluation_detail_process_employee_position_type").text(); -eva_create_evaluation_detail_processObject.employee_position_level = $("#eva_create_evaluation_detail_process_employee_position_level").text(); -eva_create_evaluation_detail_processObject.employee_org = $("#eva_create_evaluation_detail_process_employee_org").text(); -eva_create_evaluation_detail_processObject.chief_fullname = $("#eva_create_evaluation_detail_process_chief_fullname").text(); -eva_create_evaluation_detail_processObject.chief_position = $("#eva_create_evaluation_detail_process_chief_position").text(); -eva_create_evaluation_detail_processObject.create_evaluation_id = $("#eva_create_evaluation_detail_process_create_evaluation_id").val(); -eva_create_evaluation_detail_processObject.org_id = $("#eva_create_evaluation_detail_process_org_id").val(); -eva_create_evaluation_detail_processObject.search_employee_code = $("#eva_create_evaluation_detail_process_search_employee_code").val(); -eva_create_evaluation_detail_processObject.search_employee_fullname = $("#eva_create_evaluation_detail_process_search_employee_fullname").val(); + eva_create_evaluation_detail_processObject.id = $("#eva_create_evaluation_detail_process_id").val(); + eva_create_evaluation_detail_processObject.evaluation_round = $("#eva_create_evaluation_detail_process_evaluation_round").text(); + eva_create_evaluation_detail_processObject.employee_code = $("#eva_create_evaluation_detail_process_employee_code").text(); + eva_create_evaluation_detail_processObject.employee_fullname = $("#eva_create_evaluation_detail_process_employee_fullname").text(); + eva_create_evaluation_detail_processObject.employee_position = $("#eva_create_evaluation_detail_process_employee_position").text(); + eva_create_evaluation_detail_processObject.employee_position_type = $("#eva_create_evaluation_detail_process_employee_position_type").text(); + eva_create_evaluation_detail_processObject.employee_position_level = $("#eva_create_evaluation_detail_process_employee_position_level").text(); + eva_create_evaluation_detail_processObject.employee_org = $("#eva_create_evaluation_detail_process_employee_org").text(); + eva_create_evaluation_detail_processObject.chief_fullname = $("#eva_create_evaluation_detail_process_chief_fullname").text(); + eva_create_evaluation_detail_processObject.chief_position = $("#eva_create_evaluation_detail_process_chief_position").text(); + eva_create_evaluation_detail_processObject.create_evaluation_id = $("#eva_create_evaluation_detail_process_create_evaluation_id").val(); + eva_create_evaluation_detail_processObject.org_id = $("#eva_create_evaluation_detail_process_org_id").val(); + eva_create_evaluation_detail_processObject.search_employee_code = $("#eva_create_evaluation_detail_process_search_employee_code").val(); + eva_create_evaluation_detail_processObject.search_employee_fullname = $("#eva_create_evaluation_detail_process_search_employee_fullname").val(); return eva_create_evaluation_detail_processObject; @@ -69,14 +69,14 @@ eva_create_evaluation_detail_processObject.search_employee_fullname = $("#eva_cr function eva_create_evaluation_detail_process_InitialForm(s) { var successFunc = function (result) { eva_create_evaluation_detail_process_FeedDataToForm(result); - eva_create_evaluation_detail_process_FeedDataToSearchForm(result); + eva_create_evaluation_detail_process_FeedDataToSearchForm(result); if (s) { // Incase model popup $("#eva_create_evaluation_detail_processModel").modal("show"); } - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxGetRequest(apisite + eva_create_evaluation_detail_process_API + "GetBlankItem", successFunc, AlertDanger); } @@ -91,13 +91,12 @@ function eva_create_evaluation_detail_process_GoCreate() { } function eva_create_evaluation_detail_process_GoEdit(a, role_code) { - if(role_code=="1"){ + if (role_code == "1") { window_open(appsite + "/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d?id=" + a); } - else - { + else { window_open(appsite + "/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2?id=" + a); - } + } } function eva_create_evaluation_detail_process_SetEditForm(a) { @@ -105,15 +104,15 @@ function eva_create_evaluation_detail_process_SetEditForm(a) { eva_create_evaluation_detail_process_editMode = "UPDATE"; eva_create_evaluation_detail_process_FeedDataToForm(result); $("#eva_create_evaluation_detail_processModel").modal("show"); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxGetRequest(apisite + eva_create_evaluation_detail_process_API + a, successFunc, AlertDanger); } function eva_create_evaluation_detail_process_SetCreateForm(s) { eva_create_evaluation_detail_process_editMode = "CREATE"; - eva_create_evaluation_detail_process_InitialForm(s); + eva_create_evaluation_detail_process_InitialForm(s); } function eva_create_evaluation_detail_process_RefreshTable() { @@ -131,8 +130,7 @@ var eva_create_evaluation_detail_process_customValidation = function (group) { }; function eva_create_evaluation_detail_process_PutUpdate() { - if (!ValidateForm('eva_create_evaluation_detail_process', eva_create_evaluation_detail_process_customValidation)) - { + if (!ValidateForm('eva_create_evaluation_detail_process', eva_create_evaluation_detail_process_customValidation)) { return; } @@ -144,9 +142,9 @@ function eva_create_evaluation_detail_process_PutUpdate() { $("#eva_create_evaluation_detail_processModel").modal("hide"); AlertSuccess(result.message); eva_create_evaluation_detail_process_RefreshTable(); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxPutRequest(apisite + eva_create_evaluation_detail_process_API + data.id, data, successFunc1, AlertDanger); } // Create mode @@ -155,9 +153,9 @@ function eva_create_evaluation_detail_process_PutUpdate() { $("#eva_create_evaluation_detail_processModel").modal("hide"); AlertSuccess(result.message); eva_create_evaluation_detail_process_RefreshTable(); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxPostRequest(apisite + eva_create_evaluation_detail_process_API, data, successFunc2, AlertDanger); } } @@ -168,9 +166,9 @@ function eva_create_evaluation_detail_process_GoDelete(a) { $("#eva_create_evaluation_detail_processModel").modal("hide"); AlertSuccess(result.message); eva_create_evaluation_detail_process_RefreshTable(); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxDeleteRequest(apisite + eva_create_evaluation_detail_process_API + a, null, successFunc, AlertDanger); } } @@ -182,27 +180,27 @@ var eva_create_evaluation_detail_processTableV; var eva_create_evaluation_detail_process_setupTable = function (result) { var groupColumn = 6; - tmp = '"'; + tmp = '"'; eva_create_evaluation_detail_processTableV = $('#eva_create_evaluation_detail_processTable').DataTable({ "processing": true, "serverSide": false, "data": result, - "select": false, + "select": false, "columns": [ - { "data": "id" }, + { "data": "id" }, -{ "data": "plan_round_year" }, -{ "data": "employee_code" }, -{ "data": "employee_fullname" }, -{ "data": "employee_position" }, -{ "data": "employee_position_level" }, -{ "data": "org_id_external_linkage_external_name" }, -{ "data": "role_desc" }, -{ "data": "txt_status_self" }, -{ "data": "txt_status_chief" }, -{ "data": "txt_status_supervisor" }, -{ "data": "txt_status_supervisor1A" }, -{ "data": "txt_status_supervisor2A" } + { "data": "plan_round_year" }, + { "data": "employee_code" }, + { "data": "employee_fullname" }, + { "data": "employee_position" }, + { "data": "employee_position_level" }, + { "data": "org_id_external_linkage_external_name" }, + { "data": "role_desc" }, + { "data": "txt_status_self" }, + { "data": "txt_status_chief" }, + { "data": "txt_status_supervisor" }, + { "data": "txt_status_supervisor1A" }, + { "data": "txt_status_supervisor2A" } ], "columnDefs": [ { @@ -217,42 +215,42 @@ var eva_create_evaluation_detail_process_setupTable = function (result) { "url": appsite + "/DataTables-1.10.16/thai.json" }, "paging": true, - "searching": false, - "drawCallback": function ( settings ) { + "searching": false, + "drawCallback": function (settings) { var api = this.api(); - var rows = api.rows( {page:'current'} ).nodes(); - var last=null; - - api.column(groupColumn, {page:'current'} ).data().each( function ( group, i ) { - if ( last !== group ) { - $(rows).eq( i ).before( - '' + var rows = api.rows({ page: 'current' }).nodes(); + var last = null; + + api.column(groupColumn, { page: 'current' }).data().each(function (group, i) { + if (last !== group) { + $(rows).eq(i).before( + '' ); - + last = group; } - } ); + }); } }); - endLoad(); + endLoad(); }; function eva_create_evaluation_detail_process_InitiateDataTable() { - startLoad(); + startLoad(); var p = $.param(eva_create_evaluation_detail_process_GetSearchParameter()); - AjaxGetRequest(apisite + "/api/eva_create_evaluation_detail_process/GetListBySearch?"+p, eva_create_evaluation_detail_process_setupTable, AlertDanger); + AjaxGetRequest(apisite + "/api/eva_create_evaluation_detail_process/GetListBySearch?" + p, eva_create_evaluation_detail_process_setupTable, AlertDanger); } function eva_create_evaluation_detail_process_DoSearch() { var p = $.param(eva_create_evaluation_detail_process_GetSearchParameter()); -console.log(p); + //console.log(p); var eva_create_evaluation_detail_process_reload = function (result) { eva_create_evaluation_detail_processTableV.destroy(); eva_create_evaluation_detail_process_setupTable(result); - endLoad(); + endLoad(); }; - startLoad(); - AjaxGetRequest(apisite + "/api/eva_create_evaluation_detail_process/GetListBySearch?"+p, eva_create_evaluation_detail_process_reload, AlertDanger); + startLoad(); + AjaxGetRequest(apisite + "/api/eva_create_evaluation_detail_process/GetListBySearch?" + p, eva_create_evaluation_detail_process_reload, AlertDanger); } function eva_create_evaluation_detail_process_GetSelect(f) { diff --git a/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group.js b/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group.js index 77c2c6f..b86be55 100644 --- a/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group.js +++ b/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group.js @@ -158,6 +158,7 @@ function eva_limit_frame_group_GoDelete(a) { var eva_limit_frame_groupTableV; var eva_limit_frame_group_setupTable = function (result) { + let num_row = 1; let sum_total_salary = 0; let sum_total_salary_limit = 0; @@ -179,7 +180,6 @@ var eva_limit_frame_group_setupTable = function (result) { obj_result.total_salary_limit = currency_total_salary_limit; obj_result.total_salary_limit_rounded = currency_total_salary_limit_rounded; obj_result.num_row = num_row; - obj_result.emp_qty = 0; sum_emp_qty += obj_result.emp_qty; num_row++; diff --git a/wwwroot/js/eva_salary_cylinder/eva_salary_cylinder.js b/wwwroot/js/eva_salary_cylinder/eva_salary_cylinder.js index 3886e56..fa2eba0 100644 --- a/wwwroot/js/eva_salary_cylinder/eva_salary_cylinder.js +++ b/wwwroot/js/eva_salary_cylinder/eva_salary_cylinder.js @@ -158,7 +158,7 @@ function eva_salary_cylinder_GoDelete(a) { var eva_salary_cylinderTableV; var eva_salary_cylinder_setupTable = function (result) { - console.log(result); + var groupColumn = 1; tmp = '"'; eva_salary_cylinderTableV = $('#eva_salary_cylinderTable').DataTable({ "processing": true, @@ -237,7 +237,22 @@ var eva_salary_cylinder_setupTable = function (result) { "url": appsite + "/DataTables-1.10.16/thai.json" }, "paging": true, - "searching": false + "searching": false, + "drawCallback": function (settings) { + var api = this.api(); + var rows = api.rows({ page: 'current' }).nodes(); + var last = null; + + api.column(groupColumn, { page: 'current' }).data().each(function (group, i) { + if (last !== group) { + $(rows).eq(i).before( + '' + ); + + last = group; + } + }); + } }); endLoad(); };
'+group+'
' + group + '
' + group + '