From 643f7a3f7922a6ff90691770e26600b2c8fecb72 Mon Sep 17 00:00:00 2001 From: "DESKTOP-T0O5CDB\\DESK-555BD" Date: Wed, 8 Oct 2025 20:20:03 -0600 Subject: [PATCH] fixed intervals for certain reminders --- Controllers/Vehicle/ReminderController.cs | 1 + Helper/ReminderHelper.cs | 4 ++-- Models/Reminder/ReminderRecord.cs | 1 + Models/Reminder/ReminderRecordInput.cs | 2 ++ Views/Vehicle/Reminder/_ReminderRecordModal.cshtml | 12 +++++++++--- wwwroot/defaults/en_US.json | 2 +- wwwroot/js/reminderrecord.js | 4 ++++ 7 files changed, 20 insertions(+), 6 deletions(-) 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 @@
-
- - +
+
+ + +
+
+ + +