diff --git a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Create.cshtml b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Create.cshtml
index f745bfdd..cdd73980 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Create.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Create.cshtml
@@ -143,7 +143,7 @@
-
+
@@ -151,46 +151,62 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -998,6 +1014,8 @@
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);
});
@@ -1013,6 +1031,10 @@
$('#txtInsuredShare').val(0);
$('#txtEmployerShare').val(0);
$('#txtUnEmploymentInsurance').val(0);
+ $('#txtSumOfBaseYears').val(0);
+ $('#txtSumOfMarriedAllowance').val(0);
+ $('#txtSumOfDailyWagePlusBaseYears').val(0);
+ $('#txtSumOfBenefitsIncludedNonContinuous').val(0);
} else {
$.ajax({
dataType: 'json',
@@ -1034,6 +1056,10 @@
$('#txtUnEmploymentInsurance').val(response.unEmploymentInsurance);
$('#txtSumOfBaseYears').val(response.sumOfBaseYears);
$('#txtSumOfMarriedAllowance').val(response.sumOfMarriedAllowance);
+ $('#txtSumOfDailyWagePlusBaseYears').val(response.sumOfDailyWagePlusBaseYears);
+ $('#txtSumOfBenefitsIncludedNonContinuous').val(response.sumOfBenefitsIncludedNonContinuous);
+ console.log(response.sumOfDailyWagePlusBaseYears);
+ console.log(response.sumOfBenefitsIncludedNonContinuous);
},
failure: function (response) {
console.log(5, response);
@@ -1184,6 +1210,7 @@
$("#divEmployeeInsurancListData").append(``);
$("#divEmployeeInsurancListData").append(``);
+
//$("#divEmployeeInsurancListData").append('');
//$("#divEmployeeInsurancListData").append('');
diff --git a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/EmployeeDatatable.cshtml b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/EmployeeDatatable.cshtml
index 8da42de1..f15739c2 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/EmployeeDatatable.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/EmployeeDatatable.cshtml
@@ -169,10 +169,10 @@
0 |
0 |
0 |
- 0 |
+ 0 |
0 |
0 |
- 0 |
+ 0 |
0 |
@item.IdNumber |
@item.DateOfBirth |
@@ -205,7 +205,7 @@
@(item.HasConfilictJobs ? "" : item.MonthlySalary.ToMoney()) |
@item.MarriedAllowance.ToMoney() |
@item.BaseYears.ToMoney() |
- @(item.HasConfilictJobs ? "" : item.DailyWageStr) |
+ @(item.HasConfilictJobs ? "" : item.DailyWageStr) |
@item.WorkingDays |
@item.IdNumber |
@item.DateOfBirth |
diff --git a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Index.cshtml.cs b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Index.cshtml.cs
index de3d9e00..dbfe3e08 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Index.cshtml.cs
+++ b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Index.cshtml.cs
@@ -250,7 +250,7 @@ public class IndexModel : PageModel
if (leftWorkDay != "01") //اگر ترک کار آن یکم ماه نبود
- sumOfBenefitIncludedAndNotIncluded += (employeeDetailsForInsuranceList[i].IncludedAndNotIncluded + employeeDetailsForInsuranceList[i].BenefitsIncludedNonContinuous);
+ sumOfBenefitIncludedAndNotIncluded += employeeDetailsForInsuranceList[i].IncludedAndNotIncluded;
benefitsIncludedNonContinuous += employeeDetailsForInsuranceList[i].BenefitsIncludedNonContinuous;
insuredShare = insuredShare + employeeDetailsForInsuranceList[i].InsuranceShare;
@@ -396,11 +396,11 @@ public class IndexModel : PageModel
//جمع حق تاهل
SumOfMarriedAllowance = sumOfMarriedAllowance.ToMoney(),
- //جمع دستمزد روزانه + پایه سنوات روزانه
- SumOfDailyWagePlusBaseyear = sumOfDailyWagePlusBaseYear.ToMoney(),
+ //جمع دستمزد روزانه + پایه سنوات روزانه
+ SumOfDailyWagePlusBaseYears = sumOfDailyWagePlusBaseYear.ToMoney(),
//جمع مزایای غیر مشمول
- SumOFbenefitsIncludedNonContinuous = benefitsIncludedNonContinuous,
+ SumOfBenefitsIncludedNonContinuous = benefitsIncludedNonContinuous.ToMoney(),
});
}
diff --git a/ServiceHost/wwwroot/AdminTheme/css/insurance-list.css b/ServiceHost/wwwroot/AdminTheme/css/insurance-list.css
index 6b181dc5..9f03025b 100644
--- a/ServiceHost/wwwroot/AdminTheme/css/insurance-list.css
+++ b/ServiceHost/wwwroot/AdminTheme/css/insurance-list.css
@@ -336,7 +336,7 @@
background-color: #d6f7ea;
}
- #DSKWOR-datatable tr td:nth-child(10), #DSKWOR-datatable tr td:nth-child(11) {
+ #DSKWOR-datatable tr td:nth-child(11), #DSKWOR-datatable tr td:nth-child(12) {
background-color: #efee5226;
}
@@ -719,6 +719,7 @@
.inputs-group {
padding: 7px 30px;
display: flex;
+ align-items: center;
}
.green {
@@ -729,6 +730,10 @@
background-color: #67c3cf5c;
}
+ .yellow {
+ background-color: #fbf3ae6e;
+ }
+
.header-style {
text-align: center;
vertical-align: middle;
@@ -1528,3 +1533,8 @@
}
/*------------ End Create InsuranceList ------------*/
+@media (max-width: 1366px) {
+ #DSSKAR .col-md-10.col-10.col-sm-10 {
+ font-size: 10px;
+ }
+}
\ No newline at end of file