diff --git a/Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs b/Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs index 900e40fb..d40fca9c 100644 --- a/Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs +++ b/Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs @@ -51,6 +51,12 @@ public interface IInsuranceListRepository:IRepository List GetEmployeeInsuranceDataAmonthAgo(DateTime currentMonthStartDate, long workshopId); #endregion + /// + /// بدست آوردن اطلاعات محاسباتی ماه پرسنل برای ویرایش + /// + /// + /// + List GetEmployeeInsuranceDataForEdit(long insuranceListId, DateTime startDate, DateTime endDate); #region client List SearchForClient(InsuranceListSearchModel searchModel); #endregion diff --git a/CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs b/CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs index 9c9b8fb2..f8eade80 100644 --- a/CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs +++ b/CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs @@ -19,7 +19,9 @@ public interface IInsuranceListApplication OperationResult EditEmployeeDetailsInfo(EmployeeDetailsForInsuranceListViewModel command); OperationResult Remove(long id); EditInsuranceList GetDetailsForEdit(long id); - MainEmployeeDetailsViewModel SearchEmployeeListForEditByInsuranceListId(EmployeeForEditInsuranceListSearchModel searchModel); + MainEmployeeDetailsViewModel SearchEmployeeListForEditByInsuranceListId(EmployeeForEditInsuranceListSearchModel searchModel); + + MainEmployeeDetailsViewModel GetEmployeeListForEditByInsuranceListId(EmployeeForEditInsuranceListSearchModel searchModel); double GetRoundValue(double value); OperationResult ConfirmInsuranceList(long id); diff --git a/CompanyManagment.Application/InsuranceListApplication.cs b/CompanyManagment.Application/InsuranceListApplication.cs index 48b1227e..61764a57 100644 --- a/CompanyManagment.Application/InsuranceListApplication.cs +++ b/CompanyManagment.Application/InsuranceListApplication.cs @@ -9,11 +9,13 @@ using Company.Domain.DateSalaryAgg; using Company.Domain.DateSalaryItemAgg; using Company.Domain.EmployeeAgg; using Company.Domain.EmployeeChildrenAgg; +using Company.Domain.EmployeeInsurancListDataAgg; using Company.Domain.empolyerAgg; using Company.Domain.InsuranceEmployeeInfoAgg; using Company.Domain.InsuranceJobItemAgg; using Company.Domain.InsuranceListAgg; using Company.Domain.InsurancWorkshopInfoAgg; +using Company.Domain.LeftWorkAgg; using Company.Domain.LeftWorkInsuranceAgg; using Company.Domain.WorkshopAgg; using CompanyManagment.App.Contracts.DateSalary; @@ -27,6 +29,7 @@ using CompanyManagment.App.Contracts.LeftWorkInsurance; using CompanyManagment.App.Contracts.PersonalContractingParty; using CompanyManagment.App.Contracts.YearlySalary; using CompanyManagment.App.Contracts.YearlySalaryItems; +using CompanyManagment.EFCore.Migrations; using MD.PersianDateTime.Standard; namespace CompanyManagment.Application; @@ -412,7 +415,7 @@ public class InsuranceListApplication: IInsuranceListApplication var workingDays = Tools.GetEmployeeInsuranceWorkingDays(employee.StartWorkDateGr, leftDate, startDateGr,endDateGr, employee.EmployeeId); var leftWorkFa = workingDays.hasLeftWorkInMonth ? employee.LeftWorkDateGr.ToFarsi(): ""; - var startWorkFa = workingDays.startWork.ToFarsi(); + var startWorkFa = employee.StartWorkDateGr.ToFarsi(); //به دست آوردن دستمزد روزانه با توجه به اینکه کارگاه مشاغل مقطوع است یا خیر var dailyWage = searchModel.FixedSalary ? Convert.ToDouble(GetDailyWageFixedSalary(searchModel.Year, workshopId, employee.EmployeeId, startDateGr, endDateGr, employee.JobId, searchModel.Population, searchModel.InsuranceJobId)) @@ -420,28 +423,27 @@ public class InsuranceListApplication: IInsuranceListApplication //بدست آوردن پایه سنوات var baseYears = _insuranceListRepositpry.GetEmployeeInsuranceBaseYear(employee.EmployeeId, workshopId, workingDays.countWorkingDays, startDateGr, endDateGr,workingDays.startWork, workingDays.endWork, workingDays.hasLeftWorkInMonth); - - - + baseYears.baseYear = employee.JobId != 10 || employee.JobId != 16 ? baseYears.baseYear : 0; //جمع مزد روزانه و پایه سنوات - var dailyWagePlusBaseYears = dailyWage + baseYears.baseYear; + var dailyWagePlusBaseYears = dailyWage + baseYears.baseYear; - //دستمزد ماهانه با محاسبه پایه سنوات - var monthlySalary = GetRoundValue(dailyWagePlusBaseYears * workingDays.countWorkingDays); + var monthlySalary = GetRoundValue(dailyWagePlusBaseYears * workingDays.countWorkingDays); //حق تاهل var marriedAllowance = employee.MaritalStatus == "متاهل" ? yearlysaleries.MarriedAllowance : 0; //محاسبه مزایای ماهانه - var monthlyBenefits = GetMonthlyBenefits(endOfMonth, yearlysaleries.ConsumableItems, yearlysaleries.HousingAllowance, marriedAllowance, workingDays.countWorkingDays, searchModel.TypeOfInsuranceSendWorkshop, employee.JobId, employee.EmployeeId); + var monthlyBenefits = GetMonthlyBenefits(endOfMonth, yearlysaleries.ConsumableItems, yearlysaleries.HousingAllowance, marriedAllowance, workingDays.countWorkingDays, searchModel.TypeOfInsuranceSendWorkshop, employee.JobId, employee.EmployeeId,employee.IncludeStatus); - //محاسبه مزایای مشمول مستمر + + //محاسبه جمع مزایای مشمول و دستمزد ماهانه var benefitsIncludedContinuous = monthlyBenefits + monthlySalary; - //محاسبه حق بیمه سهم بیمه شده - var insuranceShare = (benefitsIncludedContinuous * 7) / 100; + //benefitsIncludedContinuous = employee.JobId != 16 ? benefitsIncludedContinuous : 0; + //محاسبه حق بیمه سهم بیمه شده + var insuranceShare = (benefitsIncludedContinuous * 7) / 100; //محاسبه حق بیمه سهم کارفرما var employerShare = (benefitsIncludedContinuous * 20) / 100; @@ -483,7 +485,7 @@ public class InsuranceListApplication: IInsuranceListApplication StartMonthCurrent = startMonthFa, WorkingDays = workingDays.countWorkingDays, StartWorkDate = startWorkFa, - StartWorkDateGr = workingDays.startWork, + StartWorkDateGr = employee.StartWorkDateGr, LeftWorkDate = leftWorkFa, LeftWorkDateGr = workingDays.hasLeftWorkInMonth ? employee.LeftWorkDateGr : null, JobId = employee.JobId, @@ -520,8 +522,8 @@ public class InsuranceListApplication: IInsuranceListApplication //مزایای ماهانه MonthlyBenefits = monthlyBenefits, - //مزایای مشمول - BenefitsIncludedContinuous = benefitsIncludedContinuous, + //جمع مزایای مشمول و دستمزد ماهانه + BenefitsIncludedContinuous = benefitsIncludedContinuous, //مزایای غیر مشمول BenefitsIncludedNonContinuous = benefitsIncludedNonContinuous, @@ -1007,33 +1009,33 @@ public class InsuranceListApplication: IInsuranceListApplication public EditInsuranceList GetDetailsForEdit(long id) { var insuranceListDetails = _insuranceListRepositpry.GetDetailsForEdit(id); - string startMonthCurrent = insuranceListDetails.Year + "/" + insuranceListDetails.Month + "/01"; - string endMonthCurrent = startMonthCurrent.FindeEndOfMonth(); - var dayMonthCurrent = Convert.ToInt32(endMonthCurrent.Substring(8, 2)); - var year = Convert.ToInt32(insuranceListDetails.Year); - var month = Convert.ToInt32(insuranceListDetails.Month); - var day = 1; - var persianCurrentStartDate = new PersianDateTime(year, month, day); - var persianCurrentEndDate = new PersianDateTime(year, month, dayMonthCurrent); + //string startMonthCurrent = insuranceListDetails.Year + "/" + insuranceListDetails.Month + "/01"; + //string endMonthCurrent = startMonthCurrent.FindeEndOfMonth(); + //var dayMonthCurrent = Convert.ToInt32(endMonthCurrent.Substring(8, 2)); + //var year = Convert.ToInt32(insuranceListDetails.Year); + //var month = Convert.ToInt32(insuranceListDetails.Month); + //var day = 1; + //var persianCurrentStartDate = new PersianDateTime(year, month, day); + //var persianCurrentEndDate = new PersianDateTime(year, month, dayMonthCurrent); - var model = new YearlySalarySearchModel(); - model.StartDateGr = startMonthCurrent.ToGeorgianDateTime(); - model.EndDateGr = endMonthCurrent.ToGeorgianDateTime(); - model.year = insuranceListDetails.Year; - var yearSalaryObj = _yearlySalaryApplication.GetDetailsBySearchModel(model); - var yearlysalaryItem = new YearlysalaryItemViewModel(); - var housingAllowance = new YearlysalaryItemViewModel(); - var consumableItems = new YearlysalaryItemViewModel(); - if (yearSalaryObj != null) - { - yearlysalaryItem = _yearlySalaryItemApplication.GetItemsByYearlySalaryId(yearSalaryObj.Id) - .Where(x => x.ItemName == "مزد روزانه").FirstOrDefault(); - housingAllowance = _yearlySalaryItemApplication.GetItemsByYearlySalaryId(yearSalaryObj.Id) - .Where(x => x.ItemName == "کمک هزینه مسکن").FirstOrDefault(); - consumableItems = _yearlySalaryItemApplication.GetItemsByYearlySalaryId(yearSalaryObj.Id) - .Where(x => x.ItemName == "کمک هزینه اقلام").FirstOrDefault(); - } + //var model = new YearlySalarySearchModel(); + //model.StartDateGr = startMonthCurrent.ToGeorgianDateTime(); + //model.EndDateGr = endMonthCurrent.ToGeorgianDateTime(); + //model.year = insuranceListDetails.Year; + //var yearSalaryObj = _yearlySalaryApplication.GetDetailsBySearchModel(model); + //var yearlysalaryItem = new YearlysalaryItemViewModel(); + //var housingAllowance = new YearlysalaryItemViewModel(); + //var consumableItems = new YearlysalaryItemViewModel(); + //if (yearSalaryObj != null) + //{ + // yearlysalaryItem = _yearlySalaryItemApplication.GetItemsByYearlySalaryId(yearSalaryObj.Id) + // .Where(x => x.ItemName == "مزد روزانه").FirstOrDefault(); + // housingAllowance = _yearlySalaryItemApplication.GetItemsByYearlySalaryId(yearSalaryObj.Id) + // .Where(x => x.ItemName == "کمک هزینه مسکن").FirstOrDefault(); + // consumableItems = _yearlySalaryItemApplication.GetItemsByYearlySalaryId(yearSalaryObj.Id) + // .Where(x => x.ItemName == "کمک هزینه اقلام").FirstOrDefault(); + //} return insuranceListDetails; } @@ -1215,7 +1217,7 @@ public class InsuranceListApplication: IInsuranceListApplication .Where(x => x.ItemName == "حق تاهل").FirstOrDefault(); item.HousingAllowance = housingAllowance.ItemValue; item.ConsumableItems = consumableItems.ItemValue; - item.MarriedAllowance = maritalStatus.ItemValue; + //item.MarriedAllowance = maritalStatus.ItemValue; item.YearlySalaryItem = yearlysalaryItem.ItemValue; } @@ -1316,7 +1318,7 @@ public class InsuranceListApplication: IInsuranceListApplication if (item.IncludeStatus) { var marital = employeeObject.MaritalStatus == "متاهل" ? maritalStatus.ItemValue : 0; - item.MonthlyBenefits = GetMonthlyBenefits(dayMonthCurrent, consumableItems.ItemValue, housingAllowance.ItemValue, marital, countWorkingDays, searchModel.TypeOfInsuranceSendWorkshop, item.JobId, item.EmployeeId); + item.MonthlyBenefits = GetMonthlyBenefits(dayMonthCurrent, consumableItems.ItemValue, housingAllowance.ItemValue, marital, countWorkingDays, searchModel.TypeOfInsuranceSendWorkshop, item.JobId, item.EmployeeId, item.IncludeStatus); } else { @@ -1361,6 +1363,149 @@ public class InsuranceListApplication: IInsuranceListApplication } return mainEmployeeDetailsViewModel; } + + public MainEmployeeDetailsViewModel GetEmployeeListForEditByInsuranceListId( + EmployeeForEditInsuranceListSearchModel searchModel) + { + var result = new MainEmployeeDetailsViewModel(); + var workshopId = searchModel.WorkshopIds.FirstOrDefault(); + var startMonthFa = $"{searchModel.Year}/{searchModel.Month}/01"; + DateTime startDateGr = startMonthFa.ToGeorgianDateTime(); + DateTime endDateGr = startMonthFa.FindeEndOfMonth() + .ToGeorgianDateTime(); + int endOfMonth = Convert.ToInt32((startMonthFa.FindeEndOfMonth()).Substring(8, 2)); + + //مقادیر سالانه این تاریخ + var yearlysaleries = _yearlySalaryApplication.GetInsuranceItems(startDateGr, endDateGr, searchModel.Year); + + // دریافت اطلاعات هویتی و شروع و ترک کار کارکنان + //var employeesInfoAndLeftWorks = + // _leftWorkInsuranceApplication.GetEmployeeInsuranceLeftWorksAndInformation(workshopId, startDateGr, + // endDateGr); + + var employeeInsurancDataPreviusList = + _insuranceListRepositpry.GetEmployeeInsuranceDataForEdit(searchModel.InsuranceId,startDateGr,endDateGr); + + var computeResult = employeeInsurancDataPreviusList.Select(employeeData => + { + var dateOfBirth = employeeData.DateOfBirthGr.ToFarsi(); + var dateOfIssue = employeeData.DateOfIssueGr.ToFarsi(); + var leftDate = employeeData.LeftWorkDateGr != null ? employeeData.LeftWorkDateGr.Value.AddDays(-1) : new DateTime(); + var workingDays = Tools.GetEmployeeInsuranceWorkingDays(employeeData.StartWorkDateGr, leftDate, startDateGr, endDateGr, employeeData.EmployeeId); + var leftWorkFa = workingDays.hasLeftWorkInMonth ? employeeData.LeftWorkDateGr.ToFarsi() : ""; + var startWorkFa = employeeData.StartWorkDateGr.ToFarsi(); + + //محاسبه حق بیمه سهم کارفرما + var employerShare = (employeeData.BenefitsIncludedContinuous * 20) / 100; + + // محاسبه بیمه بیکاری + var unEmploymentInsurance = (employeeData.BenefitsIncludedContinuous * 3) / 100; + return new EmployeeDetailsForInsuranceListViewModel + { + #region EmployeeInfo + EmployeeInsurancListDataId = employeeData.EmployeeInsurancListDataId, + + InsuranceEmployeeInformationId = employeeData.InsuranceEmployeeInformationId, + EmployeeId = employeeData.EmployeeId, + FName = employeeData.FName, + LName = employeeData.LName, + FatherName = employeeData.FatherName, + DateOfBirth = dateOfBirth == "1300/10/11" ? "" : dateOfBirth, + DateOfIssue = dateOfIssue, + DateOfBirthGr = employeeData.DateOfBirthGr, + DateOfIssueGr = employeeData.DateOfIssueGr, + PlaceOfIssue = employeeData.PlaceOfIssue, + IdNumber = employeeData.IdNumber, + Gender = employeeData.Gender, + NationalCode = employeeData.NationalCode, + Nationality = employeeData.Nationality, + InsuranceCode = employeeData.InsuranceCode, + // آیا وضعیت تاهل پرسنل ست شده است + IsMaritalStatusSet = !string.IsNullOrWhiteSpace(employeeData.MaritalStatus), + MaritalStatus = employeeData.MaritalStatus, + + StartMonthCurrent = startMonthFa, + WorkingDays = workingDays.countWorkingDays, + StartWorkDate = startWorkFa, + StartWorkDateGr = employeeData.StartWorkDateGr, + LeftWorkDate = leftWorkFa, + LeftWorkDateGr = workingDays.hasLeftWorkInMonth ? employeeData.LeftWorkDateGr : null, + JobId = employeeData.JobId, + JobName = employeeData.JobName, + JobCode = employeeData.JobCode, + + HasStartWorkInMonth = workingDays.hasStartWorkInMonth, + HasLeftWorkInMonth = workingDays.hasLeftWorkInMonth, + #endregion + + #region Compute + //مشمول مزایا بودن + IncludeStatus = employeeData.IncludeStatus, + + //دستمزد روزانه + DailyWage = GetRoundValue(employeeData.DailyWage), + DailyWageStr = employeeData.DailyWage.ToMoney(), + + //HasConfilictJobs = dailyWage == 0, + + //پایه سنوات + BaseYears = employeeData.BaseYears, + + //مجموع مزد روزانه و پایه سنوات + DailyWagePlusBaseYears = employeeData.DailyWagePlusBaseYears, + + //حق تاهل + MarriedAllowance = employeeData.MarriedAllowance, + + //دستمزد ماهانه + MonthlySalary = employeeData.MonthlySalary, + + + //مزایای ماهانه + MonthlyBenefits = employeeData.MonthlyBenefits, + + //مزایای مشمول + BenefitsIncludedContinuous = employeeData.BenefitsIncludedContinuous, + + //مزایای غیر مشمول + BenefitsIncludedNonContinuous = employeeData.BenefitsIncludedNonContinuous, + + // جمع کل دستمزد و مزایای ماهانه مشمول و غیر مشمول + IncludedAndNotIncluded = employeeData.IncludedAndNotIncluded, + + //حق بیمه سهم بیمه شده + InsuranceShare = GetRoundValue(employeeData.InsuranceShare), + + //حق بیمه سهم کارفرما + EmployerShare = GetRoundValue(employerShare), + + //بیمه بیکاری + UnEmploymentInsurance = GetRoundValue(unEmploymentInsurance), + + //کمک هزینه مسکن + HousingAllowance = yearlysaleries.HousingAllowance, + //کمک هزینه اقلام + ConsumableItems = yearlysaleries.ConsumableItems, + + EndMonthCurrentDay = endOfMonth, + YearlySalaryItem = yearlysaleries.DayliWage, + MonthlyBaseYearsStr = "0", + MonthlyBaseYears = 0, + #endregion + + + }; + }); + + result.EmployeeDetailsForInsuranceList = computeResult.OrderByDescending(x => x.HasLeftWorkInMonth).ThenByDescending(x => x.HasStartWorkInMonth) + .ThenBy(x => x.LName).ToList(); + + result.IsExist = false; + result.MaritalStatus = yearlysaleries.MarriedAllowance; + + return result; + } + public OperationResult ConfirmInsuranceList(long id) { OperationResult result = new OperationResult(); @@ -1471,7 +1616,7 @@ public class InsuranceListApplication: IInsuranceListApplication } /// - /// محاسبه مزایای ماهانه + /// محاسبه مزایای ماهانه مشمول /// /// /// @@ -1482,15 +1627,22 @@ public class InsuranceListApplication: IInsuranceListApplication /// /// /// - private double GetMonthlyBenefits(int endMonthCurrentDay, double consumableItemsItemValue, double housingAllowanceItemValue,double maritalStatus, int countWorkingDays, string typeOfInsuranceSendWorkshop, long jobId,long employeeId) + private double GetMonthlyBenefits(int endMonthCurrentDay, double consumableItemsItemValue, double housingAllowanceItemValue,double maritalStatus, int countWorkingDays, string typeOfInsuranceSendWorkshop, long jobId,long employeeId,bool includeStatus) { + //ToDo + //افزودن شرط مشمول مزایای + //اگر پرسنل کارفرما بود و نوع لیست کارگاه کمک دولت بود مزایا محاسبه نشود - if (typeOfInsuranceSendWorkshop == "Govermentlist" && jobId == 10) + if (jobId == 10 && !includeStatus) return 0; //پرسنل استثناء if (employeeId == 42783) return 53082855; + //اگر تیک مشمول مزایا در ترک کار خاموش بود مزایا نگیرد + if (jobId == 16 && !includeStatus) + return 0; + //مزایای ماهانه با توجه به پایان ماه که 30 یا 31 روزه است، متفاوت می باشد //برای ماه 29 روزه هم تقسیم بر 30 می شود. if (countWorkingDays == endMonthCurrentDay) @@ -1505,7 +1657,9 @@ public class InsuranceListApplication: IInsuranceListApplication return GetRoundValue(((consumableItemsItemValue + housingAllowanceItemValue + maritalStatus) / endMonthCurrentDay) * countWorkingDays); } - private double ComputeDailyWage(double yearlysalaryItemValue, long employeeId, long workshopId, string year) + + + private double ComputeDailyWage(double yearlysalaryItemValue, long employeeId, long workshopId, string year) { double dailyWage = yearlysalaryItemValue; InsuranceListSearchModel searchModel = new InsuranceListSearchModel(); @@ -1750,7 +1904,7 @@ public class InsuranceListApplication: IInsuranceListApplication if (item.IncludeStatus) { var marital = employeeObject.MaritalStatus == "متاهل" ? maritalStatus.ItemValue : 0; - employeeDetailsForInsuranceObj.MonthlyBenefits = GetMonthlyBenefits(endMonthCurrentDay, consumableItems.ItemValue, housingAllowance.ItemValue, marital, countWorkingDays, searchModel.TypeOfInsuranceSendWorkshop, item.JobId, item.EmployeeId); + employeeDetailsForInsuranceObj.MonthlyBenefits = GetMonthlyBenefits(endMonthCurrentDay, consumableItems.ItemValue, housingAllowance.ItemValue, marital, countWorkingDays, searchModel.TypeOfInsuranceSendWorkshop, item.JobId, item.EmployeeId, item.IncludeStatus); } else { diff --git a/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs b/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs index 51b0f918..f9603c8d 100644 --- a/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs +++ b/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Text.RegularExpressions; using _0_Framework.Application; using _0_Framework.InfraStructure; +using Company.Domain.EmployeeAgg; using Company.Domain.EmployeeChildrenAgg; using Company.Domain.EmployeeInsurancListDataAgg; using Company.Domain.InsuranceListAgg; @@ -255,6 +256,10 @@ public class InsuranceListRepository : RepositoryBase, IIns if(item.LeftWorkDate!=null) employeeInsurancListData.StrLeftWorkDate = item.LeftWorkDate.ToFarsi(); + + employeeInsurancListData.MarriedAllowance = item.MarriedAllowance; + employeeInsurancListData.BaseYears = item.BaseYears; + employeeInsurancListData.BenefitsIncludedNonContinuous = item.BenefitsIncludedNonContinuous; employeeInsurancListDataViewModelList.Add(employeeInsurancListData); } @@ -306,6 +311,9 @@ public class InsuranceListRepository : RepositoryBase, IIns employeeDetails.StartWorkDateGr = employeeInsurancListData.StartWorkDate; employeeDetails.LeftWorkDateGr = employeeInsurancListData.LeftWorkDate; employeeDetails.EmployeeInsurancListDataId = employeeInsurancListData.EmployeeInsurancListDataId; + + employeeDetails.MarriedAllowance = employeeInsurancListData.MarriedAllowance; + employeeDetails.BaseYears = employeeInsurancListData.BaseYears; employeeDetailsForInsuranceList.Add(employeeDetails); } @@ -860,6 +868,9 @@ public class InsuranceListRepository : RepositoryBase, IIns //// حقوق و مزایای ماهیانه مشمول و غیر مشمول ** employeeInsurancListData.IncludedAndNotIncluded = item.BenefitsIncludedContinuous; + employeeInsurancListData.BaseYears = item.BaseYears; + employeeInsurancListData.MarriedAllowance = item.MarriedAllowance; + ////employeeInsurancListData.IncludedAndNotIncluded = item.MonthlyBenefitsIncluded + item.BenefitsIncludedNonContinuous; //سهم بیمه حق کارگر employeeInsurancListData.InsuranceShare = item.InsuranceShare; @@ -1191,13 +1202,21 @@ public class InsuranceListRepository : RepositoryBase, IIns .Where(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId).Select(x=> new { startWork = x.StartWorkDate, - leftWork = x.LeftWorkDate == null ? listEndDate : x.LeftWorkDate.Value, + leftWork = x.LeftWorkDate == null ? listStartDate : x.LeftWorkDate.Value, }).OrderBy(x=>x.startWork).ToList(); int countDay = 0; foreach (var left in lefts) { var start = left.startWork.ToPersianDateTime(); var end = left.leftWork.ToPersianDateTime(); + //شمارش فقط تا روز قبل از شروع لیست انجام شود + if (left.leftWork >= listStartDate) + { + var endBeforStartList = new DateTime(listStartDate.Year, listStartDate.Month, listStartDate.Day); + end = endBeforStartList.AddDays(-1).ToPersianDateTime(); + } + + var count = (int)(end - start).TotalDays +1; countDay += count; } @@ -1253,4 +1272,151 @@ public class InsuranceListRepository : RepositoryBase, IIns return res.ToList(); } + + + public List GetEmployeeInsuranceDataForEdit(long insuranceListId, DateTime startDate, DateTime endDate) + { + + var res = _context.EmployeeInsurancListDataSet + .Where(x => x.InsuranceListId == insuranceListId) + .Join(_context.LeftWorkInsuranceList + .Where(x => + ((x.LeftWorkDate != null && x.LeftWorkDate != DateTime.MinValue) && + ((DateTime)x.LeftWorkDate >= startDate && + (DateTime)x.LeftWorkDate <= endDate)) || + ((x.LeftWorkDate != null && x.LeftWorkDate != DateTime.MinValue) && + (DateTime)x.LeftWorkDate >= endDate) || + (x.LeftWorkDate == null || x.LeftWorkDate == DateTime.MinValue)) + .Where(x => x.StartWorkDate <= endDate) + .Include(x => x.Employee), + employeeData => employeeData.EmployeeId, + leftwork => leftwork.EmployeeId, + (employeeData, leftwork) => new { employeeData, leftwork }) + .Join(_context.Jobs, + result => result.leftwork.JobId, + job => job.id, + (result, job) => new { result, job }) + .GroupJoin(_context.InsuranceEmployeeInformationSet.AsSplitQuery(), + allResult => allResult.result.employeeData.EmployeeId, + employeeInfo => employeeInfo.EmployeeId, + (allResult, employeeInfo) => new + { + allResult.result, + allResult.job, + employeeInfo + }) + .SelectMany(x => x.employeeInfo.DefaultIfEmpty(), (x, employeeInfo) => new { x, employeeInfo }) + .Select(result => new EmployeeDetailsForInsuranceListViewModel + { + StartWorkDateNew = result.x.result.leftwork.StartWorkDate, + LeftWorkDateNew = result.x.result.leftwork.LeftWorkDate, + JobIdNew = result.x.result.leftwork.JobId, + + + StartWorkDateGr = result.x.result.leftwork.StartWorkDate, + LeftWorkDateGr = result.x.result.leftwork.LeftWorkDate, + IncludeStatus = result.x.result.employeeData.IncludeStatus, + JobId = result.x.result.employeeData.JobId, + JobName = result.x.job != null ? result.x.job.JobName : string.Empty, + JobCode = result.x.job != null ? result.x.job.JobCode : string.Empty, + InsuranceEmployeeInformationId = result.employeeInfo != null ? result.employeeInfo.id : 0, + EmployeeId = result.x.result.employeeData.EmployeeId, + + //اطلاعات هویتی + FName = result.employeeInfo != null ? result.employeeInfo.FName : result.x.result.leftwork.Employee.FName, + LName = result.employeeInfo != null ? result.employeeInfo.LName : result.x.result.leftwork.Employee.LName, + FatherName = result.employeeInfo != null ? result.employeeInfo.FatherName : result.x.result.leftwork.Employee.FatherName, + DateOfBirthGr = result.employeeInfo != null ? result.employeeInfo.DateOfBirth : result.x.result.leftwork.Employee.DateOfBirth, + DateOfIssueGr = result.employeeInfo != null ? result.employeeInfo.DateOfIssue : result.x.result.leftwork.Employee.DateOfIssue, + PlaceOfIssue = result.employeeInfo != null ? result.employeeInfo.PlaceOfIssue : result.x.result.leftwork.Employee.PlaceOfIssue, + IdNumber = result.employeeInfo != null ? result.employeeInfo.IdNumber : result.x.result.leftwork.Employee.IdNumber, + Gender = result.employeeInfo != null ? result.employeeInfo.Gender : result.x.result.leftwork.Employee.Gender, + NationalCode = result.x.result.leftwork.Employee.NationalCode, + Nationality = result.x.result.leftwork.Employee.Nationality, + InsuranceCode = result.x.result.leftwork.Employee.InsuranceCode, + MaritalStatus = result.x.result.leftwork.Employee.MaritalStatus, + IsMaritalStatusSet = !string.IsNullOrWhiteSpace(result.x.result.leftwork.Employee.MaritalStatus), + + //اطاعات محاسباتی + EmployeeInsurancListDataId = result.x.result.employeeData.id, + DailyWage = result.x.result.employeeData.DailyWage, + // LeftWorkDateGr = x.LeftWorkDate, + // StartWorkDateGr = x.StartWorkDate, + MonthlyBenefitsIncluded = result.x.result.employeeData.MonthlyBenefitsIncluded, + // JobId = x.JobId, + WorkingDays = result.x.result.employeeData.WorkingDays, + //پایه سنوات + BaseYears = result.x.result.employeeData.BaseYears, + + //مجموع مزد روزانه و پایه سنوات + DailyWagePlusBaseYears = result.x.result.employeeData.DailyWagePlusBaseYears, + + //حق تاهل + MarriedAllowance = result.x.result.employeeData.MarriedAllowance, + + //دستمزد ماهانه + MonthlySalary = result.x.result.employeeData.MonthlySalary, + + + //مزایای ماهانه + MonthlyBenefits = result.x.result.employeeData.MonthlyBenefits, + + //مزایای مشمول + BenefitsIncludedContinuous = result.x.result.employeeData.MonthlyBenefitsIncluded, + + //مزایای غیر مشمول + BenefitsIncludedNonContinuous = result.x.result.employeeData.BenefitsIncludedNonContinuous, + + // جمع کل دستمزد و مزایای ماهانه مشمول و غیر مشمول + IncludedAndNotIncluded = result.x.result.employeeData.BenefitsIncludedContinuous, + + //حق بیمه سهم بیمه شده + InsuranceShare = result.x.result.employeeData.InsuranceShare, + }); + + + //.Select(x => new EmployeeDetailsForInsuranceListViewModel + //{ + // EmployeeInsurancListDataId = x.id, + // EmployeeId = x.EmployeeId, + // IncludeStatus = x.IncludeStatus, + // DailyWage = x.DailyWage, + // LeftWorkDateGr = x.LeftWorkDate, + // StartWorkDateGr = x.StartWorkDate, + // MonthlyBenefitsIncluded = x.MonthlyBenefitsIncluded, + // JobId = x.JobId, + // WorkingDays = x.WorkingDays, + // //پایه سنوات + // BaseYears = x.BaseYears, + + // //مجموع مزد روزانه و پایه سنوات + // DailyWagePlusBaseYears = x.DailyWagePlusBaseYears, + + // //حق تاهل + // MarriedAllowance = x.MarriedAllowance, + + // //دستمزد ماهانه + // MonthlySalary = x.MonthlySalary, + + + // //مزایای ماهانه + // MonthlyBenefits = x.MonthlyBenefits, + + // //مزایای مشمول + // BenefitsIncludedContinuous = x.BenefitsIncludedContinuous, + + // //مزایای غیر مشمول + // BenefitsIncludedNonContinuous = x.BenefitsIncludedNonContinuous, + + // // جمع کل دستمزد و مزایای ماهانه مشمول و غیر مشمول + // IncludedAndNotIncluded = x.BenefitsIncludedContinuous + x.BenefitsIncludedNonContinuous, + + // //حق بیمه سهم بیمه شده + // InsuranceShare = x.InsuranceShare, + + + //}); + + return res.ToList(); + } } \ No newline at end of file diff --git a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Create.cshtml b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Create.cshtml index cdd73980..fb452189 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Create.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Create.cshtml @@ -18,7 +18,6 @@ height: 582px !important; } } - } @@ -88,10 +87,10 @@
-
+ @*
کپی از آخرین لیست ارسالی -
+
*@
@@ -152,7 +151,7 @@
- +
@@ -1058,7 +1057,7 @@ $('#txtSumOfMarriedAllowance').val(response.sumOfMarriedAllowance); $('#txtSumOfDailyWagePlusBaseYears').val(response.sumOfDailyWagePlusBaseYears); $('#txtSumOfBenefitsIncludedNonContinuous').val(response.sumOfBenefitsIncludedNonContinuous); - console.log(response.sumOfDailyWagePlusBaseYears); + console.log(response.sumOfBenefitsIncludedNonContinuous); }, failure: function (response) { diff --git a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Edit.cshtml b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Edit.cshtml index 3e794f49..651271dc 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Edit.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Edit.cshtml @@ -89,10 +89,10 @@
-
+@*
کپی از آخرین لیست ارسالی -
+
*@
@@ -137,54 +137,78 @@
-
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
- - + +
+
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - + +
+
-
- - -
-
+ +
+ + +
+
منتظر بمانید
@@ -632,55 +656,55 @@ var employeeId = $(this).attr("data-employeeid"); if (employeeId == id) { - $(this).find('td:eq(1)').text($('#LeftWorkDate').val()); - $(this).find('td:eq(2)').text($('#StartWorkDate').val()); - $(this).find('td:eq(3)').text(jobName); - $(this).find('td:eq(4)').text($('#InsuranceShare').val()); - var monthlySalary = getNumberValue($('#MonthlySalary').val()); - var benefitsIncludedContinuous = getNumberValue($('#BenefitsIncludedContinuous').val()); - var benefitsIncluded = Number(monthlySalary) + Number(benefitsIncludedContinuous); - var sumIncludedNon = 0; + // $(this).find('td:eq(1)').text($('#LeftWorkDate').val()); + // $(this).find('td:eq(2)').text($('#StartWorkDate').val()); + // $(this).find('td:eq(3)').text(jobName); + // $(this).find('td:eq(4)').text($('#InsuranceShare').val()); + // var monthlySalary = getNumberValue($('#MonthlySalary').val()); + // var benefitsIncludedContinuous = getNumberValue($('#BenefitsIncludedContinuous').val()); + // var benefitsIncluded = Number(monthlySalary) + Number(benefitsIncludedContinuous); + // var sumIncludedNon = 0; - if ($('#BenefitsIncludedNonContinuous').val() != '') { - var benefitsIncludedNonContinuous = getNumberValue($('#BenefitsIncludedNonContinuous').val()); - sumIncludedNon = benefitsIncluded; - sumIncludedNon = benefitsIncluded + Number(benefitsIncludedNonContinuous); - $(this).find('td:eq(5)').text(sumIncludedNon.toLocaleString()); - $(this).find('td:eq(5)').attr("data-benefitsincludednoncontinuous", benefitsIncludedNonContinuous); - } else { - sumIncludedNon = benefitsIncluded; - $(this).find('td:eq(5)').text(sumIncludedNon.toLocaleString()); - } + // if ($('#BenefitsIncludedNonContinuous').val() != '') { + // var benefitsIncludedNonContinuous = getNumberValue($('#BenefitsIncludedNonContinuous').val()); + // sumIncludedNon = benefitsIncluded; + // sumIncludedNon = benefitsIncluded + Number(benefitsIncludedNonContinuous); + // $(this).find('td:eq(5)').text(sumIncludedNon.toLocaleString()); + // $(this).find('td:eq(5)').attr("data-benefitsincludednoncontinuous", benefitsIncludedNonContinuous); + // } else { + // sumIncludedNon = benefitsIncluded; + // $(this).find('td:eq(5)').text(sumIncludedNon.toLocaleString()); + // } - $(this).find('td:eq(5)').attr("data-includedandnotincluded", sumIncludedNon); - var insuranceshare = getRoundValue((benefitsIncluded * 7) / 100); - var employershare = getRoundValue((benefitsIncluded * 20) / 100); - var unemploymentinsurance = getRoundValue((benefitsIncluded * 3) / 100); - $(this).find('td:eq(6)').text(benefitsIncluded.toLocaleString()); - $(this).find('td:eq(6)').attr('data-benefitsincludedcontinuous', benefitsIncluded); + // $(this).find('td:eq(5)').attr("data-includedandnotincluded", sumIncludedNon); + // var insuranceshare = getRoundValue((benefitsIncluded * 7) / 100); + // var employershare = getRoundValue((benefitsIncluded * 20) / 100); + // var unemploymentinsurance = getRoundValue((benefitsIncluded * 3) / 100); + // $(this).find('td:eq(6)').text(benefitsIncluded.toLocaleString()); + // $(this).find('td:eq(6)').attr('data-benefitsincludedcontinuous', benefitsIncluded); - $(this).find('td:eq(7)').text($('#BenefitsIncludedContinuous').val()); - $(this).find('td:eq(7)').attr('data-monthlybenefits', benefitsIncludedContinuous); + // $(this).find('td:eq(7)').text($('#BenefitsIncludedContinuous').val()); + // $(this).find('td:eq(7)').attr('data-monthlybenefits', benefitsIncludedContinuous); - $(this).find('td:eq(8)').text($('#MonthlySalary').val()); - $(this).find('td:eq(8)').attr("data-monthlysalary", monthlySalary); + // $(this).find('td:eq(8)').text($('#MonthlySalary').val()); + // $(this).find('td:eq(8)').attr("data-monthlysalary", monthlySalary); - $(this).find('td:eq(9)').text($('#DailyWage').val()); - $(this).find('td:eq(9)').attr("data-dailywage", getNumberValue($('#DailyWage').val())); + // $(this).find('td:eq(11)').text($('#DailyWage').val()); + // $(this).find('td:eq(11)').attr("data-dailywage", getNumberValue($('#DailyWage').val())); - $(this).find('td:eq(10)').text($('#WorkingDays').val()); - $(this).find('td:eq(4)').attr('data-insuranceshare', insuranceshare); - $(this).find('td:eq(4)').attr('data-employershare', employershare); - $(this).find('td:eq(4)').attr('data-unemploymentinsurance', unemploymentinsurance); - $(this).find('td:eq(11)').text($('#IdNumber').val()); - $(this).find('td:eq(12)').text($('#DateOfBirth').val()); - $(this).find('td:eq(13)').text($('#PlaceOfIssue').val()); - $(this).find('td:eq(14)').text($('#NationalCode').val()); - $(this).find('td:eq(15)').text($('#FatherName').val()); - $(this).find('td:eq(16)').text($('#Gender').val()); - $(this).find('td:eq(17)').text($('#LName').val()); - $(this).find('td:eq(18)').text($('#FName').val()); - $(this).find('td:eq(19)').text($('#InsuranceCode').val()); + // $(this).find('td:eq(12)').text($('#WorkingDays').val()); + // $(this).find('td:eq(4)').attr('data-insuranceshare', insuranceshare); + // $(this).find('td:eq(4)').attr('data-employershare', employershare); + // $(this).find('td:eq(4)').attr('data-unemploymentinsurance', unemploymentinsurance); + // $(this).find('td:eq(13)').text($('#IdNumber').val()); + // $(this).find('td:eq(14)').text($('#DateOfBirth').val()); + // $(this).find('td:eq(15)').text($('#PlaceOfIssue').val()); + // $(this).find('td:eq(16)').text($('#NationalCode').val()); + // $(this).find('td:eq(17)').text($('#FatherName').val()); + // $(this).find('td:eq(18)').text($('#Gender').val()); + // $(this).find('td:eq(19)').text($('#LName').val()); + // $(this).find('td:eq(20)').text($('#FName').val()); + // $(this).find('td:eq(21)').text($('#InsuranceCode').val()); return false; } }); @@ -709,12 +733,18 @@ employeeDetails.JobCode = $(this).find('td:eq(3)').attr('data-jobcode'); employeeDetails.LeftWorkDate = $(this).find('td:eq(1)').text(); employeeDetails.BenefitsIncludedContinuous = Number($(this).find('td:eq(6)').attr('data-benefitsincludedcontinuous')); - employeeDetails.DailyWage = Number($(this).find('td:eq(9)').attr('data-dailywage')); + employeeDetails.DailyWage = Number($(this).find('td:eq(11)').attr('data-dailywage')); employeeDetails.MonthlySalary = Number($(this).find('td:eq(8)').attr('data-monthlysalary')); employeeDetails.MonthlyBenefits = Number($(this).find('td:eq(7)').attr('data-monthlybenefits')); employeeDetails.IncludedAndNotIncluded = Number($(this).find('td:eq(5)').attr('data-includedandnotincluded')); employeeDetails.InsuranceShare = Number($(this).find('td:eq(4)').attr('data-insuranceshare')); - employeeDetails.WorkingDays = Number($(this).find('td:eq(10)').text()); + employeeDetails.WorkingDays = Number($(this).find('td:eq(12)').text()); + + employeeDetails.MarriedAllowance = Number($(this).find('td:eq(9)').attr('data-MarriedAllowance')); + employeeDetails.BaseYears = Number($(this).find('td:eq(10)').attr('data-BaseYears')); + employeeDetails.DailyWagePlusBaseYears = Number($(this).find('td:eq(11)').attr('data-DailyWagePlusBaseYears')); + employeeDetails.BenefitsIncludedNonContinuous = Number($(this).find('td:eq(5)').attr('data-BenefitsIncludedNonContinuous')); + employeeDetailsForInsuranceList.push(employeeDetails); }); //console.log(employeeDetailsForInsuranceList); @@ -736,6 +766,10 @@ $('#txtInsuredShare').val(response.insuredShare); $('#txtEmployerShare').val(response.employerShare); $('#txtUnEmploymentInsurance').val(response.unEmploymentInsurance); + $('#txtSumOfBaseYears').val(response.sumOfBaseYears); + $('#txtSumOfMarriedAllowance').val(response.sumOfMarriedAllowance); + $('#txtSumOfDailyWagePlusBaseYears').val(response.sumOfDailyWagePlusBaseYears); + $('#txtSumOfBenefitsIncludedNonContinuous').val(response.sumOfBenefitsIncludedNonContinuous); }, failure: function(response) { console.log(5, response); @@ -788,8 +822,8 @@ sumOfIncludedKarfarma = Number(getNumberValue($(this).find('td:eq(6)').text())); } - sumOfWorkingDays = sumOfWorkingDays + Number(getNumberValue($(this).find('td:eq(10)').text())); - sumOfDailyWage = sumOfDailyWage + Number(getNumberValue($(this).find('td:eq(9)').text())); + sumOfWorkingDays = sumOfWorkingDays + Number(getNumberValue($(this).find('td:eq(12)').text())); + sumOfDailyWage = sumOfDailyWage + Number(getNumberValue($(this).find('td:eq(11)').text())); sumOfSalaries = sumOfSalaries + Number(getNumberValue($(this).find('td:eq(8)').text())); monthlyBenefits = monthlyBenefits + Number(getNumberValue($(this).find('td:eq(7)').text())); sumOfIncluded = sumOfIncluded + Number(getNumberValue($(this).find('td:eq(6)').text())); @@ -1053,6 +1087,9 @@ $("#divEmployeeInsurancListData").append(``); $("#divEmployeeInsurancListData").append(''); + $("#divEmployeeInsurancListData").append(``); + $("#divEmployeeInsurancListData").append(``); + $('#DSKWOR-datatable tbody tr').each(function(i) { var nationality = $(this).attr("data-nationality"); var includeStatus = Number($(this).attr('data-includeStatus')) == 1 ? true : false; @@ -1062,27 +1099,30 @@ var insuranceShare = $(this).find('td:eq(4)').attr("data-insuranceshare"); var benefitsIncludedContinuous = getNumberValue($(this).find('td:eq(5)').text()); var monthlySalary = $(this).find('td:eq(8)').attr("data-monthlysalary"); - var dailyWage = $(this).find('td:eq(9)').attr("data-dailywage"); - var workingDays = $(this).find('td:eq(10)').text(); + var dailyWage = $(this).find('td:eq(11)').attr("data-dailywage"); + var workingDays = $(this).find('td:eq(12)').text(); var employeeId = $(this).attr("data-employeeid"); var monthlyBenefits = $(this).find('td:eq(7)').attr("data-monthlybenefits"); var monthlyBenefitsIncluded = $(this).find('td:eq(6)').attr("data-benefitsincludedcontinuous"); var benefitsIncludedNonContinuous = $(this).find('td:eq(5)').attr("data-benefitsincludednoncontinuous"); - var idNumber = $(this).find('td:eq(11)').text(); - var dateOfBirth = $(this).find('td:eq(12)').text(); - var placeOfIssue = $(this).find('td:eq(13)').text(); - var nationalCode = $(this).find('td:eq(14)').text(); - var fatherName = $(this).find('td:eq(15)').text(); - var gender = $(this).find('td:eq(16)').text(); - var lName = $(this).find('td:eq(17)').text(); - var fName = $(this).find('td:eq(18)').text(); - var insuranceCode = $(this).find('td:eq(19)').text(); + var idNumber = $(this).find('td:eq(13)').text(); + var dateOfBirth = $(this).find('td:eq(14)').text(); + var placeOfIssue = $(this).find('td:eq(15)').text(); + var nationalCode = $(this).find('td:eq(16)').text(); + var fatherName = $(this).find('td:eq(17)').text(); + var gender = $(this).find('td:eq(18)').text(); + var lName = $(this).find('td:eq(19)').text(); + var fName = $(this).find('td:eq(20)').text(); + var insuranceCode = $(this).find('td:eq(21)').text(); var jobName = $(this).find('td:eq(3)').text(); var jobCode = $(this).find('td:eq(3)').attr("data-jobcode"); //var employeeId= $(this).attr("data-employeeid"); var insuranceEmployeeInformationId = $(this).attr("data-insuranceemployeeinformationid"); var employeeinsuranclistdataid = $(this).attr("data-employeeinsuranclistdataid"); + var marriedAllowance = $(this).find('td:eq(9)').attr('data-MarriedAllowance'); + var baseYears = $(this).find('td:eq(10)').attr('data-BaseYears'); + var dateOfIssue = $(this).attr("data-dateofissue"); $("#divEmployeeInsurancListData").append(``); @@ -1151,6 +1191,11 @@ }" />`); $("#divEmployeeInsurancListData").append(``); + + $("#divEmployeeInsurancListData").append(``); + $("#divEmployeeInsurancListData").append(``); }); $("#form").submit(); } else { @@ -1232,28 +1277,33 @@ $('#divJobId').html(row.find('td:eq(3)').text()); $('#JobId').val(jobId); $('#InsuranceShare').val(row.find('td:eq(4)').text()); - $('#BenefitsIncludedNonContinuous').val(commafy(row.find('td:eq(5)').attr("data-includedandnotincluded"))); + $('#BenefitsIncludedNonContinuous').val(commafy(row.find('td:eq(5)').attr("data-benefitsincludednoncontinuous"))); $('#BenefitsIncludedContinuous').val(row.find('td:eq(7)').text()); $('#MonthlySalary').val(row.find('td:eq(8)').text()); - $('#DailyWage').val(row.find('td:eq(9)').text()); - $('#WorkingDays').val(row.find('td:eq(10)').text()); - $('#IdNumber').val(row.find('td:eq(11)').text()); - $('#DateOfBirth').val(row.find('td:eq(12)').text()); - $('#PlaceOfIssue').val(row.find('td:eq(13)').text()); - $('#NationalCode').val(row.find('td:eq(14)').text()); - $('#FatherName').val(row.find('td:eq(15)').text()); - $('#Gender').val(row.find('td:eq(16)').text()); - $('#LName').val(row.find('td:eq(17)').text()); - $('#FName').val(row.find('td:eq(18)').text()); - $('#InsuranceCode').val(row.find('td:eq(19)').text()); + $('#DailyWage').val(row.find('td:eq(11)').text()); + $('#WorkingDays').val(row.find('td:eq(12)').text()); + $('#WorkingDays').attr('max', oldWorkingDays); + $('#OldWorkingDays').val(oldWorkingDays); + $('#IdNumber').val(row.find('td:eq(13)').text()); + $('#DateOfBirth').val(row.find('td:eq(14)').text()); + $('#PlaceOfIssue').val(row.find('td:eq(15)').text()); + $('#NationalCode').val(row.find('td:eq(16)').text()); + $('#FatherName').val(row.find('td:eq(17)').text()); + $('#Gender').val(row.find('td:eq(18)').text()); + $('#LName').val(row.find('td:eq(19)').text()); + $('#FName').val(row.find('td:eq(20)').text()); + $('#InsuranceCode').val(row.find('td:eq(21)').text()); // $('#column18').val(row.find('td:eq(0)').text()); $('#EmployeeId').val(rowId); $('#InsuranceEmployeeInformationId').val(insuranceEmployeeInformationId); $('#DateOfIssue').val(dateOfIssue); - $('#HousingAllowance').val(row.find('td:eq(10)').attr("data-housingallowance")); - $('#ConsumableItems').val(row.find('td:eq(10)').attr("data-consumableitems")); - $('#EndMonthCurrentDay').val(row.find('td:eq(10)').attr("data-endmonthcurrentday")); - $('#IncludeStatus').val(row.attr("data-IncludeStatus")); + $('#HousingAllowance').val(row.find('td:eq(12)').attr("data-housingallowance")); + $('#ConsumableItems').val(row.find('td:eq(12)').attr("data-consumableitems")); + $('#EndMonthCurrentDay').val(row.find('td:eq(12)').attr("data-endmonthcurrentday")); + $('#IncludeStatus').val(row.attr("data-includeStatus")); + + $('#yearlySalaryItem').val(row.attr("data-yearlySalaryItem")); + $('#hasconfilictjobs').val(row.attr("data-hasconfilictjobs")); } function showJobList(selectId) { diff --git a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/EmployeeListForEdit.cshtml b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/EmployeeListForEdit.cshtml index d7150865..db0b2b09 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/EmployeeListForEdit.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/EmployeeListForEdit.cshtml @@ -98,6 +98,8 @@
+ + @@ -121,29 +123,31 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @foreach (var item in Model.EmployeeDetailsForInsuranceList) { @@ -161,7 +165,9 @@ - + + + @@ -189,7 +195,9 @@ - + + + @@ -359,26 +367,26 @@ $('#BenefitsIncludedNonContinuous').val(commafy(row.find('td:eq(5)').attr("data-benefitsIncludedNonContinuous"))); $('#BenefitsIncludedContinuous').val(row.find('td:eq(7)').text()); $('#MonthlySalary').val(row.find('td:eq(8)').text()); - $('#DailyWage').val(row.find('td:eq(9)').text()); - $('#WorkingDays').val(row.find('td:eq(10)').text()); + $('#DailyWage').val(row.find('td:eq(11)').text()); + $('#WorkingDays').val(row.find('td:eq(12)').text()); $('#OldWorkingDays').val(oldWorkingDays); $('#WorkingDays').attr('max',$('#OldWorkingDays').val(oldWorkingDays)); - $('#IdNumber').val(row.find('td:eq(11)').text()); - $('#DateOfBirth').val(row.find('td:eq(12)').text()); - $('#PlaceOfIssue').val(row.find('td:eq(13)').text()); - $('#NationalCode').val(row.find('td:eq(14)').text()); - $('#FatherName').val(row.find('td:eq(15)').text()); - $('#Gender').val(row.find('td:eq(16)').text()); - $('#LName').val(row.find('td:eq(17)').text()); - $('#FName').val(row.find('td:eq(18)').text()); - $('#InsuranceCode').val(row.find('td:eq(19)').text()); + $('#IdNumber').val(row.find('td:eq(13)').text()); + $('#DateOfBirth').val(row.find('td:eq(14)').text()); + $('#PlaceOfIssue').val(row.find('td:eq(15)').text()); + $('#NationalCode').val(row.find('td:eq(16)').text()); + $('#FatherName').val(row.find('td:eq(17)').text()); + $('#Gender').val(row.find('td:eq(18)').text()); + $('#LName').val(row.find('td:eq(19)').text()); + $('#FName').val(row.find('td:eq(20)').text()); + $('#InsuranceCode').val(row.find('td:eq(11)').text()); // $('#column18').val(row.find('td:eq(0)').text()); $('#EmployeeId').val(rowId); $('#InsuranceEmployeeInformationId').val(insuranceEmployeeInformationId); $('#DateOfIssue').val(dateOfIssue); - $('#HousingAllowance').val(row.find('td:eq(10)').attr("data-housingallowance")); - $('#ConsumableItems').val(row.find('td:eq(10)').attr("data-consumableitems")); - $('#EndMonthCurrentDay').val(row.find('td:eq(10)').attr("data-endmonthcurrentday")); + $('#HousingAllowance').val(row.find('td:eq(12)').attr("data-housingallowance")); + $('#ConsumableItems').val(row.find('td:eq(12)').attr("data-consumableitems")); + $('#EndMonthCurrentDay').val(row.find('td:eq(12)').attr("data-endmonthcurrentday")); $('#IncludeStatus').val(row.attr("data-includeStatus")); $('#yearlySalaryItem').val(row.attr("data-yearlySalaryItem")); $('#hasconfilictjobs').val(row.attr("data-hasconfilictjobs")); diff --git a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Index.cshtml b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Index.cshtml index 3f72bad7..e774af6d 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Index.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Index.cshtml @@ -2,6 +2,7 @@ @model ServiceHost.Areas.Admin.Pages.Company.InsuranceList.IndexModel @{ + string adminVersion = _0_Framework.Application.Version.AdminVersion; Layout = "Shared/_AdminLayout"; ViewData["title"] = "بیمه"; var selctedOption = "selectedOption"; @@ -81,7 +82,7 @@ border-color: grey !important; } - +
تاریخ ترک کار تاریخ آغاز بکار شغل حق بیمه سهم بیمه شده حقوق و مزایای ماهیانه مشمول و غیر مشمول حقوق و مزایای ماهیانه مشمول مزایای ماهیانه مشمول حقوق ماهیانه مشمول دستمزد روزانه روزهای کارکرد ش شناسنامه تاریخ تولد محل صدور کدملی نام پدر جنسیت نام خانوادگی نام شماره بیمه #
تاریخ ترک کار تاریخ آغاز بکار شغل حق بیمه سهم بیمه شده حقوق و مزایای ماهیانه مشمول و غیر مشمول حقوق و مزایای ماهیانه مشمول مزایای ماهیانه مشمول حقوق ماهیانه مشمول حق تاهل پایه سنوات روزانه دستمزد روزانه روزهای کارکرد ش شناسنامه تاریخ تولد محل صدور کدملی نام پدر جنسیت نام خانوادگی نام شماره بیمه #
0 0 00000 0 @item.IdNumber @item.DateOfBirth@item.BenefitsIncludedContinuous.ToMoney() @item.MonthlyBenefits.ToMoney() @(item.HasConfilictJobs ? "" : item.MonthlySalary.ToMoney())@(item.HasConfilictJobs ? "" : item.DailyWageStr)@item.MarriedAllowance.ToMoney()@item.BaseYears.ToMoney()@(item.HasConfilictJobs ? "" : item.DailyWageStr) @item.WorkingDays @item.IdNumber @item.DateOfBirth
+ + + @@ -534,10 +560,13 @@ + - + + + @@ -606,10 +635,13 @@ } } + + + @@ -644,6 +676,9 @@ + + + @@ -657,6 +692,9 @@ + + + @@ -670,13 +708,19 @@ + + + + + + @@ -700,6 +744,9 @@ + + + @@ -713,6 +760,9 @@ + + + } else if (i == (q - 1) && (r>0 && r <= 10)) @@ -730,6 +780,9 @@ + + + } @@ -797,10 +850,13 @@ + - + + + @@ -810,77 +866,77 @@ - @if (CountLastRow == 0) - { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @if (CountLastRow == 0) + { + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - } - else if (CountLastRow == 2) - { - - - - - - - - - - - - - - - - - - - - - - - - - - - } + } + else if (CountLastRow == 2) + { + + + + + + + + + + + + + + + + + + + + + + + + + + + } else if (CountLastRow == 1) { diff --git a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/InsuranceSummary.cshtml b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/InsuranceSummary.cshtml index 0bfd9154..6fb4e8f4 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/InsuranceSummary.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/InsuranceSummary.cshtml @@ -17,7 +17,7 @@ padding: 0 !important; } .modal-dialog { - width: 1200px !important; + width: 1250px !important; } .printBtns { @@ -98,18 +98,19 @@ width: 100%; } - #printThis .table-bordered > thead > tr > th { - font-size: 1.3rem; - color: black; - text-align: center; - vertical-align: middle; - padding: 0; - border: 1px solid #c7c7c7 !important; - } +#printThis .table-bordered > thead > tr > th { + font-size: 9px; + font-weight: 900; + color: black; + text-align: center; + vertical-align: middle; + padding: 0; + border: 1px solid #c7c7c7 !important; +} #printThis .table-bordered > tbody > tr > td { padding: 8px 2px; text-align: center; - font-size: 1.2rem; + font-size: 10px; border: 1px solid #c7c7c7 !important; } @@ -120,11 +121,11 @@ } #printThis .colgp-1 { - width: 30px; + width: 20px; } #printThis .colgp-2 { - width: 55px; + width: 45px; } #printThis .colgp-3 { @@ -136,7 +137,7 @@ } #printThis .colgp-5 { - width: 65px; + width: 50px; } #printThis .colgp-6 { @@ -146,16 +147,17 @@ #printThis .colgp-7 { width: 58px; } + #printThis .colgp-8 { - width: 55px; + width: 42px; } #printThis .colgp-9 { - width: 55px; + width: 42px; } #printThis .colgp-10 { - width: 27px; + width: 23px; } #printThis .colgp-11 { @@ -163,22 +165,34 @@ } #printThis .colgp-12 { - width: 75px; + width: 55px; } #printThis .colgp-13 { - width: 65px; + width: 55px; } #printThis .colgp-14 { - width: 75px; + width: 55px; } #printThis .colgp-15 { - width: 75px; + width: 55px; } #printThis .colgp-16 { - width: 65px; + width: 55px; + } + + #printThis .colgp-17 { + width: 55px; + } + + #printThis .colgp-18 { + width: 55px; + } + + #printThis .colgp-19 { + width: 55px; } .summary{ @@ -257,64 +271,88 @@ border-radius: 9px !important; } #printThis .table-bordered > thead > tr > th { - font-size: 1.1rem; + font-size: 9px; + font-weight: 900; } #printThis .table-bordered > tbody > tr > td { - font-size: 1rem; + font-size: 10px; } - #printThis .colgp-3 { - width: 90px; - } + #printThis .colgp-1 { + width: 20px; + } - #printThis .colgp-4 { - width: 50px; - } + #printThis .colgp-2 { + width: 45px; + } - #printThis .colgp-5 { - width: 70px; - } + #printThis .colgp-3 { + width: 95px; + } - #printThis .colgp-6 { - width: 70px; - } + #printThis .colgp-4 { + width: 50px; + } - #printThis .colgp-7 { - width: 48px; - } + #printThis .colgp-5 { + width: 50px; + } - #printThis .colgp-8 { - width: 55px; - } + #printThis .colgp-6 { + width: 65px; + } - #printThis .colgp-9 { - width: 55px; - } + #printThis .colgp-7 { + width: 58px; + } - #printThis .colgp-15 { - width: 70px; - } + #printThis .colgp-8 { + width: 42px; + } - #printThis .colgp-16 { - width: 60px; - } + #printThis .colgp-9 { + width: 42px; + } - #printThis .colgp-14 { - width: 70px; - } + #printThis .colgp-10 { + width: 23px; + } - #printThis .colgp-13 { - width: 60px; - } + #printThis .colgp-11 { + width: 55px; + } - #printThis .colgp-12 { - width: 65px; - } + #printThis .colgp-12 { + width: 55px; + } + #printThis .colgp-13 { + width: 55px; + } - #printThis .colgp-11 { - width: 60px; - } + #printThis .colgp-14 { + width: 55px; + } + + #printThis .colgp-15 { + width: 55px; + } + + #printThis .colgp-16 { + width: 55px; + } + + #printThis .colgp-17 { + width: 55px; + } + + #printThis .colgp-18 { + width: 55px; + } + + #printThis .colgp-19 { + width: 55px; + } } @@media print { body * { @@ -363,7 +401,8 @@ } #printThis .table-bordered > thead > tr > th { - font-size: 1.2rem !important; + font-size: 9px !important; + font-weight: 900; color: black; text-align: center; vertical-align: middle; @@ -374,7 +413,7 @@ #printThis .table-bordered > tbody > tr > td { padding:8px 2px; text-align: center; - font-size: 0.8rem !important; + font-size: 10px !important; border: 1px solid black; } @@ -467,40 +506,81 @@ } - #printThis .colgp-2 { - width: 60px; - } - #printThis .colgp-3 { - width: 70px; - } + #printThis .colgp-1 { + width: 20px; + } - #printThis .colgp-15 { - width: 80px; - } + #printThis .colgp-2 { + width: 45px; + } - #printThis .colgp-16 { - width: 75px; - } + #printThis .colgp-3 { + width: 95px; + } - #printThis .colgp-14 { - width: 80px; - } + #printThis .colgp-4 { + width: 50px; + } - #printThis .colgp-13 { - width: 80px; - } + #printThis .colgp-5 { + width: 50px; + } - #printThis .colgp-12 { - width: 85px; - } + #printThis .colgp-6 { + width: 65px; + } - #printThis .colgp-8 { - width: 60px; - } + #printThis .colgp-7 { + width: 58px; + } + + #printThis .colgp-8 { + width: 42px; + } + + #printThis .colgp-9 { + width: 42px; + } + + #printThis .colgp-10 { + width: 23px; + } + + #printThis .colgp-11 { + width: 55px; + } + + #printThis .colgp-12 { + width: 55px; + } + #printThis .colgp-13 { + width: 55px; + } + + #printThis .colgp-14 { + width: 55px; + } + + #printThis .colgp-15 { + width: 55px; + } + + #printThis .colgp-16 { + width: 55px; + } + + #printThis .colgp-17 { + width: 55px; + } + + #printThis .colgp-18 { + width: 55px; + } + + #printThis .colgp-19 { + width: 55px; + } - #printThis .colgp-9 { - width: 60px; - } .summary { display: flex; justify-content: flex-end; @@ -545,6 +625,9 @@
توضیحات مجموع مزایای ماهانه غیرمشمول مجموع حقوق و مزایای ماهیانه مجموع مزایای ماهیانه حقوق ماهیانه جمع حقوق و پایه سنواتی ماهانه پایه سنوات روزانه دستمزد روزانه حق تاهل روز کارکرد سمت کدملی @Model.EmployeeDetailsForInsuranceList[j].BenefitsIncludedNonContinuous.ToMoney() @Model.EmployeeDetailsForInsuranceList[j].BenefitsIncludedContinuous.ToMoney() @Model.EmployeeDetailsForInsuranceList[j].MonthlyBenefits.ToMoney() @Model.EmployeeDetailsForInsuranceList[j].MonthlySalary.ToMoney()@Model.EmployeeDetailsForInsuranceList[j].BaseYears.ToMoney() @Model.EmployeeDetailsForInsuranceList[j].DailyWage.ToMoney()@Model.EmployeeDetailsForInsuranceList[j].MarriedAllowance.ToMoney() @Model.EmployeeDetailsForInsuranceList[j].WorkingDays @Model.EmployeeDetailsForInsuranceList[j].JobName @Model.EmployeeDetailsForInsuranceList[j].NationalCode
@Model.EmployeeDetailsForInsuranceList.Sum(x => x.BenefitsIncludedNonContinuous).ToMoney() @Model.EmployeeDetailsForInsuranceList.Sum(x => x.BenefitsIncludedContinuous).ToMoney() @Model.EmployeeDetailsForInsuranceList.Sum(x => x.MonthlyBenefits).ToMoney() @Model.EmployeeDetailsForInsuranceList.Sum(x => x.MonthlySalary).ToMoney()@Model.EmployeeDetailsForInsuranceList.Sum(x => x.BaseYears).ToMoney() @Model.EmployeeDetailsForInsuranceList.Sum(x => x.DailyWage).ToMoney()@Model.EmployeeDetailsForInsuranceList.Sum(x => x.MarriedAllowance).ToMoney() @Model.EmployeeDetailsForInsuranceList.Sum(x => x.WorkingDays)
توضیحات مجموع مزایای ماهانه غیرمشمول مجموع حقوق و مزایای ماهیانه مجموع مزایای ماهیانه حقوق ماهیانه جمع حقوق و پایه سنواتی ماهانه پایه سنوات روزانه دستمزد روزانه حق تاهل روز کارکرد سمت کدملی
+ + + @@ -554,8 +637,8 @@ - - +@* + *@ @@ -565,16 +648,19 @@ + - + + + - - + @* + *@ @@ -591,16 +677,19 @@ { + + + - - + @* + *@ @@ -610,20 +699,23 @@ index = index + 1; } - + + + + - - - + +@* + *@ diff --git a/ServiceHost/InsuranceList/11/1403_09/DSKWOR00.dbf b/ServiceHost/InsuranceList/11/1403_09/DSKWOR00.dbf deleted file mode 100644 index 347e4987..00000000 Binary files a/ServiceHost/InsuranceList/11/1403_09/DSKWOR00.dbf and /dev/null differ diff --git a/ServiceHost/InsuranceList/11/1403_11/DSKKAR00.dbf b/ServiceHost/InsuranceList/11/1403_11/DSKKAR00.dbf deleted file mode 100644 index ea252456..00000000 Binary files a/ServiceHost/InsuranceList/11/1403_11/DSKKAR00.dbf and /dev/null differ diff --git a/ServiceHost/InsuranceList/11/1403_11/DSKWOR00.dbf b/ServiceHost/InsuranceList/11/1403_11/DSKWOR00.dbf deleted file mode 100644 index 7de6a1cd..00000000 Binary files a/ServiceHost/InsuranceList/11/1403_11/DSKWOR00.dbf and /dev/null differ diff --git a/ServiceHost/InsuranceList/546/1403_05/DSKKAR00.dbf b/ServiceHost/InsuranceList/546/1403_05/DSKKAR00.dbf deleted file mode 100644 index 68d0431d..00000000 Binary files a/ServiceHost/InsuranceList/546/1403_05/DSKKAR00.dbf and /dev/null differ diff --git a/ServiceHost/InsuranceList/546/1403_05/DSKWOR00.dbf b/ServiceHost/InsuranceList/546/1403_05/DSKWOR00.dbf deleted file mode 100644 index 58aeefc8..00000000 Binary files a/ServiceHost/InsuranceList/546/1403_05/DSKWOR00.dbf and /dev/null differ diff --git a/ServiceHost/InsuranceList/552/1403_10.zip b/ServiceHost/InsuranceList/552/1403_10.zip new file mode 100644 index 00000000..9f30ed2b Binary files /dev/null and b/ServiceHost/InsuranceList/552/1403_10.zip differ diff --git a/ServiceHost/InsuranceList/11/1403_09/DSKKAR00.dbf b/ServiceHost/InsuranceList/552/1403_10/DSKKAR00.dbf similarity index 57% rename from ServiceHost/InsuranceList/11/1403_09/DSKKAR00.dbf rename to ServiceHost/InsuranceList/552/1403_10/DSKKAR00.dbf index 9f3c7db6..1fcd5dce 100644 Binary files a/ServiceHost/InsuranceList/11/1403_09/DSKKAR00.dbf and b/ServiceHost/InsuranceList/552/1403_10/DSKKAR00.dbf differ diff --git a/ServiceHost/InsuranceList/552/1403_10/DSKWOR00.dbf b/ServiceHost/InsuranceList/552/1403_10/DSKWOR00.dbf new file mode 100644 index 00000000..bde286e4 Binary files /dev/null and b/ServiceHost/InsuranceList/552/1403_10/DSKWOR00.dbf differ diff --git a/ServiceHost/wwwroot/AdminTheme/css/insurance-list.css b/ServiceHost/wwwroot/AdminTheme/css/insurance-list.css index 9f03025b..877ced63 100644 --- a/ServiceHost/wwwroot/AdminTheme/css/insurance-list.css +++ b/ServiceHost/wwwroot/AdminTheme/css/insurance-list.css @@ -434,7 +434,7 @@ border-radius: 7px; margin: 10px 19px; width: 97.6%; - padding: 30px 0; + padding: 10px 0; } .form-title { @@ -494,7 +494,7 @@ .btns { position: absolute; display: inline-flex; - bottom: 24px; + bottom: 9px; width: 100%; left: 25px; direction: ltr; @@ -673,7 +673,7 @@ .tab-content { box-shadow: none; border: 1px solid #00000042; - height: 330px; + height: 430px; padding-top: 16px !important; margin-right: 4px; border-radius: 7px; @@ -926,6 +926,14 @@ } .colgp-21 { + width: 60px; + } + + .colgp-22 { + width: 60px; + } + + .colgp-23 { width: 35px; } @@ -1210,6 +1218,14 @@ } .colgp-21 { + width: 60px; + } + + .colgp-22 { + width: 60px; + } + + .colgp-23 { width: 35px; } @@ -1405,6 +1421,14 @@ } .colgp-21 { + width: 60px; + } + + .colgp-22 { + width: 60px; + } + + .colgp-23 { width: 35px; }
حق بیمه سهم بیمه شده مجموع مزایای ماهانه غیر مشمول حقوق و مزایای ماهیانه مشمول و غیر مشمول حقوق و مزایای ماهیانه مشمول مزایای ماهیانه مشمول حقوق ماهیانه مشمول جمع حقوق و پایه سنوانی ماهانه پایه سنوات روزانه دستمزد روزانه حق تاهل کارکرد تاریخ ترک کار تاریخ آغاز بکار نام پدر شماره شناسنامه نام پدر شماره شناسنامه کدملی شغل نام و نام خانوادگی
@item.InsuranceShare.ToMoney()@item.BenefitsIncludedNonContinuous.ToMoney() @item.BenefitsIncludedContinuous.ToMoney() @item.MonthlyBenefitsIncluded.ToMoney() @item.MonthlyBenefits.ToMoney() @item.MonthlySalary.ToMoney()@item.BaseYears.ToMoney() @item.DailyWage.ToMoney()@item.MarriedAllowance.ToMoney() @item.WorkingDays @item.LeftWorkDate @item.StartWorkDate@item.FatherName@item.IdNumber@item.FatherName@item.IdNumber@item.NationalCode @item.JobName @(item.FName + " " + item.LName)
@Model.EmployeeDetailsForInsuranceList.Sum(x=>x.InsuranceShare).ToMoney()@Model.EmployeeDetailsForInsuranceList.Sum(x=>x.BenefitsIncludedNonContinuous).ToMoney() @Model.EmployeeDetailsForInsuranceList.Sum(x=>x.BenefitsIncludedContinuous).ToMoney() @Model.EmployeeDetailsForInsuranceList.Sum(x=>x.MonthlyBenefitsIncluded).ToMoney() @Model.EmployeeDetailsForInsuranceList.Sum(x=>x.MonthlyBenefits).ToMoney() @Model.EmployeeDetailsForInsuranceList.Sum(x=>x.MonthlySalary).ToMoney()@Model.EmployeeDetailsForInsuranceList.Sum(x=>x.BaseYears).ToMoney() @Model.EmployeeDetailsForInsuranceList.Sum(x=>x.DailyWage).ToMoney()@Model.EmployeeDetailsForInsuranceList.Sum(x=>x.MarriedAllowance) @Model.EmployeeDetailsForInsuranceList.Sum(x=>x.WorkingDays)