Datetime planner: app

kitchenowl/lib/config.dart

@@ -3,7 +3,7 @@ import 'package:package_info_plus/package_info_plus.dart';
 
 abstract class Config {
   // ignore: constant_identifier_names
-  static const int MIN_BACKEND_VERSION = 98;
+  static const int MIN_BACKEND_VERSION = 109;
   static const String defaultServer = "https://app.kitchenowl.org";
   static Future<PackageInfo?>? _packageInfo; // Gets loaded by SettingsCubit
   static PackageInfo? _packageInfoSync;

kitchenowl/lib/cubits/planner_cubit.dart

@@ -17,21 +17,21 @@ class PlannerCubit extends Cubit<PlannerCubitState> {
     refresh();
   }
 
-  Future<void> remove(Recipe recipe, [int? day]) async {
+  Future<void> remove(Recipe recipe, [DateTime? cookingDate]) async {
     await TransactionHandler.getInstance()
         .runTransaction(TransactionPlannerRemoveRecipe(
       household: household,
       recipe: recipe,
-      day: day,
+      cookingDate: cookingDate,
     ));
     await refresh();
   }
 
-  Future<void> add(Recipe recipe, [int? day]) async {
+  Future<void> add(Recipe recipe, [DateTime? cookingDate]) async {
     await TransactionHandler.getInstance()
         .runTransaction(TransactionPlannerAddRecipe(
       household: household,
-      recipePlan: RecipePlan(recipe: recipe, day: day),
+      recipePlan: RecipePlan(recipe: recipe, cookingDate: cookingDate),
     ));
     await refresh();
   }
@@ -124,11 +124,28 @@ class LoadedPlannerCubitState extends PlannerCubitState {
 
   List<RecipePlan> getPlannedWithoutDay() {
     return recipePlans
-        .where((element) => element.day == null || element.day! < 0)
+        .where((element) =>
+            element.cookingDate == null ||
+            (element.cookingDate != null &&
+                element.cookingDate!.millisecondsSinceEpoch < 0))
         .toList();
   }
 
-  List<RecipePlan> getPlannedOfDay(int day) {
-    return recipePlans.where((element) => element.day == day).toList();
+  List<RecipePlan> getPlannedOfDate(DateTime cookingDate) {
+    return recipePlans
+        .where((element) => element.cookingDate?.day == cookingDate.day)
+        .toList();
+  }
+
+  List<DateTime> getUniqueCookingDays() {
+    Set<DateTime> uniqueDays = {};
+
+    for (var recipe in recipePlans) {
+      if (recipe.cookingDate != null &&
+          recipe.cookingDate!.millisecondsSinceEpoch > 0) {
+        uniqueDays.add(recipe.cookingDate!);
+      }
+    }
+    return uniqueDays.toList()..sort();
   }
 }

kitchenowl/lib/cubits/recipe_cubit.dart

@@ -92,13 +92,14 @@ class RecipeCubit extends Cubit<RecipeState> {
     }
   }
 
-  Future<void> addRecipeToPlanner({int? day, bool updateOnAdd = false}) async {
+  Future<void> addRecipeToPlanner(
+      {DateTime? cookingDate, bool updateOnAdd = false}) async {
     if (state.household != null) {
       await _transactionHandler.runTransaction(TransactionPlannerAddRecipe(
         household: state.household!,
         recipePlan: RecipePlan(
           recipe: state.recipe,
-          day: day,
+          cookingDate: cookingDate,
           yields: state.selectedYields != null &&
                   state.recipe.yields != state.selectedYields &&
                   state.selectedYields! > 0

kitchenowl/lib/l10n/app_de.arb

@@ -744,6 +744,7 @@
   "wrongUsernameOrPassword": "Benutzername oder Passwort ist falsch",
   "yearly": "Jährlich",
   "yes": "Ja",
+  "yesterday": "Gestern",
   "yields": "Portionen",
   "you": "du"
 }

kitchenowl/lib/l10n/app_en.arb

@@ -748,6 +748,7 @@
   "wrongUsernameOrPassword": "Wrong username or password",
   "yearly": "Yearly",
   "yes": "Yes",
+  "yesterday": "Yesterday",
   "yields": "Yields",
   "you": "you"
 }

kitchenowl/lib/models/planner.dart

@@ -3,36 +3,37 @@ import 'package:kitchenowl/models/recipe.dart';
 
 class RecipePlan extends Model {
   final Recipe recipe;
-  final int? day;
+  final DateTime? cookingDate;
   final int? yields;
 
-  const RecipePlan({
+  RecipePlan({
     required this.recipe,
-    this.day,
+    this.cookingDate,
     this.yields,
   });
 
   factory RecipePlan.fromJson(Map<String, dynamic> map) {
     return RecipePlan(
       recipe: Recipe.fromJson(map['recipe']),
-      day: map['day'],
+      cookingDate:
+          DateTime.fromMillisecondsSinceEpoch(map["cooking_date"], isUtc: true),
       yields: map['yields'],
     );
   }
 
   Recipe get recipeWithYields {
     if (yields == null || yields! <= 0) return recipe;
-
     return recipe.withYields(yields!);
   }
 
   @override
-  List<Object?> get props => [recipe, day, yields];
+  List<Object?> get props => [recipe, cookingDate, yields];
 
   @override
   Map<String, dynamic> toJson() => {
         "recipe_id": recipe.id,
-        if (day != null) "day": day,
+        if (cookingDate != null)
+          "cooking_date": cookingDate?.millisecondsSinceEpoch,
         if (yields != null) "yields": yields,
       };
 

kitchenowl/lib/models/recipe.dart

@@ -10,7 +10,7 @@ class Recipe extends Model {
   final String name;
   final String description;
   final bool isPlanned;
-  final Set<int> plannedDays;
+  final Set<DateTime> plannedCookingDates;
   final int time;
   final int cookTime;
   final int prepTime;
@@ -40,7 +40,7 @@ class Recipe extends Model {
     this.imageHash,
     this.items = const [],
     this.tags = const {},
-    this.plannedDays = const {},
+    this.plannedCookingDates = const {},
     this.public = false,
     this.householdId,
     this.household,
@@ -55,9 +55,20 @@ class Recipe extends Model {
     if (map.containsKey('tags')) {
       tags = Set.from(map['tags'].map((e) => Tag.fromJson(e)));
     }
-    Set<int> plannedDays = const {};
-    if (map.containsKey('planned_days')) {
-      plannedDays = Set.from(map['planned_days']);
+
+    Set<DateTime> plannedCookingDates = {};
+
+    if (map.containsKey('planned_cooking_dates') &&
+        map['planned_cooking_dates'] is List) {
+      for (var timestamp in map['planned_cooking_dates']) {
+        // Check if the timestamp is not null
+        if (timestamp != null) {
+          // Convert milliseconds to DateTime and add to the Set
+          DateTime dateTime =
+              DateTime.fromMillisecondsSinceEpoch(timestamp, isUtc: true);
+          plannedCookingDates.add(dateTime);
+        }
+      }
     }
 
     return Recipe(
@@ -76,7 +87,7 @@ class Recipe extends Model {
       householdId: map['household_id'],
       items: items,
       tags: tags,
-      plannedDays: plannedDays,
+      plannedCookingDates: plannedCookingDates,
       household: map.containsKey("household")
           ? Household.fromJson(map['household'])
           : null,
@@ -96,7 +107,7 @@ class Recipe extends Model {
     bool? public,
     List<RecipeItem>? items,
     Set<Tag>? tags,
-    Set<int>? plannedDays,
+    Set<DateTime>? plannedCookingDates,
     int? householdId,
   }) =>
       Recipe(
@@ -113,7 +124,7 @@ class Recipe extends Model {
         imageHash: imageHash,
         image: image ?? this.image,
         tags: tags ?? this.tags,
-        plannedDays: plannedDays ?? this.plannedDays,
+        plannedCookingDates: plannedCookingDates ?? this.plannedCookingDates,
         public: public ?? this.public,
         householdId: householdId ?? this.householdId,
         household: this.household,
@@ -144,7 +155,7 @@ class Recipe extends Model {
         imageHash,
         tags,
         items,
-        plannedDays,
+        plannedCookingDates,
         public,
         householdId,
         household,
@@ -173,7 +184,7 @@ class Recipe extends Model {
       "items": items.map((e) => e.toJsonWithId()).toList(),
       "tags": tags.map((e) => e.toJsonWithId()).toList(),
       if (imageHash != null) "photo_hash": imageHash,
-      "planned_days": plannedDays.toList(),
+      "planned_cooking_dates": plannedCookingDates.toList(),
       "household_id": householdId,
     });
 

kitchenowl/lib/pages/household_page/planner.dart

@@ -17,15 +17,18 @@ import 'package:kitchenowl/widgets/recipe_card.dart';
 import 'package:responsive_builder/responsive_builder.dart';
 import 'package:tuple/tuple.dart';
 
-int db_weekday(int shift) {
-  // subtract 1 because DateTime.weekday goes from 1 to 7. Kitchenowl-db from 0 to 6
-  return DateTime.now().add(Duration(days: shift)).weekday - 1;
+DateTime toEndOfDay(DateTime dt) {
+  return DateTime(dt.year, dt.month, dt.day, 23, 59, 59);
 }
 
-String formatDateAsWeekday(DateTime date, BuildContext context,
-    {String default_format = 'EEEE'}) {
+String formatDateAsWeekday(
+  BuildContext context,
+  DateTime date, {
+  String default_format = 'EEEE',
+}) {
   DateTime today = DateTime.now();
   DateTime tomorrow = today.add(Duration(days: 1));
+  DateTime yesterday = today.subtract(Duration(days: 1));
 
   // Check if the date is today or tomorrow
   if (date.year == today.year &&
@@ -36,12 +39,32 @@ String formatDateAsWeekday(DateTime date, BuildContext context,
       date.month == tomorrow.month &&
       date.day == tomorrow.day) {
     return AppLocalizations.of(context)!.tomorrow;
+  } else if (date.year == yesterday.year &&
+      date.month == yesterday.month &&
+      date.day == yesterday.day) {
+    return AppLocalizations.of(context)!.yesterday;
   } else {
     // Return the weekday name
     return DateFormat(default_format).format(date);
   }
 }
 
+String _formatDate(BuildContext context, int daysToAdd) {
+  DateTime date = DateTime.now().add(Duration(days: daysToAdd));
+  if (daysToAdd >= -1 && daysToAdd < 7) {
+    return formatDateAsWeekday(context, date, default_format: 'E');
+  } else {
+    return DateFormat.yMMMd().format(date);
+  }
+}
+
+int daysBetween(DateTime from, DateTime to) {
+  // otherwise it's rounded
+  from = DateTime(from.year, from.month, from.day);
+  to = DateTime(to.year, to.month, to.day);
+  return (to.difference(from).inHours / 24).round();
+}
+
 class PlannerPage extends StatefulWidget {
   const PlannerPage({super.key});
 
@@ -188,9 +211,10 @@ class _PlannerPageState extends State<PlannerPage> {
                                   ),
                                 ),
                               ),
-                            for (int i = 0; i < 7; i++)
+                            for (final cookingDate
+                                in state.getUniqueCookingDays())
                               for (final plan
-                                  in state.getPlannedOfDay(db_weekday(i)))
+                                  in state.getPlannedOfDate(cookingDate))
                                 KitchenOwlFractionallySizedBox(
                                   widthFactor: (1 /
                                       DynamicStyling.itemCrossAxisCount(
@@ -206,13 +230,13 @@ class _PlannerPageState extends State<PlannerPage> {
                                         CrossAxisAlignment.stretch,
                                     children: [
                                       if (plan ==
-                                          state.getPlannedOfDay(
-                                              db_weekday(i))[0])
+                                          state
+                                              .getPlannedOfDate(cookingDate)[0])
                                         Padding(
                                           padding:
                                               const EdgeInsets.only(top: 5),
                                           child: Text(
-                                            '${formatDateAsWeekday(DateTime.now().add(Duration(days: i)), context, default_format: 'E')}',
+                                            '${_formatDate(context, daysBetween(DateTime.now(), cookingDate))}',
                                             style: Theme.of(context)
                                                 .textTheme
                                                 .bodyLarge,
@@ -230,7 +254,7 @@ class _PlannerPageState extends State<PlannerPage> {
                                           onPressed: () {
                                             cubit.remove(
                                               plan.recipe,
-                                              db_weekday(i),
+                                              plan.cookingDate,
                                             );
                                           },
                                           onLongPressed: () => _openRecipePage(
@@ -421,23 +445,16 @@ class _PlannerPageState extends State<PlannerPage> {
     PlannerCubit cubit,
     Recipe recipe,
   ) async {
-    int? day = await showDialog<int>(
+    final DateTime? cookingDate = await showDatePicker(
       context: context,
-      builder: (context) => SelectDialog(
-        title: AppLocalizations.of(context)!.addRecipeToPlannerShort,
-        cancelText: AppLocalizations.of(context)!.cancel,
-        options: List.generate(7, (index) {
-          return SelectDialogOption(
-              db_weekday(index),
-              formatDateAsWeekday(
-                  DateTime.now().add(Duration(days: index)), context));
-        }),
-      ),
+      initialDate: DateTime.now(),
+      firstDate: DateTime(2000),
+      lastDate: DateTime.now().add(const Duration(days: 400)),
     );
-    if (day != null) {
+    if (cookingDate != null) {
       await cubit.add(
         recipe,
-        day >= 0 ? day : null,
+        cookingDate.millisecondsSinceEpoch > 0 ? toEndOfDay(cookingDate) : null,
       );
     }
   }