From baededb717d6e3b8c2b446c3f76b0aecbe2653b3 Mon Sep 17 00:00:00 2001 From: MahanCh Date: Tue, 8 Apr 2025 16:32:10 +0330 Subject: [PATCH] fix conflict --- .../CustomizeCheckoutAgg/CustomizeCheckout.cs | 25 +- .../ICustomizeCheckoutRepository.cs | 1 + .../CustomizeCheckoutLoanInstallments.cs | 3 +- .../CustomizeCheckoutTemp.cs | 13 +- .../CustomizeCheckoutMandatoryViewModel.cs | 36 ++- .../CustomizeCheckoutViewModel.cs | 25 +- .../ICustomizeCheckoutApplication.cs | 3 +- .../SearchCustomizeCheckout.cs | 5 +- .../CustomizeCheckoutApplication.cs | 15 +- .../CustomizeCheckoutTempApplication.cs | 15 +- .../Mapping/CustomizeCheckoutMapping.cs | 18 ++ .../Mapping/CustomizeCheckoutTempMapping.cs | 20 +- .../Migrations/CompanyContextModelSnapshot.cs | 268 +++++++++--------- .../Repository/CustomizeCheckoutRepository.cs | 88 +++--- .../CustomizeCheckoutTempRepository.cs | 14 +- .../Repository/RollCallMandatoryRepository.cs | 9 +- .../PrintOneCheckoutTemporary.cshtml | 72 ++++- .../PrintOneCheckoutUnofficial.cshtml | 136 ++++++--- .../PrintDetailsCheckoutTemporaryRaw.cshtml | 64 ++++- .../PrintDetailsCheckoutUnofficialRaw.cshtml | 64 ++++- 20 files changed, 579 insertions(+), 315 deletions(-) diff --git a/Company.Domain/CustomizeCheckoutAgg/CustomizeCheckout.cs b/Company.Domain/CustomizeCheckoutAgg/CustomizeCheckout.cs index fd277dfc..9c6efe6f 100644 --- a/Company.Domain/CustomizeCheckoutAgg/CustomizeCheckout.cs +++ b/Company.Domain/CustomizeCheckoutAgg/CustomizeCheckout.cs @@ -1,12 +1,12 @@ -using _0_Framework.Application; +using System; +using System.Collections.Generic; +using _0_Framework.Application; using _0_Framework.Domain; +using _0_Framework.Domain.CustomizeCheckoutShared.Enums; +using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects; using Company.Domain.CustomizeCheckoutAgg.ValueObjects; using Company.Domain.EmployeeAgg; using Company.Domain.WorkshopAgg; -using System; -using System.Collections.Generic; -using _0_Framework.Domain.CustomizeCheckoutShared.Enums; -using Microsoft.AspNetCore.Authentication.Cookies; namespace Company.Domain.CustomizeCheckoutAgg; @@ -16,8 +16,7 @@ namespace Company.Domain.CustomizeCheckoutAgg; public class CustomizeCheckout : EntityBase { private CustomizeCheckout() - { - } + { } public CustomizeCheckout(DateTime contractStart, DateTime contractEnd, long employeeId, string employeeFName, string employeeLName, DateTime employeeDateOfBirth, string employeeNationalCode, string workshopFullName, long workshopId, long? contractId, @@ -32,7 +31,8 @@ public class CustomizeCheckout : EntityBase ICollection customizeCheckoutLoanInstallments, ICollection customizeCheckoutSalaryAids, ICollection customizeCheckoutRewards, TimeSpan lateToWorkValue, double settingSalary, - double dailyWage, WorkshopShiftStatus shiftStatus) + double dailyWage, WorkshopShiftStatus shiftStatus, IrregularShift irregularShift, + ICollection customizeRotatingShifts, ICollection employeeSettingsShifts) { YearInt = Convert.ToInt32(contractStart.ToFarsi().Substring(0, 4)); MonthInt = Convert.ToInt32(contractStart.ToFarsi().Substring(5, 2)); @@ -79,6 +79,9 @@ public class CustomizeCheckout : EntityBase SettingSalary = settingSalary; DailyWage = dailyWage; ShiftStatus = shiftStatus; + IrregularShift = irregularShift; + CustomizeRotatingShifts = customizeRotatingShifts; + RegularShifts = employeeSettingsShifts; } @@ -283,6 +286,12 @@ public class CustomizeCheckout : EntityBase public ICollection CustomizeCheckoutSalaryAids { get; set; } public ICollection CustomizeCheckoutRewards { get; set; } + public IrregularShift IrregularShift { get; set; } + public ICollection CustomizeRotatingShifts { get; set; } + public ICollection RegularShifts { get; set; } + + + #endregion #region Relations diff --git a/Company.Domain/CustomizeCheckoutAgg/ICustomizeCheckoutRepository.cs b/Company.Domain/CustomizeCheckoutAgg/ICustomizeCheckoutRepository.cs index f6d79207..a0bb28ed 100644 --- a/Company.Domain/CustomizeCheckoutAgg/ICustomizeCheckoutRepository.cs +++ b/Company.Domain/CustomizeCheckoutAgg/ICustomizeCheckoutRepository.cs @@ -3,6 +3,7 @@ using _0_Framework.Domain; using CompanyManagment.App.Contracts.CustomizeCheckout; using System; using System.Collections.Generic; +using _0_Framework.Application; namespace Company.Domain.CustomizeCheckoutAgg { diff --git a/Company.Domain/CustomizeCheckoutAgg/ValueObjects/CustomizeCheckoutLoanInstallments.cs b/Company.Domain/CustomizeCheckoutAgg/ValueObjects/CustomizeCheckoutLoanInstallments.cs index a2a1314e..a82348a8 100644 --- a/Company.Domain/CustomizeCheckoutAgg/ValueObjects/CustomizeCheckoutLoanInstallments.cs +++ b/Company.Domain/CustomizeCheckoutAgg/ValueObjects/CustomizeCheckoutLoanInstallments.cs @@ -19,6 +19,7 @@ public class CustomizeCheckoutLoanInstallments public string Month { get; private set; } public string Year { get; private set; } public string LoanRemaining { get; set; } - public string LoanAmount { get; set; } public IsActive IsActive { get; private set; } + public string LoanAmount { get; set; } + } \ No newline at end of file diff --git a/Company.Domain/CustomizeCheckoutTempAgg/CustomizeCheckoutTemp.cs b/Company.Domain/CustomizeCheckoutTempAgg/CustomizeCheckoutTemp.cs index afc1c0b7..7aa7384b 100644 --- a/Company.Domain/CustomizeCheckoutTempAgg/CustomizeCheckoutTemp.cs +++ b/Company.Domain/CustomizeCheckoutTempAgg/CustomizeCheckoutTemp.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; using Company.Domain.CustomizeCheckoutTempAgg.ValueObjects; using _0_Framework.Domain.CustomizeCheckoutShared.Enums; +using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects; namespace Company.Domain.CustomizeCheckoutTempAgg; @@ -34,7 +35,8 @@ public class CustomizeCheckoutTemp : EntityBase ICollection customizeCheckoutLoanInstallments, ICollection customizeCheckoutSalaryAids, ICollection customizeCheckoutRewards, - TimeSpan lateToWorkValue, double settingSalary, double dailyWage, WorkshopShiftStatus shiftStatus) + TimeSpan lateToWorkValue, double settingSalary, double dailyWage, WorkshopShiftStatus shiftStatus, IrregularShift irregularShift, + ICollection customizeRotatingShifts, ICollection employeeSettingsShifts) { YearInt = Convert.ToInt32(contractStart.ToFarsi().Substring(0, 4)); MonthInt = Convert.ToInt32(contractStart.ToFarsi().Substring(5, 2)); @@ -81,7 +83,10 @@ public class CustomizeCheckoutTemp : EntityBase SettingSalary = settingSalary; DailyWage = dailyWage; ShiftStatus = shiftStatus; - } + IrregularShift = irregularShift; + CustomizeRotatingShifts = customizeRotatingShifts; + RegularShifts = employeeSettingsShifts; + } #region Getters /// @@ -114,6 +119,10 @@ public class CustomizeCheckoutTemp : EntityBase public ICollection CustomizeCheckoutSalaryAids { get; set; } public ICollection CustomizeCheckoutRewards { get; set; } + public IrregularShift IrregularShift { get; set; } + public ICollection CustomizeRotatingShifts { get; set; } + public ICollection RegularShifts { get; set; } + #endregion diff --git a/CompanyManagment.App.Contracts/CustomizeCheckout/CustomizeCheckoutMandatoryViewModel.cs b/CompanyManagment.App.Contracts/CustomizeCheckout/CustomizeCheckoutMandatoryViewModel.cs index e789001f..d478c91f 100644 --- a/CompanyManagment.App.Contracts/CustomizeCheckout/CustomizeCheckoutMandatoryViewModel.cs +++ b/CompanyManagment.App.Contracts/CustomizeCheckout/CustomizeCheckoutMandatoryViewModel.cs @@ -1,8 +1,12 @@  using System; using System.Collections.Generic; +using System.Security.AccessControl; using _0_Framework.Application; +using _0_Framework.Domain.CustomizeCheckoutShared.Base; using _0_Framework.Domain.CustomizeCheckoutShared.Enums; +using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects; +using CompanyManagment.App.Contracts.CustomizeWorkshopSettings; using CompanyManagment.App.Contracts.File1; using CompanyManagment.App.Contracts.Fine; using CompanyManagment.App.Contracts.Loan; @@ -13,10 +17,13 @@ namespace CompanyManagment.App.Contracts.CustomizeCheckout; public class CustomizeCheckoutMandatoryViewModel { - /// - /// حقوق ماهانه - /// - public double MonthlySalary { get; set; } + + + + /// + /// حقوق ماهانه + /// + public double MonthlySalary { get; set; } #region Payments @@ -106,6 +113,8 @@ public class CustomizeCheckoutMandatoryViewModel public double EarlyExitDeduction { get; set; } + + /// /// مساعده @@ -131,6 +140,7 @@ public class CustomizeCheckoutMandatoryViewModel #region Values public TimeSpan LateToWorkValue { get; set; } #endregion + /// /// تعداد روزهای کارکرد /// @@ -183,16 +193,20 @@ public class CustomizeCheckoutMandatoryViewModel public int Year { get; set; } public int Month { get; set; } #endregion - - public List FineViewModels { get; set; } = []; - public List RewardViewModels { get; set; } = []; - public List InstallmentViewModels { get; set; } = []; - public List SalaryAidViewModels { get; set; } = []; - + public List FineViewModels { get; set; } + public List RewardViewModels { get; set; } + public List InstallmentViewModels{ get; set; } + public List SalaryAidViewModels { get; set; } public double SettingSalary { get; set; } public double DailyWage { get; set; } - public WorkshopShiftStatus ShiftStatus { get; set; } + public WorkshopShiftStatus ShiftStatus { get; set; } + + public IrregularShift IrregularShift { get; set; } + public ICollection CustomizeRotatingShifts { get; set; } + + public ICollection EmployeeSettingsShifts { get; set; } } + diff --git a/CompanyManagment.App.Contracts/CustomizeCheckout/CustomizeCheckoutViewModel.cs b/CompanyManagment.App.Contracts/CustomizeCheckout/CustomizeCheckoutViewModel.cs index 390a4337..1dcb87dc 100644 --- a/CompanyManagment.App.Contracts/CustomizeCheckout/CustomizeCheckoutViewModel.cs +++ b/CompanyManagment.App.Contracts/CustomizeCheckout/CustomizeCheckoutViewModel.cs @@ -2,7 +2,11 @@ using CompanyManagment.App.Contracts.RollCall; using System; using System.Collections.Generic; +using System.Runtime; +using System.Security.AccessControl; +using _0_Framework.Domain.CustomizeCheckoutShared.Base; using _0_Framework.Domain.CustomizeCheckoutShared.Enums; +using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects; using CompanyManagment.App.Contracts.Fine; using CompanyManagment.App.Contracts.Loan; using CompanyManagment.App.Contracts.Reward; @@ -67,7 +71,7 @@ namespace CompanyManagment.App.Contracts.CustomizeCheckout public string LeavePay { get; set; } public string RewardPay { get; set; } - + public bool IsBirthday { get; set; } = true; public string FineDeduction { get; set; } public string InsuranceDeduction { get; set; } public string TaxDeducation { get; set; } @@ -87,22 +91,23 @@ namespace CompanyManagment.App.Contracts.CustomizeCheckout public List InstallmentViewModels { get; set; } public List SalaryAidViewModels { get; set; } public bool TotalPaymentHide { get; set; } + public PersonnelCheckoutDailyRollCallViewModel MonthlyRollCall { get; set; } public double TotalPaymentD { get; set; } - public PersonnelCheckoutDailyRollCallViewModel MonthlyRollCall { get; set; } - - - - public string TotalLateToWorkDeduction { get; set; } + public string TotalLateToWorkDeduction { get; set; } public string LateToWorkValue { get; set; } + public string SettingSalary { get; set; } + public string DailyWage { get; set; } + public WorkshopShiftStatus ShiftStatus { get; set; } - public string SettingSalary { get; set; } - public string DailyWage { get; set; } - public WorkshopShiftStatus ShiftStatus { get; set; } + public string EmployeePicture { get; set; } - public string EmployeePicture { get; set; } + + public IrregularShift IrregularShift { get; set; } + public List CustomizeRotatingShifts { get; set; } + public List RegularShift { get; set; } //public bool HasLeft { get; set; } //public string IsBlockCantracingParty { get; set; } diff --git a/CompanyManagment.App.Contracts/CustomizeCheckout/ICustomizeCheckoutApplication.cs b/CompanyManagment.App.Contracts/CustomizeCheckout/ICustomizeCheckoutApplication.cs index 5ada835b..33645584 100644 --- a/CompanyManagment.App.Contracts/CustomizeCheckout/ICustomizeCheckoutApplication.cs +++ b/CompanyManagment.App.Contracts/CustomizeCheckout/ICustomizeCheckoutApplication.cs @@ -7,7 +7,8 @@ namespace CompanyManagment.App.Contracts.CustomizeCheckout { public interface ICustomizeCheckoutApplication { - public List Search(SearchCustomizeCheckout searchModel); + List Search(SearchCustomizeCheckout searchModel); + OperationResult> GetWorkshopEmployeesEligibleForCheckoutInDates(long workshopId, int yearFa, int monthFa); diff --git a/CompanyManagment.App.Contracts/CustomizeCheckout/SearchCustomizeCheckout.cs b/CompanyManagment.App.Contracts/CustomizeCheckout/SearchCustomizeCheckout.cs index 518c09c4..f24b97f1 100644 --- a/CompanyManagment.App.Contracts/CustomizeCheckout/SearchCustomizeCheckout.cs +++ b/CompanyManagment.App.Contracts/CustomizeCheckout/SearchCustomizeCheckout.cs @@ -4,9 +4,7 @@ public class SearchCustomizeCheckout { public long WorkshopId { get; set; } - - - + public int Month { get; set; } public int Year { get; set; } @@ -14,6 +12,7 @@ public class SearchCustomizeCheckout public string SearchEndFa { get; set; } public long EmployeeId { get; set; } + public long BankId { get; set; } public CustomizeCheckoutOrderByEnum OrderBy { get; set; } = CustomizeCheckoutOrderByEnum.ContractStartDesc; diff --git a/CompanyManagment.Application/CustomizeCheckoutApplication.cs b/CompanyManagment.Application/CustomizeCheckoutApplication.cs index f39eb01b..c7a82d33 100644 --- a/CompanyManagment.Application/CustomizeCheckoutApplication.cs +++ b/CompanyManagment.Application/CustomizeCheckoutApplication.cs @@ -50,8 +50,6 @@ namespace CompanyManagment.Application public List Search(SearchCustomizeCheckout searchModel) { - - if (!string.IsNullOrWhiteSpace(searchModel.SearchStartFa) || !string.IsNullOrWhiteSpace(searchModel.SearchEndFa)) { if (!searchModel.SearchStartFa.TryToGeorgianDateTime(out DateTime start) || @@ -99,9 +97,11 @@ namespace CompanyManagment.Application new CustomizeCheckoutLoanInstallments(x.Amount, x.Month, x.Year, x.IsActive,x.RemainingAmount,x.LoanAmount)).ToList(); var salaryAids = result.SalaryAidViewModels.Select(x => - new CustomizeCheckoutSalaryAid(x.Amount, x.SalaryAidDateTimeGe, x.SalaryAidDateTimeFa)).ToList(); + new CustomizeCheckoutSalaryAid(x.Amount, x.SalaryAidDateTimeGe, x.SalaryAidDateTimeFa)).ToList(); + var regularShift = result.EmployeeSettingsShifts.Select(x => + new CustomizeCheckoutRegularShift(x.StartTime, x.EndTime, x.Placement)).ToList(); var entity = new CustomizeCheckout(command.ContractStart, command.ContractEnd, command.EmployeeId, employee.FName, employee.LName, employee.DateOfBirth, employee.NationalCode, workshop.WorkshopFullName, command.WorkshopId, contract?.Id, @@ -110,7 +110,8 @@ namespace CompanyManagment.Application result.FamilyAllowance, result.LeavePay, result.InsuranceDeduction, result.FineAbsenceDeduction, result.LateToWorkDeduction, result.EarlyExitDeduction, result.RewardPay, result.SalaryAidDeduction, result.InstallmentDeduction, result.FineDeduction, result.TaxDeduction, result.SumOfWorkingDays, result.TotalClaimsStr, result.TotalDeductionsStr, result.TotalPayment, contract?.ContractNo ?? "-", - fines,loanInstallments,salaryAids,rewards, result.LateToWorkValue, result.SettingSalary, result.DailyWage, result.ShiftStatus); + fines,loanInstallments,salaryAids,rewards, result.LateToWorkValue, result.SettingSalary, result.DailyWage, result.ShiftStatus,result.IrregularShift,result.CustomizeRotatingShifts, + regularShift); _customizeCheckoutRepository.Create(entity); @@ -155,6 +156,9 @@ namespace CompanyManagment.Application var salaryAids = computations.SalaryAidViewModels.Select(x => new CustomizeCheckoutSalaryAid(x.Amount, x.SalaryAidDateTimeGe, x.SalaryAidDateTimeFa)).ToList(); + var regularShift = computations.EmployeeSettingsShifts.Select(x => + new CustomizeCheckoutRegularShift(x.StartTime, x.EndTime, x.Placement)).ToList(); + var entity = new CustomizeCheckout(command.ContractStart, command.ContractEnd, employeeId, employee.FName, employee.LName, employee.DateOfBirth, employee.NationalCode, workshop.WorkshopFullName, command.WorkshopId, contract?.Id, computations.MonthlySalary, computations.FridayPay, computations.OverTimePay, computations.BaseYearsPay, @@ -162,7 +166,8 @@ namespace CompanyManagment.Application computations.FamilyAllowance, computations.LeavePay, computations.InsuranceDeduction, computations.FineAbsenceDeduction, computations.LateToWorkDeduction, computations.EarlyExitDeduction, computations.RewardPay, computations.SalaryAidDeduction, computations.InstallmentDeduction, computations.FineDeduction, computations.TaxDeduction, computations.SumOfWorkingDays, computations.TotalClaimsStr, computations.TotalDeductionsStr, computations.TotalPayment, contract?.ContractNo ?? "-", - fines,loanInstallments,salaryAids,rewards, computations.LateToWorkValue, computations.SettingSalary, computations.DailyWage, computations.ShiftStatus); + fines,loanInstallments,salaryAids,rewards, computations.LateToWorkValue, computations.SettingSalary, computations.DailyWage, computations.ShiftStatus,computations.IrregularShift, + computations.CustomizeRotatingShifts, regularShift); _customizeCheckoutRepository.Create(entity); _customizeCheckoutRepository.RemoveEmployeeCustomizeCheckoutInDates(command.WorkshopId, employeeId, command.ContractStart, command.ContractEnd); diff --git a/CompanyManagment.Application/CustomizeCheckoutTempApplication.cs b/CompanyManagment.Application/CustomizeCheckoutTempApplication.cs index 8cd08799..1ab816eb 100644 --- a/CompanyManagment.Application/CustomizeCheckoutTempApplication.cs +++ b/CompanyManagment.Application/CustomizeCheckoutTempApplication.cs @@ -20,6 +20,7 @@ using System.Linq; using Company.Domain.CustomizeCheckoutTempAgg.ValueObjects; using Company.Domain.PersonnelCodeAgg; using CompanyManagment.App.Contracts.PersonnleCode; +using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects; namespace CompanyManagment.Application { @@ -84,6 +85,9 @@ namespace CompanyManagment.Application var salaryAids = result.SalaryAidViewModels.Select(x => new CustomizeCheckoutTempSalaryAid(x.Amount, x.SalaryAidDateTimeGe, x.SalaryAidDateTimeFa)).ToList(); + var regularShift = result.EmployeeSettingsShifts.Select(x => + new CustomizeCheckoutRegularShift(x.StartTime, x.EndTime, x.Placement)).ToList(); + var entity = new CustomizeCheckoutTemp(command.ContractStart, command.ContractEnd, command.EmployeeId, employee.FName, employee.LName, employee.DateOfBirth, employee.NationalCode, workshop.WorkshopFullName, command.WorkshopId, contract?.Id, result.MonthlySalary, result.FridayPay, result.OverTimePay, result.BaseYearsPay, @@ -91,7 +95,8 @@ namespace CompanyManagment.Application result.FamilyAllowance, result.LeavePay, result.InsuranceDeduction, result.FineAbsenceDeduction, result.LateToWorkDeduction, result.EarlyExitDeduction, result.RewardPay, result.SalaryAidDeduction, result.InstallmentDeduction, result.FineDeduction, result.TaxDeduction, result.SumOfWorkingDays, result.TotalClaimsStr, result.TotalDeductionsStr, result.TotalPayment, contract?.ContractNo ?? "-", - fines, loanInstallments, salaryAids, rewards,result.LateToWorkValue, result.SettingSalary, result.DailyWage, result.ShiftStatus); + fines, loanInstallments, salaryAids, rewards,result.LateToWorkValue, result.SettingSalary,result.DailyWage, result.ShiftStatus, result.IrregularShift, result.CustomizeRotatingShifts, + regularShift); _customizeCheckoutTempRepository.Create(entity); @@ -137,6 +142,9 @@ namespace CompanyManagment.Application var employee = employees.FirstOrDefault(x => x.id == employeeId); + var regularShift = computations.EmployeeSettingsShifts.Select(x => + new CustomizeCheckoutRegularShift(x.StartTime, x.EndTime, x.Placement)).ToList(); + var entity = new CustomizeCheckoutTemp(command.ContractStart, command.ContractEnd, employeeId, employee.FName, employee.LName, employee.DateOfBirth, employee.NationalCode, workshop.WorkshopFullName, command.WorkshopId, contract?.Id, computations.MonthlySalary, computations.FridayPay, computations.OverTimePay, computations.BaseYearsPay, @@ -144,8 +152,9 @@ namespace CompanyManagment.Application computations.FamilyAllowance, computations.LeavePay, computations.InsuranceDeduction, computations.FineAbsenceDeduction, computations.LateToWorkDeduction, computations.EarlyExitDeduction, computations.RewardPay, computations.SalaryAidDeduction, computations.InstallmentDeduction, computations.FineDeduction, computations.TaxDeduction, computations.SumOfWorkingDays, computations.TotalClaimsStr, computations.TotalDeductionsStr, computations.TotalPayment, contract?.ContractNo ?? "-", - fines, loanInstallments, salaryAids, rewards,computations.LateToWorkValue, computations.SettingSalary, computations.DailyWage, computations.ShiftStatus); - _customizeCheckoutTempRepository.Create(entity); + fines, loanInstallments, salaryAids, rewards,computations.LateToWorkValue, computations.SettingSalary, computations.DailyWage, computations.ShiftStatus, computations.IrregularShift, + computations.CustomizeRotatingShifts, regularShift); + _customizeCheckoutTempRepository.Create(entity); _customizeCheckoutTempRepository.RemoveEmployeeTemporaryCheckoutInDates(command.WorkshopId, employeeId, command.ContractStart, command.ContractEnd); } diff --git a/CompanyManagment.EFCore/Mapping/CustomizeCheckoutMapping.cs b/CompanyManagment.EFCore/Mapping/CustomizeCheckoutMapping.cs index 1c05dd0d..b189e2bb 100644 --- a/CompanyManagment.EFCore/Mapping/CustomizeCheckoutMapping.cs +++ b/CompanyManagment.EFCore/Mapping/CustomizeCheckoutMapping.cs @@ -1,5 +1,6 @@ using System; using _0_Framework.Application; +using _0_Framework.Domain.CustomizeCheckoutShared.Enums; using _0_Framework.InfraStructure; using Company.Domain.CustomizeCheckoutAgg; using Microsoft.AspNetCore.Components.Forms; @@ -97,6 +98,23 @@ public class CustomizeCheckoutMapping : IEntityTypeConfigurationx.Description).HasColumnType("ntext"); }); + builder.OwnsOne(x => x.IrregularShift, irregularShift => + { + irregularShift.Property(x => x.WorkshopIrregularShifts).HasConversion().HasMaxLength(30); + irregularShift.Property(x => x.StartTime).IsRequired(); + irregularShift.Property(x => x.EndTime).IsRequired(); + }); + + builder.OwnsMany(x => x.RegularShifts, shift => + { + + shift.HasKey(x => x.id); + shift.Property(x => x.Placement).HasConversion().HasMaxLength(20); + }); + + builder.OwnsMany(x => x.CustomizeRotatingShifts); + + builder.Property(x => x.ShiftStatus).HasConversion().HasMaxLength(10); diff --git a/CompanyManagment.EFCore/Mapping/CustomizeCheckoutTempMapping.cs b/CompanyManagment.EFCore/Mapping/CustomizeCheckoutTempMapping.cs index 212e4a59..1f2e7e37 100644 --- a/CompanyManagment.EFCore/Mapping/CustomizeCheckoutTempMapping.cs +++ b/CompanyManagment.EFCore/Mapping/CustomizeCheckoutTempMapping.cs @@ -97,10 +97,26 @@ public class CustomizeCheckoutTempMapping : IEntityTypeConfiguration x.Description).HasColumnType("ntext"); }); + + builder.OwnsOne(x => x.IrregularShift, irregularShift => + { + irregularShift.Property(x => x.WorkshopIrregularShifts).HasConversion().HasMaxLength(30); + irregularShift.Property(x => x.StartTime).IsRequired(); + irregularShift.Property(x => x.EndTime).IsRequired(); + }); + + builder.OwnsMany(x => x.RegularShifts, shift => + { + //shift.ToTable("RegularShifts"); + shift.HasKey(x => x.id); + shift.Property(x => x.Placement).HasConversion().HasMaxLength(20); + }); + + builder.OwnsMany(x => x.CustomizeRotatingShifts); + builder.Property(x => x.ShiftStatus).HasConversion().HasMaxLength(10); - - #region Relastions + #region Relastions //builder.HasOne(x => x.Workshop) // .WithMany(x => x.CustomizeCheckouts) diff --git a/CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs b/CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs index 88ede9b1..f5c0b23d 100644 --- a/CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs +++ b/CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs @@ -1695,7 +1695,7 @@ namespace CompanyManagment.EFCore.Migrations b.HasKey("id"); - b.ToTable("EmployeeClientTemps"); + b.ToTable("EmployeeClientTemps", (string)null); }); modelBuilder.Entity("Company.Domain.EmployeeComputeOptionsAgg.EmployeeComputeOptions", b => @@ -3559,7 +3559,7 @@ namespace CompanyManagment.EFCore.Migrations b.HasKey("id"); - b.ToTable("LeftWorkTemps"); + b.ToTable("LeftWorkTemps", (string)null); }); modelBuilder.Entity("Company.Domain.LoanAgg.Entities.Loan", b => @@ -4476,7 +4476,7 @@ namespace CompanyManagment.EFCore.Migrations b.HasIndex("RollCallEmployeeId"); - b.ToTable("RollCallEmployeesStatus"); + b.ToTable("RollCallEmployeesStatus", (string)null); }); modelBuilder.Entity("Company.Domain.RollCallPlanAgg.RollCallPlan", b => @@ -5734,7 +5734,7 @@ namespace CompanyManagment.EFCore.Migrations b.HasIndex("WorkshopsListid"); - b.ToTable("EmployerWorkshop"); + b.ToTable("EmployerWorkshop", (string)null); }); modelBuilder.Entity("Company.Domain.Board.Board", b => @@ -5910,7 +5910,7 @@ namespace CompanyManagment.EFCore.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.OwnsMany("Company.Domain.CustomizeCheckoutAgg.ValueObjects.CustomizeCheckoutFine", "CheckoutFines", b1 => + b.OwnsMany("Company.Domain.CustomizeCheckoutAgg.CustomizeCheckout.CheckoutFines#Company.Domain.CustomizeCheckoutAgg.ValueObjects.CustomizeCheckoutFine", "CheckoutFines", b1 => { b1.Property("CustomizeCheckoutid") .HasColumnType("bigint"); @@ -5946,13 +5946,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeCheckoutid", "Id"); - b1.ToTable("CustomizeCheckoutFine"); + b1.ToTable("CustomizeCheckoutFine", (string)null); b1.WithOwner() .HasForeignKey("CustomizeCheckoutid"); }); - b.OwnsMany("Company.Domain.CustomizeCheckoutAgg.ValueObjects.CustomizeCheckoutLoanInstallments", "CustomizeCheckoutLoanInstallments", b1 => + b.OwnsMany("Company.Domain.CustomizeCheckoutAgg.CustomizeCheckout.CustomizeCheckoutLoanInstallments#Company.Domain.CustomizeCheckoutAgg.ValueObjects.CustomizeCheckoutLoanInstallments", "CustomizeCheckoutLoanInstallments", b1 => { b1.Property("CustomizeCheckoutid") .HasColumnType("bigint"); @@ -5990,13 +5990,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeCheckoutid", "Id"); - b1.ToTable("CustomizeCheckoutLoanInstallments"); + b1.ToTable("CustomizeCheckoutLoanInstallments", (string)null); b1.WithOwner() .HasForeignKey("CustomizeCheckoutid"); }); - b.OwnsMany("Company.Domain.CustomizeCheckoutAgg.ValueObjects.CustomizeCheckoutReward", "CustomizeCheckoutRewards", b1 => + b.OwnsMany("Company.Domain.CustomizeCheckoutAgg.CustomizeCheckout.CustomizeCheckoutRewards#Company.Domain.CustomizeCheckoutAgg.ValueObjects.CustomizeCheckoutReward", "CustomizeCheckoutRewards", b1 => { b1.Property("CustomizeCheckoutid") .HasColumnType("bigint"); @@ -6032,13 +6032,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeCheckoutid", "Id"); - b1.ToTable("CustomizeCheckoutReward"); + b1.ToTable("CustomizeCheckoutReward", (string)null); b1.WithOwner() .HasForeignKey("CustomizeCheckoutid"); }); - b.OwnsMany("Company.Domain.CustomizeCheckoutAgg.ValueObjects.CustomizeCheckoutSalaryAid", "CustomizeCheckoutSalaryAids", b1 => + b.OwnsMany("Company.Domain.CustomizeCheckoutAgg.CustomizeCheckout.CustomizeCheckoutSalaryAids#Company.Domain.CustomizeCheckoutAgg.ValueObjects.CustomizeCheckoutSalaryAid", "CustomizeCheckoutSalaryAids", b1 => { b1.Property("CustomizeCheckoutid") .HasColumnType("bigint"); @@ -6062,7 +6062,7 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeCheckoutid", "Id"); - b1.ToTable("CustomizeCheckoutSalaryAid"); + b1.ToTable("CustomizeCheckoutSalaryAid", (string)null); b1.WithOwner() .HasForeignKey("CustomizeCheckoutid"); @@ -6095,7 +6095,7 @@ namespace CompanyManagment.EFCore.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.OwnsMany("Company.Domain.CustomizeCheckoutTempAgg.ValueObjects.CustomizeCheckoutTempFine", "CheckoutFines", b1 => + b.OwnsMany("Company.Domain.CustomizeCheckoutTempAgg.CustomizeCheckoutTemp.CheckoutFines#Company.Domain.CustomizeCheckoutTempAgg.ValueObjects.CustomizeCheckoutTempFine", "CheckoutFines", b1 => { b1.Property("CustomizeCheckoutTempid") .HasColumnType("bigint"); @@ -6131,13 +6131,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeCheckoutTempid", "Id"); - b1.ToTable("CustomizeCheckoutTempFine"); + b1.ToTable("CustomizeCheckoutTempFine", (string)null); b1.WithOwner() .HasForeignKey("CustomizeCheckoutTempid"); }); - b.OwnsMany("Company.Domain.CustomizeCheckoutTempAgg.ValueObjects.CustomizeCheckoutTempLoanInstallments", "CustomizeCheckoutLoanInstallments", b1 => + b.OwnsMany("Company.Domain.CustomizeCheckoutTempAgg.CustomizeCheckoutTemp.CustomizeCheckoutLoanInstallments#Company.Domain.CustomizeCheckoutTempAgg.ValueObjects.CustomizeCheckoutTempLoanInstallments", "CustomizeCheckoutLoanInstallments", b1 => { b1.Property("CustomizeCheckoutTempid") .HasColumnType("bigint"); @@ -6175,13 +6175,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeCheckoutTempid", "Id"); - b1.ToTable("CustomizeCheckoutTempLoanInstallments"); + b1.ToTable("CustomizeCheckoutTempLoanInstallments", (string)null); b1.WithOwner() .HasForeignKey("CustomizeCheckoutTempid"); }); - b.OwnsMany("Company.Domain.CustomizeCheckoutTempAgg.ValueObjects.CustomizeCheckoutTempReward", "CustomizeCheckoutRewards", b1 => + b.OwnsMany("Company.Domain.CustomizeCheckoutTempAgg.CustomizeCheckoutTemp.CustomizeCheckoutRewards#Company.Domain.CustomizeCheckoutTempAgg.ValueObjects.CustomizeCheckoutTempReward", "CustomizeCheckoutRewards", b1 => { b1.Property("CustomizeCheckoutTempid") .HasColumnType("bigint"); @@ -6217,13 +6217,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeCheckoutTempid", "Id"); - b1.ToTable("CustomizeCheckoutTempReward"); + b1.ToTable("CustomizeCheckoutTempReward", (string)null); b1.WithOwner() .HasForeignKey("CustomizeCheckoutTempid"); }); - b.OwnsMany("Company.Domain.CustomizeCheckoutTempAgg.ValueObjects.CustomizeCheckoutTempSalaryAid", "CustomizeCheckoutSalaryAids", b1 => + b.OwnsMany("Company.Domain.CustomizeCheckoutTempAgg.CustomizeCheckoutTemp.CustomizeCheckoutSalaryAids#Company.Domain.CustomizeCheckoutTempAgg.ValueObjects.CustomizeCheckoutTempSalaryAid", "CustomizeCheckoutSalaryAids", b1 => { b1.Property("CustomizeCheckoutTempid") .HasColumnType("bigint"); @@ -6247,7 +6247,7 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeCheckoutTempid", "Id"); - b1.ToTable("CustomizeCheckoutTempSalaryAid"); + b1.ToTable("CustomizeCheckoutTempSalaryAid", (string)null); b1.WithOwner() .HasForeignKey("CustomizeCheckoutTempid"); @@ -6274,7 +6274,7 @@ namespace CompanyManagment.EFCore.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.OwnsMany("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettingsShift", "CustomizeWorkshopEmployeeSettingsShifts", b1 => + b.OwnsMany("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettings.CustomizeWorkshopEmployeeSettingsShifts#Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettingsShift", "CustomizeWorkshopEmployeeSettingsShifts", b1 => { b1.Property("id") .ValueGeneratedOnAdd() @@ -6314,7 +6314,7 @@ namespace CompanyManagment.EFCore.Migrations b1.Navigation("CustomizeWorkshopEmployeeSettings"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.BaseYearsPay", "BaseYearsPay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettings.BaseYearsPay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.BaseYearsPay", "BaseYearsPay", b1 => { b1.Property("CustomizeWorkshopEmployeeSettingsid") .HasColumnType("bigint"); @@ -6337,13 +6337,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopEmployeeSettingsid"); - b1.ToTable("CustomizeWorkshopEmployeeSettings"); + b1.ToTable("CustomizeWorkshopEmployeeSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopEmployeeSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.BonusesPay", "BonusesPay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettings.BonusesPay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.BonusesPay", "BonusesPay", b1 => { b1.Property("CustomizeWorkshopEmployeeSettingsid") .HasColumnType("bigint"); @@ -6366,13 +6366,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopEmployeeSettingsid"); - b1.ToTable("CustomizeWorkshopEmployeeSettings"); + b1.ToTable("CustomizeWorkshopEmployeeSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopEmployeeSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.BreakTime", "BreakTime", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettings.BreakTime#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.BreakTime", "BreakTime", b1 => { b1.Property("CustomizeWorkshopEmployeeSettingsid") .HasColumnType("bigint"); @@ -6390,13 +6390,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopEmployeeSettingsid"); - b1.ToTable("CustomizeWorkshopEmployeeSettings"); + b1.ToTable("CustomizeWorkshopEmployeeSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopEmployeeSettingsid"); }); - b.OwnsMany("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.CustomizeRotatingShift", "CustomizeRotatingShifts", b1 => + b.OwnsMany("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettings.CustomizeRotatingShifts#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.CustomizeRotatingShift", "CustomizeRotatingShifts", b1 => { b1.Property("CustomizeWorkshopEmployeeSettingsid") .HasColumnType("bigint"); @@ -6415,13 +6415,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopEmployeeSettingsid", "Id"); - b1.ToTable("CustomizeWorkshopEmployeeSettings_CustomizeRotatingShifts"); + b1.ToTable("CustomizeWorkshopEmployeeSettings_CustomizeRotatingShifts", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopEmployeeSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.EarlyExit", "EarlyExit", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettings.EarlyExit#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.EarlyExit", "EarlyExit", b1 => { b1.Property("CustomizeWorkshopEmployeeSettingsid") .HasColumnType("bigint"); @@ -6438,12 +6438,12 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopEmployeeSettingsid"); - b1.ToTable("CustomizeWorkshopEmployeeSettings"); + b1.ToTable("CustomizeWorkshopEmployeeSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopEmployeeSettingsid"); - b1.OwnsMany("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.EarlyExitTimeFine", "EarlyExitTimeFines", b2 => + b1.OwnsMany("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettings.EarlyExit#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.EarlyExit.EarlyExitTimeFines#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.EarlyExitTimeFine", "EarlyExitTimeFines", b2 => { b2.Property("CustomizeWorkshopEmployeeSettingsId") .HasColumnType("bigint"); @@ -6465,7 +6465,7 @@ namespace CompanyManagment.EFCore.Migrations b2.HasKey("CustomizeWorkshopEmployeeSettingsId", "Id"); - b2.ToTable("CustomizeWorkshopEmployeeSettings_EarlyExitTimeFines"); + b2.ToTable("CustomizeWorkshopEmployeeSettings_EarlyExitTimeFines", (string)null); b2.WithOwner() .HasForeignKey("CustomizeWorkshopEmployeeSettingsId"); @@ -6474,7 +6474,7 @@ namespace CompanyManagment.EFCore.Migrations b1.Navigation("EarlyExitTimeFines"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FamilyAllowance", "FamilyAllowance", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettings.FamilyAllowance#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FamilyAllowance", "FamilyAllowance", b1 => { b1.Property("CustomizeWorkshopEmployeeSettingsid") .HasColumnType("bigint"); @@ -6491,13 +6491,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopEmployeeSettingsid"); - b1.ToTable("CustomizeWorkshopEmployeeSettings"); + b1.ToTable("CustomizeWorkshopEmployeeSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopEmployeeSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FineAbsenceDeduction", "FineAbsenceDeduction", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettings.FineAbsenceDeduction#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FineAbsenceDeduction", "FineAbsenceDeduction", b1 => { b1.Property("CustomizeWorkshopEmployeeSettingsid") .HasColumnType("bigint"); @@ -6514,12 +6514,12 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopEmployeeSettingsid"); - b1.ToTable("CustomizeWorkshopEmployeeSettings"); + b1.ToTable("CustomizeWorkshopEmployeeSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopEmployeeSettingsid"); - b1.OwnsMany("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FineAbsenceDayOfWeek", "FineAbsenceDayOfWeekCollection", b2 => + b1.OwnsMany("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettings.FineAbsenceDeduction#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FineAbsenceDeduction.FineAbsenceDayOfWeekCollection#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FineAbsenceDayOfWeek", "FineAbsenceDayOfWeekCollection", b2 => { b2.Property("CustomizeWorkshopEmployeeSettingsId") .HasColumnType("bigint"); @@ -6538,7 +6538,7 @@ namespace CompanyManagment.EFCore.Migrations b2.HasKey("CustomizeWorkshopEmployeeSettingsId", "Id"); - b2.ToTable("CustomizeWorkshopEmployeeSettings_FineAbsenceDayOfWeekCollection"); + b2.ToTable("CustomizeWorkshopEmployeeSettings_FineAbsenceDayOfWeekCollection", (string)null); b2.WithOwner() .HasForeignKey("CustomizeWorkshopEmployeeSettingsId"); @@ -6547,7 +6547,7 @@ namespace CompanyManagment.EFCore.Migrations b1.Navigation("FineAbsenceDayOfWeekCollection"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FridayPay", "FridayPay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettings.FridayPay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FridayPay", "FridayPay", b1 => { b1.Property("CustomizeWorkshopEmployeeSettingsid") .HasColumnType("bigint"); @@ -6563,13 +6563,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopEmployeeSettingsid"); - b1.ToTable("CustomizeWorkshopEmployeeSettings"); + b1.ToTable("CustomizeWorkshopEmployeeSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopEmployeeSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.InsuranceDeduction", "InsuranceDeduction", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettings.InsuranceDeduction#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.InsuranceDeduction", "InsuranceDeduction", b1 => { b1.Property("CustomizeWorkshopEmployeeSettingsid") .HasColumnType("bigint"); @@ -6586,13 +6586,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopEmployeeSettingsid"); - b1.ToTable("CustomizeWorkshopEmployeeSettings"); + b1.ToTable("CustomizeWorkshopEmployeeSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopEmployeeSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.IrregularShift", "IrregularShift", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettings.IrregularShift#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.IrregularShift", "IrregularShift", b1 => { b1.Property("CustomizeWorkshopEmployeeSettingsid") .HasColumnType("bigint"); @@ -6610,13 +6610,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopEmployeeSettingsid"); - b1.ToTable("CustomizeWorkshopEmployeeSettings"); + b1.ToTable("CustomizeWorkshopEmployeeSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopEmployeeSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LateToWork", "LateToWork", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettings.LateToWork#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LateToWork", "LateToWork", b1 => { b1.Property("CustomizeWorkshopEmployeeSettingsid") .HasColumnType("bigint"); @@ -6633,12 +6633,12 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopEmployeeSettingsid"); - b1.ToTable("CustomizeWorkshopEmployeeSettings"); + b1.ToTable("CustomizeWorkshopEmployeeSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopEmployeeSettingsid"); - b1.OwnsMany("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LateToWorkTimeFine", "LateToWorkTimeFines", b2 => + b1.OwnsMany("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettings.LateToWork#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LateToWork.LateToWorkTimeFines#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LateToWorkTimeFine", "LateToWorkTimeFines", b2 => { b2.Property("CustomizeWorkshopEmployeeSettingsId") .HasColumnType("bigint"); @@ -6660,7 +6660,7 @@ namespace CompanyManagment.EFCore.Migrations b2.HasKey("CustomizeWorkshopEmployeeSettingsId", "Id"); - b2.ToTable("CustomizeWorkshopEmployeeSettings_LateToWorkTimeFines"); + b2.ToTable("CustomizeWorkshopEmployeeSettings_LateToWorkTimeFines", (string)null); b2.WithOwner() .HasForeignKey("CustomizeWorkshopEmployeeSettingsId"); @@ -6669,7 +6669,7 @@ namespace CompanyManagment.EFCore.Migrations b1.Navigation("LateToWorkTimeFines"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LeavePay", "LeavePay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettings.LeavePay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LeavePay", "LeavePay", b1 => { b1.Property("CustomizeWorkshopEmployeeSettingsid") .HasColumnType("bigint"); @@ -6686,13 +6686,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopEmployeeSettingsid"); - b1.ToTable("CustomizeWorkshopEmployeeSettings"); + b1.ToTable("CustomizeWorkshopEmployeeSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopEmployeeSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.MarriedAllowance", "MarriedAllowance", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettings.MarriedAllowance#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.MarriedAllowance", "MarriedAllowance", b1 => { b1.Property("CustomizeWorkshopEmployeeSettingsid") .HasColumnType("bigint"); @@ -6709,13 +6709,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopEmployeeSettingsid"); - b1.ToTable("CustomizeWorkshopEmployeeSettings"); + b1.ToTable("CustomizeWorkshopEmployeeSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopEmployeeSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.NightWorkPay", "NightWorkPay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettings.NightWorkPay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.NightWorkPay", "NightWorkPay", b1 => { b1.Property("CustomizeWorkshopEmployeeSettingsid") .HasColumnType("bigint"); @@ -6732,13 +6732,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopEmployeeSettingsid"); - b1.ToTable("CustomizeWorkshopEmployeeSettings"); + b1.ToTable("CustomizeWorkshopEmployeeSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopEmployeeSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.OverTimePay", "OverTimePay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettings.OverTimePay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.OverTimePay", "OverTimePay", b1 => { b1.Property("CustomizeWorkshopEmployeeSettingsid") .HasColumnType("bigint"); @@ -6755,13 +6755,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopEmployeeSettingsid"); - b1.ToTable("CustomizeWorkshopEmployeeSettings"); + b1.ToTable("CustomizeWorkshopEmployeeSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopEmployeeSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.ShiftPay", "ShiftPay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities.CustomizeWorkshopEmployeeSettings.ShiftPay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.ShiftPay", "ShiftPay", b1 => { b1.Property("CustomizeWorkshopEmployeeSettingsid") .HasColumnType("bigint"); @@ -6784,7 +6784,7 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopEmployeeSettingsid"); - b1.ToTable("CustomizeWorkshopEmployeeSettings"); + b1.ToTable("CustomizeWorkshopEmployeeSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopEmployeeSettingsid"); @@ -6835,7 +6835,7 @@ namespace CompanyManagment.EFCore.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.OwnsMany("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettingsShift", "CustomizeWorkshopGroupSettingsShifts", b1 => + b.OwnsMany("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings.CustomizeWorkshopGroupSettingsShifts#Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettingsShift", "CustomizeWorkshopGroupSettingsShifts", b1 => { b1.Property("id") .ValueGeneratedOnAdd() @@ -6872,7 +6872,7 @@ namespace CompanyManagment.EFCore.Migrations b1.Navigation("CustomizeWorkshopGroupSettings"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.BaseYearsPay", "BaseYearsPay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings.BaseYearsPay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.BaseYearsPay", "BaseYearsPay", b1 => { b1.Property("CustomizeWorkshopGroupSettingsid") .HasColumnType("bigint"); @@ -6895,13 +6895,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopGroupSettingsid"); - b1.ToTable("CustomizeWorkshopGroupSettings"); + b1.ToTable("CustomizeWorkshopGroupSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopGroupSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.BonusesPay", "BonusesPay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings.BonusesPay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.BonusesPay", "BonusesPay", b1 => { b1.Property("CustomizeWorkshopGroupSettingsid") .HasColumnType("bigint"); @@ -6924,13 +6924,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopGroupSettingsid"); - b1.ToTable("CustomizeWorkshopGroupSettings"); + b1.ToTable("CustomizeWorkshopGroupSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopGroupSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.BreakTime", "BreakTime", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings.BreakTime#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.BreakTime", "BreakTime", b1 => { b1.Property("CustomizeWorkshopGroupSettingsid") .HasColumnType("bigint"); @@ -6948,13 +6948,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopGroupSettingsid"); - b1.ToTable("CustomizeWorkshopGroupSettings"); + b1.ToTable("CustomizeWorkshopGroupSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopGroupSettingsid"); }); - b.OwnsMany("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.CustomizeRotatingShift", "CustomizeRotatingShifts", b1 => + b.OwnsMany("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings.CustomizeRotatingShifts#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.CustomizeRotatingShift", "CustomizeRotatingShifts", b1 => { b1.Property("CustomizeWorkshopGroupSettingsid") .HasColumnType("bigint"); @@ -6973,13 +6973,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopGroupSettingsid", "Id"); - b1.ToTable("CustomizeWorkshopGroupSettings_CustomizeRotatingShifts"); + b1.ToTable("CustomizeWorkshopGroupSettings_CustomizeRotatingShifts", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopGroupSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.EarlyExit", "EarlyExit", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings.EarlyExit#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.EarlyExit", "EarlyExit", b1 => { b1.Property("CustomizeWorkshopGroupSettingsid") .HasColumnType("bigint"); @@ -6996,12 +6996,12 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopGroupSettingsid"); - b1.ToTable("CustomizeWorkshopGroupSettings"); + b1.ToTable("CustomizeWorkshopGroupSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopGroupSettingsid"); - b1.OwnsMany("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.EarlyExitTimeFine", "EarlyExitTimeFines", b2 => + b1.OwnsMany("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings.EarlyExit#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.EarlyExit.EarlyExitTimeFines#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.EarlyExitTimeFine", "EarlyExitTimeFines", b2 => { b2.Property("CustomizeWorkshopGroupSettingsId") .HasColumnType("bigint"); @@ -7023,7 +7023,7 @@ namespace CompanyManagment.EFCore.Migrations b2.HasKey("CustomizeWorkshopGroupSettingsId", "Id"); - b2.ToTable("CustomizeWorkshopGroupSettings_EarlyExitTimeFines"); + b2.ToTable("CustomizeWorkshopGroupSettings_EarlyExitTimeFines", (string)null); b2.WithOwner() .HasForeignKey("CustomizeWorkshopGroupSettingsId"); @@ -7032,7 +7032,7 @@ namespace CompanyManagment.EFCore.Migrations b1.Navigation("EarlyExitTimeFines"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FamilyAllowance", "FamilyAllowance", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings.FamilyAllowance#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FamilyAllowance", "FamilyAllowance", b1 => { b1.Property("CustomizeWorkshopGroupSettingsid") .HasColumnType("bigint"); @@ -7049,13 +7049,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopGroupSettingsid"); - b1.ToTable("CustomizeWorkshopGroupSettings"); + b1.ToTable("CustomizeWorkshopGroupSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopGroupSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FineAbsenceDeduction", "FineAbsenceDeduction", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings.FineAbsenceDeduction#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FineAbsenceDeduction", "FineAbsenceDeduction", b1 => { b1.Property("CustomizeWorkshopGroupSettingsid") .HasColumnType("bigint"); @@ -7072,12 +7072,12 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopGroupSettingsid"); - b1.ToTable("CustomizeWorkshopGroupSettings"); + b1.ToTable("CustomizeWorkshopGroupSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopGroupSettingsid"); - b1.OwnsMany("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FineAbsenceDayOfWeek", "FineAbsenceDayOfWeekCollection", b2 => + b1.OwnsMany("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings.FineAbsenceDeduction#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FineAbsenceDeduction.FineAbsenceDayOfWeekCollection#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FineAbsenceDayOfWeek", "FineAbsenceDayOfWeekCollection", b2 => { b2.Property("CustomizeWorkshopGroupSettingsId") .HasColumnType("bigint"); @@ -7096,7 +7096,7 @@ namespace CompanyManagment.EFCore.Migrations b2.HasKey("CustomizeWorkshopGroupSettingsId", "Id"); - b2.ToTable("CustomizeWorkshopGroupSettings_FineAbsenceDayOfWeekCollection"); + b2.ToTable("CustomizeWorkshopGroupSettings_FineAbsenceDayOfWeekCollection", (string)null); b2.WithOwner() .HasForeignKey("CustomizeWorkshopGroupSettingsId"); @@ -7105,7 +7105,7 @@ namespace CompanyManagment.EFCore.Migrations b1.Navigation("FineAbsenceDayOfWeekCollection"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FridayPay", "FridayPay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings.FridayPay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FridayPay", "FridayPay", b1 => { b1.Property("CustomizeWorkshopGroupSettingsid") .HasColumnType("bigint"); @@ -7121,13 +7121,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopGroupSettingsid"); - b1.ToTable("CustomizeWorkshopGroupSettings"); + b1.ToTable("CustomizeWorkshopGroupSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopGroupSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.InsuranceDeduction", "InsuranceDeduction", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings.InsuranceDeduction#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.InsuranceDeduction", "InsuranceDeduction", b1 => { b1.Property("CustomizeWorkshopGroupSettingsid") .HasColumnType("bigint"); @@ -7144,13 +7144,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopGroupSettingsid"); - b1.ToTable("CustomizeWorkshopGroupSettings"); + b1.ToTable("CustomizeWorkshopGroupSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopGroupSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.IrregularShift", "IrregularShift", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings.IrregularShift#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.IrregularShift", "IrregularShift", b1 => { b1.Property("CustomizeWorkshopGroupSettingsid") .HasColumnType("bigint"); @@ -7168,13 +7168,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopGroupSettingsid"); - b1.ToTable("CustomizeWorkshopGroupSettings"); + b1.ToTable("CustomizeWorkshopGroupSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopGroupSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LateToWork", "LateToWork", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings.LateToWork#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LateToWork", "LateToWork", b1 => { b1.Property("CustomizeWorkshopGroupSettingsid") .HasColumnType("bigint"); @@ -7191,12 +7191,12 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopGroupSettingsid"); - b1.ToTable("CustomizeWorkshopGroupSettings"); + b1.ToTable("CustomizeWorkshopGroupSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopGroupSettingsid"); - b1.OwnsMany("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LateToWorkTimeFine", "LateToWorkTimeFines", b2 => + b1.OwnsMany("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings.LateToWork#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LateToWork.LateToWorkTimeFines#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LateToWorkTimeFine", "LateToWorkTimeFines", b2 => { b2.Property("CustomizeWorkshopGroupSettingsId") .HasColumnType("bigint"); @@ -7218,7 +7218,7 @@ namespace CompanyManagment.EFCore.Migrations b2.HasKey("CustomizeWorkshopGroupSettingsId", "Id"); - b2.ToTable("CustomizeWorkshopGroupSettings_LateToWorkTimeFines"); + b2.ToTable("CustomizeWorkshopGroupSettings_LateToWorkTimeFines", (string)null); b2.WithOwner() .HasForeignKey("CustomizeWorkshopGroupSettingsId"); @@ -7227,7 +7227,7 @@ namespace CompanyManagment.EFCore.Migrations b1.Navigation("LateToWorkTimeFines"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LeavePay", "LeavePay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings.LeavePay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LeavePay", "LeavePay", b1 => { b1.Property("CustomizeWorkshopGroupSettingsid") .HasColumnType("bigint"); @@ -7244,13 +7244,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopGroupSettingsid"); - b1.ToTable("CustomizeWorkshopGroupSettings"); + b1.ToTable("CustomizeWorkshopGroupSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopGroupSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.MarriedAllowance", "MarriedAllowance", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings.MarriedAllowance#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.MarriedAllowance", "MarriedAllowance", b1 => { b1.Property("CustomizeWorkshopGroupSettingsid") .HasColumnType("bigint"); @@ -7267,13 +7267,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopGroupSettingsid"); - b1.ToTable("CustomizeWorkshopGroupSettings"); + b1.ToTable("CustomizeWorkshopGroupSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopGroupSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.NightWorkPay", "NightWorkPay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings.NightWorkPay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.NightWorkPay", "NightWorkPay", b1 => { b1.Property("CustomizeWorkshopGroupSettingsid") .HasColumnType("bigint"); @@ -7290,13 +7290,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopGroupSettingsid"); - b1.ToTable("CustomizeWorkshopGroupSettings"); + b1.ToTable("CustomizeWorkshopGroupSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopGroupSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.OverTimePay", "OverTimePay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings.OverTimePay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.OverTimePay", "OverTimePay", b1 => { b1.Property("CustomizeWorkshopGroupSettingsid") .HasColumnType("bigint"); @@ -7313,13 +7313,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopGroupSettingsid"); - b1.ToTable("CustomizeWorkshopGroupSettings"); + b1.ToTable("CustomizeWorkshopGroupSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopGroupSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.ShiftPay", "ShiftPay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings.ShiftPay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.ShiftPay", "ShiftPay", b1 => { b1.Property("CustomizeWorkshopGroupSettingsid") .HasColumnType("bigint"); @@ -7342,7 +7342,7 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopGroupSettingsid"); - b1.ToTable("CustomizeWorkshopGroupSettings"); + b1.ToTable("CustomizeWorkshopGroupSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopGroupSettingsid"); @@ -7393,7 +7393,7 @@ namespace CompanyManagment.EFCore.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.OwnsMany("Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettingsShift", "CustomizeWorkshopSettingsShifts", b1 => + b.OwnsMany("Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettings.CustomizeWorkshopSettingsShifts#Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettingsShift", "CustomizeWorkshopSettingsShifts", b1 => { b1.Property("id") .ValueGeneratedOnAdd() @@ -7430,7 +7430,7 @@ namespace CompanyManagment.EFCore.Migrations b1.Navigation("CustomizeWorkshopSettings"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.BaseYearsPay", "BaseYearsPay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettings.BaseYearsPay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.BaseYearsPay", "BaseYearsPay", b1 => { b1.Property("CustomizeWorkshopSettingsid") .HasColumnType("bigint"); @@ -7453,13 +7453,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopSettingsid"); - b1.ToTable("CustomizeWorkshopSettings"); + b1.ToTable("CustomizeWorkshopSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.BonusesPay", "BonusesPay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettings.BonusesPay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.BonusesPay", "BonusesPay", b1 => { b1.Property("CustomizeWorkshopSettingsid") .HasColumnType("bigint"); @@ -7482,13 +7482,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopSettingsid"); - b1.ToTable("CustomizeWorkshopSettings"); + b1.ToTable("CustomizeWorkshopSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.EarlyExit", "EarlyExit", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettings.EarlyExit#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.EarlyExit", "EarlyExit", b1 => { b1.Property("CustomizeWorkshopSettingsid") .HasColumnType("bigint"); @@ -7505,12 +7505,12 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopSettingsid"); - b1.ToTable("CustomizeWorkshopSettings"); + b1.ToTable("CustomizeWorkshopSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopSettingsid"); - b1.OwnsMany("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.EarlyExitTimeFine", "EarlyExitTimeFines", b2 => + b1.OwnsMany("Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettings.EarlyExit#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.EarlyExit.EarlyExitTimeFines#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.EarlyExitTimeFine", "EarlyExitTimeFines", b2 => { b2.Property("CustomizeWorkshopSettingsId") .HasColumnType("bigint"); @@ -7532,7 +7532,7 @@ namespace CompanyManagment.EFCore.Migrations b2.HasKey("CustomizeWorkshopSettingsId", "Id"); - b2.ToTable("CustomizeWorkshopSettings_EarlyExitTimeFines"); + b2.ToTable("CustomizeWorkshopSettings_EarlyExitTimeFines", (string)null); b2.WithOwner() .HasForeignKey("CustomizeWorkshopSettingsId"); @@ -7541,7 +7541,7 @@ namespace CompanyManagment.EFCore.Migrations b1.Navigation("EarlyExitTimeFines"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FamilyAllowance", "FamilyAllowance", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettings.FamilyAllowance#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FamilyAllowance", "FamilyAllowance", b1 => { b1.Property("CustomizeWorkshopSettingsid") .HasColumnType("bigint"); @@ -7558,13 +7558,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopSettingsid"); - b1.ToTable("CustomizeWorkshopSettings"); + b1.ToTable("CustomizeWorkshopSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FineAbsenceDeduction", "FineAbsenceDeduction", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettings.FineAbsenceDeduction#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FineAbsenceDeduction", "FineAbsenceDeduction", b1 => { b1.Property("CustomizeWorkshopSettingsid") .HasColumnType("bigint"); @@ -7581,12 +7581,12 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopSettingsid"); - b1.ToTable("CustomizeWorkshopSettings"); + b1.ToTable("CustomizeWorkshopSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopSettingsid"); - b1.OwnsMany("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FineAbsenceDayOfWeek", "FineAbsenceDayOfWeekCollection", b2 => + b1.OwnsMany("Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettings.FineAbsenceDeduction#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FineAbsenceDeduction.FineAbsenceDayOfWeekCollection#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FineAbsenceDayOfWeek", "FineAbsenceDayOfWeekCollection", b2 => { b2.Property("CustomizeWorkshopSettingsId") .HasColumnType("bigint"); @@ -7605,7 +7605,7 @@ namespace CompanyManagment.EFCore.Migrations b2.HasKey("CustomizeWorkshopSettingsId", "Id"); - b2.ToTable("CustomizeWorkshopSettings_FineAbsenceDayOfWeekCollection"); + b2.ToTable("CustomizeWorkshopSettings_FineAbsenceDayOfWeekCollection", (string)null); b2.WithOwner() .HasForeignKey("CustomizeWorkshopSettingsId"); @@ -7614,7 +7614,7 @@ namespace CompanyManagment.EFCore.Migrations b1.Navigation("FineAbsenceDayOfWeekCollection"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FridayPay", "FridayPay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettings.FridayPay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.FridayPay", "FridayPay", b1 => { b1.Property("CustomizeWorkshopSettingsid") .HasColumnType("bigint"); @@ -7630,13 +7630,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopSettingsid"); - b1.ToTable("CustomizeWorkshopSettings"); + b1.ToTable("CustomizeWorkshopSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.InsuranceDeduction", "InsuranceDeduction", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettings.InsuranceDeduction#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.InsuranceDeduction", "InsuranceDeduction", b1 => { b1.Property("CustomizeWorkshopSettingsid") .HasColumnType("bigint"); @@ -7653,13 +7653,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopSettingsid"); - b1.ToTable("CustomizeWorkshopSettings"); + b1.ToTable("CustomizeWorkshopSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LateToWork", "LateToWork", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettings.LateToWork#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LateToWork", "LateToWork", b1 => { b1.Property("CustomizeWorkshopSettingsid") .HasColumnType("bigint"); @@ -7676,12 +7676,12 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopSettingsid"); - b1.ToTable("CustomizeWorkshopSettings"); + b1.ToTable("CustomizeWorkshopSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopSettingsid"); - b1.OwnsMany("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LateToWorkTimeFine", "LateToWorkTimeFines", b2 => + b1.OwnsMany("Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettings.LateToWork#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LateToWork.LateToWorkTimeFines#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LateToWorkTimeFine", "LateToWorkTimeFines", b2 => { b2.Property("CustomizeWorkshopSettingsId") .HasColumnType("bigint"); @@ -7703,7 +7703,7 @@ namespace CompanyManagment.EFCore.Migrations b2.HasKey("CustomizeWorkshopSettingsId", "Id"); - b2.ToTable("CustomizeWorkshopSettings_LateToWorkTimeFines"); + b2.ToTable("CustomizeWorkshopSettings_LateToWorkTimeFines", (string)null); b2.WithOwner() .HasForeignKey("CustomizeWorkshopSettingsId"); @@ -7712,7 +7712,7 @@ namespace CompanyManagment.EFCore.Migrations b1.Navigation("LateToWorkTimeFines"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LeavePay", "LeavePay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettings.LeavePay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.LeavePay", "LeavePay", b1 => { b1.Property("CustomizeWorkshopSettingsid") .HasColumnType("bigint"); @@ -7729,13 +7729,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopSettingsid"); - b1.ToTable("CustomizeWorkshopSettings"); + b1.ToTable("CustomizeWorkshopSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.MarriedAllowance", "MarriedAllowance", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettings.MarriedAllowance#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.MarriedAllowance", "MarriedAllowance", b1 => { b1.Property("CustomizeWorkshopSettingsid") .HasColumnType("bigint"); @@ -7752,13 +7752,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopSettingsid"); - b1.ToTable("CustomizeWorkshopSettings"); + b1.ToTable("CustomizeWorkshopSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.NightWorkPay", "NightWorkPay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettings.NightWorkPay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.NightWorkPay", "NightWorkPay", b1 => { b1.Property("CustomizeWorkshopSettingsid") .HasColumnType("bigint"); @@ -7775,13 +7775,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopSettingsid"); - b1.ToTable("CustomizeWorkshopSettings"); + b1.ToTable("CustomizeWorkshopSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.OverTimePay", "OverTimePay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettings.OverTimePay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.OverTimePay", "OverTimePay", b1 => { b1.Property("CustomizeWorkshopSettingsid") .HasColumnType("bigint"); @@ -7798,13 +7798,13 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopSettingsid"); - b1.ToTable("CustomizeWorkshopSettings"); + b1.ToTable("CustomizeWorkshopSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopSettingsid"); }); - b.OwnsOne("_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.ShiftPay", "ShiftPay", b1 => + b.OwnsOne("Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettings.ShiftPay#_0_Framework.Domain.CustomizeCheckoutShared.ValueObjects.ShiftPay", "ShiftPay", b1 => { b1.Property("CustomizeWorkshopSettingsid") .HasColumnType("bigint"); @@ -7827,7 +7827,7 @@ namespace CompanyManagment.EFCore.Migrations b1.HasKey("CustomizeWorkshopSettingsid"); - b1.ToTable("CustomizeWorkshopSettings"); + b1.ToTable("CustomizeWorkshopSettings", (string)null); b1.WithOwner() .HasForeignKey("CustomizeWorkshopSettingsid"); @@ -7936,7 +7936,7 @@ namespace CompanyManagment.EFCore.Migrations .WithMany("SelectedEmployeeDocumentItems") .HasForeignKey("EmployeeDocumentsAdminViewId"); - b.OwnsMany("Company.Domain.EmployeeDocumentItemAgg.EmployeeDocumentItemLog", "ItemLogs", b1 => + b.OwnsMany("Company.Domain.EmployeeDocumentItemAgg.EmployeeDocumentItem.ItemLogs#Company.Domain.EmployeeDocumentItemAgg.EmployeeDocumentItemLog", "ItemLogs", b1 => { b1.Property("id") .ValueGeneratedOnAdd() @@ -8324,7 +8324,7 @@ namespace CompanyManagment.EFCore.Migrations modelBuilder.Entity("Company.Domain.LoanAgg.Entities.Loan", b => { - b.OwnsMany("Company.Domain.LoanAgg.Entities.LoanInstallment", "LoanInstallments", b1 => + b.OwnsMany("Company.Domain.LoanAgg.Entities.Loan.LoanInstallments#Company.Domain.LoanAgg.Entities.LoanInstallment", "LoanInstallments", b1 => { b1.Property("Id") .ValueGeneratedOnAdd() @@ -8358,7 +8358,7 @@ namespace CompanyManagment.EFCore.Migrations b1.HasIndex("LoanId"); - b1.ToTable("LoanInstallment"); + b1.ToTable("LoanInstallment", (string)null); b1.WithOwner() .HasForeignKey("LoanId"); diff --git a/CompanyManagment.EFCore/Repository/CustomizeCheckoutRepository.cs b/CompanyManagment.EFCore/Repository/CustomizeCheckoutRepository.cs index 413f5002..f8ea01bd 100644 --- a/CompanyManagment.EFCore/Repository/CustomizeCheckoutRepository.cs +++ b/CompanyManagment.EFCore/Repository/CustomizeCheckoutRepository.cs @@ -17,7 +17,7 @@ using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; -using AccountMangement.Infrastructure.EFCore; +using _0_Framework.Domain.CustomizeCheckoutShared.Base; using Company.Domain.CustomizeCheckoutAgg.ValueObjects; using CompanyManagment.App.Contracts.EmployeeDocuments; using CompanyManagment.App.Contracts.Fine; @@ -224,45 +224,49 @@ namespace CompanyManagment.EFCore.Repository SalaryAidDateTimeGe = s.SalaryAidDateTime }).ToList(), - LateToWorkValue = x.LateToWorkValue == TimeSpan.Zero ? "-" : $"{(int)x.LateToWorkValue.TotalHours}:{Convert.ToInt32(x.LateToWorkValue.TotalMinutes % 60):00}", - SettingSalary = x.SettingSalary.ToMoney(), - DailyWage = x.DailyWage.ToMoney(), - ShiftStatus = x.ShiftStatus, + LateToWorkValue = x.LateToWorkValue == TimeSpan.Zero ? "-" : $"{(int)x.LateToWorkValue.TotalHours}:{Convert.ToInt32(x.LateToWorkValue.TotalMinutes % 60):00}", - }).ToList(); - List workshopsList = workshopsQuery.Select(x => new WorkshopViewModel - { - WorkshopFullName = x.WorkshopFullName, - Id = x.id - }).ToList(); - List workshopEmployersList = employersQuery.Select(x => new EmployerViewModel - { - Id = x.id, - FullName = x.FullName - }).ToList(); - //List leftWorksList = leftWorksQuery.Select(x => new LeftWorkViewModel - //{ - // EmployeeId = x.EmployeeId, - // WorkshopId = x.WorkshopId, - // Id = x.id, - // StartWorkDateGr = x.StartWorkDate, - // LeftWorkDateGr = x.LeftWorkDate - //}).ToList(); - //List employees = employeesQuery.Select(x => new EmployeeViewModel() - //{ - // Id = x.id, - // FName = x.FName, - // LName = x.LName, - // FatherName = x.FatherName, - // NationalCode = x.NationalCode, - // DateOfBirth = x.DateOfBirth.ToFarsi() - //}).ToList(); - List personnelCodeList = personnelCodesQuery.Select(x => new PersonnelCodeViewModel - { - EmployeeId = x.EmployeeId, - WorkshopId = x.WorkshopId, - PersonnelCode = Convert.ToInt64(x.PersonnelCode) - }).ToList(); + SettingSalary = x.SettingSalary.ToMoney(), + DailyWage = x.DailyWage.ToMoney(), + ShiftStatus = x.ShiftStatus, + IrregularShift = x.IrregularShift, + CustomizeRotatingShifts = x.CustomizeRotatingShifts.ToList(), + RegularShift = x.RegularShifts.Select(s=> (CustomizeSifts)s).ToList() + + }).ToList(); + List workshopsList = workshopsQuery.Select(x => new WorkshopViewModel + { + WorkshopFullName = x.WorkshopFullName, + Id = x.id + }).ToList(); + List workshopEmployersList = employersQuery.Select(x => new EmployerViewModel + { + Id = x.id, + FullName = x.FullName + }).ToList(); + //List leftWorksList = leftWorksQuery.Select(x => new LeftWorkViewModel + //{ + // EmployeeId = x.EmployeeId, + // WorkshopId = x.WorkshopId, + // Id = x.id, + // StartWorkDateGr = x.StartWorkDate, + // LeftWorkDateGr = x.LeftWorkDate + //}).ToList(); + //List employees = employeesQuery.Select(x => new EmployeeViewModel() + //{ + // Id = x.id, + // FName = x.FName, + // LName = x.LName, + // FatherName = x.FatherName, + // NationalCode = x.NationalCode, + // DateOfBirth = x.DateOfBirth.ToFarsi() + //}).ToList(); + List personnelCodeList = personnelCodesQuery.Select(x => new PersonnelCodeViewModel + { + EmployeeId = x.EmployeeId, + WorkshopId = x.WorkshopId, + PersonnelCode = Convert.ToInt64(x.PersonnelCode) + }).ToList(); var date = customizeCheckoutsList.FirstOrDefault(); @@ -302,10 +306,8 @@ namespace CompanyManagment.EFCore.Repository } - - - - public void RemoveEmployeeCustomizeCheckoutInDates(long workshopId, long employeeId, DateTime startOfMonth, DateTime endOfMonth) + + public void RemoveEmployeeCustomizeCheckoutInDates(long workshopId, long employeeId, DateTime startOfMonth, DateTime endOfMonth) { var checkout = _companyContext.CustomizeCheckouts.FirstOrDefault(x => x.WorkshopId == workshopId && x.EmployeeId == employeeId && x.ContractStart.Date <= endOfMonth.Date && x.ContractEnd.Date >= startOfMonth.Date); diff --git a/CompanyManagment.EFCore/Repository/CustomizeCheckoutTempRepository.cs b/CompanyManagment.EFCore/Repository/CustomizeCheckoutTempRepository.cs index 23f8d7a8..82721bdb 100644 --- a/CompanyManagment.EFCore/Repository/CustomizeCheckoutTempRepository.cs +++ b/CompanyManagment.EFCore/Repository/CustomizeCheckoutTempRepository.cs @@ -1,5 +1,6 @@  using _0_Framework.Application; +using _0_Framework.Domain.CustomizeCheckoutShared.Base; using _0_Framework.InfraStructure; using AccountMangement.Infrastructure.EFCore; using Company.Domain.CustomizeCheckoutTempAgg; @@ -360,11 +361,14 @@ namespace CompanyManagment.EFCore.Repository SalaryAidDateTimeGe = s.SalaryAidDateTime }).ToList(), - LateToWorkValue = x.LateToWorkValue == TimeSpan.Zero ? "-" : $"{(int)x.LateToWorkValue.TotalHours}:{Convert.ToInt32(x.LateToWorkValue.TotalMinutes % 60):00}", - SettingSalary = x.SettingSalary.ToMoney(), - DailyWage = x.DailyWage.ToMoney(), - ShiftStatus = x.ShiftStatus, - + //LateToWorkValue = x.LateToWorkValue == TimeSpan.Zero ? "-" : $"{(int)x.LateToWorkValue.TotalHours}:{x.LateToWorkValue.Minutes:D2}" + LateToWorkValue = x.LateToWorkValue == TimeSpan.Zero ? "-" : $"{(int)x.LateToWorkValue.TotalHours}:{Convert.ToInt32(x.LateToWorkValue.TotalMinutes % 60):00}", + SettingSalary = x.SettingSalary.ToMoney(), + DailyWage = x.DailyWage.ToMoney(), + ShiftStatus = x.ShiftStatus, + IrregularShift = x.IrregularShift, + CustomizeRotatingShifts = x.CustomizeRotatingShifts.ToList(), + RegularShift = x.RegularShifts.Select(x => (CustomizeSifts)x).ToList() }).ToList(); diff --git a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs index cd6bd657..db816725 100644 --- a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs +++ b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs @@ -2392,9 +2392,12 @@ CreateWorkingHoursTemp command, bool holidayWorking) LateToWorkValue = totalLateToWorkSpan, SettingSalary = customizeWorkshopEmployeeSettings.Salary, DailyWage = dailyWage, - ShiftStatus = customizeWorkshopEmployeeSettings.WorkshopShiftStatus - - }; + ShiftStatus = customizeWorkshopEmployeeSettings.WorkshopShiftStatus, + IrregularShift = customizeWorkshopEmployeeSettings.IrregularShift, + CustomizeRotatingShifts = customizeWorkshopEmployeeSettings.CustomizeRotatingShifts, + EmployeeSettingsShifts = customizeWorkshopEmployeeSettings.CustomizeWorkshopEmployeeSettingsShifts + .Select(x => (CustomizeSifts)x).ToList(), + }; } private CustomizeCheckoutMandatoryViewModel CheckoutWithoutCalculationForKebabMahdi(long workshopId, long employeeId, DateTime contractStart, DateTime contractEnd) diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/PrintOneCheckoutTemporary.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/PrintOneCheckoutTemporary.cshtml index dabe8f1a..fa12d15d 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/PrintOneCheckoutTemporary.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/PrintOneCheckoutTemporary.cshtml @@ -108,21 +108,63 @@ فیش حقوقی: سال @Model.Year ماه @Model.Month - @* @if (Model.ShiftStatus == WorkshopShiftStatus.Irregular) - { -
-
12 ساعت کار 24 ساعت استراحت
-
17:00 الی 00:30
-
- } - else - { -
-
09:00 الی 17:00
-
17:00 الی 00:30
-
-
-
- } *@ + @if (Model.ShiftStatus == WorkshopShiftStatus.Irregular) + { + string type = Model.IrregularShift.WorkshopIrregularShifts switch + { + WorkshopIrregularShifts.TwelveTwentyFour => "12 ساعت کار 24 ساعت استراحت", + WorkshopIrregularShifts.TwelveThirtySix => "12 ساعت کار 24 ساعت استراحت", + WorkshopIrregularShifts.TwentyFourFortyEight => "24 ساعت کار 48 ساعت استراحت", + WorkshopIrregularShifts.TwentyFourTwentyFour => "24 ساعت کار 24 ساعت استراحت", + _ => "" + }; + string time = $"{Model.IrregularShift.StartTime:HH:mm} الی {Model.IrregularShift.EndTime:HH:mm}"; +
+
@type
+
@time
+
+ } + else + { +
+ @if (Model.ShiftStatus == WorkshopShiftStatus.Regular) + { + @for (int i = 0; i < 3; i++) + { + if (i >= 0 && i < Model.RegularShift.Count) + { + string time = $"{Model.RegularShift[i].StartTime:HH:mm} الی {Model.RegularShift[i].EndTime:HH:mm}"; +
@time
+ } + else + { +
-
+ } + + } + } + else if (Model.ShiftStatus == WorkshopShiftStatus.Rotating) + { + @for (int i = 0; i < 3; i++) + { + if (i >= 0 && i < Model.CustomizeRotatingShifts.Count) + { + string time = $"{Model.CustomizeRotatingShifts[i].StartTime:HH:mm} الی {Model.CustomizeRotatingShifts[i].EndTime:HH:mm}"; +
@time
+ } + else + { +
-
+ } + + } + } + + + @*
17:00 الی 00:30
+
-
*@ +
+ } diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/PrintOneCheckoutUnofficial.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/PrintOneCheckoutUnofficial.cshtml index fe9d00d7..edd16f33 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/PrintOneCheckoutUnofficial.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/PrintOneCheckoutUnofficial.cshtml @@ -6,40 +6,40 @@ @{ - string clientVersion = _0_Framework.Application.Version.StyleVersion; - int indexTable = 0; + string clientVersion = _0_Framework.Application.Version.StyleVersion; + int indexTable = 0; int indexSalaryAid = 0; - int indexLoan = 0; - int indexReward = 0; + int indexLoan = 0; + int indexReward = 0; - + @@media print { + #printSize { + width: 20cm !important; + margin: 3mm 0 0 4mm !important; + } + } + }
@@ -64,14 +64,14 @@
- @if (string.IsNullOrWhiteSpace(Model.EmployeePicture)) - { - عکس - } - else - { - عکس - } + @if (string.IsNullOrWhiteSpace(Model.EmployeePicture)) + { + عکس + } + else + { + عکس + }
@@ -110,21 +110,63 @@ فیش حقوقی: سال @Model.Year ماه @Model.Month - @* @if (Model.ShiftStatus == WorkshopShiftStatus.Irregular) + @if (Model.ShiftStatus == WorkshopShiftStatus.Irregular) { + string type = Model.IrregularShift.WorkshopIrregularShifts switch + { + WorkshopIrregularShifts.TwelveTwentyFour => "12 ساعت کار 24 ساعت استراحت", + WorkshopIrregularShifts.TwelveThirtySix => "12 ساعت کار 24 ساعت استراحت", + WorkshopIrregularShifts.TwentyFourFortyEight => "24 ساعت کار 48 ساعت استراحت", + WorkshopIrregularShifts.TwentyFourTwentyFour => "24 ساعت کار 24 ساعت استراحت", + _ => "" + }; + string time = $"{Model.IrregularShift.StartTime:HH:mm} الی {Model.IrregularShift.EndTime:HH:mm}";
-
12 ساعت کار 24 ساعت استراحت
-
17:00 الی 00:30
+
@type
+
@time
} else {
-
09:00 الی 17:00
-
17:00 الی 00:30
-
-
+ @if (Model.ShiftStatus == WorkshopShiftStatus.Regular) + { + @for (int i = 0; i < 3; i++) + { + if (i >= 0 && i < Model.RegularShift.Count) + { + string time = $"{Model.RegularShift[i].StartTime:HH:mm} الی {Model.RegularShift[i].EndTime:HH:mm}"; +
@time
+ } + else + { +
-
+ } + + } + } + else if (Model.ShiftStatus == WorkshopShiftStatus.Rotating) + { + @for (int i = 0; i < 3; i++) + { + if (i >= 0 && i < Model.CustomizeRotatingShifts.Count) + { + string time = $"{Model.CustomizeRotatingShifts[i].StartTime:HH:mm} الی {Model.CustomizeRotatingShifts[i].EndTime:HH:mm}"; +
@time
+ } + else + { +
-
+ } + + } + } + + + @*
17:00 الی 00:30
+
-
*@
- } *@ + } @@ -132,7 +174,7 @@ -
+
@@ -723,7 +765,7 @@ - + @@ -739,10 +781,10 @@
- +
-
+
diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_Partials/PrintDetailsCheckoutTemporaryRaw.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_Partials/PrintDetailsCheckoutTemporaryRaw.cshtml index d76702e0..0d969e5b 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_Partials/PrintDetailsCheckoutTemporaryRaw.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_Partials/PrintDetailsCheckoutTemporaryRaw.cshtml @@ -85,21 +85,63 @@
فیش حقوقی: سال @Model.Year ماه @Model.Month - @* @if (Model.ShiftStatus == WorkshopShiftStatus.Irregular) + @if (Model.ShiftStatus == WorkshopShiftStatus.Irregular) { -
-
12 ساعت کار 24 ساعت استراحت
-
17:00 الی 00:30
-
+ string type = Model.IrregularShift.WorkshopIrregularShifts switch + { + WorkshopIrregularShifts.TwelveTwentyFour => "12 ساعت کار 24 ساعت استراحت", + WorkshopIrregularShifts.TwelveThirtySix => "12 ساعت کار 24 ساعت استراحت", + WorkshopIrregularShifts.TwentyFourFortyEight => "24 ساعت کار 48 ساعت استراحت", + WorkshopIrregularShifts.TwentyFourTwentyFour => "24 ساعت کار 24 ساعت استراحت", + _ => "" + }; + string time = $"{Model.IrregularShift.StartTime:HH:mm} الی {Model.IrregularShift.EndTime:HH:mm}"; +
+
@type
+
@time
+
} else { -
-
09:00 الی 17:00
-
17:00 الی 00:30
-
-
-
- } *@ +
+ @if (Model.ShiftStatus == WorkshopShiftStatus.Regular) + { + @for (int i = 0; i < 3; i++) + { + if (i >= 0 && i < Model.RegularShift.Count) + { + string time = $"{Model.RegularShift[i].StartTime:HH:mm} الی {Model.RegularShift[i].EndTime:HH:mm}"; +
@time
+ } + else + { +
-
+ } + + } + } + else if (Model.ShiftStatus == WorkshopShiftStatus.Rotating) + { + @for (int i = 0; i < 3; i++) + { + if (i >= 0 && i < Model.CustomizeRotatingShifts.Count) + { + string time = $"{Model.CustomizeRotatingShifts[i].StartTime:HH:mm} الی {Model.CustomizeRotatingShifts[i].EndTime:HH:mm}"; +
@time
+ } + else + { +
-
+ } + + } + } + + + @*
17:00 الی 00:30
+
-
*@ +
+ }
diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_Partials/PrintDetailsCheckoutUnofficialRaw.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_Partials/PrintDetailsCheckoutUnofficialRaw.cshtml index d82faf59..b4ad3658 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_Partials/PrintDetailsCheckoutUnofficialRaw.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_Partials/PrintDetailsCheckoutUnofficialRaw.cshtml @@ -84,21 +84,63 @@ فیش حقوقی: سال @Model.Year ماه @Model.Month - @* @if (Model.ShiftStatus == WorkshopShiftStatus.Irregular) + @if (Model.ShiftStatus == WorkshopShiftStatus.Irregular) { -
-
12 ساعت کار 24 ساعت استراحت
-
17:00 الی 00:30
-
+ string type = Model.IrregularShift.WorkshopIrregularShifts switch + { + WorkshopIrregularShifts.TwelveTwentyFour => "12 ساعت کار 24 ساعت استراحت", + WorkshopIrregularShifts.TwelveThirtySix => "12 ساعت کار 24 ساعت استراحت", + WorkshopIrregularShifts.TwentyFourFortyEight => "24 ساعت کار 48 ساعت استراحت", + WorkshopIrregularShifts.TwentyFourTwentyFour => "24 ساعت کار 24 ساعت استراحت", + _ => "" + }; + string time = $"{Model.IrregularShift.StartTime:HH:mm} الی {Model.IrregularShift.EndTime:HH:mm}"; +
+
@type
+
@time
+
} else { -
-
09:00 الی 17:00
-
17:00 الی 00:30
-
-
-
- } *@ +
+ @if (Model.ShiftStatus == WorkshopShiftStatus.Regular) + { + @for (int i = 0; i < 3; i++) + { + if (i >= 0 && i < Model.RegularShift.Count) + { + string time = $"{Model.RegularShift[i].StartTime:HH:mm} الی {Model.RegularShift[i].EndTime:HH:mm}"; +
@time
+ } + else + { +
-
+ } + + } + } + else if (Model.ShiftStatus == WorkshopShiftStatus.Rotating) + { + @for (int i = 0; i < 3; i++) + { + if (i >= 0 && i < Model.CustomizeRotatingShifts.Count) + { + string time = $"{Model.CustomizeRotatingShifts[i].StartTime:HH:mm} الی {Model.CustomizeRotatingShifts[i].EndTime:HH:mm}"; +
@time
+ } + else + { +
-
+ } + + } + } + + + @*
17:00 الی 00:30
+
-
*@ +
+ }