Merge pull request #369 from hargata/Hargata/delta.stats

Added Total and Average Cost
hargata · Mar 6, 2024 · eb03979 · eb03979
2 parents 48c388d + ebe871b
commit eb03979
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/wwwroot/js/gasrecord.js b/wwwroot/js/gasrecord.js
@@ -403,6 +403,16 @@ function searchGasTableRows() {
         if (result.isConfirmed) {
             var rowData = $(`#${tabName} table tbody tr`);
             var filteredRows = $(`#${tabName} table tbody tr td:contains('${result.value.searchString}')`).parent();
+            var splitSearchString = result.value.searchString.split('=');
+            if (result.value.searchString.includes('=') && splitSearchString.length == 2) {
+                //column specific search.
+                //get column index
+                var columns = $(`#${tabName} table th`).toArray().map(x => x.innerText);
+                var columnName = splitSearchString[0];
+                var colSearchString = splitSearchString[1];
+                var colIndex = columns.findIndex(x => x == columnName) + 1;
+                filteredRows = $(`#${tabName} table tbody tr td:nth-child(${colIndex}):contains('${colSearchString}')`).parent();
+            }
             if (result.value.searchString.trim() == '') {
                 rowData.removeClass('override-hide');
             } else {

diff --git a/wwwroot/js/shared.js b/wwwroot/js/shared.js
@@ -909,6 +909,16 @@ function searchTableRows(tabName) {
         if (result.isConfirmed) {
             var rowData = $(`#${tabName} table tbody tr`);
             var filteredRows = $(`#${tabName} table tbody tr td:contains('${result.value.searchString}')`).parent();
+            var splitSearchString = result.value.searchString.split('=');
+            if (result.value.searchString.includes('=') && splitSearchString.length == 2) {
+                //column specific search.
+                //get column index
+                var columns = $(`#${tabName} table th`).toArray().map(x => x.innerText);
+                var columnName = splitSearchString[0];
+                var colSearchString = splitSearchString[1];
+                var colIndex = columns.findIndex(x => x == columnName) + 1;
+                filteredRows = $(`#${tabName} table tbody tr td:nth-child(${colIndex}):contains('${colSearchString}')`).parent();
+            }
             if (result.value.searchString.trim() == '') {
                 rowData.removeClass('override-hide');
             } else {

diff --git a/wwwroot/js/vehicle.js b/wwwroot/js/vehicle.js
@@ -447,6 +447,7 @@ function getRecordsDeltaStats(recordIds) {
     }
     var odometerReadings = [];
     var dateReadings = [];
+    var costReadings = [];
     //get all of the odometer readings
     recordIds.map(x => {
         var odometerReading = parseInt($(`tr[data-rowId='${x}'] td[data-column='odometer']`).text());
@@ -457,21 +458,36 @@ function getRecordsDeltaStats(recordIds) {
         if (!isNaN(dateReading)) {
             dateReadings.push(dateReading);
         }
+        var costReading = globalParseFloat($(`tr[data-rowId='${x}'] td[data-column='cost']`).text());
+        if (costReading > 0) {
+            costReadings.push(costReading);
+        }
     });
     //get max stats
     var maxOdo = odometerReadings.length > 0 ? odometerReadings.reduce((a, b) => a > b ? a : b) : 0;
     var maxDate = dateReadings.length > 0 ? dateReadings.reduce((a, b) => a > b ? a : b) : 0;
     //get min stats
     var minOdo = odometerReadings.length > 0 ? odometerReadings.reduce((a, b) => a < b ? a : b) : 0;
     var minDate = dateReadings.length > 0 ? dateReadings.reduce((a, b) => a < b ? a : b) : 0;
+    //get sum of costs
+    var costSum = costReadings.length > 0 ? costReadings.reduce((a, b) => a + b) : 0;
     var diffOdo = maxOdo - minOdo;
     var diffDate = maxDate - minDate;
     var divisibleCount = recordIds.length - 1;
     var averageOdo = diffOdo > 0 ? (diffOdo / divisibleCount).toFixed(2) : 0;
     var averageDays = diffDate > 0 ? Math.floor((diffDate / divisibleCount) / 8.64e7) : 0;
+    var averageSum = costSum > 0 ? (costSum / divisibleCount).toFixed(2) : 0;
+    costSum = costSum.toFixed(2);
     Swal.fire({
         title: "Record Statistics",
-        html: `<p>Average Distance Traveled between Records: ${averageOdo}</p><br /><p>Average Days between Records: ${averageDays}</p>`,
+        html: `<p>Average Distance Traveled between Records: ${averageOdo}</p>
+                <br />
+                <p>Average Days between Records: ${averageDays}</p>
+                <br />
+                <p>Total Cost: ${getGlobalConfig().currencySymbol} ${costSum}</p>
+                <br />
+                <p>Average Cost: ${getGlobalConfig().currencySymbol} ${averageSum}</p>`
+        ,
         icon: "info"
     });
 }