From 784b7cea4e4f8c9f1a1199a552781fb3fe9331bc Mon Sep 17 00:00:00 2001 From: Max Hohlfeld Date: Mon, 9 Jun 2025 18:47:16 +0200 Subject: [PATCH] fix: export for area manager --- web/src/endpoints/export/get_events_data.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/web/src/endpoints/export/get_events_data.rs b/web/src/endpoints/export/get_events_data.rs index 13498253..3b9c8dd2 100644 --- a/web/src/endpoints/export/get_events_data.rs +++ b/web/src/endpoints/export/get_events_data.rs @@ -15,7 +15,7 @@ use crate::{ struct ExportQuery { start: NaiveDate, end: NaiveDate, - area: i32, + area: Option, } #[derive(PartialEq)] @@ -131,10 +131,12 @@ pub async fn get( return Err(ApplicationError::Unauthorized); } + let area = query.area.unwrap_or(user.area_id); + let rows_to_export = ExportEventRow::read_all_for_timerange_and_area( pool.get_ref(), (query.start, query.end), - query.area, + area, ) .await?; let entries = read(rows_to_export); @@ -154,10 +156,10 @@ pub async fn get( "Fkt", "Reserve", ]; - worksheet.write_row(2, 0, HEADER).unwrap(); + worksheet.write_row(0, 0, HEADER).unwrap(); for (i, entry) in entries.iter().enumerate() { - let i = (i + 3) as u32; + let i = (i + 1) as u32; worksheet.write(i, 0, &entry.date).unwrap(); worksheet.write(i, 1, &entry.weekday).unwrap();