diff --git a/Controllers/VehicleController.cs b/Controllers/VehicleController.cs
index 16e2e0c..d84ba3b 100644
--- a/Controllers/VehicleController.cs
+++ b/Controllers/VehicleController.cs
@@ -1352,7 +1352,8 @@ namespace CarCareTracker.Controllers
IsRecurring = result.IsRecurring,
ReminderMileageInterval = result.ReminderMileageInterval,
ReminderMonthInterval = result.ReminderMonthInterval,
- CustomMileageInterval = result.CustomMileageInterval
+ CustomMileageInterval = result.CustomMileageInterval,
+ CustomMonthInterval = result.CustomMonthInterval
};
return PartialView("_ReminderRecordModal", convertedResult);
}
diff --git a/Enum/ReminderMonthInterval.cs b/Enum/ReminderMonthInterval.cs
index dd1d472..d3ba0f4 100644
--- a/Enum/ReminderMonthInterval.cs
+++ b/Enum/ReminderMonthInterval.cs
@@ -2,6 +2,7 @@
{
public enum ReminderMonthInterval
{
+ Other = 0,
OneMonth = 1,
ThreeMonths = 3,
SixMonths = 6,
diff --git a/Helper/ReminderHelper.cs b/Helper/ReminderHelper.cs
index 342857f..355780a 100644
--- a/Helper/ReminderHelper.cs
+++ b/Helper/ReminderHelper.cs
@@ -13,7 +13,14 @@ namespace CarCareTracker.Helper
{
if (existingReminder.Metric == ReminderMetric.Both)
{
- existingReminder.Date = existingReminder.Date.AddMonths((int)existingReminder.ReminderMonthInterval);
+ if (existingReminder.ReminderMonthInterval != ReminderMonthInterval.Other)
+ {
+ existingReminder.Date = existingReminder.Date.AddMonths((int)existingReminder.ReminderMonthInterval);
+ } else
+ {
+ existingReminder.Date = existingReminder.Date.AddMonths(existingReminder.CustomMonthInterval);
+ }
+
if (existingReminder.ReminderMileageInterval != ReminderMileageInterval.Other)
{
existingReminder.Mileage += (int)existingReminder.ReminderMileageInterval;
@@ -35,7 +42,14 @@ namespace CarCareTracker.Helper
}
else if (existingReminder.Metric == ReminderMetric.Date)
{
- existingReminder.Date = existingReminder.Date.AddMonths((int)existingReminder.ReminderMonthInterval);
+ if (existingReminder.ReminderMonthInterval != ReminderMonthInterval.Other)
+ {
+ existingReminder.Date = existingReminder.Date.AddMonths((int)existingReminder.ReminderMonthInterval);
+ }
+ else
+ {
+ existingReminder.Date = existingReminder.Date.AddMonths(existingReminder.CustomMonthInterval);
+ }
}
return existingReminder;
}
diff --git a/Models/Reminder/ReminderRecord.cs b/Models/Reminder/ReminderRecord.cs
index 31480b6..cf3c06c 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 int CustomMileageInterval { get; set; } = 0;
+ public int CustomMonthInterval { get; set; } = 0;
public ReminderMileageInterval ReminderMileageInterval { get; set; } = ReminderMileageInterval.FiveThousandMiles;
public ReminderMonthInterval ReminderMonthInterval { get; set; } = ReminderMonthInterval.OneYear;
public ReminderMetric Metric { get; set; } = ReminderMetric.Date;
diff --git a/Models/Reminder/ReminderRecordInput.cs b/Models/Reminder/ReminderRecordInput.cs
index 61e770a..d2fc7de 100644
--- a/Models/Reminder/ReminderRecordInput.cs
+++ b/Models/Reminder/ReminderRecordInput.cs
@@ -10,20 +10,27 @@
public string Notes { get; set; }
public bool IsRecurring { get; set; } = false;
public int CustomMileageInterval { get; set; } = 0;
+ public int CustomMonthInterval { get; set; } = 0;
public ReminderMileageInterval ReminderMileageInterval { get; set; } = ReminderMileageInterval.FiveThousandMiles;
public ReminderMonthInterval ReminderMonthInterval { get; set; } = ReminderMonthInterval.OneYear;
public ReminderMetric Metric { get; set; } = ReminderMetric.Date;
- public ReminderRecord ToReminderRecord() { return new ReminderRecord {
- Id = Id,
- VehicleId = VehicleId,
- Date = DateTime.Parse(string.IsNullOrWhiteSpace(Date) ? DateTime.Now.AddDays(1).ToShortDateString() : Date),
- Mileage = Mileage,
- Description = Description,
- Metric = Metric,
- IsRecurring = IsRecurring,
- ReminderMileageInterval = ReminderMileageInterval,
- ReminderMonthInterval = ReminderMonthInterval,
- CustomMileageInterval = CustomMileageInterval,
- Notes = Notes }; }
+ public ReminderRecord ToReminderRecord()
+ {
+ return new ReminderRecord
+ {
+ Id = Id,
+ VehicleId = VehicleId,
+ Date = DateTime.Parse(string.IsNullOrWhiteSpace(Date) ? DateTime.Now.AddDays(1).ToShortDateString() : Date),
+ Mileage = Mileage,
+ Description = Description,
+ Metric = Metric,
+ IsRecurring = IsRecurring,
+ ReminderMileageInterval = ReminderMileageInterval,
+ ReminderMonthInterval = ReminderMonthInterval,
+ CustomMileageInterval = CustomMileageInterval,
+ CustomMonthInterval = CustomMonthInterval,
+ Notes = Notes
+ };
+ }
}
}
diff --git a/Views/Vehicle/_ReminderRecordModal.cshtml b/Views/Vehicle/_ReminderRecordModal.cshtml
index 8fc08c4..15485eb 100644
--- a/Views/Vehicle/_ReminderRecordModal.cshtml
+++ b/Views/Vehicle/_ReminderRecordModal.cshtml
@@ -72,7 +72,9 @@
150000 mi. / Km!option>
-