From bc36d8e15158df3bfa35e27143e2da33c61acd70 Mon Sep 17 00:00:00 2001 From: SamSys Date: Wed, 14 May 2025 19:57:01 +0330 Subject: [PATCH] change --- .../Company/Workshops/AutoExtension.cshtml | 3 ++ .../Company/Workshops/AutoExtension.cshtml.cs | 6 +-- .../page/Workshop/js/AutoExtension.js | 45 ++++++++++++++++--- 3 files changed, 46 insertions(+), 8 deletions(-) diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml index 0cdff7d5..2dec4425 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml @@ -848,6 +848,9 @@ var alertModalAjax = '@Url.Page("./AutoExtension", "AlertModal")'; var clockAjax = '@Url.Page("./AutoExtension", "Clock")'; var createContractAjax = '@Url.Page("./AutoExtension", "CreateContract")'; + var EmployeesStartedWorkInSelectedPeriodAjaxUrl = '@Url.Page("./AutoExtension", "EmployeesStartedWorkInSelectedPeriod")'; + + diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs b/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs index 4cc7812a..91bec999 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs +++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs @@ -167,15 +167,15 @@ public class AutoExtensionModel : PageModel //Correction(); } - public IActionResult GetEmployeesStartedWorkInSelectedPeriod(long workshopId, string startDate) + public IActionResult OnPostEmployeesStartedWorkInSelectedPeriod(long workshopId, string startDate) { var start = startDate.ToGeorgianDateTime(); var end = ($"{startDate.FindeEndOfMonth()}").ToGeorgianDateTime(); - var LeftWorkSerchModel = new LeftWorkSearchModel + var leftWorkSerchModel = new LeftWorkSearchModel { WorkshopId = workshopId }; - var leftWorkList = _leftWorkApplication.search(LeftWorkSerchModel); + var leftWorkList = _leftWorkApplication.search(leftWorkSerchModel); if (leftWorkList.Count > 0) { diff --git a/ServiceHost/wwwroot/AssetsAdmin/page/Workshop/js/AutoExtension.js b/ServiceHost/wwwroot/AssetsAdmin/page/Workshop/js/AutoExtension.js index dcf64831..784b2bb7 100644 --- a/ServiceHost/wwwroot/AssetsAdmin/page/Workshop/js/AutoExtension.js +++ b/ServiceHost/wwwroot/AssetsAdmin/page/Workshop/js/AutoExtension.js @@ -180,7 +180,7 @@ $('#firstCheckBtn').on('click', $('#datatable tbody tr').each(function (i) { let chekbox = $(this).find("input[name=selectItem]"); if (chekbox.is(":checked") == true) { - employeeId = $(this).attr("data-employeeId");; + employeeId = $(this).attr("data-employeeId"); start = $(this).find("input[name=contarctStart]").val(); startObj = $(this).find("input[name=contarctStart]"); end = $(this).find("input[name=contractEnd]").val(); @@ -745,18 +745,22 @@ $(".edate").keyup(function () { $('#monthSelected').on('change', function () { + console.log("ok"); const year = $("select[name=yearSelected]").val(); const month = $(this).val(); if (year === "0") { $("select[name=yearSelected]").addClass("errored"); } if (year != "0" && month != "0") { + const selectedDate = year + "/" + month + "/01"; const endDate = DateComputing(selectedDate); - $(".sdate").val(selectedDate); - $(".edate").val(endDate); - $('.sdate').removeClass("errored"); - $('.edate').removeClass("errored"); + + + SetStartAndEndDate(selectedDate, endDate); + + + } }); @@ -777,6 +781,37 @@ $("select[name=yearSelected]").on('change', }); + +function SetStartAndEndDate(selectedDate, endDate) { + const workshopId = Number($('#workshopId').val()); + $.ajax({ + dataType: 'json', + type: 'POST', + url: EmployeesStartedWorkInSelectedPeriodAjaxUrl, + data: { "workshopId": workshopId, "startDate": selectedDate }, + headers: { "RequestVerificationToken": $('input[name="__RequestVerificationToken"]').val() }, + + success: function (response) { + if (response.funded) { + $('#datatable tbody tr').each(function (i) { + + let employeeId = $(this).attr("data-employeeId"); + }); + + } else { + $(".sdate").val(selectedDate); + $(".edate").val(endDate); + $('.sdate').removeClass("errored"); + $('.edate').removeClass("errored"); + } + + }, + failure: function (response) { + console.log(5, response); + + } + }); //endOf Ajax +} function DateComputing(selectedDate) { var persianNumbers = [/۰/g, /۱/g, /۲/g, /۳/g, /۴/g, /۵/g, /۶/g, /۷/g, /۸/g, /۹/g], arabicNumbers = [/٠/g, /١/g, /٢/g, /٣/g, /٤/g, /٥/g, /٦/g, /٧/g, /٨/g, /٩/g],