diff --git a/Areas/Inventory/Controllers/ItemController.cs b/Areas/Inventory/Controllers/ItemController.cs index 60019d1..403a41e 100644 --- a/Areas/Inventory/Controllers/ItemController.cs +++ b/Areas/Inventory/Controllers/ItemController.cs @@ -1,9 +1,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; -using PSTW_CentralSystem.Models; -using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; -using System.Security.Claims; namespace PSTW_CentralSystem.Areas.Inventory.Controllers { @@ -12,69 +9,44 @@ namespace PSTW_CentralSystem.Areas.Inventory.Controllers //[Authorize(Policy = "RoleModulePolicy")] public class ItemController : Controller { - private readonly IHttpContextAccessor _httpContextAccessor; - - public ItemController(IHttpContextAccessor httpContextAccessor) - { - _httpContextAccessor = httpContextAccessor; - } - public string GetCurrentUserId() - { - var user = _httpContextAccessor.HttpContext?.User; - - if (user == null) - { - return null!; - } - - return user.FindFirstValue(ClaimTypes.NameIdentifier) ?? null!; // Returns the user ID - } - // GET: Inventory public ActionResult Index() { - var userId = GetCurrentUserId(); - return View(userId); + return View(); } public IActionResult ItemRegistration() { - var userId = GetCurrentUserId(); - return View(userId); + return View(); } public IActionResult ProductRegistration() { - var userId = GetCurrentUserId(); - return View(userId); + return View(); } // GET: Inventory/Details/5 public ActionResult Details(int id) { - var userId = GetCurrentUserId(); - return View(userId); + return View(); } // GET: Inventory/Create public ActionResult Create() { - var userId = GetCurrentUserId(); - return View(userId); + return View(); } // GET: Inventory/Edit/5 public ActionResult Edit(int id) { - var userId = GetCurrentUserId(); - return View(userId); + return View(); } // GET: Inventory/Delete/5 public ActionResult Delete(int id) { - var userId = GetCurrentUserId(); - return View(userId); + return View(); } } diff --git a/Areas/Inventory/Controllers/MainController.cs b/Areas/Inventory/Controllers/MainController.cs index 08aaa34..526809d 100644 --- a/Areas/Inventory/Controllers/MainController.cs +++ b/Areas/Inventory/Controllers/MainController.cs @@ -1,7 +1,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using System.Security.Claims; namespace PSTW_CentralSystem.Areas.Inventory.Controllers { @@ -9,68 +8,43 @@ namespace PSTW_CentralSystem.Areas.Inventory.Controllers //[Authorize(Policy = "RoleModulePolicy")] public class MainController : Controller { - private readonly IHttpContextAccessor _httpContextAccessor; - - public MainController(IHttpContextAccessor httpContextAccessor) - { - _httpContextAccessor = httpContextAccessor; - } - public string GetCurrentUserId() - { - var user = _httpContextAccessor.HttpContext?.User; - - if (user == null) - { - return null!; - } - - return user.FindFirstValue(ClaimTypes.NameIdentifier) ?? null!; // Returns the user ID - } - // GET: Inventory public ActionResult Index() { - var userId = GetCurrentUserId(); - return View(userId); + return View(); } public IActionResult SupplierRegistration() { - var userId = GetCurrentUserId(); - return View(userId); + return View(); } public IActionResult ManifacturerRegistration() { - var userId = GetCurrentUserId(); - return View(userId); + return View(); } // GET: Inventory/Details/5 public ActionResult Details(int id) { - var userId = GetCurrentUserId(); - return View(userId); + return View(); } // GET: Inventory/Create public ActionResult Create() { - var userId = GetCurrentUserId(); - return View(userId); + return View(); } // GET: Inventory/Edit/5 public ActionResult Edit(int id) { - var userId = GetCurrentUserId(); - return View(userId); + return View(); } // GET: Inventory/Delete/5 public ActionResult Delete(int id) { - var userId = GetCurrentUserId(); - return View(userId); + return View(); } } diff --git a/Areas/Inventory/Models/ItemModel.cs b/Areas/Inventory/Models/ItemModel.cs index 4a3e6b0..54a07c1 100644 --- a/Areas/Inventory/Models/ItemModel.cs +++ b/Areas/Inventory/Models/ItemModel.cs @@ -34,7 +34,6 @@ namespace PSTW_CentralSystem.Areas.Inventory.Models public int ItemStatus { get; set; } = 1; public string ItemLocation { get; set; } = string.Empty; public int CreatedByUserId { get; set; } - [ForeignKey("CreatedByUserId")] public virtual UserModel? CreatedBy { get; set; } [ForeignKey("CompanyId")] diff --git a/Areas/Inventory/Views/Item/ItemRegistration.cshtml b/Areas/Inventory/Views/Item/ItemRegistration.cshtml index 0903cfd..058e150 100644 --- a/Areas/Inventory/Views/Item/ItemRegistration.cshtml +++ b/Areas/Inventory/Views/Item/ItemRegistration.cshtml @@ -2,9 +2,7 @@ @{ ViewData["Title"] = "Item Form"; Layout = "~/Views/Shared/_Layout.cshtml"; - string userId = ViewBag.UserId; } -