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-11-15 13:53:13 +07:00
parent 6d0a2ace7d
commit 4b98790d2e
27 changed files with 2690 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EXCEL/eva_create_evaluation.xlsx
BIN
View File
Binary file not shown.
EXCEL/eva_create_evaluation_detail.xlsx
BIN
View File
Binary file not shown.
Migrations/20211108074744_AddSupervisor3.Designer.cs
Generated
+1201
View File
File diff suppressed because it is too large Load Diff
Migrations/20211108074744_AddSupervisor3.cs
+22
View File
@@ -0,0 +1,22 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace tb320eva.Migrations
{
public partial class AddSupervisor3 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "supervisor3_id",
table: "eva_create_evaluation",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "supervisor3_id",
table: "eva_create_evaluation");
}
}
}
Migrations/20211108081106_AddX111.Designer.cs
Generated
+1218
View File
File diff suppressed because it is too large Load Diff
Migrations/20211108081106_AddX111.cs
+80
View File
@@ -0,0 +1,80 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace tb320eva.Migrations
{
public partial class AddX111 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "status_supervisor3A",
table: "eva_create_evaluation_detail",
maxLength: 1,
nullable: true);
migrationBuilder.AddColumn<DateTime>(
name: "status_supervisor3A_click_date",
table: "eva_create_evaluation_detail",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "supervisor3A",
table: "eva_create_evaluation_detail",
nullable: true);
migrationBuilder.AddColumn<DateTime>(
name: "supervisor3A_date",
table: "eva_create_evaluation_detail",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "supervisor3A_remark",
table: "eva_create_evaluation_detail",
maxLength: 1000,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "supervisor3A_result",
table: "eva_create_evaluation_detail",
maxLength: 1,
nullable: true);
migrationBuilder.AddColumn<int>(
name: "supervisor3_id",
table: "eva_create_evaluation_detail",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "status_supervisor3A",
table: "eva_create_evaluation_detail");
migrationBuilder.DropColumn(
name: "status_supervisor3A_click_date",
table: "eva_create_evaluation_detail");
migrationBuilder.DropColumn(
name: "supervisor3A",
table: "eva_create_evaluation_detail");
migrationBuilder.DropColumn(
name: "supervisor3A_date",
table: "eva_create_evaluation_detail");
migrationBuilder.DropColumn(
name: "supervisor3A_remark",
table: "eva_create_evaluation_detail");
migrationBuilder.DropColumn(
name: "supervisor3A_result",
table: "eva_create_evaluation_detail");
migrationBuilder.DropColumn(
name: "supervisor3_id",
table: "eva_create_evaluation_detail");
}
}
}
Migrations/DataContextModelSnapshot.cs
+19
View File
@@ -216,6 +216,8 @@ namespace tb320eva.Migrations
b.Property<int?>("supervisor2_id");
b.Property<int?>("supervisor3_id");
b.Property<DateTime>("updated");
b.HasKey("id");
@@ -348,6 +350,11 @@ namespace tb320eva.Migrations
b.Property<DateTime?>("status_supervisor2A_click_date");
b.Property<string>("status_supervisor3A")
.HasMaxLength(1);
b.Property<DateTime?>("status_supervisor3A_click_date");
b.Property<string>("status_supervisor_a")
.HasMaxLength(1);
@@ -399,6 +406,18 @@ namespace tb320eva.Migrations
b.Property<string>("supervisor2_result")
.HasMaxLength(1);
b.Property<int?>("supervisor3A");
b.Property<DateTime?>("supervisor3A_date");
b.Property<string>("supervisor3A_remark")
.HasMaxLength(1000);
b.Property<string>("supervisor3A_result")
.HasMaxLength(1);
b.Property<int?>("supervisor3_id");
b.Property<decimal?>("total_summary_chief");
b.Property<decimal?>("total_summary_competency_chief");
Models/eva_create_evaluation/eva_create_evaluationEntity.cs
+1 -1
View File
@@ -34,6 +34,6 @@ namespace TodoAPI2.Models
public int? supervisor2_id { get; set; }
public int? supervisor3_id { get; set; }
}
}
Models/eva_create_evaluation/eva_create_evaluationInputModel.cs
+2
View File
@@ -30,6 +30,8 @@ namespace TodoAPI2.Models
public int? supervisor2_id { get; set; }
public int? supervisor3_id { get; set; }
public string active_mode { get; set; }
}
}
Models/eva_create_evaluation/eva_create_evaluationService.cs
+10 -2
View File
@@ -76,6 +76,7 @@ namespace TodoAPI2.Models
i.item_evaluation_group_id = (from x in _repository.Context.eva_evaluation_group select x).ToList();
i.item_supervisor1_id = all_emp;
i.item_supervisor2_id = all_emp;
i.item_supervisor3_id = all_emp;
return i;
}
@@ -89,6 +90,7 @@ namespace TodoAPI2.Models
i.item_evaluation_group_id = (from x in _repository.Context.eva_evaluation_group select x).ToList();
i.item_supervisor1_id = all_emp;
i.item_supervisor2_id = all_emp;
i.item_supervisor3_id = all_emp;
return i;
}
@@ -127,6 +129,10 @@ namespace TodoAPI2.Models
into external_linkageResult7
from fk_external_linkageResult7 in external_linkageResult7.DefaultIfEmpty()
join fk_external_linkage8 in all_emp on m_eva_create_evaluation.supervisor3_id equals fk_external_linkage8.id
into external_linkageResult8
from fk_external_linkageResult8 in external_linkageResult8.DefaultIfEmpty()
where 1==1
&& (m_eva_create_evaluation.performance_plan_id == model.performance_plan_id || !model.performance_plan_id.HasValue)
&& (m_eva_create_evaluation.evaluation_group_id == model.evaluation_group_id || !model.evaluation_group_id.HasValue)
@@ -143,6 +149,7 @@ namespace TodoAPI2.Models
evaluation_group_id = m_eva_create_evaluation.evaluation_group_id,
supervisor1_id = m_eva_create_evaluation.supervisor1_id,
supervisor2_id = m_eva_create_evaluation.supervisor2_id,
supervisor3_id = m_eva_create_evaluation.supervisor3_id,
performance_plan_id_eva_performance_plan_fiscal_year = fk_eva_performance_planResult1.display_text,
employee_id_external_linkage_external_name = fk_external_linkageResult2.fullname,
@@ -150,6 +157,7 @@ namespace TodoAPI2.Models
evaluation_group_id_eva_evaluation_group_name = fk_eva_evaluation_groupResult5.thegroup,
supervisor1_id_external_linkage_external_name = fk_external_linkageResult6.fullname,
supervisor2_id_external_linkage_external_name = fk_external_linkageResult7.fullname,
supervisor3_id_external_linkage_external_name = fk_external_linkageResult8.fullname,
isActive = m_eva_create_evaluation.isActive,
Created = m_eva_create_evaluation.created,
@@ -209,7 +217,7 @@ namespace TodoAPI2.Models
existingEntity.evaluation_group_id = model.evaluation_group_id;
existingEntity.supervisor1_id = model.supervisor1_id;
existingEntity.supervisor2_id = model.supervisor2_id;
existingEntity.supervisor3_id = model.supervisor3_id;
var updated = _repository.Update(id, existingEntity);
return Get(updated.id);
@@ -234,7 +242,7 @@ namespace TodoAPI2.Models
existingEntity.evaluation_group_id = i.evaluation_group_id;
existingEntity.supervisor1_id = i.supervisor1_id;
existingEntity.supervisor2_id = i.supervisor2_id;
existingEntity.supervisor3_id = i.supervisor3_id;
_repository.UpdateWithoutCommit(i.id.Value, existingEntity);
}
Models/eva_create_evaluation/eva_create_evaluationViewModel.cs
+4
View File
@@ -28,6 +28,8 @@ namespace TodoAPI2.Models
public int? supervisor2_id { get; set; }
public int? supervisor3_id { get; set; }
public string performance_plan_id_eva_performance_plan_fiscal_year { get; set; }
public string employee_id_external_linkage_external_name { get; set; }
public string evaluation_group_id_eva_evaluation_group_code { get; set; }
@@ -36,6 +38,8 @@ namespace TodoAPI2.Models
public string supervisor1_id_external_linkage_external_name { get; set; }
public string supervisor2_id_external_linkage_external_name { get; set; }
public string supervisor3_id_external_linkage_external_name { get; set; }
public string description
{
get
Models/eva_create_evaluation/eva_create_evaluationWithSelectionViewModel.cs
+1 -1
View File
@@ -12,6 +12,6 @@ namespace TodoAPI2.Models
public List<eva_evaluation_groupEntity> item_evaluation_group_id { get; set; }
public List<external_employeeViewModel> item_supervisor1_id { get; set; }
public List<external_employeeViewModel> item_supervisor2_id { get; set; }
public List<external_employeeViewModel> item_supervisor3_id { get; set; }
}
}
Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs
+16
View File
@@ -137,6 +137,8 @@ namespace TodoAPI2.Models
public DateTime? status_supervisor1A_click_date { get; set; }
public DateTime? status_supervisor2A_click_date { get; set; }
public DateTime? status_supervisor3A_click_date { get; set; }
public decimal? total_summary_supervisor1A { get; set; }
public decimal? Final_summary_supervisor1A { get; set; }
@@ -198,6 +200,20 @@ namespace TodoAPI2.Models
[MaxLength(1000)]
public string remark { get; set; }
public int? supervisor3_id { get; set; }
public int? supervisor3A { get; set; }
[MaxLength(1)]
public string supervisor3A_result { get; set; }
[MaxLength(1000)]
public string supervisor3A_remark { get; set; }
public DateTime? supervisor3A_date { get; set; }
[MaxLength(1)]
public string status_supervisor3A { get; set; }
}
}
Models/eva_create_evaluation_detail/eva_create_evaluation_detailInputModel.cs
+2
View File
@@ -36,6 +36,8 @@ namespace TodoAPI2.Models
public string remark { get; set; }
public int? supervisor3_id { get; set; }
public string active_mode { get; set; }
}
}
Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs
+8
View File
@@ -82,6 +82,7 @@ namespace TodoAPI2.Models
i.item_eva_employee_id = i.item_employee_id;
i.item_supervisor1_id = i.item_employee_id;
i.item_supervisor2_id = i.item_employee_id;
i.item_supervisor3_id = i.item_employee_id;
i.item_help_org_id = ext.GetDepartmentData();
return i;
@@ -95,6 +96,7 @@ namespace TodoAPI2.Models
i.item_eva_employee_id = i.item_employee_id;
i.item_supervisor1_id = i.item_employee_id;
i.item_supervisor2_id = i.item_employee_id;
i.item_supervisor3_id = i.item_employee_id;
i.item_help_org_id = ext.GetDepartmentData();
return i;
@@ -139,6 +141,10 @@ namespace TodoAPI2.Models
into external_linkageResult46
from fk_external_linkageResult46 in external_linkageResult46.DefaultIfEmpty()
join fk_external_linkage48 in allemp on m_eva_create_evaluation_detail.supervisor3_id equals fk_external_linkage48.id
into external_linkageResult48
from fk_external_linkageResult48 in external_linkageResult48.DefaultIfEmpty()
join fk_external_linkage99 in ext.GetDepartmentData() on (m_eva_create_evaluation_detail.help_org_id.HasValue ? m_eva_create_evaluation_detail.help_org_id : fk_external_linkageResult2.department_id) equals fk_external_linkage99.id
into external_linkageResult99
from fk_external_linkageResult99 in external_linkageResult99.DefaultIfEmpty()
@@ -197,6 +203,7 @@ namespace TodoAPI2.Models
status_supervisor1A = m_eva_create_evaluation_detail.status_supervisor1A,
status_supervisor2A = m_eva_create_evaluation_detail.status_supervisor2A,
status_supervisor3A = m_eva_create_evaluation_detail.status_supervisor3A,
employee_id_external_linkage_external_name = fk_external_linkageResult2.fullname,
chief_external_linkage_external_name = fk_external_linkageResult3.fullname,
@@ -216,6 +223,7 @@ namespace TodoAPI2.Models
status_supervisor_click_date = m_eva_create_evaluation_detail.status_supervisor_click_date,
status_supervisor1A_click_date = m_eva_create_evaluation_detail.status_supervisor1A_click_date,
status_supervisor2A_click_date = m_eva_create_evaluation_detail.status_supervisor2A_click_date,
status_supervisor3A_click_date = m_eva_create_evaluation_detail.status_supervisor3A_click_date,
department_name = fk_external_linkageResult99.external_name,
help_org_id_external_linkage_external_name = fk_external_linkageResult46.external_name,
Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs
+7
View File
@@ -82,10 +82,13 @@ namespace TodoAPI2.Models
public string status_supervisor2A { get; set; }
public string status_supervisor3A { get; set; }
public string employee_id_external_linkage_external_name { get; set; }
public string chief_external_linkage_external_name { get; set; }
public string supervisor1_result_external_linkage_external_name { get; set; }
public string supervisor2_result_external_linkage_external_name { get; set; }
public string supervisor3_result_external_linkage_external_name { get; set; }
public string position_type_text { get; set; }
public string position_level_text { get; set; }
@@ -103,6 +106,7 @@ namespace TodoAPI2.Models
public DateTime? status_supervisor_click_date { get; set; }
public DateTime? status_supervisor1A_click_date { get; set; }
public DateTime? status_supervisor2A_click_date { get; set; }
public DateTime? status_supervisor3A_click_date { get; set; }
public int? eva_employee_id { get; set; }
@@ -110,6 +114,8 @@ namespace TodoAPI2.Models
public int? supervisor2_id { get; set; }
public int? supervisor3_id { get; set; }
public decimal? work_period { get; set; }
public int? order_of_data { get; set; }
@@ -120,6 +126,7 @@ namespace TodoAPI2.Models
public string txt_status_supervisor { get { return getStatusText(status_supervisor) + MyHelper.GetDateStringForReport(status_supervisor_click_date); } }
public string txt_status_supervisor1A { get { return getStatusText(status_supervisor1A) + MyHelper.GetDateStringForReport(status_supervisor1A_click_date); } }
public string txt_status_supervisor2A { get { return getStatusText(status_supervisor2A) + MyHelper.GetDateStringForReport(status_supervisor2A_click_date); } }
public string txt_status_supervisor3A { get { return getStatusText(status_supervisor3A) + MyHelper.GetDateStringForReport(status_supervisor3A_click_date); } }
public string help_org_id_external_linkage_external_name { get; set; }
Models/eva_create_evaluation_detail/eva_create_evaluation_detailWithSelectionViewModel.cs
+1
View File
@@ -13,6 +13,7 @@ namespace TodoAPI2.Models
public List<external_employeeViewModel> item_eva_employee_id { get; set; }
public List<external_employeeViewModel> item_supervisor1_id { get; set; }
public List<external_employeeViewModel> item_supervisor2_id { get; set; }
public List<external_employeeViewModel> item_supervisor3_id { get; set; }
public List<external_linkageViewModel> item_help_org_id { get; set; }
}
}
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
+8 -1
View File
@@ -140,7 +140,9 @@ namespace TodoAPI2.Models
into external_supervisor2AResult
from fk_external_supervisor2A in external_supervisor2AResult.DefaultIfEmpty()
join fk_external_supervisor3A in allemp on isNull<int?>(m_eva_create_evaluation_detail_process.supervisor3_id, fk_eva_create_evaluationResult10.supervisor3_id) equals fk_external_supervisor3A.id
into external_supervisor3AResult
from fk_external_supervisor3A in external_supervisor3AResult.DefaultIfEmpty()
where m_eva_create_evaluation_detail_process.id == id
@@ -173,6 +175,8 @@ namespace TodoAPI2.Models
supervisor1A_position = fk_external_supervisor1A.position_name,
supervisor2A_fullname = fk_external_supervisor2A.fullname,
supervisor2A_position = fk_external_supervisor2A.position_name,
supervisor3A_fullname = fk_external_supervisor3A.fullname,
supervisor3A_position = fk_external_supervisor3A.position_name,
org_id_external_linkage_external_name = fk_external_employee.department_name,
@@ -185,6 +189,7 @@ namespace TodoAPI2.Models
status_supervisor1A = m_eva_create_evaluation_detail_process.status_supervisor1A,
status_supervisor2A = m_eva_create_evaluation_detail_process.status_supervisor2A,
status_supervisor3A = m_eva_create_evaluation_detail_process.status_supervisor3A,
role_code = getRoleCode(emp_id, m_eva_create_evaluation_detail_process.chief,
m_eva_create_evaluation_detail_process.chief,
@@ -218,12 +223,14 @@ namespace TodoAPI2.Models
supervisor2_position_type_id = fk_external_supervisor2.position_type_id,
supervisor1A_position_type_id = fk_external_supervisor1A.position_type_id,
supervisor2A_position_type_id = fk_external_supervisor2A.position_type_id,
supervisor3A_position_type_id = fk_external_supervisor3A.position_type_id,
employee_position_type_id = fk_external_employee.position_type_id,
chief_position_type_id = fk_external_chief.position_type_id,
supervisor2_position_level_text = fk_external_supervisor2.position_level_text,
supervisor1A_position_level_text = fk_external_supervisor1A.position_level_text,
supervisor2A_position_level_text = fk_external_supervisor2A.position_level_text,
supervisor3A_position_level_text = fk_external_supervisor3A.position_level_text,
employee_position_level_text = fk_external_employee.position_level_text,
chief_position_level_text = fk_external_chief.position_level_text,
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs
+9
View File
@@ -49,6 +49,10 @@ namespace TodoAPI2.Models
public string supervisor2A_position { get; set; }
public string supervisor3A_fullname { get; set; }
public string supervisor3A_position { get; set; }
public int? create_evaluation_id { get; set; }
public int? org_id { get; set; }
@@ -70,6 +74,8 @@ namespace TodoAPI2.Models
public string status_supervisor2A { get; set; }
public string status_supervisor3A { get; set; }
public string role_desc { get; set; }
public string role_code { get; set; }
@@ -87,11 +93,14 @@ namespace TodoAPI2.Models
public DateTime? status_supervisor1A_click_date { get; set; }
public DateTime? status_supervisor2A_click_date { get; set; }
public DateTime? status_supervisor3A_click_date { get; set; }
public string txt_status_self { get { return getStatusText(status_self) + MyHelper.GetDateStringForReport(status_self_click_date) + " " + MyHelper.GetTimeStringFromDate(status_self_click_date) + getHistoryLink(status_self); } }
public string txt_status_chief { get { return getStatusText(status_chief) + MyHelper.GetDateStringForReport(status_chief_click_date) + " " + MyHelper.GetTimeStringFromDate(status_chief_click_date) + getHistoryLink(status_chief); } }
public string txt_status_supervisor { get { return getStatusText(status_supervisor) + MyHelper.GetDateStringForReport(status_supervisor_click_date) + " " + MyHelper.GetTimeStringFromDate(status_supervisor_click_date) + getHistoryLink(status_supervisor); } }
public string txt_status_supervisor1A { get { return getStatusText(status_supervisor1A) + MyHelper.GetDateStringForReport(status_supervisor1A_click_date) + " " + MyHelper.GetTimeStringFromDate(status_supervisor1A_click_date) + getHistoryLink(status_supervisor1A); } }
public string txt_status_supervisor2A { get { return getStatusText(status_supervisor2A) + MyHelper.GetDateStringForReport(status_supervisor2A_click_date) + " " + MyHelper.GetTimeStringFromDate(status_supervisor2A_click_date) + getHistoryLink(status_supervisor2A); } }
public string txt_status_supervisor3A { get { return getStatusText(status_supervisor3A) + MyHelper.GetDateStringForReport(status_supervisor3A_click_date) + " " + MyHelper.GetTimeStringFromDate(status_supervisor3A_click_date) + getHistoryLink(status_supervisor3A); } }
private string getHistoryLink(string s)
{
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs
+2
View File
@@ -29,12 +29,14 @@ namespace TodoAPI2.Models
public int? supervisor2_position_type_id { get; set; }
public int? supervisor1A_position_type_id { get; set; }
public int? supervisor2A_position_type_id { get; set; }
public int? supervisor3A_position_type_id { get; set; }
public int? employee_position_type_id { get; set; }
public int? chief_position_type_id { get; set; }
public string supervisor2_position_level_text { get; set; }
public string supervisor1A_position_level_text { get; set; }
public string supervisor2A_position_level_text { get; set; }
public string supervisor3A_position_level_text { get; set; }
public string employee_position_level_text { get; set; }
public string chief_position_level_text { get; set; }
Views/eva_create_evaluationView/eva_create_evaluation.cshtml
+12 -4
View File
@@ -45,6 +45,11 @@
<label id="lab_eva_create_evaluation_supervisor2_id" for="eva_create_evaluation_supervisor2_id">ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด)</label>
<select class="form-control" id="eva_create_evaluation_supervisor2_id" iLabel="ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด)" iRequire="false" iGroup="eva_create_evaluation"></select>
</div>
<div class="form-group col-md-4">
<label id="lab_eva_create_evaluation_supervisor3_id" for="eva_create_evaluation_supervisor3_id">ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (พิเศษ)</label>
<select class="form-control" id="eva_create_evaluation_supervisor3_id" iLabel="ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (พิเศษ)" iRequire="false" iGroup="eva_create_evaluation"></select>
</div>
</div>
<div class='row'>
@@ -123,12 +128,12 @@
</thead>
<tbody></tbody>
</table>
</div>
</div>
</section>
@section FooterPlaceHolder{
<script src="~/js/eva_create_evaluation/eva_create_evaluation.js?version=@MyHelper.GetDummyText()"></script>
<script>
<script src="~/js/eva_create_evaluation/eva_create_evaluation.js?version=@MyHelper.GetDummyText()"></script>
<script>
$(document).ready(function () {
eva_create_evaluation_InitiateDataTable();
eva_create_evaluation_InitialForm();
@@ -142,9 +147,12 @@
$("#eva_create_evaluation_supervisor2_id").select2({
dropdownParent: $('#eva_create_evaluationModel')
});
$("#eva_create_evaluation_supervisor3_id").select2({
dropdownParent: $('#eva_create_evaluationModel')
});
$("#eva_create_evaluation_detail_employee_id").select2();
$("#eva_create_evaluation_detail_chief").select2();
});
</script>
</script>
}
Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml
+57 -39
View File
@@ -50,8 +50,16 @@
<label id="lab_eva_create_evaluation_detail_supervisor2_id" for="eva_create_evaluation_detail_supervisor2_id">ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด)</label>
<select class="form-control" id="eva_create_evaluation_detail_supervisor2_id" iLabel="ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด)" iRequire="false" iGroup="eva_create_evaluation_detail"></select>
</div>
<div class="form-group col-md-4">
<label id="lab_eva_create_evaluation_detail_supervisor3_id" for="eva_create_evaluation_detail_supervisor3_id">ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (พิเศษ)</label>
<select class="form-control" id="eva_create_evaluation_detail_supervisor3_id" iLabel="ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (พิเศษ)" iRequire="false" iGroup="eva_create_evaluation_detail" ></select>
</div>
</div>
<div class='row'>
<div class="form-group col-md-4">
<label id="lab_eva_create_evaluation_detail_work_period" for="eva_create_evaluation_detail_work_period">ระยะเวลาทำงาน ในรอบการประเมินนี้ (เดือน)</label>
<input class="form-control" type="number" id="eva_create_evaluation_detail_work_period" iLabel="ระยะเวลาทำงาน ในรอบการประเมินนี้ (เดือน)" iRequire="false" iGroup="eva_create_evaluation_detail" />
@@ -159,6 +167,11 @@
<label id="lab_eva_create_evaluation_supervisor2_id" for="eva_create_evaluation_supervisor2_id">ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด)</label>
<select class="form-control" id="eva_create_evaluation_supervisor2_id" iLabel="ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด)" iRequire="false" iGroup="eva_create_evaluation"></select>
</div>
<div class="form-group col-md-4">
<label id="lab_eva_create_evaluation_supervisor3_id" for="eva_create_evaluation_supervisor3_id">ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (พิเศษ)</label>
<select class="form-control" id="eva_create_evaluation_supervisor3_id" iLabel="ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (พิเศษ)" iRequire="false" iGroup="eva_create_evaluation"></select>
</div>
</div>
<div class='row'>
@@ -238,50 +251,55 @@
</section>
@section FooterPlaceHolder{
<script src="~/js/eva_create_evaluation/eva_create_evaluation_d.js?version=@MyHelper.GetDummyText()"></script>
<script src="~/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js?version=@MyHelper.GetDummyText()"></script>
<script>
$(document).ready(function () {
var id = getUrlParameter("id");
if (id) {
eva_create_evaluation_SetEditForm(id);
eva_create_evaluation_detail_InitiateDataTable(id);
eva_create_evaluation_detail_InitialForm();
SetupValidationRemark("eva_create_evaluation_detail");
} else {
eva_create_evaluation_SetCreateForm();
}
SetupValidationRemark("eva_create_evaluation");
$("#eva_create_evaluation_employee_id").select2();
$("#eva_create_evaluation_supervisor1_id").select2();
$("#eva_create_evaluation_supervisor2_id").select2();
$("#eva_create_evaluation_detail_employee_id").select2({
dropdownParent: $('#eva_create_evaluation_detailModel')
});
$("#eva_create_evaluation_detail_chief").select2({
dropdownParent: $('#eva_create_evaluation_detailModel')
});
$("#eva_create_evaluation_detail_eva_employee_id").select2({
dropdownParent: $('#eva_create_evaluation_detailModel')
});
$("#eva_create_evaluation_detail_supervisor1_id").select2({
dropdownParent: $('#eva_create_evaluation_detailModel')
});
$("#eva_create_evaluation_detail_supervisor2_id").select2({
dropdownParent: $('#eva_create_evaluation_detailModel')
});
});
function go_next() {
var id = getUrlParameter("id");
window.location = "eva_create_evaluation_d_summary?id=" + id;
<script src="~/js/eva_create_evaluation/eva_create_evaluation_d.js?version=@MyHelper.GetDummyText()"></script>
<script src="~/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js?version=@MyHelper.GetDummyText()"></script>
<script>
$(document).ready(function () {
var id = getUrlParameter("id");
if (id) {
eva_create_evaluation_SetEditForm(id);
eva_create_evaluation_detail_InitiateDataTable(id);
eva_create_evaluation_detail_InitialForm();
SetupValidationRemark("eva_create_evaluation_detail");
} else {
eva_create_evaluation_SetCreateForm();
}
SetupValidationRemark("eva_create_evaluation");
$("#eva_create_evaluation_employee_id").select2();
$("#eva_create_evaluation_supervisor1_id").select2();
$("#eva_create_evaluation_supervisor2_id").select2();
$("#eva_create_evaluation_supervisor3_id").select2();
</script>
$("#eva_create_evaluation_detail_employee_id").select2({
dropdownParent: $('#eva_create_evaluation_detailModel')
});
$("#eva_create_evaluation_detail_chief").select2({
dropdownParent: $('#eva_create_evaluation_detailModel')
});
$("#eva_create_evaluation_detail_eva_employee_id").select2({
dropdownParent: $('#eva_create_evaluation_detailModel')
});
$("#eva_create_evaluation_detail_supervisor1_id").select2({
dropdownParent: $('#eva_create_evaluation_detailModel')
});
$("#eva_create_evaluation_detail_supervisor2_id").select2({
dropdownParent: $('#eva_create_evaluation_detailModel')
});
$("#eva_create_evaluation_detail_supervisor3_id").select2({
dropdownParent: $('#eva_create_evaluation_detailModel')
});
});
function go_next() {
var id = getUrlParameter("id");
window.location = "eva_create_evaluation_d_summary?id=" + id;
}
</script>
}
@section HeadPlaceHolder{
<link href="~/BackendScript/css/step.css" rel="stylesheet">
<link href="~/BackendScript/css/step.css" rel="stylesheet">
}
Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process.cshtml
+1
View File
@@ -79,6 +79,7 @@
<th><label>สถานะทำแบบประเมิน<br />(ผู้ประเมินสูงสุด)</label></th>
<th><label>สถานะตรวจสอบ<br />(ผู้บังคับบัญชาการเหนือขึ้นไปอีกชั้นหนึ่ง)</label></th>
<th><label>สถานะตรวจสอบ<br />(ผู้บังคับบัญชาการเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด))</label></th>
<th><label>สถานะตรวจสอบ<br />(ผู้บังคับบัญชาการเหนือขึ้นไปอีกชั้นหนึ่ง (พิเศษ))</label></th>
</tr>
</thead>
<tbody></tbody>
wwwroot/js/eva_create_evaluation/eva_create_evaluation.js
+2
View File
@@ -28,6 +28,7 @@ function eva_create_evaluation_FeedDataToForm(data) {
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_evaluation_group_id"), data, "id", "thegroup", "item_evaluation_group_id", data.evaluation_group_id);
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor1_id"), data, "id", "fullname", "item_supervisor1_id", data.supervisor1_id);
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor2_id"), data, "id", "fullname", "item_supervisor2_id", data.supervisor2_id);
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor3_id"), data, "id", "fullname", "item_supervisor3_id", data.supervisor3_id);
}
@@ -41,6 +42,7 @@ function eva_create_evaluation_GetFromForm() {
eva_create_evaluationObject.evaluation_group_id = $("#eva_create_evaluation_evaluation_group_id").val();
eva_create_evaluationObject.supervisor1_id = $("#eva_create_evaluation_supervisor1_id").val();
eva_create_evaluationObject.supervisor2_id = $("#eva_create_evaluation_supervisor2_id").val();
eva_create_evaluationObject.supervisor3_id = $("#eva_create_evaluation_supervisor3_id").val();
return eva_create_evaluationObject;
}
wwwroot/js/eva_create_evaluation/eva_create_evaluation_d.js
+2
View File
@@ -12,6 +12,7 @@ function eva_create_evaluation_FeedDataToForm(data) {
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_evaluation_group_id"), data, "id", "thegroup", "item_evaluation_group_id", data.evaluation_group_id);
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor1_id"), data, "id", "fullname", "item_supervisor1_id", data.supervisor1_id);
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor2_id"), data, "id", "fullname", "item_supervisor2_id", data.supervisor2_id);
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor3_id"), data, "id", "fullname", "item_supervisor3_id", data.supervisor3_id);
}
@@ -25,6 +26,7 @@ function eva_create_evaluation_GetFromForm() {
eva_create_evaluationObject.evaluation_group_id = $("#eva_create_evaluation_evaluation_group_id").val();
eva_create_evaluationObject.supervisor1_id = $("#eva_create_evaluation_supervisor1_id").val();
eva_create_evaluationObject.supervisor2_id = $("#eva_create_evaluation_supervisor2_id").val();
eva_create_evaluationObject.supervisor3_id = $("#eva_create_evaluation_supervisor3_id").val();
return eva_create_evaluationObject;
}
wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js
+2
View File
@@ -29,6 +29,7 @@ function eva_create_evaluation_detail_FeedDataToForm(data) {
$("#eva_create_evaluation_detail_order_of_data").val(data.order_of_data);
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_detail_help_org_id"), data, "id", "external_name", "item_help_org_id", data.help_org_id);
$("#eva_create_evaluation_detail_remark").val(data.remark);
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_detail_supervisor3_id"), data, "id", "fullname", "item_supervisor3_id", data.supervisor3_id);
}
function eva_create_evaluation_detail_GetFromForm() {
@@ -44,6 +45,7 @@ function eva_create_evaluation_detail_GetFromForm() {
eva_create_evaluation_detailObject.order_of_data = $("#eva_create_evaluation_detail_order_of_data").val();
eva_create_evaluation_detailObject.help_org_id = $("#eva_create_evaluation_detail_help_org_id").val();
eva_create_evaluation_detailObject.remark = $("#eva_create_evaluation_detail_remark").val();
eva_create_evaluation_detailObject.supervisor3_id = $("#eva_create_evaluation_detail_supervisor3_id").val();
return eva_create_evaluation_detailObject;
}
wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js
+3 -2
View File
@@ -206,7 +206,8 @@ var eva_create_evaluation_detail_process_setupTable = function (result) {
{ "data": "txt_status_chief" },
{ "data": "txt_status_supervisor" },
{ "data": "txt_status_supervisor1A" },
{ "data": "txt_status_supervisor2A" }
{ "data": "txt_status_supervisor2A" },
{ "data": "txt_status_supervisor3A" }
],
"columnDefs": [
{
@@ -230,7 +231,7 @@ var eva_create_evaluation_detail_process_setupTable = function (result) {
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>'
'<tr class="group"><td colspan="13">' + group + '</td></tr>'
);
last = group;