From 30c70c83b2f0a94f13f02ddb845fb330a61a1560 Mon Sep 17 00:00:00 2001 From: MahanCh Date: Tue, 13 May 2025 19:39:19 +0330 Subject: [PATCH] recalculte values group --- 0_Framework/Application/OperationResult.cs | 7 + .../CustomizeWorkshopEmployeeSettings.cs | 54 +++++++ .../ICustomizeWorkshopSettingsApplication.cs | 10 +- .../CustomizeWorkshopSettingsApplication.cs | 88 +++++++++++- ...omizeWorkshopEmployeeSettingsRepository.cs | 5 + .../Pages/Company/RollCall/Grouping.cshtml.cs | 8 +- .../Pages/Company/RollCall/Grouping.cshtml.cs | 4 +- .../Company/RollCall/ModalEditGroup.cshtml | 1 + .../ConfirmEditGroupTimeChangeModal.cshtml | 29 ++-- .../ConfirmEmployeeChangeModal.cshtml | 3 +- .../css/ConfirmEditGroupTimeChangeModal.css | 47 +++--- .../RollCall/js/ConfirmEmployeeChange.js | 48 +++++-- .../RollCall/js/ModalEditEmployeeGroup.js | 2 + .../pages/RollCall/js/ModalEditGroup.js | 135 ++++++++++-------- 14 files changed, 332 insertions(+), 109 deletions(-) diff --git a/0_Framework/Application/OperationResult.cs b/0_Framework/Application/OperationResult.cs index f37172bb..65b6b61e 100644 --- a/0_Framework/Application/OperationResult.cs +++ b/0_Framework/Application/OperationResult.cs @@ -51,4 +51,11 @@ public class OperationResult Message = message; return this; } + public OperationResult Failed(string message, T data) + { + IsSuccedded = false; + Message = message; + Data = data; + return this; + } } \ No newline at end of file diff --git a/Company.Domain/CustomizeWorkshopEmployeeSettingsAgg/Entities/CustomizeWorkshopEmployeeSettings.cs b/Company.Domain/CustomizeWorkshopEmployeeSettingsAgg/Entities/CustomizeWorkshopEmployeeSettings.cs index 964f70d9..d3db6404 100644 --- a/Company.Domain/CustomizeWorkshopEmployeeSettingsAgg/Entities/CustomizeWorkshopEmployeeSettings.cs +++ b/Company.Domain/CustomizeWorkshopEmployeeSettingsAgg/Entities/CustomizeWorkshopEmployeeSettings.cs @@ -213,6 +213,60 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity earlyExit.EarlyExitTimeFines.Select(x => new EarlyExitTimeFine(x.Minute, x.FineMoney)) .ToList(), earlyExit.Value); } + public void UpdateIsShiftChange() + { + var groupSetting = CustomizeWorkshopGroupSettings; + if (groupSetting == null) + return; + bool isShiftChange; + if (WorkshopShiftStatus == WorkshopShiftStatus.Regular) + { + + + + if (CustomizeWorkshopEmployeeSettingsShifts.All(x => groupSetting.CustomizeWorkshopGroupSettingsShifts.Any(y => x.Equals(y))) + && WorkshopShiftStatus == groupSetting.WorkshopShiftStatus && FridayWork == groupSetting.FridayWork && + HolidayWork == groupSetting.HolidayWork && BreakTime == groupSetting.BreakTime) + { + isShiftChange = false; + } + + else + { + isShiftChange = true; + } + } + else if (WorkshopShiftStatus == WorkshopShiftStatus.Irregular) + { + if (WorkshopShiftStatus == groupSetting.WorkshopShiftStatus && BreakTime == groupSetting.BreakTime && + IrregularShift == groupSetting.IrregularShift && FridayWork == groupSetting.FridayWork && + HolidayWork == groupSetting.HolidayWork) + { + isShiftChange = false; + } + else + { + isShiftChange = true; + } + } + else + { + if (CustomizeRotatingShifts.All(x => groupSetting.CustomizeRotatingShifts.Any(y => x.Equals(y))) + && WorkshopShiftStatus == groupSetting.WorkshopShiftStatus && FridayWork == groupSetting.FridayWork && + HolidayWork == groupSetting.HolidayWork && BreakTime == groupSetting.BreakTime) + { + isShiftChange = false; + } + + else + { + isShiftChange = true; + } + + } + + IsShiftChanged = isShiftChange; + } } \ No newline at end of file diff --git a/CompanyManagment.App.Contracts/CustomizeWorkshopSettings/ICustomizeWorkshopSettingsApplication.cs b/CompanyManagment.App.Contracts/CustomizeWorkshopSettings/ICustomizeWorkshopSettingsApplication.cs index 97bf7a29..46c5836e 100644 --- a/CompanyManagment.App.Contracts/CustomizeWorkshopSettings/ICustomizeWorkshopSettingsApplication.cs +++ b/CompanyManagment.App.Contracts/CustomizeWorkshopSettings/ICustomizeWorkshopSettingsApplication.cs @@ -33,7 +33,7 @@ public interface ICustomizeWorkshopSettingsApplication //Remove the Employee From the Group Settings OperationResult RemoveEmployeeFromRollCallWorkshopGroup(long employeeId, long groupId, long workshopId); - OperationResult EditSimpleRollCallGroupSetting(EditCustomizeWorkshopGroupSettings command); + OperationResult EditSimpleRollCallGroupSetting(EditCustomizeWorkshopGroupSettings command, List reCalculateCommand); #region Vafa OperationResult EditSimpleRollCallEmployeeSetting(EditCustomizeEmployeeSettings command, @@ -90,7 +90,13 @@ public interface ICustomizeWorkshopSettingsApplication List GetEmployeeSettingsByWorkshopId(long workshopId); CustomizeWorkshopGroupSettingsViewModel GetEmployeesGroupSettingsByEmployeeId(long employeeId, long workshopId); - + /// + /// این متد برای قبل از ویرایش گروهی و محاسبه مجدد گروهی استفاده میشود برای اینکه پرسنل هایی که دارای فیش هستند رو فرانت نمایش بده + /// + /// + /// + /// + OperationResult> ValidateReCalculateValueForGroupEdit(List command, long workshopId); bool HasAnyEmployeeWithoutGroup(long workshopId); /// diff --git a/CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs b/CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs index 18fd28e1..553a98fe 100644 --- a/CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs +++ b/CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs @@ -21,6 +21,10 @@ using System.Threading.Tasks; using System.Transactions; using CompanyManagment.App.Contracts.RollCall; using Microsoft.EntityFrameworkCore.Query; +using Company.Domain.CheckoutAgg; +using Company.Domain.CustomizeCheckoutAgg; +using Company.Domain.CustomizeCheckoutTempAgg; +using CompanyManagment.EFCore.Repository; namespace CompanyManagment.Application; @@ -30,7 +34,10 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository, IEmployeeRepository employeeRepository, ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository, IRollCallEmployeeApplication rollCallEmployeeApplication, - IRollCallApplication rollCallAppllication) + IRollCallApplication rollCallAppllication, + ICheckoutRepository checkoutRepository, + ICustomizeCheckoutRepository customizeCheckoutRepository, + ICustomizeCheckoutTempRepository customizeCheckoutTempRepository) : ICustomizeWorkshopSettingsApplication { private readonly ICustomizeWorkshopSettingsRepository _customizeWorkshopSettingsRepository = customizeWorkshopSettingsRepository; @@ -42,6 +49,9 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo private readonly ICameraAccountApplication _cameraAccountApplication = cameraAccountApplication; private readonly IRollCallEmployeeApplication _rollCallEmployeeApplication = rollCallEmployeeApplication; private readonly IRollCallApplication _rollCallApplication = rollCallAppllication; + private readonly ICheckoutRepository _checkoutRepository = checkoutRepository; + private readonly ICustomizeCheckoutRepository _customizeCheckoutRepository = customizeCheckoutRepository; + private readonly ICustomizeCheckoutTempRepository _customizeCheckoutTempRepository = customizeCheckoutTempRepository; #region RollCallShifts @@ -670,7 +680,8 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo transActionScope.Complete(); return op.Succcedded(); } - public OperationResult EditSimpleRollCallGroupSetting(EditCustomizeWorkshopGroupSettings command) + public OperationResult EditSimpleRollCallGroupSetting(EditCustomizeWorkshopGroupSettings command, + List reCalculateCommand) { OperationResult op = new(); @@ -689,9 +700,11 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo var workshopSettings = _customizeWorkshopSettingsRepository.Get(entity.CustomizeWorkshopSettingId); - var employeeIds = command.IsShiftChanged ? entity.CustomizeWorkshopEmployeeSettingsCollection - .Select(x => x.id).ToList() : entity.CustomizeWorkshopEmployeeSettingsCollection.Where(x => !x.IsShiftChanged) - .Select(x => x.id).ToList(); + //var employeeIds = command.IsShiftChanged ? entity.CustomizeWorkshopEmployeeSettingsCollection + // .Select(x => x.id).ToList() : entity.CustomizeWorkshopEmployeeSettingsCollection.Where(x => !x.IsShiftChanged) + // .Select(x => x.id).ToList(); + + var groupSettingsShifts = new List(); ICollection rotatingShift = []; bool isChanged; @@ -708,7 +721,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo return new CustomizeWorkshopGroupSettingsShift(start, end, x.Placement); }).ToList(); - ; + if (groupSettingsShifts.All(x => workshopSettings.CustomizeWorkshopSettingsShifts.Any(y => x.Equals(y))) && command.WorkshopShiftStatus == workshopSettings.WorkshopShiftStatus && command.FridayWork == workshopSettings.FridayWork && command.HolidayWork == workshopSettings.HolidayWork && @@ -782,10 +795,38 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo var breakTime = new BreakTime(command.BreakTime.HasBreakTimeValue, command.BreakTime.BreakTimeValue); - entity.EditSimpleAndOverwriteOnEmployee(command.Name, employeeIds, groupSettingsShifts, command.WorkshopShiftStatus, + var employeeSettings = entity.CustomizeWorkshopEmployeeSettingsCollection; + + var employeeSettingIds = employeeSettings.Select(x => x.EmployeeId).ToList(); + + reCalculateCommand = reCalculateCommand.Where(x => employeeSettingIds.Contains(x.EmployeeId)).ToList(); + + var selectedEmployeesIds = reCalculateCommand.Select(x => x.EmployeeId).ToList(); + + var notSelectedEmployeeSettings = employeeSettings.Where(x => !selectedEmployeesIds.Contains(x.EmployeeId)); + + using var transaction = new TransactionScope(); + + entity.EditSimpleAndOverwriteOnEmployee(command.Name, selectedEmployeesIds, groupSettingsShifts, command.WorkshopShiftStatus, command.IrregularShift, breakTime, isChanged, command.FridayWork, command.HolidayWork, rotatingShift); + if (reCalculateCommand.Count > 0) + { + var result = _rollCallApplication.RecalculateValues(workshopSettings.WorkshopId, reCalculateCommand); + + if (result.IsSuccedded == false) + { + return result; + } + } + + foreach (var notSelectedEmployeeSetting in notSelectedEmployeeSettings) + { + notSelectedEmployeeSetting.UpdateIsShiftChange(); + } _customizeWorkshopGroupSettingsRepository.SaveChanges(); + + transaction.Complete(); return op.Succcedded(); } public OperationResult EditSimpleRollCallEmployeeSetting(EditCustomizeEmployeeSettings command, @@ -1552,7 +1593,40 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo { return _customizeWorkshopGroupSettingsRepository.HasAnyEmployeeWithoutGroup(workshopId); } + public OperationResult> ValidateReCalculateValueForGroupEdit(List commands, + long workshopId) + { + var operationResult = new OperationResult>(); + bool isSuccess = true; + List employeeIdsHasCheckout = []; + foreach (var command in commands) + { + var fromDateGr = command.FromDate.ToGeorgianDateTime(); + if (_checkoutRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractStart)) + { + isSuccess = false; + employeeIdsHasCheckout.Add(command.EmployeeId); + } + if (_customizeCheckoutRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractStart)) + { + isSuccess = false; + employeeIdsHasCheckout.Add(command.EmployeeId); + } + + if (_customizeCheckoutTempRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractStart)) + { + isSuccess = false; + employeeIdsHasCheckout.Add(command.EmployeeId); + } + } + + employeeIdsHasCheckout = employeeIdsHasCheckout.Distinct().ToList(); + return isSuccess ? + operationResult.Succcedded(employeeIdsHasCheckout) + : + operationResult.Failed("پرسنل هایی دارای فیش هستند لطفا نسبت به تعیین تکلیف این ها اقدام نمایید", employeeIdsHasCheckout); + } public bool CheckEmployeeShiftHasChanged(EditCustomizeEmployeeSettings command) { return _customizeWorkshopEmployeeSettingsRepository.CheckEmployeeShiftHasChanged(command); diff --git a/CompanyManagment.EFCore/Repository/CustomizeWorkshopEmployeeSettingsRepository.cs b/CompanyManagment.EFCore/Repository/CustomizeWorkshopEmployeeSettingsRepository.cs index 33bcd3df..ad761f28 100644 --- a/CompanyManagment.EFCore/Repository/CustomizeWorkshopEmployeeSettingsRepository.cs +++ b/CompanyManagment.EFCore/Repository/CustomizeWorkshopEmployeeSettingsRepository.cs @@ -196,6 +196,11 @@ public class CustomizeWorkshopEmployeeSettingsRepository(CompanyContext companyC return true; } + if (command.BreakTime.BreakTimeValue != employeeSettings.BreakTime.BreakTimeValue || command.BreakTime.HasBreakTimeValue != employeeSettings.BreakTime.HasBreakTimeValue) + { + return true; + } + switch (employeeSettings.WorkshopShiftStatus) { case WorkshopShiftStatus.Irregular: diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/Grouping.cshtml.cs b/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/Grouping.cshtml.cs index 29fc8aa7..8b2639dc 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/Grouping.cshtml.cs +++ b/ServiceHost/Areas/AdminNew/Pages/Company/RollCall/Grouping.cshtml.cs @@ -130,11 +130,11 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.RollCall return Partial("ModalEditGroup", command); } - public IActionResult OnPostEditGroup(EditCustomizeWorkshopGroupSettings command) - { - var result = _customizeWorkshopSettingsApplication.EditSimpleRollCallGroupSetting(command); + public IActionResult OnPostEditGroup(EditCustomizeWorkshopGroupSettings command, List reCalculateCommand) + { + var result = _customizeWorkshopSettingsApplication.EditSimpleRollCallGroupSetting(command, reCalculateCommand); - return new JsonResult(new + return new JsonResult(new { success = result.IsSuccedded, message = result.Message diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/Grouping.cshtml.cs b/ServiceHost/Areas/Client/Pages/Company/RollCall/Grouping.cshtml.cs index 43658362..25a4917d 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/Grouping.cshtml.cs +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/Grouping.cshtml.cs @@ -152,9 +152,9 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall return Partial("ModalEditGroup", command); } - public IActionResult OnPostEditGroup(EditCustomizeWorkshopGroupSettings command) + public IActionResult OnPostEditGroup(EditCustomizeWorkshopGroupSettings command, List reCalculateCommand) { - var result = _customizeWorkshopSettingsApplication.EditSimpleRollCallGroupSetting(command); + var result = _customizeWorkshopSettingsApplication.EditSimpleRollCallGroupSetting(command, reCalculateCommand); return new JsonResult(new { diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml index 4f66e0e5..00728add 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml @@ -481,6 +481,7 @@ var indexShiftViewModel = Number(@indexShiftViewModel); var indexShiftViewModelRS = Number(@indexShiftViewModel); + var ajaxEmployeeSettingsHasChangedValueUrl = `@Url.Page("./Grouping", "EmployeeSettingsHasChangedValue")`; var groupId = Number(@Model.Id); var IsRegularWorkshop = @(Model.WorkshopShiftStatus == WorkshopShiftStatus.Regular ? 0 : Model.WorkshopShiftStatus == WorkshopShiftStatus.Irregular ? 1 : 2); diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/ConfirmEditGroupTimeChangeModal.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/ConfirmEditGroupTimeChangeModal.cshtml index 398624f8..409834c4 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/ConfirmEditGroupTimeChangeModal.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/ConfirmEditGroupTimeChangeModal.cshtml @@ -8,10 +8,9 @@
- تغییرات ساعت کار پرسنل به صورت گروهی : + تغییرات ساعت کار پرسنل به صورت گروهی - تاریخ تغییرات ساعت کاری را میتوانید بصورت انفرادی در منوی - ذیل انجام دهید : + تاریخ تغییرات ساعت کاری را میتوانید بصورت انفرادی در منوی ذیل انجام دهید:
@@ -24,21 +23,31 @@
-
+
ردیف
نام پرسنل
- - - +
+ + + +
@* load employees *@ -
+
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/ConfirmEmployeeChangeModal.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/ConfirmEmployeeChangeModal.cshtml index b139b202..6f3ac9e2 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/ConfirmEmployeeChangeModal.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/ConfirmEmployeeChangeModal.cshtml @@ -41,8 +41,7 @@
- @* ajaxConfirm() *@ - + diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/css/ConfirmEditGroupTimeChangeModal.css b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/css/ConfirmEditGroupTimeChangeModal.css index d6ff173c..d0658cd7 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/css/ConfirmEditGroupTimeChangeModal.css +++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/css/ConfirmEditGroupTimeChangeModal.css @@ -152,24 +152,18 @@ background: #F5F5F5; border-radius: 10px; width: 100%; - height: 372px; - overflow: hidden; - border: 1px solid #E7E7E7 + height: 400px; + overflow: auto; + border: 1px solid #E7E7E7; + padding: 7px; } .cardModal2-content { - padding: 10px; text-align: center; - height: 400px; - overflow: auto; } - - - - .btn-quit { background-color: #292D32; color: white; @@ -192,9 +186,9 @@ font-weight: 500 } -.btn-confirm:hover { - background-color: #5f9213; -} + .btn-confirm:hover { + background-color: #5f9213; + } .btn-quit:hover { background-color: #121820; @@ -213,10 +207,29 @@ input:focus { .btn-card { color: #0B5959; - width: 33px; - height: 33px; - border-radius: 3px; + width: 27px; + height: 27px; + border-radius: 5px; background-color: #57E3E340; font-size: 14px; line-height: 29px; -} \ No newline at end of file +} + +.cusRemove { + background-color: #F2B3B3; + border: 1px solid #F63D3D; + border-radius: 7px; + padding: 3px; + cursor: pointer; + transition: all ease-in-out 0.3s; +} + +.noselect { + -webkit-touch-callout: none; /* iOS Safari */ + -webkit-user-select: none; /* Safari */ + -khtml-user-select: none; /* Konqueror HTML */ + -moz-user-select: none; /* Firefox */ + -ms-user-select: none; /* Internet Explorer/Edge */ + user-select: none; /* Non-prefixed version, currently + supported by Chrome and Opera */ +} diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ConfirmEmployeeChange.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ConfirmEmployeeChange.js index d47b55d7..9ecbfda8 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ConfirmEmployeeChange.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ConfirmEmployeeChange.js @@ -74,8 +74,14 @@ function loadEmployeeIsChangeAjax() { function ajaxConfirm() { - $('#ConfirmModal').show(); + saveDataLocal(); employeeList(); + var isYesCheck = $('#YesConfirm').is(':checked'); + if (isYesCheck) { + $('#ConfirmModal').show(); + } else { + postChangeEditGroup(); + } } @@ -96,16 +102,29 @@ function employeeList() { var index = 1; if (response.success) { employeeList.forEach(function (item) { - htmlEmployeeList += `
-
- ${index++} + htmlEmployeeList += `
+
+ ${index++} ${item.name}
- + +
+ + +
+ + + + + + + +
+
`; }); @@ -145,4 +164,15 @@ $('#initialDateInput').on('input', function () { // datePattern: ['Y', 'm', 'd'] // }); $('.dateInput').val($(this).val()); -}); \ No newline at end of file +}); + +$(document).on('click', '.cusRemove', function () { + $(this).closest('.TaleRowCell').remove(); + updateRowIndexes(); +}); + +function updateRowIndexes() { + $('.btn-card').each(function (index) { + $(this).text(index + 1); + }); +} \ No newline at end of file diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditEmployeeGroup.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditEmployeeGroup.js index 9c9f671e..70032389 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditEmployeeGroup.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditEmployeeGroup.js @@ -804,6 +804,8 @@ function saveDataLocal() { saveData['Command.FridayWork'] = FridayWork; saveData['Command.HolidayWork'] = HolidayWork; + console.log(saveData); + //data.push({ name: 'Command.BreakTime.HasBreakTimeValue', value: hasBreakTime }); //data.push({ name: 'Command.BreakTime.BreakTimeValue', value: breakTimeValue }); //data.push({ name: 'Command.FridayWork', value: FridayWork }); diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditGroup.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditGroup.js index d37e8fcc..8ae8f690 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditGroup.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditGroup.js @@ -504,6 +504,7 @@ updateRemoveButtons(); updateRemoveButtonsRS(); + saveDataLocal(); }); function updateRemoveButtons() { @@ -772,10 +773,29 @@ async function ajaxSaveSubmit() { } } - $('#btnSave').addClass('disable'); - $('#finalSaveRollCallSetting').addClass('disable'); + saveDataLocal(); + postChangeEditGroup(); + + //try { + // const responseCheckCal = await checkEmployeeSettingsHasChangedValue(saveData); + + // if (responseCheckCal) { + // $('#ConfirmModal').show(); + // } else { + // postChangeEditGroup(); + // } + + //} catch (err) { + // console.log(err); + //} +} + +// save all data +var saveData = {}; +function saveDataLocal() { + //$('#btnSave').addClass('disable'); + //$('#finalSaveRollCallSetting').addClass('disable'); - var data = $('#edit-form').serializeArray(); var hasBreakTime = "false"; if ($('#BreakTime').prop('checked')) { @@ -787,9 +807,7 @@ async function ajaxSaveSubmit() { var breakTimeValue = $("#TimeOnly").val(); var isShiftChanged = $('#YesConfirm').prop("checked") ? "true" : "false"; - //console.log(breakTimeValue); - //return; - + var FridayWork = "Default"; if ($('#Friday1').prop('checked')) { FridayWork = "Default"; @@ -806,70 +824,75 @@ async function ajaxSaveSubmit() { } - data.push({ name: 'BreakTime.HasBreakTimeValue', value: hasBreakTime }); - data.push({ name: 'BreakTime.BreakTimeValue', value: breakTimeValue }); - data.push({ name: 'FridayWork', value: FridayWork }); - data.push({ name: 'HolidayWork', value: HolidayWork }); + var formData = $('#edit-form').serializeArray(); - data.push({ name: 'IsShiftChanged', value: isShiftChanged }); + formData.forEach(function (item) { + saveData[item.name] = item.value; + }); + + saveData['BreakTime.HasBreakTimeValue'] = hasBreakTime; + saveData['BreakTime.BreakTimeValue'] = breakTimeValue; + saveData['FridayWork'] = FridayWork; + saveData['HolidayWork'] = HolidayWork; + saveData['IsShiftChanged'] = isShiftChanged; +} + + +async function postChangeEditGroup() { - var requestData = $.param(data); + $('#ConfirmRecalculationLoading').show(); + $('.btn-confirm').addClass('disable'); + var command = []; - - var commandGroup = []; - - $('input[name="EmployeeId[]"]').each(function (index) { - var employeeId = $(this).val(); - var fromDate = $('input[name="FromDate[]"]').eq(index).val(); - - commandGroup.push({ - EmployeeId: employeeId, - FromDate: fromDate + $('[name="EmployeeId[]"]').each(function (index) { + command.push({ + EmployeeId: $(this).val(), + FromDate: $('[name="FromDate[]"]').eq(index).val() }); }); - // console.log(commandGroup); + const response = await $.ajax({ + dataType: 'json', + type: 'POST', + url: ajaxEditGroupSave, + headers: { "RequestVerificationToken": antiForgeryToken }, + data: { ...saveData, reCalculateCommand: command } + }); - try { - const response = await $.ajax({ - dataType: 'json', - type: 'POST', - url: ajaxEditGroupSave, - headers: { "RequestVerificationToken": antiForgeryToken }, - data: requestData - }); + if (response.success) { + isShiftChangedGlobal = true; - if (response.success) { - //const responseSaveCal = await saveReCalculateValues(commandGroup); - //if (responseSaveCal) { - // loadDataAjax(); - // $('#btn-register').addClass('disable'); - // $('#MainModal').modal('hide'); - //} - loadDataAjax(); - $('#btnSave').removeClass('disable'); - $('#btn-register').addClass('disable'); - $('#MainModal').modal('hide'); - } else { - $('.alert-msg').show(); - $('.alert-msg p').text(response.message); - setTimeout(function () { - $('.alert-msg').hide(); - $('.alert-msg p').text(''); - }, 3500); - $('#btn-register').removeClass('disable'); - $('#finalSaveRollCallSetting').removeClass('disable'); - } - } catch (err) { - $('#btn-register').removeClass('disable'); - $('#finalSaveRollCallSetting').removeClass('disable'); - console.log(err); + + $('.alert-success-msg').show(); + $('.alert-success-msg p').text(response.message); + setTimeout(function () { + $('.alert-success-msg').hide(); + $('.alert-success-msg p').text(''); + }, 2000); + + loadDataAjax(); + $('#btn-register').addClass('disable'); + $('#MainModal').modal('hide'); + + $('#ConfirmRecalculationLoading').hide(); + $('.btn-confirm').removeClass('disable'); + //} + } else { + $('.alert-msg').show(); + $('.alert-msg p').text(response.message); + setTimeout(function () { + $('.alert-msg').hide(); + $('.alert-msg p').text(''); + }, 3500); + $('#ConfirmRecalculationLoading').hide(); + $('.btn-confirm').removeClass('disable'); } } + async function saveReCalculateValues(command) { var btnConfirm = $('.btn-confirm').addClass('disable');