From cb2c5315c9db7dd7e41f400de1622e613ae5cf58 Mon Sep 17 00:00:00 2001 From: SamSys Date: Mon, 13 Jan 2025 19:20:00 +0330 Subject: [PATCH] workFlow overlap counter commented - clinen site.js bug fixed --- ServiceHost/wwwroot/AssetsClient/js/site.js | 2 +- .../Application/WorkFlow.Application/WorkFlowApplication.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ServiceHost/wwwroot/AssetsClient/js/site.js b/ServiceHost/wwwroot/AssetsClient/js/site.js index 141feec8..d3619951 100644 --- a/ServiceHost/wwwroot/AssetsClient/js/site.js +++ b/ServiceHost/wwwroot/AssetsClient/js/site.js @@ -44,7 +44,7 @@ $(document).ready(function () { SinglePage.LoadModal(); }; $("#MainModal").on("shown.bs.modal", function () { - window.location.hash = ""; + window.location.hash = "##"; }); $(document).on("submit", diff --git a/WorkFlow/Application/WorkFlow.Application/WorkFlowApplication.cs b/WorkFlow/Application/WorkFlow.Application/WorkFlowApplication.cs index 3be03ab7..448087a8 100644 --- a/WorkFlow/Application/WorkFlow.Application/WorkFlowApplication.cs +++ b/WorkFlow/Application/WorkFlow.Application/WorkFlowApplication.cs @@ -93,7 +93,7 @@ public class WorkFlowApplication : IWorkFlowApplication count += (await GetAbsentRollCallWorkFlows(workshopId))?.Count ?? 0; count += (await GetRollCallWorkFlowsCutByBgService(workshopId))?.Count ?? 0; count += (await GetEmployeesWithoutLunchBreak(workshopId))?.Count ?? 0; - count += (await GetRollCallsOverlappingLeaves(workshopId))?.Count ?? 0; + //count += (await GetRollCallsOverlappingLeaves(workshopId))?.Count ?? 0; count += (await GetUndefinedRollCalls(workshopId))?.Count ?? 0;