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

ปรับปรุง ปรับเลื่อน ค่าตอบแทน

Browse Source
This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-07-08 14:29:02 +07:00
parent 93f58f0be3
commit 3a00d8c0f4
5 changed files with 90 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
EXCEL/eva_adjust_postponement@eva_adjust_postponement_normal.xlsx
View File

Binary file not shown.

30
Models/eva_adjust_postponement_normal/eva_adjust_postponement_normalService.cs
View File

@@ -87,6 +87,26 @@ namespace TodoAPI2.Models
i.item_managed_by = all_emp.ToList();
i.item_org_id = (from x in ext.GetDepartmentData() select x).ToList();
var data_fiscal_year = (from f_y in _repository.Context.eva_adjust_postponement
group f_y by f_y.fiscal_year into new_group
orderby new_group.Key descending
select new
{
fiscal_year = new_group.Key
}
).ToList();
var result = new List<external_linkageViewModel>();
foreach (var x in data_fiscal_year)
{
result.Add(new external_linkageViewModel
{
external_id = x.fiscal_year,
external_code = x.fiscal_year.ToString(),
external_name = x.fiscal_year.ToString()
});
}
i.item_fiscal_year = result;
return i;
}
@@ -104,6 +124,15 @@ namespace TodoAPI2.Models
fiscal_year = new_group.Key
}
).ToList();
var result = new List<external_linkageViewModel>();
foreach(var x in data_fiscal_year)
{
result.Add(new external_linkageViewModel {
external_id = x.fiscal_year,
external_code = x.fiscal_year.ToString(),
external_name = x.fiscal_year.ToString()
});
}
var i = new eva_adjust_postponement_normalWithSelectionViewModel();
var temp = create.GetListBySearch(new eva_create_evaluationSearchModel());
@@ -112,6 +141,7 @@ namespace TodoAPI2.Models
i.item_managed_by = all_emp.ToList();
i.item_org_id = (from x in ext.GetDepartmentData() select x).ToList();
i.item_fiscal_year = result;
return i;
}

1
Models/eva_adjust_postponement_normal/eva_adjust_postponement_normalWithSelectionViewModel.cs
View File

@@ -7,6 +7,7 @@ namespace TodoAPI2.Models
{
public class eva_adjust_postponement_normalWithSelectionViewModel: eva_adjust_postponement_normalViewModel
{
public List<external_linkageViewModel> item_fiscal_year { get; set; }
public List<eva_create_evaluationViewModel> item_create_evaluation_id { get; set; }
public List<external_employeeViewModel> item_managed_by { get; set; }
public List<external_linkageViewModel> item_org_id { get; set; }

2
Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal.cshtml
View File

@@ -86,7 +86,7 @@
<div class="form-group col-md-3">
<label id='lab_s_eva_adjust_postponement_normal_fiscal_year' for='s_eva_adjust_postponement_normal_fiscal_year'>ปีงบประมาณ </label>
<input class="form-control" type="number" id="s_eva_adjust_postponement_normal_fiscal_year" iLabel="ปีงบประมาณ " iRequire="true" iGroup="s_eva_adjust_postponement_normal" title='ปีงบประมาณ ' placeholder='ปีงบประมาณ ' />
<select class="form-control" id="s_eva_adjust_postponement_normal_fiscal_year" iLabel="ปีงบประมาณ " iRequire="false" iGroup="s_eva_adjust_postponement_normal" title='ปีงบประมาณ ' placeholder='ปีงบประมาณ '></select>
</div>
<div class="form-group col-md-3">

117
wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal.js
View File

@@ -5,17 +5,17 @@ var eva_adjust_postponement_normal_API = "/api/eva_adjust_postponement_normal/";
function eva_adjust_postponement_normal_GetSearchParameter() {
var eva_adjust_postponement_normalSearchObject = new Object();
eva_adjust_postponement_normalSearchObject.fiscal_year = $("#s_eva_adjust_postponement_normal_fiscal_year").val();
eva_adjust_postponement_normalSearchObject.theRound = $("#s_eva_adjust_postponement_normal_theRound").val();
eva_adjust_postponement_normalSearchObject.org_id = $("#s_eva_adjust_postponement_normal_org_id").val();
eva_adjust_postponement_normalSearchObject.fiscal_year = $("#s_eva_adjust_postponement_normal_fiscal_year").val();
eva_adjust_postponement_normalSearchObject.theRound = $("#s_eva_adjust_postponement_normal_theRound").val();
eva_adjust_postponement_normalSearchObject.org_id = $("#s_eva_adjust_postponement_normal_org_id").val();
return eva_adjust_postponement_normalSearchObject;
}
function eva_adjust_postponement_normal_FeedDataToSearchForm(data) {
$("#s_eva_adjust_postponement_normal_fiscal_year").val(data.fiscal_year);
$("#s_eva_adjust_postponement_normal_theRound").val(data.theRound);
DropDownClearFormAndFeedWithData($("#s_eva_adjust_postponement_normal_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
DropDownClearFormAndFeedWithData($("#s_eva_adjust_postponement_normal_fiscal_year"), data, "id", "external_name", "item_fiscal_year", data.fiscal_year);
$("#s_eva_adjust_postponement_normal_theRound").val(data.theRound);
DropDownClearFormAndFeedWithData($("#s_eva_adjust_postponement_normal_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
}
@@ -23,37 +23,37 @@ DropDownClearFormAndFeedWithData($("#s_eva_adjust_postponement_normal_org_id"),
function eva_adjust_postponement_normal_FeedDataToForm(data) {
//console.log(data);
//console.log(data);
$("#eva_adjust_postponement_normal_id").val(data.id);
$("#eva_adjust_postponement_normal_fiscal_year").val(data.fiscal_year);
$("#eva_adjust_postponement_normal_theDate").val(formatDate(data.theDate));
$("#eva_adjust_postponement_normal_theRound").val(data.theRound);
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_create_evaluation_id"), data, "id", "description", "item_create_evaluation_id", data.create_evaluation_id);
$("#eva_adjust_postponement_normal_limit").val(data.limit);
$("#eva_adjust_postponement_normal_limit_frame").val(data.limit_frame);
// $("#eva_adjust_postponement_normal_limit_quota").val(data.limit_quota);
$("#eva_adjust_postponement_normal_limit_quota").maskMoney('mask',data.limit_quota);
$("#eva_adjust_postponement_normal_id").val(data.id);
$("#eva_adjust_postponement_normal_fiscal_year").val(data.fiscal_year);
$("#eva_adjust_postponement_normal_theDate").val(formatDate(data.theDate));
$("#eva_adjust_postponement_normal_theRound").val(data.theRound);
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_create_evaluation_id"), data, "id", "description", "item_create_evaluation_id", data.create_evaluation_id);
$("#eva_adjust_postponement_normal_limit").val(data.limit);
$("#eva_adjust_postponement_normal_limit_frame").val(data.limit_frame);
// $("#eva_adjust_postponement_normal_limit_quota").val(data.limit_quota);
$("#eva_adjust_postponement_normal_limit_quota").maskMoney('mask', data.limit_quota);
$("#eva_adjust_postponement_normal_percentage").val(data.percentage);
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id"));
//DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
$("#eva_adjust_postponement_normal_percentage").val(data.percentage);
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id"));
//DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
}
function eva_adjust_postponement_normal_GetFromForm() {
var eva_adjust_postponement_normalObject = new Object();
eva_adjust_postponement_normalObject.id = $("#eva_adjust_postponement_normal_id").val();
eva_adjust_postponement_normalObject.fiscal_year = $("#eva_adjust_postponement_normal_fiscal_year").val();
eva_adjust_postponement_normalObject.theDate = getDate($("#eva_adjust_postponement_normal_theDate").val());
eva_adjust_postponement_normalObject.theRound = $("#eva_adjust_postponement_normal_theRound").val();
eva_adjust_postponement_normalObject.create_evaluation_id = $("#eva_adjust_postponement_normal_create_evaluation_id").val();
eva_adjust_postponement_normalObject.limit = $("#eva_adjust_postponement_normal_limit").val();
eva_adjust_postponement_normalObject.limit_frame = $("#eva_adjust_postponement_normal_limit_frame").val();
eva_adjust_postponement_normalObject.limit_quota = $("#eva_adjust_postponement_normal_limit_quota").val();
eva_adjust_postponement_normalObject.percentage = $("#eva_adjust_postponement_normal_percentage").val();
eva_adjust_postponement_normalObject.managed_by = $("#eva_adjust_postponement_normal_managed_by").val();
//eva_adjust_postponement_normalObject.org_id = $("#eva_adjust_postponement_normal_org_id").val();
eva_adjust_postponement_normalObject.id = $("#eva_adjust_postponement_normal_id").val();
eva_adjust_postponement_normalObject.fiscal_year = $("#eva_adjust_postponement_normal_fiscal_year").val();
eva_adjust_postponement_normalObject.theDate = getDate($("#eva_adjust_postponement_normal_theDate").val());
eva_adjust_postponement_normalObject.theRound = $("#eva_adjust_postponement_normal_theRound").val();
eva_adjust_postponement_normalObject.create_evaluation_id = $("#eva_adjust_postponement_normal_create_evaluation_id").val();
eva_adjust_postponement_normalObject.limit = $("#eva_adjust_postponement_normal_limit").val();
eva_adjust_postponement_normalObject.limit_frame = $("#eva_adjust_postponement_normal_limit_frame").val();
eva_adjust_postponement_normalObject.limit_quota = $("#eva_adjust_postponement_normal_limit_quota").val();
eva_adjust_postponement_normalObject.percentage = $("#eva_adjust_postponement_normal_percentage").val();
eva_adjust_postponement_normalObject.managed_by = $("#eva_adjust_postponement_normal_managed_by").val();
//eva_adjust_postponement_normalObject.org_id = $("#eva_adjust_postponement_normal_org_id").val();
return eva_adjust_postponement_normalObject;
@@ -62,14 +62,14 @@ eva_adjust_postponement_normalObject.managed_by = $("#eva_adjust_postponement_no
function eva_adjust_postponement_normal_InitialForm(s) {
var successFunc = function (result) {
eva_adjust_postponement_normal_FeedDataToForm(result);
eva_adjust_postponement_normal_FeedDataToSearchForm(result);
eva_adjust_postponement_normal_FeedDataToSearchForm(result);
if (s) {
// Incase model popup
$("#eva_adjust_postponement_normalModel").modal("show");
}
endLoad();
endLoad();
};
startLoad();
startLoad();
AjaxGetRequest(apisite + eva_adjust_postponement_normal_API + "GetBlankItem", successFunc, AlertDanger);
}
@@ -96,15 +96,15 @@ function eva_adjust_postponement_normal_SetEditForm(a) {
eva_adjust_postponement_normal_editMode = "UPDATE";
eva_adjust_postponement_normal_FeedDataToForm(result);
$("#eva_adjust_postponement_normalModel").modal("show");
endLoad();
endLoad();
};
startLoad();
startLoad();
AjaxGetRequest(apisite + eva_adjust_postponement_normal_API + a, successFunc, AlertDanger);
}
function eva_adjust_postponement_normal_SetCreateForm(s) {
eva_adjust_postponement_normal_editMode = "CREATE";
eva_adjust_postponement_normal_InitialForm(s);
eva_adjust_postponement_normal_InitialForm(s);
}
function eva_adjust_postponement_normal_RefreshTable() {
@@ -122,8 +122,7 @@ var eva_adjust_postponement_normal_customValidation = function (group) {
};
function eva_adjust_postponement_normal_PutUpdate() {
if (!ValidateForm('eva_adjust_postponement_normal', eva_adjust_postponement_normal_customValidation))
{
if (!ValidateForm('eva_adjust_postponement_normal', eva_adjust_postponement_normal_customValidation)) {
return;
}
@@ -135,9 +134,9 @@ function eva_adjust_postponement_normal_PutUpdate() {
$("#eva_adjust_postponement_normalModel").modal("hide");
AlertSuccess(result.message);
eva_adjust_postponement_normal_RefreshTable();
endLoad();
endLoad();
};
startLoad();
startLoad();
AjaxPutRequest(apisite + eva_adjust_postponement_normal_API + data.id, data, successFunc1, AlertDanger);
}
// Create mode
@@ -146,9 +145,9 @@ function eva_adjust_postponement_normal_PutUpdate() {
$("#eva_adjust_postponement_normalModel").modal("hide");
AlertSuccess(result.message);
eva_adjust_postponement_normal_RefreshTable();
endLoad();
endLoad();
};
startLoad();
startLoad();
AjaxPostRequest(apisite + eva_adjust_postponement_normal_API, data, successFunc2, AlertDanger);
}
}
@@ -159,9 +158,9 @@ function eva_adjust_postponement_normal_GoDelete(a) {
$("#eva_adjust_postponement_normalModel").modal("hide");
AlertSuccess(result.message);
eva_adjust_postponement_normal_RefreshTable();
endLoad();
endLoad();
};
startLoad();
startLoad();
AjaxDeleteRequest(apisite + eva_adjust_postponement_normal_API + a, null, successFunc, AlertDanger);
}
}
@@ -171,18 +170,18 @@ function eva_adjust_postponement_normal_GoDelete(a) {
var eva_adjust_postponement_normalTableV;
var eva_adjust_postponement_normal_setupTable = function (result) {
tmp = '"';
tmp = '"';
eva_adjust_postponement_normalTableV = $('#eva_adjust_postponement_normalTable').DataTable({
"processing": true,
"serverSide": false,
"data": result,
"select": false,
"select": false,
"columns": [
{ "data": "id" },
{ "data": "fiscal_year" },
{ "data": "txt_theDate" },
{ "data": "theRound" },
{ "data": "create_evaluation_id_description" },
{ "data": "id" },
{ "data": "fiscal_year" },
{ "data": "txt_theDate" },
{ "data": "theRound" },
{ "data": "create_evaluation_id_description" },
],
"columnDefs": [
{
@@ -196,15 +195,15 @@ var eva_adjust_postponement_normal_setupTable = function (result) {
"url": appsite + "/DataTables-1.10.16/thai.json"
},
"paging": true,
"searching": false
"searching": false
});
endLoad();
endLoad();
};
function eva_adjust_postponement_normal_InitiateDataTable() {
startLoad();
var p = $.param(eva_adjust_postponement_normal_GetSearchParameter());
AjaxGetRequest(apisite + "/api/eva_adjust_postponement_normal/GetListBySearch?"+p, eva_adjust_postponement_normal_setupTable, AlertDanger);
startLoad();
var p = $.param(eva_adjust_postponement_normal_GetSearchParameter());
AjaxGetRequest(apisite + "/api/eva_adjust_postponement_normal/GetListBySearch?" + p, eva_adjust_postponement_normal_setupTable, AlertDanger);
}
function eva_adjust_postponement_normal_DoSearch() {
@@ -212,10 +211,10 @@ function eva_adjust_postponement_normal_DoSearch() {
var eva_adjust_postponement_normal_reload = function (result) {
eva_adjust_postponement_normalTableV.destroy();
eva_adjust_postponement_normal_setupTable(result);
endLoad();
endLoad();
};
startLoad();
AjaxGetRequest(apisite + "/api/eva_adjust_postponement_normal/GetListBySearch?"+p, eva_adjust_postponement_normal_reload, AlertDanger);
startLoad();
AjaxGetRequest(apisite + "/api/eva_adjust_postponement_normal/GetListBySearch?" + p, eva_adjust_postponement_normal_reload, AlertDanger);
}
function eva_adjust_postponement_normal_GetSelect(f) {