feat(calendar): "what's due this month" — dedicated screen + inventory filter
Reuses the existing per-variety crop-calendar masks (sow/transplant/ flowering/fruiting/seed-harvest) — no schema change, no migration — to answer "qué toca este mes" across the whole inventory. Since the months are the grower's own record, there's no hemisphere assumption. - Repo: CalendarEntry + watchCalendar() (varieties with any recorded phase); VarietyListItem now carries sowMonths. - Dedicated CalendarScreen (/calendar): a month strip (defaults to the current month, intl month names) and varieties grouped by phase — actions (sow/transplant/harvest seed) above informational (flowering/ fruiting), each tinted, tap → variety detail; empty-month state. - Inventory filter: a 'this month' chip (shown only when some variety has a calendar) keeps what sows in the current month; folded into the attributes group + clear-filters. - Entry points: a live Home card + a drawer item. - i18n calendar block + menu.calendar (en/es/pt/ast). - Tests: calendar_test (watchCalendar, list carries sow-months, pure filter), calendar_screen_test (phase grouping, month switch, empty), plus the screen added to the small-screen overflow guard.
This commit is contained in:
parent
28e8318026
commit
171daabce3
19 changed files with 681 additions and 5 deletions
|
|
@ -53,6 +53,15 @@ class AppDrawer extends StatelessWidget {
|
|||
context.push('/sales');
|
||||
},
|
||||
),
|
||||
// "What's due this month" — the aggregate crop calendar, offline.
|
||||
_DrawerItem(
|
||||
icon: const Icon(Icons.calendar_month),
|
||||
label: t.menu.calendar,
|
||||
onTap: () {
|
||||
Navigator.of(context).pop();
|
||||
context.push('/calendar');
|
||||
},
|
||||
),
|
||||
_DrawerItem(
|
||||
icon: const Icon(Symbols.storefront),
|
||||
label: t.menu.market,
|
||||
|
|
|
|||
247
apps/app_seeds/lib/ui/calendar_screen.dart
Normal file
247
apps/app_seeds/lib/ui/calendar_screen.dart
Normal file
|
|
@ -0,0 +1,247 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
|
||||
import '../app.dart' show materialLocaleFor;
|
||||
import '../data/variety_repository.dart';
|
||||
import '../domain/crop_calendar.dart';
|
||||
import '../i18n/strings.g.dart';
|
||||
import 'category_palette.dart';
|
||||
import 'theme.dart';
|
||||
|
||||
/// One crop-calendar phase as shown on the "this month" screen: its label,
|
||||
/// which month mask on a [CalendarEntry] it reads, an icon and a tint.
|
||||
class _Phase {
|
||||
const _Phase(this.label, this.maskOf, this.icon, this.color);
|
||||
final String Function(Translations t) label;
|
||||
final int? Function(CalendarEntry e) maskOf;
|
||||
final IconData icon;
|
||||
final Color color;
|
||||
}
|
||||
|
||||
// Actions first (sow / transplant / harvest seed), then the informational
|
||||
// phases (flowering / fruiting) — "qué toca hacer" above "qué está pasando".
|
||||
const _phases = <_Phase>[
|
||||
_Phase(_sowLabel, _sowMask, Icons.grass, Color(0xFF2F7D34)),
|
||||
_Phase(_transplantLabel, _transplantMask, Icons.spa, Color(0xFF3E7168)),
|
||||
_Phase(_harvestLabel, _harvestMask, Icons.grain, Color(0xFF8A6D1E)),
|
||||
_Phase(_floweringLabel, _floweringMask, Icons.local_florist, Color(0xFF9B5566)),
|
||||
_Phase(_fruitingLabel, _fruitingMask, Icons.eco, Color(0xFF9C5B3B)),
|
||||
];
|
||||
|
||||
String _sowLabel(Translations t) => t.cropCalendar.sow;
|
||||
String _transplantLabel(Translations t) => t.cropCalendar.transplant;
|
||||
String _harvestLabel(Translations t) => t.cropCalendar.seedHarvest;
|
||||
String _floweringLabel(Translations t) => t.cropCalendar.flowering;
|
||||
String _fruitingLabel(Translations t) => t.cropCalendar.fruiting;
|
||||
int? _sowMask(CalendarEntry e) => e.sowMonths;
|
||||
int? _transplantMask(CalendarEntry e) => e.transplantMonths;
|
||||
int? _harvestMask(CalendarEntry e) => e.seedHarvestMonths;
|
||||
int? _floweringMask(CalendarEntry e) => e.floweringMonths;
|
||||
int? _fruitingMask(CalendarEntry e) => e.fruitingMonths;
|
||||
|
||||
/// "What's due this month" across the whole inventory: a month strip plus the
|
||||
/// varieties whose recorded calendar has an action in the picked month, grouped
|
||||
/// by phase. Reuses the per-variety calendar data — no schema of its own.
|
||||
class CalendarScreen extends StatefulWidget {
|
||||
const CalendarScreen({this.initialMonth, super.key});
|
||||
|
||||
/// The month (1..12) to open on; defaults to the current month. Injected in
|
||||
/// tests so they don't depend on the wall clock.
|
||||
final int? initialMonth;
|
||||
|
||||
@override
|
||||
State<CalendarScreen> createState() => _CalendarScreenState();
|
||||
}
|
||||
|
||||
class _CalendarScreenState extends State<CalendarScreen> {
|
||||
late int _month = widget.initialMonth ?? DateTime.now().month;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final t = context.t;
|
||||
final repo = context.read<VarietyRepository>();
|
||||
return Scaffold(
|
||||
appBar: AppBar(title: Text(t.calendar.title)),
|
||||
body: Column(
|
||||
children: [
|
||||
_MonthStrip(
|
||||
month: _month,
|
||||
onSelect: (m) => setState(() => _month = m),
|
||||
),
|
||||
const Divider(height: 1),
|
||||
Expanded(
|
||||
child: StreamBuilder<List<CalendarEntry>>(
|
||||
stream: repo.watchCalendar(),
|
||||
builder: (context, snapshot) {
|
||||
final entries = snapshot.data ?? const <CalendarEntry>[];
|
||||
final sections = <Widget>[];
|
||||
for (final phase in _phases) {
|
||||
final matches = [
|
||||
for (final e in entries)
|
||||
if (maskHasMonth(phase.maskOf(e), _month)) e,
|
||||
];
|
||||
if (matches.isEmpty) continue;
|
||||
sections.add(_PhaseGroup(phase: phase, entries: matches));
|
||||
}
|
||||
if (sections.isEmpty) {
|
||||
return _EmptyMonth(monthName: _monthName(context, _month));
|
||||
}
|
||||
return ListView(
|
||||
padding: const EdgeInsets.only(bottom: 24),
|
||||
children: sections,
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// A horizontally scrolling strip of the twelve months; the picked one is
|
||||
/// filled. Scrolls the picked month into view on first build.
|
||||
class _MonthStrip extends StatelessWidget {
|
||||
const _MonthStrip({required this.month, required this.onSelect});
|
||||
|
||||
final int month;
|
||||
final ValueChanged<int> onSelect;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final locale = materialLocaleFor(Localizations.localeOf(context));
|
||||
final fmt = DateFormat.MMM(locale.toLanguageTag());
|
||||
return SizedBox(
|
||||
height: 56,
|
||||
child: ListView.separated(
|
||||
scrollDirection: Axis.horizontal,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
|
||||
itemCount: 12,
|
||||
separatorBuilder: (_, _) => const SizedBox(width: 8),
|
||||
itemBuilder: (context, i) {
|
||||
final m = i + 1;
|
||||
final selected = m == month;
|
||||
return ChoiceChip(
|
||||
key: Key('calendar.month.$m'),
|
||||
label: Text(_capitalise(fmt.format(DateTime(2000, m)))),
|
||||
selected: selected,
|
||||
onSelected: (_) => onSelect(m),
|
||||
selectedColor: seedPrimaryContainer,
|
||||
labelStyle: TextStyle(
|
||||
color: selected ? seedOnPrimaryContainer : seedMuted,
|
||||
fontWeight: selected ? FontWeight.w600 : FontWeight.w400,
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _PhaseGroup extends StatelessWidget {
|
||||
const _PhaseGroup({required this.phase, required this.entries});
|
||||
|
||||
final _Phase phase;
|
||||
final List<CalendarEntry> entries;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final t = context.t;
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.fromLTRB(16, 18, 16, 6),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(phase.icon, size: 20, color: phase.color),
|
||||
const SizedBox(width: 8),
|
||||
Text(
|
||||
phase.label(t),
|
||||
style: Theme.of(context).textTheme.titleMedium?.copyWith(
|
||||
fontWeight: FontWeight.w600,
|
||||
color: phase.color,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 6),
|
||||
Text('· ${entries.length}',
|
||||
style: const TextStyle(color: seedMuted)),
|
||||
],
|
||||
),
|
||||
),
|
||||
for (final e in entries) _CalendarRow(entry: e),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _CalendarRow extends StatelessWidget {
|
||||
const _CalendarRow({required this.entry});
|
||||
|
||||
final CalendarEntry entry;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final swatch = categorySwatch(entry.category ?? '');
|
||||
return ListTile(
|
||||
key: Key('calendar.entry.${entry.id}'),
|
||||
leading: CircleAvatar(
|
||||
radius: 20,
|
||||
backgroundColor: swatch.fill,
|
||||
foregroundImage:
|
||||
entry.photo == null ? null : MemoryImage(entry.photo!),
|
||||
child: entry.photo == null
|
||||
? Text(
|
||||
entry.label.isEmpty
|
||||
? '?'
|
||||
: entry.label.substring(0, 1).toUpperCase(),
|
||||
style: TextStyle(color: swatch.ink, fontWeight: FontWeight.w600),
|
||||
)
|
||||
: null,
|
||||
),
|
||||
title: Text(entry.label),
|
||||
subtitle: entry.category == null ? null : Text(entry.category!),
|
||||
onTap: () => context.push('/variety/${entry.id}'),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _EmptyMonth extends StatelessWidget {
|
||||
const _EmptyMonth({required this.monthName});
|
||||
|
||||
final String monthName;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final t = context.t;
|
||||
return Center(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Icon(Icons.event_available,
|
||||
size: 64, color: seedGreen.withValues(alpha: 0.5)),
|
||||
const SizedBox(height: 16),
|
||||
Text(
|
||||
t.calendar.nothing(month: monthName),
|
||||
textAlign: TextAlign.center,
|
||||
style: Theme.of(context).textTheme.bodyLarge,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
String _monthName(BuildContext context, int month) {
|
||||
final locale = materialLocaleFor(Localizations.localeOf(context));
|
||||
return _capitalise(
|
||||
DateFormat.MMMM(locale.toLanguageTag()).format(DateTime(2000, month)));
|
||||
}
|
||||
|
||||
String _capitalise(String s) =>
|
||||
s.isEmpty ? s : s[0].toUpperCase() + s.substring(1);
|
||||
|
|
@ -102,6 +102,14 @@ class HomeScreen extends StatelessWidget {
|
|||
onTap: () => context.push('/inventory'),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
_OutlinedMenuCard(
|
||||
key: const Key('home.calendar'),
|
||||
icon: Icons.calendar_month,
|
||||
label: t.calendar.title,
|
||||
subtitle: t.calendar.homeSubtitle,
|
||||
onTap: () => context.push('/calendar'),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
_OutlinedMenuCard(
|
||||
key: const Key('home.market'),
|
||||
icon: Icons.storefront_outlined,
|
||||
|
|
|
|||
|
|
@ -286,11 +286,14 @@ class _FilterBar extends StatelessWidget {
|
|||
final hasNeedsReproduction = state.hasNeedsReproduction;
|
||||
// Only offer the "I share" chip when some lot is marked to share.
|
||||
final hasShared = state.hasShared;
|
||||
// Only offer the "to sow this month" chip when some variety has a calendar.
|
||||
final hasSowCalendar = state.hasSowCalendar;
|
||||
if (categories.isEmpty &&
|
||||
forms.isEmpty &&
|
||||
!hasOrganic &&
|
||||
!hasNeedsReproduction &&
|
||||
!hasShared) {
|
||||
!hasShared &&
|
||||
!hasSowCalendar) {
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
|
||||
|
|
@ -298,6 +301,18 @@ class _FilterBar extends StatelessWidget {
|
|||
// attributes (green icons) · forms (per-form tonality) · families (each a
|
||||
// stable earthy tonality). Grouping + colour makes a long row scannable.
|
||||
final attrChips = <Widget>[
|
||||
if (hasSowCalendar)
|
||||
FilterChip(
|
||||
key: const Key('inventory.filter.sowThisMonth'),
|
||||
avatar: Icon(
|
||||
Icons.calendar_month,
|
||||
size: 18,
|
||||
color: state.sowThisMonthOnly ? null : seedGreen,
|
||||
),
|
||||
label: Text(t.calendar.filterChip),
|
||||
selected: state.sowThisMonthOnly,
|
||||
onSelected: (_) => cubit.toggleSowThisMonth(),
|
||||
),
|
||||
if (hasShared)
|
||||
FilterChip(
|
||||
key: const Key('inventory.filter.sharing'),
|
||||
|
|
@ -361,7 +376,8 @@ class _FilterBar extends StatelessWidget {
|
|||
state.typeFilter.isNotEmpty ||
|
||||
state.organicOnly ||
|
||||
state.needsReproductionOnly ||
|
||||
state.sharingOnly;
|
||||
state.sharingOnly ||
|
||||
state.sowThisMonthOnly;
|
||||
|
||||
// Lay out the groups in order, dropping a hairline divider between any two
|
||||
// that both have chips.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue