Shifty/shifty-backend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix total amount of extra hours in report

Browse source
This commit is contained in:
Simon Goller 2024-06-26 20:44:20 +02:00
parent 56fe23f8bc
commit 036551ba39
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
service_impl/src/reporting.rs
View file

@ -178,9 +178,10 @@ where
.sum();
let extra_hours = self
.extra_hours_dao
.find_by_sales_person_id_and_year(paid_employee.id, year, until_week)
.find_by_sales_person_id_and_year(paid_employee.id, year)
.await?
.iter()
.filter(|eh| eh.date_time.iso_week() <= until_week)
.map(|eh| eh.amount)
.sum::<f32>();
let balance_hours = shiftplan_hours + extra_hours - planned_hours;
@ -221,7 +222,7 @@ where
.await?;
let extra_hours = self
.extra_hours_dao
.find_by_sales_person_id_and_year(*sales_person_id, year, until_week)
.find_by_sales_person_id_and_year(*sales_person_id, year)
.await?;
let planned_hours: f32 = (1..=until_week)
@ -232,7 +233,11 @@ where
})
.sum();
let shiftplan_hours = shiftplan_report.iter().map(|r| r.hours).sum::<f32>() as f32;
let overall_extra_hours = extra_hours.iter().map(|eh| eh.amount).sum::<f32>();
let overall_extra_hours = extra_hours
.iter()
.filter(|eh| eh.date_time.iso_week() <= until_week)
.map(|eh| eh.amount)
.sum::<f32>();
let employee_report = EmployeeReport {
sales_person: Arc::new(sales_person),