diff --git a/ApiControllers/rep_eva_self_reviewControllers.cs b/ApiControllers/rep_eva_self_reviewControllers.cs index f67a616..1337a62 100644 --- a/ApiControllers/rep_eva_self_reviewControllers.cs +++ b/ApiControllers/rep_eva_self_reviewControllers.cs @@ -101,20 +101,20 @@ namespace TodoAPI2.Controllers if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); var httpclient = new WebClient(); - var stream = new MemoryStream(); - Document document = new Document(); - PdfCopy writer = new PdfCopy(document, stream); - document.Open(); + //var stream = new MemoryStream(); + //Document document = new Document(); + //PdfCopy writer = new PdfCopy(document, stream); + //document.Open(); var data1 = GetReport01(model); - PdfReader reader1 = new PdfReader(data1); - reader1.ConsolidateNamedDestinations(); - for (int i = 1; i <= reader1.NumberOfPages; i++) - { - PdfImportedPage page = writer.GetImportedPage(reader1, i); - writer.AddPage(page); - } - reader1.Close(); + //PdfReader reader1 = new PdfReader(data1); + //reader1.ConsolidateNamedDestinations(); + //for (int i = 1; i <= reader1.NumberOfPages; i++) + //{ + // PdfImportedPage page = writer.GetImportedPage(reader1, i); + // writer.AddPage(page); + //} + //reader1.Close(); //var data2 = GetReport02(model); //PdfReader reader2 = new PdfReader(data2); @@ -126,13 +126,15 @@ namespace TodoAPI2.Controllers //} //reader2.Close(); - writer.Close(); - document.Close(); + //writer.Close(); + //document.Close(); - var datax = stream.ToArray(); - var streamx = new MemoryStream(datax); + //var datax = stream.ToArray(); + //var streamx = new MemoryStream(datax); - return File(streamx, model.contentType); + var stream = new MemoryStream(data1); + + return File(stream, model.contentType); } catch (Exception ex) { diff --git a/Models/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2Service.cs b/Models/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2Service.cs index deef068..58931ca 100644 --- a/Models/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2Service.cs +++ b/Models/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2Service.cs @@ -275,6 +275,11 @@ namespace TodoAPI2.Models existingEntity.score4 = i.score2; existingEntity.sumary4 = i.sumary2; } + else if (i.who_update == "5") + { + existingEntity.score4 = i.score2; + existingEntity.sumary4 = i.sumary2; + } //existingEntity.target_score1 = i.target_score1; //existingEntity.target_score2 = i.target_score2; diff --git a/ViewControllers/eva_self_reviewViewControllers.cs b/ViewControllers/eva_self_reviewViewControllers.cs index 1069f88..0ee3ae9 100644 --- a/ViewControllers/eva_self_reviewViewControllers.cs +++ b/ViewControllers/eva_self_reviewViewControllers.cs @@ -40,20 +40,20 @@ namespace TodoAPI2.Controllers MyHelper.get_login(HttpContext, emp, Response); if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView - if(HttpContext.Request.Cookies["emp_id"] == "152" // ผอ กลาง - || HttpContext.Request.Cookies["emp_id"] == "180" // ประยูร สีสด - || HttpContext.Request.Cookies["emp_id"] == "107" // ประเดิมสวัสดิ์ - || HttpContext.Request.Cookies["emp_id"] == "70" // อังคณา - || HttpContext.Request.Cookies["emp_id"] == "69" // สาริกา - || HttpContext.Request.Cookies["emp_id"] == "64" // ขวัญพิชา - || HttpContext.Request.Cookies["emp_id"] == "161" // อุบลวรรณ - ) - { - return View(); - } + //if(HttpContext.Request.Cookies["emp_id"] == "152" // ผอ กลาง + // || HttpContext.Request.Cookies["emp_id"] == "180" // ประยูร สีสด + // || HttpContext.Request.Cookies["emp_id"] == "107" // ประเดิมสวัสดิ์ + // || HttpContext.Request.Cookies["emp_id"] == "70" // อังคณา + // || HttpContext.Request.Cookies["emp_id"] == "69" // สาริกา + // || HttpContext.Request.Cookies["emp_id"] == "64" // ขวัญพิชา + // || HttpContext.Request.Cookies["emp_id"] == "161" // อุบลวรรณ + // ) + //{ + // return View(); + //} - return View("eva_self_review_close"); - //return View(); + //return View("eva_self_review_close"); + return View(); } // public IActionResult eva_self_review_d() diff --git a/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml b/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml index 26b1221..8ce55c0 100644 --- a/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml +++ b/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml @@ -236,7 +236,8 @@