admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Onpage Handler CaseHistory-> Edit and WorkFlow->Edit

Browse Source
This commit is contained in:
SamSys
2024-12-24 16:57:11 +03:30
parent 48b5d9ea8b
commit 79a38c31a8
46 changed files with 2508 additions and 1151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WorkFlow/Application/WorkFlow.Application/WorkFlowApplication.cs
View File

@@ -286,7 +286,7 @@ public class WorkFlowApplication : IWorkFlowApplication
var rollCalls = _rollCallACL.GetRollCallsOverlappingLeaves(workshopId, startOfDay, endOfDay);
var activeEmployees = _rollCallACL.GetActiveWorkshopRollCallEmployees(workshopId, startOfDay, endOfDay);
var rollCallsForDate = rollCalls.FirstOrDefault(x=>x.Date==date);
var rollCallsForDate = rollCalls.FirstOrDefault(x => x.Date == date);
if (rollCallsForDate == null)
return new();

2
WorkFlow/Infrastructure/WorkFlow.Infrastructure.ACL/CustomizedWorkshopSettings/WorkFlowCustomizedWorkshopSettingsACL.cs
View File

@@ -29,7 +29,7 @@ namespace WorkFlow.Infrastructure.ACL.CustomizedWorkshopSettings
public List<(long EmployeeId, string Name)> GetEmployeesWithoutBreakTime(long workshopId)
{
var list = _customizeWorkshopSettingsApplication.GetEmployeeSettingsByWorkshopId(workshopId);
return list.Where(x => x.BreakTime.BreakTimeType == BreakTimeType.WithTime)
return list.Where(x => x.BreakTime.BreakTimeType == BreakTimeType.WithoutTime)
.Select(x => (x.EmployeeId, x.EmployeeFullName)).ToList();
}