From 4d76bd6d369449b8b133ebcd5a9e307afa43516a Mon Sep 17 00:00:00 2001 From: "DESKTOP-T0O5CDB\\DESK-555BD" Date: Wed, 15 Jan 2025 11:54:03 -0700 Subject: [PATCH] added printing functionality for notes, fuel, and tax. --- Controllers/VehicleController.cs | 27 +++++++++++++++++--- Models/Shared/StickerViewModel.cs | 1 + Views/Vehicle/_Gas.cshtml | 2 ++ Views/Vehicle/_Notes.cshtml | 3 +++ Views/Vehicle/_Stickers.cshtml | 42 +++++++++++++++++++++---------- Views/Vehicle/_TaxRecords.cshtml | 3 +++ 6 files changed, 61 insertions(+), 17 deletions(-) diff --git a/Controllers/VehicleController.cs b/Controllers/VehicleController.cs index 777273c..b41db09 100644 --- a/Controllers/VehicleController.cs +++ b/Controllers/VehicleController.cs @@ -965,7 +965,7 @@ namespace CarCareTracker.Controllers { return Json(result); } - var stickerViewModel = new StickerViewModel(); + var stickerViewModel = new StickerViewModel() { RecordType = importMode }; if (vehicleId != default) { var vehicleData = _dataAccess.GetVehicleById(vehicleId); @@ -1010,7 +1010,14 @@ namespace CarCareTracker.Controllers { foreach (int recordId in recordIds) { - //stickerViewModel.VehicleRecords.GasRecords.Add(_gasRecordDataAccess.GetGasRecordById(recordId)); + var record = _gasRecordDataAccess.GetGasRecordById(recordId); + stickerViewModel.GenericRecords.Add(new GenericRecord + { + Cost = record.Cost, + Date = record.Date, + Notes = record.Notes, + Mileage = record.Mileage + }); recordsAdded++; } @@ -1020,7 +1027,14 @@ namespace CarCareTracker.Controllers { foreach (int recordId in recordIds) { - //stickerViewModel.VehicleRecords.TaxRecords.Add(_taxRecordDataAccess.GetTaxRecordById(recordId)); + var record = _taxRecordDataAccess.GetTaxRecordById(recordId); + stickerViewModel.GenericRecords.Add(new GenericRecord + { + Description = record.Description, + Cost = record.Cost, + Notes = record.Notes, + Date = record.Date + }); recordsAdded++; } } @@ -1039,7 +1053,12 @@ namespace CarCareTracker.Controllers { foreach (int recordId in recordIds) { - //stickerViewModel.VehicleRecords.NoteRecords.Add(_noteDataAccess.GetNoteById(recordId)); + var record = _noteDataAccess.GetNoteById(recordId); + stickerViewModel.GenericRecords.Add(new GenericRecord + { + Description = record.Description, + Notes = record.NoteText + }); recordsAdded++; } diff --git a/Models/Shared/StickerViewModel.cs b/Models/Shared/StickerViewModel.cs index d0e2a05..3a2896c 100644 --- a/Models/Shared/StickerViewModel.cs +++ b/Models/Shared/StickerViewModel.cs @@ -2,6 +2,7 @@ { public class StickerViewModel { + public ImportMode RecordType { get; set; } public Vehicle VehicleData { get; set; } = new Vehicle(); public List ReminderRecords { get; set; } = new List(); public List GenericRecords { get; set; } = new List(); diff --git a/Views/Vehicle/_Gas.cshtml b/Views/Vehicle/_Gas.cshtml index 605b4c8..2125885 100644 --- a/Views/Vehicle/_Gas.cshtml +++ b/Views/Vehicle/_Gas.cshtml @@ -254,6 +254,8 @@
  • @translator.Translate(userLanguage, "Duplicate To Vehicle")
  • @translator.Translate(userLanguage, "Create Odometer")
    • +
  • @translator.Translate(userLanguage, "Print")
    • +
  • @translator.Translate(userLanguage, "Delete")
  • @translator.Translate(userLanguage, "Adjust Odometer")
    • diff --git a/Views/Vehicle/_Notes.cshtml b/Views/Vehicle/_Notes.cshtml index 48e896e..001c45c 100644 --- a/Views/Vehicle/_Notes.cshtml +++ b/Views/Vehicle/_Notes.cshtml @@ -109,5 +109,8 @@
  • @translator.Translate(userLanguage, "Duplicate")
  • @translator.Translate(userLanguage, "Duplicate To Vehicle")
    • +
    • +
  • @translator.Translate(userLanguage, "Print")
    • +
  • @translator.Translate(userLanguage, "Delete")
    • \ No newline at end of file diff --git a/Views/Vehicle/_Stickers.cshtml b/Views/Vehicle/_Stickers.cshtml index 9b6d414..1c31c6d 100644 --- a/Views/Vehicle/_Stickers.cshtml +++ b/Views/Vehicle/_Stickers.cshtml @@ -84,19 +84,35 @@
      -
    • - @($"{translator.Translate(userLanguage, "Description")}: {genericRecord.Description}") -
      • -
    • - @($"{translator.Translate(userLanguage, "Date")}: {genericRecord.Date.ToShortDateString()}") -
      • -
    • - @($"{translator.Translate(userLanguage, "Odometer")}: {genericRecord.Mileage}") -
      • -
    • - @($"{translator.Translate(userLanguage, "Cost")}: {genericRecord.Cost.ToString("C")}") -
      • - + @if(!string.IsNullOrWhiteSpace(genericRecord.Description)){ +
    • + @($"{translator.Translate(userLanguage, "Description")}: {genericRecord.Description}") +
      • + } + @switch(Model.RecordType){ + case ImportMode.ServiceRecord: + case ImportMode.RepairRecord: + case ImportMode.UpgradeRecord: + case ImportMode.GasRecord: +
    • + @($"{translator.Translate(userLanguage, "Date")}: {genericRecord.Date.ToShortDateString()}") +
      • +
    • + @($"{translator.Translate(userLanguage, "Odometer")}: {genericRecord.Mileage}") +
      • +
    • + @($"{translator.Translate(userLanguage, "Cost")}: {genericRecord.Cost.ToString("C")}") +
      • + break; + case ImportMode.TaxRecord: +
    • + @($"{translator.Translate(userLanguage, "Date")}: {genericRecord.Date.ToShortDateString()}") +
      • +
    • + @($"{translator.Translate(userLanguage, "Cost")}: {genericRecord.Cost.ToString("C")}") +
      • + break; + }
    diff --git a/Views/Vehicle/_TaxRecords.cshtml b/Views/Vehicle/_TaxRecords.cshtml index e7707c5..fb60990 100644 --- a/Views/Vehicle/_TaxRecords.cshtml +++ b/Views/Vehicle/_TaxRecords.cshtml @@ -170,6 +170,9 @@
  • @translator.Translate(userLanguage, "Duplicate")
  • @translator.Translate(userLanguage, "Duplicate To Vehicle")
    • +
    • +
  • @translator.Translate(userLanguage, "Print")
    • +
  • @translator.Translate(userLanguage, "Delete")
    • @if (userColumnPreferences.Any())