Merge pull request #389 from hargata/Hargata/odo.changes

added support for meta key for MacOS users
hargata · Mar 11, 2024 · 7fb3a80 · 7fb3a80
2 parents 91e8526 + f277048
commit 7fb3a80
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/Controllers/VehicleController.cs b/Controllers/VehicleController.cs
@@ -2071,6 +2071,14 @@ public IActionResult DeletePlanRecordById(int planRecordId)
         #endregion
         #region "Odometer Records"
         [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpPost]
+        public IActionResult ForceRecalculateDistanceByVehicleId(int vehicleId)
+        {
+            var result = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
+            result = _odometerLogic.AutoConvertOdometerRecord(result);
+            return Json(result.Any());
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetOdometerRecordsByVehicleId(int vehicleId)
         {

diff --git a/Views/Vehicle/_OdometerRecords.cshtml b/Views/Vehicle/_OdometerRecords.cshtml
@@ -149,6 +149,8 @@
 <ul class="table-context-menu dropdown-menu" style="display:none;">
     <li><a class="context-menu-multiple context-menu-select-all dropdown-item" href="#" onclick="selectAllRows()">@translator.Translate(userLanguage, "Select All")</a></li>
     <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="clearSelectedRows()">@translator.Translate(userLanguage, "Deselect All")</a></li>
+    <li><hr class="context-menu-multiple context-menu-deselect-all dropdown-divider"></li>
+    <li><a class="context-menu-multiple context-menu-deselect-all dropdown-item" href="#" onclick="recalculateDistance()">@translator.Translate(userLanguage, "Recalculate Distance")</a></li>
     <li><hr class="context-menu-multiple dropdown-divider"></li>
     <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'OdometerRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
     <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'OdometerRecord')">@translator.Translate(userLanguage, "Delete")</a></li>

diff --git a/wwwroot/defaults/en_US.json b/wwwroot/defaults/en_US.json
diff --git a/wwwroot/js/odometerrecord.js b/wwwroot/js/odometerrecord.js
@@ -120,4 +120,18 @@ function getAndValidateOdometerRecordValues() {
         files: uploadedFiles,
         extraFields: extraFields.extraFields
     }
+}
+
+function recalculateDistance() {
+    //force distance recalculation
+    //reserved for when data is incoherent with negative distances due to non-chronologica order of odometer records.
+    var vehicleId = GetVehicleId().vehicleId
+    $.post(`/Vehicle/ForceRecalculateDistanceByVehicleId?vehicleId=${vehicleId}`, function (data) {
+        if (data) {
+            successToast("Odometer Records Updated")
+            getVehicleOdometerRecords(vehicleId);
+        } else {
+            errorToast(genericErrorMessage());
+        }
+    });
 }
diff --git a/wwwroot/js/shared.js b/wwwroot/js/shared.js
@@ -653,7 +653,7 @@ $(window).on('mousedown', function (e) {
 $(window).on('keydown', function (e) {
     var userOnInput = $(e.target).is("input") || $(e.target).is("textarea");
     if (!userOnInput) {
-        if (e.ctrlKey && e.which == 65) {
+        if ((e.ctrlKey || e.metaKey) && e.which == 65) {
             e.preventDefault();
             e.stopPropagation();
             selectAllRows();
@@ -672,7 +672,7 @@ function rangeMouseDown(e) {
         return;
     }
     var contextMenuAction = $(e.target).is(".table-context-menu > li > .dropdown-item")
-    if (!e.ctrlKey && !contextMenuAction) {
+    if (!(e.ctrlKey || e.metaKey) && !contextMenuAction) {
         clearSelectedRows();
     }
     isDragging = true;
@@ -796,7 +796,7 @@ function getMenuPosition(mouse, direction, scrollDir) {
     return position;
 }
 function handleTableRowClick(e, callBack, rowId) {
-    if (!event.ctrlKey) {
+    if (!(event.ctrlKey || event.metaKey)) {
         callBack(rowId);
     } else if (!$(e).hasClass('table-active')) {
         addToSelectedRows($(e).attr('data-rowId'));