admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
MahanCh
2025-05-14 16:26:53 +03:30
parent f4961a46eb
commit 56def568b5
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Company.Domain/CustomizeWorkshopGroupSettingsAgg/Entities/CustomizeWorkshopGroupSettings.cs
View File

@@ -219,7 +219,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
}
var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.id));
var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.EmployeeId));
foreach (var item in permittedToOverWrite)
{

6
CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs
View File

@@ -1602,19 +1602,19 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
foreach (var command in commands)
{
var fromDateGr = command.FromDate.ToGeorgianDateTime();
if (_checkoutRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractStart))
if (_checkoutRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractEnd))
{
isSuccess = false;
employeeIdsHasCheckout.Add(command.EmployeeId);
}
if (_customizeCheckoutRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractStart))
if (_customizeCheckoutRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractEnd))
{
isSuccess = false;
employeeIdsHasCheckout.Add(command.EmployeeId);
}
if (_customizeCheckoutTempRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractStart))
if (_customizeCheckoutTempRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractEnd))
{
isSuccess = false;
employeeIdsHasCheckout.Add(command.EmployeeId);

11
ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ConfirmEmployeeChange.js
View File

@@ -154,11 +154,12 @@ function employeeList() {
}
$('#initialDateInput').on('input', function () {
new Cleave('.dateInput', {
delimiters: ['/', '/'],
blocks: [4, 2, 2],
numericOnly: true
});
$('.dateInput').mask('0000/00/00')
//new Cleave('.dateInput', {
// delimiters: ['/', '/'],
// blocks: [4, 2, 2],
// numericOnly: true
//});
// new Cleave('.dateInput', {
// date: true,
// datePattern: ['Y', 'm', 'd']

8
ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditGroup.js
View File

@@ -897,11 +897,11 @@ async function postChangeEditGroup() {
$('.btn-confirm').removeClass('disable');
}
} else {
$('.alert-success-msg').show();
$('.alert-success-msg p').text(responseValid.message);
$('.alert-msg').show();
$('.alert-msg p').text(responseValid.message);
setTimeout(function () {
$('.alert-success-msg').hide();
$('.alert-success-msg p').text('');
$('.alert-msg').hide();
$('.alert-msg p').text('');
}, 3500);
// Updating the employees that who has checkout