diff --git a/ApiControllers/rep_eva_xControllers.cs b/ApiControllers/rep_eva_xControllers.cs index d35f81a..dee6deb 100644 --- a/ApiControllers/rep_eva_xControllers.cs +++ b/ApiControllers/rep_eva_xControllers.cs @@ -277,15 +277,15 @@ namespace TodoAPI2.Controllers foreach (var k in rep_type) { - if (!string.IsNullOrEmpty(loginPositionName)) - { - if (!(loginPositionName == "นักทรัพยากรบุคคล" || loginPositionName.Contains("ผู้อำนวยการ")) - && (k == 2 || k == 3 || k == 4 || k == 5) - ) - { - continue; - } - } + //if (!string.IsNullOrEmpty(loginPositionName)) + //{ + // if (!(loginPositionName == "นักทรัพยากรบุคคล" || loginPositionName.Contains("ผู้อำนวยการ")) + // && (k == 2 || k == 3 || k == 4 || k == 5) + // ) + // { + // continue; + // } + //} string url = $"{mainurl}{reportsite}/rep_eva_x{k}.{model.filetype}?{MyHelper.GetParameterForJasperReport(p1)}&j_username={username}&j_password={password}"; diff --git a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs index 434890f..2ff3dca 100644 --- a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs +++ b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs @@ -151,13 +151,13 @@ namespace TodoAPI2.Models private (decimal?, decimal?) GetRangePercentage(List 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 select i).FirstOrDefault(); if (item != null) { return (item.min_percentage, item.max_percentage); - } + }*/ return (-100, 100); } diff --git a/appsettings.Development.json b/appsettings.Development.json index 2b7e1ee..992bc18 100644 --- a/appsettings.Development.json +++ b/appsettings.Development.json @@ -1,7 +1,7 @@ { "connectionStrings": { - "mainDBConnectionString": "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;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_eva2;User ID=postgres;Password=ZdPr0jects;" //"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*;" },