From cc740439ec96675aa43c5b3f4547e2b9751cb70f Mon Sep 17 00:00:00 2001 From: MahanCh Date: Wed, 16 Apr 2025 20:04:57 +0330 Subject: [PATCH] get the employees select2 changes --- .../EmployeeAgg/IEmployeeRepository.cs | 1 + .../IRollCallEmployeeStatusRepository.cs | 14 +- .../Employee/EmployeeSelectListViewModel.cs | 2 + .../Employee/IEmployeeApplication.cs | 3 + .../EmployeeAplication.cs | 5 + .../RollCallEmployeeStatusApplication.cs | 5 + .../Repository/EmployeeRepository .cs | 40 + .../RollCallEmployeeStatusRepository.cs | 1 + .../Pages/Company/Checkouts/Index.cshtml | 44 +- .../Pages/Company/Checkouts/Index.cshtml.cs | 279 +++--- .../Pages/Company/Contracts/Index.cshtml | 33 +- .../Pages/Company/Contracts/Index.cshtml.cs | 14 +- .../CheckoutTemporary.cshtml | 6 +- .../CheckoutTemporary.cshtml.cs | 4 +- .../CheckoutUnofficial.cshtml | 8 +- .../CheckoutUnofficial.cshtml.cs | 4 +- .../Company/CustomizeCheckout/Grouping.cshtml | 10 +- .../Employees/ContractCheckoutStatus.cshtml | 13 +- .../Company/Employees/EmployeeList.cshtml | 8 +- .../Company/Employees/EmployeeList.cshtml.cs | 4 +- .../Pages/Company/Employees/Index.cshtml.cs | 53 +- .../Pages/Company/Employees/Leave.cshtml | 16 +- .../Pages/Company/Employees/Leave.cshtml.cs | 49 +- .../Company/Employees/LeaveCreateModal.cshtml | 4 +- .../Company/EmployeesBankInfo/Index.cshtml | 4 +- .../Company/EmployeesBankInfo/Index.cshtml.cs | 4 +- .../Company/EmployeesDocuments/Index.cshtml | 2 +- .../Client/Pages/Company/Fine/Index.cshtml | 2 +- .../Client/Pages/Company/Fine/Index.cshtml.cs | 4 +- .../Pages/Company/InsuranceList/Index.cshtml | 12 +- .../Client/Pages/Company/Loan/Index.cshtml | 2 +- .../Client/Pages/Company/Loan/Index.cshtml.cs | 7 +- .../Company/PaymentToEmployee/Index.cshtml | 857 ++++++++++++------ .../Company/PaymentToEmployee/Index.cshtml.cs | 127 ++- .../Company/Reports/CheckoutReport.cshtml | 24 +- .../Company/Reports/CheckoutReport.cshtml.cs | 74 +- .../Client/Pages/Company/Reward/Index.cshtml | 2 +- .../Pages/Company/Reward/Index.cshtml.cs | 4 +- .../Company/RollCall/CameraAccounts.cshtml | 2 +- .../Pages/Company/RollCall/CaseHistory.cshtml | 2 +- .../Pages/Company/RollCall/CurrentDay.cshtml | 2 +- .../RollCall/EmployeeUploadPicture.cshtml | 2 +- .../Pages/Company/RollCall/Grouping.cshtml | 4 +- .../Pages/Company/RollCall/Plans.cshtml | 2 +- .../Pages/Company/SalaryAid/Index.cshtml | 2 +- .../Pages/Company/SalaryAid/Index.cshtml.cs | 4 +- .../Pages/Company/SubAccounts/Index.cshtml | 2 +- .../Pages/Company/WorkFlow/Index.cshtml | 6 +- .../Areas/Client/Pages/Index.cshtml.cs | 84 +- .../Areas/Client/Pages/LeaveCreate.cshtml | 4 - .../Pages/PaymentToPersonnelCreate.cshtml | 12 +- .../Pages/Shared/_headerAndFooter.cshtml | 39 +- .../wwwroot/AssetsClient/css/select2.css | 4 + .../AssetsClient/pages/Checkouts/js/Index.js | 25 +- .../CustomizeCheckout/js/CheckoutTemporary.js | 40 +- .../js/CheckoutUnofficial.js | 88 +- .../js/ModalCreateLeftWorkEmployee.js | 3 +- .../pages/Employees/js/createleave.js | 9 +- .../pages/EmployeesBankInfo/js/Index.js | 11 +- .../AssetsClient/pages/Fine/js/Index.js | 11 +- .../pages/Fine/js/ModalCreateNewFine.js | 34 +- .../pages/Index/js/LeaveCreate.js | 2 +- .../AssetsClient/pages/Loan/js/Index.js | 11 +- .../pages/Loan/js/ModalCreateNewLoan.js | 3 +- .../AssetsClient/pages/Reward/js/Index.js | 11 +- .../pages/Reward/js/ModalCreateNewReward.js | 34 +- .../AssetsClient/pages/SalaryAid/js/Index.js | 37 +- .../SalaryAid/js/ModalCreateNewSalaryAid.js | 3 +- 68 files changed, 1421 insertions(+), 817 deletions(-) diff --git a/Company.Domain/EmployeeAgg/IEmployeeRepository.cs b/Company.Domain/EmployeeAgg/IEmployeeRepository.cs index 6a49fd7e..ae689fb6 100644 --- a/Company.Domain/EmployeeAgg/IEmployeeRepository.cs +++ b/Company.Domain/EmployeeAgg/IEmployeeRepository.cs @@ -54,6 +54,7 @@ public interface IEmployeeRepository : IRepository Employee GetIgnoreQueryFilter(long id); + Task> WorkedEmployeesInWorkshopSelectList(long workshopId); #endregion diff --git a/Company.Domain/RollCallEmployeeStatusAgg/IRollCallEmployeeStatusRepository.cs b/Company.Domain/RollCallEmployeeStatusAgg/IRollCallEmployeeStatusRepository.cs index d288cbce..a853cc67 100644 --- a/Company.Domain/RollCallEmployeeStatusAgg/IRollCallEmployeeStatusRepository.cs +++ b/Company.Domain/RollCallEmployeeStatusAgg/IRollCallEmployeeStatusRepository.cs @@ -15,12 +15,14 @@ namespace Company.Domain.RollCallEmployeeStatusAgg /// /// void AdjustRollCallStatusEndDates(List command); - /// - /// دریافت وضعیت حضور غیاب پرسنل در تاریخ مشخص - /// - /// - /// - /// + bool IsActiveInPeriod(long employeeId, long workshopId, DateTime start, DateTime end); + + /// + /// دریافت وضعیت حضور غیاب پرسنل در تاریخ مشخص + /// + /// + /// + /// RollCallEmployeeStatus GetByRollCallEmployeeIdAndDate(long rollCallEmployeeId, DateTime date); List GetActiveByWorkshopIdInDate(long workshopId, DateTime startDateGr, DateTime endDateGr); List GetByWorkshopIdInDates(long workshopId, DateTime start, DateTime end); diff --git a/CompanyManagment.App.Contracts/Employee/EmployeeSelectListViewModel.cs b/CompanyManagment.App.Contracts/Employee/EmployeeSelectListViewModel.cs index ed4f9849..680107ea 100644 --- a/CompanyManagment.App.Contracts/Employee/EmployeeSelectListViewModel.cs +++ b/CompanyManagment.App.Contracts/Employee/EmployeeSelectListViewModel.cs @@ -10,4 +10,6 @@ public class EmployeeSelectListViewModel { public long Id { get; set; } public string EmployeeFullName { get; set; } + public bool Black { get; set; } + } \ No newline at end of file diff --git a/CompanyManagment.App.Contracts/Employee/IEmployeeApplication.cs b/CompanyManagment.App.Contracts/Employee/IEmployeeApplication.cs index 4ec027f8..dc1d30bb 100644 --- a/CompanyManagment.App.Contracts/Employee/IEmployeeApplication.cs +++ b/CompanyManagment.App.Contracts/Employee/IEmployeeApplication.cs @@ -72,6 +72,9 @@ public interface IEmployeeApplication Task GetEmployeeEditInEmployeeDocumentWorkFlow(long employeeId, long workshopId); Task EditEmployeeInEmployeeDocumentWorkFlow(EditEmployeeInEmployeeDocument command); + + Task> WorkedEmployeesInWorkshopSelectList(long workshopId); + #endregion } \ No newline at end of file diff --git a/CompanyManagment.Application/EmployeeAplication.cs b/CompanyManagment.Application/EmployeeAplication.cs index 29db332f..2c9bfc70 100644 --- a/CompanyManagment.Application/EmployeeAplication.cs +++ b/CompanyManagment.Application/EmployeeAplication.cs @@ -1498,5 +1498,10 @@ public class EmployeeAplication : RepositoryBase, IEmployeeAppli return op.Succcedded(); } + public async Task> WorkedEmployeesInWorkshopSelectList(long workshopId) + { + return await _EmployeeRepository.WorkedEmployeesInWorkshopSelectList(workshopId); + } + #endregion } \ No newline at end of file diff --git a/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs b/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs index d6c8e57a..7046b585 100644 --- a/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs +++ b/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs @@ -135,6 +135,11 @@ namespace CompanyManagment.Application + public bool IsActiveInPeriod(long employeeId, long workshopId, DateTime startDate, DateTime endDate) + { + return _employeeRollCallStatusRepository.IsActiveInPeriod(employeeId, workshopId, startDate, endDate); + } + public OperationResult Deactivate(long id) { OperationResult op = new(); diff --git a/CompanyManagment.EFCore/Repository/EmployeeRepository .cs b/CompanyManagment.EFCore/Repository/EmployeeRepository .cs index d3a67eb8..37c1ab25 100644 --- a/CompanyManagment.EFCore/Repository/EmployeeRepository .cs +++ b/CompanyManagment.EFCore/Repository/EmployeeRepository .cs @@ -802,6 +802,46 @@ public class EmployeeRepository : RepositoryBase, IEmployeeRepos { return _context.Employees.IgnoreQueryFilters().FirstOrDefault(x => x.id == id); } + + public async Task> WorkedEmployeesInWorkshopSelectList(long workshopId) + { + var workshopActiveLeftWorksQuery = _context.LeftWorkList.Where(x => x.WorkshopId == workshopId); + + + var workshopActiveInsuranceLeftWorksQuery = _context.LeftWorkInsuranceList.Where(x => x.WorkshopId == workshopId); + + + var employeesQuery = _context.Employees.Where(x => + workshopActiveLeftWorksQuery.Any(y => y.EmployeeId == x.id) || + workshopActiveInsuranceLeftWorksQuery.Any(y => y.EmployeeId == x.id)).Select(x => new + { + leftWork = workshopActiveLeftWorksQuery.Where(l => l.EmployeeId == x.id).OrderByDescending(i => i.StartWorkDate).FirstOrDefault(), + insuranceLeftWork = workshopActiveInsuranceLeftWorksQuery.Where(i => i.EmployeeId == x.id).OrderByDescending(i => i.StartWorkDate).FirstOrDefault(), + Employee = x + }); + + + + return (await employeesQuery.ToListAsync()).Select(x => + { + var leftWork = x.leftWork; + var insuranceLeftWork = x.insuranceLeftWork; + return new EmployeeSelectListViewModel() + { + Id = x.Employee.id, + EmployeeFullName = x.Employee.FullName, + Black = ((leftWork != null && leftWork.LeftWorkDate < DateTime.Now && + insuranceLeftWork != null && insuranceLeftWork.LeftWorkDate != null) || + (leftWork != null && insuranceLeftWork == null && + leftWork.LeftWorkDate < DateTime.Now) || + (insuranceLeftWork != null && insuranceLeftWork.LeftWorkDate != null && x.leftWork == null && + insuranceLeftWork.LeftWorkDate != null)) + ? true + : false, + }; + }).OrderBy(x => x.Black).ToList(); + } + #endregion #region Pooya diff --git a/CompanyManagment.EFCore/Repository/RollCallEmployeeStatusRepository.cs b/CompanyManagment.EFCore/Repository/RollCallEmployeeStatusRepository.cs index 172fbecf..6f2dcc36 100644 --- a/CompanyManagment.EFCore/Repository/RollCallEmployeeStatusRepository.cs +++ b/CompanyManagment.EFCore/Repository/RollCallEmployeeStatusRepository.cs @@ -69,6 +69,7 @@ public class RollCallEmployeeStatusRepository : RepositoryBase x.RollCallEmployeeId == rollCallEmployeeId && x.StartDate.Date <= date.Date && x.EndDate.Date >= date.Date); diff --git a/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml b/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml index 4ce1761b..486976ba 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml @@ -2,13 +2,21 @@ @using Version = _0_Framework.Application.Version @model ServiceHost.Areas.Client.Pages.Company.Checkouts.IndexModel +@{ + string clientVersion = _0_Framework.Application.Version.StyleVersion; + + Layout = "Shared/_ClientLayout"; + ViewData["Title"] = " - " + "فیش حقوقی"; + int i = 0; +} + @section Styles { - - - - - - + + + + + + } -@{ - Layout = "Shared/_ClientLayout"; - ViewData["Title"] = " - " + "فیش حقوقی"; - int i = 0; -} - @@ -96,7 +98,7 @@ @@ -184,7 +186,8 @@ @foreach (var person in @Model.Employees) { - + var black = person.Black ? "blackSelect" : ""; + } @@ -505,7 +508,8 @@ @foreach (var person in @Model.Employees) { - + var black = person.Black ? "blackSelect" : ""; + } @@ -648,21 +652,21 @@ @section Script { - - + + - + } \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml.cs b/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml.cs index 966496cf..0d3c406f 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml.cs +++ b/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml.cs @@ -8,188 +8,193 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using System.Security.Claims; +using _0_Framework.Infrastructure; namespace ServiceHost.Areas.Client.Pages.Company.Checkouts { - [Authorize] - public class IndexModel : PageModel - { - #region Entities + [Authorize] + [NeedsPermission(SubAccountPermissionHelper.CheckoutListPermissionCode)] + public class IndexModel : PageModel + { + #region Entities - public List Checkouts; - public CheckoutSearchModel SearchModel; - public List Employees; - public string Year; - public string Month; - public long EmployeeId; - public string ContarctStart; - public string ContarctEnd; - public long WorkshopId; - public string Sorting; - public string WorkshopName { get; set; } - public List YearlyList; - private readonly ICheckoutApplication _checkoutApplication; - private readonly IWorkshopApplication _workshopApplication; - private readonly IYearlySalaryApplication _yearlySalaryApplication; - private readonly IPasswordHasher _passwordHasher; - private readonly IRollCallApplication rollCallApplication; - public int PageIndex; + public List Checkouts; + public CheckoutSearchModel SearchModel; + public List Employees; + public string Year; + public string Month; + public long EmployeeId; + public string ContarctStart; + public string ContarctEnd; + public long WorkshopId; + public string Sorting; + public string WorkshopName { get; set; } + public List YearlyList; + private readonly ICheckoutApplication _checkoutApplication; + private readonly IWorkshopApplication _workshopApplication; + private readonly IEmployeeApplication _employeeApplication; + private readonly IYearlySalaryApplication _yearlySalaryApplication; + private readonly IPasswordHasher _passwordHasher; + private readonly IRollCallApplication rollCallApplication; + public int PageIndex; - #endregion + #endregion - public IndexModel(IWorkshopApplication workshopApplication, - IEmployeeApplication employeeApplication, - IYearlySalaryApplication yearlySalaryApplication, - ICheckoutApplication checkoutApplication, IPasswordHasher passwordHasher, IRollCallApplication rollCallApplication) - { + public IndexModel(IWorkshopApplication workshopApplication, + IEmployeeApplication employeeApplication, + IYearlySalaryApplication yearlySalaryApplication, + ICheckoutApplication checkoutApplication, IPasswordHasher passwordHasher, IRollCallApplication rollCallApplication) + { - _workshopApplication = workshopApplication; + _workshopApplication = workshopApplication; + _employeeApplication = employeeApplication; - _yearlySalaryApplication = yearlySalaryApplication; + _yearlySalaryApplication = yearlySalaryApplication; - _checkoutApplication = checkoutApplication; - _passwordHasher = passwordHasher; - this.rollCallApplication = rollCallApplication; - } + _checkoutApplication = checkoutApplication; + _passwordHasher = passwordHasher; + this.rollCallApplication = rollCallApplication; + } - #region FirstLoad-OnGet + #region FirstLoad-OnGet - public IActionResult OnGet(CheckoutSearchModel searchModel) - { - var workshopHash = User.FindFirstValue("WorkshopSlug"); - var workshopId = _passwordHasher.SlugDecrypt(workshopHash); - if (workshopId > 0) - { - searchModel.Sorting = string.IsNullOrWhiteSpace(searchModel.Sorting) - ? "CreationDate-Max" - : searchModel.Sorting; - searchModel.PageIndex = 0; - Year = searchModel.Year; - Month = searchModel.Month; - ContarctStart = searchModel.ContractStart; - ContarctEnd = searchModel.ContractEnd; - EmployeeId = searchModel.EmployeeId; - WorkshopId = workshopId == 0 ? searchModel.WorkshopId : workshopId; - searchModel.WorkshopId = WorkshopId; - Sorting = string.IsNullOrWhiteSpace(searchModel.Sorting) ? "CreationDate-Max" : searchModel.Sorting; - var workshopInfo = _workshopApplication.GetWorkshopInfo(WorkshopId); - WorkshopName = workshopInfo.WorkshopFullName; - Employees = workshopInfo.EmployeeList.Select(x => new EmployeeSelectListViewModel() - { Id = x.Id, EmployeeFullName = x.EmployeeFullName }).ToList(); + public async Task OnGet(CheckoutSearchModel searchModel) + { + var workshopHash = User.FindFirstValue("WorkshopSlug"); + var workshopId = _passwordHasher.SlugDecrypt(workshopHash); + if (workshopId > 0) + { + searchModel.Sorting = string.IsNullOrWhiteSpace(searchModel.Sorting) + ? "CreationDate-Max" + : searchModel.Sorting; + searchModel.PageIndex = 0; + Year = searchModel.Year; + Month = searchModel.Month; + ContarctStart = searchModel.ContractStart; + ContarctEnd = searchModel.ContractEnd; + EmployeeId = searchModel.EmployeeId; + WorkshopId = workshopId == 0 ? searchModel.WorkshopId : workshopId; + searchModel.WorkshopId = WorkshopId; + Sorting = string.IsNullOrWhiteSpace(searchModel.Sorting) ? "CreationDate-Max" : searchModel.Sorting; + var workshopInfo = _workshopApplication.GetWorkshopInfo(WorkshopId); + WorkshopName = workshopInfo.WorkshopFullName; + //Employees = workshopInfo.EmployeeList.Select(x => new EmployeeSelectListViewModel() + //{ Id = x.Id, EmployeeFullName = x.EmployeeFullName }).ToList(); + Employees = await _employeeApplication.WorkedEmployeesInWorkshopSelectList(workshopId); Checkouts = _checkoutApplication.SearchForClient(searchModel); - PageIndex = Checkouts.Count; - YearlyList = - _yearlySalaryApplication.GetYears(); - SearchModel = new CheckoutSearchModel() - { - Year = string.IsNullOrWhiteSpace(searchModel.Year) ? " " : searchModel.Year, - Month = string.IsNullOrWhiteSpace(searchModel.Month) ? " " : searchModel.Month, - ContractStart = searchModel.ContractStart, - ContractEnd = searchModel.ContractEnd, - EmployeeId = searchModel.EmployeeId, - Sorting = searchModel.Sorting, + PageIndex = Checkouts.Count; + YearlyList = + _yearlySalaryApplication.GetYears(); + SearchModel = new CheckoutSearchModel() + { + Year = string.IsNullOrWhiteSpace(searchModel.Year) ? " " : searchModel.Year, + Month = string.IsNullOrWhiteSpace(searchModel.Month) ? " " : searchModel.Month, + ContractStart = searchModel.ContractStart, + ContractEnd = searchModel.ContractEnd, + EmployeeId = searchModel.EmployeeId, + Sorting = searchModel.Sorting, - }; - return Page(); - } - else - { - return Redirect("error/401"); - } - } + }; + return Page(); + } + else + { + return Redirect("error/401"); + } + } - #endregion + #endregion - #region Pagination + #region Pagination - public IActionResult OnGetPagination(int pageIndex, long workshopId, long employeeId, string year, string month, string start, string end, string sorting) - { - var searchModel = new CheckoutSearchModel() - { - PageIndex = pageIndex, - WorkshopId = workshopId, - EmployeeId = employeeId, - Year = year, - Month = month, - ContractStart = start, - ContractEnd = end, - Sorting = sorting - }; + public IActionResult OnGetPagination(int pageIndex, long workshopId, long employeeId, string year, string month, string start, string end, string sorting) + { + var searchModel = new CheckoutSearchModel() + { + PageIndex = pageIndex, + WorkshopId = workshopId, + EmployeeId = employeeId, + Year = year, + Month = month, + ContractStart = start, + ContractEnd = end, + Sorting = sorting + }; - var search = _checkoutApplication.SearchForClient(searchModel); + var search = _checkoutApplication.SearchForClient(searchModel); - return new JsonResult(new - { - contractResultViewModels = search, - pageIndex = search.Count + return new JsonResult(new + { + contractResultViewModels = search, + pageIndex = search.Count - }); + }); - } + } - #endregion + #endregion - #region PrintOne + #region PrintOne - public IActionResult OnGetPrintOne(long id) - { + public IActionResult OnGetPrintOne(long id) + { - var res = _checkoutApplication.PrintOne(id); + var res = _checkoutApplication.PrintOne(id); if (res.HasRollCall) return Partial("PrintOneRollCall", res); return Partial("PrintOne", res); - } + } - #endregion + #endregion - #region PrintOneMobile - public IActionResult OnGetPrintOneMobile(long id) - { + #region PrintOneMobile + public IActionResult OnGetPrintOneMobile(long id) + { - var res = _checkoutApplication.PrintOne(id); + var res = _checkoutApplication.PrintOne(id); if (res.HasRollCall) return Partial("PrintOneRollCall", res); return Partial("PrintOneMobile", res); - } + } - #endregion + #endregion - #region LoadAllToPrint - public IActionResult OnGetLoadAllToPrint(long workshopId, long employeeId, string year, string month) - { - var searchModel = new CheckoutSearchModel() - { - SearchAll = true, - WorkshopId = workshopId, - EmployeeId = employeeId, - Year = year, - Month = month, + #region LoadAllToPrint + public IActionResult OnGetLoadAllToPrint(long workshopId, long employeeId, string year, string month) + { + var searchModel = new CheckoutSearchModel() + { + SearchAll = true, + WorkshopId = workshopId, + EmployeeId = employeeId, + Year = year, + Month = month, - }; + }; - var search = _checkoutApplication.SearchForClient(searchModel); + var search = _checkoutApplication.SearchForClient(searchModel); - return new JsonResult(new - { - contractResultViewModels = search, - pageIndex = search.Count + return new JsonResult(new + { + contractResultViewModels = search, + pageIndex = search.Count - }); + }); - } - #endregion - } + } + #endregion + } - public class Person - { - public string FirstName { get; set; } - public string LastName { get; set; } - public int Age { get; set; } - } + public class Person + { + public string FirstName { get; set; } + public string LastName { get; set; } + public int Age { get; set; } + } } diff --git a/ServiceHost/Areas/Client/Pages/Company/Contracts/Index.cshtml b/ServiceHost/Areas/Client/Pages/Company/Contracts/Index.cshtml index 8d3f6b8d..4a99bd94 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Contracts/Index.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/Contracts/Index.cshtml @@ -104,7 +104,7 @@ @@ -167,7 +167,8 @@ @foreach (var person in @Model.Employees) { - + var black = person.Black ? "blackSelect" : ""; + } @@ -507,7 +508,8 @@ @foreach (var person in @Model.Employees) { - + var black = person.Black ? "blackSelect" : ""; + } @@ -1782,13 +1784,25 @@ } $("#getPersonnel").select2({ language: "fa", - dir: "rtl" + dir: "rtl", + templateResult: function (data, container) { + if (data.element) { + $(container).addClass($(data.element).attr("class")); + } + return data.text; + } }); $("#getPersonneModal").select2({ language: "fa", dir: "rtl", - dropdownParent: $("#searchModal") + dropdownParent: $('#searchModal'), + templateResult: function (data, container) { + if (data.element) { + $(container).addClass($(data.element).attr("class")); + } + return data.text; + } }); // $(".date").mask("0000/00/00"); @@ -2205,14 +2219,13 @@ diff --git a/ServiceHost/Areas/Client/Pages/PaymentToPersonnelCreate.cshtml b/ServiceHost/Areas/Client/Pages/PaymentToPersonnelCreate.cshtml index 6010939b..456d4511 100644 --- a/ServiceHost/Areas/Client/Pages/PaymentToPersonnelCreate.cshtml +++ b/ServiceHost/Areas/Client/Pages/PaymentToPersonnelCreate.cshtml @@ -108,7 +108,14 @@ $(".select2Option").select2({ language: "fa", - dir: "rtl" + dir: "rtl", + //dropdownParent: $('#MainModal'), + templateResult: function (data, container) { + if (data.element) { + $(container).addClass($(data.element).attr("class")); + } + return data.text; + } }); }); @@ -143,7 +150,8 @@ var employees = response.employees.connectedPersonnelViewModels; var employeeOptionsHtml = ''; employees.forEach(function (employee) { - employeeOptionsHtml += ''; + var black = employee.black ? "blackSelect" : ""; + employeeOptionsHtml += ``; }); $('#employeeSelect').html(employeeOptionsHtml); }, diff --git a/ServiceHost/Areas/Client/Pages/Shared/_headerAndFooter.cshtml b/ServiceHost/Areas/Client/Pages/Shared/_headerAndFooter.cshtml index a97cbd07..bd1e7c9c 100644 --- a/ServiceHost/Areas/Client/Pages/Shared/_headerAndFooter.cshtml +++ b/ServiceHost/Areas/Client/Pages/Shared/_headerAndFooter.cshtml @@ -218,24 +218,27 @@
-
+
- - - - + +
+ + + - @* - - - - - - - - - - *@ + @* + + + + + + + + + + *@ + +
خدمات
@@ -253,7 +256,7 @@
-
+ @*
@@ -270,7 +273,7 @@
کارپوشه -
+
*@ @*
diff --git a/ServiceHost/wwwroot/AssetsClient/css/select2.css b/ServiceHost/wwwroot/AssetsClient/css/select2.css index 72335795..89f1c14e 100644 --- a/ServiceHost/wwwroot/AssetsClient/css/select2.css +++ b/ServiceHost/wwwroot/AssetsClient/css/select2.css @@ -1,3 +1,7 @@ +.blackSelect { + background-color: #cbd5e1; +} + .select2-dropdown { border: 1px solid #DADADA; border-radius: 0 0 7px 7px !important; diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Checkouts/js/Index.js b/ServiceHost/wwwroot/AssetsClient/pages/Checkouts/js/Index.js index 62959bcc..710a1c70 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Checkouts/js/Index.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/Checkouts/js/Index.js @@ -144,7 +144,7 @@ $(document).ready(function () { var filterStart = $('#start').val(); var filterEnd = $('#end').val(); - if (filterEmployeeId !== 0 || filterYear !== '' || filterMonth !== '' || filterStart !== '' || filterEnd !== '') { + if (filterEmployeeId !== "0" || filterYear !== '' || filterMonth !== '' || filterStart !== '' || filterEnd !== '') { $('.btn-clear-filter').removeClass('disable'); } else { $('.btn-clear-filter').addClass('disable'); @@ -1129,13 +1129,25 @@ $("#overlaySearchAdvance").click(function () { } $("#getPersonnel").select2({ language: "fa", - dir: "rtl" + dir: "rtl", + templateResult: function (data, container) { + if (data.element) { + $(container).addClass($(data.element).attr("class")); + } + return data.text; + } }); $("#getPersonneModal").select2({ language: "fa", dir: "rtl", - dropdownParent: $("#searchModal") + dropdownParent: $('#searchModal'), + templateResult: function (data, container) { + if (data.element) { + $(container).addClass($(data.element).attr("class")); + } + return data.text; + } }); // $(".date").mask("0000/00/00"); @@ -1559,14 +1571,13 @@ $(window).scroll(function () { function printOne(id) { var parametr = '&id=' + id; var url = PrintOneUrl; - window.location.href = url + parametr; - + AjaxUrlContentModal(url + parametr); } + function printOneMobile(id) { var parametr = '&id=' + id; var url = PrintOneMobileUrl; - window.location.href = url + parametr; - + AjaxUrlContentModal(url + parametr); } function printAll() { diff --git a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutTemporary.js b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutTemporary.js index b2f9e9c9..6dc702e4 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutTemporary.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutTemporary.js @@ -79,7 +79,13 @@ $(document).ready(function () { $(".select2Option").select2({ language: "fa", - dir: "rtl" + dir: "rtl", + templateResult: function (data, container) { + if (data.element) { + $(container).addClass($(data.element).attr("class")); + } + return data.text; + } }); $(".select2OptionMobile").select2({ @@ -1692,35 +1698,6 @@ function showExcelAllModal() { function downloadExcelAll() { var idlist = ""; - var year = $('#Year').val(); - var month = $('#Month').val(); - - - if (year === '0' || month === '0') { - $('#dropdown-year').addClass("errored"); - $('#dropdown-month').addClass("errored"); - $('.alert-msg').show(); - $('.alert-msg p').text('لطفا سال و ماه را انتخاب نموده و جستجو نمایید'); - setTimeout(function () { - $('.alert-msg').hide(); - $('.alert-msg p').text(''); - $('#dropdown-year').removeClass("errored"); - $('#dropdown-month').removeClass("errored"); - }, 3500); - return - } - - if (!($('input:checkbox').is(":checked"))) { - $('.alert-msg').show(); - $('.alert-msg p').text('هیچ موردی انتخاب نشده است.'); - setTimeout(function () { - $('.alert-msg').hide(); - $('.alert-msg p').text(''); - }, 3500); - return - } - - $('.foo').each(function () { if ($(this).is(":checked")) { @@ -1829,7 +1806,8 @@ function ajaxPersonals() { var employees = response.data; var employeeOptionsHtml = ''; employees.forEach(function (employee) { - employeeOptionsHtml += ``; + var black = employee.black ? "blackSelect" : ""; + employeeOptionsHtml += ``; }); $('#getPersonnel').html(employeeOptionsHtml); $('#getPersonnelMobile').html(employeeOptionsHtml); diff --git a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutUnofficial.js b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutUnofficial.js index d2446bc4..7071be0f 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutUnofficial.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutUnofficial.js @@ -1236,7 +1236,13 @@ $(document).ready(function () { $(".select2Option").select2({ language: "fa", - dir: "rtl" + dir: "rtl", + templateResult: function (data, container) { + if (data.element) { + $(container).addClass($(data.element).attr("class")); + } + return data.text; + } }); $(".select2OptionMobile").select2({ @@ -1674,36 +1680,8 @@ function showExcelAllModal() { window.location.href = showCheckoutExcelModalUrl; } -function excelDownloadAll() { +function downloadExcelAll() { var idlist = ""; - var year = $('#Year').val(); - var month = $('#Month').val(); - - - if (year === '0' || month === '0') { - $('#dropdown-year').addClass("errored"); - $('#dropdown-month').addClass("errored"); - $('.alert-msg').show(); - $('.alert-msg p').text('لطفا سال و ماه را انتخاب نموده و جستجو نمایید'); - setTimeout(function () { - $('.alert-msg').hide(); - $('.alert-msg p').text(''); - $('#dropdown-year').removeClass("errored"); - $('#dropdown-month').removeClass("errored"); - }, 3500); - return - } - - if (!($('input:checkbox').is(":checked"))) { - $('.alert-msg').show(); - $('.alert-msg p').text('هیچ موردی انتخاب نشده است.'); - setTimeout(function () { - $('.alert-msg').hide(); - $('.alert-msg p').text(''); - }, 3500); - return - } - $('.foo').each(function () { if ($(this).is(":checked")) { @@ -1714,47 +1692,22 @@ function excelDownloadAll() { } }); + var filterArray = []; + $("input[name='filter[]']:checked").each(function () { + filterArray.push($(this).val()); + }); + + if (idlist !== "") { + //var url = CheckoutExcelAllUrl + "&idList=" + idlist; + var url = CheckoutExcelAllUrl + "&idList=" + encodeURIComponent(idlist); - - var yearFa = '&yearFa=' + year; - var monthFa = '&monthFa=' + month; - var url = CheckoutExcelAllUrl + '&idlist=' + idlist; - - - //console.log(url + '?checkoutId=' + idlist + yearFa + monthFa); + filterArray.forEach(function (filter) { + url += "&filter=" + encodeURIComponent(filter); + }); window.open(url, "_blank"); - } } -//function downloadExcelAll() { -// var idlist = ""; -// $('.foo').each(function () { -// if ($(this).is(":checked")) { - -// var a = $(this).val(); -// var b = a + "+"; -// idlist += b; - -// } -// }); - -// var filterArray = []; -// $("input[name='filter[]']:checked").each(function () { -// filterArray.push($(this).val()); -// }); - - -// if (idlist !== "") { -// //var url = CheckoutExcelAllUrl + "&idList=" + idlist; -// var url = CheckoutExcelAllUrl + "&idList=" + encodeURIComponent(idlist); - -// filterArray.forEach(function (filter) { -// url += "&filter=" + encodeURIComponent(filter); -// }); -// window.open(url, "_blank"); -// } -//} function printAllMobile() { var idlist = ""; @@ -1824,7 +1777,8 @@ function ajaxPersonals() { var employees = response.data; var employeeOptionsHtml = ''; employees.forEach(function (employee) { - employeeOptionsHtml += ``; + var black = employee.black ? "blackSelect" : ""; + employeeOptionsHtml += ``; }); $('#getPersonnel').html(employeeOptionsHtml); $('#getPersonnelMobile').html(employeeOptionsHtml); diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/ModalCreateLeftWorkEmployee.js b/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/ModalCreateLeftWorkEmployee.js index 42762c6c..d304d52a 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/ModalCreateLeftWorkEmployee.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/ModalCreateLeftWorkEmployee.js @@ -190,7 +190,8 @@ function ajaxPersonals() { var employees = response.data; var employeeOptionsHtml = ''; employees.forEach(function (employee) { - employeeOptionsHtml += ``; + var black = employee.black ? "blackSelect" : ""; + employeeOptionsHtml += ``; }); $('#employeeSelect').html(employeeOptionsHtml); } else { diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/createleave.js b/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/createleave.js index fb4bfdc3..53202cb3 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/createleave.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/createleave.js @@ -629,12 +629,11 @@ function ajaxPersonals() { success: function (response) { $('#cardSectionLeave').addClass('blur'); $("#cardSectionLeave div *").prop('disabled', true); - var employees = response.connectedPersonnel.connectedPersonnelViewModels; - + var employees = response.data; var employeeOptionsHtml = ''; - employees.forEach(function (employee) { - var black = employee.black ? "blackSelect" : ""; - employeeOptionsHtml += ``; + employees.forEach(function (employee) { + var black = employee.black ? "blackSelect" : ""; + employeeOptionsHtml += ``; }); $('#employeeSelectList').html(employeeOptionsHtml); }, diff --git a/ServiceHost/wwwroot/AssetsClient/pages/EmployeesBankInfo/js/Index.js b/ServiceHost/wwwroot/AssetsClient/pages/EmployeesBankInfo/js/Index.js index e42c7bee..3c2ab797 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/EmployeesBankInfo/js/Index.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/EmployeesBankInfo/js/Index.js @@ -25,7 +25,13 @@ $(document).ready(function () { $(".select2OptionIndex").select2({ language: "fa", - dir: "rtl" + dir: "rtl", + templateResult: function (data, container) { + if (data.element) { + $(container).addClass($(data.element).attr("class")); + } + return data.text; + } }); $(".select2OptionIndexMobile").select2({ @@ -283,7 +289,8 @@ function ajaxPersonals() { var employees = response.data; var employeeOptionsHtml = ''; employees.forEach(function (employee) { - employeeOptionsHtml += ``; + var black = employee.black ? "blackSelect" : ""; + employeeOptionsHtml += ``; }); $('#employeeSelectIndex').html(employeeOptionsHtml); $('#employeeSelectIndexMobile').html(employeeOptionsHtml); diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/Index.js b/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/Index.js index afa7106a..c709db9e 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/Index.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/Index.js @@ -14,7 +14,13 @@ $(document).ready(function () { $(".select2OptionIndex").select2({ language: "fa", - dir: "rtl" + dir: "rtl", + templateResult: function (data, container) { + if (data.element) { + $(container).addClass($(data.element).attr("class")); + } + return data.text; + } }); $(".select2OptionIndexMobile").select2({ @@ -252,7 +258,8 @@ function ajaxPersonals() { var employees = response.data; var employeeOptionsHtml = ''; employees.forEach(function (employee) { - employeeOptionsHtml += ``; + var black = employee.black ? "blackSelect" : ""; + employeeOptionsHtml += ``; }); $('#employeeSelectIndex').html(employeeOptionsHtml); $('#employeeSelectIndexMobile').html(employeeOptionsHtml); diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalCreateNewFine.js b/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalCreateNewFine.js index c0c6a772..e9ce8af4 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalCreateNewFine.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalCreateNewFine.js @@ -1,5 +1,36 @@ var urlPathname = location.pathname; +document.querySelectorAll('.scroll-container-amount').forEach(container => { + let isDown = false; + let startX; + let scrollLeft; + + container.addEventListener('mousedown', (e) => { + isDown = true; + startX = e.pageX - container.offsetLeft; + scrollLeft = container.scrollLeft; + container.style.cursor = "grabbing"; + }); + + container.addEventListener('mouseleave', () => { + isDown = false; + container.style.cursor = "grab"; + }); + + container.addEventListener('mouseup', () => { + isDown = false; + container.style.cursor = "grab"; + }); + + container.addEventListener('mousemove', (e) => { + if (!isDown) return; + e.preventDefault(); + const x = e.pageX - container.offsetLeft; + const walk = (x - startX) * 2; + container.scrollLeft = scrollLeft - walk; + }); +}); + $(document).ready(function () { $('.loading').hide(); @@ -94,7 +125,8 @@ function ajaxPersonals() { var employees = response.data; var employeeOptionsHtml = ''; employees.forEach(function (employee) { - employeeOptionsHtml += ``; + var black = employee.black ? "blackSelect" : ""; + employeeOptionsHtml += ``; }); $('#employeeSelect').html(employeeOptionsHtml); } else { diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Index/js/LeaveCreate.js b/ServiceHost/wwwroot/AssetsClient/pages/Index/js/LeaveCreate.js index a8a2e2e8..0165e540 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Index/js/LeaveCreate.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/Index/js/LeaveCreate.js @@ -726,7 +726,7 @@ function ajaxPersonals() { var employeeOptionsHtml = ''; employees.forEach(function (employee) { var black = employee.black ? "blackSelect" : ""; - employeeOptionsHtml += ``; + employeeOptionsHtml += ``; }); $('#employeeSelect').html(employeeOptionsHtml); }, diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Loan/js/Index.js b/ServiceHost/wwwroot/AssetsClient/pages/Loan/js/Index.js index 7bbfec61..850e1b01 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Loan/js/Index.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/Loan/js/Index.js @@ -13,7 +13,13 @@ $(document).ready(function () { $(".select2OptionIndex").select2({ language: "fa", - dir: "rtl" + dir: "rtl", + templateResult: function (data, container) { + if (data.element) { + $(container).addClass($(data.element).attr("class")); + } + return data.text; + } }); $(".select2OptionIndexMobile").select2({ @@ -256,7 +262,8 @@ function ajaxPersonals() { var employees = response.data; var employeeOptionsHtml = ''; employees.forEach(function (employee) { - employeeOptionsHtml += ``; + var black = employee.black ? "blackSelect" : ""; + employeeOptionsHtml += ``; }); $('#employeeSelectIndex').html(employeeOptionsHtml); $('#employeeSelectIndexMobile').html(employeeOptionsHtml); diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Loan/js/ModalCreateNewLoan.js b/ServiceHost/wwwroot/AssetsClient/pages/Loan/js/ModalCreateNewLoan.js index b78ddf41..39c64a6b 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Loan/js/ModalCreateNewLoan.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/Loan/js/ModalCreateNewLoan.js @@ -126,7 +126,8 @@ function ajaxPersonals() { var employees = response.data; var employeeOptionsHtml = ''; employees.forEach(function (employee) { - employeeOptionsHtml += ``; + var black = employee.black ? "blackSelect" : ""; + employeeOptionsHtml += ``; }); $('#employeeSelect').html(employeeOptionsHtml); } else { diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Reward/js/Index.js b/ServiceHost/wwwroot/AssetsClient/pages/Reward/js/Index.js index e98820b1..67d45171 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Reward/js/Index.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/Reward/js/Index.js @@ -15,7 +15,13 @@ $(document).ready(function () { $(".select2OptionIndex").select2({ language: "fa", - dir: "rtl" + dir: "rtl", + templateResult: function (data, container) { + if (data.element) { + $(container).addClass($(data.element).attr("class")); + } + return data.text; + } }); $(".select2OptionIndexMobile").select2({ @@ -260,7 +266,8 @@ function ajaxPersonals() { var employees = response.data; var employeeOptionsHtml = ''; employees.forEach(function (employee) { - employeeOptionsHtml += ``; + var black = employee.black ? "blackSelect" : ""; + employeeOptionsHtml += ``; }); $('#employeeSelectIndex').html(employeeOptionsHtml); $('#employeeSelectIndexMobile').html(employeeOptionsHtml); diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Reward/js/ModalCreateNewReward.js b/ServiceHost/wwwroot/AssetsClient/pages/Reward/js/ModalCreateNewReward.js index 5c29ab7b..c70bc822 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Reward/js/ModalCreateNewReward.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/Reward/js/ModalCreateNewReward.js @@ -1,5 +1,36 @@ var urlPathname = location.pathname; +document.querySelectorAll('.scroll-container-amount').forEach(container => { + let isDown = false; + let startX; + let scrollLeft; + + container.addEventListener('mousedown', (e) => { + isDown = true; + startX = e.pageX - container.offsetLeft; + scrollLeft = container.scrollLeft; + container.style.cursor = "grabbing"; + }); + + container.addEventListener('mouseleave', () => { + isDown = false; + container.style.cursor = "grab"; + }); + + container.addEventListener('mouseup', () => { + isDown = false; + container.style.cursor = "grab"; + }); + + container.addEventListener('mousemove', (e) => { + if (!isDown) return; + e.preventDefault(); + const x = e.pageX - container.offsetLeft; + const walk = (x - startX) * 2; + container.scrollLeft = scrollLeft - walk; + }); +}); + $(document).ready(function () { $('.loading').hide(); @@ -89,7 +120,8 @@ function ajaxPersonals() { var employees = response.data; var employeeOptionsHtml = ''; employees.forEach(function (employee) { - employeeOptionsHtml += ``; + var black = employee.black ? "blackSelect" : ""; + employeeOptionsHtml += ``; }); $('#employeeSelect').html(employeeOptionsHtml); } else { diff --git a/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/Index.js b/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/Index.js index e6d94e51..d118fa7e 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/Index.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/Index.js @@ -15,7 +15,13 @@ $(document).ready(function () { $(".select2OptionIndex").select2({ language: "fa", - dir: "rtl" + dir: "rtl", + templateResult: function (data, container) { + if (data.element) { + $(container).addClass($(data.element).attr("class")); + } + return data.text; + } }); $(".select2OptionIndexMobile").select2({ @@ -179,6 +185,27 @@ $(document).on('click', '.btn-search-click, .btn-search-click-mobile', function return; } + if (((searchName.val() === "0") && ((searchStartDateTime === '' && searchEndDateTime === '')))) { + if (isMobile) { + $('#start-date-mobile').addClass("errored"); + $('#end-date-mobile').addClass("errored"); + } else { + $('#start-date').addClass("errored"); + $('#end-date').addClass("errored"); + $('.select2.select2-container .select2-selection').addClass("errored"); + } + + $('.alert-msg').show(); + $('.alert-msg p').text('برای جستجوی تاریخ، می بایست تاریخ شروع و پایان یا پرسنل را مشخص نمایید'); + setTimeout(function () { + $('.alert-msg').hide(); + $('.alert-msg p').text(''); + $('#start-date, #end-date, .select2.select2-container .select2-selection ,#start-date-mobile, #end-date-mobile').removeClass("errored"); + + }, 3500); + return; + } + $('.btn-clear-filter').removeClass('disable'); if (searchName.val() === "0" && searchStartDateTime === "" && searchEndDateTime === "") { $('.btn-clear-filter').addClass('disable'); @@ -259,7 +286,8 @@ function ajaxPersonals() { var employees = response.data; var employeeOptionsHtml = ''; employees.forEach(function (employee) { - employeeOptionsHtml += ``; + var black = employee.black ? "blackSelect" : ""; + employeeOptionsHtml += ``; }); $('#employeeSelectIndex').html(employeeOptionsHtml); $('#employeeSelectIndexMobile').html(employeeOptionsHtml); @@ -557,7 +585,8 @@ function htmlLoadWithEmployeeDataByDate(loadSalaryAidListData) { if (loadSalaryAidListData.length > 0) { loadSalaryAidListData.forEach(function (itemSalaryAids) { n = 1; - html += `
+ //
+ html += `
@@ -689,7 +718,7 @@ function htmlLoadWithEmployeeDataByDate(loadSalaryAidListData) { }); - html += `
` + html += `
`; html += `
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/ModalCreateNewSalaryAid.js b/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/ModalCreateNewSalaryAid.js index 89063877..2bfd9a13 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/ModalCreateNewSalaryAid.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/ModalCreateNewSalaryAid.js @@ -120,7 +120,8 @@ function ajaxPersonals() { var employees = response.data; var employeeOptionsHtml = ''; employees.forEach(function (employee) { - employeeOptionsHtml += ``; + var black = employee.black ? "blackSelect" : ""; + employeeOptionsHtml += ``; }); $('#employeeSelect').html(employeeOptionsHtml); } else {