Merge pull request #291 from hargata/Hargata/further.improvements

styling changes.

Controllers/HomeController.cs

@@ -72,12 +72,18 @@ namespace CarCareTracker.Controllers
                 {
                     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();
+                    reminderUrgency = reminderUrgency.Select(x => new ReminderRecordViewModel { Id = x.Id, 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 ViewCalendarReminder(int reminderId)
+        {
+            var reminder = _reminderRecordDataAccess.GetReminderRecordById(reminderId);
+            var reminderUrgency = _reminderHelper.GetReminderRecordViewModels(new List<ReminderRecord> { reminder }, reminder.Mileage + 1000, DateTime.Now).FirstOrDefault();
+            return PartialView("_ReminderRecordCalendarModal", reminderUrgency);
+        }
         public IActionResult Settings()
         {
             var userConfig = _config.GetUserConfig(User);
@@ -99,6 +105,7 @@ namespace CarCareTracker.Controllers
         {
             return View();
         }
+        [Authorize(Roles = nameof(UserData.IsRootUser))]
         public IActionResult GetExtraFieldsModal(int importMode = 0)
         {
             var recordExtraFields = _extraFieldDataAccess.GetExtraFieldsById(importMode);
@@ -108,6 +115,7 @@ namespace CarCareTracker.Controllers
             }
             return PartialView("_ExtraFields", recordExtraFields);
         }
+        [Authorize(Roles = nameof(UserData.IsRootUser))]
         public IActionResult UpdateExtraFields(RecordExtraField record)
         {
             try

Helper/StaticHelper.cs

@@ -210,5 +210,9 @@ namespace CarCareTracker.Helper
             }
             return fuelEconomyUnit;
         }
+        public static long GetEpochFromDateTime(DateTime date)
+        {
+            return new DateTimeOffset(date).ToUnixTimeMilliseconds();
+        }
     }
 }

Logic/LoginLogic.cs

@@ -280,19 +280,32 @@ namespace CarCareTracker.Logic
         #region "Root User"
         public bool CreateRootUserCredentials(LoginModel credentials)
         {
-            var configFileContents = File.ReadAllText(StaticHelper.UserConfigPath);
-            var existingUserConfig = JsonSerializer.Deserialize<UserConfig>(configFileContents);
-            if (existingUserConfig is not null)
+            //check if file exists
+            if (File.Exists(StaticHelper.UserConfigPath))
             {
-                //create hashes of the login credentials.
-                var hashedUserName = GetHash(credentials.UserName);
-                var hashedPassword = GetHash(credentials.Password);
-                //copy over settings that are off limits on the settings page.
-                existingUserConfig.EnableAuth = true;
-                existingUserConfig.UserNameHash = hashedUserName;
-                existingUserConfig.UserPasswordHash = hashedPassword;
+                var configFileContents = File.ReadAllText(StaticHelper.UserConfigPath);
+                var existingUserConfig = JsonSerializer.Deserialize<UserConfig>(configFileContents);
+                if (existingUserConfig is not null)
+                {
+                    //create hashes of the login credentials.
+                    var hashedUserName = GetHash(credentials.UserName);
+                    var hashedPassword = GetHash(credentials.Password);
+                    //copy over settings that are off limits on the settings page.
+                    existingUserConfig.EnableAuth = true;
+                    existingUserConfig.UserNameHash = hashedUserName;
+                    existingUserConfig.UserPasswordHash = hashedPassword;
+                }
+                File.WriteAllText(StaticHelper.UserConfigPath, JsonSerializer.Serialize(existingUserConfig));
+            } else
+            {
+                var newUserConfig = new UserConfig()
+                {
+                    EnableAuth = true,
+                    UserNameHash = GetHash(credentials.UserName),
+                    UserPasswordHash = GetHash(credentials.Password)
+                };
+                File.WriteAllText(StaticHelper.UserConfigPath, JsonSerializer.Serialize(newUserConfig));
             }
-            File.WriteAllText(StaticHelper.UserConfigPath, JsonSerializer.Serialize(existingUserConfig));
             _cache.Remove("userConfig_-1");
             return true;
         }

Views/Home/_Calendar.cshtml

@@ -1,10 +1,11 @@
-@model List<ReminderRecordViewModel>
+@using CarCareTracker.Helper
+@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()')});
+        @:eventDates.push({ id: @reminderRecord.Id, date: decodeHTMLEntities('@StaticHelper.GetEpochFromDateTime(reminderRecord.Date)'), description: decodeHTMLEntities('@reminderRecord.Description'), urgency: decodeHTMLEntities('@reminderRecord.Urgency.ToString()') });
     }
 </script>
 <div class="row vehicleDetailTabContainer">
@@ -13,6 +14,12 @@
         </div>
     </div>
 </div>
+<div class="modal fade" data-bs-focus="false" id="reminderRecordCalendarModal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content" id="reminderRecordCalendarModalContent">
+        </div>
+    </div>
+</div>
 <script>
     initCalendar();
 </script>

Views/Home/_ReminderRecordCalendarModal.cshtml

@@ -0,0 +1,39 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@model ReminderRecordViewModel
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+}
+<div class="modal-header">
+    <h5 class="modal-title">@(translator.Translate(userLanguage, "View Reminder"))</h5>
+    <button type="button" class="btn-close" onclick="hideCalendarReminderModal()" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    <form>
+        <div class="form-group">
+            <div class="row">
+                <div class="col-md-6 col-12" id="reminderOptions">
+                    <input type="text" id="workAroundInput" style="height:0px; width:0px; display:none;">
+                    <label for="reminderDescription">@translator.Translate(userLanguage, "Date")</label>
+                    <input type="text" id="reminderDescription" readonly class="form-control" value="@Model.Date.ToShortDateString()">
+                    <label for="reminderDescription">@translator.Translate(userLanguage,"Description")</label>
+                    <input type="text" id="reminderDescription" readonly class="form-control" value="@Model.Description">
+                </div>
+                <div class="col-md-6 col-12">
+                    <label for="reminderNotes">@translator.Translate(userLanguage,"Notes")<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
+                    <textarea id="reminderNotes" readonly class="form-control" rows="5">@Model.Notes</textarea>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-danger" onclick="deleteCalendarReminderRecord(@Model.Id)" style="margin-right:auto;">@translator.Translate(userLanguage, "Delete")</button>
+    <button type="button" class="btn btn-secondary" onclick="hideCalendarReminderModal()">@translator.Translate(userLanguage, "Close")</button>
+    @if (Model.IsRecurring && (Model.Urgency == ReminderUrgency.VeryUrgent || Model.Urgency == ReminderUrgency.PastDue))
+    {
+        <button type="button" class="btn btn-primary" onclick="markDoneCalendarReminderRecord(@Model.Id)">@translator.Translate(userLanguage, "Mark as Done")</button>
+    }
+</div>

Views/Home/_Settings.cshtml

@@ -201,7 +201,7 @@
             <img src="/defaults/lubelogger_logo.png" />
         </div>
         <div class="d-flex justify-content-center">
-            <small class="text-body-secondary">Version 1.1.6</small>
+            <small class="text-body-secondary">Version 1.1.8</small>
         </div>
         <p class="lead">
             Proudly developed in the rural town of Price, Utah by Hargata Softworks.

wwwroot/css/site.css

@@ -304,7 +304,25 @@ input[type="file"] {
 .override-hide{
     display: none !important;
 }
-.reminderCalendarViewContent + .datepicker, .datepicker-inline, .datepicker-days, .table-condensed {
+.reminderCalendarViewContent .datepicker, .reminderCalendarViewContent .datepicker-inline, .reminderCalendarViewContent .datepicker-days, .reminderCalendarViewContent .table-condensed {
     width: 100%;
     height: 100%;
+    table-layout: fixed;
+    cursor: default;
+}
+.reminder-exist{
+    overflow:auto;
+    vertical-align:top;
+}
+.reminder-exist p{
+    margin:0;
+}
+.reminderCalendarViewContent .datepicker table tr td.day {
+    cursor: default;
+}
+.reminderCalendarViewContent .datepicker table tr td.day:hover {
+    cursor: default;
+}
+.reminder-calendar-item{
+    cursor: pointer;
 }

wwwroot/js/garage.js

@@ -62,30 +62,86 @@ function getVehicleCalendarEvents() {
         }
     });
 }
-function generateReminderItem(urgency, description) {
+function showCalendarReminderModal(id) {
+    event.stopPropagation();
+    $.get(`/Home/ViewCalendarReminder?reminderId=${id}`, function (data) {
+        if (data) {
+            $("#reminderRecordCalendarModalContent").html(data);
+            $("#reminderRecordCalendarModal").modal('show');
+            $('#reminderRecordCalendarModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("reminderNotes");
+                }
+            });
+        }
+    })
+}
+function hideCalendarReminderModal() {
+    $("#reminderRecordCalendarModal").modal('hide');
+}
+function generateReminderItem(id, urgency, description) {
     if (description.trim() == '') {
         return;
     }
     switch (urgency) {
         case "VeryUrgent":
-            return `<p class="badge text-wrap bg-danger">${description}</p>`;
+            return `<p class="badge text-wrap bg-danger reminder-calendar-item mb-2" onclick='showCalendarReminderModal(${id})'>${encodeHTMLInput(description)}</p>`;
         case "PastDue":
-            return `<p class="badge text-wrap bg-secondary">${description}</p>`;
+            return `<p class="badge text-wrap bg-secondary reminder-calendar-item mb-2" onclick='showCalendarReminderModal(${id})'>${encodeHTMLInput(description)}</p>`;
         case "Urgent":
-            return `<p class="badge text-wrap bg-warning">${description}</p>`;
+            return `<p class="badge text-wrap bg-warning reminder-calendar-item mb-2" onclick='showCalendarReminderModal(${id})'>${encodeHTMLInput(description)}</p>`;
         case "NotUrgent":
-            return `<p class="badge text-wrap bg-success">${description}</p>`;
+            return `<p class="badge text-wrap bg-success reminder-calendar-item mb-2" onclick='showCalendarReminderModal(${id})'>${encodeHTMLInput(description)}</p>`;
     }
 }
+function markDoneCalendarReminderRecord(reminderRecordId, e) {
+    event.stopPropagation();
+    $.post(`/Vehicle/PushbackRecurringReminderRecord?reminderRecordId=${reminderRecordId}`, function (data) {
+        if (data) {
+            hideCalendarReminderModal();
+            successToast("Reminder Updated");
+            getVehicleCalendarEvents();
+        } else {
+            errorToast(genericErrorMessage());
+        }
+    });
+}
+function deleteCalendarReminderRecord(reminderRecordId, e) {
+    if (e != undefined) {
+        event.stopPropagation();
+    }
+    $("#workAroundInput").show();
+    Swal.fire({
+        title: "Confirm Deletion?",
+        text: "Deleted Reminders cannot be restored.",
+        showCancelButton: true,
+        confirmButtonText: "Delete",
+        confirmButtonColor: "#dc3545"
+    }).then((result) => {
+        if (result.isConfirmed) {
+            $.post(`/Vehicle/DeleteReminderRecordById?reminderRecordId=${reminderRecordId}`, function (data) {
+                if (data) {
+                    hideCalendarReminderModal();
+                    successToast("Reminder Deleted");
+                    getVehicleCalendarEvents();
+                } else {
+                    errorToast(genericErrorMessage());
+                }
+            });
+        } else {
+            $("#workAroundInput").hide();
+        }
+    });
+}
 function initCalendar() {
     if (groupedDates.length == 0) {
         //group dates
         eventDates.map(x => {
-            var existingIndex = groupedDates.findIndex(y => y.date.getTime() == x.date.getTime());
+            var existingIndex = groupedDates.findIndex(y => y.date == x.date);
             if (existingIndex == -1) {
-                groupedDates.push({ date: x.date, reminders: [`${generateReminderItem(x.urgency, x.description)}`] });
+                groupedDates.push({ date: x.date, reminders: [`${generateReminderItem(x.id, x.urgency, x.description)}`] });
             } else if (existingIndex > -1) {
-                groupedDates[existingIndex].reminders.push(`${generateReminderItem(x.urgency, x.description)}`);
+                groupedDates[existingIndex].reminders.push(`${generateReminderItem(x.id, x.urgency, x.description)}`);
             }
         });
     }
@@ -94,12 +150,12 @@ function initCalendar() {
         format: getShortDatePattern().pattern,
         todayHighlight: true,
         beforeShowDay: function (date) {
-            var reminderDateIndex = groupedDates.findIndex(x => x.date.getTime() == date.getTime());
+            var reminderDateIndex = groupedDates.findIndex(x => (x.date == date.getTime() || x.date == (date.getTime() - date.getTimezoneOffset() * 60000))); //take into account server timezone offset
             if (reminderDateIndex > -1) {
                 return {
                     enabled: true,
                     classes: 'reminder-exist',
-                    content: `<div class='text-wrap'><p>${date.getDate()}</p>${groupedDates[reminderDateIndex].reminders.join('<br>')}</div>`
+                    content: `<div class='text-wrap' style='height:20px;'><p>${date.getDate()}</p>${groupedDates[reminderDateIndex].reminders.join('<br>')}</div>`
                 }
             }
         }

wwwroot/js/shared.js

@@ -160,6 +160,11 @@ function bindWindowResize() {
         hideMobileNav();
     });
 }
+function encodeHTMLInput(input) {
+    const encoded = document.createElement('div');
+    encoded.innerText = input;
+    return encoded.innerHTML;
+}
 function decodeHTMLEntities(text) {
     return $("<textarea/>")
         .html(text)