From 25cd092a083a7cfb6ae92a895ef08c64f6263032 Mon Sep 17 00:00:00 2001 From: ivanszabo Date: Sun, 29 Jun 2025 13:30:08 +0200 Subject: [PATCH] Backend BUGFIX --- src/WorkFlowCheck.API/appsettings.Development.json | 3 ++- .../DocumentGenerator/DokumentumGenerator.cs | 3 ++- src/WorkFlowCheck.BL/Services/SyncService.cs | 12 +++++++----- src/WorkFlowCheck.Web/Helpers/SystemHelper.cs | 2 +- .../CheckListHeaderEditPage.cshtml.cs | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/WorkFlowCheck.API/appsettings.Development.json b/src/WorkFlowCheck.API/appsettings.Development.json index 22833e7..c652fd0 100644 --- a/src/WorkFlowCheck.API/appsettings.Development.json +++ b/src/WorkFlowCheck.API/appsettings.Development.json @@ -1,6 +1,7 @@ { "ConnectionStrings": { - "DefaultConnection": "Data Source=NSINB-37\\WFC;Initial Catalog=WFC;Integrated Security=True;Connect Timeout=30;Encrypt=False;Trust Server Certificate=False;Application Intent=ReadWrite;Multi Subnet Failover=False" + //"DefaultConnection": "Data Source=NSINB-37\\WFC;Initial Catalog=WFC;Integrated Security=True;Connect Timeout=30;Encrypt=False;Trust Server Certificate=False;Application Intent=ReadWrite;Multi Subnet Failover=False" + "DefaultConnection": "Data Source=WS2016DC\\SQLEXPRESS;Initial Catalog=WFC;Integrated Security=True;Connect Timeout=30;Encrypt=False;Trust Server Certificate=False;Application Intent=ReadWrite;Multi Subnet Failover=False" }, "Logging": { "LogLevel": { diff --git a/src/WorkFlowCheck.BL/DocumentGenerator/DokumentumGenerator.cs b/src/WorkFlowCheck.BL/DocumentGenerator/DokumentumGenerator.cs index c3282be..45c2241 100644 --- a/src/WorkFlowCheck.BL/DocumentGenerator/DokumentumGenerator.cs +++ b/src/WorkFlowCheck.BL/DocumentGenerator/DokumentumGenerator.cs @@ -44,7 +44,8 @@ namespace WorkFlowCheck.BL.DocumentGenerator #if !DEBUG FileName = "e:\\LibreOffice\\program\\soffice", // LibreOffice parancs #else - FileName = "c:\\Program Files\\LibreOffice\\program\\soffice", // LibreOffice parancs + //FileName = "c:\\Program Files\\LibreOffice\\program\\soffice", // LibreOffice parancs + FileName = "e:\\LibreOffice\\program\\soffice", // LibreOffice parancs #endif Arguments = $"--headless --convert-to pdf \"{tempWordPath}\" --outdir \"{pdfDirectory}", RedirectStandardOutput = true, diff --git a/src/WorkFlowCheck.BL/Services/SyncService.cs b/src/WorkFlowCheck.BL/Services/SyncService.cs index 0bd085d..ef4a8f3 100644 --- a/src/WorkFlowCheck.BL/Services/SyncService.cs +++ b/src/WorkFlowCheck.BL/Services/SyncService.cs @@ -413,8 +413,8 @@ namespace WorkFlowCheck.BL.Services } await _dbContext.SaveChangesAsync(); retVal = _mapper.Map(res); - - if (NeedBlocking(checkListHeaderDTO)) + string Answer = ""; + if (NeedBlocking(checkListHeaderDTO, out Answer)) { /// TODO: blokkolás miatt res.CheckStatus = CheckStatus.Blocked; @@ -429,7 +429,7 @@ namespace WorkFlowCheck.BL.Services var deviceMessageDTO = new DeviceMessageDTO() { IsReaded = false, - Message = $"Ellenőrző lap blokkolva! [{checkListHeaderDTO.DocumentNumber}]", + Message = $"Ellenőrző lap blokkolva! [{checkListHeaderDTO.DocumentNumber}]\n({Answer})", SendDate = DateTime.UtcNow, ExtraDataJSON = "", RoleId = item.ParentId, @@ -451,7 +451,7 @@ namespace WorkFlowCheck.BL.Services } res.CheckStatus = CheckStatus.InProgress; - + if (CheckIfLastReached(checkListHeaderDTO)) { /// TODO: most kell a CheckStatust állítani és menjen üzenet ! @@ -474,9 +474,10 @@ namespace WorkFlowCheck.BL.Services return retVal; } - private bool NeedBlocking(CheckListHeaderDTO checkListHeaderDTO) + private bool NeedBlocking(CheckListHeaderDTO checkListHeaderDTO, out string Answer) { var retVal = false; + Answer = ""; if (checkListHeaderDTO.CheckListRowDTO != null && checkListHeaderDTO.CheckListRowDTO.Count > 0) { var checkListRows = checkListHeaderDTO.CheckListRowDTO; @@ -486,6 +487,7 @@ namespace WorkFlowCheck.BL.Services { if (row.CheckListTemplateRowDTO != null) { + Answer = row.CheckListTemplateRowDTO.OperationDescription; if (row.CheckListTemplateRowDTO.AnswerType == "PI-N" && row.Answer == "Igen") { retVal = true; diff --git a/src/WorkFlowCheck.Web/Helpers/SystemHelper.cs b/src/WorkFlowCheck.Web/Helpers/SystemHelper.cs index 7519383..039f62e 100644 --- a/src/WorkFlowCheck.Web/Helpers/SystemHelper.cs +++ b/src/WorkFlowCheck.Web/Helpers/SystemHelper.cs @@ -7,7 +7,7 @@ namespace WorkFlowCheck.Web.Helpers public static class SystemHelper { public static string DatabaseName = ""; - public static string ProgramVersion = "v1.1.027"; + public static string ProgramVersion = "v1.1.028"; public async static Task GetAPIInfoAsync(IConfiguration configuration) { diff --git a/src/WorkFlowCheck.Web/Pages/CheckList/CheckListHeader/CheckListHeaderEditPage.cshtml.cs b/src/WorkFlowCheck.Web/Pages/CheckList/CheckListHeader/CheckListHeaderEditPage.cshtml.cs index e47db53..17f2b48 100644 --- a/src/WorkFlowCheck.Web/Pages/CheckList/CheckListHeader/CheckListHeaderEditPage.cshtml.cs +++ b/src/WorkFlowCheck.Web/Pages/CheckList/CheckListHeader/CheckListHeaderEditPage.cshtml.cs @@ -86,7 +86,7 @@ namespace WorkFlowCheck.Web.Pages.CheckList.CheckListHeader { foreach (var item in CheckListHeaderDTO.CheckListRowDTO) { - if (item.CheckListTemplateRowDTO?.AnswerType == "P") + if (item.CheckListTemplateRowDTO?.AnswerType == "P" || item.CheckListTemplateRowDTO?.AnswerType == "PN") { if (item.Photo != null && item.Photo.Length > 0) {