diff --git a/Cargo.lock b/Cargo.lock index daf340f..b1d2542 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -252,6 +252,7 @@ dependencies = [ "tower-sessions", "tower-sessions-sqlx-store", "wasm-bindgen", + "web-sys", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 0a33ba7..859cefe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,6 +26,7 @@ chrono = { version = "0.4", default-features = false, features = ["clock", "serd # Client (WASM) console_error_panic_hook = { version = "0.1", optional = true } wasm-bindgen = { version = "=0.2.128", optional = true } +web-sys = { version = "0.3", features = ["Storage"] } # Serveur uniquement axum = { version = "0.8", optional = true } diff --git a/src/components.rs b/src/components.rs index 95a85bb..694aa73 100644 --- a/src/components.rs +++ b/src/components.rs @@ -143,10 +143,22 @@ pub fn LastRainfalls(#[prop(into)] reload: Signal) -> impl IntoView { } } -/// Chiffres clés et comparaison mois par mois avec l'an dernier (page d'accueil). +/// Chiffres clés et comparaison mois par mois avec les années précédentes (page d'accueil). #[component] pub fn YearOverview(#[prop(into)] reload: Signal) -> impl IntoView { - let summary = Resource::new(move || reload.get(), |_| rainfall::last_months()); + let show_table = RwSignal::new(false); + let years_back = RwSignal::new(1u32); + // Lus après l'hydratation, pour que le rendu serveur et le premier rendu client concordent. + Effect::new(move |_| { + show_table.set(stored(MONTHLY_VIEW_KEY).is_some_and(|view| view == "table")); + if let Some(n) = stored(YEARS_BACK_KEY).and_then(|n| n.parse().ok()) { + years_back.set(n); + } + }); + let summary = Resource::new( + move || (reload.get(), years_back.get()), + |(_, years_back)| rainfall::last_months(years_back), + ); let last = Resource::new(move || reload.get(), |_| rainfall::list_rainfalls(1)); view! { ) -> impl IntoView { summary .get() .map(|result| match result { - Ok(summary) => view! { }.into_any(), + Ok(summary) => view! { }.into_any(), Err(e) => view! { }.into_any(), }) }} @@ -172,11 +184,36 @@ pub fn YearOverview(#[prop(into)] reload: Signal) -> impl IntoView { } } +/// Couleurs des séries, de l'année en cours à la plus ancienne (ordre fixe : une année +/// garde sa couleur quand on en ajoute ou en retire). +const SERIES_COLORS: [&str; 8] = [ + "bg-chart-1", + "bg-chart-2", + "bg-chart-3", + "bg-chart-4", + "bg-chart-5", + "bg-chart-6", + "bg-chart-7", + "bg-chart-8", +]; + #[component] -fn Overview(summary: MonthlySummary, last: Option) -> impl IntoView { +fn Overview( + summary: MonthlySummary, + last: Option, + show_table: RwSignal, + years_back: RwSignal, +) -> impl IntoView { let year = summary.current_year; let month = rainfall::today().month(); let this_month = summary.rows.iter().find(|r| r.month == month).cloned(); + let first_year = summary.first_year; + let shown_years_back = summary.total_previous.len() as u32; + // On ne remonte pas avant la première mesure. + let max_years_back = summary + .first_year + .map_or(1, |first| (year - first).max(1) as u32) + .min(rainfall::MAX_YEARS_BACK); let difference = summary.total_current - summary.total_previous_to_date; let year_detail = format!( @@ -187,23 +224,21 @@ fn Overview(summary: MonthlySummary, last: Option) -> impl I format_number(difference), ); - let series = vec![ - Series { - name: year.to_string(), - color: "bg-chart-1", - }, - Series { - name: (year - 1).to_string(), - color: "bg-chart-2", - }, - ]; + let series = (0..=summary.total_previous.len()) + .map(|back| Series { + name: (year - back as i32).to_string(), + color: SERIES_COLORS[back], + }) + .collect::>(); let columns = summary .rows .iter() .map(|row| Column { label: month_short(row.month).to_string(), title: Some(row.label.clone()), - values: vec![row.current, Some(row.previous)], + values: std::iter::once(row.current) + .chain(row.previous.iter().copied().map(Some)) + .collect(), }) .collect::>(); @@ -224,7 +259,7 @@ fn Overview(summary: MonthlySummary, last: Option) -> impl I unit="mm" detail=format!( "{} mm en {} {}", - format_number(this_month.map(|r| r.previous).unwrap_or(0)), + format_number(this_month.map(|r| r.previous[0]).unwrap_or(0)), month_name(month).to_lowercase(), year - 1, ) @@ -252,57 +287,175 @@ fn Overview(summary: MonthlySummary, last: Option) -> impl I }} - - -
- - - "Voir le tableau" - - -
+ }> + }> + + +
+ + {first_year.map(|first| format!("Mesures depuis {first}"))} + + +
} } +/// Clés localStorage de « Mois par mois » : mode d'affichage et nombre d'années précédentes. +const MONTHLY_VIEW_KEY: &str = "bermite.monthly-view"; +const YEARS_BACK_KEY: &str = "bermite.monthly-years-back"; + +fn local_storage() -> Option { + window().local_storage().ok().flatten() +} + +fn stored(key: &str) -> Option { + local_storage()?.get_item(key).ok().flatten() +} + +fn store(key: &str, value: &str) { + if let Some(storage) = local_storage() { + let _ = storage.set_item(key, value); + } +} + +/// Boutons − / + pour retirer ou ajouter une année précédente. `current` : nombre +/// d'années affichées (celui demandé, borné par le serveur). +#[component] +fn YearsBackStepper(years_back: RwSignal, current: u32, max: u32) -> impl IntoView { + let step = move |delta: i32| { + let n = (current as i32 + delta).clamp(1, max as i32) as u32; + years_back.set(n); + store(YEARS_BACK_KEY, &n.to_string()); + }; + let button = "flex size-7 cursor-pointer items-center justify-center rounded-md border border-slate-200 text-slate-600 transition hover:bg-slate-50 hover:text-slate-900 disabled:cursor-not-allowed disabled:opacity-40 disabled:hover:bg-transparent dark:border-slate-700 dark:text-slate-300 dark:hover:bg-slate-800 dark:hover:text-white"; + view! { +
+ "Années précédentes" + + + {current} + + +
+ } +} + +/// Contrôle segmenté graphique / tableau ; le choix est mémorisé dans le navigateur. +#[component] +fn ViewSwitch(show_table: RwSignal) -> impl IntoView { + let segment = |active: bool| { + format!( + "flex size-7 cursor-pointer items-center justify-center rounded-md transition {}", + if active { + "bg-white text-slate-900 shadow-sm dark:bg-slate-700 dark:text-white" + } else { + "text-slate-500 hover:text-slate-900 dark:text-slate-400 dark:hover:text-white" + } + ) + }; + view! { +
+ + +
+ } +} + #[component] fn MonthTable(summary: MonthlySummary) -> impl IntoView { let year = summary.current_year; + let years = (1..=summary.total_previous.len() as i32).map(|back| year - back); view! { - - - - - - - - - - {summary - .rows - .into_iter() - .map(|row| { - view! { - - - - - - } - }) - .collect_view()} - - - - - - - - -
"Mois"{year}{year - 1}
{row.label}{row.current.map(|v| format!("{v} mm"))}{row.previous} " mm"
"Total"{format_number(summary.total_current)} " mm"{format_number(summary.total_previous)} " mm"
- {summary - .first_year - .map(|first| view! {

"Mesures depuis " {first}

})} +
+ + + + + + {years.map(|y| view! { }).collect_view()} + + + + {summary + .rows + .into_iter() + .map(|row| { + view! { + + + + {row + .previous + .into_iter() + .map(|v| view! { }) + .collect_view()} + + } + }) + .collect_view()} + + + + + + {summary + .total_previous + .into_iter() + .map(|v| { + view! { } + }) + .collect_view()} + + +
"Mois"{year}{y}
{row.label} + {row.current.map(|v| format!("{v} mm"))} + {v} " mm"
"Total"{format_number(summary.total_current)} " mm"{format_number(v)} " mm"
+
} } diff --git a/src/icons.rs b/src/icons.rs index c6ae246..8165310 100644 --- a/src/icons.rs +++ b/src/icons.rs @@ -9,6 +9,7 @@ pub enum IconName { CloudSun, User, Plus, + Minus, Trash, Pencil, Check, @@ -23,6 +24,8 @@ pub enum IconName { ArrowRight, ChevronDown, Calendar, + ChartColumn, + Table, } impl IconName { @@ -69,10 +72,17 @@ impl IconName { r#""# } IconName::ArrowRight => r#""#, + IconName::Minus => r#""#, IconName::ChevronDown => r#""#, IconName::Calendar => { r#""# } + IconName::ChartColumn => { + r#""# + } + IconName::Table => { + r#""# + } } } } diff --git a/src/rainfall.rs b/src/rainfall.rs index b804a05..5e7cefe 100644 --- a/src/rainfall.rs +++ b/src/rainfall.rs @@ -189,21 +189,39 @@ pub async fn graph_data( Ok(graph::group(start, end, period, &daily)) } -/// Cumuls mensuels de l'année en cours et de la précédente (page d'accueil). +/// Nombre maximal d'années précédentes affichées sur l'accueil (une couleur de série +/// chacune, en plus de l'année en cours). +pub const MAX_YEARS_BACK: u32 = 7; + +/// Cumuls mensuels de l'année en cours et des `years_back` précédentes (page d'accueil). #[server] -pub async fn last_months() -> Result { +pub async fn last_months(years_back: u32) -> Result { use chrono::Datelike; use std::collections::HashMap; let user_id = server::require_user_id().await?; let pool = server::pool()?; let today = today(); + let first_year: Option = sqlx::query_scalar::<_, Option>( + "SELECT MIN(date) FROM rainfalls WHERE user_id = ?1", + ) + .bind(user_id) + .fetch_one(&pool) + .await + .map_err(server::internal_error)? + .and_then(|date| date.get(..4)?.parse().ok()); + // Pas plus loin que la première mesure. + let years_back = first_year + .map_or(1, |first| (today.year() - first).max(1) as u32) + .min(MAX_YEARS_BACK) + .min(years_back) + .max(1); let rows = sqlx::query_as::<_, (String, i64)>( "SELECT substr(date, 1, 7) AS month, SUM(value) FROM rainfalls \ WHERE user_id = ?1 AND date >= ?2 GROUP BY month", ) .bind(user_id) - .bind(format!("{}-01-01", today.year() - 1)) + .bind(format!("{}-01-01", today.year() - years_back as i32)) .fetch_all(&pool) .await .map_err(server::internal_error)?; @@ -215,16 +233,7 @@ pub async fn last_months() -> Result { }) .collect(); - let first_year = sqlx::query_scalar::<_, Option>( - "SELECT MIN(date) FROM rainfalls WHERE user_id = ?1", - ) - .bind(user_id) - .fetch_one(&pool) - .await - .map_err(server::internal_error)? - .and_then(|date| date.get(..4)?.parse().ok()); - - Ok(graph::monthly_summary(today, &sums, first_year)) + Ok(graph::monthly_summary(today, &sums, first_year, years_back)) } #[cfg(test)] diff --git a/src/rainfall/graph.rs b/src/rainfall/graph.rs index aefa696..3baa0d2 100644 --- a/src/rainfall/graph.rs +++ b/src/rainfall/graph.rs @@ -149,7 +149,8 @@ pub struct MonthRow { pub label: String, /// Cumul de l'année en cours ; `None` pour les mois pas encore commencés. pub current: Option, - pub previous: i64, + /// Cumuls des années précédentes, de l'an dernier à la plus ancienne demandée. + pub previous: Vec, } #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] @@ -157,38 +158,45 @@ pub struct MonthlySummary { pub current_year: i32, pub rows: Vec, pub total_current: i64, - pub total_previous: i64, + /// Totaux des années précédentes, dans l'ordre de `MonthRow::previous`. + pub total_previous: Vec, /// Cumul de l'an dernier sur les mêmes mois (janvier au mois en cours inclus). pub total_previous_to_date: i64, /// Année de la plus ancienne mesure. pub first_year: Option, } -/// Port de `RainfallController::lastMonths` : de janvier de l'an dernier au mois en cours. -/// `sums` associe (année, mois) au cumul du mois. +/// Port de `RainfallController::lastMonths`, étendu à `years_back` années précédentes +/// (au moins une). `sums` associe (année, mois) au cumul du mois. pub fn monthly_summary( today: NaiveDate, sums: &HashMap<(i32, u32), i64>, first_year: Option, + years_back: u32, ) -> MonthlySummary { let year = today.year(); + let years_back = years_back.max(1) as i32; let rows: Vec = (1..=12) .map(|month| MonthRow { month, label: month_name(month).to_string(), current: (month <= today.month()) .then(|| sums.get(&(year, month)).copied().unwrap_or(0)), - previous: sums.get(&(year - 1, month)).copied().unwrap_or(0), + previous: (1..=years_back) + .map(|back| sums.get(&(year - back, month)).copied().unwrap_or(0)) + .collect(), }) .collect(); MonthlySummary { current_year: year, total_current: rows.iter().filter_map(|r| r.current).sum(), - total_previous: rows.iter().map(|r| r.previous).sum(), + total_previous: (0..years_back as usize) + .map(|i| rows.iter().map(|r| r.previous[i]).sum()) + .collect(), total_previous_to_date: rows .iter() .filter(|r| r.current.is_some()) - .map(|r| r.previous) + .map(|r| r.previous[0]) .sum(), rows, first_year, @@ -330,7 +338,7 @@ mod tests { ((2022, 1), 6), ((2022, 12), 8), ]); - let summary = monthly_summary(d("2023-03-14"), &sums, Some(2021)); + let summary = monthly_summary(d("2023-03-14"), &sums, Some(2021), 1); assert_eq!(summary.current_year, 2023); assert_eq!(summary.rows.len(), 12); assert_eq!( @@ -339,15 +347,30 @@ mod tests { month: 1, label: "Janvier".into(), current: Some(15), - previous: 6 + previous: vec![6] } ); assert_eq!(summary.rows[1].current, Some(0)); assert_eq!(summary.rows[3].current, None, "avril n'a pas commencé"); - assert_eq!(summary.rows[11].previous, 8); + assert_eq!(summary.rows[11].previous, vec![8]); assert_eq!(summary.total_current, 25); - assert_eq!(summary.total_previous, 14); + assert_eq!(summary.total_previous, vec![14]); assert_eq!(summary.total_previous_to_date, 6); assert_eq!(summary.first_year, Some(2021)); } + + #[test] + fn monthly_summary_covers_older_years() { + let sums = HashMap::from([ + ((2023, 1), 15), + ((2022, 1), 6), + ((2021, 1), 4), + ((2021, 5), 9), + ]); + let summary = monthly_summary(d("2023-03-14"), &sums, Some(2021), 2); + assert_eq!(summary.rows[0].previous, vec![6, 4]); + assert_eq!(summary.rows[4].previous, vec![0, 9]); + assert_eq!(summary.total_previous, vec![6, 13]); + assert_eq!(summary.total_previous_to_date, 6); + } } diff --git a/src/ui.rs b/src/ui.rs index 6faa348..a60e8cd 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -73,11 +73,13 @@ pub fn Page( } } -/// Carte : surface blanche arrondie, avec un titre et une icône facultatifs. +/// Carte : surface blanche arrondie, avec un titre, une icône et une action (à droite du +/// titre) facultatifs. #[component] pub fn Card( #[prop(optional)] title: Option<&'static str>, #[prop(optional)] icon: Option, + #[prop(optional, into)] action: Option, #[prop(optional, into)] class: String, children: Children, ) -> impl IntoView { @@ -86,17 +88,20 @@ pub fn Card( {title .map(|title| { view! { -

- {icon - .map(|icon| { - view! { - - - - } - })} - {title} -

+
+

+ {icon + .map(|icon| { + view! { + + + + } + })} + {title} +

+ {action.map(|action| action.run())} +
} })} {children()} diff --git a/style/tailwind.css b/style/tailwind.css index af9508d..f297f84 100644 --- a/style/tailwind.css +++ b/style/tailwind.css @@ -24,6 +24,12 @@ /* Séries des graphiques (palette validée en clair et en sombre, daltonisme compris). */ --color-chart-1: #2a78d6; --color-chart-2: #eb6834; + --color-chart-3: #1baf7a; + --color-chart-4: #eda100; + --color-chart-5: #e87ba4; + --color-chart-6: #008300; + --color-chart-7: #6250d6; + --color-chart-8: #e34948; } @layer base { @@ -41,11 +47,23 @@ :root[data-theme="dark"] { --color-chart-1: #3987e5; --color-chart-2: #d95926; + --color-chart-3: #199e70; + --color-chart-4: #c98500; + --color-chart-5: #d55181; + --color-chart-6: #008300; + --color-chart-7: #9085e9; + --color-chart-8: #e66767; } @media (prefers-color-scheme: dark) { :root:where(:not([data-theme="light"])) { --color-chart-1: #3987e5; --color-chart-2: #d95926; + --color-chart-3: #199e70; + --color-chart-4: #c98500; + --color-chart-5: #d55181; + --color-chart-6: #008300; + --color-chart-7: #9085e9; + --color-chart-8: #e66767; } }