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 Rientrakrunchai
2020-03-14 15:06:48 +07:00
parent 1c2857e977
commit 6135a2ec09
8 changed files with 141 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Models/external_employee/external_employeeService.cs
View File

@@ -69,7 +69,7 @@ where ha.employee_id = @emp_id and ha.workingstatus = 'สถานะปฏิ
select he.employee_id as id, mpn.position_number,he.employee_no,he.position_no,
CONCAT(htm.title_name,' ',he.firstname,' ',he.lastname) as fullname,opd.position_name,
orgdata.id as department_id,orgdata.department_name,orgdata.department_code,he.salary,
he.employee_type_id, het.employee_type_name,
he.employee_type_id, het.employee_type_name,opd.position_id as position_id,
u.email as user_email, u.id as user_id,hpl.position_level_name,hpl.position_level_id
from public.hrm_employees as he
left join public.hrm_position_levels as hpl on he.position_level_id = hpl.id
@@ -99,6 +99,12 @@ order by he.firstname,he.lastname;
i.employee_type_name = dr["employee_type_name"].ToString();
}
i.position_type_id = null;
if (dr["position_id"] != DBNull.Value)
{
i.position_id = Convert.ToInt32(dr["position_id"]);
}
if (dr["user_id"] != DBNull.Value)
{
i.user_email = dr["user_email"].ToString();
@@ -116,7 +122,7 @@ order by he.firstname,he.lastname;
}
if (dr["position_level_id"] != DBNull.Value)
{
i.position_level_id = Convert.ToInt32(dr["department_id"]);
i.position_level_id = Convert.ToInt32(dr["position_level_id"]);
i.position_level_text = dr["position_level_name"].ToString();
}
i.salary = 0;

2
Models/external_employee/external_employeeViewModel.cs
View File

@@ -23,6 +23,8 @@ namespace TodoAPI2.Models
public int? employee_type_id { get; set; }
public int? position_id { get; set; }
public int? position_type_id { get; set; }
public string user_email { get; set; }

4
Models/external_linkage/external_linkageService.cs
View File

@@ -285,7 +285,7 @@ namespace TodoAPI2.Models
public List<external_linkageViewModel> GetPositionForReport()
{
var sql = string.Format("select {0}mpn{0}.{0}position_id{0}, CONCAT(mpn.position_number,' ',pos.position_name) as position from {0}hrm_employees{0} as {0}he{0} left join {0}hrm_title_masters{0} as {0}hrm_title{0} on {0}he{0}.{0}prefix_card_name{0} = {0}hrm_title{0}.{0}id{0} left join {0}mpp_position_numbers{0} as {0}mpn{0} on {0}he{0}.{0}position{0} = {0}mpn{0}.{0}id{0} left join {0}org_position_datas{0} as {0}pos{0} on {0}mpn{0}.{0}position_id{0} = {0}pos{0}.{0}position_id{0} where {0}he{0}.{0}deleted_at{0} is null and {0}hrm_title{0}.{0}deleted_at{0} is null and {0}pos{0}.{0}deleted_at{0} is null and {0}mpn{0}.{0}deleted_at{0} is null", '"'.ToString());
var sql = string.Format("select * from {0}org_position_datas{0} order by position_name", '"'.ToString());
var para = db.GetParameterListNpgsql();
DataTable dt = db.ExecuteDataTableNpgsql(sql, para);
var result = new List<external_linkageViewModel>();
@@ -294,7 +294,7 @@ namespace TodoAPI2.Models
var i = new external_linkageViewModel();
i.external_id = Convert.ToInt32(dr["position_id"]);
i.external_code = dr["position_id"].ToString();
i.external_name = dr["position"].ToString();
i.external_name = dr["position_name"].ToString();
result.Add(i);
}
return result;

6
Models/search_employee_for_group/search_employee_for_groupService.cs
View File

@@ -39,7 +39,7 @@ namespace TodoAPI2.Models
public search_employee_for_groupWithSelectionViewModel GetBlankItem()
{
var i = new search_employee_for_groupWithSelectionViewModel();
i.item_position_id = (from x in ext.Gethrm_position_types() orderby x.external_name select x).ToList();
i.item_position_id = (from x in ext.GetPositionForReport() orderby x.external_name select x).ToList();
i.item_org_id = (from x in ext.GetDepartmentData() orderby x.external_name select x).ToList();
@@ -63,7 +63,7 @@ namespace TodoAPI2.Models
where 1 == 1
&& (string.IsNullOrEmpty(model.employee_number) || (!string.IsNullOrEmpty(model.employee_number) && m_search_employee_for_group.employee_no.Contains(model.employee_number)))
&& (string.IsNullOrEmpty(model.fullname) || (!string.IsNullOrEmpty(model.fullname) && m_search_employee_for_group.fullname.Contains(model.fullname)))
&& (m_search_employee_for_group.position_type_id == model.position_id || !model.position_id.HasValue)
&& (m_search_employee_for_group.position_id == model.position_id || !model.position_id.HasValue)
&& (m_search_employee_for_group.department_id == model.org_id || !model.org_id.HasValue)
orderby m_search_employee_for_group.fullname
@@ -72,7 +72,7 @@ namespace TodoAPI2.Models
id = m_search_employee_for_group.id,
employee_number = m_search_employee_for_group.employee_no,
fullname = m_search_employee_for_group.fullname,
position_id = m_search_employee_for_group.position_type_id,
position_id = m_search_employee_for_group.position_id,
level_name = m_search_employee_for_group.position_level_text,
org_id = m_search_employee_for_group.department_id,
remark = m_search_employee_for_group.user_email,

100
Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml
View File

@@ -2,7 +2,7 @@
@inject IConfiguration Configuration
@{
ViewData["Title"] = "eva_create_evaluation_detail_process";
Layout = "_LayoutDirect";
Layout = "_LayoutDirect";
}
<div class="row page-title">
@@ -16,7 +16,7 @@
<li class="breadcrumb-item "><a href="@Environment.GetEnvironmentVariable("SiteInformation_mainsite")">หน้าแรก</a></li>
<li class="breadcrumb-item "><a href="@Environment.GetEnvironmentVariable("SiteInformation_mainsite")@Environment.GetEnvironmentVariable("SiteInformation_appsite")">@Environment.GetEnvironmentVariable("SiteInformation_modulename")</a></li>
<li class="breadcrumb-item active">ประเมินผลเพื่อปรับเลื่อนเงินเดือน</li>
</ol>
</ol>
</div>
</div>
@@ -26,7 +26,7 @@
<section class="card no-border">
<div class="card-body" style="">
<div class="row">
<div class="row">
<div class="col-md-12">
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_process_id" />
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_process_create_evaluation_id" />
@@ -81,19 +81,67 @@
</div>
</div>
</div>
</div>
</div>
</section>
</div>
</div>
</section>
<div class="row">
<div class="form-group col-md-12">
<button type="button" class="btn btn-outline" onclick="javascript:window_close()" style="background-color: #fff;">กลับ</button>
</div>
</div>
<div class="row">
<div class="form-group col-md-12">
<button type="button" class="btn btn-outline" onclick="javascript:window_close()" style="background-color: #fff;">กลับ</button>
</div>
</div>
</section>
<br/>
<br />
<section class="wrapper">
<div class="title col-md-12"><div class="line"></div>ข้อมูลการลา</div>
<section class="card no-border">
<div class="card-body" style="">
<div class="row">
<div class="col-md-12">
<table class="display table table-bordered table-striped">
<tr>
<td colspan="2">ลาป่วย</td>
<td colspan="2">ลากิจ</td>
<td rowspan="2">ลาพักผ่อน</td>
<td rowspan="2">ขอกลับก่อนเวลา</td>
<td>สาย</td>
<td>ขาด</td>
<td colspan="2">รวม (ป่วย/กิจ)</td>
</tr>
<tr>
<td>วัน</td>
<td>ครั้ง</td>
<td>วัน</td>
<td>ครั้ง</td>
<td>สาย</td>
<td>ขาด</td>
<td>วัน</td>
<td>ครั้ง</td>
</tr>
<tr>
<td>0</td>
<td>0</td>
<td>0</td>
<td>0</td>
<td>0</td>
<td>0</td>
<td>0</td>
<td>0</td>
<td>0</td>
<td>0</td>
</tr>
</table>
</div>
</div>
</div>
</section>
</section>
<br />
<section class="wrapper">
<div class="title col-md-12"><div class="line"></div>ผลสัมฤทธิ์ของงาน</div>
@@ -133,7 +181,8 @@
<th><label id='h_eva_evaluation_achievement_process_target_score5'></label></th>
<th width="15%"><label id='h_eva_evaluation_achievement_process_score'></label></th>
<th width="10%"><p id="eva_create_evaluation_detail_summary1_total_summary_chief" />
<th width="10%">
<p id="eva_create_evaluation_detail_summary1_total_summary_chief" />
</th>
</tr>
@@ -151,7 +200,7 @@
</div>
</section>
<br/>
<br />
<section class="wrapper">
<div class="title col-md-12"><div class="line"></div>พฤติกรรมการปฏิบัติงาน (สมรรถนะ)</div>
@@ -184,7 +233,8 @@
<th width="7%"><label id='h_eva_evaluation_behavior_process_target_score4'></label></th>
<th width="7%"><label id='h_eva_evaluation_behavior_process_target_score5'></label></th>
<th width="15%"><label id='h_eva_evaluation_behavior_process_score'></label></th>
<th width="10%"><p id="eva_create_evaluation_detail_summary1_total_summary_competency_chief" />
<th width="10%">
<p id="eva_create_evaluation_detail_summary1_total_summary_competency_chief" />
</th>
</tr>
</tfoot>
@@ -203,7 +253,7 @@
</section>
<br/>
<br />
<section class="wrapper">
<div class="title col-md-12"><div class="line"></div>สรุปผลการประเมิน</div>
@@ -256,7 +306,7 @@
</section>
<br/>
<br />
<section class="wrapper">
<div class="title col-md-12"><div class="line"></div>ความเห็นผู้ประเมิน</div>
@@ -309,13 +359,13 @@
</section>
@section FooterPlaceHolder{
<script src="~/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js"></script>
<script src="~/js/eva_evaluation_achievement_process/eva_evaluation_achievement_process_inline.js"></script>
<script src="~/js/eva_evaluation_behavior_process/eva_evaluation_behavior_process_inline.js"></script>
<script src="~/js/eva_create_evaluation_detail_summary1/eva_create_evaluation_detail_summary1_d.js"></script>
<script src="~/js/eva_create_evaluation_detail_review01/eva_create_evaluation_detail_review01_d.js"></script>
<script src="~/js/eva_create_evaluation_detail_status/eva_create_evaluation_detail_status_d.js"></script>
<script>
<script src="~/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js"></script>
<script src="~/js/eva_evaluation_achievement_process/eva_evaluation_achievement_process_inline.js"></script>
<script src="~/js/eva_evaluation_behavior_process/eva_evaluation_behavior_process_inline.js"></script>
<script src="~/js/eva_create_evaluation_detail_summary1/eva_create_evaluation_detail_summary1_d.js"></script>
<script src="~/js/eva_create_evaluation_detail_review01/eva_create_evaluation_detail_review01_d.js"></script>
<script src="~/js/eva_create_evaluation_detail_status/eva_create_evaluation_detail_status_d.js"></script>
<script>
$(document).ready(function () {
var id = getUrlParameter("id");
if (id) {
@@ -334,6 +384,6 @@
SetupValidationRemark("eva_create_evaluation_detail_process");
SetupValidationRemark("eva_create_evaluation_detail_review01");
});
</script>
</script>
}

48
Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml
View File

@@ -95,6 +95,54 @@
<br />
<section class="wrapper">
<div class="title col-md-12"><div class="line"></div>ข้อมูลการลา</div>
<section class="card no-border">
<div class="card-body" style="">
<div class="row">
<div class="col-md-12">
<table class="display table table-bordered table-striped">
<tr>
<td colspan="2">ลาป่วย</td>
<td colspan="2">ลากิจ</td>
<td rowspan="2">ลาพักผ่อน</td>
<td rowspan="2">ขอกลับก่อนเวลา</td>
<td>สาย</td>
<td>ขาด</td>
<td colspan="2">รวม (ป่วย/กิจ)</td>
</tr>
<tr>
<td>วัน</td>
<td>ครั้ง</td>
<td>วัน</td>
<td>ครั้ง</td>
<td>สาย</td>
<td>ขาด</td>
<td>วัน</td>
<td>ครั้ง</td>
</tr>
<tr>
<td>0</td>
<td>0</td>
<td>0</td>
<td>0</td>
<td>0</td>
<td>0</td>
<td>0</td>
<td>0</td>
<td>0</td>
<td>0</td>
</tr>
</table>
</div>
</div>
</div>
</section>
</section>
<br />
<section class="wrapper">
<div class="title col-md-12"><div class="line"></div>ผลสัมฤทธิ์ของงาน</div>

1
Views/search_employee_for_groupView/search_employee_for_group.cshtml
View File

@@ -82,6 +82,7 @@
search_employee_for_group_InitialForm();
SetupValidationRemark("search_employee_for_group");
$("#s_search_employee_for_group_org_id").select2();
$("#s_search_employee_for_group_position_id").select2();
});
</script>
}

4
wwwroot/js/search_employee_for_group/search_employee_for_group.js
View File

@@ -196,11 +196,11 @@ var search_employee_for_group_setupTable = function (result) {
};
function search_employee_SelectAll(){
search_employeeTableV.rows().select();
search_employee_for_groupTableV.rows().select();
}
function search_employee_DeselectAll(){
search_employeeTableV.rows().deselect();
search_employee_for_groupTableV.rows().deselect();
}
function search_employee_for_group_InitiateDataTable() {