From 5a786d221dd5614b2e539ced83dcccf25638c194 Mon Sep 17 00:00:00 2001 From: Mohd Ariff Date: Thu, 26 Dec 2024 16:30:28 +0800 Subject: [PATCH] update --- .../Views/Item/ItemRegistration.cshtml | 224 +++++++------- .../Main/ManifacturerRegistration.cshtml | 2 +- .../Views/Main/SupplierRegistration.cshtml | 280 +++++++++++++----- Controllers/API/Inventory/InvMainAPI.cs | 35 +++ Controllers/InventoryController.cs | 33 +++ Views/Admin/CompDeptAdmin.cshtml | 13 + Views/Shared/_Layout.cshtml | 2 + 7 files changed, 389 insertions(+), 200 deletions(-) create mode 100644 Controllers/InventoryController.cs diff --git a/Areas/Inventory/Views/Item/ItemRegistration.cshtml b/Areas/Inventory/Views/Item/ItemRegistration.cshtml index eb8577d..6e67afb 100644 --- a/Areas/Inventory/Views/Item/ItemRegistration.cshtml +++ b/Areas/Inventory/Views/Item/ItemRegistration.cshtml @@ -27,11 +27,11 @@
- +
-
+
@@ -45,6 +45,9 @@
+
+ {{thisQRInfo.uniqueID}} +
{{thisQRInfo.departmentName}}
@@ -318,11 +321,10 @@ @* Submit and Reset Buttons *@
- - + +
-
@@ -508,6 +510,10 @@ if (response.ok) { // If the form submission was successful, display a success message alert('Success!', 'Item form has been successfully submitted.', 'success'); + const updatedItem = await response.json(); + this.items.push(updatedItem); + + this.fetchItem(); // Reset the form this.resetForm(); @@ -569,16 +575,6 @@ else { return data } } }, - // { - // "title": "Image", - // "data": "imageProduct", - // "render": function (data, type, full, meta) { - // var image = ` - // Image - // `; - // return image; - // }, - // }, { "title": "Print", "data": "uniqueID", @@ -604,6 +600,8 @@ const data = this.data(); // Row data const containerId = `qr${data.uniqueID}`; const container = $(`#${containerId}`); + container.empty(); + container.append(`${data.uniqueID}`); // console.log(container[0]); if (container) { // Generate QR code only if not already generated @@ -613,7 +611,7 @@ height: 150, colorDark: "#000000", colorLight: "#ffffff", - correctLevel: QRCode.CorrectLevel.H + correctLevel: QRCode.CorrectLevel.M }); } }); @@ -643,7 +641,6 @@ } if (imageSrc) { - console.log(imageSrc); self.printItem(itemId, imageSrc); // Call the print function with the itemId and imageSrc } else { console.error("Image source not found."); @@ -669,6 +666,9 @@ } this.items = await response.json(); + if (this.itemDatatable) { + this.itemDatatable.clear().destroy(); + } this.initiateTable(); } catch (error) { @@ -753,24 +753,23 @@ this.productName = null; this.imageProduct = null; this.serialNumber = ''; - this.quantity = 0; + this.quantity = 1; this.supplierName = null; this.purchaseDate = null; this.PO = null; - this.currency = null; - this.DefaultPrice = null; - this.currencyRate = null; - this.convertPrice = null; + this.currency = 'MYR'; + this.DefaultPrice = 0.01; + this.currencyRate = 1; + this.convertPrice = 0.01; this.DODate = null; - this.warranty = null; + this.warranty = 0; this.EndWDate = null; this.invoiceDate = null; - this.selectedProduct = ""; - this.selectedSupplier = ""; - this.selectedCompany = ""; - this.selectedDepartment = ""; - this.currentUserCompanyDept = null; - this.selectedTeamType = ""; + this.selectedProduct = ''; + this.selectedSupplier = ''; + this.selectedCompany = this.currentUserCompanyDept.companyId; + this.selectedDepartment = ''; + this.selectedTeamType = ''; }, // FRONT END FUNCTIONS @@ -835,33 +834,6 @@ this.loading = false; } }, - async generateItemQr(itemId) { - try { - // Clear any existing QR code in the container - const container = document.getElementById(QrContainer); - if (!container) { - console.error(`Container with ID ${containerId} not found.`); - return; - } - // Clear any existing QR code in the container - container.innerHTML = ''; - - // Generate the QR code - new QRCode(container, { - text: itemId, - width: 128, - height: 128, - colorDark: "#000000", - colorLight: "#ffffff", - correctLevel: QRCode.CorrectLevel.H - }); - - } - catch (error) { - console.error("Error generating QR code:", error); - alert("An error occurred while generating the QR code."); - } - }, async printItem(itemId, imgSrc) { try { this.thisQRInfo.uniqueID = itemId; @@ -875,7 +847,7 @@ // Safely set image content const sanitizedImgSrc = encodeURI(imgSrc); // Sanitize the URL - container.innerHTML = `QR Code`; + container.innerHTML = `QR Code`; // Fetch QR information const qrInfo = this.getPrintedQR(uniqueQR); @@ -884,7 +856,9 @@ return; } - this.thisQRInfo = qrInfo; // Save the QR info to a property + this.thisQRInfo = qrInfo; + this.thisQRInfo.imgSrc = sanitizedImgSrc + this.thisQRInfo.imgContainer = container.innerHTML $(`#QrItemModal`).modal('show'); // Show modal } catch (error) { @@ -959,79 +933,83 @@ // } // } // }, - printQRInfo() { - // Create a virtual DOM element - const virtualElement = document.createElement('div'); - virtualElement.style.width = '500px'; // Set dimensions - virtualElement.style.height = 'auto'; - virtualElement.style.position = 'absolute'; - virtualElement.style.left = '-9999px'; // Position offscreen + printQRInfo() { + // Create a virtual DOM element + const virtualElement = document.createElement('div'); + virtualElement.style.width = '340px '; // Match label size for 2 inches at 203 DPI + virtualElement.style.height = '180px'; + virtualElement.style.position = 'absolute'; + virtualElement.style.left = '-9999px'; // Position offscreen to avoid rendering on the main UI + // virtualElement.style.border = '1px solid #000'; // Optional: Add a border for debugging dimensions - // Populate the virtual DOM with content - virtualElement.innerHTML = ` -
-
-
- -
-
-

${this.thisQRInfo.uniqueID}

+ // Populate the virtual DOM with content + virtualElement.innerHTML = ` +
+
+
+
+
+
${this.thisQRInfo.imgContainer}
+
+
+
+
+
+
${this.thisQRInfo.uniqueID}
+
${this.thisQRInfo.departmentName}
+
${this.thisQRInfo.productName}
+
${this.thisQRInfo.endWDate}
+
+
-
-
-
${this.thisQRInfo.departmentName}
-
${this.thisQRInfo.productName}
-
${this.thisQRInfo.endWDate}
-
-
-
- `; + `; - // Append the virtual DOM to the body (temporarily) - document.body.appendChild(virtualElement); + // Append the virtual DOM to the body (temporarily) + document.body.appendChild(virtualElement); - // Use html2canvas to convert the virtual DOM to an image - html2canvas(virtualElement, { - scale: 10, // Increase scale for sharper image - useCORS: true, - allowTaint: true, - }).then((canvas) => { - // Convert the canvas to an image - const imgData = canvas.toDataURL('image/png'); + // Wait for the font to be loaded (important for custom fonts like OCR-A) + document.fonts.load('1em "OCR A"').then(() => { + // Use html2canvas to convert the virtual DOM to an image + html2canvas(virtualElement, { + scale: 1, // Increase scale for sharper images + }).then((canvas) => { + // Convert the canvas to an image + const imgData = canvas.toDataURL('image/png'); - // Use printJS to print the image - printJS({ - printable: imgData, - type: 'image', - css: '/../lib/bootstrap/dist/css/bootstrap.css', - style: ` - @@media print { - @@page { - margin-top: 15px; - margin-bottom: 15px; - } - body { margin: 0; } - img { - display: block; - margin: auto; - width: auto; - max-width: 100%; - height: auto; - max-height: 100vh; - } - } - ` + // Open the image in a new tab for preview (optional) + const newWindow = window.open(); + newWindow.location.href = imgData; + console.log(imgData) + // Use printJS to print the image + printJS({ + printable: imgData, + type: 'image', + css: '/../lib/bootstrap/dist/css/bootstrap.css', + style: ` + @@media print { + @@page { + margin: 2px; + } + body { margin: 0; } + } + ` + }); + + // Remove the virtual DOM from the body after use + document.body.removeChild(virtualElement); + }).catch((error) => { + console.error("Error generating image:", error); + // Remove the virtual DOM if an error occurs + document.body.removeChild(virtualElement); + }); + }).catch((error) => { + console.error("Error loading font:", error); + // Remove the virtual DOM if font loading fails + document.body.removeChild(virtualElement); }); + }, - // Remove the virtual DOM from the body after use - document.body.removeChild(virtualElement); - }).catch((error) => { - console.error("Error generating image:", error); - // Remove the virtual DOM if an error occurs - document.body.removeChild(virtualElement); - }); - }, }, }); diff --git a/Areas/Inventory/Views/Main/ManifacturerRegistration.cshtml b/Areas/Inventory/Views/Main/ManifacturerRegistration.cshtml index e2f2401..c0de4db 100644 --- a/Areas/Inventory/Views/Main/ManifacturerRegistration.cshtml +++ b/Areas/Inventory/Views/Main/ManifacturerRegistration.cshtml @@ -15,7 +15,7 @@
-
+
+
+
+ +
+
+
+
+
+@section Scripts { + @{ + await Html.RenderPartialAsync("_ValidationScriptsPartial"); + } + - \ No newline at end of file + }); + +} \ No newline at end of file diff --git a/Controllers/API/Inventory/InvMainAPI.cs b/Controllers/API/Inventory/InvMainAPI.cs index 07e8216..9e61f25 100644 --- a/Controllers/API/Inventory/InvMainAPI.cs +++ b/Controllers/API/Inventory/InvMainAPI.cs @@ -205,6 +205,41 @@ namespace PSTW_CentralSystem.Controllers.API.Inventory return Json(supplierList); } + [HttpPost("AddSupplier")] + public async Task AddSupplier([FromBody] SupplierModel supplier) + { + if (!ModelState.IsValid) + { + return BadRequest(ModelState); + } + + try + { + _centralDbContext.Suppliers.Add(supplier); + await _centralDbContext.SaveChangesAsync(); + var updatedList = await _centralDbContext.Suppliers.ToListAsync(); + return Json(updatedList); + } + catch (Exception ex) + { + return BadRequest(ex.Message); + } + } + + [HttpDelete("DeleteSupplier/{id}")] + public async Task DeleteSupplier(int id) + { + var supplier = await _centralDbContext.Suppliers.FindAsync(id); + if (supplier == null) + { + return NotFound(new { success = false, message = "Supplier not found" }); + } + + _centralDbContext.Suppliers.Remove(supplier); + await _centralDbContext.SaveChangesAsync(); + + return Ok(new { success = true, message = "Supplier deleted successfully" }); + } #endregion Supplier #region Item diff --git a/Controllers/InventoryController.cs b/Controllers/InventoryController.cs new file mode 100644 index 0000000..7d6cb4e --- /dev/null +++ b/Controllers/InventoryController.cs @@ -0,0 +1,33 @@ +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using PSTW_CentralSystem.Areas.Inventory.Models; +using PSTW_CentralSystem.DBContext; +using PSTW_CentralSystem.Models; + +namespace PSTW_CentralSystem.Controllers +{ + public class InventoryController : Controller + { + private readonly ILogger _logger; + private readonly CentralSystemContext _centralDbContext; + public InventoryController(ILogger logger, CentralSystemContext centralDbContext) + { + _logger = logger; + _centralDbContext = centralDbContext; + } + + [HttpGet("ItemInformation/{Id}")] + public async Task ItemInformation(int Id) + { + var item = await _centralDbContext.Items.FindAsync(Id); + return View(Json(item)); + } + + [HttpPost("ItemInformation/{id}")] + public IActionResult ItemInformation(int id, [FromBody] ItemModel item) + { + return View(); + } + } +} diff --git a/Views/Admin/CompDeptAdmin.cshtml b/Views/Admin/CompDeptAdmin.cshtml index dbafb1b..4a80f07 100644 --- a/Views/Admin/CompDeptAdmin.cshtml +++ b/Views/Admin/CompDeptAdmin.cshtml @@ -327,6 +327,19 @@ }, updateUppercase(event, index, key) { this.departments[index][key] = event.target.value.toUpperCase(); + + if (key === 'departmentCode') { + //check if the code is already exist from compdeptlist[index1].departments[index2].departmentCode + for (let index1 = 0; index1 < this.compDeptList.length; index1++) { + for (let index2 = 0; index2 < this.compDeptList[index1].departments.length; index2++) { + if (this.departments[index].departmentCode === this.compDeptList[index1].departments[index2].departmentCode) { + alert("Department Code already exist"); + this.departments[index].departmentCode = ''; + break; + } + } + } + } }, resetDetails(){ this.company = null; diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml index eccd55b..ae31875 100644 --- a/Views/Shared/_Layout.cshtml +++ b/Views/Shared/_Layout.cshtml @@ -22,6 +22,8 @@ type="image/png" sizes="16x16" href="/assets/images/favicon.png" /> + +