From 0d511921e80d4d499a17b019c7736ced8e5fae4c Mon Sep 17 00:00:00 2001
From: Mohd Ariff <catalyx_x@yahoo.com>
Date: Tue, 7 Jan 2025 10:16:22 +0800
Subject: [PATCH] Update

---
 Areas/Identity/Pages/Account/Login.cshtml     |  4 ++++
 .../Admin/InventoryMasterController.cs        | 19 +++++++++++++++++++
 ...ontroller.cs => ItemMovementController.cs} | 12 +-----------
 .../ItemRegistration.cshtml                   |  0
 .../ManifacturerRegistration.cshtml           |  0
 .../ProductRegistration.cshtml                |  0
 .../SupplierRegistration.cshtml               |  0
 Views/Admin/UserAdmin.cshtml                  | 18 +++++++++++++++++-
 Views/Shared/_Layout.cshtml                   |  2 +-
 9 files changed, 42 insertions(+), 13 deletions(-)
 rename Areas/Inventory/Controllers/{ItemController.cs => ItemMovementController.cs} (60%)
 rename Areas/Inventory/Views/{Item => InventoryMaster}/ItemRegistration.cshtml (100%)
 rename Areas/Inventory/Views/{Main => InventoryMaster}/ManifacturerRegistration.cshtml (100%)
 rename Areas/Inventory/Views/{Item => InventoryMaster}/ProductRegistration.cshtml (100%)
 rename Areas/Inventory/Views/{Main => InventoryMaster}/SupplierRegistration.cshtml (100%)

diff --git a/Areas/Identity/Pages/Account/Login.cshtml b/Areas/Identity/Pages/Account/Login.cshtml
index 533512d..fef680b 100644
--- a/Areas/Identity/Pages/Account/Login.cshtml
+++ b/Areas/Identity/Pages/Account/Login.cshtml
@@ -97,6 +97,10 @@
 
         $(function () {
             app.mount('#systemLogin');
+
+            $('.closeModal').on('click', function () {
+                $('.modal').modal('hide');
+            });
         });
 
         const app = Vue.createApp({
diff --git a/Areas/Inventory/Controllers/Admin/InventoryMasterController.cs b/Areas/Inventory/Controllers/Admin/InventoryMasterController.cs
index df6280f..af6d221 100644
--- a/Areas/Inventory/Controllers/Admin/InventoryMasterController.cs
+++ b/Areas/Inventory/Controllers/Admin/InventoryMasterController.cs
@@ -10,5 +10,24 @@ namespace PSTW_CentralSystem.Areas.Inventory.Controllers.Admin
         {
             return View();
         }
+
+        public IActionResult ItemRegistration()
+        {
+            return View();
+        }
+
+        public IActionResult ProductRegistration()
+        {
+            return View();
+        }
+
+        public IActionResult SupplierRegistration()
+        {
+            return View();
+        }
+        public IActionResult ManifacturerRegistration()
+        {
+            return View();
+        }
     }
 }
diff --git a/Areas/Inventory/Controllers/ItemController.cs b/Areas/Inventory/Controllers/ItemMovementController.cs
similarity index 60%
rename from Areas/Inventory/Controllers/ItemController.cs
rename to Areas/Inventory/Controllers/ItemMovementController.cs
index 0d02ccc..ba17a0e 100644
--- a/Areas/Inventory/Controllers/ItemController.cs
+++ b/Areas/Inventory/Controllers/ItemMovementController.cs
@@ -7,7 +7,7 @@ namespace PSTW_CentralSystem.Areas.Inventory.Controllers
     [Area("Inventory")]
 
     //[Authorize(Policy = "RoleModulePolicy")]
-    public class ItemController : Controller
+    public class ItemMovementController : Controller
     {
         // GET: Inventory
         public ActionResult Index()
@@ -15,15 +15,5 @@ namespace PSTW_CentralSystem.Areas.Inventory.Controllers
             return View();
         }
 
-        public IActionResult ItemRegistration()
-        {
-            return View();
-        }
-
-        public IActionResult ProductRegistration()
-        {
-            return View();
-        }
-
     }
 }
diff --git a/Areas/Inventory/Views/Item/ItemRegistration.cshtml b/Areas/Inventory/Views/InventoryMaster/ItemRegistration.cshtml
similarity index 100%
rename from Areas/Inventory/Views/Item/ItemRegistration.cshtml
rename to Areas/Inventory/Views/InventoryMaster/ItemRegistration.cshtml
diff --git a/Areas/Inventory/Views/Main/ManifacturerRegistration.cshtml b/Areas/Inventory/Views/InventoryMaster/ManifacturerRegistration.cshtml
similarity index 100%
rename from Areas/Inventory/Views/Main/ManifacturerRegistration.cshtml
rename to Areas/Inventory/Views/InventoryMaster/ManifacturerRegistration.cshtml
diff --git a/Areas/Inventory/Views/Item/ProductRegistration.cshtml b/Areas/Inventory/Views/InventoryMaster/ProductRegistration.cshtml
similarity index 100%
rename from Areas/Inventory/Views/Item/ProductRegistration.cshtml
rename to Areas/Inventory/Views/InventoryMaster/ProductRegistration.cshtml
diff --git a/Areas/Inventory/Views/Main/SupplierRegistration.cshtml b/Areas/Inventory/Views/InventoryMaster/SupplierRegistration.cshtml
similarity index 100%
rename from Areas/Inventory/Views/Main/SupplierRegistration.cshtml
rename to Areas/Inventory/Views/InventoryMaster/SupplierRegistration.cshtml
diff --git a/Views/Admin/UserAdmin.cshtml b/Views/Admin/UserAdmin.cshtml
index 0580b8e..a48609b 100644
--- a/Views/Admin/UserAdmin.cshtml
+++ b/Views/Admin/UserAdmin.cshtml
@@ -165,7 +165,23 @@
                                 "render": function (data, type, row, meta) {
                                     if (data.length > 0) {
                                         return data;
-                                    } else {
+                                    } 
+                                    else if(row.company == null && row.department == null) {
+                                        var thisCol = `
+                                            <div class="row">
+                                                <div class="col-md-6">
+                                                    <select class="form-select role-select" data-id="${row.id}" disabled>
+                                                        <option value="" selected disabled>Select Role</option>
+                                                        ${self.roleList && self.roleList.map(role => `<option value="${role.name}">${role.name}</option>`).join('')}
+                                                    </select>
+                                                </div>
+                                                <div class="col-md-6">
+                                                    <button type="button" class="btn btn-primary update-btn" data-id="${row.id}" disabled>Update</button>
+                                                </div>
+                                            </div>`
+                                        return thisCol;
+                                    } 
+                                    else {
                                         var thisCol = `
                                             <div class="row">
                                                 <div class="col-md-6">
diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml
index bac0445..e56a132 100644
--- a/Views/Shared/_Layout.cshtml
+++ b/Views/Shared/_Layout.cshtml
@@ -16,7 +16,7 @@
     <meta name="description"
           content="Matrix Admin Lite Free Version is powerful and clean admin dashboard template, inpired from Bootstrap Framework" />
     <meta name="robots" content="noindex,nofollow" />
-    <title>Matrix Admin Lite Free Versions Template by WrapPixel</title>
+    <title>PSTW Centralize Web System</title>
     <!-- Favicon icon -->
     <link rel="icon"
           type="image/png"