From 39a9d5f95b895e74bff1466bbd4ac60d6bc35e25 Mon Sep 17 00:00:00 2001 From: "DESKTOP-GENO133\\IvanPlex" Date: Sat, 3 Feb 2024 14:41:33 -0700 Subject: [PATCH] keyed up to odometer. --- Views/Vehicle/Index.cshtml | 56 +++++++++++----------- Views/Vehicle/_Collaborators.cshtml | 15 ++++-- Views/Vehicle/_CollisionRecords.cshtml | 4 +- Views/Vehicle/_CostMakeUpReport.cshtml | 21 ++++++-- Views/Vehicle/_GasCostByMonthReport.cshtml | 13 +++-- Views/Vehicle/_MPGByMonthReport.cshtml | 36 ++++++++------ Views/Vehicle/_NoteModal.cshtml | 21 ++++---- Views/Vehicle/_Notes.cshtml | 15 ++++-- Views/Vehicle/_OdometerRecordModal.cshtml | 37 +++++++------- Views/Vehicle/_OdometerRecords.cshtml | 25 +++++----- wwwroot/translations/en_US.json | 2 +- 11 files changed, 147 insertions(+), 98 deletions(-) diff --git a/Views/Vehicle/Index.cshtml b/Views/Vehicle/Index.cshtml index e6bac13..09bc16f 100644 --- a/Views/Vehicle/Index.cshtml +++ b/Views/Vehicle/Index.cshtml @@ -3,8 +3,10 @@ ViewData["Title"] = "LubeLogger - View Vehicle"; } @inject IConfigHelper config +@inject ITranslationHelper translator @{ var userConfig = config.GetUserConfig(User); + var userLanguage = userConfig.UserLanguage; } @model Vehicle @section Scripts { @@ -26,46 +28,46 @@
@@ -83,42 +85,42 @@
diff --git a/Views/Vehicle/_Collaborators.cshtml b/Views/Vehicle/_Collaborators.cshtml index 20fc53e..ed9a34f 100644 --- a/Views/Vehicle/_Collaborators.cshtml +++ b/Views/Vehicle/_Collaborators.cshtml @@ -1,7 +1,14 @@ -@model List +@using CarCareTracker.Helper +@inject IConfigHelper config +@inject ITranslationHelper translator +@{ + var userConfig = config.GetUserConfig(User); + var userLanguage = userConfig.UserLanguage; +} +@model List
- Collaborators + @translator.Translate(userLanguage, "Collaborators")
@@ -11,8 +18,8 @@ - - + + diff --git a/Views/Vehicle/_CollisionRecords.cshtml b/Views/Vehicle/_CollisionRecords.cshtml index c4e1b72..1e930d4 100644 --- a/Views/Vehicle/_CollisionRecords.cshtml +++ b/Views/Vehicle/_CollisionRecords.cshtml @@ -12,8 +12,8 @@
- @($"{@translator.Translate(userLanguage,"# of Repair Records")}: {Model.Count()}") - @($"{@translator.Translate(userLanguage,"Total")}: {Model.Sum(x => x.Cost).ToString("C")}") + @($"{translator.Translate(userLanguage,"# of Repair Records")}: {Model.Count()}") + @($"{translator.Translate(userLanguage,"Total")}: {Model.Sum(x => x.Cost).ToString("C")}") @foreach (string recordTag in recordTags) { @recordTag diff --git a/Views/Vehicle/_CostMakeUpReport.cshtml b/Views/Vehicle/_CostMakeUpReport.cshtml index 63ed97f..69b7784 100644 --- a/Views/Vehicle/_CostMakeUpReport.cshtml +++ b/Views/Vehicle/_CostMakeUpReport.cshtml @@ -1,4 +1,11 @@ -@model CostMakeUpForVehicle +@using CarCareTracker.Helper +@inject IConfigHelper config +@inject ITranslationHelper translator +@{ + var userConfig = config.GetUserConfig(User); + var userLanguage = userConfig.UserLanguage; +} +@model CostMakeUpForVehicle @if (Model.CollisionRecordSum + Model.ServiceRecordSum + Model.GasRecordSum + Model.TaxRecordSum + Model.UpgradeRecordSum > 0) { @@ -9,10 +16,14 @@ new Chart($("#pie-chart"), { type: 'pie', data: { - labels: ["Service Records", "Repairs", "Upgrades", "Tax", "Fuel"], + labels: ['@translator.Translate(userLanguage, "Service Records")', + '@translator.Translate(userLanguage, "Repairs")', + '@translator.Translate(userLanguage, "Upgrades")', + '@translator.Translate(userLanguage, "Tax")', + '@translator.Translate(userLanguage, "Fuel")'], datasets: [ { - label: "Expenses by Type", + label: '@translator.Translate(userLanguage,"Expenses by Type")', backgroundColor: ["#003f5c", "#58508d", "#bc5090", "#ff6361", "#ffa600"], data: [ globalParseFloat('@Model.ServiceRecordSum'), @@ -34,7 +45,7 @@ }, title: { display: true, - text: "Expenses by Type", + text: '@translator.Translate(userLanguage, "Expenses by Type")', color: useDarkMode ? "#fff" : "#000" }, } @@ -46,6 +57,6 @@ else {
-

No data found or all records have zero sums, insert records with non-zero sums to see visualizations here.

+

@translator.Translate(userLanguage, "No data found or all records have zero sums, insert records with non-zero sums to see visualizations here.")

} diff --git a/Views/Vehicle/_GasCostByMonthReport.cshtml b/Views/Vehicle/_GasCostByMonthReport.cshtml index 3c23c43..c70a5a4 100644 --- a/Views/Vehicle/_GasCostByMonthReport.cshtml +++ b/Views/Vehicle/_GasCostByMonthReport.cshtml @@ -1,5 +1,10 @@ -@model List +@using CarCareTracker.Helper +@inject IConfigHelper config +@inject ITranslationHelper translator +@model List @{ + var userConfig = config.GetUserConfig(User); + var userLanguage = userConfig.UserLanguage; var barGraphColors = new string[] { "#00876c", "#43956e", "#67a371", "#89b177", "#a9be80", "#c8cb8b", "#e6d79b", "#e4c281", "#e3ab6b", "#e2925b", "#e07952", "#db5d4f" }; var sortedByMPG = Model.OrderBy(x => x.Cost).ToList(); } @@ -27,7 +32,7 @@ labels: barGraphLabels, datasets: [ { - label: "Expenses by Month", + label: '@translator.Translate(userLanguage, "Expenses by Month")', backgroundColor: barGraphColors, data: barGraphData } @@ -38,7 +43,7 @@ title: { display: true, color: useDarkMode ? "#fff" : "#000", - text: 'Expenses by Month' + text: '@translator.Translate(userLanguage,"Expenses by Month")' }, legend: { display: false, @@ -67,6 +72,6 @@ } else {
-

No data found, insert/select some data to see visualizations here.

+

@translator.Translate(userLanguage,"No data found, insert/select some data to see visualizations here.")

} \ No newline at end of file diff --git a/Views/Vehicle/_MPGByMonthReport.cshtml b/Views/Vehicle/_MPGByMonthReport.cshtml index 7725c88..487162c 100644 --- a/Views/Vehicle/_MPGByMonthReport.cshtml +++ b/Views/Vehicle/_MPGByMonthReport.cshtml @@ -1,20 +1,25 @@ -@model List +@using CarCareTracker.Helper +@inject IConfigHelper config +@inject ITranslationHelper translator +@model List @{ - var barGraphColors = new string[] { "#00876c", "#43956e", "#67a371", "#89b177", "#a9be80", "#c8cb8b", "#e6d79b", "#e4c281", "#e3ab6b", "#e2925b", "#e07952", "#db5d4f" }; - var sortedByMPG = Model.OrderByDescending(x => x.Cost).ToList(); + var barGraphColors = new string[] { "#00876c", "#43956e", "#67a371", "#89b177", "#a9be80", "#c8cb8b", "#e6d79b", "#e4c281", "#e3ab6b", "#e2925b", "#e07952", "#db5d4f" }; + var sortedByMPG = Model.OrderByDescending(x => x.Cost).ToList(); + var userConfig = config.GetUserConfig(User); + var userLanguage = userConfig.UserLanguage; } -@if (Model.Where(x=>x.Cost > 0).Any()) +@if (Model.Where(x => x.Cost > 0).Any()) { - + -} else +} +else {
-

No data found, insert/select some data to see visualizations here.

+

@translator.Translate(userLanguage,"No data found, insert/select some data to see visualizations here.")

} \ No newline at end of file diff --git a/Views/Vehicle/_NoteModal.cshtml b/Views/Vehicle/_NoteModal.cshtml index 2038b24..9c03b18 100644 --- a/Views/Vehicle/_NoteModal.cshtml +++ b/Views/Vehicle/_NoteModal.cshtml @@ -1,9 +1,14 @@ -@model Note +@using CarCareTracker.Helper +@inject IConfigHelper config +@inject ITranslationHelper translator +@model Note @{ var isNew = Model.Id == 0; + var userConfig = config.GetUserConfig(User); + var userLanguage = userConfig.UserLanguage; }
-
@(isNew ? "Add New Note" : "Edit Note")
+
@(isNew ? translator.Translate(userLanguage, "Add New Note") : translator.Translate(userLanguage, "Edit Note"))
@@ -16,11 +21,11 @@
- - + +
- +
@@ -41,14 +46,14 @@ { } - + @if (isNew) { - + } else if (!isNew) { - + }
UsernameDelete@translator.Translate(userLanguage, "Username")@translator.Translate(userLanguage, "Delete")