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

insurance bug fixed - new permistion for adminWorkflow and cheker

Browse Source
This commit is contained in:
SamSys
2025-02-12 18:47:57 +03:30
parent 5afe91ce38
commit c60ce9cf36
25 changed files with 184 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
0_Framework/Application/AuthHelper.cs
View File

@@ -96,7 +96,7 @@ public class AuthHelper : IAuthHelper
claimsIdentity.AddClaim(new Claim("WorkshopSlug", newWorkshopSlug));
claimsIdentity.AddClaim(new Claim("workshopName", newWorkshopName));
claimsIdentity.AddClaim(new Claim("WorkshopName", newWorkshopName));
var authProperties = new AuthenticationProperties

6
0_Framework/Application/Tools.cs
View File

@@ -82,9 +82,9 @@ public static class Tools
case 40469://ثابت
countDays = 7;
break;
case 9950://ثابت
countDays = 15;
break;
//case 9950://ثابت
// countDays = 15;
//break;
case 9640://ثابت
countDays = 15;
break;

4
CompanyManagment.Application/InsuranceListApplication.cs
View File

@@ -1886,8 +1886,8 @@ public class InsuranceListApplication: IInsuranceListApplication
case 40469://ثابت
countWorkingDays = 7;
break;
case 9950://ثابت
countWorkingDays = 15;
//case 9950://ثابت
// countWorkingDays = 15;
break;
case 9640://ثابت
countWorkingDays = 15;

5
CompanyManagment.EFCore/Repository/ContractRepository.cs
View File

@@ -690,12 +690,13 @@ public class ContractRepository : RepositoryBase<long, Contract>, IContractRepos
};
var leftworkList = _leftWorkRepository.search(searchModel);
if(leftworkList.Count == 0)
var lastLeftWork = leftworkList.FirstOrDefault(x => contractStart <= x.LeftWorkDateGr && ContractEnd >= x.StartWorkDateGr);
if (leftworkList.Count == 0 || lastLeftWork == null)
return new ContractSeparationViewModel()
{
checker = false
};
var lastLeftWork = leftworkList.FirstOrDefault(x=>contractStart <= x.LeftWorkDateGr && ContractEnd >= x.StartWorkDateGr);
//if (lastLeftWork.StartWorkDateGr > contractStart)
// lastLeftWork = leftworkList.FirstOrDefault(x =>
// x.StartWorkDateGr <= contractStart && x.LeftWorkDateGr > contractStart);

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

@@ -376,11 +376,11 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
insurance => insurance.WorkshopId,
workshop => workshop.id,
(insurance, workshop) => new { insurance, workshop })
.Join(_context.WorkshopEmployers,
.GroupJoin(_context.WorkshopEmployers,
result => result.workshop.id,
employer => employer.WorkshopId,
(result, employer) => new { result.insurance, result.workshop, employer })
.Select(result => new InsuranceListViewModel
.Select(result => new InsuranceListViewModel
{
Id = result.insurance.id,
Year = result.insurance.Year,
@@ -399,10 +399,10 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
City = "",
ConfirmSentlist = result.insurance.ConfirmSentlist,
IsBlockCantracingParty = _context.PersonalContractingParties
.Where(p => p.Employers.Any(e => e.id == result.employer.EmployerId))
.Where(p => p.Employers.Any(e => e.id == result.employer.First().EmployerId))
.Select(p => p.IsBlock)
.FirstOrDefault(),
EmployerId = result.employer.EmployerId
EmployerId = result.employer.First().EmployerId
});

42
CompanyManagment.EFCore/Repository/LeftWorkInsuranceRepository.cs
View File

@@ -165,11 +165,11 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
if(hasInsurance)
break;
}
if (hasInsurance)
{
return op.Failed("برای این پرسنل در این کارگاه لیست بیمه ارسال شده است.");
}
//tempChange
//if (hasInsurance)
//{
// return op.Failed("برای این پرسنل در این کارگاه لیست بیمه ارسال شده است.");
//}
var list = _context.LeftWorkInsuranceList.Where(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId).ToList();
if (list != null && list.Count > 0)
_context.LeftWorkInsuranceList.RemoveRange(list);
@@ -529,8 +529,9 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
// return op.Failed("برای این پرسنل در این تاریخ لیست بیمه ارسال شده است.برای حذف تاریخ شروع به کار، ابتدا لیست بیمه مربوطه را حذف کنید");
//}
//else
if (type == 2 && hasInsurance)
return op.Failed("برای این پرسنل در این تاریخ لیست بیمه تنظیم شده است.برای حذف تاریخ ترک کار، ابتدا لیست بیمه مربوطه را حذف کنید");
//tempChange
//if (type == 2 && hasInsurance)
// return op.Failed("برای این پرسنل در این تاریخ لیست بیمه تنظیم شده است.برای حذف تاریخ ترک کار، ابتدا لیست بیمه مربوطه را حذف کنید");
return op.Succcedded();
@@ -559,15 +560,18 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
{
if (type == 1)
{
var insurance = _context.EmployeeInsurancListDataSet.Where(x =>
x.EmployeeId == employeeId && x.InsuranceListId == item.id &&
x.StartWorkDate.Date < date.Date).FirstOrDefault();
if (insurance!=null)
{
var insuranceListObj= insuranceList.FirstOrDefault(x => x.id == item.id);
string resulDate= insuranceListObj.Month.ToFarsiMonthByNumber() + " " + insuranceListObj.Year;
return op.Failed(" به دلیل استفاده این تاریخ در ایجاد لیست بیمه، ویرایش تاریخ قبل از تاریخ " + resulDate + " امکان پذیر می باشد. ");
}
//TempChange
// بصورت موقت کامنت شد
//var insurance = _context.EmployeeInsurancListDataSet.Where(x =>
// x.EmployeeId == employeeId && x.InsuranceListId == item.id &&
// x.StartWorkDate.Date < date.Date).FirstOrDefault();
//if (insurance!=null)
//{
// var insuranceListObj= insuranceList.FirstOrDefault(x => x.id == item.id);
// string resulDate= insuranceListObj.Month.ToFarsiMonthByNumber() + " " + insuranceListObj.Year;
// return op.Failed(" به دلیل استفاده این تاریخ در ایجاد لیست بیمه، ویرایش تاریخ قبل از تاریخ " + resulDate + " امکان پذیر می باشد. ");
//}
}
else
@@ -647,12 +651,14 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
if (type == 1)
{
string resulDate = month.ToFarsiMonthByNumber() + " " + year;
return op.Failed("در صورت تمایل به ثبت تاریخ شروع به کار این پرسنل می بایست لیست تنظیمی "+ resulDate + " بیمه را حذف نمایید.");
//tempChange
//return op.Failed("در صورت تمایل به ثبت تاریخ شروع به کار این پرسنل می بایست لیست تنظیمی "+ resulDate + " بیمه را حذف نمایید.");
}
else
{
string resulDate = month.ToFarsiMonthByNumber() + " " + year;
return op.Failed("در صورت تمایل به ثبت تاریخ ترک کار به کار این پرسنل می بایست لیست تنظیمی بیمه "+ resulDate + " را حذف نمایید.");
//tempChange
// return op.Failed("در صورت تمایل به ثبت تاریخ ترک کار به کار این پرسنل می بایست لیست تنظیمی بیمه "+ resulDate + " را حذف نمایید.");
}
}

6
CompanyManagment.EFCore/Repository/LeftWorkRepository.cs
View File

@@ -179,7 +179,11 @@ public class LeftWorkRepository : RepositoryBase<long, LeftWork>, ILeftWorkRepos
var entity = _context.LeftWorkList.FirstOrDefault(x =>
x.WorkshopId == workshopId && x.EmployeeId == employeeId &&
(x.StartWorkDate <= dateTime && x.LeftWorkDate >= dateTime));
return new()
if (entity == null)
{
return null;
}
return new()
{
EmployeeId = entity.EmployeeId,
WorkshopId = entity.WorkshopId,

59
ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml
View File

@@ -704,21 +704,58 @@
@* بیمه *@
<div class="parent-check">
<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn"/>
</label>
<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn"/>
</label>
<label class="btn btn-inverse waves-effect waves-light m-b-5 parent"> <input type="checkbox" value="800" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> بیمه </span>&nbsp;</label>
@*لیست مشاغل مقطوع*@
<div class="child-check level2">
<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn"/>
</label>
<label class="btn btn-inverse waves-effect waves-light m-b-5 parentLevel2"> <input type="checkbox" disabled="disabled" value="801" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> لیست مشاغل مقطوع </span> </label>
<label class="btn btn-inverse waves-effect waves-light m-b-5 parent"> <input type="checkbox" value="800" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> بیمه </span>&nbsp;</label>
@*لیست مشاغل مقطوع*@
<div class="child-check level2">
<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn"/>
</label>
<label class="btn btn-inverse waves-effect waves-light m-b-5 parentLevel2"> <input type="checkbox" disabled="disabled" value="801" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> لیست مشاغل مقطوع </span> </label>
</div>
</div>
</div>
@* کارپوشه *@
<div class="parent-check">
<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
</label>
<label class="btn btn-inverse waves-effect waves-light m-b-5 parent"> <input type="checkbox" value="1000" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> کارپوشه </span>&nbsp;</label>
@* <div class="child-check level2">
<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn"/>
</label>
<label class="btn btn-inverse waves-effect waves-light m-b-5 parentLevel2"> <input type="checkbox" disabled="disabled" value="801" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> لیست مشاغل مقطوع </span> </label>
</div> *@
</div>
@* بررسی مدارک پرسنل *@
<div class="parent-check">
<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
</label>
<label class="btn btn-inverse waves-effect waves-light m-b-5 parent"> <input type="checkbox" value="1100" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> برسی مدارک پرسنل </span>&nbsp;</label>
@* <div class="child-check level2">
<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn"/>
</label>
<label class="btn btn-inverse waves-effect waves-light m-b-5 parentLevel2"> <input type="checkbox" disabled="disabled" value="801" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> لیست مشاغل مقطوع </span> </label>
</div> *@
</div>
</fieldset>
<div id="hiddenInput" style="display: none">

36
ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml
View File

@@ -724,6 +724,42 @@
</div>
@* کارپوشه *@
<div class="parent-check">
<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn"/>
</label>
<label class="btn btn-inverse waves-effect waves-light m-b-5 parent"> <input type="checkbox" value="1000" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> کارپوشه </span>&nbsp;</label>
@* <div class="child-check level2">
<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn"/>
</label>
<label class="btn btn-inverse waves-effect waves-light m-b-5 parentLevel2"> <input type="checkbox" disabled="disabled" value="801" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> لیست مشاغل مقطوع </span> </label>
</div> *@
</div>
@* بررسی مدارک پرسنل *@
<div class="parent-check">
<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn"/>
</label>
<label class="btn btn-inverse waves-effect waves-light m-b-5 parent"> <input type="checkbox" value="1100" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> برسی مدارک پرسنل </span>&nbsp;</label>
@* <div class="child-check level2">
<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn"/>
</label>
<label class="btn btn-inverse waves-effect waves-light m-b-5 parentLevel2"> <input type="checkbox" disabled="disabled" value="801" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> لیست مشاغل مقطوع </span> </label>
</div> *@
</div>
</fieldset>
<div id="hiddenInput" @*style="display: none"*@>

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

@@ -757,7 +757,8 @@
$(this).find('td:eq(7)').attr('data-monthlybenefits', benefitsIncludedContinuous);
$(this).find('td:eq(8)').text($('#hiddenMonthlySalaryPlusBaseYear').val());
$(this).find('td:eq(8)').attr("data-monthlysalary", monthlySalaryPlusBaseyear);
$(this).find('td:eq(8)').attr("data-monthlysalary", monthlySalaryPlusBaseyear);
$(this).find('td:eq(8)').attr("data-MonthlySalaryPlusBaseyear", monthlySalaryPlusBaseyear);
$(this).find('td:eq(11)').text($('#DailyWage').val());
$(this).find('td:eq(11)').attr("data-dailywage", getNumberValue($('#DailyWage').val()));

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

@@ -700,6 +700,7 @@
$(this).find('td:eq(8)').text($('#hiddenMonthlySalaryPlusBaseYear').val());
$(this).find('td:eq(8)').attr("data-monthlysalary", monthlySalaryPlusBaseyear);
$(this).find('td:eq(8)').attr("data-MonthlySalaryPlusBaseyear", monthlySalaryPlusBaseyear);
$(this).find('td:eq(11)').text($('#DailyWage').val());
$(this).find('td:eq(11)').attr("data-dailywage", getNumberValue($('#DailyWage').val()));

4
ServiceHost/Areas/Admin/Pages/Company/InsuranceList/EmployeeDatatable.cshtml
View File

@@ -169,11 +169,11 @@
<td data-IncludedAndNotIncluded="0" data-BenefitsIncludedNonContinuous="0" class="small-font td-ellipsis emptyTR">0 </td>
<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" data-MonthlySalaryPlusBaseyear="0" class="small-font td-ellipsis emptyTR">0</td>
<td data-MonthlySalary="0" data-MonthlySalaryPlusBaseyear="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 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>
<td class="td-ellipsis emptyTR">@item.PlaceOfIssue</td>

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

@@ -934,7 +934,7 @@ public class IndexModel : PageModel
dailyWag = "0",
dailyWagePlusBaseYear = "0",
marriedAllowance = "0",
baseYesr = "0",
baseYears = "0",
});

18
ServiceHost/Areas/Admin/Pages/Shared/_Menu.cshtml
View File

@@ -416,7 +416,23 @@
</li>
<li permission="1000">
<a asp-area="AdminNew" asp-page="/Company/WorkFlow/Index" class="waves-effect btnWorkFlow">
<div class="menuTitle">
<i class="md md-home"></i>
<span> کارپوشه </span>
</div>
</a>
</li>
<li permission="1100">
<a asp-area="AdminNew" asp-page="/Company/EmployeesDocumentsManagement/Index" class="waves-effect btnWorkFlow">
<div class="menuTitle">
<i class="md md-home"></i>
<span> بررسی مدارک پرسنل </span>
</div>
</a>
</li>
</ul>
<div class="clearfix"></div>

18
ServiceHost/Areas/AdminNew/Pages/Shared/_Menu.cshtml
View File

@@ -624,7 +624,23 @@
</li>
</ul>
</li>
<li permission="1000">
<a asp-area="AdminNew" asp-page="/Company/WorkFlow/Index" class="waves-effect btnWorkFlow">
<div class="menuTitle">
<i class="md md-home"></i>
<span> کارپوشه </span>
</div>
</a>
</li>
<li permission="1100">
<a asp-area="AdminNew" asp-page="/Company/EmployeesDocumentsManagement/Index" class="waves-effect btnWorkFlow">
<div class="menuTitle">
<i class="md md-home"></i>
<span> بررسی مدارک پرسنل </span>
</div>
</a>
</li>
</ul>
<div class="clearfix"></div>

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

Binary file not shown.

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

Binary file not shown.

BIN
ServiceHost/InsuranceList/396/1403_10/DSKKAR00.dbf Normal file
View File

Binary file not shown.

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

Binary file not shown.

BIN
ServiceHost/InsuranceList/537/1403_10/DSKKAR00.dbf Normal file
View File

Binary file not shown.

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

Binary file not shown.

6
ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/Index.js
View File

@@ -1324,7 +1324,11 @@ $(window).scroll(function () {
} else if ($('#btnTaskTicket').hasClass('active')) {
loadMore('ticket');
} else if ($('#btnTaskRequest').hasClass('active')) {
loadMore('request');
loadMoreRequest('request');
} else if ($('#btnTicketList').hasClass('active')) {
loadMore('TasksHaveTicket');
} else if ($('#btnTicketRequestList').hasClass('active')) {
loadMoreRequest('TaskHaveTicketRequests')
}
}
});

2
ServiceHost/wwwroot/AssetsClient/pages/RollCall/css/CaseHistory.css
View File

@@ -79,7 +79,7 @@
padding: 3px 1px;
color: #d97706;
margin: auto 1px auto 2px;
background: rgba(217, 119, 6, 0.18);
background: #fef3c7;
transition: ease .2s;
}

8
ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/CaseHistory.js
View File

@@ -461,7 +461,7 @@ function caseHistoryLoadAjax() {
<div class="Rtable-cell--content text-center h-100">
<div class="d-md-none d-none">عملیات: </div>
<button type="button" onclick="openModalLeave(${item.employeeId}, '${item.dateFa}', '${item.employeeFullName}')" class="btn-leave-casehistory position-relative d-none ${item.hasLeave || !item.isAbsent ? `disable` : ``}">
<button type="button" onclick="openModalLeave(${item.employeeId}, '${item.dateFa}', '${item.employeeFullName}')" class="btn-leave-casehistory position-relative d-md-block d-none ${item.hasLeave || !item.isAbsent ? `disable` : ``}">
<svg width="20" height="20" viewBox="0 0 24 24" id="_24x24_On_Light_Session-Leave" data-name="24x24/On Light/Session-Leave" xmlns="http://www.w3.org/2000/svg" fill="#d97706">
<g id="SVGRepo_bgCarrier" stroke-width="0"></g>
<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g>
@@ -570,7 +570,7 @@ function caseHistoryLoadAjax() {
<div class="col-12 mt-2">
<div class="d-flex">
<button type="button" onclick="openModalLeave(${item.employeeId}, '${item.dateFa}', '${item.employeeFullName}')" class="btn-leave-casehistory position-relative d-none justify-content-center align-items-center ${item.hasLeave || !item.isAbsent ? `disable` : ``}" style="width:100%">
<button type="button" onclick="openModalLeave(${item.employeeId}, '${item.dateFa}', '${item.employeeFullName}')" class="btn-leave-casehistory position-relative d-md-none d-flex justify-content-center align-items-center ${item.hasLeave || !item.isAbsent ? `disable` : ``}" style="width:100%">
<svg width="20" height="20" viewBox="0 0 24 24" id="_24x24_On_Light_Session-Leave" data-name="24x24/On Light/Session-Leave" xmlns="http://www.w3.org/2000/svg" fill="#d97706">
<g id="SVGRepo_bgCarrier" stroke-width="0"></g>
<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g>
@@ -743,7 +743,7 @@ function caseHistoryLoadAjax() {
<div class="Rtable-cell--content text-center h-100">
<div class="d-md-none d-none">عملیات: </div>
<button type="button" onclick="openModalLeave(${item.employeeId}, '${caseHistoryData.dateFa}', '${item.employeeFullName}')" class="btn-leave-casehistory position-relative d-none ${item.hasLeave || !item.isAbsent ? `disable` : ``}">
<button type="button" onclick="openModalLeave(${item.employeeId}, '${caseHistoryData.dateFa}', '${item.employeeFullName}')" class="btn-leave-casehistory position-relative d-md-block d-none ${item.hasLeave || !item.isAbsent ? `disable` : ``}">
<svg width="20" height="20" viewBox="0 0 24 24" id="_24x24_On_Light_Session-Leave" data-name="24x24/On Light/Session-Leave" xmlns="http://www.w3.org/2000/svg" fill="#d97706">
<g id="SVGRepo_bgCarrier" stroke-width="0"></g>
<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g>
@@ -835,7 +835,7 @@ function caseHistoryLoadAjax() {
</div>
<div class="col-4 pe-0 mt-2">
<button type="button" onclick="openModalLeave(${item.employeeId}, '${caseHistoryData.dateFa}', '${item.employeeFullName}')" class="btn-leave-casehistory position-relative d-none justify-content-center align-items-center ${item.hasLeave || !item.isAbsent ? `disable` : ``}" style="width:100%">
<button type="button" onclick="openModalLeave(${item.employeeId}, '${caseHistoryData.dateFa}', '${item.employeeFullName}')" class="btn-leave-casehistory position-relative d-md-none d-flex justify-content-center align-items-center ${item.hasLeave || !item.isAbsent ? `disable` : ``}" style="width:100%">
<svg width="20" height="20" viewBox="0 0 24 24" id="_24x24_On_Light_Session-Leave" data-name="24x24/On Light/Session-Leave" xmlns="http://www.w3.org/2000/svg" fill="#d97706">
<g id="SVGRepo_bgCarrier" stroke-width="0"></g>
<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g>

65
ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/LeaveCreate.js
View File

@@ -146,64 +146,15 @@
$('#save').addClass("disable");
$('#printSingleID').val(response.printID);
$('#printSingle').show();
//$('#MainModal').modal('hide');
_RefreshCountMenu();
CountWorkFlowOfAbsentAndCut();
//var menuActive = $('#navbar-animmenu li.active').data('menu');
//switch (menuActive) {
// case "absent":
// loadWorkFlowsAbsentsList();
// break;
// case "cut":
// LoadWorkFlowsCutList();
// break;
// case "lunchBreak":
// loadWorkFlowEmployeesWithoutLunchBreakList();
// break;
// case "undefined":
// loadUndefinedRollCallsList();
// break;
// case "overlappingLeave":
// loadOverlappingLeavesList();
// break;
// default:
//}
var menuActive = $('#navbar-animmenu li.active').data('menu');
switch (menuActive) {
case "absent":
/*loadWorkFlowsAbsentsList();*/
$(`[data-absent-employee-date="${dateEmployeeID}"]`).remove();
updateIndexesWorkFlow(`absent_${dateFa}`);
updateMainWorkFlow(`absentMain_${dateFa}`);
break;
case "cut":
//LoadWorkFlowsCutList();
$(`[data-cut-employee-date="${dateEmployeeID}"]`).remove();
updateIndexesWorkFlow(`cut_${dateFa}`);
updateMainWorkFlow(`cutMain_${dateFa}`);
break;
case "lunchBreak":
//loadWorkFlowEmployeesWithoutLunchBreakList();
$(`[data-break-employee-date="${dateEmployeeID}"]`).remove();
updateIndexesWorkFlow(`break_${dateFa}`);
updateMainWorkFlow(`breakMain_${dateFa}`);
break;
case "undefined":
//loadUndefinedRollCallsList();
$(`[data-undefined-employee-date="${dateEmployeeID}"]`).remove();
updateIndexesWorkFlow(`undefined_${dateFa}`);
updateMainWorkFlow(`undefinedMain_${dateFa}`);
break;
case "overlappingLeave":
//loadOverlappingLeavesList();
$(`[data-leave-employee-date="${dateEmployeeID}"]`).remove();
updateIndexesWorkFlow(`leave_${dateFa}`);
updateMainWorkFlow(`leaveMain_${dateFa}`);
break;
default:
}
hasData = true;
dateIndex = 0;
dateEmployeeIndex = null;
$('#caseHistoryLoadData').html('');
caseHistoryLoadAjax();
loadUntilHeightExceeds();
} else {
$('.alert-msg').show();