diff --git a/Views/Admin/Index.cshtml b/Views/Admin/Index.cshtml index 5a93ffe..171553a 100644 --- a/Views/Admin/Index.cshtml +++ b/Views/Admin/Index.cshtml @@ -56,8 +56,8 @@ Username + Email Is Admin - Reset Password Delete @@ -66,8 +66,8 @@ { @userData.UserName + @userData.EmailAddress @userData.Id - @userData.Id } @@ -77,6 +77,7 @@ + }
@@ -19,7 +20,10 @@ + - @@ -61,7 +62,10 @@
diff --git a/Views/Vehicle/_Report.cshtml b/Views/Vehicle/_Report.cshtml index 9cb0a6b..7d0d651 100644 --- a/Views/Vehicle/_Report.cshtml +++ b/Views/Vehicle/_Report.cshtml @@ -69,94 +69,16 @@
-
- -
-
-
- -
-
@await Html.PartialAsync("_Collaborators", Model.Collaborators)
+
+ +
+
+
+ +
+
-
- \ No newline at end of file +
\ No newline at end of file diff --git a/wwwroot/js/reports.js b/wwwroot/js/reports.js new file mode 100644 index 0000000..3137ea0 --- /dev/null +++ b/wwwroot/js/reports.js @@ -0,0 +1,76 @@ +function getYear() { + return $("#yearOption").val(); +} +function generateVehicleHistoryReport() { + var vehicleId = GetVehicleId().vehicleId; + $.get(`/Vehicle/GetVehicleHistory?vehicleId=${vehicleId}`, function (data) { + if (data) { + $("#vehicleHistoryReport").html(data); + setTimeout(function () { + window.print(); + }, 500); + } + }) +} +var debounce = null; +function updateCheck(sender) { + clearTimeout(debounce); + debounce = setTimeout(function () { + refreshBarChart(); + }, 1000); +} +function refreshBarChart(callBack) { + var selectedMetrics = []; + var vehicleId = GetVehicleId().vehicleId; + var year = getYear(); + + if ($("#serviceExpenseCheck").is(":checked")) { + selectedMetrics.push('ServiceRecord'); + } + if ($("#repairExpenseCheck").is(":checked")) { + selectedMetrics.push('RepairRecord'); + } + if ($("#upgradeExpenseCheck").is(":checked")) { + selectedMetrics.push('UpgradeRecord'); + } + if ($("#gasExpenseCheck").is(":checked")) { + selectedMetrics.push('GasRecord'); + } + if ($("#taxExpenseCheck").is(":checked")) { + selectedMetrics.push('TaxRecord'); + } + + $.post('/Vehicle/GetCostByMonthByVehicle', + { + vehicleId: vehicleId, + selectedMetrics: selectedMetrics, + year: year + }, function (data) { + $("#gasCostByMonthReportContent").html(data); + if (callBack != undefined) { + callBack(); + } + }); +} +function updateReminderPie() { + var vehicleId = GetVehicleId().vehicleId; + var daysToAdd = $("#reminderOption").val(); + $.get(`/Vehicle/GetReminderMakeUpByVehicle?vehicleId=${vehicleId}`, { daysToAdd: daysToAdd }, function (data) { + $("#reminderMakeUpReportContent").html(data); + }); +} +//called when year selected is changed. +function yearUpdated() { + var vehicleId = GetVehicleId().vehicleId; + var year = getYear(); + $.get(`/Vehicle/GetCostMakeUpForVehicle?vehicleId=${vehicleId}`, { year: year }, function (data) { + $("#costMakeUpReportContent").html(data); + refreshBarChart(); + }) +} +function refreshCollaborators() { + var vehicleId = GetVehicleId().vehicleId; + $.get(`/Vehicle/GetCollaboratorsForVehicle?vehicleId=${vehicleId}`, function (data) { + $("#collaboratorContent").html(data); + }); +} \ No newline at end of file diff --git a/wwwroot/js/vehicle.js b/wwwroot/js/vehicle.js index 788b23b..a104a78 100644 --- a/wwwroot/js/vehicle.js +++ b/wwwroot/js/vehicle.js @@ -58,7 +58,7 @@ $(document).ready(function () { break; } }); - getVehicleServiceRecords(vehicleId); + getVehicleReport(vehicleId); }); function getVehicleNotes(vehicleId) {