diff --git a/Helper/ReminderHelper.cs b/Helper/ReminderHelper.cs index 48f50cc..b058a68 100644 --- a/Helper/ReminderHelper.cs +++ b/Helper/ReminderHelper.cs @@ -79,6 +79,7 @@ namespace CarCareTracker.Helper Description = reminder.Description, Notes = reminder.Notes, Metric = reminder.Metric, + UserMetric = reminder.Metric, IsRecurring = reminder.IsRecurring, Tags = reminder.Tags }; diff --git a/Models/Reminder/ReminderRecordViewModel.cs b/Models/Reminder/ReminderRecordViewModel.cs index 7fb31b6..faceb44 100644 --- a/Models/Reminder/ReminderRecordViewModel.cs +++ b/Models/Reminder/ReminderRecordViewModel.cs @@ -9,6 +9,10 @@ public string Description { get; set; } public string Notes { get; set; } /// + /// The metric the user selected to calculate the urgency of this reminder. + /// + public ReminderMetric UserMetric { get; set; } = ReminderMetric.Date; + /// /// Reason why this reminder is urgent /// public ReminderMetric Metric { get; set; } = ReminderMetric.Date; diff --git a/Views/Vehicle/_ReminderRecords.cshtml b/Views/Vehicle/_ReminderRecords.cshtml index 13784ff..13c5507 100644 --- a/Views/Vehicle/_ReminderRecords.cshtml +++ b/Views/Vehicle/_ReminderRecords.cshtml @@ -7,6 +7,8 @@ var userLanguage = userConfig.UserLanguage; var hasRefresh = Model.Where(x => (x.Urgency == ReminderUrgency.VeryUrgent || x.Urgency == ReminderUrgency.PastDue) && x.IsRecurring).Any(); var recordTags = Model.SelectMany(x => x.Tags).Distinct(); + var enableCsvImports = userConfig.EnableCsvImports; + var userColumnPreferences = userConfig.UserColumnPreferences.Where(x => x.Tab == ImportMode.ReminderRecord); }
@@ -28,7 +30,68 @@
- + @if (enableCsvImports) + { +
+ + + +
+ } + else + { + + }
@@ -42,39 +105,42 @@ - - - - + + + + + + @if (hasRefresh) { - + } - + @foreach (ReminderRecordViewModel reminderRecord in Model) { - @if (reminderRecord.Urgency == ReminderUrgency.VeryUrgent) - { - - } - else if (reminderRecord.Urgency == ReminderUrgency.Urgent) - { - - } - else if (reminderRecord.Urgency == ReminderUrgency.PastDue) - { - - } - else - { - - } - + - - + + + + @if (hasRefresh) { - } - @@ -132,8 +203,7 @@
  • @translator.Translate(userLanguage, "Delete")
  • - \ No newline at end of file +@if (userColumnPreferences.Any()) +{ + @await Html.PartialAsync("_UserColumnPreferences", userColumnPreferences) +} \ No newline at end of file
    @translator.Translate(userLanguage, "Urgency")@translator.Translate(userLanguage, "Metric")@translator.Translate(userLanguage, "Description")@translator.Translate(userLanguage, "Notes")@translator.Translate(userLanguage, "Urgency")@translator.Translate(userLanguage, "Metric")@translator.Translate(userLanguage, "Description")@translator.Translate(userLanguage, "Notes")@translator.Translate(userLanguage, "Done")@translator.Translate(userLanguage, "Done")@translator.Translate(userLanguage, "Delete")@translator.Translate(userLanguage, "Delete")
    @translator.Translate(userLanguage, "Very Urgent")@translator.Translate(userLanguage, "Urgent")@translator.Translate(userLanguage, "Past Due")@translator.Translate(userLanguage, "Not Urgent") - {reminderRecord.Date.ToShortDateString()}{reminderRecord.Mileage}")"> + + @if (reminderRecord.Urgency == ReminderUrgency.VeryUrgent) + { + @translator.Translate(userLanguage, "Very Urgent") + } + else if (reminderRecord.Urgency == ReminderUrgency.Urgent) + { + @translator.Translate(userLanguage, "Urgent") + } + else if (reminderRecord.Urgency == ReminderUrgency.PastDue) + { + @translator.Translate(userLanguage, "Past Due") + } + else + { + @translator.Translate(userLanguage, "Not Urgent") + } + @if (reminderRecord.Metric == ReminderMetric.Date) { @reminderRecord.Date.ToShortDateString() @@ -87,20 +153,25 @@ { @reminderRecord.Metric } - @reminderRecord.Description@StaticHelper.TruncateStrings(reminderRecord.Notes)@reminderRecord.Description@StaticHelper.TruncateStrings(reminderRecord.Notes) + @if((reminderRecord.Urgency == ReminderUrgency.VeryUrgent || reminderRecord.Urgency == ReminderUrgency.PastDue) && reminderRecord.IsRecurring) { } +