From 622fb463232c4b5b52ea375d518a9fbee3d64a5f Mon Sep 17 00:00:00 2001 From: Pairat Sangprasert Date: Thu, 15 Jul 2021 23:04:53 +0700 Subject: [PATCH] =?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;