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

Merge branch 'Feature/SalaryPaymentSetting' into Main

Browse Source
This commit is contained in:
gozareshgir
2026-01-29 11:53:38 +03:30
parent a678b92c39 64746fa3c3
commit 5a9bfde922
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/SalaryPaymentSettings/Commands/CreateSalarySettings/CreateSalarySettingsCommandHandler.cs
View File

@@ -25,12 +25,12 @@ public class CreateSalarySettingsCommandHandler : IBaseCommandHandler<CreateSala
return OperationResult.Failure(" برای این پرسنل قبلا تنظیمات ایجاد شده است");
if (string.IsNullOrWhiteSpace(request.MonthlySalary))
if (string.IsNullOrWhiteSpace(request.SalaryPerMinute))
return OperationResult.Failure("حقوق ماهانه وارد نشده اشت");
double monthlySalary = 0;
try
{
monthlySalary = request.MonthlySalary.MoneyToDouble();
monthlySalary = request.SalaryPerMinute.MoneyToDouble();
}
catch (Exception e)
{
@@ -110,7 +110,7 @@ public class CreateSalarySettingsCommandHandler : IBaseCommandHandler<CreateSala
}
public record CreateSalarySettingsCommand(bool HolidayWorking, long UserId, string? MonthlySalary, List<WorkingHoursListDto> WorkingHoursList) : IBaseCommand;
public record CreateSalarySettingsCommand(bool HolidayWorking, long UserId, string? SalaryPerMinute, List<WorkingHoursListDto> WorkingHoursList) : IBaseCommand;
public record WorkingHoursListDto

6
ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/SalaryPaymentSettings/Commands/EditSalarySettings/EditSalarySettingsCommandHandler.cs
View File

@@ -25,12 +25,12 @@ public class EditSalarySettingsCommandHandler : IBaseCommandHandler<EditSalarySe
if(getSettings == null)
return OperationResult.NotFound("یافت نشد");
if(string.IsNullOrWhiteSpace(request.MonthlySalary))
if(string.IsNullOrWhiteSpace(request.SalaryPerMinute))
return OperationResult.Failure("حقوق ماهانه وارد نشده اشت");
double monthlySalary = 0;
try
{
monthlySalary = request.MonthlySalary.MoneyToDouble();
monthlySalary = request.SalaryPerMinute.MoneyToDouble();
}
catch (Exception e)
{
@@ -110,7 +110,7 @@ public class EditSalarySettingsCommandHandler : IBaseCommandHandler<EditSalarySe
}
public record EditSalarySettingsCommand(long UserId, bool HolidayWorking,string? MonthlySalary, List<WorkingHoursListDto> WorkingHoursList) : IBaseCommand;
public record EditSalarySettingsCommand(long UserId, bool HolidayWorking,string? SalaryPerMinute, List<WorkingHoursListDto> WorkingHoursList) : IBaseCommand;

4
ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/SalaryPaymentSettings/Queries/GetSalarySettingToEdit/GetSalarySettingToEditQueryHandler.cs
View File

@@ -28,7 +28,7 @@ public class GetSalarySettingToEditQueryHandler : IBaseQueryHandler<GetSalarySet
Id = x.Id,
HolidayWorking = x.HolidayWorking,
UserId = x.UserId,
MonthlySalary = x.MonthlySalary.ToMoney(),
SalaryPerMinute = x.MonthlySalary.ToMoney(),
WorkingHoursList = x.WorkingHoursList.Select(wh => new WorkingHoursListDto
{
@@ -77,7 +77,7 @@ public record GetSalarySettingToEdit
/// <summary>
/// حقوق ماهانه
/// </summary>
public string MonthlySalary { get; set; }
public string SalaryPerMinute { get; set; }
/// <summary>
/// لیست روزهای هفته و ساعات کاری

6
ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/SalaryPaymentSettings/Queries/GetUserListWhoHaveSettings/GetUserListWhoHaveSettingsQueryHandler.cs
View File

@@ -27,7 +27,7 @@ public class GetUserListWhoHaveSettingsQueryHandler : IBaseQueryHandler<GetUserL
UserId = u.Id,
FullName = u.FullName,
HasSalarySettings = settingsGroup.Any(),
MontlySalary = settingsGroup.Any() ? settingsGroup.FirstOrDefault().MonthlySalary.ToMoney() : "",
SalaryPerMinute = settingsGroup.Any() ? settingsGroup.FirstOrDefault().MonthlySalary.ToMoney() : "",
WeeklyWorkingTimeAvrageInt = settingsGroup
.SelectMany(x => x.WorkingHoursList)
.Sum(w => (int?)w.ShiftDurationInMinutes) ?? 0
@@ -55,7 +55,7 @@ public class GetUserListWhoHaveSettingsQueryHandler : IBaseQueryHandler<GetUserL
UserId = user.UserId,
FullName = user.FullName,
HasSalarySettings = user.HasSalarySettings,
MontlySalary = user.MontlySalary,
SalaryPerMinute = user.SalaryPerMinute,
WeeklyWorkingTimeAvrageInt = user.WeeklyWorkingTimeAvrageInt,
WeeklyWorkingTimeAvrage = weeklyWorkingTimeAvrage
};
@@ -106,6 +106,6 @@ public record GetUserWhoHaveSettingsDto
/// <summary>
/// حقوق ماهانه
/// </summary>
public string MontlySalary { get; set; }
public string SalaryPerMinute { get; set; }
}