Merge branch 'Feature/program-manager/request-additional-time' into Main

# Conflicts:
#	ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Task/ProjectTask.cs
This commit is contained in:
2026-01-24 14:04:29 +03:30
79 changed files with 2425 additions and 124 deletions

View File

@@ -87,9 +87,7 @@ public class WorkFlowApplication : IWorkFlowApplication
{
return (await GetRollCallWorkFlowsCutByBgService(workshopId)).Count;
}
public async Task<int> GetAllWorkFlowCount(long workshopId, long accountId)
{
var count = 0;
@@ -434,7 +432,7 @@ public class WorkFlowApplication : IWorkFlowApplication
var lastCheckouts = _checkoutACL.GetLastCheckoutsByWorkshopIdForWorkFlow(workshopId, twoMonthsAgo, now);
List<DailyRollCallWorkFlowViewModel> rollCalls = _rollCallACL.GetUndefinedRollCalls(workshopId, twoMonthsAgo, now.AddDays(-1).Date);
var activeEmployees = _rollCallACL.GetActiveWorkshopRollCallEmployees(workshopId, twoMonthsAgo, now);
return rollCalls.Select(x => new DailyRollCallWorkFlowViewModel()
var res= rollCalls.Select(x => new DailyRollCallWorkFlowViewModel()
{
DateTime = x.DateTime,
DateTimeFa = x.DateTimeFa,
@@ -447,6 +445,8 @@ public class WorkFlowApplication : IWorkFlowApplication
.ToList(),
DayOfWeekFa = x.DateTime.DayOfWeek.DayOfWeeKToPersian()
}).Where(y => y.RollCallWorkFlowPerDayViewModels != null && y.RollCallWorkFlowPerDayViewModels.Any()).OrderBy(x => x.DateTime).ToList();
return res;
}
/// <summary>
@@ -757,7 +757,7 @@ public class WorkFlowApplication : IWorkFlowApplication
var entites = _rollCallConfirmedWithoutLunchBreakRepository.GetByWorkshopId(workshopId, twoMonthsAgo, now).ToList();
return employeeWithoutBreakTimeAndNotSliced.Where(x => !entites.Any(y => y.RollCallId == x.RollCallId))
var res = employeeWithoutBreakTimeAndNotSliced.Where(x => !entites.Any(y => y.RollCallId == x.RollCallId))
.GroupBy(x => x.RollCallDate.Date).OrderBy(x => x.Key).Select(x => new DailyRollCallConfirmedWithoutLunchBreakViewModel
{
DateGr = x.Key.Date,
@@ -770,6 +770,7 @@ public class WorkFlowApplication : IWorkFlowApplication
RollCallId = y.RollCallId,
}).ToList()
}).ToList();
return res;
}