ivanszabo/WorkFlowCheck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'master' of https://tfs.nuvolar.hu:8443/tfs/AtomERP/_git/WorkFlowCheck

Browse Source
This commit is contained in:
ivanszabo
2025-06-29 13:30:38 +02:00
parent d42900e8f6 25cd092a08
commit 8ce7268338
5 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/WorkFlowCheck.API/appsettings.Development.json
+2 -1
View File
@@ -1,6 +1,7 @@
{ {
"ConnectionStrings": { "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": { "Logging": {
"LogLevel": { "LogLevel": {
src/WorkFlowCheck.BL/DocumentGenerator/DokumentumGenerator.cs
+2 -1
View File
@@ -44,7 +44,8 @@ namespace WorkFlowCheck.BL.DocumentGenerator
#if !DEBUG #if !DEBUG
FileName = "e:\\LibreOffice\\program\\soffice", // LibreOffice parancs FileName = "e:\\LibreOffice\\program\\soffice", // LibreOffice parancs
#else #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 #endif
Arguments = $"--headless --convert-to pdf \"{tempWordPath}\" --outdir \"{pdfDirectory}", Arguments = $"--headless --convert-to pdf \"{tempWordPath}\" --outdir \"{pdfDirectory}",
RedirectStandardOutput = true, RedirectStandardOutput = true,
src/WorkFlowCheck.BL/Services/SyncService.cs
+7 -5
View File
@@ -413,8 +413,8 @@ namespace WorkFlowCheck.BL.Services
} }
await _dbContext.SaveChangesAsync(); await _dbContext.SaveChangesAsync();
retVal = _mapper.Map<CheckListHeaderDTO>(res); retVal = _mapper.Map<CheckListHeaderDTO>(res);
string Answer = "";
if (NeedBlocking(checkListHeaderDTO)) if (NeedBlocking(checkListHeaderDTO, out Answer))
{ {
/// TODO: blokkolás miatt /// TODO: blokkolás miatt
res.CheckStatus = CheckStatus.Blocked; res.CheckStatus = CheckStatus.Blocked;
@@ -429,7 +429,7 @@ namespace WorkFlowCheck.BL.Services
var deviceMessageDTO = new DeviceMessageDTO() var deviceMessageDTO = new DeviceMessageDTO()
{ {
IsReaded = false, IsReaded = false,
Message = $"Ellenőrző lap blokkolva! [{checkListHeaderDTO.DocumentNumber}]", Message = $"Ellenőrző lap blokkolva! [{checkListHeaderDTO.DocumentNumber}]\n({Answer})",
SendDate = DateTime.UtcNow, SendDate = DateTime.UtcNow,
ExtraDataJSON = "", ExtraDataJSON = "",
RoleId = item.ParentId, RoleId = item.ParentId,
@@ -451,7 +451,7 @@ namespace WorkFlowCheck.BL.Services
} }
res.CheckStatus = CheckStatus.InProgress; res.CheckStatus = CheckStatus.InProgress;
if (CheckIfLastReached(checkListHeaderDTO)) if (CheckIfLastReached(checkListHeaderDTO))
{ {
/// TODO: most kell a CheckStatust állítani és menjen üzenet ! /// TODO: most kell a CheckStatust állítani és menjen üzenet !
@@ -474,9 +474,10 @@ namespace WorkFlowCheck.BL.Services
return retVal; return retVal;
} }
private bool NeedBlocking(CheckListHeaderDTO checkListHeaderDTO) private bool NeedBlocking(CheckListHeaderDTO checkListHeaderDTO, out string Answer)
{ {
var retVal = false; var retVal = false;
Answer = "";
if (checkListHeaderDTO.CheckListRowDTO != null && checkListHeaderDTO.CheckListRowDTO.Count > 0) if (checkListHeaderDTO.CheckListRowDTO != null && checkListHeaderDTO.CheckListRowDTO.Count > 0)
{ {
var checkListRows = checkListHeaderDTO.CheckListRowDTO; var checkListRows = checkListHeaderDTO.CheckListRowDTO;
@@ -486,6 +487,7 @@ namespace WorkFlowCheck.BL.Services
{ {
if (row.CheckListTemplateRowDTO != null) if (row.CheckListTemplateRowDTO != null)
{ {
Answer = row.CheckListTemplateRowDTO.OperationDescription;
if (row.CheckListTemplateRowDTO.AnswerType == "PI-N" && row.Answer == "Igen") if (row.CheckListTemplateRowDTO.AnswerType == "PI-N" && row.Answer == "Igen")
{ {
retVal = true; retVal = true;
src/WorkFlowCheck.Web/Helpers/SystemHelper.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace WorkFlowCheck.Web.Helpers
public static class SystemHelper public static class SystemHelper
{ {
public static string DatabaseName = ""; 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) public async static Task GetAPIInfoAsync(IConfiguration configuration)
{ {
src/WorkFlowCheck.Web/Pages/CheckList/CheckListHeader/CheckListHeaderEditPage.cshtml.cs
+1 -1
View File
@@ -86,7 +86,7 @@ namespace WorkFlowCheck.Web.Pages.CheckList.CheckListHeader
{ {
foreach (var item in CheckListHeaderDTO.CheckListRowDTO) 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) if (item.Photo != null && item.Photo.Length > 0)
{ {