diff --git a/Areas/Inventory/Views/InventoryMaster/ItemRegistration.cshtml b/Areas/Inventory/Views/InventoryMaster/ItemRegistration.cshtml index 2f41ebb..90cb1b6 100644 --- a/Areas/Inventory/Views/InventoryMaster/ItemRegistration.cshtml +++ b/Areas/Inventory/Views/InventoryMaster/ItemRegistration.cshtml @@ -288,7 +288,7 @@
- +
@@ -296,7 +296,7 @@
- +
@@ -304,7 +304,7 @@
- +
@@ -320,7 +320,7 @@
- +
@@ -328,7 +328,7 @@
- +
@@ -401,12 +401,12 @@ purchaseDate: null, PO: null, currency: "MYR", - DefaultPrice: 0.01, + DefaultPrice: null, currencyRate: 1, convertPrice: 0.01, DONo: null, DODate: null, - warranty: 0, + warranty: null, EndWDate: null, invoiceNo: null, invoiceDate: null, @@ -473,6 +473,18 @@ }, methods: { async addItem() { + + // List of required fields + const requiredFields = ['DefaultPrice', 'DONo', 'DODate', 'warranty', 'invoiceNo', 'invoiceDate']; + + // Loop through required fields and check if any are null or empty + for (let field of requiredFields) { + if (this[field] === null || this[field] === '') { + alert('Item Error', `Please fill in required fields: ${field}.`, 'warning'); + return; + } + } + if (this.showProduct.category == "Disposable") { this.serialNumber = ""; } @@ -489,9 +501,11 @@ DefaultPrice: this.DefaultPrice, CurrencyRate: this.currencyRate, ConvertPrice: this.convertPrice, + DONo: this.DONo, DODate: this.DODate, Warranty: this.warranty, EndWDate: this.EndWDate, + InvoiceNo: this.invoiceNo, InvoiceDate: this.invoiceDate, CreatedByUserId: this.currentUser.id, TeamType: this.selectedTeamType, @@ -811,17 +825,19 @@ this.purchaseDate = null; this.PO = null; this.currency = 'MYR'; - this.DefaultPrice = 0.01; + this.DefaultPrice = null; this.currencyRate = 1; this.convertPrice = 0.01; this.DODate = null; - this.warranty = 0; + this.warranty = null; + this.DONo = null; + this.invoiceNo = null; this.EndWDate = null; this.invoiceDate = null; this.selectedProduct = ''; this.selectedSupplier = ''; - this.selectedCompany = this.currentUserCompanyDept.companyId; - this.selectedDepartment = ''; + // this.selectedCompany = this.currentUserCompanyDept.companyId; + // this.selectedDepartment = ''; this.selectedTeamType = ''; this.partNumber = null; }, diff --git a/Areas/Inventory/Views/InventoryMaster/StationRegistration.cshtml b/Areas/Inventory/Views/InventoryMaster/StationRegistration.cshtml index 45bfc6d..9b49354 100644 --- a/Areas/Inventory/Views/InventoryMaster/StationRegistration.cshtml +++ b/Areas/Inventory/Views/InventoryMaster/StationRegistration.cshtml @@ -27,11 +27,11 @@
-
- - @@ -113,12 +113,11 @@ methods: { async fetchUsers() { try { - const response = await fetch(`/IdentityAPI/GetTechnicianUserInformation/`, { + const response = await fetch(`/InvMainAPI/UserList/`, { method: 'POST', }); if (response.ok) { - const data = await response.json(); - this.users = data.technicianUsers; + this.users = await response.json(); } else { console.error(`Failed to fetch user: ${response.statusText}`); @@ -230,11 +229,11 @@ }, { "title": "Station User PIC", - "data": "stationPicID", + "data": "fullName", }, { - "title": "Department ID", - "data": "departmentId", + "title": "Department", + "data": "departmentName", }, { "title": "Delete", @@ -250,7 +249,7 @@ }) // Attach click event listener to the delete buttons - $('#stationDatatable tbody').on('click', '.delete-btn', function () { + $('#stationDatatable tbody').off('click', '.delete-btn').on('click', '.delete-btn', function () { const stationId = $(this).data('id'); self.deleteStation(stationId); }); @@ -259,7 +258,8 @@ }, updateDepartment() { // Find the selected user by their full name - const selectedUser = this.users.find(user => user.fullname === this.selectedUserName); + const selectedUser = this.users.find(user => user.fullName === this.selectedUserName); + console.log(selectedUser); if (selectedUser) { this.stationUserPIC = selectedUser.id; this.departmentId = selectedUser.department.departmentId; diff --git a/Controllers/API/IdentityAPI.cs b/Controllers/API/IdentityAPI.cs index 308849f..e6c8d99 100644 --- a/Controllers/API/IdentityAPI.cs +++ b/Controllers/API/IdentityAPI.cs @@ -70,44 +70,44 @@ namespace PSTW_CentralSystem.Controllers.API } } - [HttpPost("GetTechnicianUserInformation")] - public async Task GetTechnicianUserInformation() - { - try - { - var users = await _identityDbContext.Users - .Include(u => u.Department) - .ToListAsync(); // Retrieve all users with department info + //[HttpPost("GetTechnicianUserInformation")] + //public async Task GetTechnicianUserInformation() + //{ + // try + // { + // var users = await _identityDbContext.Users + // .Include(u => u.Department) + // .ToListAsync(); // Retrieve all users with department info - var technicianUsers = new List(); + // var technicianUsers = new List(); - foreach (var user in users) - { - var roles = await _userManager.GetRolesAsync(user); - if (roles.Contains("Technician")) - { - technicianUsers.Add(new - { - id = user.Id, - fullname = user.FullName, - department = user.Department - }); - } - } + // foreach (var user in users) + // { + // var roles = await _userManager.GetRolesAsync(user); + // if (roles.Contains("Technician")) + // { + // technicianUsers.Add(new + // { + // id = user.Id, + // fullname = user.FullName, + // department = user.Department + // }); + // } + // } - if (!technicianUsers.Any()) - { - return NotFound(new { message = "No technicians found" }); - } + // if (!technicianUsers.Any()) + // { + // return NotFound(new { message = "No technicians found" }); + // } - return Ok(new { technicianUsers = technicianUsers }); - } - catch (Exception ex) - { - return StatusCode(500, new { message = $"An error occurred: {ex.Message}" }); - } + // return Ok(new { technicianUsers = technicianUsers }); + // } + // catch (Exception ex) + // { + // return StatusCode(500, new { message = $"An error occurred: {ex.Message}" }); + // } - } + //} #endregion User #region LDAP Login diff --git a/Controllers/API/Inventory/InvMainAPI.cs b/Controllers/API/Inventory/InvMainAPI.cs index 0fab0fd..fe4cebf 100644 --- a/Controllers/API/Inventory/InvMainAPI.cs +++ b/Controllers/API/Inventory/InvMainAPI.cs @@ -1231,8 +1231,17 @@ namespace PSTW_CentralSystem.Controllers.API.Inventory [HttpPost("StationList")] public async Task StationList() { - var stationList = await _centralDbContext.Stations.Include(i => i.StationPic).ToListAsync(); - return Json(stationList); + var stationList = await _centralDbContext.Stations.Include(i => i.StationPic).Include(i => i.Department).ToListAsync(); + + return Json(stationList.Select(i => new + { + i.StationId, + i.StationPicID, + i.StationName, + i.DepartmentId, + i.StationPic?.FullName, + i.Department?.DepartmentName, + })); } [HttpPost("AddStation")] @@ -1311,10 +1320,15 @@ namespace PSTW_CentralSystem.Controllers.API.Inventory [HttpPost("UserList")] public async Task UserList() { - var userList = await _centralDbContext.Users.ToListAsync(); - return Json(userList); - } + var userList = await _centralDbContext.Users.Include(i => i.Department).ToListAsync(); + return Json(userList.Select(i => new + { + i.Id, + i.FullName, + i.Department, + })); + } #endregion AllUser diff --git a/Views/Home/Privacy.cshtml b/Views/Home/Privacy.cshtml index af4fb19..afa11f6 100644 --- a/Views/Home/Privacy.cshtml +++ b/Views/Home/Privacy.cshtml @@ -1,6 +1,5 @@ @{ ViewData["Title"] = "Privacy Policy"; } -

@ViewData["Title"]

-

Use this page to detail your site's privacy policy.

+

PSTW All right reserved 2025

diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml index 8881ec4..3b96819 100644 --- a/Views/Shared/_Layout.cshtml +++ b/Views/Shared/_Layout.cshtml @@ -233,7 +233,7 @@ -
  • + @*
  • Something else here
    • - + *@ -
  • + @*
  • -
    • + *@ @@ -375,14 +375,14 @@
      - My Profile + @* My Profile My Balance Inbox
      Account Setting - + *@
      Logout
      diff --git a/appsettings.json b/appsettings.json index 5b9735b..76db4eb 100644 --- a/appsettings.json +++ b/appsettings.json @@ -3,7 +3,7 @@ //"DefaultConnection": "Server=localhost;uid=root;Password='';Database=web_interface;" //"DefaultConnection": "server=175.136.244.102;user id=root;password=tw_mysql_root;port=3306;database=web_interface" //"CentralConnnection": "Server=192.168.12.12;Port=3306;uid=installer;password='pstw_mysql_installer';database=pstw_cs;", //DB_dev Local connection - "CentralConnnection": "Server=219.92.7.60;Port=3307;uid=installer;password='pstw_mysql_installer';database=pstw_cs;" //DB_dev Public connection + "CentralConnnection": "Server=219.92.7.60;Port=3307;uid=installer;password='pstw_mysql_installer';database=pstw_cs_prod;" //DB_dev Public connection //"InventoryConnection": "Server=219.92.7.60;Port=3307;uid=installer;password='pstw_mysql_installer';database=pstw_cs_inventory;" //DB_dev connection //"DefaultConnection": "Server=219.92.7.60;Port=3307;uid=intern;password='intern_mysql_acct';database=web_interface;"//DB_dev connection },