diff --git a/Controllers/Vehicle/ReminderController.cs b/Controllers/Vehicle/ReminderController.cs index b44529a..53aae3d 100644 --- a/Controllers/Vehicle/ReminderController.cs +++ b/Controllers/Vehicle/ReminderController.cs @@ -151,6 +151,7 @@ namespace CarCareTracker.Controllers Mileage = result.Mileage, Metric = result.Metric, IsRecurring = result.IsRecurring, + FixedIntervals = result.FixedIntervals, UseCustomThresholds = result.UseCustomThresholds, CustomThresholds = result.CustomThresholds, ReminderMileageInterval = result.ReminderMileageInterval, diff --git a/Helper/ReminderHelper.cs b/Helper/ReminderHelper.cs index 19a6ed0..76ad8ad 100644 --- a/Helper/ReminderHelper.cs +++ b/Helper/ReminderHelper.cs @@ -16,8 +16,8 @@ namespace CarCareTracker.Helper } public ReminderRecord GetUpdatedRecurringReminderRecord(ReminderRecord existingReminder, DateTime? currentDate, int? currentMileage) { - var newDate = currentDate ?? existingReminder.Date; - var newMileage = currentMileage ?? existingReminder.Mileage; + var newDate = existingReminder.FixedIntervals ? existingReminder.Date : currentDate ?? existingReminder.Date; + var newMileage = existingReminder.FixedIntervals ? existingReminder.Mileage : currentMileage ?? existingReminder.Mileage; if (existingReminder.Metric == ReminderMetric.Both) { if (existingReminder.ReminderMonthInterval != ReminderMonthInterval.Other) diff --git a/Models/Reminder/ReminderRecord.cs b/Models/Reminder/ReminderRecord.cs index 744381a..112a37e 100644 --- a/Models/Reminder/ReminderRecord.cs +++ b/Models/Reminder/ReminderRecord.cs @@ -10,6 +10,7 @@ public string Notes { get; set; } public bool IsRecurring { get; set; } = false; public bool UseCustomThresholds { get; set; } = false; + public bool FixedIntervals { get; set; } = false; public ReminderUrgencyConfig CustomThresholds { get; set; } = new ReminderUrgencyConfig(); public int CustomMileageInterval { get; set; } = 0; public int CustomMonthInterval { get; set; } = 0; diff --git a/Models/Reminder/ReminderRecordInput.cs b/Models/Reminder/ReminderRecordInput.cs index 4b91a24..42576c7 100644 --- a/Models/Reminder/ReminderRecordInput.cs +++ b/Models/Reminder/ReminderRecordInput.cs @@ -10,6 +10,7 @@ public string Notes { get; set; } public bool IsRecurring { get; set; } = false; public bool UseCustomThresholds { get; set; } = false; + public bool FixedIntervals { get; set; } = false; public ReminderUrgencyConfig CustomThresholds { get; set; } = new ReminderUrgencyConfig(); public int CustomMileageInterval { get; set; } = 0; public int CustomMonthInterval { get; set; } = 0; @@ -29,6 +30,7 @@ Description = Description, Metric = Metric, IsRecurring = IsRecurring, + FixedIntervals = FixedIntervals, UseCustomThresholds = UseCustomThresholds, CustomThresholds = CustomThresholds, ReminderMileageInterval = ReminderMileageInterval, diff --git a/Views/Vehicle/Reminder/_ReminderRecordModal.cshtml b/Views/Vehicle/Reminder/_ReminderRecordModal.cshtml index a118828..d26884d 100644 --- a/Views/Vehicle/Reminder/_ReminderRecordModal.cshtml +++ b/Views/Vehicle/Reminder/_ReminderRecordModal.cshtml @@ -57,9 +57,15 @@
-
- - +
+
+ + +
+
+ + +