Add 52-week planting calendar with month fallback
Add indoor_sowing_weeks, direct_sowing_weeks, transplanting_weeks, glasshouse_weeks, harvesting_weeks (integer[]) to backend Cultivar and CreateCultivar structs with INSERT/UPDATE SQL bindings. Frontend PlantingCalendar component rewritten as a compact 52-column Gantt-style grid grouped by month headers. Prefers week data when available, falls back to expanding month data into week ranges. Calendar displayed full-width on cultivar detail page with color legend.
This commit is contained in:
@@ -1,51 +1,105 @@
|
||||
use dioxus::prelude::*;
|
||||
|
||||
const MONTH_LABELS: [&str; 12] = ["J", "F", "M", "A", "M", "J", "J", "A", "S", "O", "N", "D"];
|
||||
/// Month boundaries as week ranges (approximate ISO weeks).
|
||||
/// Jan=1-4, Feb=5-8, Mar=9-13, Apr=14-17, May=18-22, Jun=23-26,
|
||||
/// Jul=27-30, Aug=31-35, Sep=36-39, Oct=40-44, Nov=45-48, Dec=49-52
|
||||
const MONTH_WEEK_RANGES: [(u8, u8); 12] = [
|
||||
(1, 4), (5, 8), (9, 13), (14, 17), (18, 22), (23, 26),
|
||||
(27, 30), (31, 35), (36, 39), (40, 44), (45, 48), (49, 52),
|
||||
];
|
||||
|
||||
const MONTH_LABELS: [&str; 12] = [
|
||||
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
|
||||
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
|
||||
];
|
||||
|
||||
/// Expand month data (1-12) into week numbers (1-52) for fallback.
|
||||
fn months_to_weeks(months: &Option<Vec<i32>>) -> Option<Vec<i32>> {
|
||||
let m = months.as_ref()?;
|
||||
if m.is_empty() { return None; }
|
||||
let mut weeks = Vec::new();
|
||||
for &month in m {
|
||||
if month >= 1 && month <= 12 {
|
||||
let (start, end) = MONTH_WEEK_RANGES[(month - 1) as usize];
|
||||
for w in start..=end {
|
||||
weeks.push(w as i32);
|
||||
}
|
||||
}
|
||||
}
|
||||
weeks.sort();
|
||||
weeks.dedup();
|
||||
Some(weeks)
|
||||
}
|
||||
|
||||
/// Resolve: prefer week data, fall back to expanding month data.
|
||||
fn resolve_weeks(weeks: &Option<Vec<i32>>, months: &Option<Vec<i32>>) -> Option<Vec<i32>> {
|
||||
if let Some(w) = weeks {
|
||||
if !w.is_empty() {
|
||||
return Some(w.clone());
|
||||
}
|
||||
}
|
||||
months_to_weeks(months)
|
||||
}
|
||||
|
||||
#[component]
|
||||
pub fn PlantingCalendar(
|
||||
indoor_sowing: Option<Vec<i32>>,
|
||||
direct_sowing: Option<Vec<i32>>,
|
||||
transplanting: Option<Vec<i32>>,
|
||||
glasshouse: Option<Vec<i32>>,
|
||||
harvesting: Option<Vec<i32>>,
|
||||
indoor_sowing_months: Option<Vec<i32>>,
|
||||
direct_sowing_months: Option<Vec<i32>>,
|
||||
transplanting_months: Option<Vec<i32>>,
|
||||
glasshouse_months: Option<Vec<i32>>,
|
||||
harvesting_months: Option<Vec<i32>>,
|
||||
indoor_sowing_weeks: Option<Vec<i32>>,
|
||||
direct_sowing_weeks: Option<Vec<i32>>,
|
||||
transplanting_weeks: Option<Vec<i32>>,
|
||||
glasshouse_weeks: Option<Vec<i32>>,
|
||||
harvesting_weeks: Option<Vec<i32>>,
|
||||
) -> Element {
|
||||
let rows: Vec<(&str, &str, &Option<Vec<i32>>)> = vec![
|
||||
("Indoor Sowing", "cal-indoor", &indoor_sowing),
|
||||
("Direct Sowing", "cal-direct", &direct_sowing),
|
||||
("Transplanting", "cal-transplant", &transplanting),
|
||||
("Glasshouse", "cal-glass", &glasshouse),
|
||||
("Harvesting", "cal-harvest", &harvesting),
|
||||
let rows: Vec<(&str, &str, Option<Vec<i32>>)> = vec![
|
||||
("Indoor Sowing", "cal-indoor", resolve_weeks(&indoor_sowing_weeks, &indoor_sowing_months)),
|
||||
("Direct Sowing", "cal-direct", resolve_weeks(&direct_sowing_weeks, &direct_sowing_months)),
|
||||
("Transplanting", "cal-transplant", resolve_weeks(&transplanting_weeks, &transplanting_months)),
|
||||
("Glasshouse", "cal-glass", resolve_weeks(&glasshouse_weeks, &glasshouse_months)),
|
||||
("Harvesting", "cal-harvest", resolve_weeks(&harvesting_weeks, &harvesting_months)),
|
||||
];
|
||||
|
||||
// Check if any data exists
|
||||
let has_data = rows.iter().any(|(_, _, months)| months.is_some());
|
||||
let has_data = rows.iter().any(|(_, _, w)| w.is_some());
|
||||
if !has_data {
|
||||
return rsx! { p { class: "empty", "No planting calendar data." } };
|
||||
}
|
||||
|
||||
rsx! {
|
||||
div { class: "planting-calendar",
|
||||
// Header row with month labels
|
||||
div { class: "cal-row cal-header",
|
||||
div { class: "cal-label" }
|
||||
for label in MONTH_LABELS.iter() {
|
||||
div { class: "cal-cell", "{label}" }
|
||||
div { class: "planting-calendar week-calendar",
|
||||
// Month header spanning groups of weeks
|
||||
div { class: "wcal-month-row",
|
||||
div { class: "wcal-label" }
|
||||
for (i, label) in MONTH_LABELS.iter().enumerate() {
|
||||
{
|
||||
let (start, end) = MONTH_WEEK_RANGES[i];
|
||||
let span = (end - start + 1) as usize;
|
||||
rsx! {
|
||||
div {
|
||||
class: "wcal-month-header",
|
||||
style: "grid-column: span {span};",
|
||||
"{label}"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// Data rows
|
||||
for (name, class, months) in rows.iter() {
|
||||
if months.is_some() {
|
||||
div { class: "cal-row",
|
||||
div { class: "cal-label", "{name}" }
|
||||
for month in 1..=12i32 {
|
||||
for (name, class, weeks) in rows.iter() {
|
||||
if weeks.is_some() {
|
||||
div { class: "wcal-row",
|
||||
div { class: "wcal-label", "{name}" }
|
||||
for week in 1..=52i32 {
|
||||
{
|
||||
let active = months.as_ref()
|
||||
.map(|m| m.contains(&month))
|
||||
let active = weeks.as_ref()
|
||||
.map(|w| w.contains(&week))
|
||||
.unwrap_or(false);
|
||||
rsx! {
|
||||
div {
|
||||
class: if active { format!("cal-cell {class} active") } else { "cal-cell".to_string() },
|
||||
class: if active { format!("wcal-cell {class} active") } else { "wcal-cell".to_string() },
|
||||
title: "W{week}",
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -53,6 +107,29 @@ pub fn PlantingCalendar(
|
||||
}
|
||||
}
|
||||
}
|
||||
// Legend
|
||||
div { class: "wcal-legend",
|
||||
div { class: "wcal-legend-item",
|
||||
div { class: "wcal-legend-swatch cal-indoor" }
|
||||
span { "Indoor Sowing" }
|
||||
}
|
||||
div { class: "wcal-legend-item",
|
||||
div { class: "wcal-legend-swatch cal-direct" }
|
||||
span { "Direct Sowing" }
|
||||
}
|
||||
div { class: "wcal-legend-item",
|
||||
div { class: "wcal-legend-swatch cal-transplant" }
|
||||
span { "Transplanting" }
|
||||
}
|
||||
div { class: "wcal-legend-item",
|
||||
div { class: "wcal-legend-swatch cal-glass" }
|
||||
span { "Glasshouse" }
|
||||
}
|
||||
div { class: "wcal-legend-item",
|
||||
div { class: "wcal-legend-swatch cal-harvest" }
|
||||
span { "Harvesting" }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ use uuid::Uuid;
|
||||
|
||||
use crate::api;
|
||||
use crate::app::{Lang, Route};
|
||||
use crate::components::planting_calendar::PlantingCalendar;
|
||||
use crate::components::table_controls::*;
|
||||
use crate::i18n::{pick_desc, pick_name};
|
||||
|
||||
@@ -378,6 +379,25 @@ pub fn CultivarDetail(slug: String) -> Element {
|
||||
p { class: "name-common", "{common_name}" }
|
||||
}
|
||||
|
||||
// Week-based planting calendar (full width)
|
||||
div { class: "detail-card", style: "margin-top: 1.25rem;",
|
||||
div { class: "detail-card-header", "Planting Calendar" }
|
||||
div { style: "padding: 0.75rem;",
|
||||
PlantingCalendar {
|
||||
indoor_sowing_months: c.indoor_sowing_months.clone(),
|
||||
direct_sowing_months: c.direct_sowing_months.clone(),
|
||||
transplanting_months: c.transplanting_months.clone(),
|
||||
glasshouse_months: c.glasshouse_months.clone(),
|
||||
harvesting_months: c.harvesting_months.clone(),
|
||||
indoor_sowing_weeks: c.indoor_sowing_weeks.clone(),
|
||||
direct_sowing_weeks: c.direct_sowing_weeks.clone(),
|
||||
transplanting_weeks: c.transplanting_weeks.clone(),
|
||||
glasshouse_weeks: c.glasshouse_weeks.clone(),
|
||||
harvesting_weeks: c.harvesting_weeks.clone(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
div { class: "detail-row",
|
||||
// === LEFT COLUMN ===
|
||||
div { class: "detail-col",
|
||||
|
||||
@@ -117,6 +117,11 @@ pub struct Cultivar {
|
||||
pub transplanting_months: Option<Vec<i32>>,
|
||||
pub glasshouse_months: Option<Vec<i32>>,
|
||||
pub harvesting_months: Option<Vec<i32>>,
|
||||
pub indoor_sowing_weeks: Option<Vec<i32>>,
|
||||
pub direct_sowing_weeks: Option<Vec<i32>>,
|
||||
pub transplanting_weeks: Option<Vec<i32>>,
|
||||
pub glasshouse_weeks: Option<Vec<i32>>,
|
||||
pub harvesting_weeks: Option<Vec<i32>>,
|
||||
pub succession_planting_days: Option<i32>,
|
||||
pub planting_notes: Option<String>,
|
||||
pub propagation_methods: Option<Vec<String>>,
|
||||
|
||||
Reference in New Issue
Block a user