diff --git a/ServiceHost/Areas/Admin/Pages/Company/Employees/Create.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Employees/Create.cshtml index 534107f7..be5f8e23 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Employees/Create.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/Employees/Create.cshtml @@ -567,8 +567,10 @@ $('#IdNumberSeri').val(response.data.idNumberSeri); if (response.data.gender === 0) { $('#GenderMale').prop('checked', true); + $('#soldier').prop('disabled', false); } else if (response.data.gender === 1) { $('#GenderFemale').prop('checked', true); + $('#soldier').prop('disabled', true); } } else { $.Notification.autoHideNotify('error', 'top right', 'خطا', response.message); diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/ModalCameraAccountChangePassword.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/ModalCameraAccountChangePassword.cshtml index fa15151f..16e300e3 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/ModalCameraAccountChangePassword.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/ModalCameraAccountChangePassword.cshtml @@ -181,4 +181,4 @@ var checkCodeAjax = `@Url.Page("./CameraAccounts", "CheckCode")`; var ajaxCameraValidation = `@Url.Page("./CameraAccounts", "CameraValidation")`; - \ No newline at end of file + \ No newline at end of file diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/ModalCreateAccountSetting.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/ModalCreateAccountSetting.cshtml index 0e20fedc..932260b9 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/ModalCreateAccountSetting.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/ModalCreateAccountSetting.cshtml @@ -307,4 +307,4 @@ var hasGroupWorkshop = @(Model.HasGroupWorkshop ? "true" : "false"); var saveCameraAccountAndWorkshopSettingAjax = `@Url.Page("./Index", "SaveCameraAccountAndWorkshopSetting")`; - \ No newline at end of file + \ No newline at end of file diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/ModalSettingWorkTime.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/ModalSettingWorkTime.cshtml index 8273edc4..4dc94467 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/ModalSettingWorkTime.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/ModalSettingWorkTime.cshtml @@ -186,4 +186,4 @@ var IsRegularWorkshop = @(Model.WorkshopShiftStatus == WorkshopShiftStatus.Regular ? "true" : "false"); - \ No newline at end of file + \ No newline at end of file diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/ModalTakeImages.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/ModalTakeImages.cshtml index 23f318f2..d2237a26 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/ModalTakeImages.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/ModalTakeImages.cshtml @@ -231,4 +231,4 @@ var hasErrorPic2 = false; - \ No newline at end of file + \ No newline at end of file diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/EmployeesDocuments.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/EmployeesDocuments.cshtml index 5051065d..7f6f2df9 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/EmployeesDocuments.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/EmployeesDocuments.cshtml @@ -1,4 +1,6 @@ @page +@using _0_Framework.Application +@using Microsoft.AspNetCore.Mvc.TagHelpers @model ServiceHost.Areas.AdminNew.Pages.Company.WorkFlow.EmployeesDocumentsModel @inject _0_Framework.Application.IAuthHelper AuthHelper; @@ -92,33 +94,35 @@ - -
  • -
    - - آپلود مدارک پرسنل جدید - -
    -
  • +
    + + آپلود مدارک پرسنل جدید + +
    + +
    -
    - -
    • -
  • -
    - - عدم تایید توسط ناظر (کلاینت) - -
    -
    • +
  • +
    + + عدم تایید توسط ناظر (کلاینت) + +
    + +
    -
    - -
    • + + } diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/CheckoutTemporary.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/CheckoutTemporary.cshtml index 3c858e2d..f8394fc6 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/CheckoutTemporary.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/CheckoutTemporary.cshtml @@ -760,6 +760,8 @@ var deleteOneAjax = `@Url.Page("/Company/CustomizeCheckout/CheckoutTemporary", "DeleteOne")`; var deleteAllAjax = `@Url.Page("/Company/CustomizeCheckout/CheckoutTemporary", "DeleteAll")`; + + } \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/ConfirmEmployeeTimeChangeModal.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/ConfirmEmployeeTimeChangeModal.cshtml index 5baf82e9..6ed4ab0e 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/ConfirmEmployeeTimeChangeModal.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/ConfirmEmployeeTimeChangeModal.cshtml @@ -51,10 +51,16 @@ $(document).ready(function () { new Cleave('.dateModal', { - date: true, - datePattern: ['Y', 'm', 'd'] + delimiters: ['/', '/'], + blocks: [4, 2, 2], + numericOnly: true }); + // new Cleave('.dateModal', { + // date: true, + // datePattern: ['Y', 'm', 'd'] + // }); + $('.dateModal').val(dateNow); $(".closeConfirmModal").on("click", function () { diff --git a/ServiceHost/Areas/Client/Pages/Shared/_Menu.cshtml b/ServiceHost/Areas/Client/Pages/Shared/_Menu.cshtml index 40911ddb..f1a380a7 100644 --- a/ServiceHost/Areas/Client/Pages/Shared/_Menu.cshtml +++ b/ServiceHost/Areas/Client/Pages/Shared/_Menu.cshtml @@ -72,8 +72,8 @@
  • لیست قرارداد
  • لیست فیش حقوقی
  • لیست بیمه
    • -
  • گزارش وضعیت پرسنل به صورت انفرادی
    • -
  • گزارش وضعیت پرسنل بصورت گروهی
    • +
  • گزارش وضعیت انفرادی پرسنل
    • +
  • گزارش وضعیت گروهی پرسنل
    • @@ -132,7 +132,7 @@ diff --git a/ServiceHost/wwwroot/AssetsAdminNew/RollCall/js/ModalAddRollCall.js b/ServiceHost/wwwroot/AssetsAdminNew/RollCall/js/ModalAddRollCall.js index c0fc72e6..402e692e 100644 --- a/ServiceHost/wwwroot/AssetsAdminNew/RollCall/js/ModalAddRollCall.js +++ b/ServiceHost/wwwroot/AssetsAdminNew/RollCall/js/ModalAddRollCall.js @@ -18,10 +18,15 @@ $(".form-control-date").each(function () { new Cleave(this, { - date: true, - delimiter: '/', - datePattern: ['Y', 'm', 'd'] + delimiters: ['/', '/'], + blocks: [4, 2, 2], + numericOnly: true }); + // new Cleave(this, { + // date: true, + // delimiter: '/', + // datePattern: ['Y', 'm', 'd'] + // }); }); $(".dateTime").each(function () { diff --git a/ServiceHost/wwwroot/AssetsAdminNew/RollCall/js/ModalEditRollCall.js b/ServiceHost/wwwroot/AssetsAdminNew/RollCall/js/ModalEditRollCall.js index b561e70b..120238f2 100644 --- a/ServiceHost/wwwroot/AssetsAdminNew/RollCall/js/ModalEditRollCall.js +++ b/ServiceHost/wwwroot/AssetsAdminNew/RollCall/js/ModalEditRollCall.js @@ -5,10 +5,15 @@ $(".form-control-date").each(function () { new Cleave(this, { - date: true, - delimiter: '/', - datePattern: ['Y', 'm', 'd'] + delimiters: ['/', '/'], + blocks: [4, 2, 2], + numericOnly: true }); + // new Cleave(this, { + // date: true, + // delimiter: '/', + // datePattern: ['Y', 'm', 'd'] + // }); }); $(".dateTime").each(function () { diff --git a/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/ModalEmployeeEdit.js b/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/ModalEmployeeEdit.js index c4cffbab..594757df 100644 --- a/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/ModalEmployeeEdit.js +++ b/ServiceHost/wwwroot/AssetsAdminNew/WorkFlow/js/ModalEmployeeEdit.js @@ -13,10 +13,15 @@ }); new Cleave(this, { - date: true, - delimiter: '/', - datePattern: ['Y', 'm', 'd'] + delimiters: ['/', '/'], + blocks: [4, 2, 2], + numericOnly: true }); + // new Cleave(this, { + // date: true, + // delimiter: '/', + // datePattern: ['Y', 'm', 'd'] + // }); }); }); diff --git a/ServiceHost/wwwroot/AssetsClient/css/sidebar-menu.css b/ServiceHost/wwwroot/AssetsClient/css/sidebar-menu.css index b43a5a77..24c4d30b 100644 --- a/ServiceHost/wwwroot/AssetsClient/css/sidebar-menu.css +++ b/ServiceHost/wwwroot/AssetsClient/css/sidebar-menu.css @@ -55,6 +55,11 @@ padding-right: 2rem; } +.submenu li a span { + font-size: 12px; + font-weight: 600; +} + .submenu:before { content: ""; position: absolute; diff --git a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutTemporary.js b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutTemporary.js index df55e1ec..becf0493 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutTemporary.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutTemporary.js @@ -126,10 +126,16 @@ $(document).ready(function () { }); new Cleave(this, { - date: true, - delimiter: '/', - datePattern: ['Y', 'm', 'd'] + delimiters: ['/', '/'], + blocks: [4, 2, 2], + numericOnly: true }); + + //new Cleave(this, { + // date: true, + // delimiter: '/', + // datePattern: ['Y', 'm', 'd'] + //}); }); var filterEmployeeId = $('#employeeId').val(); @@ -1397,7 +1403,6 @@ function loadMore() { headers: { "RequestVerificationToken": antiForgeryToken }, success: function (response) { - console.log(response); if (response.pageIndex > 0) { var n = pageIndex + 1; @@ -1511,17 +1516,17 @@ function loadMore() { ${response.deletePermission === "true" ? ` ` : ``} - + @@ -1530,37 +1535,37 @@ function loadMore() {
    ${response.printPermission === "true" ? ` - + - + ` : ``} ${response.deletePermission === "true" ? ` ` : ``} diff --git a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutUnofficial.js b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutUnofficial.js index 6e300cd2..5dcec93a 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutUnofficial.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutUnofficial.js @@ -2,7 +2,7 @@ let $checkAll = $("#checkAll2"); let $checkboxes = $(".foo"); - + $checkAll.on("change", function () { $checkboxes.prop("checked", this.checked); @@ -150,7 +150,7 @@ $(document).on('click', '.btn-search-click', function (event) { const selectedMonth = $('#sendDropdownMonth').val(); const isYearMonthSelected = selectedYear === "0" && selectedMonth === "0"; - if (!isYearMonthSelected && (selectedYear === "0" || selectedMonth === "0")) { + if (!isYearMonthSelected && (selectedYear === "0" || selectedMonth === "0") ) { $('#dropdown-year').addClass("errored"); $('#dropdown-month').addClass("errored"); @@ -175,7 +175,7 @@ $(document).on('click', '.btn-search-click', function (event) { const endDate = $('.end-date').val(); const isStartEndDateSelected = startDate.trim() === "" && endDate.trim() === ""; - if (!isStartEndDateSelected && (startDate.trim() === "" || endDate.trim() === "")) { + if (!isStartEndDateSelected && (startDate.trim() === "" || endDate.trim() === "") ) { $('.start-date').addClass("errored"); $('.end-date').addClass("errored"); @@ -223,7 +223,7 @@ $(document).ready(function () { } else { $('.btn-clear-filter').addClass('disable'); } - if (filterStart !== '') { + if(filterStart !== '') { $('#start-date').text(filterStart); } if (filterEnd !== '') { @@ -1283,10 +1283,16 @@ $(document).ready(function () { }); new Cleave(this, { - date: true, - delimiter: '/', - datePattern: ['Y', 'm', 'd'] + delimiters: ['/', '/'], + blocks: [4, 2, 2], + numericOnly: true }); + + //new Cleave(this, { + // date: true, + // delimiter: '/', + // datePattern: ['Y', 'm', 'd'] + //}); }); @@ -1503,18 +1509,18 @@ function loadMore() { ` : ``} ${response.deletePermission === "true" ? ` ` : ``} - +
    @@ -1523,7 +1529,7 @@ function loadMore() {
    ${response.printPermission === "true" ? ` - ` : ``} - +
    @@ -1708,6 +1714,7 @@ function downloadExcelAll() { return } + var idlist = ""; $('.foo').each(function () { if ($(this).is(":checked")) { diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/CreateEmployeeForm.js b/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/CreateEmployeeForm.js index e3f99787..15fea561 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/CreateEmployeeForm.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/CreateEmployeeForm.js @@ -54,10 +54,15 @@ $(document).ready(function () { }); new Cleave(this, { - date: true, - delimiter: '/', - datePattern: ['Y', 'm', 'd'] + delimiters: ['/', '/'], + blocks: [4, 2, 2], + numericOnly: true }); + //new Cleave(this, { + // date: true, + // delimiter: '/', + // datePattern: ['Y', 'm', 'd'] + //}); }); }); diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/IdentityInformationModal.js b/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/IdentityInformationModal.js index 59453d6c..6efa24cd 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/IdentityInformationModal.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/IdentityInformationModal.js @@ -15,10 +15,15 @@ $(document).ready(function () { }); new Cleave(this, { - date: true, - delimiter: '/', - datePattern: ['Y', 'm', 'd'] + delimiters: ['/', '/'], + blocks: [4, 2, 2], + numericOnly: true }); + // new Cleave(this, { + // date: true, + // delimiter: '/', + // datePattern: ['Y', 'm', 'd'] + // }); }); $(".checkNationalCodeAndBirthDate").click(function () { diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/Index.js b/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/Index.js index e5757496..324dbdb0 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/Index.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/Index.js @@ -43,10 +43,15 @@ $(document).ready(function () { }); new Cleave(this, { - date: true, - delimiter: '/', - datePattern: ['Y', 'm', 'd'] + delimiters: ['/', '/'], + blocks: [4, 2, 2], + numericOnly: true }); + // new Cleave(this, { + // date: true, + // delimiter: '/', + // datePattern: ['Y', 'm', 'd'] + // }); }); //******************** انتخاب همه ی چک باکس ها ******************** $(".checkAll").change(function () { diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalCreateNewFine.js b/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalCreateNewFine.js index e9ce8af4..36a159ff 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalCreateNewFine.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalCreateNewFine.js @@ -96,10 +96,15 @@ $(document).ready(function () { }); new Cleave(this, { - date: true, - delimiter: '/', - datePattern: ['Y', 'm', 'd'] + delimiters: ['/', '/'], + blocks: [4, 2, 2], + numericOnly: true }); + // new Cleave(this, { + // date: true, + // delimiter: '/', + // datePattern: ['Y', 'm', 'd'] + // }); }); updateDateInput(0); diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalEditFine.js b/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalEditFine.js index 04ed44a3..4d9391f9 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalEditFine.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalEditFine.js @@ -1,4 +1,35 @@ -$(document).ready(function () { +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 () { $('.form-control-number').on('keydown', function (e) { const allowedKeys = [ 'Backspace', 'Tab', 'Escape', 'Enter', 'ArrowLeft', 'ArrowRight', @@ -49,10 +80,15 @@ }); new Cleave(this, { - date: true, - delimiter: '/', - datePattern: ['Y', 'm', 'd'] + delimiters: ['/', '/'], + blocks: [4, 2, 2], + numericOnly: true }); + //new Cleave(this, { + // date: true, + // delimiter: '/', + // datePattern: ['Y', 'm', 'd'] + // }); }); }); diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Loan/js/Index.js b/ServiceHost/wwwroot/AssetsClient/pages/Loan/js/Index.js index 50e10cc2..217d4958 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Loan/js/Index.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/Loan/js/Index.js @@ -41,11 +41,16 @@ $(document).ready(function () { element.val(value); }); - new Cleave(this, { - date: true, - delimiter: '/', - datePattern: ['Y', 'm', 'd'] + new Cleave(this', { + delimiters: ['/', '/'], + blocks: [4, 2, 2], + numericOnly: true }); + // new Cleave(this, { + // date: true, + // delimiter: '/', + // datePattern: ['Y', 'm', 'd'] + // }); }); //******************** انتخاب همه ی چک باکس ها ******************** diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Loan/js/ModalCreateNewLoan.js b/ServiceHost/wwwroot/AssetsClient/pages/Loan/js/ModalCreateNewLoan.js index 39c64a6b..75317b77 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Loan/js/ModalCreateNewLoan.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/Loan/js/ModalCreateNewLoan.js @@ -98,10 +98,15 @@ $(document).ready(function () { }); new Cleave(this, { - date: true, - delimiter: '/', - datePattern: ['Y', 'm', 'd'] + delimiters: ['/', '/'], + blocks: [4, 2, 2], + numericOnly: true }); + // new Cleave(this, { + // date: true, + // delimiter: '/', + // datePattern: ['Y', 'm', 'd'] + // }); }); updateDateInput(0); diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Reward/js/Index.js b/ServiceHost/wwwroot/AssetsClient/pages/Reward/js/Index.js index 794466f3..c74124c2 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Reward/js/Index.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/Reward/js/Index.js @@ -43,11 +43,16 @@ $(document).ready(function () { element.val(value); }); - new Cleave(this, { - date: true, - delimiter: '/', - datePattern: ['Y', 'm', 'd'] + new Cleave('.dateInput', { + delimiters: ['/', '/'], + blocks: [4, 2, 2], + numericOnly: true }); + // new Cleave(this, { + // date: true, + // delimiter: '/', + // datePattern: ['Y', 'm', 'd'] + // }); }); //******************** انتخاب همه ی چک باکس ها ******************** @@ -614,14 +619,13 @@ function htmlLoadWithEmployeeDataByDate(loadRewardListData) {
    `; itemRewards.rewards.forEach(function (item) { - html += `
    @@ -663,7 +667,7 @@ function htmlLoadWithEmployeeDataByDate(loadRewardListData) { ${editPermission ? ` -