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

เพิ่มฟิล remark2

Browse Source
This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-09-10 15:13:26 +07:00
parent a898de8ab2
commit edc9bf053e
10 changed files with 1135 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
EXCEL/eva_limit_frame_group.xlsx
View File

Binary file not shown.

1084
Migrations/20210910071115_AddRemark2.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

23
Migrations/20210910071115_AddRemark2.cs Normal file
View File

@@ -0,0 +1,23 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace tb320eva.Migrations
{
public partial class AddRemark2 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "remark2",
table: "eva_limit_frame_group",
maxLength: 4000,
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "remark2",
table: "eva_limit_frame_group");
}
}
}

3
Migrations/DataContextModelSnapshot.cs
View File

@@ -767,6 +767,9 @@ namespace tb320eva.Migrations
b.Property<string>("remark")
.HasMaxLength(4000);
b.Property<string>("remark2")
.HasMaxLength(4000);
b.Property<decimal?>("total_salary");
b.Property<decimal?>("total_salary_limit");

3
Models/eva_limit_frame_group/eva_limit_frame_groupEntity.cs
View File

@@ -35,6 +35,9 @@ namespace TodoAPI2.Models
[MaxLength(4000)]
public string remark { get; set; }
[MaxLength(4000)]
public string remark2 { get; set; }
public int? main_dept_id { get; set; }
public void SetAutoField(DataContext context)
{

2
Models/eva_limit_frame_group/eva_limit_frame_groupInputModel.cs
View File

@@ -30,6 +30,8 @@ namespace TodoAPI2.Models
public string remark { get; set; }
public string remark2 { get; set; }
public string active_mode { get; set; }
}
}

13
Models/eva_limit_frame_group/eva_limit_frame_groupService.cs
View File

@@ -119,13 +119,11 @@ namespace TodoAPI2.Models
into eva_evaluation_groupResult2
from fk_eva_evaluation_groupResult2 in eva_evaluation_groupResult2.DefaultIfEmpty()
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
select new eva_limit_frame_groupViewModel()
{
@@ -136,7 +134,9 @@ namespace TodoAPI2.Models
total_salary = m_eva_limit_frame_group.total_salary,
total_salary_limit = m_eva_limit_frame_group.total_salary_limit,
total_salary_limit_rounded = m_eva_limit_frame_group.total_salary_limit_rounded,
remark = m_eva_limit_frame_group.remark,
remark = m_eva_limit_frame_group.remark+@"
"+ m_eva_limit_frame_group.remark2,
remark2 = m_eva_limit_frame_group.remark2,
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,
@@ -204,6 +204,7 @@ namespace TodoAPI2.Models
existingEntity.total_salary_limit = model.total_salary_limit;
existingEntity.total_salary_limit_rounded = model.total_salary_limit_rounded;
existingEntity.remark = "";
existingEntity.remark2 = model.remark2;
int j = 1;
foreach (var y in from z in _repository.Context.eva_limit_frame_employee where z.frame_group_guid == model.id orderby z.order_of_data select z)
@@ -257,8 +258,9 @@ namespace TodoAPI2.Models
existingEntity.total_salary_limit = i.total_salary_limit;
existingEntity.total_salary_limit_rounded = i.total_salary_limit_rounded;
existingEntity.remark = i.remark;
existingEntity.remark2 = i.remark2;
existingEntity.SetAutoField(_repository.Context);
existingEntity.SetAutoField(_repository.Context);
_repository.UpdateWithoutCommit(i.id.Value, existingEntity);
}
}
@@ -329,7 +331,8 @@ namespace TodoAPI2.Models
i.Add("total_salary", "อัตราเงินเดือนรวม");
i.Add("total_salary_limit", "วงเงินในการเลื่อนเงินเดือน");
i.Add("total_salary_limit_rounded", "วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง");
i.Add("remark", "หมายเหตุ");
i.Add("remark", "หมายเหตุ");
i.Add("remark2", "หมายเหตุ กรอกเอง");
return i;
}

2
Models/eva_limit_frame_group/eva_limit_frame_groupViewModel.cs
View File

@@ -28,6 +28,8 @@ namespace TodoAPI2.Models
public string remark { get; set; }
public string remark2 { get; set; }
public DateTime? frame_plan_guid_eva_limit_frame_plan_executed_date { get; set; }
public string group_guid_eva_evaluation_group_code { get; set; }

9
Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml
View File

@@ -129,7 +129,7 @@
<div class="form-group col-md-4">
<label id="lab_eva_limit_frame_group_limit_frame_295" for="eva_limit_frame_group_limit_frame_295">วงเงินในการเลื่อนเงินเดือน ร้อยละ</label>
<input class="form-control" type="number" id="eva_limit_frame_group_limit_frame_295" iLabel="วงเงินในการเลื่อนเงินเดือน ร้อยละ" iRequire="false" iGroup="eva_limit_frame_group"
<input class="form-control" type="number" id="eva_limit_frame_group_limit_frame_295" iLabel="วงเงินในการเลื่อนเงินเดือน ร้อยละ" iRequire="false" iGroup="eva_limit_frame_group"
onchange="funcCeilCalculateSalaryLimit(event)" />
</div>
</div>
@@ -155,7 +155,12 @@
<textarea disabled class="form-control" rows="4" cols="50" id="eva_limit_frame_group_remark" iLabel="หมายเหตุ" iRequire="false" iGroup="eva_limit_frame_group"></textarea>
</div>
</div>
<div class='row'>
<div class="form-group col-md-12">
<label id="lab_eva_limit_frame_group_remark2" for="eva_limit_frame_group_remark2">หมายเหตุ กรอกเอง</label>
<textarea class="form-control" rows="4" cols="50" id="eva_limit_frame_group_remark2" iLabel="หมายเหตุ กรอกเอง" iRequire="false" iGroup="eva_limit_frame_group"></textarea>
</div>
</div>
</div>
</div>

5
wwwroot/js/eva_limit_frame_group/eva_limit_frame_group_d.js
View File

@@ -13,7 +13,8 @@ function eva_limit_frame_group_FeedDataToForm(data) {
$("#eva_limit_frame_group_total_salary_limit").val(coreFormatPrice(data.total_salary_limit, digits));
$("#eva_limit_frame_group_total_salary_limit_rounded").val(coreFormatPrice(data.total_salary_limit_rounded, digits));
$("#eva_limit_frame_group_remark").val(data.remark);
$("#eva_limit_frame_group_remark2").val(data.remark2);
console.log(data);
}
function eva_limit_frame_group_GetFromForm() {
@@ -26,7 +27,7 @@ function eva_limit_frame_group_GetFromForm() {
eva_limit_frame_groupObject.total_salary_limit = $("#eva_limit_frame_group_total_salary_limit").val();
eva_limit_frame_groupObject.total_salary_limit_rounded = $("#eva_limit_frame_group_total_salary_limit_rounded").val();
eva_limit_frame_groupObject.remark = $("#eva_limit_frame_group_remark").val();
eva_limit_frame_groupObject.remark2 = $("#eva_limit_frame_group_remark2").val();
return eva_limit_frame_groupObject;
}