diff --git a/CompanyManagment.EFCore/Repository/CustomizeCheckoutRepository.cs b/CompanyManagment.EFCore/Repository/CustomizeCheckoutRepository.cs index fa6d57b0..bf8ac629 100644 --- a/CompanyManagment.EFCore/Repository/CustomizeCheckoutRepository.cs +++ b/CompanyManagment.EFCore/Repository/CustomizeCheckoutRepository.cs @@ -106,7 +106,7 @@ namespace CompanyManagment.EFCore.Repository var employeePicMediaIdInEmployeeDoc = _companyContext.EmployeeDocumentItems.Where(x => customizeCheckoutsQuery .Any(y => y.WorkshopId == x.WorkshopId && y.EmployeeId == x.EmployeeId) && x.DocumentLabel == DocumentItemLabel.EmployeePicture && - x.DocumentStatus == DocumentStatus.Confirmed) + x.DocumentStatus == DocumentStatus.Confirmed) ?.Select(x => new { x.EmployeeId, x.MediaId }).ToList(); var mediasInEmployeeDoc = _accountContext.Medias.Where(x => employeePicMediaIdInEmployeeDoc.Select(y => y.MediaId).Contains(x.id)).ToList(); @@ -128,14 +128,13 @@ namespace CompanyManagment.EFCore.Repository var employeeIds = customizeCheckoutsQuery.Select(x => x.EmployeeId).ToList() .Where(x => !employeePictures.Select(e => e.Id).Contains(x)).ToList(); + foreach (var employeeId in employeeIds) { - var directoryPath = $"{_webHostEnvironment.ContentRootPath}\\Faces\\{workshopId}\\{employeeId}"; + var directoryPath = $"{_webHostEnvironment.ContentRootPath}\\Faces\\{workshopId}\\{employeeId}\\1.jpg"; - if (!Directory.Exists(directoryPath)) - continue; if (!System.IO.File.Exists(directoryPath)) - throw new FileNotFoundException("فایل مورد نظر یافت نشد.", directoryPath); + continue; byte[] fileBytes = System.IO.File.ReadAllBytes(directoryPath); var base64 = Convert.ToBase64String(fileBytes); @@ -222,11 +221,12 @@ namespace CompanyManagment.EFCore.Repository SalaryAidDateTimeGe = s.SalaryAidDateTime }).ToList(), - LateToWorkValue = x.LateToWorkValue == TimeSpan.Zero ? "-" : $"{(int)x.LateToWorkValue.TotalHours}:{x.LateToWorkValue.Minutes:D2}", + LateToWorkValue = x.LateToWorkValue == TimeSpan.Zero ? "-" : $"{(int)x.LateToWorkValue.TotalHours}:{Convert.ToInt32(x.LateToWorkValue.TotalMinutes % 60):00}", + SettingSalary = x.SettingSalary.ToMoney(), DailyWage = x.DailyWage.ToMoney(), ShiftStatus = x.ShiftStatus, - EmployeePicture = employeePictures.FirstOrDefault(p => p.Id == x.EmployeeId).Picture ?? "", + }).ToList(); List workshopsList = workshopsQuery.Select(x => new WorkshopViewModel @@ -279,6 +279,9 @@ namespace CompanyManagment.EFCore.Repository foreach (var checkout in customizeCheckoutsList) { + checkout.EmployeePicture = + employeePictures.FirstOrDefault(p => p.Id == checkout.EmployeeId).Picture ?? ""; + checkout.PrintCounter = counter++; //var leftwork = leftWorksList.FirstOrDefault(x => checkout.WorkshopId == x.WorkshopId && x.EmployeeId == checkout.EmployeeId); diff --git a/ServiceHost/Faces/170/5976/1.jpg b/ServiceHost/Faces/170/5976/1.jpg deleted file mode 100644 index 6b22b9aa..00000000 Binary files a/ServiceHost/Faces/170/5976/1.jpg and /dev/null differ diff --git a/ServiceHost/Faces/170/5976/2.jpg b/ServiceHost/Faces/170/5976/2.jpg deleted file mode 100644 index 921141e8..00000000 Binary files a/ServiceHost/Faces/170/5976/2.jpg and /dev/null differ diff --git a/ServiceHost/Faces/170/5976/Thumbnail.jpg b/ServiceHost/Faces/170/5976/Thumbnail.jpg deleted file mode 100644 index ffdce672..00000000 Binary files a/ServiceHost/Faces/170/5976/Thumbnail.jpg and /dev/null differ