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

Merge branch 'master' into Api

Browse Source
This commit is contained in:
MahanCh
2025-07-28 11:55:12 +03:30
parent e8fd8bdace 41f39fb6fa
commit 0a41751c15
4 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs
View File

@@ -154,7 +154,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
}
var offDays = command.OffDays.Select(x => new WeeklyOffDay(x)).ToList();
var offDays = command.OffDays?.Select(x => new WeeklyOffDay(x)).ToList()??[];
var record = new CustomizeWorkshopSettings(workshopId, shiftCollection, command.LeavePermittedDays,
command.WorkshopShiftStatus, command.HolidayWork, offDays);
@@ -390,7 +390,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
//var commandOffDayHashSet = command.WeeklyOffDays.ToHashSet();
var commandOffDayHashSet = command.WeeklyOffDays?.ToHashSet() ?? [];
var groupOffDayHashSet = customizeWorkshopGroupSettings.WeeklyOffDays.Select(x => x.DayOfWeek).ToHashSet();
var groupOffDayHashSet = customizeWorkshopGroupSettings.WeeklyOffDays?.Select(x => x.DayOfWeek).ToHashSet()??[];
if (command.WorkshopShiftStatus == WorkshopShiftStatus.Regular)
{
@@ -669,7 +669,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
#endregion
var offDays = weeklyOffDays.Select(x => new WeeklyOffDay(x)).ToList();
var offDays = weeklyOffDays?.Select(x => new WeeklyOffDay(x)).ToList()??[];
using var transActionScope = new TransactionScope();
entity.ChangeWorkshopShifts(shiftCollection, workshopShiftStatus, holidayWork, offDays);
@@ -723,7 +723,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
//var commandOffDayHashSet = command.OffDayOfWeeks.ToHashSet();
var commandOffDayHashSet = command.OffDayOfWeeks?.ToHashSet() ?? [];
var workshopOffDayHashSet = workshopSettings.WeeklyOffDays.Select(x => x.DayOfWeek).ToHashSet();
var workshopOffDayHashSet = workshopSettings.WeeklyOffDays?.Select(x => x.DayOfWeek).ToHashSet()??[];
if (command.WorkshopShiftStatus == WorkshopShiftStatus.Regular)
{
@@ -871,7 +871,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
bool isChanged = false;
var commandOffDayHashSet = command.WeeklyOffDays?.ToHashSet()??[];
var groupOffDayHashSet = groupSettings.WeeklyOffDays.Select(x => x.DayOfWeek).ToHashSet();
var groupOffDayHashSet = groupSettings.WeeklyOffDays?.Select(x => x.DayOfWeek).ToHashSet()??[];
if (command.WorkshopShiftStatus == WorkshopShiftStatus.Regular)
{
@@ -1034,7 +1034,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
}
var weeklyOffDays = command.WeeklyOffDays.Select(x => new WeeklyOffDay(x)).ToList();
var weeklyOffDays = command.WeeklyOffDays?.Select(x => new WeeklyOffDay(x)).ToList()??[];
using var transaction = new TransactionScope();
entity.SimpleEdit(employeesShifts, command.IrregularShift, command.WorkshopShiftStatus, command.BreakTime,
@@ -1442,7 +1442,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
var commandOffDayHashSet = command.WeeklyOffDays?.ToHashSet()??[];
var entityOffDayHashSet = entity.WeeklyOffDays.Select(x => x.DayOfWeek).ToHashSet();
var entityOffDayHashSet = entity.WeeklyOffDays?.Select(x => x.DayOfWeek).ToHashSet()??[];
bool isChanged;
if (fridayPay == entity.FridayPay && overTimePay == entity.OverTimePay && baseYearsPay == entity.BaseYearsPay && bonusesPay == entity.BonusesPay
@@ -1536,7 +1536,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
}).ToList(),
//FridayWork = entity.FridayWork,
HolidayWork = entity.HolidayWork,
WeeklyOffDays = entity.WeeklyOffDays.Select(x=>x.DayOfWeek).ToList(),
WeeklyOffDays = entity.WeeklyOffDays?.Select(x=>x.DayOfWeek).ToList()??[],
CustomizeRotatingShiftsViewModels = entity.CustomizeRotatingShifts.Select(x => new CustomizeRotatingShiftsViewModel()
{
StartTime = x.StartTime.ToString("HH:mm"),

10
CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs
View File

@@ -825,10 +825,16 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
#region SaveRollCall
GroupedRollCalls = groupedRollCall,
TotalWorkingTimeSpan = sumSpansWhitOutleaves,
//کارکرد واقعی - محاسبات شامل مرخصی افزوده شده
TotalWorkingTimeSpan = sumSpans,
// ساعت استراحت
TotalBreakTimeSpan = totalBreakTime,
TotalPresentTimeSpan = sumSpansWhitOutleaves + totalBreakTime,
// ساعت حضور - بدون مرخصی افزده شده
TotalPresentTimeSpan = sumSpansWhitOutleaves,
// مرخصی استحقاقی
TotalPaidLeave = totalLeaveSpan,
//مرخصی استعلاجی
TotalSickLeave = new TimeSpan(sickLeaveTimeSpans.Sum(x => x.Ticks)),
#endregion
};

11
ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs
View File

@@ -1028,16 +1028,17 @@ public class IndexModel : PageModel
TotalDayOfBunosesCompute = bunosesPay.Bunoses > 0 ? $"{bunosesPay.TotalDayCompute}" : "0",
HolidayWorking = workshop.WorkshopHolidayWorking,
ShiftWork = workingHours.ShiftWork,
//کارکرد واقعی - محاسبات شامل مرخصی افزوده شده
TotalWorkingTimeSpan = mandatoryCompute.TotalWorkingTimeSpan,
//ساعت استراحت
TotalBreakTimeSpan = mandatoryCompute.TotalBreakTimeSpan,
// ساعت حضور - بدون مرخصی افزده شده
TotalPresentTimeSpan = mandatoryCompute.TotalPresentTimeSpan,
//مدت مرخصی استحقاقی
TotalPaidLeave = mandatoryCompute.TotalPaidLeave,
//مدت مرخصی استعلاجی
TotalSickLeave = mandatoryCompute.TotalSickLeave,
//لیست حضورغیاب جهت ذخیره سازی
GroupedRollCalls = mandatoryCompute.GroupedRollCalls,
HasInsuranceChekoutOverTime = workshop.InsuranceCheckoutOvertime

4
ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/FinancialStatments.cshtml.cs
View File

@@ -413,8 +413,8 @@ public class FinancialStatmentsModel : PageModel
var currentLastTransaction = currentTransactionsList
.OrderByDescending(x => x.TdateGr).Select(x => x.TdateGr)
.FirstOrDefault();
var beforeCurrent10 = allTransactions.Where(x => x.TdateGr < currentFirstTransaction).ToList();
var afterCurrent10 = allTransactions.Where(x => x.TdateGr > currentLastTransaction).ToList();
var beforeCurrent10 = allTransactions.Take(pageIndex).ToList();
var afterCurrent10 = allTransactions.Skip(pageIndex+pagination).ToList();
result.I = beforeCurrent10.Count + 1;
result.CurrentPageNumber = pageNumber;
//محاسبه تراکنش های قبل از 10 تای جاری