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

rollCall reports bug fixed

Browse Source
This commit is contained in:
SamSys
2024-10-19 21:13:01 +03:30
parent 66ac0743d6
commit df08a68942
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CompanyManagment.EFCore/Repository/RollCallRepository.cs
View File

@@ -95,7 +95,7 @@ public class RollCallRepository : RepositoryBase<long, RollCall>, 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<long, RollCall>, 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<long, RollCall>, 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<long, RollCall>, 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();

2
ServiceHost/appsettings.Development.json
View File

@@ -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",