diff --git a/Areas/MMS/Controllers/MarineController.cs b/Areas/MMS/Controllers/MarineController.cs index 2170dc4..c7ca117 100644 --- a/Areas/MMS/Controllers/MarineController.cs +++ b/Areas/MMS/Controllers/MarineController.cs @@ -11,9 +11,9 @@ namespace PSTW_CentralSystem.Areas.MMS.Controllers [Area("MMS")] public class MarineController : Controller { - private readonly MMSSystemContext _context; - private readonly NetworkShareAccess _networkAccessService; - private const string PhotoBasePath = "\\192.168.12.42\\images\\marine\\manual_tarball"; + private readonly MMSSystemContext _context;//Used in TarBallForm and GeneratePdfResponse to query the database. + private readonly NetworkShareAccess _networkAccessService;//used in GetImage and GeneratePdfResponse + private const string PhotoBasePath = "\\192.168.12.42\\images\\marine\\manual_tarball";//used in GetImage and GeneratePdfResponse public MarineController(MMSSystemContext context, NetworkShareAccess networkAccessService) { @@ -26,7 +26,7 @@ namespace PSTW_CentralSystem.Areas.MMS.Controllers return View(); } - public IActionResult TarBallForm() + public IActionResult TarBallForm()//Queries the database and returns a view with tarball data { try { @@ -50,6 +50,30 @@ namespace PSTW_CentralSystem.Areas.MMS.Controllers } } + [HttpGet] // Explicitly mark as a GET endpoint + public IActionResult TestCredentials() + { + try + { + // Use the EXACT same path/credentials as in Program.cs + var testService = new NetworkShareAccess( + @"\\192.168.12.42\images\marine\manual_tarball", + "installer", + "mms@pstw" + ); + + testService.ConnectToNetworkPath(); + testService.DisconnectFromNetworkShare(); + + return Ok("Network credentials and path are working correctly!"); + } + catch (Exception ex) + { + // Log the full error (including stack trace) + Console.WriteLine($"TestCredentials failed: {ex}"); + return StatusCode(500, $"Credentials test failed: {ex.Message}"); + } + } public IActionResult GetImage(string fileName) { @@ -82,7 +106,7 @@ namespace PSTW_CentralSystem.Areas.MMS.Controllers } } - public IActionResult GenerateReport(int id) + public IActionResult GenerateReport(int id)//calls GeneratePdfResponse to generate a PDF for inline viewing { return GeneratePdfResponse(id, true); } @@ -99,7 +123,7 @@ namespace PSTW_CentralSystem.Areas.MMS.Controllers try { // Connect to the network path - _networkAccessService.ConnectToNetworkPath(); + _networkAccessService.ConnectToNetworkPath();//------------------ // 1. Fetch core data from database var tarballData = (from marine in _context.MarineTarballs diff --git a/Areas/MMS/Models/NetworkAccessService.cs b/Areas/MMS/Models/NetworkAccessService.cs index a20b14b..bef5345 100644 --- a/Areas/MMS/Models/NetworkAccessService.cs +++ b/Areas/MMS/Models/NetworkAccessService.cs @@ -28,7 +28,7 @@ public class NetworkShareAccess : IDisposable RemoteName = _networkPath }; - var result = WNetAddConnection2(netResource, _password, _username, 0); + var result = WNetAddConnection2(netResource, _password, _username, 0);// if (result != 0) { diff --git a/Areas/MMS/Models/PDFGenerator/TarBallPDF.cs b/Areas/MMS/Models/PDFGenerator/TarBallPDF.cs index 6ca266e..572a054 100644 --- a/Areas/MMS/Models/PDFGenerator/TarBallPDF.cs +++ b/Areas/MMS/Models/PDFGenerator/TarBallPDF.cs @@ -351,7 +351,7 @@ namespace PSTW_CentralSystem.Areas.MMS.Models.PDFGenerator .Text(text => { text.Span("CHECKED BY: ").Bold().FontSize(12); - text.Span("Rifaie Azhari").FontSize(10); + text.Span("***RIFAIE AZHARI").FontSize(10); }); table.Cell().Element(CellStyle).Text("Signature").FontSize(12); table.Cell().ColumnSpan(2).Element(CellStyle).Text(""); diff --git a/Areas/MMS/Views/Marine/TarBallForm.cshtml b/Areas/MMS/Views/Marine/TarBallForm.cshtml index 3ef37bc..40f179f 100644 --- a/Areas/MMS/Views/Marine/TarBallForm.cshtml +++ b/Areas/MMS/Views/Marine/TarBallForm.cshtml @@ -11,7 +11,7 @@ Tarball Report