cleanup code

lib/model/Schedule.dart

@@ -298,10 +298,6 @@ class Schedule {
           extractValue: (dayOfWeek) {
             return dayOfWeek.index + 1;
           },
-          shiftBack: (repetitionValue, from) {
-            final shift = repetitionValue * DayOfWeek.values.length; // period - 1, e.g. 2 weeks = 1 week, 3 weeks = 2 weeks
-            return from.subtract(Duration(days: shift));
-          },
       ) ?? nextRegularDueDate;
     }
 
@@ -312,10 +308,7 @@ class Schedule {
         },
         extractValue: (dayOfMonth) {
           return dayOfMonth;
-        },
-        shiftBack: (repetitionValue, from) {
-          return Jiffy.parseFromDateTime(from).subtract(months: repetitionValue).dateTime;
-        },
+        }
       ) ?? nextRegularDueDate;
     }
 
@@ -326,10 +319,7 @@ class Schedule {
         },
         extractValue: (dayOfMonth) {
           return dayOfMonth.value;
-        },
-        shiftBack: (repetitionValue, from) {
-          return Jiffy.parseFromDateTime(from).subtract(years: repetitionValue).dateTime;
-        },
+        }
       ) ?? nextRegularDueDate;
     }
     // bypass
@@ -380,7 +370,6 @@ class Schedule {
     bool moveForward, {
     required T Function (DateTime from) extractType,
     required int Function (T) extractValue,
-    required DateTime Function (int repetitionValue, DateTime from) shiftBack,
   }) {
 
     //debugPrint("from=$from nextRegularDueDate=$nextRegularDueDate");
@@ -413,14 +402,6 @@ class Schedule {
 
       //debugPrint("last = $last");
       if (last != null) {
-        // if last is the max element in sorted, shift x days back
-        /*if (!sortedDescending.any((element) => extractValue(element) >= extractValue(extractType(last)))) {
-          final repetition = fromRepetitionStepToCustomRepetition(repetitionStep, customRepetition);
-          final corrected = shiftBack(repetition.repetitionValue - 1, last);
-          //debugPrint("corrected = $corrected");
-
-          return corrected;
-        }*/
         return last;
       }
 

metadata/en-US/changelogs/10703.txt

@@ -0,0 +1,3 @@
+* Fix fixed and weekly based schedule due data calculation (#83)
+* Fix wrong number of due and overdue schedules in overview
+* Ensure selected due dates match selected week days (for fixed week based schedules)