From ca1ef420afa76b2aea840f6c17b1d38ae1984491 Mon Sep 17 00:00:00 2001 From: mahan Date: Tue, 28 Oct 2025 17:31:43 +0330 Subject: [PATCH] feat: add exception for Amir's pizza workshop to adjust roll call date handling --- .../WorkFlowApplication.cs | 43 ++++++++++++------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/WorkFlow/Application/WorkFlow.Application/WorkFlowApplication.cs b/WorkFlow/Application/WorkFlow.Application/WorkFlowApplication.cs index ed188fea..d644bb5f 100644 --- a/WorkFlow/Application/WorkFlow.Application/WorkFlowApplication.cs +++ b/WorkFlow/Application/WorkFlow.Application/WorkFlowApplication.cs @@ -420,14 +420,17 @@ public class WorkFlowApplication : IWorkFlowApplication /// public async Task> GetUndefinedRollCalls(long workshopId) { - var workshop = _workshopRepository.Get(workshopId); - - if (workshop == null || workshop.IsStaticCheckout) - return []; + var now = DateTime.Now; DateTime.Now.Date.AddMonthsFa(-2, out var twoMonthsAgo); + //استثنا برای کارگاه پیتزا امیر برای برای نمایش ندادن کارپوشه قبل از 1 آبان 1404 + if(workshopId == 367 && twoMonthsAgo< new DateTime(2025,10,23)) + { + twoMonthsAgo = new DateTime(2025,10,23); + } + var lastCheckouts = _checkoutACL.GetLastCheckoutsByWorkshopIdForWorkFlow(workshopId, twoMonthsAgo, now); List rollCalls = _rollCallACL.GetUndefinedRollCalls(workshopId, twoMonthsAgo, now.AddDays(-1).Date); var activeEmployees = _rollCallACL.GetActiveWorkshopRollCallEmployees(workshopId, twoMonthsAgo, now); @@ -451,14 +454,17 @@ public class WorkFlowApplication : IWorkFlowApplication /// public async Task> GetRollCallWorkFlowsCutByBgService(long workshopId) { - var workshop = _workshopRepository.Get(workshopId); - - if (workshop == null || workshop.IsStaticCheckout) - return []; + var now = DateTime.Now; DateTime.Now.Date.AddMonthsFa(-2, out var twoMonthsAgo); + //استثنا برای کارگاه پیتزا امیر برای برای نمایش ندادن کارپوشه قبل از 1 آبان 1404 + if(workshopId == 367 && twoMonthsAgo< new DateTime(2025,10,23)) + { + twoMonthsAgo = new DateTime(2025,10,23); + } + var lastCheckouts = _checkoutACL.GetLastCheckoutsByWorkshopIdForWorkFlow(workshopId, twoMonthsAgo, now); var rollCalls = _rollCallACL.GetRollCallWorkFlowsCutByBgService(workshopId, twoMonthsAgo, now.AddDays(-1).Date); var activeEmployees = _rollCallACL.GetActiveWorkshopRollCallEmployees(workshopId, twoMonthsAgo, now); @@ -656,14 +662,17 @@ public class WorkFlowApplication : IWorkFlowApplication /// public async Task> GetAbsentRollCallWorkFlows(long workshopId) { - var workshop = _workshopRepository.Get(workshopId); - - if (workshop == null || workshop.IsStaticCheckout) - return []; + var now = DateTime.Now; + DateTime.Now.Date.AddMonthsFa(-2, out var twoMonthsAgo); + //استثنا برای کارگاه پیتزا امیر برای برای نمایش ندادن کارپوشه قبل از 1 آبان 1404 + if(workshopId == 367 && twoMonthsAgo< new DateTime(2025,10,23)) + { + twoMonthsAgo = new DateTime(2025,10,23); + } var lastCheckouts = _checkoutACL.GetLastCheckoutsByWorkshopIdForWorkFlow(workshopId, twoMonthsAgo, now); @@ -723,14 +732,16 @@ public class WorkFlowApplication : IWorkFlowApplication /// public async Task> GetEmployeesWithoutLunchBreak(long workshopId) { - var workshop = _workshopRepository.Get(workshopId); - - if (workshop == null || workshop.IsStaticCheckout) - return []; + var now = DateTime.Now.Date; now.AddMonthsFa(-2, out var twoMonthsAgo); + //استثنا برای کارگاه پیتزا امیر برای برای نمایش ندادن کارپوشه قبل از 1 آبان 1404 + if(workshopId == 367 && twoMonthsAgo< new DateTime(2025,10,23)) + { + twoMonthsAgo = new DateTime(2025,10,23); + } var lastCheckouts = _checkoutACL.GetLastCheckoutsByWorkshopIdForWorkFlow(workshopId, twoMonthsAgo, now); var notSlicedRollCalls = _rollCallACL.GetNotSlicedRollCallsByWorkshopId(workshopId, twoMonthsAgo, now.AddDays(-1).Date); var employeesWithoutBreakTime = _customizedWorkshopSettingsACL.GetEmployeesWithoutBreakTime(workshopId);