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

Merge branch 'feature/20210719_enhancement_01' into develop

Browse Source
This commit is contained in:
Pairat Sangprasert
2021-07-19 17:00:41 +07:00
parent 93ce18f352 38a2e1fe88
commit 5747602eb5
12 changed files with 150 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ApiControllers/rep_eva02Controllers.cs
View File

@@ -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);

19
Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs
View File

@@ -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,28 +532,23 @@ 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 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;

8
Models/eva_limit_frame_group/eva_limit_frame_groupService.cs
View File

@@ -102,6 +102,12 @@ namespace TodoAPI2.Models
public List<eva_limit_frame_groupViewModel> 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
@@ -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

2
Models/eva_limit_frame_group/eva_limit_frame_groupViewModel.cs
View File

@@ -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
{

4
Models/eva_salary_cylinder/eva_salary_cylinderService.cs
View File

@@ -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,

2
Models/rep_eva02/Irep_eva02Service.cs
View File

@@ -16,7 +16,7 @@ namespace TodoAPI2.Models
rep_eva02WithSelectionViewModel GetWithSelection(Guid id);
rep_eva02WithSelectionViewModel GetBlankItem();
void SetEvaDate(rep_eva02ReportRequestModel model);
}
}

2
Models/rep_eva02/rep_eva02SearchModel.cs
View File

@@ -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; }
}
}

7
Models/rep_eva02/rep_eva02Service.cs
View File

@@ -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

15
Views/vw_limit_frame_planView/vw_limit_frame_plan_d.cshtml
View File

@@ -44,12 +44,13 @@
</div>
</div>
<br/>
<section class="wrapper">
<div class="title col-md-12"><div class="line"></div>บันทึกข้อมูล วงเงินที่ใช้ในการเลื่อนเงินเดือน</div>
<div class="title"><div class="line"></div>วงเงินที่ใช้ในการเลื่อนเงินเดือนของพนักงานเนติบัณฑิตยสภา ของแต่ละกอง/ส่วนงาน</div>
<section class="card no-border">
<div class="card-body" style="">
<div class="row">
<div class="col-md-12">
@@ -57,7 +58,7 @@
<div class='row'>
<div class="form-group col-md-6">
<label id="lab_vw_limit_frame_plan_plan_guid" for="vw_limit_frame_plan_plan_guid">แผนการประเมิน</label>
<label id="lab_vw_limit_frame_plan_plan_guid" for="vw_limit_frame_plan_plan_guid">รอบที่ / ปีงบประมาณ</label>
<select disabled class="form-control" id="vw_limit_frame_plan_plan_guid" iLabel="แผนการประเมิน" iRequire="false" iGroup="vw_limit_frame_plan"></select>
</div>
@@ -76,16 +77,10 @@
</div>
</div>
</div>
</section>
</section>
<br/>
<section class="wrapper">
<div class="title"><div class="line"></div>วงเงินที่ใช้ในการเลื่อนเงินเดือนของแต่ละกอง/ส่วนงาน</div>
<table id="eva_limit_frame_groupTable" class="display table table-bordered table-striped">
<thead>
<tr>

8
wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js
View File

@@ -94,8 +94,7 @@ function eva_create_evaluation_detail_process_GoEdit(a, role_code) {
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);
}
}
@@ -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;
}
@@ -245,7 +243,7 @@ function eva_create_evaluation_detail_process_InitiateDataTable() {
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);

2
wwwroot/js/eva_limit_frame_group/eva_limit_frame_group.js
View File

@@ -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++;

19
wwwroot/js/eva_salary_cylinder/eva_salary_cylinder.js
View File

@@ -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(
'<tr class="group"><td colspan="12">' + group + '</td></tr>'
);
last = group;
}
});
}
});
endLoad();
};