Merge pull request #282 from hargata/Hargata/calendar.view

Hargata/calendar.view

Controllers/HomeController.cs

@@ -18,12 +18,16 @@ namespace CarCareTracker.Controllers
         private readonly IFileHelper _fileHelper;
         private readonly IConfigHelper _config;
         private readonly IExtraFieldDataAccess _extraFieldDataAccess;
+        private readonly IReminderRecordDataAccess _reminderRecordDataAccess;
+        private readonly IReminderHelper _reminderHelper;
         public HomeController(ILogger<HomeController> logger,
             IVehicleDataAccess dataAccess,
             IUserLogic userLogic,
             IConfigHelper configuration,
             IFileHelper fileHelper,
-            IExtraFieldDataAccess extraFieldDataAccess)
+            IExtraFieldDataAccess extraFieldDataAccess,
+            IReminderRecordDataAccess reminderRecordDataAccess,
+            IReminderHelper reminderHelper)
         {
             _logger = logger;
             _dataAccess = dataAccess;
@@ -31,6 +35,8 @@ namespace CarCareTracker.Controllers
             _userLogic = userLogic;
             _fileHelper = fileHelper;
             _extraFieldDataAccess = extraFieldDataAccess;
+            _reminderRecordDataAccess = reminderRecordDataAccess;
+            _reminderHelper = reminderHelper;
         }
         private int GetUserID()
         {
@@ -49,6 +55,29 @@ namespace CarCareTracker.Controllers
             }
             return PartialView("_GarageDisplay", vehiclesStored);
         }
+        public IActionResult Calendar()
+        {
+            var vehiclesStored = _dataAccess.GetVehicles();
+            if (!User.IsInRole(nameof(UserData.IsRootUser)))
+            {
+                vehiclesStored = _userLogic.FilterUserVehicles(vehiclesStored, GetUserID());
+            }
+            List<ReminderRecordViewModel> reminders = new List<ReminderRecordViewModel>();
+            foreach(Vehicle vehicle in vehiclesStored)
+            {
+                var vehicleReminders = _reminderRecordDataAccess.GetReminderRecordsByVehicleId(vehicle.Id);
+                vehicleReminders.RemoveAll(x => x.Metric == ReminderMetric.Odometer);
+                //we don't care about mileages so we can basically fake the current vehicle mileage.
+                if (vehicleReminders.Any())
+                {
+                    var maxMileage = vehicleReminders.Max(x => x.Mileage) + 1000;
+                    var reminderUrgency = _reminderHelper.GetReminderRecordViewModels(vehicleReminders, maxMileage, DateTime.Now);
+                    reminderUrgency = reminderUrgency.Select(x => new ReminderRecordViewModel { Date = x.Date, Urgency = x.Urgency, Description = $"{vehicle.Year} {vehicle.Make} {vehicle.Model} #{vehicle.LicensePlate} - {x.Description}" }).ToList();
+                    reminders.AddRange(reminderUrgency);
+                }
+            }
+            return PartialView("_Calendar", reminders);
+        }
         public IActionResult Settings()
         {
             var userConfig = _config.GetUserConfig(User);

Views/Home/Index.cshtml

@@ -27,6 +27,9 @@
                 <button class="nav-link" id="supply-tab" data-bs-toggle="tab" data-bs-target="#supply-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-shop me-2"></i>@translator.Translate(userLanguage, "Supplies")</button>
             </li>
         }
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" id="calendar-tab" data-bs-toggle="tab" data-bs-target="#calendar-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-calendar-week me-2"></i>@translator.Translate(userLanguage, "Calendar")</button>
+        </li>
         <li class="nav-item" role="presentation">
             <button class="nav-link @(Model == "settings" ? "active" : "")" id="settings-tab" data-bs-toggle="tab" data-bs-target="#settings-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-gear me-2"></i>@translator.Translate(userLanguage,"Settings")</span></button>
         </li>
@@ -64,6 +67,9 @@
                 <button class="nav-link" id="supply-tab" data-bs-toggle="tab" data-bs-target="#supply-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-shop me-2"></i>@translator.Translate(userLanguage, "Supplies")</button>
             </li>
         }
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" id="calendar-tab" data-bs-toggle="tab" data-bs-target="#calendar-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-calendar-week me-2"></i>@translator.Translate(userLanguage, "Calendar")</button>
+        </li>
         <li class="nav-item ms-auto" role="presentation">
             <button class="nav-link @(Model == "settings" ? "active" : "")" id="settings-tab" data-bs-toggle="tab" data-bs-target="#settings-tab-pane" type="button" role="tab"><i class="bi bi-gear me-2"></i>@translator.Translate(userLanguage,"Settings")</button>
         </li>
@@ -93,6 +99,8 @@
         </div>
         <div class="tab-pane fade" id="supply-tab-pane" role="tabpanel" tabindex="0">
         </div>
+        <div class="tab-pane fade" id="calendar-tab-pane" role="tabpanel" tabindex="0">
+        </div>
         <div class="tab-pane fade @(Model == "settings" ? "show active" : "")" id="settings-tab-pane" role="tabpanel" tabindex="0">
         </div>
     </div>

Views/Home/_Calendar.cshtml

@@ -0,0 +1,18 @@
+@model List<ReminderRecordViewModel>
+<script>
+    var eventDates = [];
+    var groupedDates = [];
+    @foreach(ReminderRecordViewModel reminderRecord in Model)
+    {
+    @:eventDates.push({date: new Date(Date.parse(decodeHTMLEntities('@reminderRecord.Date.ToShortDateString()'))), description: decodeHTMLEntities('@reminderRecord.Description'), urgency: decodeHTMLEntities('@reminderRecord.Urgency.ToString()')});
+    }
+</script>
+<div class="row vehicleDetailTabContainer">
+    <div class="col-12 reminderCalendarView">
+        <div class="reminderCalendarViewContent" style="height:60vh;">
+        </div>
+    </div>
+</div>
+<script>
+    initCalendar();
+</script>

wwwroot/css/site.css

@@ -303,4 +303,8 @@ input[type="file"] {
 }
 .override-hide{
     display: none !important;
+}
+.reminderCalendarViewContent + .datepicker, .datepicker-inline, .datepicker-days, .table-condensed {
+    width: 100%;
+    height: 100%;
 }

wwwroot/js/garage.js

@@ -41,11 +41,67 @@ function bindTabEvent() {
             case "supply-tab":
                 getVehicleSupplyRecords();
                 break;
+            case "calendar-tab":
+                getVehicleCalendarEvents();
+                break;
         }
         switch (e.relatedTarget.id) { //clear out previous tabs with grids in them to help with performance
             case "supply-tab":
                 $("#supply-tab-pane").html("");
                 break;
+            case "calendar-tab":
+                $("#calendar-tab-pane").html("");
+                break;
+        }
+    });
+}
+function getVehicleCalendarEvents() {
+    $.get('/Home/Calendar', function (data) {
+        if (data) {
+            $("#calendar-tab-pane").html(data);
+        }
+    });
+}
+function generateReminderItem(urgency, description) {
+    if (description.trim() == '') {
+        return;
+    }
+    switch (urgency) {
+        case "VeryUrgent":
+            return `<p class="badge text-wrap bg-danger">${description}</p>`;
+        case "PastDue":
+            return `<p class="badge text-wrap bg-secondary">${description}</p>`;
+        case "Urgent":
+            return `<p class="badge text-wrap bg-warning">${description}</p>`;
+        case "NotUrgent":
+            return `<p class="badge text-wrap bg-success">${description}</p>`;
+    }
+}
+function initCalendar() {
+    if (groupedDates.length == 0) {
+        //group dates
+        eventDates.map(x => {
+            var existingIndex = groupedDates.findIndex(y => y.date.getTime() == x.date.getTime());
+            if (existingIndex == -1) {
+                groupedDates.push({ date: x.date, reminders: [`${generateReminderItem(x.urgency, x.description)}`] });
+            } else if (existingIndex > -1) {
+                groupedDates[existingIndex].reminders.push(`${generateReminderItem(x.urgency, x.description)}`);
+            }
+        });
+    }
+    $(".reminderCalendarViewContent").datepicker({
+        startDate: "+0d",
+        format: getShortDatePattern().pattern,
+        todayHighlight: true,
+        beforeShowDay: function (date) {
+            var reminderDateIndex = groupedDates.findIndex(x => x.date.getTime() == date.getTime());
+            if (reminderDateIndex > -1) {
+                return {
+                    enabled: true,
+                    classes: 'reminder-exist',
+                    content: `<div class='text-wrap'><p>${date.getDate()}</p>${groupedDates[reminderDateIndex].reminders.join('<br>')}</div>`
+                }
+            }
         }
     });
 }