From f7f44b98fbe240a2796661be9631a2d9617d88b5 Mon Sep 17 00:00:00 2001 From: SamSys Date: Wed, 14 May 2025 19:31:56 +0330 Subject: [PATCH 1/6] add new ajax metod --- .../Company/Workshops/AutoExtension.cshtml.cs | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs b/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs index 3155d4e2..4cc7812a 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs +++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs @@ -167,6 +167,39 @@ public class AutoExtensionModel : PageModel //Correction(); } + public IActionResult GetEmployeesStartedWorkInSelectedPeriod(long workshopId, string startDate) + { + var start = startDate.ToGeorgianDateTime(); + var end = ($"{startDate.FindeEndOfMonth()}").ToGeorgianDateTime(); + var LeftWorkSerchModel = new LeftWorkSearchModel + { + WorkshopId = workshopId + }; + var leftWorkList = _leftWorkApplication.search(LeftWorkSerchModel); + + if (leftWorkList.Count > 0) + { + var res = leftWorkList.Where(x => x.StartWorkDateGr <= end && x.StartWorkDateGr > start).ToList(); + if (res.Count > 0) + { + return new JsonResult(new + { + founded = true, + leftWorkList = res, + + }); + } + + + } + + return new JsonResult(new + { + founded = false, + + }); + + } public IActionResult OnGetContractStatus(long employeeId, long workshopId, string employeeName, string workshopname) { var command = new ContractStatusViewModel(); From bc36d8e15158df3bfa35e27143e2da33c61acd70 Mon Sep 17 00:00:00 2001 From: SamSys Date: Wed, 14 May 2025 19:57:01 +0330 Subject: [PATCH 2/6] 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], From ab2c1124ca27a4a370f7f695848705b923689b4b Mon Sep 17 00:00:00 2001 From: SamSys Date: Wed, 14 May 2025 20:42:27 +0330 Subject: [PATCH 3/6] checkout change shift work --- Company.Domain/YearlySalaryAgg/IYearlySalaryRepository.cs | 2 +- CompanyManagment.App.Contracts/Checkout/CreateCheckout.cs | 2 ++ .../Contract/ComputingViewModel.cs | 1 + CompanyManagment.Application/CheckoutApplication.cs | 2 +- .../Repository/YearlySalaryRepository.cs | 6 +++--- .../Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs | 5 +++-- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Company.Domain/YearlySalaryAgg/IYearlySalaryRepository.cs b/Company.Domain/YearlySalaryAgg/IYearlySalaryRepository.cs index 97a42b0e..7a0a3acc 100644 --- a/Company.Domain/YearlySalaryAgg/IYearlySalaryRepository.cs +++ b/Company.Domain/YearlySalaryAgg/IYearlySalaryRepository.cs @@ -17,7 +17,7 @@ public interface IYearlySalaryRepository : IRepository void TestDayliFeeCompute(); List GetYears(); List GetYearlySalary(); - MontlywageBunosYearsViewModel GetMontlyBunosYears(TimeSpan weeklyTime, DateTime contractStart,DateTime contractEnd, double daylyWage, string weeklyWorkingTime, int officialholiday, int friday, string totalHoursH, string totalHorsM, string basic, int fridayStartToEnd, double dayliFeeComplete, bool hasRollCall, bool holidaysWorking); + MontlywageBunosYearsViewModel GetMontlyBunosYears(TimeSpan weeklyTime, DateTime contractStart,DateTime contractEnd, double daylyWage, string weeklyWorkingTime, int officialholiday, int friday, string totalHoursH, string totalHorsM, string basic, int fridayStartToEnd, double dayliFeeComplete, bool hasRollCall, bool holidaysWorking,string shiftWork); double GetLeavePay(DateTime contractStart, DateTime contractEnd, double daylyWage, double consumableItem, double housingAllowance, double familyAllowance , string weeklyWorkingTime, int officialholiday, int friday, string totalHoursH, string totalHorsM); double GetOverTimeWorking(double dayliWage, string overTimeWorkH, string overTimeWorkM); double GetOverNightWorking(double dayliWage, string overNightWorkH, string overNightWorkM, string weeklyWorkingTime, int officialholiday, int friday, DateTime contractStart, DateTime contractEnd, string totalHoursH, string totalHorsM); diff --git a/CompanyManagment.App.Contracts/Checkout/CreateCheckout.cs b/CompanyManagment.App.Contracts/Checkout/CreateCheckout.cs index 0af8d207..dee0bc11 100644 --- a/CompanyManagment.App.Contracts/Checkout/CreateCheckout.cs +++ b/CompanyManagment.App.Contracts/Checkout/CreateCheckout.cs @@ -136,4 +136,6 @@ public class CreateCheckout public bool HolidayWorking { get; set; } + public string ShiftWork { get; set; } + } \ No newline at end of file diff --git a/CompanyManagment.App.Contracts/Contract/ComputingViewModel.cs b/CompanyManagment.App.Contracts/Contract/ComputingViewModel.cs index 15bfa45e..61346fbe 100644 --- a/CompanyManagment.App.Contracts/Contract/ComputingViewModel.cs +++ b/CompanyManagment.App.Contracts/Contract/ComputingViewModel.cs @@ -43,5 +43,6 @@ public class ComputingViewModel public bool HasRotatingShift { get; set; } + //public List holidays; } \ No newline at end of file diff --git a/CompanyManagment.Application/CheckoutApplication.cs b/CompanyManagment.Application/CheckoutApplication.cs index 0e753f3a..7ae53f91 100644 --- a/CompanyManagment.Application/CheckoutApplication.cs +++ b/CompanyManagment.Application/CheckoutApplication.cs @@ -124,7 +124,7 @@ public class CheckoutApplication : ICheckoutApplication //حق تاهل var marriedAllowance = command.MarriedAllowance.MoneyToDouble(); var MontlyYearsBunos = - _yearlySalaryRepository.GetMontlyBunosYears(command.WeeklyTime, command.ContractStartGr, command.ContractEndGr, dayliWage,command.WorkingWeeklyTime,command.officialholiday,command.friday, command.TotalHolidaysAndNotH, command.TotalHolidaysAndNotM, command.Basic, command.FridayStarttoEnd,command.DailFeeComplete,command.HasRollCall, command.HolidayWorking); + _yearlySalaryRepository.GetMontlyBunosYears(command.WeeklyTime, command.ContractStartGr, command.ContractEndGr, dayliWage,command.WorkingWeeklyTime,command.officialholiday,command.friday, command.TotalHolidaysAndNotH, command.TotalHolidaysAndNotM, command.Basic, command.FridayStarttoEnd,command.DailFeeComplete,command.HasRollCall, command.HolidayWorking, command.ShiftWork); //دستمزد ماهانه var monthlyWage = MontlyYearsBunos.MontlyWage; //سنوات diff --git a/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs b/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs index c7d32ba0..e1a3a393 100644 --- a/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs +++ b/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs @@ -84,7 +84,7 @@ public class YearlySalaryRepository : RepositoryBase, IYearl //محاسبه حقوق ماهیانه عیدی و پاداش ، سنوات #region GetMontlyBunosYears public MontlywageBunosYearsViewModel GetMontlyBunosYears(TimeSpan weeklyTime, DateTime contractStart, DateTime contractEnd, double daylyWage, - string weeklyWorkingTime, int officialholiday, int friday, string totalHoursH, string totalHorsM, string basic, int fridayStartToEnd, double dayliFeeComplete, bool hasRollCall, bool holidaysWorking) + string weeklyWorkingTime, int officialholiday, int friday, string totalHoursH, string totalHorsM, string basic, int fridayStartToEnd, double dayliFeeComplete, bool hasRollCall, bool holidaysWorking, string shiftWork) { double basicDouble = basic.MoneyToDouble(); double sub = 0; @@ -125,8 +125,8 @@ public class YearlySalaryRepository : RepositoryBase, IYearl //if (hasRollCall) var MandatoryDays = TotalDays - fridayStartToEnd - officialholiday; - if (!hasRollCall && weeklyWorkingTime !="4") - MandatoryDays = TotalDays - fridayStartToEnd; + if (!hasRollCall && shiftWork != "4") + MandatoryDays = TotalDays - fridayStartToEnd; //بدست آوردن ساعت موظفی این ماه var TotalMandatoryHours = MandatoryDays * 7.33;//ساعت موظفی این ماه diff --git a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs index fa9fd92c..458d8f13 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs +++ b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs @@ -675,7 +675,7 @@ public class IndexModel : PageModel _yearlySalaryRepository.GetMontlyBunosYears(foundMandatoryCompute.weeklyTime, found.ContractStart, found.ContractEnd, foundMandatoryCompute.SalaryCompute.MoneyToDouble(), foundMandatoryCompute.SumTime44, foundMandatoryCompute.OfficialHoliday, int.Parse(foundMandatoryCompute.NumberOfFriday), foundMandatoryCompute.TotalHolidayAndNotH, foundMandatoryCompute.TotalHolidayAndNotM, - foundMandatoryCompute.Basic, foundMandatoryCompute.FridayStartToEnd, foundMandatoryCompute.DayliFeeComplete, hasRollCall, workshop.WorkshopHolidayWorking); + foundMandatoryCompute.Basic, foundMandatoryCompute.FridayStartToEnd, foundMandatoryCompute.DayliFeeComplete, hasRollCall, workshop.WorkshopHolidayWorking, workingHours.ShiftWork); double foundMontlySalary = MontlyYearsBunos.MontlyWage + MontlyYearsBunos.BasicYears; int foundTotaldays = Convert.ToInt32(MontlyYearsBunos.SumOfWorkingDay); double foundDayliWage = foundMontlySalary / foundTotaldays; @@ -785,7 +785,8 @@ public class IndexModel : PageModel TotalDayOfYearsCompute = yearsPay.YearsPay > 0 ? $"{yearsPay.TotalDayCompute}" : "0", TotalDayOfBunosesCompute = bunosesPay.Bunoses > 0 ? $"{bunosesPay.TotalDayCompute}" : "0", HolidayWorking = workshop.WorkshopHolidayWorking, - }; + ShiftWork = workingHours.ShiftWork, + }; _checkoutApplication.Create(command); //var workshopId = $"{contract.WorkshopIds}"; From 986092135f085998597b9cb0df6b9dbaba30e493 Mon Sep 17 00:00:00 2001 From: SamSys Date: Thu, 15 May 2025 15:02:36 +0330 Subject: [PATCH 4/6] change temp --- .../page/Workshop/js/AutoExtension.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/ServiceHost/wwwroot/AssetsAdmin/page/Workshop/js/AutoExtension.js b/ServiceHost/wwwroot/AssetsAdmin/page/Workshop/js/AutoExtension.js index 784b2bb7..30a0fe5e 100644 --- a/ServiceHost/wwwroot/AssetsAdmin/page/Workshop/js/AutoExtension.js +++ b/ServiceHost/wwwroot/AssetsAdmin/page/Workshop/js/AutoExtension.js @@ -757,9 +757,12 @@ $('#monthSelected').on('change', const endDate = DateComputing(selectedDate); - SetStartAndEndDate(selectedDate, endDate); + /* SetStartAndEndDate(selectedDate, endDate);*/ - + $(".sdate").val(selectedDate); + $(".edate").val(endDate); + $('.sdate').removeClass("errored"); + $('.edate').removeClass("errored"); } @@ -783,7 +786,10 @@ $("select[name=yearSelected]").on('change', function SetStartAndEndDate(selectedDate, endDate) { - const workshopId = Number($('#workshopId').val()); + const workshopId = Number $(".sdate").val(selectedDate); + $(".edate").val(endDate); + $('.sdate').removeClass("errored"); + $('.edate').removeClass("errored");($('#workshopId').val()); $.ajax({ dataType: 'json', type: 'POST', @@ -799,10 +805,7 @@ function SetStartAndEndDate(selectedDate, endDate) { }); } else { - $(".sdate").val(selectedDate); - $(".edate").val(endDate); - $('.sdate').removeClass("errored"); - $('.edate').removeClass("errored"); + } }, From ee2adf1c13f0c7dbc0b59c66231ca7bd8e6193d6 Mon Sep 17 00:00:00 2001 From: SamSys Date: Thu, 15 May 2025 17:30:51 +0330 Subject: [PATCH 5/6] DateChange LeftWorkCheck Completed --- .../Company/Workshops/AutoExtension.cshtml.cs | 15 +++- .../page/Workshop/js/AutoExtension.js | 72 ++++++++++++------- 2 files changed, 61 insertions(+), 26 deletions(-) diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs b/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs index 91bec999..68fef39a 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs +++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs @@ -167,10 +167,20 @@ public class AutoExtensionModel : PageModel //Correction(); } - public IActionResult OnPostEmployeesStartedWorkInSelectedPeriod(long workshopId, string startDate) + public IActionResult OnPostEmployeesStartedWorkInSelectedPeriod(long workshopId, string startDate, string endDate, bool manualDate) { var start = startDate.ToGeorgianDateTime(); var end = ($"{startDate.FindeEndOfMonth()}").ToGeorgianDateTime(); + if (manualDate) + end = endDate.ToGeorgianDateTime(); + if (start >= end) + { + return new JsonResult(new + { + founded = false, + error = true + }); + } var leftWorkSerchModel = new LeftWorkSearchModel { WorkshopId = workshopId @@ -186,7 +196,7 @@ public class AutoExtensionModel : PageModel { founded = true, leftWorkList = res, - + error = false }); } @@ -196,6 +206,7 @@ public class AutoExtensionModel : PageModel return new JsonResult(new { founded = false, + error = false }); diff --git a/ServiceHost/wwwroot/AssetsAdmin/page/Workshop/js/AutoExtension.js b/ServiceHost/wwwroot/AssetsAdmin/page/Workshop/js/AutoExtension.js index 30a0fe5e..d8eead67 100644 --- a/ServiceHost/wwwroot/AssetsAdmin/page/Workshop/js/AutoExtension.js +++ b/ServiceHost/wwwroot/AssetsAdmin/page/Workshop/js/AutoExtension.js @@ -701,7 +701,12 @@ $("#start").keyup(function () { $(this).addClass("errored"); } else { $(this).removeClass("errored"); - $(".sdate").val(value); + var endDate = $("#end").val(); + if (endDate.length == 10) { + + SetStartAndEndDate(value, endDate, true); + } + } } }); @@ -713,7 +718,11 @@ $("#end").keyup(function () { $(this).addClass("errored"); } else { $(this).removeClass("errored"); - $(".edate").val(value); + var startDate = $("#start").val(); + if (startDate.length == 10) { + + SetStartAndEndDate(startDate, value,true); + } } } }); @@ -745,7 +754,7 @@ $(".edate").keyup(function () { $('#monthSelected').on('change', function () { - console.log("ok"); + const year = $("select[name=yearSelected]").val(); const month = $(this).val(); if (year === "0") { @@ -757,12 +766,8 @@ $('#monthSelected').on('change', const endDate = DateComputing(selectedDate); - /* SetStartAndEndDate(selectedDate, endDate);*/ + SetStartAndEndDate(selectedDate, endDate,false); - $(".sdate").val(selectedDate); - $(".edate").val(endDate); - $('.sdate').removeClass("errored"); - $('.edate').removeClass("errored"); } @@ -775,39 +780,58 @@ $("select[name=yearSelected]").on('change', 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,false); + $("select[name=yearSelected]").removeClass("errored"); } }); -function SetStartAndEndDate(selectedDate, endDate) { - const workshopId = Number $(".sdate").val(selectedDate); - $(".edate").val(endDate); - $('.sdate').removeClass("errored"); - $('.edate').removeClass("errored");($('#workshopId').val()); +function SetStartAndEndDate(selectedDate, endDate, manualDate) { + const workshopId = Number($('#workshopId').val()); + $.ajax({ dataType: 'json', type: 'POST', url: EmployeesStartedWorkInSelectedPeriodAjaxUrl, - data: { "workshopId": workshopId, "startDate": selectedDate }, + data: { "workshopId": workshopId, "startDate": selectedDate, "endDate": endDate, "manualDate": manualDate }, headers: { "RequestVerificationToken": $('input[name="__RequestVerificationToken"]').val() }, success: function (response) { - if (response.funded) { + if (response.founded && !response.error) { + $('#datatable tbody tr').each(function (i) { - - let employeeId = $(this).attr("data-employeeId"); + let selectedTr = $(this); + let employeeIdInList = selectedTr.attr("data-employeeId"); + console.log('employeeIdInList' + employeeIdInList); + selectedTr.find(".sdate").val(selectedDate); + selectedTr.find(".edate").val(endDate); + response.leftWorkList.forEach(function (el) { + if (el.employeeId == employeeIdInList) { + + $('.sdate').removeClass("errored"); + selectedTr.find(".sdate").val(el.startWorkDate); + selectedTr.find(".edate").val(endDate); + $('.edate').removeClass("errored"); + + } + }); + }); - - } else { + } else if (!response.founded && !response.error) { + $(".sdate").val(selectedDate); + $('.sdate').removeClass("errored"); + $(".edate").val(endDate); + $('.edate').removeClass("errored"); + - } + } else if (!response.founded && response.error) { + $('#end').addClass("errored"); + + + } }, failure: function (response) { console.log(5, response); From 140adb25880b43b7bd7238af16fb9b46a7fac36e Mon Sep 17 00:00:00 2001 From: SamSys Date: Sat, 17 May 2025 00:31:28 +0330 Subject: [PATCH 6/6] Version Added to AutoExtention --- .../Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml index 2dec4425..3f5ca027 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml @@ -449,7 +449,7 @@ } var i = 1; var zeropscode = "zero-ps-code tooltip-container"; - + string adminVersion = _0_Framework.Application.Version.AdminVersion; } @@ -853,7 +853,7 @@ - + } \ No newline at end of file