diff --git a/src/WorkFlowCheck.BL/Services/CheckListService.cs b/src/WorkFlowCheck.BL/Services/CheckListService.cs index 1ec22f3..96145ce 100644 --- a/src/WorkFlowCheck.BL/Services/CheckListService.cs +++ b/src/WorkFlowCheck.BL/Services/CheckListService.cs @@ -302,7 +302,7 @@ namespace WorkFlowCheck.BL.Services try { var checkListHeader = await _dbContext.CheckListHeaders - .Where(w => w.Id == id && w.CheckStatus == CheckStatus.Sent) + .Where(w => w.Id == id && w.CheckStatus == CheckStatus.InProgress) .FirstOrDefaultAsync(); if (checkListHeader != null && checkListHeader.CheckStatus == CheckStatus.InProgress) @@ -313,6 +313,10 @@ namespace WorkFlowCheck.BL.Services Log.Warning($"Ellenőrzési lap blokkolva: Ellenőrzés:{id}, Felhasználó:{userid}"); await _dbContext.SaveChangesAsync(); + + + + retVal = true; } } @@ -331,7 +335,7 @@ namespace WorkFlowCheck.BL.Services try { var checkListHeader = await _dbContext.CheckListHeaders - .Where(w => w.Id == id && w.CheckStatus == CheckStatus.Sent) + .Where(w => w.Id == id && w.CheckStatus == CheckStatus.Blocked) .FirstOrDefaultAsync(); if (checkListHeader != null && checkListHeader.CheckStatus == CheckStatus.Blocked) diff --git a/src/WorkFlowCheck.Web/wwwroot/js/site.js b/src/WorkFlowCheck.Web/wwwroot/js/site.js index ed40f12..d99e8ec 100644 --- a/src/WorkFlowCheck.Web/wwwroot/js/site.js +++ b/src/WorkFlowCheck.Web/wwwroot/js/site.js @@ -127,6 +127,15 @@ function renderActionButtonsforCheckListHeader(data, rowId) { `; } + if (data === 1) { + return ` + + `; + } if (data === 5) { return `