feat(02-04): wire template selection flow into room creation
- After createRoom, detect room type via detectRoomType on room name - Show TemplatePickerSheet if room type matches one of 14 known types - Create tasks from selected templates with correct frequency, effort, and anchor day - Navigate to new room after creation (with or without templates) - Edit mode unchanged: no template prompt on room updates - Custom rooms (no type match) skip template prompt entirely Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -6,6 +6,10 @@ import 'package:household_keeper/core/providers/database_provider.dart';
|
|||||||
import 'package:household_keeper/features/rooms/domain/room_icons.dart';
|
import 'package:household_keeper/features/rooms/domain/room_icons.dart';
|
||||||
import 'package:household_keeper/features/rooms/presentation/icon_picker_sheet.dart';
|
import 'package:household_keeper/features/rooms/presentation/icon_picker_sheet.dart';
|
||||||
import 'package:household_keeper/features/rooms/presentation/room_providers.dart';
|
import 'package:household_keeper/features/rooms/presentation/room_providers.dart';
|
||||||
|
import 'package:household_keeper/features/tasks/domain/frequency.dart';
|
||||||
|
import 'package:household_keeper/features/tasks/presentation/task_providers.dart';
|
||||||
|
import 'package:household_keeper/features/templates/data/task_templates.dart';
|
||||||
|
import 'package:household_keeper/features/templates/presentation/template_picker_sheet.dart';
|
||||||
import 'package:household_keeper/l10n/app_localizations.dart';
|
import 'package:household_keeper/l10n/app_localizations.dart';
|
||||||
|
|
||||||
/// Full-screen form for creating and editing rooms.
|
/// Full-screen form for creating and editing rooms.
|
||||||
@@ -62,21 +66,40 @@ class _RoomFormScreenState extends ConsumerState<RoomFormScreen> {
|
|||||||
setState(() => _isSaving = true);
|
setState(() => _isSaving = true);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
final actions = ref.read(roomActionsProvider.notifier);
|
final roomActions = ref.read(roomActionsProvider.notifier);
|
||||||
|
final name = _nameController.text.trim();
|
||||||
|
|
||||||
if (widget.isEditing) {
|
if (widget.isEditing) {
|
||||||
|
// Edit mode: update and pop (no template prompt).
|
||||||
final db = ref.read(appDatabaseProvider);
|
final db = ref.read(appDatabaseProvider);
|
||||||
final existing = await db.roomsDao.getRoomById(widget.roomId!);
|
final existing = await db.roomsDao.getRoomById(widget.roomId!);
|
||||||
await actions.updateRoom(existing.copyWith(
|
await roomActions.updateRoom(existing.copyWith(
|
||||||
name: _nameController.text.trim(),
|
name: name,
|
||||||
iconName: _selectedIconName,
|
iconName: _selectedIconName,
|
||||||
));
|
));
|
||||||
|
if (mounted) context.pop();
|
||||||
} else {
|
} else {
|
||||||
await actions.createRoom(
|
// Create mode: save room, then offer template selection if type matches.
|
||||||
_nameController.text.trim(),
|
final roomId = await roomActions.createRoom(name, _selectedIconName);
|
||||||
_selectedIconName,
|
if (!mounted) return;
|
||||||
);
|
|
||||||
|
final roomType = detectRoomType(name);
|
||||||
|
if (roomType != null) {
|
||||||
|
final templates = roomTemplates[roomType];
|
||||||
|
if (templates != null && templates.isNotEmpty) {
|
||||||
|
final selected = await showTemplatePickerSheet(
|
||||||
|
context: context,
|
||||||
|
roomType: roomType,
|
||||||
|
templates: templates,
|
||||||
|
);
|
||||||
|
if (selected != null && selected.isNotEmpty && mounted) {
|
||||||
|
await _createTasksFromTemplates(roomId, selected);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mounted) context.go('/rooms/$roomId');
|
||||||
}
|
}
|
||||||
if (mounted) context.pop();
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (mounted) {
|
if (mounted) {
|
||||||
setState(() => _isSaving = false);
|
setState(() => _isSaving = false);
|
||||||
@@ -87,6 +110,48 @@ class _RoomFormScreenState extends ConsumerState<RoomFormScreen> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Creates tasks from the selected templates in the newly created room.
|
||||||
|
Future<void> _createTasksFromTemplates(
|
||||||
|
int roomId,
|
||||||
|
List<TaskTemplate> templates,
|
||||||
|
) async {
|
||||||
|
final taskActions = ref.read(taskActionsProvider.notifier);
|
||||||
|
final today = DateTime.now();
|
||||||
|
final todayDateOnly = DateTime(today.year, today.month, today.day);
|
||||||
|
|
||||||
|
for (final template in templates) {
|
||||||
|
await taskActions.createTask(
|
||||||
|
roomId: roomId,
|
||||||
|
name: template.name,
|
||||||
|
description: template.description,
|
||||||
|
intervalType: template.intervalType,
|
||||||
|
intervalDays: template.intervalDays,
|
||||||
|
anchorDay: _anchorDayForType(template.intervalType, todayDateOnly),
|
||||||
|
effortLevel: template.effortLevel,
|
||||||
|
nextDueDate: todayDateOnly,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Returns the anchor day for calendar-anchored interval types.
|
||||||
|
///
|
||||||
|
/// Monthly/quarterly/yearly intervals anchor to today's day-of-month.
|
||||||
|
/// Day-count based intervals don't need an anchor.
|
||||||
|
int? _anchorDayForType(IntervalType type, DateTime today) {
|
||||||
|
switch (type) {
|
||||||
|
case IntervalType.monthly:
|
||||||
|
case IntervalType.everyNMonths:
|
||||||
|
case IntervalType.quarterly:
|
||||||
|
case IntervalType.yearly:
|
||||||
|
return today.day;
|
||||||
|
case IntervalType.daily:
|
||||||
|
case IntervalType.everyNDays:
|
||||||
|
case IntervalType.weekly:
|
||||||
|
case IntervalType.biweekly:
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
_nameController.dispose();
|
_nameController.dispose();
|
||||||
|
|||||||
Reference in New Issue
Block a user