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

InsuranceUpdate

Browse Source
This commit is contained in:
SamSys
2025-02-03 20:29:32 +03:30
parent aa3a132341
commit be5441ec9d
20 changed files with 990 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs
View File

@@ -51,6 +51,12 @@ public interface IInsuranceListRepository:IRepository<long, InsuranceList>
List<EmployeeInsurancListDataViewModel> GetEmployeeInsuranceDataAmonthAgo(DateTime currentMonthStartDate, long workshopId);
#endregion
/// <summary>
/// بدست آوردن اطلاعات محاسباتی ماه پرسنل برای ویرایش
/// </summary>
/// <param name="insuranceListId"></param>
/// <returns></returns>
List<EmployeeDetailsForInsuranceListViewModel> GetEmployeeInsuranceDataForEdit(long insuranceListId, DateTime startDate, DateTime endDate);
#region client
List<InsuranceListViewModel> SearchForClient(InsuranceListSearchModel searchModel);
#endregion

4
CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs
View File

@@ -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);

246
CompanyManagment.Application/InsuranceListApplication.cs
View File

@@ -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
}
/// <summary>
/// محاسبه مزایای ماهانه
/// محاسبه مزایای ماهانه مشمول
/// </summary>
/// <param name="endMonthCurrentDay"></param>
/// <param name="consumableItemsItemValue"></param>
@@ -1482,15 +1627,22 @@ public class InsuranceListApplication: IInsuranceListApplication
/// <param name="jobId"></param>
/// <param name="employeeId"></param>
/// <returns></returns>
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
{

168
CompanyManagment.EFCore/Repository/InsuranceListRepository.cs
View File

@@ -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<long, InsuranceList>, 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<long, InsuranceList>, 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<long, InsuranceList>, 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<long, InsuranceList>, 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<long, InsuranceList>, IIns
return res.ToList();
}
public List<EmployeeDetailsForInsuranceListViewModel> 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();
}
}

9
ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Create.cshtml
View File

@@ -18,7 +18,6 @@
height: 582px !important;
}
}
</style>
}
@@ -88,10 +87,10 @@
</div>
<!--اطلاعات کارگاه-->
<div class="col-md-12 col-12 col-sm-12 form-box" id="divInsuranceWorkshopInfo">
<div class="d-flex">
@* <div class="d-flex">
<span class="form-title">کپی از آخرین لیست ارسالی </span>
<div id="resultExistPersonel" class="alert alert-danger" style="display:none"></div>
</div>
</div> *@
<div class="col-md-3 col-3 col-sm-3 inputs">
<input type="text" class="input green notEmpty input-field" asp-for="@Model.InsuranceWorkshopInfo.WorkshopName" placeholder="نام کارگاه">
@@ -152,7 +151,7 @@
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> جمع دستمزد و مزایای ماهانه مشمول و غیر مشمول </label>
<input type="text" placeholder="" id="txtIncludedAndNotIncluded" asp-for="IncludedAndNotIncluded" class="input green col-md-2 col-2 col-sm-2 notEmpty">
<input type="text" placeholder="" id="txtIncludedAndNotIncluded" asp-for="IncludedAndNotIncluded" class="input yellow col-md-2 col-2 col-sm-2 notEmpty">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> جمع دستمزد روزانه </label>
@@ -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) {

286
ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Edit.cshtml
View File

@@ -89,10 +89,10 @@
</select>
</div>
<div class="col-md-12 col-12 col-sm-12 form-box" id="divInsuranceWorkshopInfo">
<div class="d-flex">
@* <div class="d-flex">
<span class="form-title">کپی از آخرین لیست ارسالی </span>
<div id="resultExistPersonel" class="alert alert-danger" style="display:none"></div>
</div>
</div> *@
<div class="col-md-3 col-3 col-sm-3 inputs">
<input type="hidden" class="input green input-field" asp-for="@Model.InsuranceWorkshopInfo.InsuranceWorkshopInfoId">
@@ -137,54 +137,78 @@
</li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="DSSKAR">
<div class="tab-pane active" id="DSSKAR">
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> تعداد نفرات </label>
<input type="text" placeholder="" id="txtSumOfEmployees" asp-for="SumOfEmployees" class="input green col-md-2 col-2 col-sm-2 notEmpty">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> جمع دستمزد و مزایای ماهانه مشمول </label>
<input type="text" placeholder="" id="txtIncluded" asp-for="Included" class="input green col-md-2 col-2 col-sm-2 notEmpty">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> جمع روزهای کارکرد </label>
<input type="text" placeholder="" id="txtSumOfWorkingDays" asp-for="SumOfWorkingDays" class="input green col-md-2 col-2 col-sm-2 notEmpty">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> جمع دستمزد و مزایای ماهانه مشمول و غیر مشمول </label>
<input type="text" placeholder="" id="txtIncludedAndNotIncluded" asp-for="IncludedAndNotIncluded" class="input yellow col-md-2 col-2 col-sm-2 notEmpty">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> جمع دستمزد روزانه </label>
<input type="text" placeholder="" id="txtSumOfDailyWage" asp-for="SumOfDailyWage" class="input green col-md-2 col-2 col-sm-2 notEmpty">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> جمع مزایای ماهانه غیرمشمول </label>
<input type="text" placeholder="" id="txtSumOfBenefitsIncludedNonContinuous" value="0" name="SumOfBenefitsIncludedNonContinuous" class="input yellow col-md-2 col-2 col-sm-2 notEmpty">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> جمع حقوق ماهیانه </label>
<input type="text" placeholder="" id="txtSumOfSalaries" asp-for="SumOfSalaries" class="input green col-md-2 col-2 col-sm-2 notEmpty">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> سهم حق بیمه شده </label>
<input type="text" placeholder="" id="txtInsuredShare" asp-for="InsuredShare" class="input blue col-md-2 col-2 col-sm-2 notEmpty">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10 text-small"> جمع مزایای ماهیانه مشمول </label>
<input type="text" placeholder="" id="txtSumOfBenefitsIncluded" asp-for="SumOfBenefitsIncluded" class="input green col-md-2 col-2 col-sm-2 notEmpty">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> سهم حق کارفرما </label>
<input type="text" placeholder="" id="txtEmployerShare" asp-for="EmployerShare" class="input blue col-md-2 col-2 col-sm-2 notEmpty">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10 text-small"> مجموع پایه سنواتی </label>
<input type="text" placeholder="" id="txtSumOfBaseYears" asp-for="SumOfBaseYears" class="input green col-md-2 col-2 col-sm-2">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> بیمه بیکاری </label>
<input type="text" placeholder="" id="txtUnEmploymentInsurance" asp-for="UnEmploymentInsurance" class="input blue col-md-2 col-2 col-sm-2 notEmpty">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> تعداد نفرات </label>
<input type="text" placeholder="" id="txtSumOfEmployees" asp-for="SumOfEmployees" class="input green col-md-2 col-2 col-sm-2 notEmpty">
<label class="col-md-10 col-10 col-sm-10 text-small"> جمع دستمزد روزانه (دستمزد روزانه + پایه سنواتی) </label>
<input type="text" placeholder="" id="txtSumOfDailyWagePlusBaseYears" value="0" name="SumOfDailyWagePlusBaseYears" class="input green col-md-2 col-2 col-sm-2">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> مشمول </label>
<input type="text" placeholder="" id="txtIncluded" asp-for="Included" class="input green col-md-2 col-2 col-sm-2 notEmpty">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> جمع روزهای کارکرد </label>
<input type="text" placeholder="" id="txtSumOfWorkingDays" asp-for="SumOfWorkingDays" class="input green col-md-2 col-2 col-sm-2 notEmpty">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> مشمول و غیر مشمول </label>
<input type="text" placeholder="" id="txtIncludedAndNotIncluded" asp-for="IncludedAndNotIncluded" class="input green col-md-2 col-2 col-sm-2 notEmpty">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> جمع دستمزد روزانه </label>
<input type="text" placeholder="" id="txtSumOfDailyWage" asp-for="SumOfDailyWage" class="input green col-md-2 col-2 col-sm-2 notEmpty">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> سهم حق بیمه شده </label>
<input type="text" placeholder="" id="txtInsuredShare" asp-for="InsuredShare" class="input blue col-md-2 col-2 col-sm-2 notEmpty">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> جمع حقوق ماهیانه </label>
<input type="text" placeholder="" id="txtSumOfSalaries" asp-for="SumOfSalaries" class="input green col-md-2 col-2 col-sm-2 notEmpty">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> سهم حق کارفرما </label>
<input type="text" placeholder="" id="txtEmployerShare" asp-for="EmployerShare" class="input blue col-md-2 col-2 col-sm-2 notEmpty">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10 text-small"> جمع مزایای ماهیانه مشمول </label>
<input type="text" placeholder="" id="txtSumOfBenefitsIncluded" asp-for="SumOfBenefitsIncluded" class="input green col-md-2 col-2 col-sm-2 notEmpty">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10"> بیمه بیکاری </label>
<input type="text" placeholder="" id="txtUnEmploymentInsurance" asp-for="UnEmploymentInsurance" class="input blue col-md-2 col-2 col-sm-2 notEmpty">
<label class="col-md-10 col-10 col-sm-10 text-small"> مجموع حق تاهل </label>
<input type="text" placeholder="" id="txtSumOfMarriedAllowance" asp-for="SumOfMarriedAllowance" class="input green col-md-2 col-2 col-sm-2">
</div>
<div class="col-md-6 col-6 col-sm-6">
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10 text-small"> 4% سخت و زیان آور </label>
<input type="text" placeholder="" id="txtDifficultJobsInsuranc" asp-for="DifficultJobsInsuranc" class="input blue col-md-2 col-2 col-sm-2">
</div>
</div>
<div class="col-md-6 col-6 col-sm-6 inputs-group">
<label class="col-md-10 col-10 col-sm-10 text-small"> 4% سخت و زیان آور </label>
<input type="text" placeholder="" id="txtDifficultJobsInsuranc" asp-for="DifficultJobsInsuranc" class="input green col-md-2 col-2 col-sm-2">
</div>
</div>
<div class="tab-pane" id="DSKWOR">
<div id="table-container">
<div class="ring"> منتظر بمانید<span></span></div>
@@ -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(`<input type="hidden" name="InsuranceWorkshopInfo.Address" id="InsuranceWorkshopInfo_Address" value="${address}" />`);
$("#divEmployeeInsurancListData").append('<input type="hidden" name="InsuranceWorkshopInfo.WorkshopId" id="InsuranceWorkshopInfo_WorkshopId" value="@Model.WorkshopId" />');
$("#divEmployeeInsurancListData").append(`<input type="hidden" name="SumOfBaseYears" id="SumOfBaseYears" value="${getNumberValue($("#txtSumOfBaseYears").val())}" />`);
$("#divEmployeeInsurancListData").append(`<input type="hidden" name="SumOfMarriedAllowance" id="SumOfMarriedAllowance" value="${getNumberValue($("#txtSumOfMarriedAllowance").val())}" />`);
$('#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(`<input type="hidden" name="EmployeeDetailsForInsuranceList[${i}].EmployeeId" id="EmployeeDetailsForInsuranceList_${i
}__EmployeeId" value="${employeeId}" />`);
@@ -1151,6 +1191,11 @@
}" />`);
$("#divEmployeeInsurancListData").append(`<input type="hidden" name="EmployeeInsurancListDataList[${i}].IncludeStatus" id="EmployeeInsurancListDataList_${i
}__IncludeStatus" value="${includeStatus}" />`);
$("#divEmployeeInsurancListData").append(`<input type="hidden" name="EmployeeInsurancListDataList[${i
}].MarriedAllowance" id="EmployeeInsurancListDataList_${i}__MarriedAllowance" value="${marriedAllowance}" />`);
$("#divEmployeeInsurancListData").append(`<input type="hidden" name="EmployeeInsurancListDataList[${i
}].BaseYears" id="EmployeeInsurancListDataList_${i}__BaseYears" value="${baseYears}" />`);
});
$("#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) {

86
ServiceHost/Areas/Admin/Pages/Company/InsuranceList/EmployeeListForEdit.cshtml
View File

@@ -98,6 +98,8 @@
</div>
<table id="DSKWOR-datatable" class="table table-bordered table-striped dataTable @(Model.EmployeeDetailsForInsuranceList.Any(x => !x.IsMaritalStatusSet) ? "hideDataTable" : "")">
<colgroup>
<col class="colgp-23">
<col class="colgp-22">
<col class="colgp-21">
<col class="colgp-20">
<col class="colgp-19">
@@ -121,29 +123,31 @@
<col class="colgp-1">
</colgroup>
<thead>
<tr>
<th class="sorting_asc_disabled sorting_desc_disabled"></th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> تاریخ ترک کار </th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled">تاریخ آغاز بکار </th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> شغل</th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> حق بیمه سهم بیمه شده </th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> حقوق و مزایای ماهیانه مشمول و غیر مشمول </th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> حقوق و مزایای ماهیانه مشمول </th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> مزایای ماهیانه مشمول </th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> حقوق ماهیانه مشمول </th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> دستمزد روزانه </th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> روزهای کارکرد </th>
<th class="header-style sorting_asc_disabled sorting_desc_disabled"> ش شناسنامه </th>
<th class="header-style sorting_asc_disabled sorting_desc_disabled"> تاریخ تولد </th>
<th class="header-style sorting_asc_disabled sorting_desc_disabled"> محل صدور </th>
<th class="header-style sorting_asc_disabled sorting_desc_disabled"> کدملی </th>
<th class="header-style sorting_asc_disabled sorting_desc_disabled"> نام پدر </th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> جنسیت </th>
<th class="header-styledit-btn sorting_asc_disabled sorting_desc_disabled"> نام خانوادگی </th>
<th class="header-style sorting_asc_disabled sorting_desc_disabled"> نام </th>
<th class="header-style sorting_asc_disabled sorting_desc_disabled"> شماره بیمه </th>
<th class="header-style sorting_asc_disabled sorting_desc_disabled">#</th>
</tr>
<tr>
<th class="sorting_asc_disabled sorting_desc_disabled"></th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> تاریخ ترک کار </th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled">تاریخ آغاز بکار </th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> شغل</th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> حق بیمه سهم بیمه شده </th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> حقوق و مزایای ماهیانه مشمول و غیر مشمول </th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> حقوق و مزایای ماهیانه مشمول </th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> مزایای ماهیانه مشمول </th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> حقوق ماهیانه مشمول </th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> حق تاهل </th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> پایه سنوات روزانه</th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> دستمزد روزانه </th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> روزهای کارکرد </th>
<th class="header-style sorting_asc_disabled sorting_desc_disabled"> ش شناسنامه </th>
<th class="header-style sorting_asc_disabled sorting_desc_disabled"> تاریخ تولد </th>
<th class="header-style sorting_asc_disabled sorting_desc_disabled"> محل صدور </th>
<th class="header-style sorting_asc_disabled sorting_desc_disabled"> کدملی </th>
<th class="header-style sorting_asc_disabled sorting_desc_disabled"> نام پدر </th>
<th class="header-style small-font sorting_asc_disabled sorting_desc_disabled"> جنسیت </th>
<th class="header-styledit-btn sorting_asc_disabled sorting_desc_disabled"> نام خانوادگی </th>
<th class="header-style sorting_asc_disabled sorting_desc_disabled"> نام </th>
<th class="header-style sorting_asc_disabled sorting_desc_disabled"> شماره بیمه </th>
<th class="header-style sorting_asc_disabled sorting_desc_disabled">#</th>
</tr>
</thead>
@foreach (var item in Model.EmployeeDetailsForInsuranceList)
{
@@ -161,7 +165,9 @@
<td data-BenefitsIncludedContinuous="0" class="small-font td-ellipsis emptyTR">0 </td>
<td data-MonthlyBenefits="0" class="small-font td-ellipsis emptyTR">0 </td>
<td data-MonthlySalary="0" class="small-font td-ellipsis emptyTR">0</td>
<td data-DailyWage="0" class="small-font td-ellipsis emptyTR">0</td>
<td data-MarriedAllowance="0" class="small-font td-ellipsis emptyTR">0</td>
<td data-BaseYears="0" class="small-font td-ellipsis emptyTR">0</td>
<td data-DailyWage="0" data-DailyWagePlusBaseYears="0" class="small-font td-ellipsis emptyTR">0</td>
<td data-EndMonthCurrentDay="@item.EndMonthCurrentDay" data-OldWorkingDays="0" data-HousingAllowance="@item.HousingAllowance" data-ConsumableItems="@item.ConsumableItems" class="small-font td-ellipsis emptyTR">0</td>
<td class="td-ellipsis emptyTR">@item.IdNumber</td>
<td class="td-ellipsis emptyTR">@item.DateOfBirth</td>
@@ -189,7 +195,9 @@
<td data-BenefitsIncludedContinuous="@item.BenefitsIncludedContinuous" class="small-font td-ellipsis emptyTR">@item.BenefitsIncludedContinuous.ToMoney() </td>
<td data-MonthlyBenefits="@item.MonthlyBenefits" class="small-font td-ellipsis emptyTR">@item.MonthlyBenefits.ToMoney() </td>
<td data-MonthlySalary="@(item.HasConfilictJobs ? 0 : item.MonthlySalary)" class="small-font td-ellipsis emptyTR">@(item.HasConfilictJobs ? "" : item.MonthlySalary.ToMoney())</td>
<td data-DailyWage="@(item.HasConfilictJobs ? 0 : item.DailyWage)" class="small-font td-ellipsis emptyTR">@(item.HasConfilictJobs ? "" : item.DailyWageStr)</td>
<td data-MarriedAllowance="@item.MarriedAllowance" class="small-font td-ellipsis emptyTR">@item.MarriedAllowance.ToMoney()</td>
<td data-BaseYears="@item.BaseYears" class="small-font td-ellipsis emptyTR">@item.BaseYears.ToMoney()</td>
<td data-DailyWage="@(item.HasConfilictJobs ? 0 : item.DailyWage)" data-DailyWagePlusBaseYears="@item.DailyWagePlusBaseYears" class="small-font td-ellipsis emptyTR">@(item.HasConfilictJobs ? "" : item.DailyWageStr)</td>
<td data-EndMonthCurrentDay="@item.EndMonthCurrentDay" data-OldWorkingDays="@item.WorkingDays" data-HousingAllowance="@item.HousingAllowance" data-ConsumableItems="@item.ConsumableItems" class="small-font td-ellipsis emptyTR">@item.WorkingDays</td>
<td class="td-ellipsis emptyTR">@item.IdNumber</td>
<td class="td-ellipsis emptyTR">@item.DateOfBirth</td>
@@ -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"));

3
ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Index.cshtml
View File

@@ -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;
}
</style>
<link href="@Href("~/admintheme/css/insurance-list.css")" rel="stylesheet" />
<link href="~/admintheme/css/insurance-list.css?ver=@adminVersion" rel="stylesheet" />
<div class="row">
<div class="col-sm-12 m-r-10">
<div class="printBtns" style="display: none;">

30
ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Index.cshtml.cs
View File

@@ -816,6 +816,13 @@ public class IndexModel : PageModel
}
}
#region EditInsurance
//-1
/// <summary>
/// متد لود اطلاعات بیمه برای ویرایش
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public IActionResult OnGetEdit(long id)
{
var insurance = _insuranceListApplication.GetDetailsForEdit(id);
@@ -834,12 +841,26 @@ public class IndexModel : PageModel
return Partial("Edit", insurance);
}
public IActionResult OnGetEmployeeListForEdit(EmployeeForEditInsuranceListSearchModel searchModel)
//-2
/// <summary>
/// لود اطلاعات پرسنل در مودال ویرایش بیمه -- DSKWOR
/// محاسبه تب پرسنل
/// </summary>
/// <param name="searchModel"></param>
/// <returns></returns>
public IActionResult OnGetEmployeeListForEdit(EmployeeForEditInsuranceListSearchModel searchModel)
{
var result = _insuranceListApplication.SearchEmployeeListForEditByInsuranceListId(searchModel);
return Partial("./EmployeeListForEdit", result);
// var result = _insuranceListApplication.SearchEmployeeListForEditByInsuranceListId(searchModel);
var result = _insuranceListApplication.GetEmployeeListForEditByInsuranceListId(searchModel);
return Partial("./EmployeeListForEdit", result);
}
//-3
/// <summary>
/// ذخیره ویرایش
/// </summary>
/// <param name="command"></param>
/// <returns></returns>
public IActionResult OnPostEdit(EditInsuranceList command)
{
//var result =new OperationResult();
@@ -874,7 +895,8 @@ public class IndexModel : PageModel
}
return new JsonResult(result);
}
}
#endregion
public IActionResult OnGetInsuranceSummary(long id)
{

236
ServiceHost/Areas/Admin/Pages/Company/InsuranceList/InsuranceConfirm.cshtml
View File

@@ -1,5 +1,4 @@
@using _0_Framework.Application
@using _0_Framework.Application
@model CompanyManagment.App.Contracts.InsuranceList.EditInsuranceList
@@ -134,7 +133,7 @@
#printThis .table-bordered > thead > tr > th {
font-size: 1.3rem;
font-size: 10px;
color: black;
text-align: center;
vertical-align: middle;
@@ -164,11 +163,11 @@
}
#printThis .colgp-3 {
width: 50px;
width: 74px;
}
#printThis .colgp-4 {
width: 33px;
width: 50px;
}
#printThis .colgp-5 {
@@ -180,23 +179,35 @@
}
#printThis .colgp-7 {
width: 35px;
width: 44px;
}
#printThis .colgp-8 {
width: 35px;
width: 44px;
}
#printThis .colgp-9 {
width: 30px;
width: 44px;
}
#printThis .colgp-10 {
width: 30px;
width: 44px;
}
#printThis .colgp-11 {
width: 25px;
width: 44px;
}
#printThis .colgp-12 {
width: 44px;
}
#printThis .colgp-13 {
width: 44px;
}
#printThis .colgp-14 {
width: 40px;
}
#printThis .table-bordered > tbody > tr:nth-child(12n) td:first-child {
@@ -268,7 +279,7 @@
.asignment-field {
display: flex;
justify-content: flex-end;
margin-bottom: 15px !important;
margin-bottom: 50px !important;
margin-top: 25px !important;
}
@@ -301,7 +312,7 @@
}
#printThis .table-bordered > thead > tr > th {
font-size: 1.1rem;
font-size: 10px;
}
#printThis .table-bordered > tbody > tr > td {
@@ -313,7 +324,7 @@
}
#printThis .colgp-4 {
width: 40px;
width: 50px;
}
#printThis .colgp-5 {
@@ -324,24 +335,36 @@
width: 18px;
}
#printThis .colgp-7 {
width: 44px;
}
#printThis .colgp-8 {
width: 40px;
width: 44px;
}
#printThis .colgp-9 {
width: 40px;
width: 44px;
}
#printThis .colgp-10 {
width: 44px;
}
#printThis .colgp-11 {
width: 44px;
}
#printThis .colgp-12 {
width: 60px;
width: 44px;
}
#printThis .colgp-13 {
width: 60px;
width: 44px;
}
#printThis .colgp-14 {
width: 60px;
width: 40px;
}
#printThis .colgp-15 {
@@ -412,7 +435,7 @@
#printThis .table-bordered > thead > tr > th {
font-size: 1.2rem;
font-size: 10px;
color: black;
text-align: center;
vertical-align: middle;
@@ -519,6 +542,9 @@
</div>
<table class="table table-bordered">
<colgroup>
<col class="colgp-14">
<col class="colgp-13">
<col class="colgp-12">
<col class="colgp-11">
<col class="colgp-10">
<col class="colgp-9">
@@ -534,10 +560,13 @@
<thead>
<tr>
<th class="header-pad" style="background: #80808033 !important;"> توضیحات </th>
<th class="header-pad2" style="background: #80808033 !important;"> مجموع مزایای ماهانه غیرمشمول </th>
<th class="header-pad2" style="background: #80808033 !important;"> مجموع حقوق و مزایای ماهیانه </th>
<th class="header-pad2" style="background: #80808033 !important;"> مجموع مزایای ماهیانه </th>
<th class="header-pad2" style="background: #80808033 !important;"> حقوق ماهیانه </th>
<th class="header-pad2" style="background: #80808033 !important;"> جمع حقوق و پایه سنواتی ماهانه </th>
<th class="header-pad2" style="background: #80808033 !important;"> پایه سنوات روزانه </th>
<th class="header-pad2" style="background: #80808033 !important;"> دستمزد روزانه </th>
<th class="header-pad" style="background: #80808033 !important;"> حق تاهل </th>
<th class="header-pad" style="background: #80808033 !important;"> روز کارکرد </th>
<th class="header-pad" style="background: #80808033 !important;"> سمت</th>
<th class="header-pad" style="background: #80808033 !important;"> کدملی </th>
@@ -606,10 +635,13 @@
}
</td>
}
<td>@Model.EmployeeDetailsForInsuranceList[j].BenefitsIncludedNonContinuous.ToMoney()</td>
<td>@Model.EmployeeDetailsForInsuranceList[j].BenefitsIncludedContinuous.ToMoney()</td>
<td>@Model.EmployeeDetailsForInsuranceList[j].MonthlyBenefits.ToMoney()</td>
<td>@Model.EmployeeDetailsForInsuranceList[j].MonthlySalary.ToMoney()</td>
<td>@Model.EmployeeDetailsForInsuranceList[j].BaseYears.ToMoney()</td>
<td>@Model.EmployeeDetailsForInsuranceList[j].DailyWage.ToMoney()</td>
<td>@Model.EmployeeDetailsForInsuranceList[j].MarriedAllowance.ToMoney()</td>
<td>@Model.EmployeeDetailsForInsuranceList[j].WorkingDays</td>
<td class="table-name">@Model.EmployeeDetailsForInsuranceList[j].JobName</td>
<td>@Model.EmployeeDetailsForInsuranceList[j].NationalCode</td>
@@ -644,6 +676,9 @@
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td style="padding: 15px 2px !important;"></td>
@@ -657,6 +692,9 @@
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td style="padding: 15px 2px !important;"></td>
@@ -670,13 +708,19 @@
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr style="background: #e6e6e6 !important;">
<td style="border-bottom-left-radius:9px;background: #e6e6e6 !important;"></td>
<td style="background: #e6e6e6 !important;">@Model.EmployeeDetailsForInsuranceList.Sum(x => x.BenefitsIncludedNonContinuous).ToMoney()</td>
<td style="background: #e6e6e6 !important;">@Model.EmployeeDetailsForInsuranceList.Sum(x => x.BenefitsIncludedContinuous).ToMoney()</td>
<td style="background: #e6e6e6 !important;">@Model.EmployeeDetailsForInsuranceList.Sum(x => x.MonthlyBenefits).ToMoney()</td>
<td style="background: #e6e6e6 !important;">@Model.EmployeeDetailsForInsuranceList.Sum(x => x.MonthlySalary).ToMoney()</td>
<td style="background: #e6e6e6 !important;">@Model.EmployeeDetailsForInsuranceList.Sum(x => x.BaseYears).ToMoney()</td>
<td style="background: #e6e6e6 !important;">@Model.EmployeeDetailsForInsuranceList.Sum(x => x.DailyWage).ToMoney()</td>
<td style="background: #e6e6e6 !important;">@Model.EmployeeDetailsForInsuranceList.Sum(x => x.MarriedAllowance).ToMoney()</td>
<td style="background: #e6e6e6 !important;">@Model.EmployeeDetailsForInsuranceList.Sum(x => x.WorkingDays)</td>
<td style=" border-right: hidden !important;background: #e6e6e6 !important;"></td>
<td style=" border-right: hidden !important;border-left: hidden !important;background: #e6e6e6 !important;"></td>
@@ -700,6 +744,9 @@
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td style="padding: 15px 2px !important;"></td>
@@ -713,6 +760,9 @@
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
}
else if (i == (q - 1) && (r>0 && r <= 10))
@@ -730,6 +780,9 @@
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
}
</tbody>
@@ -797,10 +850,13 @@
<thead>
<tr>
<th class="header-pad" style="background: #80808033 !important;"> توضیحات </th>
<th class="header-pad2" style="background: #80808033 !important;"> مجموع مزایای ماهانه غیرمشمول </th>
<th class="header-pad2" style="background: #80808033 !important;"> مجموع حقوق و مزایای ماهیانه </th>
<th class="header-pad2" style="background: #80808033 !important;"> مجموع مزایای ماهیانه </th>
<th class="header-pad2" style="background: #80808033 !important;"> حقوق ماهیانه </th>
<th class="header-pad2" style="background: #80808033 !important;"> جمع حقوق و پایه سنواتی ماهانه </th>
<th class="header-pad2" style="background: #80808033 !important;"> پایه سنوات روزانه </th>
<th class="header-pad2" style="background: #80808033 !important;"> دستمزد روزانه </th>
<th class="header-pad" style="background: #80808033 !important;"> حق تاهل </th>
<th class="header-pad" style="background: #80808033 !important;"> روز کارکرد </th>
<th class="header-pad" style="background: #80808033 !important;"> سمت</th>
<th class="header-pad" style="background: #80808033 !important;"> کدملی </th>
@@ -810,77 +866,77 @@
</tr>
</thead>
<tbody>
@if (CountLastRow == 0)
{
<tr>
<td style="padding: 15px 2px !important;"></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td style="padding: 15px 2px !important;"></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td style="padding: 15px 2px !important;"></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
@if (CountLastRow == 0)
{
<tr>
<td style="padding: 15px 2px !important;"></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td style="padding: 15px 2px !important;"></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td style="padding: 15px 2px !important;"></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
}
else if (CountLastRow == 2)
{
<tr>
<td style="padding: 15px 2px !important;"></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td style="padding: 15px 2px !important;"></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
}
}
else if (CountLastRow == 2)
{
<tr>
<td style="padding: 15px 2px !important;"></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td style="padding: 15px 2px !important;"></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
}
else if (CountLastRow == 1)
{

296
ServiceHost/Areas/Admin/Pages/Company/InsuranceList/InsuranceSummary.cshtml
View File

@@ -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 @@
</div>
<table class="table table-bordered" style="border-radius: 9px;">
<colgroup>
<col class="colgp-19">
<col class="colgp-18">
<col class="colgp-17">
<col class="colgp-16">
<col class="colgp-15">
<col class="colgp-14">
@@ -554,8 +637,8 @@
<col class="colgp-10">
<col class="colgp-9">
<col class="colgp-8">
<col class="colgp-7">
<col class="colgp-6">
@* <col class="colgp-7">
<col class="colgp-6"> *@
<col class="colgp-5">
<col class="colgp-4">
<col class="colgp-3">
@@ -565,16 +648,19 @@
<thead>
<tr>
<th style="background: #80808033 !important;border-top-left-radius: 9px!important;"> حق بیمه سهم بیمه شده </th>
<th style="background: #80808033 !important;"> مجموع مزایای ماهانه غیر مشمول </th>
<th style="background: #80808033 !important;"> حقوق و مزایای ماهیانه مشمول و غیر مشمول </th>
<th style="background: #80808033 !important;"> حقوق و مزایای ماهیانه مشمول </th>
<th style="background: #80808033 !important;"> مزایای ماهیانه مشمول </th>
<th style="background: #80808033 !important;"> حقوق ماهیانه مشمول </th>
<th style="background: #80808033 !important;"> جمع حقوق و پایه سنوانی ماهانه </th>
<th style="background: #80808033 !important;"> پایه سنوات روزانه </th>
<th style="background: #80808033 !important;"> دستمزد روزانه </th>
<th style="background: #80808033 !important;"> حق تاهل </th>
<th style="background: #80808033 !important;"> کارکرد </th>
<th style="background: #80808033 !important;"> تاریخ ترک کار </th>
<th style="background: #80808033 !important;">تاریخ آغاز بکار </th>
<th style="background: #80808033 !important;"> نام پدر </th>
<th style="background: #80808033 !important;"> شماره شناسنامه </th>
@* <th style="background: #80808033 !important;"> نام پدر </th>
<th style="background: #80808033 !important;"> شماره شناسنامه </th> *@
<th style="background: #80808033 !important;"> کدملی </th>
<th style="background: #80808033 !important;"> شغل</th>
<th style="background: #80808033 !important;"> نام و نام خانوادگی </th>
@@ -591,16 +677,19 @@
{
<tr>
<td>@item.InsuranceShare.ToMoney()</td>
<td>@item.BenefitsIncludedNonContinuous.ToMoney()</td>
<td>@item.BenefitsIncludedContinuous.ToMoney()</td>
<td>@item.MonthlyBenefitsIncluded.ToMoney()</td>
<td>@item.MonthlyBenefits.ToMoney()</td>
<td>@item.MonthlySalary.ToMoney()</td>
<td>@item.BaseYears.ToMoney()</td>
<td>@item.DailyWage.ToMoney()</td>
<td>@item.MarriedAllowance.ToMoney()</td>
<td>@item.WorkingDays</td>
<td>@item.LeftWorkDate</td>
<td>@item.StartWorkDate</td>
<td class="table-name">@item.FatherName</td>
<td>@item.IdNumber</td>
@* <td class="table-name">@item.FatherName</td>
<td>@item.IdNumber</td> *@
<td>@item.NationalCode</td>
<td class="table-name">@item.JobName</td>
<td class="table-name">@(item.FName + " " + item.LName)</td>
@@ -610,20 +699,23 @@
index = index + 1;
}
<tr class="total">
<tr class="total">
<td style="border-bottom-left-radius:9px !important;">@Model.EmployeeDetailsForInsuranceList.Sum(x=>x.InsuranceShare).ToMoney()</td>
<td>@Model.EmployeeDetailsForInsuranceList.Sum(x=>x.BenefitsIncludedNonContinuous).ToMoney()</td>
<td>@Model.EmployeeDetailsForInsuranceList.Sum(x=>x.BenefitsIncludedContinuous).ToMoney()</td>
<td>@Model.EmployeeDetailsForInsuranceList.Sum(x=>x.MonthlyBenefitsIncluded).ToMoney()</td>
<td>@Model.EmployeeDetailsForInsuranceList.Sum(x=>x.MonthlyBenefits).ToMoney()</td>
<td>@Model.EmployeeDetailsForInsuranceList.Sum(x=>x.MonthlySalary).ToMoney()</td>
<td>@Model.EmployeeDetailsForInsuranceList.Sum(x=>x.BaseYears).ToMoney()</td>
<td>@Model.EmployeeDetailsForInsuranceList.Sum(x=>x.DailyWage).ToMoney()</td>
<td>@Model.EmployeeDetailsForInsuranceList.Sum(x=>x.MarriedAllowance)</td>
<td>@Model.EmployeeDetailsForInsuranceList.Sum(x=>x.WorkingDays)</td>
<td style="border-right: hidden !important;"></td>
<td style=" border-left: hidden !important;border-right: hidden !important;" class="bl-hidden"></td>
<td style=" border-left: hidden !important;border-right: hidden !important;" class="bl-hidden"></td>
<td style="border-right: hidden !important;"></td>
<td style=" border-left: hidden !important;border-right: hidden !important;" class="bl-hidden"></td>
<td style=" border-left: hidden !important;border-right: hidden !important;" class="bl-hidden"></td>
<td style=" border-left: hidden !important;border-right: hidden !important;" class="bl-hidden"></td>
@* <td style=" border-left: hidden !important;border-right: hidden !important;" class="bl-hidden"></td>
<td style=" border-left: hidden !important;border-right: hidden !important;" class="bl-hidden"></td> *@
<td style=" border-left: hidden !important;border-right: hidden !important;" class="bl-hidden"></td>
<td style=" border-left: hidden !important;border-right: hidden !important;" class="bl-hidden"></td>
<td style="border-bottom-right-radius:9px !important; border-left: hidden !important" class="bl-hidden"></td>

BIN
ServiceHost/InsuranceList/11/1403_09/DSKWOR00.dbf
View File

Binary file not shown.

BIN
ServiceHost/InsuranceList/11/1403_11/DSKKAR00.dbf
View File

Binary file not shown.

BIN
ServiceHost/InsuranceList/11/1403_11/DSKWOR00.dbf
View File

Binary file not shown.

BIN
ServiceHost/InsuranceList/546/1403_05/DSKKAR00.dbf
View File

Binary file not shown.

BIN
ServiceHost/InsuranceList/546/1403_05/DSKWOR00.dbf
View File

Binary file not shown.

BIN
ServiceHost/InsuranceList/552/1403_10.zip Normal file
View File

Binary file not shown.

BIN
ServiceHost/InsuranceList/11/1403_09/DSKKAR00.dbf → ServiceHost/InsuranceList/552/1403_10/DSKKAR00.dbf
View File

Binary file not shown.

BIN
ServiceHost/InsuranceList/552/1403_10/DSKWOR00.dbf Normal file
View File

Binary file not shown.

30
ServiceHost/wwwroot/AdminTheme/css/insurance-list.css
View File

@@ -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;
}