From df08a68942712549fd4fa57cef76c7fe93dd30e2 Mon Sep 17 00:00:00 2001 From: SamSys Date: Sat, 19 Oct 2024 21:13:01 +0330 Subject: [PATCH] rollCall reports bug fixed --- CompanyManagment.EFCore/Repository/RollCallRepository.cs | 8 ++++---- ServiceHost/appsettings.Development.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CompanyManagment.EFCore/Repository/RollCallRepository.cs b/CompanyManagment.EFCore/Repository/RollCallRepository.cs index ebe87160..baf12c86 100644 --- a/CompanyManagment.EFCore/Repository/RollCallRepository.cs +++ b/CompanyManagment.EFCore/Repository/RollCallRepository.cs @@ -95,7 +95,7 @@ public class RollCallRepository : RepositoryBase, IRollCallRepos { StartDate = x.StartDate, EndDate = x.EndDate, - TotalWorkingHours = $"{(int)x.TotalhourseSpan.TotalHours}:{(int)x.TotalhourseSpan.Minutes}", + TotalWorkingHours = $"{(int)x.TotalhourseSpan.TotalHours}:{(x.TotalhourseSpan.Minutes):00}", DayOfWeek = x.DayOfWeek, RollCallDateFa = x.RollCallDateFa, DateTimeGr = x.DateTimeGr, @@ -237,7 +237,7 @@ public class RollCallRepository : RepositoryBase, IRollCallRepos IsHoliday = _holidayItemApplication.IsHoliday(x.DateGr), IsAbsent = !x.RollCallTimesList.Any(), RollCallTimesList = x.RollCallTimesList, - TotalWorkingHours = $"{(int)x.TotalWorkingHoursSpan.TotalHours}:{(int)x.TotalWorkingHoursSpan.Minutes}", + TotalWorkingHours = $"{(int)x.TotalWorkingHoursSpan.TotalHours}:{(x.TotalWorkingHoursSpan.Minutes):00}", }).ToList(); return new EmployeeRollCallsByMonthViewModel() { @@ -362,7 +362,7 @@ public class RollCallRepository : RepositoryBase, IRollCallRepos HasLeave = x.HasLeave, IsAbsent = x.IsAbsent, PersonnelCode = x.PersonnelCode, - TotalWorkingHours = $"{(int)x.TotalWorkingHoursSpan.TotalHours}:{(int)x.TotalWorkingHoursSpan.Minutes}", + TotalWorkingHours = $"{(int)x.TotalWorkingHoursSpan.TotalHours}:{(x.TotalWorkingHoursSpan.Minutes):00}", }); return result; } @@ -446,7 +446,7 @@ public class RollCallRepository : RepositoryBase, IRollCallRepos EmployeeFullName = x.EmployeeFullName, EmployeeId = x.EmployeeId, TotalWorkingHours = - $"{(int)x.TotalWorkingHoursSpan.TotalHours}:{(int)x.TotalWorkingHoursSpan.Minutes}", + $"{(int)x.TotalWorkingHoursSpan.TotalHours}:{(x.TotalWorkingHoursSpan.Minutes):00}", RollCallTimesList = x.RollCallTimesList }).ToList(); diff --git a/ServiceHost/appsettings.Development.json b/ServiceHost/appsettings.Development.json index 8033ae18..54dc7c80 100644 --- a/ServiceHost/appsettings.Development.json +++ b/ServiceHost/appsettings.Development.json @@ -15,7 +15,7 @@ //"MesbahDb": "Data Source=171.22.24.15;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]is[3019]#@ATt;TrustServerCertificate=true;" //local - "MesbahDb": "Data Source=.;Initial Catalog=Mesbah_db;Integrated Security=True;TrustServerCertificate=true;" + "MesbahDb": "Data Source=.;Initial Catalog=Mesbah_db;Integrated Security=True;TrustServerCertificate=true;" }, "GoogleRecaptchaV3": { "SiteKey": "6Lfhp_AnAAAAAB79WkrMoHd1k8ir4m8VvfjE7FTH",