From 9aa338ff1828efdeedf43af5aa77392586517147 Mon Sep 17 00:00:00 2001 From: Pairat Sangprasert Date: Wed, 14 Jul 2021 18:54:07 +0700 Subject: [PATCH 1/5] =?UTF-8?q?=E0=B8=97=E0=B8=B3=E0=B8=AB=E0=B8=99?= =?UTF-8?q?=E0=B9=89=E0=B8=B2=20font=20=E0=B9=83=E0=B8=AB=E0=B9=89?= =?UTF-8?q?=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=20report=20jasper=20?= =?UTF-8?q?=E0=B9=81=E0=B8=A5=E0=B8=B0=20=E0=B9=80=E0=B8=82=E0=B8=B5?= =?UTF-8?q?=E0=B8=A2=E0=B8=99=20api=20controller=20=E0=B9=83=E0=B8=AB?= =?UTF-8?q?=E0=B9=89=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=20report=20?= =?UTF-8?q?=E0=B9=81=E0=B8=A5=E0=B8=B0=20=E0=B8=97=E0=B8=B3=20class=20mode?= =?UTF-8?q?l=20=E0=B8=A3=E0=B8=B1=E0=B8=9A=20parameter=20=E0=B8=88?= =?UTF-8?q?=E0=B8=B2=E0=B8=81=20font?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...va_adjust_postponement_quotaControllers.cs | 39 +++++++++++++++++++ .../rep_eva_savemessageReportRequestModel.cs | 21 ++++++++++ .../eva_adjust_postponement_quota_d.cshtml | 24 ++++++++++++ tb320eva.xml | 10 +++++ .../eva_adjust_postponement_quota_d.js | 30 ++++++++++++++ 5 files changed, 124 insertions(+) create mode 100644 Models/rep_eva_savemessage/rep_eva_savemessageReportRequestModel.cs diff --git a/ApiControllers/eva_adjust_postponement_quotaControllers.cs b/ApiControllers/eva_adjust_postponement_quotaControllers.cs index 0d161fd..f9c0ca6 100644 --- a/ApiControllers/eva_adjust_postponement_quotaControllers.cs +++ b/ApiControllers/eva_adjust_postponement_quotaControllers.cs @@ -15,6 +15,7 @@ using TodoAPI2.Models; using System.Data; using Microsoft.Extensions.Configuration; using System.IO; +using System.Net; namespace TodoAPI2.Controllers { @@ -315,6 +316,44 @@ namespace TodoAPI2.Controllers return BadRequest(ModelState); } + /// + /// Download Report + /// + /// + /// + /// Return list of items by specifced keyword + /// Returns the item + /// Error Occurred + [HttpGet("rep_eva_savemessage")] + [ProducesResponseType(typeof(FileStreamResult), 200)] + [ProducesResponseType(400)] + [ProducesResponseType(500)] + //[ValidateAntiForgeryToken] + public IActionResult rep_eva_savemessage(rep_eva_savemessageReportRequestModel model) + { + try + { + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); + //var httpclient = MyHelper.getHttpClient(Configuration); + var httpclient = new WebClient(); + string mainurl = MyHelper.GetConfig(Configuration, "JasperReportServer:MainURL"); + string reportsite = MyHelper.GetConfig(Configuration, "JasperReportServer:reportsite"); + string username = MyHelper.GetConfig(Configuration, "JasperReportServer:username"); + string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password"); + string url = $"{mainurl}{reportsite}/rep_eva_savemessage.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; + + var data = httpclient.DownloadData(url); + var stream = new MemoryStream(data); + + return File(stream, model.contentType); + } + catch (Exception ex) + { + _logger.LogCritical($"Exception while GetReport.", ex); + return StatusCode(500, $"Exception while GetReport. {ex.Message}"); + } + } + } } diff --git a/Models/rep_eva_savemessage/rep_eva_savemessageReportRequestModel.cs b/Models/rep_eva_savemessage/rep_eva_savemessageReportRequestModel.cs new file mode 100644 index 0000000..de95e7d --- /dev/null +++ b/Models/rep_eva_savemessage/rep_eva_savemessageReportRequestModel.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Threading.Tasks; +using TTSW.EF; +using TTSW.Utils; +using TTSW.Constant; +using TTSW.Common; + +namespace TodoAPI2.Models +{ + public class rep_eva_savemessageReportRequestModel + { + public int? quota_id { get; set; } + public string filetype { get; set; } + public string contentType { get { return MyHelper.GetContentType(filetype); } } + } +} + 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 d449432..7b64946 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 @@ -5,6 +5,29 @@ Layout = "_LayoutDirect"; } + +
@@ -103,6 +126,7 @@
+
diff --git a/tb320eva.xml b/tb320eva.xml index d6cf165..498212c 100644 --- a/tb320eva.xml +++ b/tb320eva.xml @@ -886,6 +886,16 @@ If the model is invalid Error Occurred + + + Download Report + + + + Return list of items by specifced keyword + Returns the item + Error Occurred + Default constructure for dependency injection diff --git a/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js b/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js index f2b94e3..1131ed5 100644 --- a/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js +++ b/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js @@ -180,3 +180,33 @@ function CalculateRemainQuota(m) { } +// ================================================= report rep_eva_savemessage ================================================== + +function rep_eva_savemessage_GetSearchParameter(fileType) { + var eva_adjust_postponement_quotaObject = new Object(); + eva_adjust_postponement_quotaObject.quota_id = $("#eva_adjust_postponement_quota_id").val(); + + eva_adjust_postponement_quotaObject.fileType = fileType; + + return eva_adjust_postponement_quotaObject; +} + +function rep_eva_savemessage_DoSearch(fileType) { + if (!ValidateForm('eva_adjust_postponement_quota', eva_adjust_postponement_quota_customValidation)) { + return; + } + + var p = $.param(rep_eva_savemessage_GetSearchParameter(fileType)); + + var report_url = apisite + eva_adjust_postponement_quota_API + "rep_eva_savemessage?" + p; + + if (fileType === "pdf") { + $("#report_result").attr("src", report_url); + $("#report_result").show(); + $("#report_xModel").modal("show"); + } else { + $("#report_result").hide(); + window.open(report_url); + } + +} From 6f06b1e544df996f331bfaedbe6e9f3340b354d2 Mon Sep 17 00:00:00 2001 From: "LAPTOP-KB8JC2K2\\acer" Date: Thu, 15 Jul 2021 14:31:49 +0700 Subject: [PATCH 2/5] =?UTF-8?q?=E0=B9=80=E0=B8=95=E0=B8=A3=E0=B8=B5?= =?UTF-8?q?=E0=B8=A2=E0=B8=A1=20code=20=E0=B9=80=E0=B8=9E=E0=B8=B7?= =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=AA=E0=B8=AD=E0=B8=99=20=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=94=E0=B8=B6=E0=B8=87=E0=B8=82=E0=B9=89?= =?UTF-8?q?=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=9C=E0=B9=88=E0=B8=B2?= =?UTF-8?q?=E0=B8=99=20C#=20=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B8=AA=E0=B9=88?= =?UTF-8?q?=E0=B8=87=E0=B9=84=E0=B8=9B=E0=B9=83=E0=B8=AB=E0=B9=89=20report?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...va_adjust_postponement_quotaControllers.cs | 25 +++++++++++++++++++ .../Ieva_adjust_postponement_quotaService.cs | 2 +- .../eva_adjust_postponement_quotaService.cs | 5 ++++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/ApiControllers/eva_adjust_postponement_quotaControllers.cs b/ApiControllers/eva_adjust_postponement_quotaControllers.cs index f9c0ca6..f127e46 100644 --- a/ApiControllers/eva_adjust_postponement_quotaControllers.cs +++ b/ApiControllers/eva_adjust_postponement_quotaControllers.cs @@ -340,6 +340,31 @@ namespace TodoAPI2.Controllers string reportsite = MyHelper.GetConfig(Configuration, "JasperReportServer:reportsite"); string username = MyHelper.GetConfig(Configuration, "JasperReportServer:username"); string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password"); + + var postponement_data = (from postponement in _repository.GetContext().eva_adjust_postponement + join create_evaluation in _repository.GetContext().eva_create_evaluation on postponement.create_evaluation_id equals create_evaluation.id + select new + { + create_evaluation.performance_plan_id, + postponement.fiscal_year, + postponement.theDate, + postponement.limit_frame, + postponement.limit_frame_quota + }).FirstOrDefault(); + + var plan = (from q in _repository.GetContext().eva_limit_frame_plan + where q.id == postponement_data.performance_plan_id + select q).FirstOrDefault(); + var start_plan = (from s in _repository.GetContext().eva_performance_plan_detail + where s.performance_plan_id == postponement_data.performance_plan_id + select s.start_date).Min(); + var end_plan = (from s in _repository.GetContext().eva_performance_plan_detail + where s.performance_plan_id == postponement_data.performance_plan_id + select s.end_date).Max(); + + var start_plan_date = MyHelper.GetDateStringForReport(start_plan); + var end_plan_date = MyHelper.GetDateStringForReport(end_plan); + string url = $"{mainurl}{reportsite}/rep_eva_savemessage.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; var data = httpclient.DownloadData(url); diff --git a/Models/eva_adjust_postponement_quota/Ieva_adjust_postponement_quotaService.cs b/Models/eva_adjust_postponement_quota/Ieva_adjust_postponement_quotaService.cs index f6738e1..475c059 100644 --- a/Models/eva_adjust_postponement_quota/Ieva_adjust_postponement_quotaService.cs +++ b/Models/eva_adjust_postponement_quota/Ieva_adjust_postponement_quotaService.cs @@ -21,7 +21,7 @@ namespace TodoAPI2.Models eva_adjust_postponement_quotaWithSelectionViewModel GetWithSelection(int id); eva_adjust_postponement_quotaWithSelectionViewModel GetBlankItem(); - + DataContext GetContext(); } } diff --git a/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs b/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs index 2486f10..26ac85e 100644 --- a/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs +++ b/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs @@ -59,6 +59,11 @@ namespace TodoAPI2.Models #region Public Functions #region Query Functions + public DataContext GetContext() + { + return _repository.Context; + } + public eva_adjust_postponement_quotaViewModel Get(int id) { var entity = _repository.Get(id); From 622fb463232c4b5b52ea375d518a9fbee3d64a5f Mon Sep 17 00:00:00 2001 From: Pairat Sangprasert Date: Thu, 15 Jul 2021 23:04:53 +0700 Subject: [PATCH 3/5] =?UTF-8?q?=E0=B8=97=E0=B8=B3=20set=20parameter=20?= =?UTF-8?q?=E0=B8=88=E0=B8=B2=E0=B8=81=20font-end=20=E0=B9=81=E0=B8=A5?= =?UTF-8?q?=E0=B8=B0=20back-end=20=E0=B9=83=E0=B8=AB=E0=B9=89=20jasper=20?= =?UTF-8?q?=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1=E0=B8=87=E0=B8=97=E0=B8=B3?= =?UTF-8?q?=E0=B8=95=E0=B9=88=E0=B8=AD=20=E0=B9=83=E0=B8=99=E0=B8=AA?= =?UTF-8?q?=E0=B9=88=E0=B8=A7=E0=B8=99=E0=B8=82=E0=B8=AD=E0=B8=87=E0=B8=A3?= =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=20?= =?UTF-8?q?=E0=B8=97=E0=B8=B3=E0=B8=A7=E0=B8=B1=E0=B8=99=20=E0=B8=9E?= =?UTF-8?q?=E0=B8=A4=E0=B8=AB=E0=B8=B1=E0=B8=AA=E0=B8=9A=E0=B8=94=E0=B8=B5?= =?UTF-8?q?=20=E0=B8=97=E0=B8=B5=E0=B9=88=2015/07/2564=20=E0=B9=80?= =?UTF-8?q?=E0=B8=A7=E0=B8=A5=E0=B8=B2=2020.00=20-=2023.00=20=E0=B8=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...va_adjust_postponement_quotaControllers.cs | 24 +---------- .../Ieva_adjust_postponement_quotaService.cs | 2 +- .../eva_adjust_postponement_quotaService.cs | 40 +++++++++++++++++++ .../rep_eva_savemessageReportRequestModel.cs | 12 +++++- .../eva_adjust_postponement_quota_d.js | 24 ++++++----- 5 files changed, 68 insertions(+), 34 deletions(-) diff --git a/ApiControllers/eva_adjust_postponement_quotaControllers.cs b/ApiControllers/eva_adjust_postponement_quotaControllers.cs index f127e46..ea4f998 100644 --- a/ApiControllers/eva_adjust_postponement_quotaControllers.cs +++ b/ApiControllers/eva_adjust_postponement_quotaControllers.cs @@ -341,29 +341,7 @@ namespace TodoAPI2.Controllers string username = MyHelper.GetConfig(Configuration, "JasperReportServer:username"); string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password"); - var postponement_data = (from postponement in _repository.GetContext().eva_adjust_postponement - join create_evaluation in _repository.GetContext().eva_create_evaluation on postponement.create_evaluation_id equals create_evaluation.id - select new - { - create_evaluation.performance_plan_id, - postponement.fiscal_year, - postponement.theDate, - postponement.limit_frame, - postponement.limit_frame_quota - }).FirstOrDefault(); - - var plan = (from q in _repository.GetContext().eva_limit_frame_plan - where q.id == postponement_data.performance_plan_id - select q).FirstOrDefault(); - var start_plan = (from s in _repository.GetContext().eva_performance_plan_detail - where s.performance_plan_id == postponement_data.performance_plan_id - select s.start_date).Min(); - var end_plan = (from s in _repository.GetContext().eva_performance_plan_detail - where s.performance_plan_id == postponement_data.performance_plan_id - select s.end_date).Max(); - - var start_plan_date = MyHelper.GetDateStringForReport(start_plan); - var end_plan_date = MyHelper.GetDateStringForReport(end_plan); + _repository.setModelFor_rep_eva_savemessageReport(model); string url = $"{mainurl}{reportsite}/rep_eva_savemessage.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; diff --git a/Models/eva_adjust_postponement_quota/Ieva_adjust_postponement_quotaService.cs b/Models/eva_adjust_postponement_quota/Ieva_adjust_postponement_quotaService.cs index 475c059..8798aa7 100644 --- a/Models/eva_adjust_postponement_quota/Ieva_adjust_postponement_quotaService.cs +++ b/Models/eva_adjust_postponement_quota/Ieva_adjust_postponement_quotaService.cs @@ -20,7 +20,7 @@ namespace TodoAPI2.Models string UpdateMultiple(List model); eva_adjust_postponement_quotaWithSelectionViewModel GetWithSelection(int id); eva_adjust_postponement_quotaWithSelectionViewModel GetBlankItem(); - + rep_eva_savemessageReportRequestModel setModelFor_rep_eva_savemessageReport(rep_eva_savemessageReportRequestModel model); DataContext GetContext(); } diff --git a/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs b/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs index 26ac85e..941696f 100644 --- a/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs +++ b/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs @@ -511,6 +511,46 @@ namespace TodoAPI2.Models return; } + + public rep_eva_savemessageReportRequestModel setModelFor_rep_eva_savemessageReport(rep_eva_savemessageReportRequestModel model) + { + model.theDate = MyHelper.GetDateFromString(model.theDate_text); + model.theDate_text = MyHelper.GetDateStringForReport(model.theDate); + + var postponement_data = (from postponement in _repository.Context.eva_adjust_postponement + join create_evaluation in _repository.Context.eva_create_evaluation on postponement.create_evaluation_id equals create_evaluation.id + where postponement.id == model.quota_id + select new + { + create_evaluation.performance_plan_id, + postponement.fiscal_year, + postponement.theDate, + postponement.limit_frame, + postponement.limit_frame_quota + }).FirstOrDefault(); + + if(postponement_data != null) + { + var plan = (from eva_p_p in _repository.Context.eva_performance_plan + where eva_p_p.id == postponement_data.performance_plan_id + select eva_p_p).FirstOrDefault(); + + var start_plan = (from s in _repository.Context.eva_performance_plan_detail + where s.performance_plan_id == postponement_data.performance_plan_id + select s.start_date).Min(); + + var end_plan = (from s in _repository.Context.eva_performance_plan_detail + where s.performance_plan_id == postponement_data.performance_plan_id + select s.end_date).Max(); + + model.theTime = plan.theTime; + model.min_plan_start_date = MyHelper.GetDateStringForReport(start_plan); + model.max_plan_end_date = MyHelper.GetDateStringForReport(end_plan); + + } + + return model; + } #endregion #region Match Item diff --git a/Models/rep_eva_savemessage/rep_eva_savemessageReportRequestModel.cs b/Models/rep_eva_savemessage/rep_eva_savemessageReportRequestModel.cs index de95e7d..ad90b6b 100644 --- a/Models/rep_eva_savemessage/rep_eva_savemessageReportRequestModel.cs +++ b/Models/rep_eva_savemessage/rep_eva_savemessageReportRequestModel.cs @@ -14,7 +14,17 @@ namespace TodoAPI2.Models public class rep_eva_savemessageReportRequestModel { public int? quota_id { get; set; } - public string filetype { get; set; } + public int? fiscal_year { get; set; } + public int? theRound { get; set; } + public decimal? limit_frame_quota { get; set; } + public string limit_quota { get; set; } + public string command_no { get; set; } + public string theDate_text { get; set; } + public DateTime? theDate { get; set; } + public int? theTime { get; set; } + public string min_plan_start_date { get; set; } + public string max_plan_end_date { get; set; } + public string filetype { get; set; } public string contentType { get { return MyHelper.GetContentType(filetype); } } } } diff --git a/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js b/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js index 1131ed5..8889e83 100644 --- a/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js +++ b/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js @@ -10,7 +10,7 @@ function eva_adjust_postponement_quota_FeedDataToForm(data) { $("#eva_adjust_postponement_quota_theRound").val(data.theRound); $("#eva_adjust_postponement_quota_limit_quota").val(data.limit_quota); //$("#eva_adjust_postponement_quota_limit_quota").maskMoney('mask', data.limit_quota); - + // $("#eva_adjust_postponement_quota_limit_frame_quota").val(data.limit_frame_quota); $("#eva_adjust_postponement_quota_limit_frame_quota").maskMoney('mask', data.limit_frame_quota); $("#eva_adjust_postponement_quota_command_no").val(data.command_no); @@ -25,11 +25,11 @@ function eva_adjust_postponement_quota_GetFromForm() { eva_adjust_postponement_quotaObject.fiscal_year = $("#eva_adjust_postponement_quota_fiscal_year").val(); eva_adjust_postponement_quotaObject.theDate = getDate($("#eva_adjust_postponement_quota_theDate").val()); eva_adjust_postponement_quotaObject.theRound = $("#eva_adjust_postponement_quota_theRound").val(); - eva_adjust_postponement_quotaObject.limit_quota = $("#eva_adjust_postponement_quota_limit_quota").val().replace(/[,-]/g,''); - eva_adjust_postponement_quotaObject.limit_frame_quota = $("#eva_adjust_postponement_quota_limit_frame_quota").val().replace(/[,-]/g,''); + eva_adjust_postponement_quotaObject.limit_quota = $("#eva_adjust_postponement_quota_limit_quota").val().replace(/[,-]/g, ''); + eva_adjust_postponement_quotaObject.limit_frame_quota = $("#eva_adjust_postponement_quota_limit_frame_quota").val().replace(/[,-]/g, ''); eva_adjust_postponement_quotaObject.command_no = $("#eva_adjust_postponement_quota_command_no").val(); eva_adjust_postponement_quotaObject.managed_by = $("#eva_adjust_postponement_quota_managed_by").val(); - eva_adjust_postponement_quotaObject.limit = $("#eva_adjust_postponement_quota_limit").val().replace(/[,-]/g,''); + eva_adjust_postponement_quotaObject.limit = $("#eva_adjust_postponement_quota_limit").val().replace(/[,-]/g, ''); var eva_adjust_postponement_detail_quota_02 = []; $('#eva_adjust_postponement_detail_quota_02Body tr').each(function () { @@ -136,20 +136,20 @@ function Oneva_adjust_postponement_quota_limit_frame_quotaChange() { //$("#eva_adjust_postponement_quota_limit_quota").val(Math.ceil(limit_quota/10)*10); //console.log(limit); - $("#eva_adjust_postponement_quota_limit_quota").maskMoney('mask', Math.ceil(limit_quota/10)*10); + $("#eva_adjust_postponement_quota_limit_quota").maskMoney('mask', Math.ceil(limit_quota / 10) * 10); CalculateRemainQuota(false); } function CalculateRemainQuota(m) { -//console.log("xx"); + //console.log("xx"); var sum_receive_quota = 0; - var limit_quota = parseFloat($("#eva_adjust_postponement_quota_limit_quota").val().replace(/[,-]/g,'')); + var limit_quota = parseFloat($("#eva_adjust_postponement_quota_limit_quota").val().replace(/[,-]/g, '')); var eva_adjust_postponement_detail_quota_02 = []; $('#eva_adjust_postponement_detail_quota_02Body tr').each(function () { var i = $(this).find("#rowCount").text(); if (i) { - var current_salary = parseFloat($("#eva_adjust_postponement_detail_quota_02_sarary_" + i).text().replace(/[,-]/g,'')); + var current_salary = parseFloat($("#eva_adjust_postponement_detail_quota_02_sarary_" + i).text().replace(/[,-]/g, '')); var new_sarary = parseFloat($("#eva_adjust_postponement_detail_quota_02_new_sarary_" + i).text()); var receive_quota = parseFloat($("#eva_adjust_postponement_detail_quota_02_receive_quota_" + i).val()); @@ -167,7 +167,7 @@ function CalculateRemainQuota(m) { $("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).val(0); } } - + sum_receive_quota += receive_quota; } @@ -185,6 +185,12 @@ function CalculateRemainQuota(m) { function rep_eva_savemessage_GetSearchParameter(fileType) { var eva_adjust_postponement_quotaObject = new Object(); eva_adjust_postponement_quotaObject.quota_id = $("#eva_adjust_postponement_quota_id").val(); + eva_adjust_postponement_quotaObject.fiscal_year = $("#eva_adjust_postponement_quota_fiscal_year").val(); + eva_adjust_postponement_quotaObject.theRound = $("#eva_adjust_postponement_quota_theRound").val(); + eva_adjust_postponement_quotaObject.limit_frame_quota = $("#eva_adjust_postponement_quota_limit_frame_quota").val(); + eva_adjust_postponement_quotaObject.limit_quota = $("#eva_adjust_postponement_quota_limit_quota").val(); + eva_adjust_postponement_quotaObject.command_no = $("#eva_adjust_postponement_quota_command_no").val(); + eva_adjust_postponement_quotaObject.theDate_text = $("#eva_adjust_postponement_quota_theDate").val(); eva_adjust_postponement_quotaObject.fileType = fileType; From 18303d092f99d92e5dc42dfeb4a66354758d5547 Mon Sep 17 00:00:00 2001 From: "LAPTOP-KB8JC2K2\\acer" Date: Fri, 16 Jul 2021 11:50:25 +0700 Subject: [PATCH 4/5] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B8=E0=B8=87=20=E0=B8=84=E0=B8=B4?= =?UTF-8?q?=E0=B8=A7=E0=B8=A3=E0=B8=B5=E0=B9=88=20=E0=B9=80=E0=B8=9E?= =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B9=80?= =?UTF-8?q?=E0=B8=88=E0=B8=AD=20plan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eva_adjust_postponement_quotaService.cs | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs b/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs index 941696f..05406bb 100644 --- a/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs +++ b/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs @@ -531,22 +531,34 @@ namespace TodoAPI2.Models if(postponement_data != null) { - var plan = (from eva_p_p in _repository.Context.eva_performance_plan - where eva_p_p.id == postponement_data.performance_plan_id - select eva_p_p).FirstOrDefault(); + var plan_id = postponement_data.performance_plan_id; - var start_plan = (from s in _repository.Context.eva_performance_plan_detail - where s.performance_plan_id == postponement_data.performance_plan_id - select s.start_date).Min(); + if(plan_id == null) + { + plan_id = (from plan_in_db in _repository.Context.eva_performance_plan + where plan_in_db.fiscal_year == postponement_data.fiscal_year + && plan_in_db.theTime == plan_in_db.theTime + select plan_in_db.id).FirstOrDefault(); + } - var end_plan = (from s in _repository.Context.eva_performance_plan_detail - where s.performance_plan_id == postponement_data.performance_plan_id - select s.end_date).Max(); + if (plan_id.HasValue) + { + var plan = (from eva_p_p in _repository.Context.eva_performance_plan + where eva_p_p.id == plan_id + select eva_p_p).FirstOrDefault(); - model.theTime = plan.theTime; - model.min_plan_start_date = MyHelper.GetDateStringForReport(start_plan); - model.max_plan_end_date = MyHelper.GetDateStringForReport(end_plan); + var start_plan = (from s in _repository.Context.eva_performance_plan_detail + where s.performance_plan_id == postponement_data.performance_plan_id + select s.start_date).Min(); + var end_plan = (from s in _repository.Context.eva_performance_plan_detail + where s.performance_plan_id == postponement_data.performance_plan_id + select s.end_date).Max(); + + model.theTime = plan.theTime; + model.min_plan_start_date = MyHelper.GetDateStringForReport(start_plan); + model.max_plan_end_date = MyHelper.GetDateStringForReport(end_plan); + } } return model; From 3de7c45968a59800b5511417255497e725c6ac98 Mon Sep 17 00:00:00 2001 From: Pairat Sangprasert Date: Fri, 16 Jul 2021 16:20:53 +0700 Subject: [PATCH 5/5] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?= =?UTF-8?q?=E0=B8=A1=20decimal=5Flimit=5Fquota=20=E0=B9=83=E0=B8=99=20mode?= =?UTF-8?q?l=20=E0=B8=AA=E0=B8=B3=E0=B8=AB=E0=B8=A3=E0=B8=B1=E0=B8=9A=20re?= =?UTF-8?q?port=20=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B8=81?= =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1?= =?UTF-8?q?=20=E0=B9=83=E0=B8=8A=E0=B9=89=E0=B8=84=E0=B9=88=E0=B8=B2?= =?UTF-8?q?=E0=B8=88=E0=B8=B2=E0=B8=81=20limit=5Fquota?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eva_adjust_postponement_quotaService.cs | 1 + .../rep_eva_savemessage/rep_eva_savemessageReportRequestModel.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs b/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs index 05406bb..86e7121 100644 --- a/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs +++ b/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs @@ -516,6 +516,7 @@ namespace TodoAPI2.Models { model.theDate = MyHelper.GetDateFromString(model.theDate_text); model.theDate_text = MyHelper.GetDateStringForReport(model.theDate); + model.decimal_limit_quota = Convert.ToDecimal(model.limit_quota); var postponement_data = (from postponement in _repository.Context.eva_adjust_postponement join create_evaluation in _repository.Context.eva_create_evaluation on postponement.create_evaluation_id equals create_evaluation.id diff --git a/Models/rep_eva_savemessage/rep_eva_savemessageReportRequestModel.cs b/Models/rep_eva_savemessage/rep_eva_savemessageReportRequestModel.cs index ad90b6b..7f424af 100644 --- a/Models/rep_eva_savemessage/rep_eva_savemessageReportRequestModel.cs +++ b/Models/rep_eva_savemessage/rep_eva_savemessageReportRequestModel.cs @@ -18,6 +18,7 @@ namespace TodoAPI2.Models public int? theRound { get; set; } public decimal? limit_frame_quota { get; set; } public string limit_quota { get; set; } + public decimal? decimal_limit_quota { get; set; } public string command_no { get; set; } public string theDate_text { get; set; } public DateTime? theDate { get; set; }