From d345d579a17dd834bdbb94028240120d23d290e9 Mon Sep 17 00:00:00 2001 From: Sudkhet Authairat Date: Mon, 3 Oct 2022 16:11:12 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=20(supervisor1=5Fremark)=20parameter=20jasperReport?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ApiControllers/rep_eva_xControllers.cs | 1 + .../eva_create_evaluation_detail_processViewModel.cs | 2 ++ Models/rep_eva_x/rep_eva_xInputModel2.cs | 1 + 3 files changed, 4 insertions(+) diff --git a/ApiControllers/rep_eva_xControllers.cs b/ApiControllers/rep_eva_xControllers.cs index dee6deb..6cf88d3 100644 --- a/ApiControllers/rep_eva_xControllers.cs +++ b/ApiControllers/rep_eva_xControllers.cs @@ -400,6 +400,7 @@ namespace TodoAPI2.Controllers i.chief_fullname = p.chief_fullname; i.chief_position = p.chief_position + checkLevel(p.chief_position_type_id, p.chief_position_level_text, p.chief_fullname); + i.supervisor1_remark = p.supervisor1_remark; i.supervisor2_fullname = p.supervisor2_fullname; i.supervisor2_position = p.supervisor2_position + checkLevel(p.supervisor2_position_type_id, p.supervisor2_position_level_text, p.supervisor2_fullname); i.supervisor1A_fullname = p.supervisor1A_fullname; diff --git a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs index bd9d95a..0b33aed 100644 --- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs +++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs @@ -37,6 +37,8 @@ namespace TodoAPI2.Models public string chief_position { get; set; } + public string supervisor1_remark { get; set; } + public string supervisor2_fullname { get; set; } public string supervisor2_position { get; set; } diff --git a/Models/rep_eva_x/rep_eva_xInputModel2.cs b/Models/rep_eva_x/rep_eva_xInputModel2.cs index 44ebf03..ada60bb 100644 --- a/Models/rep_eva_x/rep_eva_xInputModel2.cs +++ b/Models/rep_eva_x/rep_eva_xInputModel2.cs @@ -25,6 +25,7 @@ namespace TodoAPI2.Models public string image_url { get; set; } public string chief_fullname { get; set; } public string chief_position { get; set; } + public string supervisor1_remark { get; set; } public string supervisor2_fullname { get; set; } public string supervisor2_position { get; set; } public string supervisor1A_fullname { get; set; }