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

ปลด lock การกรอกคะแนน ให้กรอกได้อิสระ

Browse Source
This commit is contained in:
nakorn
2022-04-08 11:55:20 +07:00
parent 71f1906d79
commit 94bf0709d1
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApiControllers/rep_eva_xControllers.cs
View File

@@ -277,15 +277,15 @@ namespace TodoAPI2.Controllers
foreach (var k in rep_type) foreach (var k in rep_type)
{ {
if (!string.IsNullOrEmpty(loginPositionName)) //if (!string.IsNullOrEmpty(loginPositionName))
{ //{
if (!(loginPositionName == "นักทรัพยากรบุคคล" || loginPositionName.Contains("ผู้อำนวยการ")) // if (!(loginPositionName == "นักทรัพยากรบุคคล" || loginPositionName.Contains("ผู้อำนวยการ"))
&& (k == 2 || k == 3 || k == 4 || k == 5) // && (k == 2 || k == 3 || k == 4 || k == 5)
) // )
{ // {
continue; // continue;
} // }
} //}
string url = $"{mainurl}{reportsite}/rep_eva_x{k}.{model.filetype}?{MyHelper.GetParameterForJasperReport(p1)}&j_username={username}&j_password={password}"; string url = $"{mainurl}{reportsite}/rep_eva_x{k}.{model.filetype}?{MyHelper.GetParameterForJasperReport(p1)}&j_username={username}&j_password={password}";

4
Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs
View File

@@ -151,13 +151,13 @@ namespace TodoAPI2.Models
private (decimal?, decimal?) GetRangePercentage(List<eva_level_score_detailEntity> level_detail, decimal? score) private (decimal?, decimal?) GetRangePercentage(List<eva_level_score_detailEntity> level_detail, decimal? score)
{ {
var item = (from i in level_detail /*var item = (from i in level_detail
where i.min_value <= score && i.max_value >= score where i.min_value <= score && i.max_value >= score
select i).FirstOrDefault(); select i).FirstOrDefault();
if (item != null) if (item != null)
{ {
return (item.min_percentage, item.max_percentage); return (item.min_percentage, item.max_percentage);
} }*/
return (-100, 100); return (-100, 100);
} }

4
appsettings.Development.json
View File

@@ -1,7 +1,7 @@
{ {
"connectionStrings": { "connectionStrings": {
"mainDBConnectionString": "Server=192.168.1.34;Port=32432;Database=tb320_hr_site2;User ID=postgres;Password=ZdPr0jects;", "mainDBConnectionString": "Server=192.168.1.34;Port=32432;Database=tb320_hr_site2_eva2;User ID=postgres;Password=ZdPr0jects;",
"externalDBConnectionString": "Server=192.168.1.34;Port=32432;Database=tb320_hr_site2;User ID=postgres;Password=ZdPr0jects;" "externalDBConnectionString": "Server=192.168.1.34;Port=32432;Database=tb320_hr_site2_eva2;User ID=postgres;Password=ZdPr0jects;"
//"mainDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr_site2;User ID=postgres;Password=project0*;", //"mainDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr_site2;User ID=postgres;Password=project0*;",
//"externalDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr_site2;User ID=postgres;Password=project0*;" //"externalDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr_site2;User ID=postgres;Password=project0*;"
}, },