diff --git a/Utils/MyHelper.cs b/Utils/MyHelper.cs index eff2f7d..d85ed6b 100644 --- a/Utils/MyHelper.cs +++ b/Utils/MyHelper.cs @@ -7,6 +7,8 @@ using System.Data; using System.Reflection; using Microsoft.Extensions.Configuration; using System.Net; +using TodoAPI2.Models; +using Microsoft.AspNetCore.Http; /// /// Summary description for MyHelper @@ -258,6 +260,28 @@ public class MyHelper return httpclient; } + public static void get_login(Microsoft.AspNetCore.Http.HttpContext HttpContext, + Iexternal_employeeService _repository, + Microsoft.AspNetCore.Http.HttpResponse Response + ) + { + if (!string.IsNullOrEmpty(HttpContext.Request.Cookies["user_id"])) + { + string loginid = HttpContext.Request.Cookies["user_id"]; + var emp = _repository.GetEmployeeForLogin(Convert.ToInt32(loginid)); + if (emp != null) + { + Response.Cookies.Delete("emp_name"); + Response.Cookies.Delete("emp_id"); + + CookieOptions option = new CookieOptions(); + option.Expires = DateTime.Now.AddHours(3); + Response.Cookies.Append("emp_name", emp.fullname, option); + Response.Cookies.Append("emp_id", emp.id.ToString(), option); + } + } + } + public static bool checkAuth(IConfiguration Configuration, Microsoft.AspNetCore.Http.HttpContext context) { //if (!string.IsNullOrEmpty(context.Request.Cookies["user_id"])) diff --git a/ViewControllers/eva_adjust_postponement_normalViewControllers.cs b/ViewControllers/eva_adjust_postponement_normalViewControllers.cs index 2a865a4..2558a6b 100644 --- a/ViewControllers/eva_adjust_postponement_normalViewControllers.cs +++ b/ViewControllers/eva_adjust_postponement_normalViewControllers.cs @@ -16,44 +16,38 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Ieva_adjust_postponement_normalService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// + /// /// - public eva_adjust_postponement_normalViewController(ILogger logger, Ieva_adjust_postponement_normalService repository, IConfiguration configuration) + public eva_adjust_postponement_normalViewController(ILogger logger, Ieva_adjust_postponement_normalService repository, IConfiguration configuration, Iexternal_employeeService inemp) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult eva_adjust_postponement_normal() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } public IActionResult eva_adjust_postponement_normal_d() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } - //public IActionResult eva_adjust_postponement_normal_report() - //{ - // if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView - // return View(); - //} - - //public IActionResult eva_adjust_postponement_normal_inline() - //{ - // if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView - // return View(); - //} [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] public IActionResult Error() diff --git a/ViewControllers/eva_adjust_postponement_quotaViewControllers.cs b/ViewControllers/eva_adjust_postponement_quotaViewControllers.cs index 3eb670b..c615b7e 100644 --- a/ViewControllers/eva_adjust_postponement_quotaViewControllers.cs +++ b/ViewControllers/eva_adjust_postponement_quotaViewControllers.cs @@ -16,30 +16,36 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Ieva_adjust_postponement_quotaService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public eva_adjust_postponement_quotaViewController(ILogger logger, Ieva_adjust_postponement_quotaService repository, IConfiguration configuration) + /// + public eva_adjust_postponement_quotaViewController( + ILogger logger, Iexternal_employeeService inemp, Ieva_adjust_postponement_quotaService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult eva_adjust_postponement_quota() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } public IActionResult eva_adjust_postponement_quota_d() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/eva_create_evaluationViewControllers.cs b/ViewControllers/eva_create_evaluationViewControllers.cs index dc94abf..05a8448 100644 --- a/ViewControllers/eva_create_evaluationViewControllers.cs +++ b/ViewControllers/eva_create_evaluationViewControllers.cs @@ -16,35 +16,41 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Ieva_create_evaluationService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public eva_create_evaluationViewController(ILogger logger, Ieva_create_evaluationService repository, IConfiguration configuration) + /// + public eva_create_evaluationViewController(ILogger logger, Iexternal_employeeService inemp, Ieva_create_evaluationService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult eva_create_evaluation() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } public IActionResult eva_create_evaluation_d() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } public IActionResult eva_create_evaluation_d_summary() { + MyHelper.get_login(HttpContext, emp, Response); if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/eva_create_evaluation_detailViewControllers.cs b/ViewControllers/eva_create_evaluation_detailViewControllers.cs index f5a79bf..a70b3ad 100644 --- a/ViewControllers/eva_create_evaluation_detailViewControllers.cs +++ b/ViewControllers/eva_create_evaluation_detailViewControllers.cs @@ -16,30 +16,36 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Ieva_create_evaluation_detailService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public eva_create_evaluation_detailViewController(ILogger logger, Ieva_create_evaluation_detailService repository, IConfiguration configuration) + /// + public eva_create_evaluation_detailViewController( + ILogger logger, Iexternal_employeeService inemp, Ieva_create_evaluation_detailService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult eva_create_evaluation_detail() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } public IActionResult eva_create_evaluation_detail_d() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/eva_create_evaluation_detail_agreementViewControllers.cs b/ViewControllers/eva_create_evaluation_detail_agreementViewControllers.cs index 359a717..a29996a 100644 --- a/ViewControllers/eva_create_evaluation_detail_agreementViewControllers.cs +++ b/ViewControllers/eva_create_evaluation_detail_agreementViewControllers.cs @@ -16,30 +16,36 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Ieva_create_evaluation_detail_agreementService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public eva_create_evaluation_detail_agreementViewController(ILogger logger, Ieva_create_evaluation_detail_agreementService repository, IConfiguration configuration) + /// + public eva_create_evaluation_detail_agreementViewController( + ILogger logger, Iexternal_employeeService inemp, Ieva_create_evaluation_detail_agreementService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult eva_create_evaluation_detail_agreement() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } public IActionResult eva_create_evaluation_detail_agreement_d() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/eva_create_evaluation_detail_processViewControllers.cs b/ViewControllers/eva_create_evaluation_detail_processViewControllers.cs index 2402323..b2db176 100644 --- a/ViewControllers/eva_create_evaluation_detail_processViewControllers.cs +++ b/ViewControllers/eva_create_evaluation_detail_processViewControllers.cs @@ -16,35 +16,42 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Ieva_create_evaluation_detail_processService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public eva_create_evaluation_detail_processViewController(ILogger logger, Ieva_create_evaluation_detail_processService repository, IConfiguration configuration) + /// + public eva_create_evaluation_detail_processViewController( + ILogger logger, Iexternal_employeeService inemp, Ieva_create_evaluation_detail_processService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult eva_create_evaluation_detail_process() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } public IActionResult eva_create_evaluation_detail_process_d() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } public IActionResult eva_create_evaluation_detail_process_d2() { + MyHelper.get_login(HttpContext, emp, Response); if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/eva_evaluation_achievementViewControllers.cs b/ViewControllers/eva_evaluation_achievementViewControllers.cs index 2c29111..445904a 100644 --- a/ViewControllers/eva_evaluation_achievementViewControllers.cs +++ b/ViewControllers/eva_evaluation_achievementViewControllers.cs @@ -16,30 +16,35 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Ieva_evaluation_achievementService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public eva_evaluation_achievementViewController(ILogger logger, Ieva_evaluation_achievementService repository, IConfiguration configuration) + /// + public eva_evaluation_achievementViewController(ILogger logger, Iexternal_employeeService inemp, Ieva_evaluation_achievementService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult eva_evaluation_achievement() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } public IActionResult eva_evaluation_achievement_d() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/eva_evaluation_achievement_processViewControllers.cs b/ViewControllers/eva_evaluation_achievement_processViewControllers.cs index 4947ed5..9094c90 100644 --- a/ViewControllers/eva_evaluation_achievement_processViewControllers.cs +++ b/ViewControllers/eva_evaluation_achievement_processViewControllers.cs @@ -16,30 +16,36 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Ieva_evaluation_achievement_processService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public eva_evaluation_achievement_processViewController(ILogger logger, Ieva_evaluation_achievement_processService repository, IConfiguration configuration) + /// + public eva_evaluation_achievement_processViewController( + ILogger logger, Iexternal_employeeService inemp, Ieva_evaluation_achievement_processService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult eva_evaluation_achievement_process() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } public IActionResult eva_evaluation_achievement_process_d() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/eva_evaluation_behaviorViewControllers.cs b/ViewControllers/eva_evaluation_behaviorViewControllers.cs index ac00e14..bedb1a2 100644 --- a/ViewControllers/eva_evaluation_behaviorViewControllers.cs +++ b/ViewControllers/eva_evaluation_behaviorViewControllers.cs @@ -16,30 +16,35 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Ieva_evaluation_behaviorService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public eva_evaluation_behaviorViewController(ILogger logger, Ieva_evaluation_behaviorService repository, IConfiguration configuration) + /// + public eva_evaluation_behaviorViewController(ILogger logger, Iexternal_employeeService inemp, Ieva_evaluation_behaviorService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult eva_evaluation_behavior() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } public IActionResult eva_evaluation_behavior_d() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/eva_evaluation_behavior_processViewControllers.cs b/ViewControllers/eva_evaluation_behavior_processViewControllers.cs index 20ea199..eeff2e1 100644 --- a/ViewControllers/eva_evaluation_behavior_processViewControllers.cs +++ b/ViewControllers/eva_evaluation_behavior_processViewControllers.cs @@ -16,30 +16,36 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Ieva_evaluation_behavior_processService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public eva_evaluation_behavior_processViewController(ILogger logger, Ieva_evaluation_behavior_processService repository, IConfiguration configuration) + /// + public eva_evaluation_behavior_processViewController( + ILogger logger, Iexternal_employeeService inemp, Ieva_evaluation_behavior_processService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult eva_evaluation_behavior_process() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } public IActionResult eva_evaluation_behavior_process_d() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/eva_evaluation_groupViewControllers.cs b/ViewControllers/eva_evaluation_groupViewControllers.cs index feb4e45..61f9a36 100644 --- a/ViewControllers/eva_evaluation_groupViewControllers.cs +++ b/ViewControllers/eva_evaluation_groupViewControllers.cs @@ -16,30 +16,35 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Ieva_evaluation_groupService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public eva_evaluation_groupViewController(ILogger logger, Ieva_evaluation_groupService repository, IConfiguration configuration) + /// + public eva_evaluation_groupViewController(ILogger logger, Iexternal_employeeService inemp, Ieva_evaluation_groupService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult eva_evaluation_group() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } public IActionResult eva_evaluation_group_d() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/eva_level_scoreViewControllers.cs b/ViewControllers/eva_level_scoreViewControllers.cs index 1d7dfd3..39e88c1 100644 --- a/ViewControllers/eva_level_scoreViewControllers.cs +++ b/ViewControllers/eva_level_scoreViewControllers.cs @@ -16,30 +16,35 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Ieva_level_scoreService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public eva_level_scoreViewController(ILogger logger, Ieva_level_scoreService repository, IConfiguration configuration) + /// + public eva_level_scoreViewController(ILogger logger, Iexternal_employeeService inemp, Ieva_level_scoreService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult eva_level_score() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } public IActionResult eva_level_score_d() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/eva_level_score_basicViewControllers.cs b/ViewControllers/eva_level_score_basicViewControllers.cs index 11929b4..460569b 100644 --- a/ViewControllers/eva_level_score_basicViewControllers.cs +++ b/ViewControllers/eva_level_score_basicViewControllers.cs @@ -16,24 +16,28 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Ieva_level_score_basicService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public eva_level_score_basicViewController(ILogger logger, Ieva_level_score_basicService repository, IConfiguration configuration) + /// + public eva_level_score_basicViewController(ILogger logger, Iexternal_employeeService inemp, Ieva_level_score_basicService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult eva_level_score_basic() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/eva_performance_planViewControllers.cs b/ViewControllers/eva_performance_planViewControllers.cs index e1b18d8..ca0d9be 100644 --- a/ViewControllers/eva_performance_planViewControllers.cs +++ b/ViewControllers/eva_performance_planViewControllers.cs @@ -16,7 +16,8 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Ieva_performance_planService _repository; - private IConfiguration Configuration { get; set; } + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } /// /// Default constructure for dependency injection @@ -24,22 +25,26 @@ namespace TodoAPI2.Controllers /// /// /// - public eva_performance_planViewController(ILogger logger, Ieva_performance_planService repository, IConfiguration configuration) + /// + public eva_performance_planViewController(ILogger logger, Iexternal_employeeService inemp, Ieva_performance_planService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult eva_performance_plan() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } public IActionResult eva_performance_plan_d() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/eva_performance_plan_detailViewControllers.cs b/ViewControllers/eva_performance_plan_detailViewControllers.cs index 92bd502..ee80b6b 100644 --- a/ViewControllers/eva_performance_plan_detailViewControllers.cs +++ b/ViewControllers/eva_performance_plan_detailViewControllers.cs @@ -16,7 +16,8 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Ieva_performance_plan_detailService _repository; - private IConfiguration Configuration { get; set; } + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } /// /// Default constructure for dependency injection @@ -24,22 +25,26 @@ namespace TodoAPI2.Controllers /// /// /// - public eva_performance_plan_detailViewController(ILogger logger, Ieva_performance_plan_detailService repository, IConfiguration configuration) + /// + public eva_performance_plan_detailViewController(ILogger logger, Iexternal_employeeService inemp, Ieva_performance_plan_detailService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult eva_performance_plan_detail() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } public IActionResult eva_performance_plan_detail_d() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/eva_salary_cylinderViewControllers.cs b/ViewControllers/eva_salary_cylinderViewControllers.cs index 41164da..ee02e1f 100644 --- a/ViewControllers/eva_salary_cylinderViewControllers.cs +++ b/ViewControllers/eva_salary_cylinderViewControllers.cs @@ -16,30 +16,35 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Ieva_salary_cylinderService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public eva_salary_cylinderViewController(ILogger logger, Ieva_salary_cylinderService repository, IConfiguration configuration) + /// + public eva_salary_cylinderViewController(ILogger logger, Iexternal_employeeService inemp, Ieva_salary_cylinderService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult eva_salary_cylinder() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } public IActionResult eva_salary_cylinder_d() { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView + MyHelper.get_login(HttpContext, emp, Response); + if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/homeViewController.cs b/ViewControllers/homeViewController.cs index 839a97c..0d1ada5 100644 --- a/ViewControllers/homeViewController.cs +++ b/ViewControllers/homeViewController.cs @@ -16,29 +16,29 @@ namespace TodoAPI2.Controllers public class homeController : Controller { private IConfiguration Configuration { get; set; } - private Iexternal_employeeService _repository; + private Iexternal_employeeService emp; /// /// Default constructure for dependency injection /// - /// + /// /// - public homeController(Iexternal_employeeService repository, IConfiguration configuration) + public homeController(Iexternal_employeeService inemp, IConfiguration configuration) { Configuration = configuration; - _repository = repository; + emp = inemp; } public IActionResult index() { - get_login(); + MyHelper.get_login(HttpContext, emp, Response); return View(); } public IActionResult index_report() { - get_login(); + MyHelper.get_login(HttpContext, emp, Response); return View(); } @@ -59,26 +59,7 @@ namespace TodoAPI2.Controllers return Redirect("/eva/home/index"); } - - public void get_login() - { - if (!string.IsNullOrEmpty(HttpContext.Request.Cookies["user_id"])) - { - string loginid = HttpContext.Request.Cookies["user_id"]; - var emp = _repository.GetEmployeeForLogin(Convert.ToInt32(loginid)); - if (emp != null) - { - Response.Cookies.Delete("emp_name"); - Response.Cookies.Delete("emp_id"); - - CookieOptions option = new CookieOptions(); - option.Expires = DateTime.Now.AddHours(3); - Response.Cookies.Append("emp_name", emp.fullname, option); - Response.Cookies.Append("emp_id", emp.id.ToString(), option); - } - } - } - + [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] public IActionResult Error() { diff --git a/ViewControllers/rep_eva01ViewControllers.cs b/ViewControllers/rep_eva01ViewControllers.cs index 890c975..7d296c0 100644 --- a/ViewControllers/rep_eva01ViewControllers.cs +++ b/ViewControllers/rep_eva01ViewControllers.cs @@ -16,23 +16,27 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Irep_eva01Service _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public rep_eva01ViewController(ILogger logger, Irep_eva01Service repository, IConfiguration configuration) + /// + public rep_eva01ViewController(ILogger logger, Iexternal_employeeService inemp, Irep_eva01Service repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult rep_eva01_report() { + MyHelper.get_login(HttpContext, emp, Response); if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/rep_eva02ViewControllers.cs b/ViewControllers/rep_eva02ViewControllers.cs index c448949..39f0bb7 100644 --- a/ViewControllers/rep_eva02ViewControllers.cs +++ b/ViewControllers/rep_eva02ViewControllers.cs @@ -16,24 +16,28 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Irep_eva02Service _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public rep_eva02ViewController(ILogger logger, Irep_eva02Service repository, IConfiguration configuration) + /// + public rep_eva02ViewController(ILogger logger, Iexternal_employeeService inemp, Irep_eva02Service repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult rep_eva02_report() { + MyHelper.get_login(HttpContext, emp, Response); if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/rep_eva03ViewControllers.cs b/ViewControllers/rep_eva03ViewControllers.cs index 61bd8fa..2fb24df 100644 --- a/ViewControllers/rep_eva03ViewControllers.cs +++ b/ViewControllers/rep_eva03ViewControllers.cs @@ -16,24 +16,28 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Irep_eva03Service _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public rep_eva03ViewController(ILogger logger, Irep_eva03Service repository, IConfiguration configuration) + /// + public rep_eva03ViewController(ILogger logger, Iexternal_employeeService inemp, Irep_eva03Service repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult rep_eva03_report() { + MyHelper.get_login(HttpContext, emp, Response); if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/rep_familyViewControllers.cs b/ViewControllers/rep_familyViewControllers.cs index 01cc4de..2b689f7 100644 --- a/ViewControllers/rep_familyViewControllers.cs +++ b/ViewControllers/rep_familyViewControllers.cs @@ -16,22 +16,26 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Irep_familyService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public rep_familyViewController(ILogger logger, Irep_familyService repository, IConfiguration configuration) + /// + public rep_familyViewController(ILogger logger, Iexternal_employeeService inemp, Irep_familyService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult rep_family_report() { + MyHelper.get_login(HttpContext, emp, Response); if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/rep_leave_summaryViewControllers.cs b/ViewControllers/rep_leave_summaryViewControllers.cs index c9ce008..3fbba1b 100644 --- a/ViewControllers/rep_leave_summaryViewControllers.cs +++ b/ViewControllers/rep_leave_summaryViewControllers.cs @@ -16,23 +16,27 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Irep_leave_summaryService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public rep_leave_summaryViewController(ILogger logger, Irep_leave_summaryService repository, IConfiguration configuration) + /// + public rep_leave_summaryViewController(ILogger logger, Iexternal_employeeService inemp, Irep_leave_summaryService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult rep_leave_summary_report() { + MyHelper.get_login(HttpContext, emp, Response); if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/rep_leave_totalViewControllers.cs b/ViewControllers/rep_leave_totalViewControllers.cs index cb8fa7e..9dab865 100644 --- a/ViewControllers/rep_leave_totalViewControllers.cs +++ b/ViewControllers/rep_leave_totalViewControllers.cs @@ -16,23 +16,27 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Irep_leave_totalService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public rep_leave_totalViewController(ILogger logger, Irep_leave_totalService repository, IConfiguration configuration) + /// + public rep_leave_totalViewController(ILogger logger, Iexternal_employeeService inemp, Irep_leave_totalService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult rep_leave_total_report() { + MyHelper.get_login(HttpContext, emp, Response); if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/rep_position_salaryViewControllers.cs b/ViewControllers/rep_position_salaryViewControllers.cs index 1770c4a..7995533 100644 --- a/ViewControllers/rep_position_salaryViewControllers.cs +++ b/ViewControllers/rep_position_salaryViewControllers.cs @@ -16,23 +16,27 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Irep_position_salaryService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public rep_position_salaryViewController(ILogger logger, Irep_position_salaryService repository, IConfiguration configuration) + /// + public rep_position_salaryViewController(ILogger logger, Iexternal_employeeService inemp, Irep_position_salaryService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult rep_position_salary_report() { + MyHelper.get_login(HttpContext, emp, Response); if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/rep_samanaViewControllers.cs b/ViewControllers/rep_samanaViewControllers.cs index 7c20904..e03042c 100644 --- a/ViewControllers/rep_samanaViewControllers.cs +++ b/ViewControllers/rep_samanaViewControllers.cs @@ -16,23 +16,27 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Irep_samanaService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public rep_samanaViewController(ILogger logger, Irep_samanaService repository, IConfiguration configuration) + /// + public rep_samanaViewController(ILogger logger, Iexternal_employeeService inemp, Irep_samanaService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult rep_samana_report() { + MyHelper.get_login(HttpContext, emp, Response); if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/rep_study_historyViewControllers.cs b/ViewControllers/rep_study_historyViewControllers.cs index 084dbf1..74036dd 100644 --- a/ViewControllers/rep_study_historyViewControllers.cs +++ b/ViewControllers/rep_study_historyViewControllers.cs @@ -16,24 +16,28 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Irep_study_historyService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public rep_study_historyViewController(ILogger logger, Irep_study_historyService repository, IConfiguration configuration) + /// + public rep_study_historyViewController(ILogger logger, Iexternal_employeeService inemp, Irep_study_historyService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult rep_study_history_report() { + MyHelper.get_login(HttpContext, emp, Response); if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/ViewControllers/rep_working_typeViewControllers.cs b/ViewControllers/rep_working_typeViewControllers.cs index 3d849ed..4c18ccc 100644 --- a/ViewControllers/rep_working_typeViewControllers.cs +++ b/ViewControllers/rep_working_typeViewControllers.cs @@ -16,24 +16,28 @@ namespace TodoAPI2.Controllers { private ILogger _logger; private Irep_working_typeService _repository; - private IConfiguration Configuration { get; set; } - + private Iexternal_employeeService emp; + private IConfiguration Configuration { get; set; } + /// /// Default constructure for dependency injection /// /// - /// + /// /// - public rep_working_typeViewController(ILogger logger, Irep_working_typeService repository, IConfiguration configuration) + /// + public rep_working_typeViewController(ILogger logger, Iexternal_employeeService inemp, Irep_working_typeService repository, IConfiguration configuration) { _logger = logger; _repository = repository; Configuration = configuration; + emp = inemp; } public IActionResult rep_working_type_report() { + MyHelper.get_login(HttpContext, emp, Response); if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView return View(); } diff --git a/tb320eva.xml b/tb320eva.xml index 9ada29a..5f9831c 100644 --- a/tb320eva.xml +++ b/tb320eva.xml @@ -3588,133 +3588,149 @@ Returns the item Error Occurred - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + @@ -3727,88 +3743,98 @@ Default constructure for dependency injection - + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection + - + Default constructure for dependency injection +