Insurance New Change Completed
This commit is contained in:
@@ -884,30 +884,39 @@ public static class Tools
|
||||
string result = "";
|
||||
switch (value)
|
||||
{
|
||||
case "1":
|
||||
case "01":
|
||||
result = "فروردین";
|
||||
break;
|
||||
case "2":
|
||||
case "02":
|
||||
result = "اردیبهشت";
|
||||
break;
|
||||
case "3":
|
||||
case "03":
|
||||
result = "خرداد";
|
||||
break;
|
||||
case "4":
|
||||
case "04":
|
||||
result = "تیر";
|
||||
break;
|
||||
case "5":
|
||||
case "05":
|
||||
result = "مرداد";
|
||||
break;
|
||||
case "6":
|
||||
case "06":
|
||||
result = "شهریور";
|
||||
break;
|
||||
case "7":
|
||||
case "07":
|
||||
result = "مهر";
|
||||
break;
|
||||
case "8":
|
||||
case "08":
|
||||
result = "آبان";
|
||||
break;
|
||||
case "9":
|
||||
case "09":
|
||||
result = "آذر";
|
||||
break;
|
||||
|
||||
@@ -12,7 +12,7 @@ public class EmployeeInsurancListData : EntityBase
|
||||
{
|
||||
public EmployeeInsurancListData(long insuranceListId, long employeeId, int workingDays, double dailyWage, double monthlySalary,
|
||||
double monthlyBenefits, double monthlyBenefitsIncluded, double benefitsIncludedContinuous, double benefitsIncludedNonContinuous,
|
||||
double insuranceShare, DateTime startWorkDate, DateTime? leftWorkDate, long jobId,bool includeStatus, double baseYears, double marriedAllowance)
|
||||
double insuranceShare, DateTime startWorkDate, DateTime? leftWorkDate, long jobId,bool includeStatus, double baseYears, double marriedAllowance, double overTimePay, double familyAllowance)
|
||||
{
|
||||
InsuranceListId = insuranceListId;
|
||||
EmployeeId = employeeId;
|
||||
@@ -30,6 +30,8 @@ public class EmployeeInsurancListData : EntityBase
|
||||
IncludeStatus = includeStatus;
|
||||
BaseYears = baseYears;
|
||||
MarriedAllowance = marriedAllowance;
|
||||
OverTimePay = overTimePay;
|
||||
FamilyAllowance = familyAllowance;
|
||||
DailyWagePlusBaseYears = dailyWage + baseYears;
|
||||
}
|
||||
|
||||
@@ -110,10 +112,20 @@ public class EmployeeInsurancListData : EntityBase
|
||||
/// </summary>
|
||||
public double MarriedAllowance { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// اضافه کار فیش حقوقی
|
||||
/// </summary>
|
||||
public double OverTimePay { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// حق اولاد فیش حقوقی
|
||||
/// </summary>
|
||||
public double FamilyAllowance { get; private set; }
|
||||
|
||||
|
||||
public void Edit(int workingDays, double dailyWage, double monthlySalary, double monthlyBenefits, double monthlyBenefitsIncluded,
|
||||
double benefitsIncludedContinuous, double benefitsIncludedNonContinuous, double insuranceShare, DateTime startWorkDate,
|
||||
DateTime? leftWorkDate, long jobId, bool includeStatus, double baseYears, double marriedAllowance)
|
||||
DateTime? leftWorkDate, long jobId, bool includeStatus, double baseYears, double marriedAllowance, double overTimePay, double familyAllowance)
|
||||
{
|
||||
|
||||
WorkingDays = workingDays;
|
||||
@@ -130,6 +142,8 @@ public class EmployeeInsurancListData : EntityBase
|
||||
IncludeStatus= includeStatus;
|
||||
BaseYears = baseYears;
|
||||
MarriedAllowance = marriedAllowance;
|
||||
OverTimePay = overTimePay;
|
||||
FamilyAllowance = familyAllowance;
|
||||
DailyWagePlusBaseYears = dailyWage + baseYears;
|
||||
}
|
||||
|
||||
|
||||
@@ -90,4 +90,14 @@ public class CreateEmployeeInsurancListData
|
||||
/// DSW_SPOUSE
|
||||
/// </summary>
|
||||
public double MarriedAllowance { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// اضافه کار فیش حقوقی
|
||||
/// </summary>
|
||||
public double OverTimePay { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// حق اولاد فیش حقوقی
|
||||
/// </summary>
|
||||
public double FamilyAllowance { get; set; }
|
||||
}
|
||||
@@ -119,5 +119,15 @@ public class EmployeeInsurancListDataViewModel
|
||||
/// </summary>
|
||||
public double MarriedAllowance { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// اضافه کار فیش حقوقی
|
||||
/// </summary>
|
||||
public double OverTimePay { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// حق اولاد فیش حقوقی
|
||||
/// </summary>
|
||||
public double FamilyAllowance { get; set; }
|
||||
|
||||
|
||||
}
|
||||
@@ -270,21 +270,32 @@ public class EmployeeDetailsForInsuranceListViewModel
|
||||
/// حق اولاد فیش حقوقی
|
||||
/// </summary>
|
||||
public double FamilyAllowance { get; set; }
|
||||
///// <summary>
|
||||
///// مجموع پایه سنواتی کارکنان
|
||||
///// DSK_INC
|
||||
///// </summary>
|
||||
//public double SumOfBaseYears { get; set; }
|
||||
|
||||
///// <summary>
|
||||
///// جمع پایه سنوات و دستمزد روزانه کارکنان
|
||||
///// DSW_INC
|
||||
///// </summary>
|
||||
//public double SumOfDailyWagePlusBaseYears { get; set; }
|
||||
/// <summary>
|
||||
/// محاسبه اضافه کار
|
||||
/// </summary>
|
||||
public bool OverTimeIsSet { get; set; }
|
||||
|
||||
///// <summary>
|
||||
///// مجموع حق تاهل کارکنان
|
||||
///// DSK_SPOUSE
|
||||
///// </summary>
|
||||
//public double SumOfMarriedAllowance { get; set; }
|
||||
|
||||
/// <summary>
|
||||
///محاسبه حق اولاد
|
||||
/// </summary>
|
||||
public bool FamilyAllowanceIsSet { get; set; }
|
||||
///// <summary>
|
||||
///// مجموع پایه سنواتی کارکنان
|
||||
///// DSK_INC
|
||||
///// </summary>
|
||||
//public double SumOfBaseYears { get; set; }
|
||||
|
||||
///// <summary>
|
||||
///// جمع پایه سنوات و دستمزد روزانه کارکنان
|
||||
///// DSW_INC
|
||||
///// </summary>
|
||||
//public double SumOfDailyWagePlusBaseYears { get; set; }
|
||||
|
||||
///// <summary>
|
||||
///// مجموع حق تاهل کارکنان
|
||||
///// DSK_SPOUSE
|
||||
///// </summary>
|
||||
//public double SumOfMarriedAllowance { get; set; }
|
||||
}
|
||||
@@ -28,7 +28,7 @@ public class EmployeeInsurancListDataApplication : IEmployeeInsurancListDataAppl
|
||||
|
||||
var employeeInsurancListData = new EmployeeInsurancListData(command.InsuranceListId, command.EmployeeId, command.WorkingDays, command.DailyWage, command.MonthlySalary, command.MonthlyBenefits,
|
||||
command.MonthlyBenefitsIncluded, command.BenefitsIncludedContinuous, command.BenefitsIncludedNonContinuous, command.InsuranceShare,
|
||||
command.StartWorkDate,command.LeftWorkDate,command.JobId,command.IncludeStatus, command.BaseYears,command.MarriedAllowance);
|
||||
command.StartWorkDate,command.LeftWorkDate,command.JobId,command.IncludeStatus, command.BaseYears,command.MarriedAllowance,command.OverTimePay,command.FamilyAllowance);
|
||||
_employeeInsurancListDataRepository.Create(employeeInsurancListData);
|
||||
_employeeInsurancListDataRepository.SaveChanges();
|
||||
return operation.Succcedded();
|
||||
|
||||
@@ -472,12 +472,16 @@ public class InsuranceListApplication: IInsuranceListApplication
|
||||
|
||||
//محاسبه مزایای ماهانه
|
||||
var monthlyBenefits = GetMonthlyBenefits(endOfMonth, yearlysaleries.ConsumableItems, yearlysaleries.HousingAllowance, marriedAllowance, workingDays.countWorkingDays, searchModel.TypeOfInsuranceSendWorkshop, employee.JobId, employee.EmployeeId,employee.IncludeStatus);
|
||||
|
||||
|
||||
//if (employee.EmployeeId is 7999)// سید عباس خوشکلام سلیمان
|
||||
// monthlyBenefits = 80869389;
|
||||
//if (employee.EmployeeId is 43787)// شهرام براهیمی سیقلان
|
||||
// monthlyBenefits = 54748472;
|
||||
if (workshop.InsuranceCheckoutOvertime && employeeHasCheckout)
|
||||
{
|
||||
|
||||
monthlyBenefits = GetRoundValue(monthlyBenefits += overTimePay);
|
||||
}
|
||||
|
||||
var marriedAllowanceCompute = MarriedAllowance(employee.MaritalStatus, employee.JobId, employee.IncludeStatus,
|
||||
workingDays.countWorkingDays, yearlysaleries.MarriedAllowance, endOfMonth);
|
||||
@@ -503,16 +507,14 @@ public class InsuranceListApplication: IInsuranceListApplication
|
||||
if (workshop.InsuranceCheckoutFamilyAllowance && employeeHasCheckout)
|
||||
{
|
||||
|
||||
benefitsIncludedNonContinuous += familyAllowance;
|
||||
}
|
||||
|
||||
if (workshop.InsuranceCheckoutOvertime && employeeHasCheckout)
|
||||
{
|
||||
|
||||
benefitsIncludedContinuous += overTimePay;
|
||||
benefitsIncludedNonContinuous = GetRoundValue(benefitsIncludedNonContinuous + familyAllowance);
|
||||
}
|
||||
|
||||
|
||||
|
||||
var includedAndNotIncluded = benefitsIncludedContinuous + benefitsIncludedNonContinuous;
|
||||
|
||||
|
||||
return new EmployeeDetailsForInsuranceListViewModel
|
||||
{
|
||||
#region EmployeeInfo
|
||||
@@ -603,6 +605,8 @@ public class InsuranceListApplication: IInsuranceListApplication
|
||||
YearlySalaryItem = yearlysaleries.DayliWage,
|
||||
MonthlyBaseYearsStr = "0",
|
||||
MonthlyBaseYears = 0,
|
||||
OverTimePay = overTimePay,
|
||||
FamilyAllowance = familyAllowance
|
||||
#endregion
|
||||
|
||||
|
||||
@@ -1486,14 +1490,19 @@ public class InsuranceListApplication: IInsuranceListApplication
|
||||
workshop.InsuranceCheckoutFamilyAllowance || workshop.InsuranceCheckoutOvertime;
|
||||
|
||||
bool employeeHasCheckout = true;
|
||||
double familyAllowance = 0;
|
||||
double overTimePay = 0;
|
||||
bool hasOverTimePay = false;
|
||||
bool hasFamilyAllowance = false;
|
||||
|
||||
if (hasWorkshopOverTimeOrFamilyAllowance && (leftDate >= startDateGr || employeeData.LeftWorkDateGr == null))
|
||||
{
|
||||
var checkout = _checkoutRepository.HasCheckout(workshopId, employeeData.EmployeeId,
|
||||
searchModel.Year, searchModel.Month);
|
||||
if (checkout.hasChekout)
|
||||
{
|
||||
if (checkout.OverTimePay > 0)
|
||||
hasOverTimePay = true;
|
||||
if (checkout.FamilyAlloance > 0)
|
||||
hasFamilyAllowance = true;
|
||||
|
||||
}
|
||||
else
|
||||
@@ -1501,6 +1510,20 @@ public class InsuranceListApplication: IInsuranceListApplication
|
||||
employeeHasCheckout = false;
|
||||
}
|
||||
}
|
||||
|
||||
bool familyAllowanceIsSet = true;
|
||||
bool overTimePayIsSet = true;
|
||||
if (workshop.InsuranceCheckoutFamilyAllowance && employeeHasCheckout && employeeData.FamilyAllowance == 0 && hasFamilyAllowance)
|
||||
{
|
||||
|
||||
familyAllowanceIsSet = false;
|
||||
}
|
||||
|
||||
if (workshop.InsuranceCheckoutOvertime && employeeHasCheckout && employeeData.OverTimePay == 0 && hasOverTimePay)
|
||||
{
|
||||
|
||||
overTimePayIsSet = false;
|
||||
}
|
||||
return new EmployeeDetailsForInsuranceListViewModel
|
||||
{
|
||||
#region EmployeeInfo
|
||||
@@ -1593,6 +1616,9 @@ public class InsuranceListApplication: IInsuranceListApplication
|
||||
YearlySalaryItem = yearlysaleries.DayliWage,
|
||||
MonthlyBaseYearsStr = "0",
|
||||
MonthlyBaseYears = 0,
|
||||
|
||||
OverTimeIsSet = overTimePayIsSet,
|
||||
FamilyAllowanceIsSet = familyAllowanceIsSet
|
||||
#endregion
|
||||
|
||||
|
||||
|
||||
9483
CompanyManagment.EFCore/Migrations/20250510145511_NewPropToEmployeeInsuranceListData.Designer.cs
generated
Normal file
9483
CompanyManagment.EFCore/Migrations/20250510145511_NewPropToEmployeeInsuranceListData.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,40 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace CompanyManagment.EFCore.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class NewPropToEmployeeInsuranceListData : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<double>(
|
||||
name: "FamilyAllowance",
|
||||
table: "EmployeeInsurancListData",
|
||||
type: "float",
|
||||
nullable: false,
|
||||
defaultValue: 0.0);
|
||||
|
||||
migrationBuilder.AddColumn<double>(
|
||||
name: "OverTimePay",
|
||||
table: "EmployeeInsurancListData",
|
||||
type: "float",
|
||||
nullable: false,
|
||||
defaultValue: 0.0);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "FamilyAllowance",
|
||||
table: "EmployeeInsurancListData");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "OverTimePay",
|
||||
table: "EmployeeInsurancListData");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1954,6 +1954,9 @@ namespace CompanyManagment.EFCore.Migrations
|
||||
b.Property<long>("EmployeeId")
|
||||
.HasColumnType("bigint");
|
||||
|
||||
b.Property<double>("FamilyAllowance")
|
||||
.HasColumnType("float");
|
||||
|
||||
b.Property<bool>("IncludeStatus")
|
||||
.HasColumnType("bit");
|
||||
|
||||
@@ -1981,6 +1984,9 @@ namespace CompanyManagment.EFCore.Migrations
|
||||
b.Property<double>("MonthlySalary")
|
||||
.HasColumnType("float");
|
||||
|
||||
b.Property<double>("OverTimePay")
|
||||
.HasColumnType("float");
|
||||
|
||||
b.Property<DateTime>("StartWorkDate")
|
||||
.HasColumnType("datetime2");
|
||||
|
||||
|
||||
@@ -58,7 +58,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
|
||||
public (bool hasChekout, double FamilyAlloance, double OverTimePay) HasCheckout(long workshopId, long employeId, string year, string month)
|
||||
{
|
||||
var farisMonthName = Tools.ToFarsiMonthByNumber(month);
|
||||
|
||||
|
||||
var res = _context.CheckoutSet.FirstOrDefault(x =>
|
||||
x.WorkshopId == workshopId && x.EmployeeId == employeId && x.Year == year && x.Month == farisMonthName &&
|
||||
x.IsActiveString == "true");
|
||||
|
||||
@@ -121,14 +121,14 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
|
||||
item.BenefitsIncludedContinuous,
|
||||
item.BenefitsIncludedNonContinuous,
|
||||
item.InsuranceShare, item.StartWorkDate,
|
||||
item.LeftWorkDate, item.JobId,item.IncludeStatus,item.BaseYears,item.MarriedAllowance);
|
||||
item.LeftWorkDate, item.JobId,item.IncludeStatus,item.BaseYears,item.MarriedAllowance,item.OverTimePay,item.FamilyAllowance);
|
||||
_employeeInsurancListDataRepository.Create(employeeInsurancListData);
|
||||
}
|
||||
else
|
||||
{
|
||||
var employeeInsurancListDataObj = _employeeInsurancListDataRepository.Get(item.EmployeeInsurancListDataId);
|
||||
employeeInsurancListDataObj.Edit(item.WorkingDays,item.DailyWage,item.MonthlySalary,item.MonthlyBenefits,item .MonthlyBenefitsIncluded,item.BenefitsIncludedContinuous,
|
||||
item.BenefitsIncludedNonContinuous,item.InsuranceShare,item.StartWorkDate,item.LeftWorkDate,item.JobId,item.IncludeStatus,item.BaseYears,item.MarriedAllowance);
|
||||
item.BenefitsIncludedNonContinuous,item.InsuranceShare,item.StartWorkDate,item.LeftWorkDate,item.JobId,item.IncludeStatus,item.BaseYears,item.MarriedAllowance,item.OverTimePay,item.FamilyAllowance);
|
||||
}
|
||||
}
|
||||
_employeeInsurancListDataRepository.SaveChanges();
|
||||
@@ -641,7 +641,7 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
|
||||
item.BenefitsIncludedContinuous,
|
||||
item.BenefitsIncludedNonContinuous,
|
||||
item.InsuranceShare, item.StartWorkDate,
|
||||
item.LeftWorkDate, item.JobId,item.IncludeStatus,item.BaseYears,item.MarriedAllowance);
|
||||
item.LeftWorkDate, item.JobId,item.IncludeStatus,item.BaseYears,item.MarriedAllowance,item.OverTimePay,item.FamilyAllowance);
|
||||
_employeeInsurancListDataRepository.Create(employeeInsurancListData);
|
||||
|
||||
}_employeeInsurancListDataRepository.SaveChanges();
|
||||
@@ -1374,6 +1374,12 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
|
||||
|
||||
//حق بیمه سهم بیمه شده
|
||||
InsuranceShare = result.x.result.employeeData.InsuranceShare,
|
||||
|
||||
//اضافه کار فیش حقوقی
|
||||
OverTimePay = result.x.result.employeeData.OverTimePay,
|
||||
|
||||
//حق اولا فیش حقوقی
|
||||
FamilyAllowance = result.x.result.employeeData.FamilyAllowance,
|
||||
});
|
||||
|
||||
|
||||
|
||||
@@ -1248,6 +1248,8 @@
|
||||
var includeStatus = Number($(this).attr('data-includeStatus')) == 1 ? true : false;
|
||||
|
||||
var leftWorkDate = $(this).find('td:eq(1)').attr("data-leftworkdate");
|
||||
var overTimePay = $(this).find('td:eq(1)').attr("data-OverTimePay");
|
||||
var familyAllowance = $(this).find('td:eq(1)').attr("data-FamilyAllowance");
|
||||
var nationality = $(this).attr("data-nationality");
|
||||
//console.log(leftWorkDate);
|
||||
var startWorkDate = $(this).find('td:eq(2)').attr("data-startworkdate");
|
||||
@@ -1343,6 +1345,10 @@
|
||||
}].MarriedAllowance" id="EmployeeInsurancListDataList_${i}__MarriedAllowance" value="${marriedAllowance}" />`);
|
||||
$("#divEmployeeInsurancListData").append(`<input type="hidden" name="EmployeeInsurancListDataList[${i
|
||||
}].BaseYears" id="EmployeeInsurancListDataList_${i}__BaseYears" value="${baseYears}" />`);
|
||||
$("#divEmployeeInsurancListData").append(`<input type="hidden" name="EmployeeInsurancListDataList[${i
|
||||
}].OverTimePay" id="EmployeeInsurancListDataList_${i}__OverTimePay" value="${overTimePay}" />`);
|
||||
$("#divEmployeeInsurancListData").append(`<input type="hidden" name="EmployeeInsurancListDataList[${i
|
||||
}].FamilyAllowance" id="EmployeeInsurancListDataList_${i}FamilyAllowance" value="${familyAllowance}" />`);
|
||||
});
|
||||
$("#form").submit();
|
||||
} else {
|
||||
|
||||
@@ -167,6 +167,8 @@
|
||||
|
||||
@foreach (var item in Model.EmployeeDetailsForInsuranceList)
|
||||
{
|
||||
<input type="hidden" id="familyAllownce" value="@item.FamilyAllowance" asp-for="@item.FamilyAllowance"/>
|
||||
<input type="hidden" value="@item.OverTimePay" asp-for="@item.OverTimePay"/>
|
||||
if (item.LeftWorkDate == item.StartMonthCurrent)
|
||||
{
|
||||
<tr data-hasconfilictjobs="@item.HasConfilictJobs" data-nationality="@item.Nationality" data-yearlySalaryItem="@item.YearlySalaryItem" data-IncludeStatus="@Convert.ToInt32(item.IncludeStatus)" class="leftwork" data-employeeId="@item.EmployeeId" data-insuranceEmployeeInformationId="@item.InsuranceEmployeeInformationId" data-DateOfIssue="@item.DateOfIssue">
|
||||
@@ -176,7 +178,7 @@
|
||||
<i class="fa faSize fa-sign-out"></i>
|
||||
</a>*@
|
||||
</td>
|
||||
<td data-LeftWorkDate="@item.LeftWorkDateGr" class="small-font td-ellipsis ">@item.LeftWorkDate</td>
|
||||
<td data-OverTimePay="@item.OverTimePay" data-FamilyAllowance="@item.FamilyAllowance" data-LeftWorkDate="@item.LeftWorkDateGr" class="small-font td-ellipsis ">@item.LeftWorkDate</td>
|
||||
<td data-StartWorkDate="@item.StartWorkDateGr" class="small-font td-ellipsis emptyTR">@item.StartWorkDate</td>
|
||||
<td data-Id="@item.JobId" data-jobcode="@item.JobCode" class="@(item.HasConfilictJobs && item.JobId != 10 ? "blink" : "") small-font td-ellipsis emptyTR" id="JobName">@item.JobName</td>
|
||||
<td data-InsuranceShare="0" data-EmployerShare="0" data-UnemploymentInsurance="0" class="small-font td-ellipsis emptyTR">0</td>
|
||||
@@ -209,7 +211,7 @@
|
||||
<i class="fa faSize fa-sign-out"></i>
|
||||
</a>*@
|
||||
</td>
|
||||
<td data-LeftWorkDate="@item.LeftWorkDateGr" class="small-font td-ellipsis ">@item.LeftWorkDate</td>
|
||||
<td data-OverTimePay="@item.OverTimePay" data-FamilyAllowance="@item.FamilyAllowance" data-LeftWorkDate="@item.LeftWorkDateGr" class="small-font td-ellipsis ">@item.LeftWorkDate</td>
|
||||
<td data-StartWorkDate="@item.StartWorkDateGr" class="small-font td-ellipsis emptyTR">@item.StartWorkDate</td>
|
||||
<td data-Id="@item.JobId" data-jobcode="@item.JobCode" class="@(item.HasConfilictJobs && item.JobId != 10 ? "blink" : "") small-font td-ellipsis emptyTR jobName">@item.JobName</td>
|
||||
<td data-InsuranceShare="@item.InsuranceShare" data-EmployerShare="@item.EmployerShare" data-UnemploymentInsurance="@item.UnEmploymentInsurance" class="small-font td-ellipsis emptyTR">@item.InsuranceShare.ToMoney()</td>
|
||||
@@ -230,6 +232,7 @@
|
||||
<td class="td-ellipsis emptyTR">@item.LName</td>
|
||||
<td class="td-ellipsis emptyTR">@item.FName</td>
|
||||
<td class="td-ellipsis emptyTR">@item.InsuranceCode</td>
|
||||
|
||||
<td class="td-ellipsis ">@index</td>
|
||||
</tr>
|
||||
}
|
||||
|
||||
@@ -31,8 +31,8 @@
|
||||
@if (Model.EmployeeDetailsForInsuranceList != null)
|
||||
{
|
||||
var index = 1;
|
||||
|
||||
if (Model.EmployeeDetailsForInsuranceList.Any(x => !x.IsMaritalStatusSet || !x.EmployeeHasCheckout))
|
||||
|
||||
if (Model.EmployeeDetailsForInsuranceList.Any(x => !x.IsMaritalStatusSet || !x.EmployeeHasCheckout))
|
||||
{
|
||||
<script>
|
||||
|
||||
@@ -99,12 +99,69 @@
|
||||
</tbody>
|
||||
</table>
|
||||
}
|
||||
else if (Model.EmployeeDetailsForInsuranceList.Any(x=>x.FamilyAllowanceIsSet == false || x.OverTimeIsSet == false))
|
||||
{
|
||||
<script>
|
||||
$('#maritalStatusErr').val(true);
|
||||
</script>
|
||||
|
||||
<table id="DSKWOR" class="table table-bordered table-striped dataTable" style="min-width: 473px;">
|
||||
<colgroup>
|
||||
|
||||
<col class="colgp-4">
|
||||
<col class="colgp-3">
|
||||
<col class="colgp-2">
|
||||
<col class="colgp-1">
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th colspan="4">
|
||||
|
||||
<p style="color: red">
|
||||
<span> محاسبات اضافه کار یا حق اولاد پرسنل زیر در لیست بیمه وجود ندارد </span>
|
||||
<br/>
|
||||
<span>لطفا لیست بیمه را حذف و مجددا ایجاد نمایید</span>
|
||||
</p>
|
||||
</th>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
<th class="header-style 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>
|
||||
|
||||
</tr>
|
||||
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
@foreach (var item in Model.EmployeeDetailsForInsuranceList)
|
||||
{
|
||||
if (!item.OverTimeIsSet || !item.FamilyAllowanceIsSet)
|
||||
{
|
||||
<tr>
|
||||
|
||||
<td class="td-ellipsis @(item.Nationality == "ایرانی" ? "emptyTR" : "")">@item.NationalCode</td>
|
||||
<td class="td-ellipsis emptyTR">@item.LName</td>
|
||||
<td class="td-ellipsis emptyTR">@item.FName</td>
|
||||
<td class="td-ellipsis ">@index</td>
|
||||
</tr>
|
||||
index++;
|
||||
}
|
||||
}
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
}
|
||||
else
|
||||
{
|
||||
<script>
|
||||
<script>
|
||||
|
||||
$('#maritalStatusErr').val(false);
|
||||
</script>
|
||||
|
||||
|
||||
}
|
||||
|
||||
<div class="col-md-6 @(Model.EmployeeDetailsForInsuranceList.Any(x => !x.IsMaritalStatusSet) ? "hideDataTable" : "")" style="float: left;">
|
||||
|
||||
@@ -719,8 +719,7 @@ public class IndexModel : PageModel
|
||||
|
||||
foreach (var item in createInsuranceList.EmployeeInsurancListDataList)
|
||||
{
|
||||
var employee = createInsuranceList.EmployeeDetailsForInsuranceList
|
||||
.Where(p => p.EmployeeId == item.EmployeeId).FirstOrDefault();
|
||||
var employee = createInsuranceList.EmployeeDetailsForInsuranceList.FirstOrDefault(p => p.EmployeeId == item.EmployeeId);
|
||||
|
||||
//var employeeObj = _employeeApplication.GetDetails(item.EmployeeId);
|
||||
|
||||
|
||||
@@ -82,7 +82,7 @@ namespace ServiceHost.Areas.Admin.Pages
|
||||
|
||||
TaskCount = await _taskApplication.RequestedAndOverdueTasksCount(userId);
|
||||
TicketCount = _ticketApplication.GetAdminTicketsCount();
|
||||
SmsRemaining = (int)await _smsService.GetCreditAmount();
|
||||
//SmsRemaining = (int)await _smsService.GetCreditAmount();
|
||||
|
||||
//foreach (string fileEntry in fileEntries)
|
||||
//{
|
||||
|
||||
Reference in New Issue
Block a user