From 25c0fb93958b251829a5f551a5fdf2fae693e330 Mon Sep 17 00:00:00 2001 From: SamSys Date: Sat, 4 Jan 2025 20:11:47 +0330 Subject: [PATCH] CWS CustomizeChekout --- .../CustomizeWorkshopSettingsRepository.cs | 11 +- .../Company/CustomizeCheckout/Grouping.cshtml | 282 +++++- .../CustomizeCheckout/Grouping.cshtml.cs | 2 + .../Company/CustomizeCheckout/Index.cshtml | 63 +- .../Company/CustomizeCheckout/Index.cshtml.cs | 83 +- .../CustomizeCheckout/ModalSetting.cshtml | 54 +- .../ModalSettingGroup.cshtml | 25 +- .../ModalSettingGroupEmployee.cshtml | 33 +- .../Company/CustomizeCheckout/PrintOne.cshtml | 1 - .../EarlyExit.cshtml | 157 ++++ .../FineAbsenceDeduction.cshtml | 8 +- .../FridayAndHoliday.cshtml | 28 - .../LateToWork.cshtml | 162 ++++ .../LeavePayAndInsuranceDeduction.cshtml | 7 +- .../Salary.cshtml | 72 +- .../EarlyExit.cshtml | 158 ++++ .../FineAbsenceDeduction.cshtml | 9 +- .../FridayAndHoliday.cshtml | 29 - .../LateToWork.cshtml | 163 ++++ .../LeavePayAndInsuranceDeduction.cshtml | 7 +- .../_ModalGroupSettingPartials/Salary.cshtml | 72 +- .../_ModalPartials/EarlyExit.cshtml | 166 ++++ .../FineAbsenceDeduction.cshtml | 13 +- .../_ModalPartials/FridayAndHoliday.cshtml | 90 +- .../_ModalPartials/LateToWork.cshtml | 178 ++++ .../LeavePayAndInsuranceDeduction.cshtml | 12 +- ServiceHost/ServiceHost.csproj | 1 - ServiceHost/appsettings.Development.json | 4 +- ServiceHost/wwwroot/AssetsClient/css/card.css | 2 +- .../css/CheckoutTemporary.css | 41 + .../css/ModalCheckoutTemporaryCreate.css | 26 +- .../css/ModalCheckoutUnofficialCreate.css | 25 +- .../CustomizeCheckout/js/CheckoutTemporary.js | 880 ++++++++++-------- .../js/CheckoutUnofficial.js | 564 ++++++----- .../js/ModalCheckoutTemporaryCreate.js | 61 +- .../js/ModalCheckoutUnofficialCreate.js | 79 +- .../pages/RollCall/js/ModalEditGroup.js | 4 +- 37 files changed, 2654 insertions(+), 918 deletions(-) delete mode 100644 ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/PrintOne.cshtml create mode 100644 ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/EarlyExit.cshtml create mode 100644 ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/LateToWork.cshtml create mode 100644 ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/EarlyExit.cshtml create mode 100644 ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/LateToWork.cshtml create mode 100644 ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalPartials/EarlyExit.cshtml create mode 100644 ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalPartials/LateToWork.cshtml diff --git a/CompanyManagment.EFCore/Repository/CustomizeWorkshopSettingsRepository.cs b/CompanyManagment.EFCore/Repository/CustomizeWorkshopSettingsRepository.cs index df4877dc..7cdbd03d 100644 --- a/CompanyManagment.EFCore/Repository/CustomizeWorkshopSettingsRepository.cs +++ b/CompanyManagment.EFCore/Repository/CustomizeWorkshopSettingsRepository.cs @@ -296,9 +296,14 @@ namespace CompanyManagment.EFCore.Repository }).ToList(), BreakTime = g.BreakTime, HolidayWork = g.HolidayWork, - FridayWork = g.FridayWork - - }).ToList(), + FridayWork = g.FridayWork, + CustomizeRotatingShiftsViewModels = g.CustomizeRotatingShifts.Select(r => new CustomizeRotatingShiftsViewModel() + { + EndTime = r.EndTime.ToString("HH:mm"), + StartTime = r.StartTime.ToString("HH:mm") + }).ToList() + + }).ToList(), }).FirstOrDefault(); diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/Grouping.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/Grouping.cshtml index 9fef622b..c5c887b0 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/Grouping.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/Grouping.cshtml @@ -1,4 +1,6 @@ @page +@using _0_Framework.Application +@using Microsoft.AspNetCore.Mvc.TagHelpers @model ServiceHost.Areas.Client.Pages.Company.CustomizeCheckout.GroupingModel @{ @@ -98,7 +100,7 @@
-
+
@@ -175,6 +177,282 @@ var removeEmployeeFromGroupAjax = `@Url.Page("./Grouping", "RemoveEmployee")`; var workshopSettingId = Number((@Model.RollCallWorkshopSettings.Id)); var isSettingChangedGlobal = false; + + + + $(document).ready(function () { + $(document).on('click', ".openAction", function () { + var id = $(this).data('index'); + + if (window.matchMedia('(max-width: 767px)').matches) { + $(this).next().find(".operations-btns").slideToggle(500); + $(".operations-btns").not($(this).next().find(".operations-btns")).slideUp(500); + } + + loadEmployeeAjax(id); + $(`.openAction`).removeClass('active'); + $(this).addClass('active'); + }); + + loadDataAjax(); + }); + + function loadDataAjax() { + var html = ""; + var index = 0; + $.ajax({ + async: false, + contentType: 'charset=utf-8', + dataType: 'json', + type: 'GET', + url: loadWorkshopSettingsDataAjax, + headers: { "RequestVerificationToken": `${antiForgeryToken}` }, + success: function (response) { + var responseData = response.data; + + if (responseData.groupSettings.length > 0) { + responseData.groupSettings.forEach(function (item, indexItem) { + index = index + 1; + + html += ` +
+
+ ${item.id} + ${index} +
+ +
+

نام گروه:

+

${item.groupName}

+
+
`; + + if (item.workshopShiftStatus === 0) { + item.rollCallWorkshopShifts.forEach(function (itemShifts) { + html += ` +

+ ${itemShifts.startTime} + الی + ${itemShifts.endTime} +

+ `; + }); + } else { + html += `

`; + if (item.irregularShift.workshopIrregularShifts === 1) { + html += `12-24`; + } else if (item.irregularShift.workshopIrregularShifts === 2) { + html += `24-24`; + } else if (item.irregularShift.workshopIrregularShifts === 3) { + html += `12-36`; + } else if (item.irregularShift.workshopIrregularShifts === 4) { + html += `24-48`; + } + + html += `

`; + } + + html += `
+
+

حقوق

+

+ ${item.salary.toLocaleString() !== 0 ? item.salary.toLocaleString() + ` ریال` : `-`} +

+
+
+ +
+
+ +
+
+
+
+ `; + + if (indexItem === 0) { + loadEmployeeAjax(item.id); + } + }); + + $('#ajaxDataMain').html(html); + } else { + var htmlEmpty = `
+
+ +
اطلاعاتی وجود ندارد.
+
+
`; + + $('#ajaxDataMain').html(htmlEmpty); + $('#loadAccountItems').html(htmlEmpty); + } + }, + failure: function (response) { + console.log(5, response); + } + }); + } + + function loadEmployeeAjax(groupSettingId) { + var htmlEmployee = ""; + $(`#loadEmployeeItemsMobile_${groupSettingId}`).html(''); + + var indexEmployee = 1; + $.ajax({ + async: false, + contentType: 'charset=utf-8', + dataType: 'json', + type: 'GET', + url: loadEmployeesGroupAjax, + data: { 'groupId': groupSettingId }, + headers: { "RequestVerificationToken": `${antiForgeryToken}` }, + success: function (response) { + var responseDataEmployee = response.data; + + if (response.success) { + if (responseDataEmployee.length > 0) { + htmlEmployee += ` +
+
+ +
+
`; + + responseDataEmployee.forEach(function (itemEmployee) { + if (itemEmployee.isSettingChanged === true) { + isSettingChangedGlobal = true; + } + + htmlEmployee += `
+
+
+
+ + ${indexEmployee++} + +
+
+
+
نام پرسنل:
+
+
نام پرسنل:
+
${itemEmployee.name}
+
+
+ +
+
ساعت کاری:
+
+
ساعت کاری:
+
`; + if (itemEmployee.workshopShiftStatus === 0) { + itemEmployee.rollCallWorkshopShifts.forEach(function (itemEmployeeShifts) { + htmlEmployee += ` +

+ ${itemEmployeeShifts.startTime} + الی + ${itemEmployeeShifts.endTime} +

`; + }); + } else { + htmlEmployee += `

`; + if (itemEmployee.irregularShift.workshopIrregularShifts === 1) { + htmlEmployee += `12-24`; + } else if (itemEmployee.irregularShift.workshopIrregularShifts === 2) { + htmlEmployee += `24-24`; + } else if (itemEmployee.irregularShift.workshopIrregularShifts === 3) { + htmlEmployee += `12-36`; + } else if (itemEmployee.irregularShift.workshopIrregularShifts === 4) { + htmlEmployee += `24-48`; + } + + htmlEmployee += `

`; + } + + htmlEmployee += `
+
+ +
+
حقوق
+
+ ${itemEmployee.salary.toLocaleString() !== 0 ? itemEmployee.salary.toLocaleString() + ` ریال` : `-`} +
+
+ +
+
مرخصی مجاز
+
+ ${itemEmployee.leavePermittedDays} +
+
+ +
+ +
+
`; + }); + + $('#loadAccountItems').html(htmlEmployee); + $(`#loadEmployeeItemsMobile_${groupSettingId}`).append(htmlEmployee); + + } else { + isSettingChangedGlobal = false; + var htmlEmpty = `
+
+ +
اطلاعاتی وجود ندارد.
+
+
`; + + $('#loadAccountItems').html(htmlEmpty); + $(`#loadEmployeeItemsMobile_${groupSettingId}`).html(htmlEmpty); + } + } + }, + failure: function (response) { + console.log(5, response); + } + }); + } + + $(document).on('keyup', '#searchEmployee', function () { + var value = $(this).val().toLowerCase(); + var indexEmployee = 1; + $('.itemResultEmployee').filter(function () { + var employeeFName = $(this).find('.itemEmployeeName').text().toLowerCase(); + + if (employeeFName.includes(value)) { + $(this).show(); + $(this).find('.row-index2').text(indexEmployee++); + } else { + $(this).hide(); + } + }); + }); + + function showModalGroupSetting(groupId) { + window.location.href = `#showmodal=/Client/Company/CustomizeCheckout/Grouping?groupId=${groupId}&handler=GroupingSetting`; + } + + function showModalGroupEmployeeSetting(id, employeeIds) { + if (!Array.isArray(employeeIds)) { + employeeIds = [employeeIds]; + } + var employeeIdListStr = employeeIds.map(employeeId => `employeeId=${employeeId}`).join('&'); + + window.location.href = `#showmodal=/Client/Company/CustomizeCheckout/Grouping?customizeEmployeeId=${id}&${employeeIdListStr}&handler=GroupingEmployeeSetting`; + } - + @* *@ } \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/Grouping.cshtml.cs b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/Grouping.cshtml.cs index c94c5dc6..bb05cc59 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/Grouping.cshtml.cs +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/Grouping.cshtml.cs @@ -1,5 +1,6 @@ using System.Security.Claims; using _0_Framework.Application; +using _0_Framework.Infrastructure; using CompanyManagment.App.Contracts.CustomizeWorkshopSettings; using CompanyManagment.App.Contracts.Employee; using CompanyManagment.App.Contracts.Workshop; @@ -8,6 +9,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages; namespace ServiceHost.Areas.Client.Pages.Company.CustomizeCheckout { + [NeedsPermission(SubAccountPermissionHelper.CustomizeCheckoutSetGroupAndSalaryPermissionCode)] public class GroupingModel : PageModel { private readonly IPasswordHasher _passwordHasher; diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/Index.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/Index.cshtml index c001cfab..56153560 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/Index.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/Index.cshtml @@ -1,4 +1,6 @@ @page +@using _0_Framework.Application +@using Microsoft.AspNetCore.Mvc.TagHelpers @model ServiceHost.Areas.Client.Pages.Company.CustomizeCheckout.IndexModel @{ @@ -44,7 +46,7 @@
-
+ @*
@@ -56,9 +58,9 @@
-
+
*@ -
+
@@ -73,22 +75,7 @@
-@*
- -
- -
-
لیست فیش حقوقی موقت
-
-
- - -
*@ - - -
+
@@ -102,32 +89,18 @@
- @*
- -
- -
-
لیست فیش حقوقی نهایی
-
-
- - -
*@ - -
- -
- -
-
لیست فیش حقوقی نهایی
-
-
- - +
+ +
+ +
+
لیست فیش حقوقی نهایی
+
+
+ +
diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/Index.cshtml.cs b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/Index.cshtml.cs index 49e218c7..2e0e4fc9 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/Index.cshtml.cs +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/Index.cshtml.cs @@ -1,5 +1,4 @@ -using System.Security.Claims; -using _0_Framework.Application; +using _0_Framework.Application; using CompanyManagment.App.Contracts.CustomizeWorkshopSettings; using CompanyManagment.App.Contracts.Error; using CompanyManagment.App.Contracts.RollCallService; @@ -7,25 +6,28 @@ using CompanyManagment.App.Contracts.Workshop; 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.CustomizeCheckout { [Authorize] + [NeedsPermission(SubAccountPermissionHelper.CustomizeCheckoutOperationsPermissionCode)] public class IndexModel : PageModel { - private IPasswordHasher _passwordHasher; - private IWorkshopApplication _workshopApplication; - private readonly ICustomizeWorkshopSettingsApplication _customizeWorkshopSettingsApplication; - private readonly IRollCallServiceApplication _rollCallServiceApplication; + private IPasswordHasher _passwordHasher; + private IWorkshopApplication _workshopApplication; + private readonly ICustomizeWorkshopSettingsApplication _customizeWorkshopSettingsApplication; + private readonly IRollCallServiceApplication _rollCallServiceApplication; private readonly IHttpContextAccessor _contextAccessor; private readonly long _workshopId; public IndexModel(IPasswordHasher passwordHasher, IWorkshopApplication workshopApplication, ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication, IRollCallServiceApplication rollCallServiceApplication, IHttpContextAccessor contextAccessor) - { - _passwordHasher = passwordHasher; - _workshopApplication = workshopApplication; - _customizeWorkshopSettingsApplication = customizeWorkshopSettingsApplication; - _rollCallServiceApplication = rollCallServiceApplication; + { + _passwordHasher = passwordHasher; + _workshopApplication = workshopApplication; + _customizeWorkshopSettingsApplication = customizeWorkshopSettingsApplication; + _rollCallServiceApplication = rollCallServiceApplication; _contextAccessor = contextAccessor; var workshopHash = _contextAccessor.HttpContext?.User.FindFirstValue("WorkshopSlug"); @@ -35,45 +37,44 @@ namespace ServiceHost.Areas.Client.Pages.Company.CustomizeCheckout throw new InvalidDataException("اختلال در کارگاه"); } - public string HasCustomizeCheckoutService; + public string HasCustomizeCheckoutService; public string WorkshopFullName; public IActionResult OnGet() { - HasCustomizeCheckoutService = _rollCallServiceApplication.GetActiveServiceByWorkshopId(_workshopId)?.HasCustomizeCheckoutService; + HasCustomizeCheckoutService = _rollCallServiceApplication.GetActiveServiceByWorkshopId(_workshopId)?.HasCustomizeCheckoutService; - var workshopInfo = _workshopApplication.GetWorkshopInfo(_workshopId); - WorkshopFullName = workshopInfo.WorkshopFullName; + var workshopInfo = _workshopApplication.GetWorkshopInfo(_workshopId); + WorkshopFullName = workshopInfo.WorkshopFullName; - return Page(); - } + return Page(); + } - public IActionResult OnGetModalSettingRollCall() - { - var command = _customizeWorkshopSettingsApplication.GetWorkshopSettingsDetails(_workshopId); + public IActionResult OnGetModalSettingRollCall() + { + var command = _customizeWorkshopSettingsApplication.GetWorkshopSettingsDetails(_workshopId); - if (command.Id == 0) - { - var resultError = new ErrorViewModel() - { - Message = "شما تنظیماتی مربوط به کارگاه را تنظیم نکرده اید." - }; - return Partial("../Error/_ErrorModal", resultError); - } + if (command.Id == 0) + { + var resultError = new ErrorViewModel() + { + Message = "شما تنظیماتی مربوط به کارگاه را تنظیم نکرده اید." + }; + return Partial("../Error/_ErrorModal", resultError); + } - return Partial("ModalSetting", command); - } + return Partial("ModalSetting", command); + } - public IActionResult OnPostSaveCustomWorkshopSettings(EditCustomizeWorkshopSettings command,bool isAllGroupChanged) - { - //TODO:VAFA!!!! - var result = _customizeWorkshopSettingsApplication.EditWorkshopSetting(command, isAllGroupChanged); + public IActionResult OnPostSaveCustomWorkshopSettings(EditCustomizeWorkshopSettings command, bool isAllGroupChanged) + { + var result = _customizeWorkshopSettingsApplication.EditWorkshopSetting(command, isAllGroupChanged); - return new JsonResult(new - { - isSuccess = result.IsSuccedded, - message = result.Message, - }); - } - } + return new JsonResult(new + { + isSuccess = result.IsSuccedded, + message = result.Message, + }); + } + } } diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/ModalSetting.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/ModalSetting.cshtml index 134c9c4b..99c54c0e 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/ModalSetting.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/ModalSetting.cshtml @@ -21,7 +21,7 @@
تنظیمات فیش حقوقی
-
حقوق
+
جمعه و روزهای تعطیل
@@ -43,8 +43,18 @@ حقوق ماهانه و ساعت کاری پرسنل - *@ -
  • +
    • *@ +
  • + + + + + + + + جمعه و روزهای تعطیل +
    • +
  • @@ -104,13 +114,19 @@ مزد مرخصی و حق بیمه
    • -
  • +
  • + + تاخیر در ورود +
    • +
  • + + - تاخیر در ورود و تعجیل در خروج + تعجیل در خروج
  • @@ -122,16 +138,6 @@ جریمه غیبت
    • -
  • - - - - - - - - جمعه و روزهای تعطیل -
    • @@ -145,7 +151,11 @@ @* *@ -
    +
    + +
    + + @@ -161,14 +171,14 @@ -
    @@ -189,15 +195,18 @@ - diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/ModalSettingGroupEmployee.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/ModalSettingGroupEmployee.cshtml index 85b70004..87d5bdf8 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/ModalSettingGroupEmployee.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/ModalSettingGroupEmployee.cshtml @@ -7,6 +7,9 @@ int indexEmployee = 0; + + }
    @@ -22,8 +25,9 @@
    تنظیمات حقوق پرسنل
    -
    -
    حقوق
    +
    +
    حقوق
    +
    @Model.EmployeeFullName
    @@ -115,13 +119,19 @@ مزد مرخصی و حق بیمه -
  • +
  • + + تاخیر در ورود +
    • +
  • + + - تاخیر در ورود و تعجیل در خروج + تعجیل در خروج
  • @@ -133,7 +143,7 @@ جریمه غیبت
    • -
  • + @*
  • @@ -142,7 +152,7 @@ جمعه و روزهای تعطیل -
    • + *@
    @@ -192,15 +202,18 @@ - diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/PrintOne.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/PrintOne.cshtml deleted file mode 100644 index 5f282702..00000000 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/PrintOne.cshtml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/EarlyExit.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/EarlyExit.cshtml new file mode 100644 index 00000000..0b8aead9 --- /dev/null +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/EarlyExit.cshtml @@ -0,0 +1,157 @@ +@using _0_Framework.Domain.CustomizeCheckoutShared.Enums +@model CompanyManagment.App.Contracts.CustomizeWorkshopSettings.EditCustomizeEmployeeSettings + +
    +
    +
    + + + + + + این تنظیمات در محاسبات فیش حقوق قانونی اداره کار تاثیری نخواهد داشت. +
    +
    + +
    +
    تعجیل در خروج
    +
    + + +
    + +
    + + + +
    +
    + + + + +
    +
    + + +
    +
    +
    + +
    +
    +
    + +
    +
    در صورت تمایل به جرائم بیشتر از گزینه‌های زیر استفاده نمایید:
    +
    در صورت تعجیل پرسنل در خروج به مجموعه:
    +
    (توجه داشته باشید، مبلغ این جریمه مضاف بر مبالغ کسر شده بخش بالا محاسبه می‌گردد و در صورت تکمیل هر سه مرحله این بخش از جرائم، در صورتی که پرسنل از شروط دو سه مرحله عدول نماید. مجموع کل جرائم شامل محاسبه می‌گردد.)
    +
    + +
    + 0 } && + !String.IsNullOrWhiteSpace(Model.EarlyExit.EarlyExitTimeFinesViewModels[0].Minute) && + Model.EarlyExit.EarlyExitTimeFinesViewModels[0].FineMoney > 0 ? "checked" : "") + /> + + 0 } && !String.IsNullOrWhiteSpace(Model.EarlyExit?.EarlyExitTimeFinesViewModels[0].Minute) ? "" : "disabled") : "disabled") /> + + 0 } && Model.EarlyExit?.EarlyExitTimeFinesViewModels[0].FineMoney > 0 ? "" : "disabled") : "disabled") /> + +
    + +
    + 1 } && + !String.IsNullOrWhiteSpace(Model.EarlyExit.EarlyExitTimeFinesViewModels[1].Minute) && + Model.EarlyExit.EarlyExitTimeFinesViewModels[1].FineMoney > 0 ? "checked" : "") + /> + + 1 } && !String.IsNullOrWhiteSpace(Model.EarlyExit?.EarlyExitTimeFinesViewModels[1].Minute) ? "" : "disabled") : "disabled") /> + + 1 } && Model.EarlyExit?.EarlyExitTimeFinesViewModels[1].FineMoney > 0 ? "" : "disabled") : "disabled") /> + +
    + +
    + 2 } && + !String.IsNullOrWhiteSpace(Model.EarlyExit.EarlyExitTimeFinesViewModels[2].Minute) && + Model.EarlyExit.EarlyExitTimeFinesViewModels[2].FineMoney > 0 ? "checked" : "") + /> + + 2 } && !String.IsNullOrWhiteSpace(Model.EarlyExit?.EarlyExitTimeFinesViewModels[2].Minute) ? "" : "disabled") : "disabled") /> + + 2 } && Model.EarlyExit?.EarlyExitTimeFinesViewModels[2].FineMoney > 0 ? "" : "disabled") : "disabled") /> + +
    +
    + +
    + + \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/FineAbsenceDeduction.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/FineAbsenceDeduction.cshtml index 01c28374..3e60b614 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/FineAbsenceDeduction.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/FineAbsenceDeduction.cshtml @@ -54,9 +54,11 @@ Model.FineAbsenceDeduction.FineAbsenceDeductionType == FineAbsenceDeductionType.Money ? "" : "disabled") value="@((int)(FineAbsenceDeductionType.MultipleTimesOfDailyWage))" /> - - diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/FridayAndHoliday.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/FridayAndHoliday.cshtml index 6df058d2..05384bb4 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/FridayAndHoliday.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/FridayAndHoliday.cshtml @@ -13,32 +13,4 @@ این تنظیمات در محاسبات فیش حقوق قانونی اداره کار تاثیری نخواهد داشت.
    -
    -
    تعطیلات جمعه
    -
    - - -
    -
    - - -
    -
    - -
    -
    -
    - -
    -
    تعطیلات رسمی
    -
    - - -
    -
    - - -
    - -
    \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/LateToWork.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/LateToWork.cshtml new file mode 100644 index 00000000..ca8dc70a --- /dev/null +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/LateToWork.cshtml @@ -0,0 +1,162 @@ +@using _0_Framework.Domain.CustomizeCheckoutShared.Enums +@model CompanyManagment.App.Contracts.CustomizeWorkshopSettings.EditCustomizeEmployeeSettings + +
    +
    +
    + + + + + + این تنظیمات در محاسبات فیش حقوق قانونی اداره کار تاثیری نخواهد داشت. +
    +
    +
    +
    تاخیر در ورود
    + +
    + + +
    + +
    + + + +
    +
    + + + + +
    +
    + + +
    +
    +
    + +
    +
    +
    + +
    +
    در صورت تمایل به جرائم بیشتر از گزینه‌های زیر استفاده نمایید:
    +
    در صورت تاخیر پرسنل در ورود به مجموعه:
    +
    (توجه داشته باشید، مبلغ این جریمه مضاف بر مبالغ کسر شده بخش بالا محاسبه می‌گردد و در صورت تکمیل هر سه مرحله این بخش از جرائم، در صورتی که پرسنل از شروط دو سه مرحله عدول نماید. مجموع کل جرائم شامل محاسبه می‌گردد.)
    +
    + + +
    + 0 } && + !String.IsNullOrWhiteSpace(Model.LateToWork.LateToWorkTimeFinesVewModels[0].Minute) && + Model.LateToWork.LateToWorkTimeFinesVewModels[0].FineMoney > 0 ? "checked" : "")/> + + @* *@ + + @* value="@(Model.FridayPay.FridayPayType == FridayPayType.MoneyPerFridayPerHour ? Model.FridayPay.Value : "")" @((Model.FridayPay.Value != 0 && Model.FridayPay.FridayPayType == FridayPayType.MoneyPerFridayPerHour) ? "" : "disabled") *@ + 0 } && !String.IsNullOrWhiteSpace(Model.LateToWork?.LateToWorkTimeFinesVewModels[0].Minute) ? "" : "disabled") : "disabled") /> + + 0 } && (Model.LateToWork?.LateToWorkTimeFinesVewModels[0].FineMoney > 0) ? "" : "disabled") : "disabled") /> + +
    + +
    + 1 } && + !String.IsNullOrWhiteSpace(Model.LateToWork.LateToWorkTimeFinesVewModels[1].Minute) && + Model.LateToWork.LateToWorkTimeFinesVewModels[1]?.FineMoney > 0 ? "checked" : "") + /> + + + 1 } && !String.IsNullOrWhiteSpace(Model.LateToWork?.LateToWorkTimeFinesVewModels[1].Minute) ? "" : "disabled") : "disabled") /> + + 1 } && Model.LateToWork?.LateToWorkTimeFinesVewModels[1].FineMoney > 0 ? "" : "disabled") : "disabled") /> + +
    + +
    + 2 } && + !String.IsNullOrWhiteSpace(Model.LateToWork.LateToWorkTimeFinesVewModels[2].Minute) && + Model.LateToWork.LateToWorkTimeFinesVewModels[2].FineMoney > 0 ? "checked" : "") + /> + + + 2 } && !String.IsNullOrWhiteSpace(Model.LateToWork?.LateToWorkTimeFinesVewModels[2].Minute) ? "" : "disabled") : "disabled") /> + + 2 } && Model.LateToWork?.LateToWorkTimeFinesVewModels[2].FineMoney > 0 ? "" : "disabled") : "disabled") /> + +
    +
    + +
    + + \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/LeavePayAndInsuranceDeduction.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/LeavePayAndInsuranceDeduction.cshtml index 70b3af7a..efa3de4f 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/LeavePayAndInsuranceDeduction.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/LeavePayAndInsuranceDeduction.cshtml @@ -22,7 +22,12 @@
    - diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/Salary.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/Salary.cshtml index 208efa29..65ba66bd 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/Salary.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalEmployeeSettingPartials/Salary.cshtml @@ -13,10 +13,78 @@
    -
    حقوق
    +
    میزان حقوق
    ریال
    -
    \ No newline at end of file + + +
    +
    +
    + +
    +
    تعداد مرخصی مجاز
    +
    + + +
    +
    + +
    +
    +
    + +
    +
    وضعیت فعالیت مجموعه در روز های جمعه
    +
    + + +
    +
    + + +
    +
    + +
    +
    +
    + +
    +
    وضعیت فعالیت مجموعه در روز های تعطیلات رسمی
    +
    + + +
    +
    + + +
    + +
    +
    + + + + \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/EarlyExit.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/EarlyExit.cshtml new file mode 100644 index 00000000..f9dae0b0 --- /dev/null +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/EarlyExit.cshtml @@ -0,0 +1,158 @@ + +@using _0_Framework.Domain.CustomizeCheckoutShared.Enums +@model CompanyManagment.App.Contracts.CustomizeWorkshopSettings.EditCustomizeWorkshopGroupSettings + +
    +
    +
    + + + + + + این تنظیمات در محاسبات فیش حقوق قانونی اداره کار تاثیری نخواهد داشت. +
    +
    + +
    +
    تعجیل در خروج
    +
    + + +
    + +
    + + + +
    +
    + + + + +
    +
    + + +
    +
    +
    + +
    +
    +
    + +
    +
    در صورت تمایل به جرائم بیشتر از گزینه‌های زیر استفاده نمایید:
    +
    در صورت تعجیل پرسنل در خروج به مجموعه:
    +
    (توجه داشته باشید، مبلغ این جریمه مضاف بر مبالغ کسر شده بخش بالا محاسبه می‌گردد و در صورت تکمیل هر سه مرحله این بخش از جرائم، در صورتی که پرسنل از شروط دو سه مرحله عدول نماید. مجموع کل جرائم شامل محاسبه می‌گردد.)
    +
    + +
    + 0 } && + !String.IsNullOrWhiteSpace(Model.EarlyExit.EarlyExitTimeFinesViewModels[0].Minute) && + Model.EarlyExit.EarlyExitTimeFinesViewModels[0].FineMoney > 0 ? "checked" : "") + /> + + 0 } && !String.IsNullOrWhiteSpace(Model.EarlyExit?.EarlyExitTimeFinesViewModels[0].Minute) ? "" : "disabled") : "disabled") /> + + 0 } && Model.EarlyExit?.EarlyExitTimeFinesViewModels[0].FineMoney > 0 ? "" : "disabled") : "disabled") /> + +
    + +
    + 1 } && + !String.IsNullOrWhiteSpace(Model.EarlyExit.EarlyExitTimeFinesViewModels[1].Minute) && + Model.EarlyExit.EarlyExitTimeFinesViewModels[1].FineMoney > 0 ? "checked" : "") + /> + + 1 } && !String.IsNullOrWhiteSpace(Model.EarlyExit?.EarlyExitTimeFinesViewModels[1].Minute) ? "" : "disabled") : "disabled") /> + + 1 } && Model.EarlyExit?.EarlyExitTimeFinesViewModels[1].FineMoney > 0 ? "" : "disabled") : "disabled") /> + +
    + +
    + 2 } && + !String.IsNullOrWhiteSpace(Model.EarlyExit.EarlyExitTimeFinesViewModels[2].Minute) && + Model.EarlyExit.EarlyExitTimeFinesViewModels[2].FineMoney > 0 ? "checked" : "") + /> + + 2 } && !String.IsNullOrWhiteSpace(Model.EarlyExit?.EarlyExitTimeFinesViewModels[2].Minute) ? "" : "disabled") : "disabled") /> + + 2 } && Model.EarlyExit?.EarlyExitTimeFinesViewModels[2].FineMoney > 0 ? "" : "disabled") : "disabled") /> + +
    +
    + +
    + + \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/FineAbsenceDeduction.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/FineAbsenceDeduction.cshtml index f607cb2d..aa1eb7a6 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/FineAbsenceDeduction.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/FineAbsenceDeduction.cshtml @@ -54,9 +54,12 @@ Model.FineAbsenceDeduction.FineAbsenceDeductionType == FineAbsenceDeductionType.Money ? "" : "disabled") value="@((int)(FineAbsenceDeductionType.MultipleTimesOfDailyWage))" /> - - diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/FridayAndHoliday.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/FridayAndHoliday.cshtml index 5e1ce2c1..50f1718f 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/FridayAndHoliday.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/FridayAndHoliday.cshtml @@ -1,6 +1,5 @@ @using _0_Framework.Domain.CustomizeCheckoutShared.Enums -@using _0_Framework.Domain.CustomizeCheckoutShared.Enums @model CompanyManagment.App.Contracts.CustomizeWorkshopSettings.EditCustomizeWorkshopGroupSettings
    @@ -14,32 +13,4 @@ این تنظیمات در محاسبات فیش حقوق قانونی اداره کار تاثیری نخواهد داشت.
    -
    -
    تعطیلات جمعه
    -
    - - -
    -
    - - -
    -
    - -
    -
    -
    - -
    -
    تعطیلات رسمی
    -
    - - -
    -
    - - -
    - -
    \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/LateToWork.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/LateToWork.cshtml new file mode 100644 index 00000000..552372e9 --- /dev/null +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/LateToWork.cshtml @@ -0,0 +1,163 @@ + +@using _0_Framework.Domain.CustomizeCheckoutShared.Enums +@model CompanyManagment.App.Contracts.CustomizeWorkshopSettings.EditCustomizeWorkshopGroupSettings + +
    +
    +
    + + + + + + این تنظیمات در محاسبات فیش حقوق قانونی اداره کار تاثیری نخواهد داشت. +
    +
    +
    +
    تاخیر در ورود
    + +
    + + +
    + +
    + + + +
    +
    + + + + +
    +
    + + +
    +
    +
    + +
    +
    +
    + +
    +
    در صورت تمایل به جرائم بیشتر از گزینه‌های زیر استفاده نمایید:
    +
    در صورت تاخیر پرسنل در ورود به مجموعه:
    +
    (توجه داشته باشید، مبلغ این جریمه مضاف بر مبالغ کسر شده بخش بالا محاسبه می‌گردد و در صورت تکمیل هر سه مرحله این بخش از جرائم، در صورتی که پرسنل از شروط دو سه مرحله عدول نماید. مجموع کل جرائم شامل محاسبه می‌گردد.)
    +
    + + +
    + 0 } && + !String.IsNullOrWhiteSpace(Model.LateToWork.LateToWorkTimeFinesVewModels[0].Minute) && + Model.LateToWork.LateToWorkTimeFinesVewModels[0].FineMoney > 0 ? "checked" : "")/> + + @* *@ + + @* value="@(Model.FridayPay.FridayPayType == FridayPayType.MoneyPerFridayPerHour ? Model.FridayPay.Value : "")" @((Model.FridayPay.Value != 0 && Model.FridayPay.FridayPayType == FridayPayType.MoneyPerFridayPerHour) ? "" : "disabled") *@ + 0 } && !String.IsNullOrWhiteSpace(Model.LateToWork?.LateToWorkTimeFinesVewModels[0].Minute) ? "" : "disabled") : "disabled") /> + + 0 } && (Model.LateToWork?.LateToWorkTimeFinesVewModels[0].FineMoney > 0) ? "" : "disabled") : "disabled") /> + +
    + +
    + 1 } && + !String.IsNullOrWhiteSpace(Model.LateToWork.LateToWorkTimeFinesVewModels[1].Minute) && + Model.LateToWork.LateToWorkTimeFinesVewModels[1]?.FineMoney > 0 ? "checked" : "") + /> + + + 1 } && !String.IsNullOrWhiteSpace(Model.LateToWork?.LateToWorkTimeFinesVewModels[1].Minute) ? "" : "disabled") : "disabled") /> + + 1 } && Model.LateToWork?.LateToWorkTimeFinesVewModels[1].FineMoney > 0 ? "" : "disabled") : "disabled") /> + +
    + +
    + 2 } && + !String.IsNullOrWhiteSpace(Model.LateToWork.LateToWorkTimeFinesVewModels[2].Minute) && + Model.LateToWork.LateToWorkTimeFinesVewModels[2].FineMoney > 0 ? "checked" : "") + /> + + + 2 } && !String.IsNullOrWhiteSpace(Model.LateToWork?.LateToWorkTimeFinesVewModels[2].Minute) ? "" : "disabled") : "disabled") /> + + 2 } && Model.LateToWork?.LateToWorkTimeFinesVewModels[2].FineMoney > 0 ? "" : "disabled") : "disabled") /> + +
    +
    + +
    + + \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/LeavePayAndInsuranceDeduction.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/LeavePayAndInsuranceDeduction.cshtml index a69650ae..25eee733 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/LeavePayAndInsuranceDeduction.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/LeavePayAndInsuranceDeduction.cshtml @@ -23,7 +23,12 @@
    - diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/Salary.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/Salary.cshtml index 92e3cd5f..949fd908 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/Salary.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalGroupSettingPartials/Salary.cshtml @@ -13,10 +13,78 @@
    -
    حقوق
    +
    میزان حقوق
    ریال
    -
    \ No newline at end of file + + +
    +
    +
    + +
    +
    تعداد مرخصی مجاز
    +
    + + +
    +
    + +
    +
    +
    + +
    +
    وضعیت فعالیت مجموعه در روز های جمعه
    +
    + + +
    +
    + + +
    +
    + +
    +
    +
    + +
    +
    وضعیت فعالیت مجموعه در روز های تعطیلات رسمی
    +
    + + +
    +
    + + +
    + +
    +
    + + + + \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalPartials/EarlyExit.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalPartials/EarlyExit.cshtml new file mode 100644 index 00000000..9ef679dc --- /dev/null +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalPartials/EarlyExit.cshtml @@ -0,0 +1,166 @@ +@using _0_Framework.Domain.CustomizeCheckoutShared.Enums +@model CompanyManagment.App.Contracts.CustomizeWorkshopSettings.EditCustomizeWorkshopSettings + +
    +
    +
    + + + + + + این تنظیمات در محاسبات فیش حقوق قانونی اداره کار تاثیری نخواهد داشت. +
    +
    + +
    +
    تعجیل در خروج
    +
    + + +
    + +
    + + + +
    +
    + + + + +
    +
    + + +
    +
    +
    + +@*
    + + + + +
    *@ + +
    +
    +
    + +
    +
    در صورت تمایل به جرائم بیشتر از گزینه‌های زیر استفاده نمایید:
    +
    در صورت تعجیل پرسنل در خروج به مجموعه:
    +
    (توجه داشته باشید، مبلغ این جریمه مضاف بر مبالغ کسر شده بخش بالا محاسبه می‌گردد و در صورت تکمیل هر سه مرحله این بخش از جرائم، در صورتی که پرسنل از شروط دو سه مرحله عدول نماید. مجموع کل جرائم شامل محاسبه می‌گردد.)
    +
    + +
    + 0 } && + !String.IsNullOrWhiteSpace(Model.EarlyExit.EarlyExitTimeFinesViewModels[0].Minute) && + Model.EarlyExit.EarlyExitTimeFinesViewModels[0].FineMoney > 0 ? "checked" : "") + /> + + 0 } && !String.IsNullOrWhiteSpace(Model.EarlyExit?.EarlyExitTimeFinesViewModels[0].Minute) ? "" : "disabled") : "disabled") /> + + 0 } && Model.EarlyExit?.EarlyExitTimeFinesViewModels[0].FineMoney > 0 ? "" : "disabled") : "disabled") /> + +
    + +
    + 1 } && + !String.IsNullOrWhiteSpace(Model.EarlyExit.EarlyExitTimeFinesViewModels[1].Minute) && + Model.EarlyExit.EarlyExitTimeFinesViewModels[1].FineMoney > 0 ? "checked" : "") + /> + + 1 } && !String.IsNullOrWhiteSpace(Model.EarlyExit?.EarlyExitTimeFinesViewModels[1].Minute) ? "" : "disabled") : "disabled") /> + + 1 } && Model.EarlyExit?.EarlyExitTimeFinesViewModels[1].FineMoney > 0 ? "" : "disabled") : "disabled") /> + +
    + +
    + 2 } && + !String.IsNullOrWhiteSpace(Model.EarlyExit.EarlyExitTimeFinesViewModels[2].Minute) && + Model.EarlyExit.EarlyExitTimeFinesViewModels[2].FineMoney > 0 ? "checked" : "") + /> + + 2 } && !String.IsNullOrWhiteSpace(Model.EarlyExit?.EarlyExitTimeFinesViewModels[2].Minute) ? "" : "disabled") : "disabled") /> + + 2 } && Model.EarlyExit?.EarlyExitTimeFinesViewModels[2].FineMoney > 0 ? "" : "disabled") : "disabled") /> + +
    +
    + +
    + + \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalPartials/FineAbsenceDeduction.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalPartials/FineAbsenceDeduction.cshtml index c0b54882..acbd5e8e 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalPartials/FineAbsenceDeduction.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalPartials/FineAbsenceDeduction.cshtml @@ -55,10 +55,15 @@ value="@((int)(FineAbsenceDeductionType.MultipleTimesOfDailyWage))" /> - + @* @(Model.FineAbsenceDeduction.FineAbsenceDeductionType == FineAbsenceDeductionType.MultipleTimesOfDailyWage ? =@Model.FineAbsenceDeduction.Value : "disabled") *@ + +
    diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalPartials/FridayAndHoliday.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalPartials/FridayAndHoliday.cshtml index 055ffc20..68387937 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalPartials/FridayAndHoliday.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalPartials/FridayAndHoliday.cshtml @@ -12,8 +12,23 @@ این تنظیمات در محاسبات فیش حقوق قانونی اداره کار تاثیری نخواهد داشت. +
    -
    تعطیلات جمعه
    +
    تعداد مرخصی مجاز
    +
    + + +
    +
    + + +
    +
    +
    + + +
    +
    وضعیت فعالیت مجموعه در روز های جمعه
    @@ -29,7 +44,7 @@
    -
    تعطیلات رسمی
    +
    وضعیت فعالیت مجموعه در روز های تعطیلات رسمی
    @@ -42,22 +57,12 @@
    - - -
    -
    -
    - -
    -
    -
    -
    -
    تعلق گرفتن عیدی
    +
    تعیین وضعیت پرداخت عیدی
    @@ -73,7 +78,7 @@
    -
    تعلق گرفتن سنوات
    +
    تعیین وضعیت پرداخت سنوات
    @@ -84,63 +89,6 @@
    - - @*
    -
    تعلق گرفتن عیدی
    -
    - - @{ - int checkedValid = 0; - switch (Model.BonusesPaysInEndOfMonth) - { - case BonusesPaysInEndOfYear.EndOfYear: - checkedValid = 0; - break; - case BonusesPaysInEndOfYear.WhenEverEmployeeLeftWork: - checkedValid = 1; - break; - } - } - - -
    -
    *@ - -
    -
    -
    - -@*
    -
    تعلق گرفتن سنوات
    -
    - @{ - int checkedBaseYearValid = 0; - switch (Model.BonusesPaysInEndOfMonth) - { - case BonusesPaysInEndOfYear.EndOfYear: - checkedBaseYearValid = 0; - break; - case BonusesPaysInEndOfYear.WhenEverEmployeeLeftWork: - checkedBaseYearValid = 1; - break; - } - } - - -
    -
    *@ - -
    -
    -
    - -
    -
    تعداد روز مجاز برای مرخصی
    -
    - - -
    -
    diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalPartials/LateToWork.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalPartials/LateToWork.cshtml new file mode 100644 index 00000000..5d3dbaee --- /dev/null +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalPartials/LateToWork.cshtml @@ -0,0 +1,178 @@ +@using _0_Framework.Domain.CustomizeCheckoutShared.Enums +@model CompanyManagment.App.Contracts.CustomizeWorkshopSettings.EditCustomizeWorkshopSettings + +
    +
    +
    + + + + + + این تنظیمات در محاسبات فیش حقوق قانونی اداره کار تاثیری نخواهد داشت. +
    +
    +
    +
    تاخیر در ورود
    + +
    + + +
    + +
    + + + +
    +
    + + + + +
    +
    + + +
    +
    +
    + + @*
    + + + + +
    + +
    + + + + +
    *@ + +
    +
    +
    + +
    +
    در صورت تمایل به جرائم بیشتر از گزینه‌های زیر استفاده نمایید:
    +
    در صورت تاخیر پرسنل در ورود به مجموعه:
    +
    (توجه داشته باشید، مبلغ این جریمه مضاف بر مبالغ کسر شده بخش بالا محاسبه می‌گردد و در صورت تکمیل هر سه مرحله این بخش از جرائم، در صورتی که پرسنل از شروط دو سه مرحله عدول نماید. مجموع کل جرائم شامل محاسبه می‌گردد.)
    +
    + + +
    + 0 } && + !String.IsNullOrWhiteSpace(Model.LateToWork.LateToWorkTimeFinesVewModels[0].Minute) && + Model.LateToWork.LateToWorkTimeFinesVewModels[0].FineMoney > 0 ? "checked" : "")/> + + @* *@ + + @* value="@(Model.FridayPay.FridayPayType == FridayPayType.MoneyPerFridayPerHour ? Model.FridayPay.Value : "")" @((Model.FridayPay.Value != 0 && Model.FridayPay.FridayPayType == FridayPayType.MoneyPerFridayPerHour) ? "" : "disabled") *@ + 0 } && !String.IsNullOrWhiteSpace(Model.LateToWork?.LateToWorkTimeFinesVewModels[0].Minute) ? "" : "disabled") : "disabled") /> + + 0 } && (Model.LateToWork?.LateToWorkTimeFinesVewModels[0].FineMoney > 0) ? "" : "disabled") : "disabled") /> + +
    + +
    + 1 } && + !String.IsNullOrWhiteSpace(Model.LateToWork.LateToWorkTimeFinesVewModels[1].Minute) && + Model.LateToWork.LateToWorkTimeFinesVewModels[1]?.FineMoney > 0 ? "checked" : "") + /> + + + 1 } && !String.IsNullOrWhiteSpace(Model.LateToWork?.LateToWorkTimeFinesVewModels[1].Minute) ? "" : "disabled") : "disabled") /> + + 1 } && Model.LateToWork?.LateToWorkTimeFinesVewModels[1].FineMoney > 0 ? "" : "disabled") : "disabled") /> + +
    + +
    + 2 } && + !String.IsNullOrWhiteSpace(Model.LateToWork.LateToWorkTimeFinesVewModels[2].Minute) && + Model.LateToWork.LateToWorkTimeFinesVewModels[2].FineMoney > 0 ? "checked" : "") + /> + + + 2 } && !String.IsNullOrWhiteSpace(Model.LateToWork?.LateToWorkTimeFinesVewModels[2].Minute) ? "" : "disabled") : "disabled") /> + + 2 } && Model.LateToWork?.LateToWorkTimeFinesVewModels[2].FineMoney > 0 ? "" : "disabled") : "disabled") /> + +
    +
    + +
    + + \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalPartials/LeavePayAndInsuranceDeduction.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalPartials/LeavePayAndInsuranceDeduction.cshtml index ccc8dbe3..87a03093 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalPartials/LeavePayAndInsuranceDeduction.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/_ModalPartials/LeavePayAndInsuranceDeduction.cshtml @@ -22,9 +22,15 @@
    - *@ +
    diff --git a/ServiceHost/ServiceHost.csproj b/ServiceHost/ServiceHost.csproj index f1508ee7..ae813357 100644 --- a/ServiceHost/ServiceHost.csproj +++ b/ServiceHost/ServiceHost.csproj @@ -158,7 +158,6 @@ - diff --git a/ServiceHost/appsettings.Development.json b/ServiceHost/appsettings.Development.json index 58da1be8..e8a307ae 100644 --- a/ServiceHost/appsettings.Development.json +++ b/ServiceHost/appsettings.Development.json @@ -12,10 +12,10 @@ //"MesbahDb": "Data Source=DESKTOP-NUE119G\\MSNEW;Initial Catalog=Mesbah_db;Integrated Security=True" //server - //"MesbahDb": "Data Source=171.22.24.15;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]is[3019]#@ATt;TrustServerCertificate=true;" + "MesbahDb": "Data Source=171.22.24.15;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]is[3019]#@ATt;TrustServerCertificate=true;" //local - "MesbahDb": "Data Source=.;Initial Catalog=mesbah_db;Integrated Security=True;TrustServerCertificate=true;" + //"MesbahDb": "Data Source=.;Initial Catalog=mesbah_db;Integrated Security=True;TrustServerCertificate=true;" }, "GoogleRecaptchaV3": { "SiteKey": "6Lfhp_AnAAAAAB79WkrMoHd1k8ir4m8VvfjE7FTH", diff --git a/ServiceHost/wwwroot/AssetsClient/css/card.css b/ServiceHost/wwwroot/AssetsClient/css/card.css index b2ae6ea6..a0bd6351 100644 --- a/ServiceHost/wwwroot/AssetsClient/css/card.css +++ b/ServiceHost/wwwroot/AssetsClient/css/card.css @@ -150,7 +150,7 @@ } .card-area-checkout-customize { - grid-template-columns: repeat(4, minmax(0, 1fr)); + grid-template-columns: repeat(3, minmax(0, 1fr)); } /************************* Start Responsive *************************/ @media (max-width: 1442px) { diff --git a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/css/CheckoutTemporary.css b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/css/CheckoutTemporary.css index 8c0d56ec..2d8aa14e 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/css/CheckoutTemporary.css +++ b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/css/CheckoutTemporary.css @@ -40,6 +40,47 @@ background-color: #72b112; } +.Rtable .Rtable-row:first-child { + background: linear-gradient(90deg, #1ab8ff 0%, #4abef2 100%); +} + +.Rtable .Rtable-row:nth-child(2n), .table-workshop .Rtable .Rtable-row:nth-child(4n+2), .table-personals .Rtable .Rtable-row:nth-child(4n+2) { + background-color: #d9f3ff; +} + +.Rtable .Rtable-row:nth-child(2n+1), .table-workshop .Rtable .Rtable-row:nth-child(4n+4), .table-personals .Rtable .Rtable-row:nth-child(4n+4) { + background-color: #c6e8f7; +} + +.Rtable .Rtable-row:nth-child(2n):hover, .table-workshop .Rtable .Rtable-row:nth-child(4n+2):hover, .table-personals .Rtable .Rtable-row:nth-child(4n+2):hover { + background-color: #b0e7ff; +} +.Rtable .Rtable-row:nth-child(2n+1):hover, .table-workshop .Rtable .Rtable-row:nth-child(4n+4):hover, .table-personals .Rtable .Rtable-row:nth-child(4n+4):hover { + background-color: #b0e7ff; +} + +.Rtable .Rtable-row .Rtable-cell .Rtable-cell--content { + color: #0c4a6e; +} + +.table-contracts .Rtable .Rtable-row .Rtable-cell .Rtable-cell--content > span { + background: rgba(115, 166, 232, 0.25); +} + +.table-contracts .form-check-input { + outline: 1px solid #3bb6fd; +} + +.table-contracts .form-check-input.checkAll:checked { + background-color: #3bb6fd; + outline: 1px solid #81d1ff; +} + +.table-contracts .form-check-input:checked { + background-color: #3bb6fd; + outline: 1px solid #81d1ff; +} + @media screen and (max-width: 767px) { .goToTop { position: fixed; diff --git a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/css/ModalCheckoutTemporaryCreate.css b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/css/ModalCheckoutTemporaryCreate.css index 7dea9b11..fe15d3d2 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/css/ModalCheckoutTemporaryCreate.css +++ b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/css/ModalCheckoutTemporaryCreate.css @@ -49,6 +49,22 @@ width: 100% !important; } +.isEligiblePersonel { + pointer-events: none; +} + +.orangeStatus { + background-color: #f4c56d !important; +} + +.redStatus { + background-color: #ec8c8c !important; +} + +.greenStatus { + background-color: #afeec7 !important; +} + #loadTableCheckout { height: 400px; overflow-y: scroll; @@ -56,15 +72,19 @@ } .checkout-temp .width1 { - width: 20% !important; + width: 10% !important; } .checkout-temp .width2 { - width: 50% !important; + width: 30% !important; } .checkout-temp .width3 { - width: 30% !important; + width: 20% !important; +} + +.checkout-temp .width4 { + width: 20% !important; } .Rtable .Rtable-row .Rtable-cell .Rtable-cell--content > span { diff --git a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/css/ModalCheckoutUnofficialCreate.css b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/css/ModalCheckoutUnofficialCreate.css index 88272bc7..24bdb9b5 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/css/ModalCheckoutUnofficialCreate.css +++ b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/css/ModalCheckoutUnofficialCreate.css @@ -67,6 +67,23 @@ width: 100% !important; } + +.isEligiblePersonel { + pointer-events: none; +} + +.orangeStatus { + background-color: #f4c56d !important; +} + +.redStatus { + background-color: #ec8c8c !important; +} + +.greenStatus { + background-color: #afeec7 !important; +} + #loadTableCheckout { height: 270px; overflow-y: scroll; @@ -74,19 +91,19 @@ } .checkout-unoff .width1 { - width: 20% !important; + width: 10% !important; } .checkout-unoff .width2 { - width: 50% !important; + width: 30% !important; } .checkout-unoff .width3 { - width: 30% !important; + width: 20% !important; } .checkout-unoff .width4 { - width: 30% !important; + width: 20% !important; } .checkout-unoff .width5 { diff --git a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutTemporary.js b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutTemporary.js index 998ddf47..90fe64b2 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutTemporary.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutTemporary.js @@ -7,6 +7,99 @@ Scrollbar.init(document.querySelector('#my-scrollbar'), { const selectedAll = document.querySelectorAll(".wrapper-dropdown"); $(document).ready(function () { + ajaxPersonals(); + + + //$(".getPersonnel").select2({ + // language: "fa", + // dir: "rtl" + //}); + + //$(".getPersonneModal").select2({ + // language: "fa", + // dir: "rtl", + // dropdownParent: $("#searchModal") + //}); + + $('.select2Option').on('change', function () { + $('#SearchModel_EmployeeId').val(this.value); + }); + + $(".select2Option").select2({ + language: "fa", + dir: "rtl" + }); + + $(".select2OptionMobile").select2({ + language: "fa", + dir: "rtl", + dropdownParent: $('#searchModal'), + templateResult: function (data, container) { + if (data.element) { + $(container).addClass($(data.element).attr("class")); + } + return data.text; + } + }); + + $(".form-control-date").each(function () { + let element = $(this); + element.on('input', function () { + let value = convertPersianNumbersToEnglish(element.val()); + element.val(value); + }); + + new Cleave(this, { + date: true, + delimiter: '/', + datePattern: ['Y', 'm', 'd'] + }); + }); + + + + + + var filterEmployeeId = $('#employeeId').val(); + var filterYear = $('#Year').val(); + var filterMonth = $('#Month').val(); + var filterStart = $('#SearchStartFa').val(); + var filterEnd = $('#SearchEndFa').val(); + if (filterEmployeeId !== "0" || filterYear !== "0" || filterMonth !== "0" || filterStart !== '' || filterEnd !== '') { + $('.btn-clear-filter').removeClass('disable'); + } else { + $('.btn-clear-filter').addClass('disable'); + } + if (filterStart !== '') { + $('#start-date').text(filterStart); + } + if (filterEnd !== '') { + $('#end-date').text(filterEnd); + } + + + + + + + + + if ($(window).width() < 768) { + $('#search-theme-form1').remove(); + + } else { + $('#search-theme-form2').remove(); + } + + // $(".date").mask("0000/00/00"); + $(".date").on('input', function () { + var value = $(this).val(); + $(this).val(convertPersianNumbersToEnglish(value)); + }).mask("0000/00/00"); + $('.goToTop').hide(); + + + ////******************** چسباندن هدر تیبل به صفحه بالا ******************** //// Get the offset position of the sticky element //var stickyDiv = $(".sticky-div"); @@ -98,32 +191,32 @@ function handleDropdown(dropdown, arrow, open) { //******************** انتخاب همه ی چک باکس ها ******************** $(".checkAll").change(function () { - let dataValYear = $('#year').val(); - let dataValMonth = $('#month').val(); + let dataValYear = $('#Year').val(); + let dataValMonth = $('#Month').val(); let dataValPersonel = Number($('#employeeId').val()); - if ((dataValYear === '' || dataValMonth === '') && dataValPersonel === 0) { + + if ((dataValYear === '0' || dataValMonth === '0') && dataValPersonel === 0) { $('#dropdown-year').addClass("errored"); $('#dropdown-month').addClass("errored"); $(this).prop('checked', false); $('.alert-msg').show(); - $('.alert-msg p').text('جهت انتخاب گروهی فیش های حقوقی ابتدا میبایست سال و ماه مورد نظر را انتخاب نمائید.'); + $('.alert-msg p').text('جهت انتخاب گروهی ابتدا میبایست سال و ماه مورد نظر را انتخاب نمائید.'); setTimeout(function () { $('.alert-msg').hide(); $('.alert-msg p').text(''); $('#dropdown-year').removeClass("errored"); $('#dropdown-month').removeClass("errored"); - }, - 3500); + }, 3500); } else { - // loadAllToPrint(); + // $('.foo:checkbox').not(this).prop('checked', this.checked); $('input:checkbox').not(this).prop('checked', this.checked); } }); //******************** انتخاب همه ی چک باکس ها ******************** //******************** فیلتر کردن برای جستجو ******************** -$(document).on('click', '.btn-search-click', function (event) { +$(document).on('click', '.btn-search-click ', function (event) { event.preventDefault(); // جستجو سال و ماه @@ -191,24 +284,6 @@ $(document).on('click', '.btn-clear-filter', function () { }); -$(document).ready(function () { - var filterEmployeeId = $('#employeeId').val(); - var filterYear = $('#Year').val(); - var filterMonth = $('#Month').val(); - var filterStart = $('#SearchStartFa').val(); - var filterEnd = $('#SearchEndFa').val(); - if (filterEmployeeId !== "0" || filterYear !== "0" || filterMonth !== "0" || filterStart !== '' || filterEnd !== '') { - $('.btn-clear-filter').removeClass('disable'); - } else { - $('.btn-clear-filter').addClass('disable'); - } - if (filterStart !== '') { - $('#start-date').text(filterStart); - } - if (filterEnd !== '') { - $('#end-date').text(filterEnd); - } -}); // قسمت دکمه حذف فیلتر // $('#filterRemove').filter(function () { @@ -1171,39 +1246,6 @@ if ($(window).width() < 768) { - - - - - - - - -$(document).ready(function () { - if ($(window).width() < 768) { - $('#search-theme-form1').remove(); - - } else { - $('#search-theme-form2').remove(); - } - $("#getPersonnel").select2({ - language: "fa", - dir: "rtl" - }); - - $("#getPersonneModal").select2({ - language: "fa", - dir: "rtl", - dropdownParent: $("#searchModal") - }); - - // $(".date").mask("0000/00/00"); - $(".date").on('input', function () { - var value = $(this).val(); - $(this).val(convertPersianNumbersToEnglish(value)); - }).mask("0000/00/00"); - $('.goToTop').hide(); -}); $(".date").keyup(function () { let value = $(this).val(); let lengthValue = value.length; @@ -1252,175 +1294,7 @@ if (sendDropdownMonth) { selectedMonthDisplay.text(itemDropdownMonth.text()); } -function loadAllToPrint() { - var workshopId = Number($('#workshopIds').val()); - var employeeId = Number($('#employeeId').val()); - var year = $('#year').val(); - var month = $('#month').val(); - - // var sorting = $('#sortingList').val(); - $('.printAllTd').remove(); - - $.ajax({ - async: false, - contentType: 'charset=utf-8', - dataType: 'json', - type: 'GET', - url: LoadAllToPrintURL, - data: { - workshopId: workshopId, - employeeId: employeeId, - year: year, - month: month - }, - headers: { "RequestVerificationToken": antiForgeryToken }, - - success: function (response) { - if (response.pageIndex > 0) { - var n = 1; - $.each(response.contractResultViewModels, - function (i, item) { - - const html = ` -
    -
    -
    - ردیف -
    - -
    -
    -
    شماره پرسنلی
    -
    ${item.personnelCode}
    -
    -
    -
    سال
    -
    ${item.year}
    -
    -
    -
    ماه
    -
    ${item.month}
    -
    -
    -
    شماره قرارداد
    -
    ${item.contractNo}
    -
    -
    -
    نام پرسنل
    -
    ${item.employeeFullName}
    -
    -
    -
    آغاز قرارداد
    -
    ${item.contractStart}
    -
    -
    -
    پایان قرارداد
    -
    ${item.contractEnd}
    -
    -
    -
    امضاء پرسنل
    -
    - ${item.signature === "1" - ? ` - - - ` - : ` - - ` - } -
    -
    - -
    -
    -
    - - ${n} -
    - -
    - - ${item.employeeFullName} - -
    -
    - - -
    - -
    - آغاز قرارداد - ${item.contractStart} -
    -
    - پایان قرارداد - ${item.contractEnd} -
    -
    - -
    -
    -
    - -
    -
    - - -
    -
    -
    - - `; - - $('.tb').append(html); - n += 1; - }); - var newPageIndex = pageIndex + response.pageIndex; - $('#pageIndex').val(newPageIndex); - - } - - - }, - failure: function (response) { - console.log(5, response); - - } - }); -} -//Scroll Ajax function loadMore() { - let pageIndex = Number($('#pageIndex').val()); var b = pageIndex % 30; var employeeId = Number($('#employeeId').val()); @@ -1450,136 +1324,156 @@ function loadMore() { headers: { "RequestVerificationToken": antiForgeryToken }, success: function (response) { + console.log(response); + if (response.pageIndex > 0) { var n = pageIndex + 1; - $.each(response.data, - function (i, item) { - - - const html = ` -
    -
    -
    - ردیف -
    - + $.each(response.data, function (i, item) { + const html = ` +
    +
    +
    + ردیف
    -
    -
    شماره پرسنلی
    -
    ${item.personnelCode}
    -
    -
    -
    سال
    -
    ${item.year}
    +
    -
    -
    ماه
    -
    ${item.month}
    +
    +
    شماره پرسنلی
    +
    ${item.personnelCode}
    +
    +
    +
    سال
    +
    ${item.year}
    +
    +
    +
    ماه
    +
    ${item.month}
    +
    +
    +
    شماره قرارداد
    +
    ${item.contractNo}
    +
    +
    +
    نام پرسنل
    +
    ${item.employeeFullName}
    +
    +
    +
    آغاز قرارداد
    +
    ${item.contractStartFa}
    +
    +
    +
    پایان قرارداد
    +
    ${item.contractEndFa}
    +
    +
    +
    ساعات کارکرد
    +
    ${item.sumOfWorkingDays}
    -
    -
    شماره قرارداد
    -
    ${item.contractNo}
    -
    -
    -
    نام پرسنل
    -
    ${item.employeeFullName}
    -
    -
    -
    آغاز قرارداد
    -
    ${item.contractStartFa}
    -
    -
    -
    پایان قرارداد
    -
    ${item.contractEndFa}
    -
    -
    -
    ساعات کارکرد
    -
    ${item.sumOfWorkingDays}
    -
    -
    -
    -
    - - ${n} -
    +
    +
    +
    + + + ${n} + +
    -
    - - ${item.employeeFullName} - -
    -
    +
    + + ${item.employeeFullName} + +
    +
    -
    +
    -
    - آغاز قرارداد - ${item.contractStartFa} -
    -
    - پایان قرارداد - ${item.contractEndFa} -
    -
    - -
    -
    -
    +
    + آغاز قرارداد + ${item.contractStartFa} +
    +
    + پایان قرارداد + ${item.contractEndFa} +
    +
    + -
    -
    - - -
    -
    -
    + +
    +
    +
    - `; +
    +
    + + - $('.tb').append(html); - n += 1; - }); + +
    +
    +
    + + `; + + $('.tb').append(html); + n += 1; + }); + updateRowNumbers(); var newPageIndex = pageIndex + response.pageIndex; $('#pageIndex').val(newPageIndex); - } - - }, failure: function (response) { console.log(5, response); - } }); } @@ -1614,6 +1508,23 @@ function printOne(id, year, month) { function printAll() { 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(); @@ -1636,42 +1547,122 @@ function printAll() { }); if (idlist !== "") { + var url = CheckoutPrintAllUrl; - window.location.href = url + '?idlist=' + idlist; + var yearFa = '&yearFa=' + year; + var monthFa = '&monthFa=' + month; + //console.log(url + '?checkoutId=' + idlist + yearFa + monthFa); + window.location.href = url + '?idlist=' + idlist + yearFa + monthFa; } } + + +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")) { + + var a = $(this).val(); + var b = a + "+"; + idlist += b; + + } + }); + + if (idlist !== "") { + + var url = CheckoutExcelAllUrl + "&idList=" + idlist; + var yearFa = '&yearFa=' + year; + var monthFa = '&monthFa=' + month; + //console.log(url + '?checkoutId=' + idlist + yearFa + monthFa); + window.open(url, "_blank"); + + } +} + +function printAllMobile() { + 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 + } + + $('.fooMobile').each(function () { + if ($(this).is(":checked")) { + + var a = $(this).val(); + var b = a + "+"; + idlist += b; + + } + }); + + if (idlist !== "") { + + var url = CheckoutPrintAllUrl; + var yearFa = '&yearFa=' + year; + var monthFa = '&monthFa=' + month; + //console.log(url + '?checkoutId=' + idlist + yearFa + monthFa); + window.location.href = url + '?idlist=' + idlist + yearFa + monthFa; + } +} + + //------------------------------------------------------------------------------------ -$(document).ready(function () { - ajaxPersonals(); - - $(".select2Option").select2({ - language: "fa", - dir: "rtl" - }); - - $(".select2OptionMobile").select2({ - language: "fa", - dir: "rtl", - dropdownParent: $('#searchModal'), - templateResult: function (data, container) { - if (data.element) { - $(container).addClass($(data.element).attr("class")); - } - return data.text; - } - }); - - $(".form-control-date").each(function () { - new Cleave(this, { - date: true, - delimiter: '/', - datePattern: ['Y', 'm', 'd'] - }); - }); -}); function openCreateCheckoutTemporaryModal() { @@ -1701,7 +1692,8 @@ function ajaxPersonals() { employees.forEach(function (employee) { employeeOptionsHtml += ``; }); - $('.getPersonnel').html(employeeOptionsHtml); + $('#getPersonnel').html(employeeOptionsHtml); + $('#getPersonnelMobile').html(employeeOptionsHtml); } else { $('.alert-msg').show(); $('.alert-msg p').text(response.message); @@ -1715,4 +1707,154 @@ function ajaxPersonals() { console.error(xhr.responseText); } }); -} \ No newline at end of file +} + + + + +$(document).on('click', '.RemoveBtn', function () { + var id = $(this).data("delete-id"); + var button = this; + + swal({ + title: "آیا از حذف این فیش حقوقی موقت اطمینان دارید؟", + text: "", + type: "warning", + showCancelButton: true, + confirmButtonColor: "#DD6B55", + confirmButtonText: "بله", + cancelButtonText: "خیر", + closeOnConfirm: true, + closeOnCancel: true + }, function (isConfirm) { + if (isConfirm) { + deleteOneItem(id, button); + } + }); +}); +function updateRowNumbers() { + $('.Rtable-row').each(function (index) { + $(this).find('.row-number').text(index); + }); +} +function deleteOneItem(id, button) { + $.ajax({ + async: false, + type: 'POST', + url: deleteOneAjax, + data: { checkoutId: Number(id) }, + headers: { "RequestVerificationToken": `${antiForgeryToken}` }, + success: function (response) { + if (response.success) { + $('.alert-success-msg').show(); + $('.alert-success-msg p').text(response.message); + setTimeout(function () { + $('.alert-success-msg').hide(); + $('.alert-success-msg p').text(''); + }, 2000); + + $(button).closest('.Rtable-row').remove(); + updateRowNumbers(); + + } else { + $('.alert-msg').show(); + $('.alert-msg p').text(response.message); + setTimeout(function () { + $('.alert-msg').hide(); + $('.alert-msg p').text(''); + }, 3000); + } + }, + failure: function (response) { + console.log(5, response); + } + }); +} + + + + +$('.RemoveBtnAll').on("click", function () { + var idListArray = []; + 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 + } + + $('input[name="foo"]').each(function () { + if ($(this).is(":checked")) { + idListArray.push($(this).val()); + } + }); + + if (idListArray.length > 0) { + swal({ + title: "آیا از حذف گروهی فیش حقوقی موقت اطمینان دارید؟", + text: "", + type: "warning", + showCancelButton: true, + confirmButtonColor: "#DD6B55", + confirmButtonText: "بله", + cancelButtonText: "خیر", + closeOnConfirm: true, + closeOnCancel: true + }, function (isConfirm) { + if (isConfirm) { + $.ajax({ + async: false, + type: 'POST', + url: deleteAllAjax, + data: { checkoutIds: idListArray }, + headers: { "RequestVerificationToken": `${antiForgeryToken}` }, + success: function (response) { + if (response.success) { + $('.alert-success-msg').show(); + $('.alert-success-msg p').text(response.message); + setTimeout(function () { + $('.alert-success-msg').hide(); + $('.alert-success-msg p').text(''); + }, 2000); + $('input[name="foo"]:checked').each(function () { + $(this).closest('.Rtable-row').remove(); + }); + updateRowNumbers(); + + } else { + $('.alert-msg').show(); + $('.alert-msg p').text(response.message); + setTimeout(function () { + $('.alert-msg').hide(); + $('.alert-msg p').text(''); + }, 3000); + } + }, + failure: function (response) { + console.log(5, response); + } + }); + } + }); + } +}) \ No newline at end of file diff --git a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutUnofficial.js b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutUnofficial.js index 071d22b4..10dd9cbc 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutUnofficial.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutUnofficial.js @@ -98,26 +98,26 @@ function handleDropdown(dropdown, arrow, open) { //******************** انتخاب همه ی چک باکس ها ******************** $(".checkAll").change(function () { - let dataValYear = $('#year').val(); - let dataValMonth = $('#month').val(); + let dataValYear = $('#Year').val(); + let dataValMonth = $('#Month').val(); let dataValPersonel = Number($('#employeeId').val()); - if ((dataValYear === '' || dataValMonth === '') && dataValPersonel === 0) { + + if ((dataValYear === '0' || dataValMonth === '0') && dataValPersonel === 0) { $('#dropdown-year').addClass("errored"); $('#dropdown-month').addClass("errored"); $(this).prop('checked', false); $('.alert-msg').show(); - $('.alert-msg p').text('جهت انتخاب گروهی فیش های حقوقی ابتدا میبایست سال و ماه مورد نظر را انتخاب نمائید.'); + $('.alert-msg p').text('جهت انتخاب گروهی ابتدا میبایست سال و ماه مورد نظر را انتخاب نمائید.'); setTimeout(function () { $('.alert-msg').hide(); $('.alert-msg p').text(''); $('#dropdown-year').removeClass("errored"); $('#dropdown-month').removeClass("errored"); - }, - 3500); + }, 3500); } else { - // loadAllToPrint(); - $('.foo:checkbox').not(this).prop('checked', this.checked); + // $('.foo:checkbox').not(this).prop('checked', this.checked); + $('input:checkbox').not(this).prop('checked', this.checked); } }); //******************** انتخاب همه ی چک باکس ها ******************** @@ -1173,19 +1173,50 @@ if ($(window).width() < 768) { - - - - - - $(document).ready(function () { + ajaxPersonals(); + if ($(window).width() < 768) { $('#search-theme-form1').remove(); } else { $('#search-theme-form2').remove(); } + + + $(".select2Option").select2({ + language: "fa", + dir: "rtl" + }); + + $(".select2OptionMobile").select2({ + language: "fa", + dir: "rtl", + dropdownParent: $('#searchModal'), + templateResult: function (data, container) { + if (data.element) { + $(container).addClass($(data.element).attr("class")); + } + return data.text; + } + }); + + $(".form-control-date").each(function () { + let element = $(this); + element.on('input', function () { + let value = convertPersianNumbersToEnglish(element.val()); + element.val(value); + }); + + new Cleave(this, { + date: true, + delimiter: '/', + datePattern: ['Y', 'm', 'd'] + }); + }); + + + //$("#getPersonnel").select2({ // language: "fa", // dir: "rtl" @@ -1253,173 +1284,7 @@ if (sendDropdownMonth) { selectedMonthDisplay.text(itemDropdownMonth.text()); } -function loadAllToPrint() { - var workshopId = Number($('#workshopIds').val()); - var employeeId = Number($('#employeeId').val()); - var year = $('#year').val(); - var month = $('#month').val(); - // var orderBy = $('#OrderBy').val(); - $('.printAllTd').remove(); - - $.ajax({ - async: false, - contentType: 'charset=utf-8', - dataType: 'json', - type: 'GET', - url: LoadAllToPrintURL, - data: { - workshopId: workshopId, - employeeId: employeeId, - year: year, - month: month - }, - headers: { "RequestVerificationToken": antiForgeryToken }, - - success: function (response) { - if (response.pageIndex > 0) { - var n = 1; - $.each(response.contractResultViewModels, - function (i, item) { - - const html = ` -
    -
    -
    - ردیف -
    - -
    -
    -
    شماره پرسنلی
    -
    ${item.personnelCode}
    -
    -
    -
    سال
    -
    ${item.year}
    -
    -
    -
    ماه
    -
    ${item.month}
    -
    -
    -
    شماره قرارداد
    -
    ${item.contractNo}
    -
    -
    -
    نام پرسنل
    -
    ${item.employeeFullName}
    -
    -
    -
    آغاز قرارداد
    -
    ${item.contractStart}
    -
    -
    -
    پایان قرارداد
    -
    ${item.contractEnd}
    -
    -
    -
    امضاء پرسنل
    -
    - ${item.signature === "1" - ? ` - - - ` - : ` - - ` - } -
    -
    - -
    -
    -
    - - ${n} -
    - -
    - - ${item.employeeFullName} - -
    -
    - - -
    - -
    - آغاز قرارداد - ${item.contractStart} -
    -
    - پایان قرارداد - ${item.contractEnd} -
    -
    - -
    -
    -
    - -
    -
    - - -
    -
    -
    - - `; - - $('.tb').append(html); - n += 1; - }); - var newPageIndex = pageIndex + response.pageIndex; - $('#pageIndex').val(newPageIndex); - - } - - - }, - failure: function (response) { - console.log(5, response); - - } - }); -} -//Scroll Ajax function loadMore() { let pageIndex = Number($('#pageIndex').val()); var b = pageIndex % 30; @@ -1463,7 +1328,9 @@ function loadMore() {
    @@ -1503,8 +1370,10 @@ function loadMore() {
    - - ${n} + + + ${n} +
    @@ -1525,8 +1394,8 @@ function loadMore() { پایان قرارداد ${item.contractEndFa}
    -
    - + +
    -
    +
    - + +
    @@ -1568,6 +1457,7 @@ function loadMore() { $('.tb').append(html); n += 1; }); + updateRowNumbers(); var newPageIndex = pageIndex + response.pageIndex; $('#pageIndex').val(newPageIndex); } @@ -1606,11 +1496,27 @@ function printOne(id, year, month) { window.location.href = url + checkoutId + yearFa + monthFa; } - function printAll() { var idlist = ""; + var year = $('#Year').val(); + var month = $('#Month').val(); - if (!($('.foo:checkbox').is(":checked"))) { + + 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 () { @@ -1631,42 +1537,119 @@ function printAll() { }); if (idlist !== "") { + var url = CheckoutPrintAllUrl; - window.location.href = url + '?idlist=' + idlist; + var yearFa = '&yearFa=' + year; + var monthFa = '&monthFa=' + month; + //console.log(url + '?checkoutId=' + idlist + yearFa + monthFa); + window.location.href = url + '?idlist=' + idlist + yearFa + monthFa; } } - -//------------------------------------------------------------------------------------ +function excelDownloadAll() { + var idlist = ""; + var year = $('#Year').val(); + var month = $('#Month').val(); -$(document).ready(function () { - ajaxPersonals(); + 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 + } - $(".select2Option").select2({ - language: "fa", - dir: "rtl" - }); + 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")) { + + var a = $(this).val(); + var b = a + "+"; + idlist += b; - $(".select2OptionMobile").select2({ - language: "fa", - dir: "rtl", - dropdownParent: $('#searchModal'), - templateResult: function (data, container) { - if (data.element) { - $(container).addClass($(data.element).attr("class")); - } - return data.text; } }); - $(".form-control-date").each(function () { - new Cleave(this, { - date: true, - delimiter: '/', - datePattern: ['Y', 'm', 'd'] - }); + if (idlist !== "") { + + + var yearFa = '&yearFa=' + year; + var monthFa = '&monthFa=' + month; + var url = CheckoutExcelDownloadUrl + '&idlist=' + idlist; + + + //console.log(url + '?checkoutId=' + idlist + yearFa + monthFa); + window.open(url, "_blank"); + + } +} +function printAllMobile() { + 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 + } + + $('.fooMobile').each(function () { + if ($(this).is(":checked")) { + + var a = $(this).val(); + var b = a + "+"; + idlist += b; + + } }); -}); + + if (idlist !== "") { + + var url = CheckoutPrintAllUrl; + var yearFa = '&yearFa=' + year; + var monthFa = '&monthFa=' + month; + //console.log(url + '?checkoutId=' + idlist + yearFa + monthFa); + window.location.href = url + '?idlist=' + idlist + yearFa + monthFa; + } +} +//------------------------------------------------------------------------------------ + + function openCreateCheckoutUnofficialModal() { var goTo = `#showmodal=/Client/Company/CustomizeCheckout/CheckoutUnofficial?handler=Create`; @@ -1685,7 +1668,8 @@ function ajaxPersonals() { employees.forEach(function (employee) { employeeOptionsHtml += ``; }); - $('.getPersonnel').html(employeeOptionsHtml); + $('#getPersonnel').html(employeeOptionsHtml); + $('#getPersonnelMobile').html(employeeOptionsHtml); } else { $('.alert-msg').show(); $('.alert-msg p').text(response.message); @@ -1699,4 +1683,152 @@ function ajaxPersonals() { console.error(xhr.responseText); } }); -} \ No newline at end of file +} + + + +$(document).on('click', '.RemoveBtn', function () { + var id = $(this).data("delete-id"); + var button = this; + + swal({ + title: "آیا از حذف این فیش حقوقی نهایی اطمینان دارید؟", + text: "", + type: "warning", + showCancelButton: true, + confirmButtonColor: "#DD6B55", + confirmButtonText: "بله", + cancelButtonText: "خیر", + closeOnConfirm: true, + closeOnCancel: true + }, function (isConfirm) { + if (isConfirm) { + deleteOneItem(id, button); + } + }); +}); +function updateRowNumbers() { + $('.Rtable-row').each(function (index) { + $(this).find('.row-number').text(index); + }); +} +function deleteOneItem(id, button) { + $.ajax({ + async: false, + type: 'POST', + url: deleteOneAjax, + data: { checkoutId: Number(id) }, + headers: { "RequestVerificationToken": `${antiForgeryToken}` }, + success: function (response) { + if (response.success) { + $('.alert-success-msg').show(); + $('.alert-success-msg p').text(response.message); + setTimeout(function () { + $('.alert-success-msg').hide(); + $('.alert-success-msg p').text(''); + }, 2000); + + $(button).closest('.Rtable-row').remove(); + updateRowNumbers(); + + } else { + $('.alert-msg').show(); + $('.alert-msg p').text(response.message); + setTimeout(function () { + $('.alert-msg').hide(); + $('.alert-msg p').text(''); + }, 3000); + } + }, + failure: function (response) { + console.log(5, response); + } + }); +} + + + +$('.RemoveBtnAll').on("click", function () { + var idListArray = []; + 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 + } + + $('input[name="foo"]').each(function () { + if ($(this).is(":checked")) { + idListArray.push($(this).val()); + } + }); + + if (idListArray.length > 0) { + swal({ + title: "آیا از حذف گروهی فیش حقوقی نهایی اطمینان دارید؟", + text: "", + type: "warning", + showCancelButton: true, + confirmButtonColor: "#DD6B55", + confirmButtonText: "بله", + cancelButtonText: "خیر", + closeOnConfirm: true, + closeOnCancel: true + }, function (isConfirm) { + if (isConfirm) { + $.ajax({ + async: false, + type: 'POST', + url: deleteAllAjax, + data: { checkoutIds: idListArray }, + headers: { "RequestVerificationToken": `${antiForgeryToken}` }, + success: function (response) { + if (response.success) { + $('.alert-success-msg').show(); + $('.alert-success-msg p').text(response.message); + setTimeout(function () { + $('.alert-success-msg').hide(); + $('.alert-success-msg p').text(''); + }, 2000); + $('input[name="foo"]:checked').each(function () { + $(this).closest('.Rtable-row').remove(); + }); + updateRowNumbers(); + + } else { + $('.alert-msg').show(); + $('.alert-msg p').text(response.message); + setTimeout(function () { + $('.alert-msg').hide(); + $('.alert-msg p').text(''); + }, 3000); + } + }, + failure: function (response) { + console.log(5, response); + } + }); + } + }); + } +}) \ No newline at end of file diff --git a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/ModalCheckoutTemporaryCreate.js b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/ModalCheckoutTemporaryCreate.js index 500f413f..0d7730bd 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/ModalCheckoutTemporaryCreate.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/ModalCheckoutTemporaryCreate.js @@ -1,9 +1,14 @@ $(document).ready(function () { - $(`#day-select option[value="${day}"]`).attr("selected", "selected"); loadEmployeesByDay(day); - $("#day-select").change(function () { - loadEmployeesByDay($(this).val()); + $('.dropdown-global-item').click(function () { + var selectedItem = $(this).text(); + $('#day-select').val(selectedItem); + loadEmployeesByDay(selectedItem); + }); + + Scrollbar.init(document.querySelector('.dropdown-global-content'), { + alwaysShowTracks: true }); }); @@ -38,21 +43,41 @@ function loadEmployeesByDay(day) { headers: { "RequestVerificationToken": antiForgeryToken }, success: function (response) { - if (response.success) { if (response.data.length > 0) { + $('.btnCreateNew').removeClass('disable'); + htmlTable += `
    `; - response.data.forEach(function (item, index) { + response.data.forEach(function(item, index) { index++; + valueColor = ''; + switch (item.color) { + case "green": + valueColor = "greenStatus"; + break; + case "red": + valueColor = "redStatus"; + break; + case "orange": + valueColor = "orangeStatus"; + break; + default: + valueColor = ""; + break; + } + htmlTable += ` -
    +
    ردیف
    @@ -66,18 +91,34 @@ function loadEmployeesByDay(day) {
    +
    +
    وضعیت:
    +
    ${item.reason}
    +
    +
    + +
    شماره پرسنلی:
    -
    +
    ${item.personnelCode}
    `; }); $('#loadTableCheckout').html(htmlTable); } + } else { + $('.btnCreateNew').addClass('disable'); + $('.alert-msg').show(); + $('.alert-msg p').text(response.message); + setTimeout(function () { + $('.alert-msg').hide(); + $('.alert-msg p').text(''); + }, 3500); } }, failure: function (response) { + $('#MainModal').modal('hide'); console.log(5, response); } @@ -133,9 +174,7 @@ $(document).on('change', '.fooCreate, .checkAllCreate', function () { }); $(".checkAllCreate").change(function () { - - $('.fooCreate:checkbox').not(this).prop('checked', this.checked); - + $('.fooCreate:checkbox').not(':disabled').prop('checked', this.checked); }); //******************** انتخاب همه ی چک باکس ها ******************** diff --git a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/ModalCheckoutUnofficialCreate.js b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/ModalCheckoutUnofficialCreate.js index 1199f5c9..2f3f7b55 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/ModalCheckoutUnofficialCreate.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/ModalCheckoutUnofficialCreate.js @@ -1,4 +1,19 @@ -$(document).ready(function() { +$(document).ready(function () { + + //$('.yearDropDown').click(function () { + // var value = $(this).data('value'); + // $('#year-select').val(value); + //}); + + //$('.monthDropDown').click(function () { + // var value = $(this).data('value'); + // $('#month-select').val(value); + //}); + + + //Scrollbar.init(document.querySelector('.dropdown-global-content'), { + // alwaysShowTracks: true + //}); $("#next-step").on("click", function() { loadEmployeesByYearAndMonthFunction(); @@ -148,20 +163,37 @@ function loadEmployeesByYearAndMonthFunction() }, success: function (response) { if (response.success) { - if (response.data.length > 0) { htmlTable += `
    `; - response.data.forEach(function(item, index) { + response.data.forEach(function (item, index) { + + index++; + valueColor = ''; + switch (item.color) { + case "green": + valueColor = "greenStatus"; + break; + case "red": + valueColor = "redStatus"; + break; + case "orange": + valueColor = "orangeStatus"; + break; + default: + valueColor = ""; + break; + } + htmlTable += ` -
    +
    ردیف
    -
    @@ -173,34 +205,24 @@ function loadEmployeesByYearAndMonthFunction()
    -
    +
    +
    +
    وضعیت:
    +
    ${item.reason}
    +
    +
    + +
    شماره پرسنلی:
    -
    +
    ${item.personnelCode}
    -
    -
    -
    تاریخ شروع:
    -
    -
    -
    - -
    -
    -
    تاریخ پایان:
    -
    -
    -
    - -
    `; }); - - $('#step-form1').hide(); $('#step-form2').show(); $('#prev-step').text('مرحله قبل'); @@ -257,8 +279,7 @@ $('#clear-search').on('click', function () { //******************** انتخاب همه ی چک باکس ها ******************** $(".checkAllCreate").change(function () { - - $('.fooCreate:checkbox').not(this).prop('checked', this.checked); + $('.fooCreate:checkbox').not(':disabled').prop('checked', this.checked); }); //******************** انتخاب همه ی چک باکس ها ******************** \ No newline at end of file diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditGroup.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditGroup.js index ee0312f6..aa6b133e 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditGroup.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditGroup.js @@ -102,7 +102,6 @@ $('#step_workTimeOptionIrregular').show(); }); - console.log(IsRegularWorkshop); switch (IsRegularWorkshop) { case 0: //radio btn @@ -153,7 +152,6 @@ } - $('input[name="IrregularShift.WorkshopIrregularShifts"]').on('change', function () { if ($('input[name="IrregularShift.WorkshopIrregularShifts"]:checked').length > 0) { $('#irregularShiftsDateTime').removeClass('disable'); @@ -207,7 +205,7 @@ if (parseInt($("#hour").val(), 10) === 3) { $("#min").val("00"); } - $('#computeTimeText').text($("#hour").val() + ' ساعت ' + $("#min").val() + ' دقیقه '); + // $('#computeTimeText').text($("#hour").val() + ' ساعت ' + $("#min").val() + ' دقیقه '); $("#TimeOnly").val($("#hour").val() + ':' + $("#min").val()); });