cphipps/lubelog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added sticker viewModel and some code cleanup.

Browse Source
This commit is contained in:
DESKTOP-T0O5CDB\DESK-555BD
2025-01-12 12:28:14 -07:00
parent fdbb325611
commit c6f49bafca
3 changed files with 57 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
Controllers/VehicleController.cs
View File

@@ -1,12 +1,12 @@
using CarCareTracker.External.Interfaces; using CarCareTracker.External.Interfaces;
using CarCareTracker.Models;
using Microsoft.AspNetCore.Mvc;
using CarCareTracker.Helper;
using System.Globalization;
using Microsoft.AspNetCore.Authorization;
using System.Security.Claims;
using CarCareTracker.Logic;
using CarCareTracker.Filter; using CarCareTracker.Filter;
using CarCareTracker.Helper;
using CarCareTracker.Logic;
using CarCareTracker.Models;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using System.Globalization;
using System.Security.Claims;
using System.Text.Json; using System.Text.Json;
namespace CarCareTracker.Controllers namespace CarCareTracker.Controllers
@@ -131,7 +131,8 @@ namespace CarCareTracker.Controllers
{ {
_userLogic.AddUserAccessToVehicle(GetUserID(), vehicleInput.Id); _userLogic.AddUserAccessToVehicle(GetUserID(), vehicleInput.Id);
StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic($"Created Vehicle {vehicleInput.Year} {vehicleInput.Make} {vehicleInput.Model}({StaticHelper.GetVehicleIdentifier(vehicleInput)})", "vehicle.add", User.Identity.Name, vehicleInput.Id.ToString())); StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic($"Created Vehicle {vehicleInput.Year} {vehicleInput.Make} {vehicleInput.Model}({StaticHelper.GetVehicleIdentifier(vehicleInput)})", "vehicle.add", User.Identity.Name, vehicleInput.Id.ToString()));
} else }
else
{ {
StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic($"Updated Vehicle {vehicleInput.Year} {vehicleInput.Make} {vehicleInput.Model}({StaticHelper.GetVehicleIdentifier(vehicleInput)})", "vehicle.update", User.Identity.Name, vehicleInput.Id.ToString())); StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic($"Updated Vehicle {vehicleInput.Year} {vehicleInput.Make} {vehicleInput.Model}({StaticHelper.GetVehicleIdentifier(vehicleInput)})", "vehicle.update", User.Identity.Name, vehicleInput.Id.ToString()));
} }
@@ -198,7 +199,7 @@ namespace CarCareTracker.Controllers
return Json(OperationResponse.Failed()); return Json(OperationResponse.Failed());
} }
} }
#region "Shared Methods" #region "Shared Methods"
[HttpPost] [HttpPost]
public IActionResult GetFilesPendingUpload(List<UploadedFiles> uploadedFiles) public IActionResult GetFilesPendingUpload(List<UploadedFiles> uploadedFiles)
@@ -215,7 +216,7 @@ namespace CarCareTracker.Controllers
{ {
return Json(searchResults); return Json(searchResults);
} }
foreach(ImportMode visibleTab in _config.GetUserConfig(User).VisibleTabs) foreach (ImportMode visibleTab in _config.GetUserConfig(User).VisibleTabs)
{ {
switch (visibleTab) switch (visibleTab)
{ {
@@ -843,14 +844,15 @@ namespace CarCareTracker.Controllers
} }
if (extraFieldIsEdited) if (extraFieldIsEdited)
{ {
foreach(ExtraField extraField in genericRecordEditModel.EditRecord.ExtraFields) foreach (ExtraField extraField in genericRecordEditModel.EditRecord.ExtraFields)
{ {
if (existingRecord.ExtraFields.Any(x=>x.Name == extraField.Name)) if (existingRecord.ExtraFields.Any(x => x.Name == extraField.Name))
{ {
var insertIndex = existingRecord.ExtraFields.FindIndex(x => x.Name == extraField.Name); var insertIndex = existingRecord.ExtraFields.FindIndex(x => x.Name == extraField.Name);
existingRecord.ExtraFields.RemoveAll(x => x.Name == extraField.Name); existingRecord.ExtraFields.RemoveAll(x => x.Name == extraField.Name);
existingRecord.ExtraFields.Insert(insertIndex, extraField); existingRecord.ExtraFields.Insert(insertIndex, extraField);
} else }
else
{ {
existingRecord.ExtraFields.Add(extraField); existingRecord.ExtraFields.Add(extraField);
} }
@@ -956,108 +958,110 @@ namespace CarCareTracker.Controllers
return Json(result); return Json(result);
} }
[HttpPost] [HttpPost]
public IActionResult PrintRecordStickers(List<int> recordIds, ImportMode importMode) public IActionResult PrintRecordStickers(int vehicleId, List<int> recordIds, ImportMode importMode)
{ {
bool result = false; bool result = false;
if (!recordIds.Any()) if (!recordIds.Any())
{ {
return Json(result); return Json(result);
} }
var stickerViewModel = new StickerViewModel();
int recordsAdded = 0;
switch (importMode) switch (importMode)
{ {
case ImportMode.ServiceRecord: case ImportMode.ServiceRecord:
{ {
var records = new List<ServiceRecord>(); foreach (int recordId in recordIds)
foreach(int recordId in recordIds)
{ {
records.Add(_serviceRecordDataAccess.GetServiceRecordById(recordId)); stickerViewModel.VehicleRecords.ServiceRecords.Add(_serviceRecordDataAccess.GetServiceRecordById(recordId));
recordsAdded++;
} }
} }
break; break;
case ImportMode.RepairRecord: case ImportMode.RepairRecord:
{ {
var records = new List<CollisionRecord>();
foreach (int recordId in recordIds) foreach (int recordId in recordIds)
{ {
records.Add(_collisionRecordDataAccess.GetCollisionRecordById(recordId)); stickerViewModel.VehicleRecords.CollisionRecords.Add(_collisionRecordDataAccess.GetCollisionRecordById(recordId));
recordsAdded++;
} }
} }
break; break;
case ImportMode.UpgradeRecord: case ImportMode.UpgradeRecord:
{ {
var records = new List<UpgradeRecord>();
foreach (int recordId in recordIds) foreach (int recordId in recordIds)
{ {
records.Add(_upgradeRecordDataAccess.GetUpgradeRecordById(recordId)); stickerViewModel.VehicleRecords.UpgradeRecords.Add(_upgradeRecordDataAccess.GetUpgradeRecordById(recordId));
recordsAdded++;
} }
} }
break; break;
case ImportMode.GasRecord: case ImportMode.GasRecord:
{ {
var records = new List<GasRecord>();
foreach (int recordId in recordIds) foreach (int recordId in recordIds)
{ {
records.Add(_gasRecordDataAccess.GetGasRecordById(recordId)); stickerViewModel.VehicleRecords.GasRecords.Add(_gasRecordDataAccess.GetGasRecordById(recordId));
recordsAdded++;
} }
} }
break; break;
case ImportMode.TaxRecord: case ImportMode.TaxRecord:
{ {
var records = new List<TaxRecord>();
foreach (int recordId in recordIds) foreach (int recordId in recordIds)
{ {
records.Add(_taxRecordDataAccess.GetTaxRecordById(recordId)); stickerViewModel.VehicleRecords.TaxRecords.Add(_taxRecordDataAccess.GetTaxRecordById(recordId));
recordsAdded++;
} }
} }
break; break;
case ImportMode.SupplyRecord: case ImportMode.SupplyRecord:
{ {
var records = new List<SupplyRecord>();
foreach (int recordId in recordIds) foreach (int recordId in recordIds)
{ {
records.Add(_supplyRecordDataAccess.GetSupplyRecordById(recordId)); stickerViewModel.VehicleRecords.SupplyRecords.Add(_supplyRecordDataAccess.GetSupplyRecordById(recordId));
recordsAdded++;
} }
} }
break; break;
case ImportMode.NoteRecord: case ImportMode.NoteRecord:
{ {
var records = new List<Note>();
foreach (int recordId in recordIds) foreach (int recordId in recordIds)
{ {
records.Add(_noteDataAccess.GetNoteById(recordId)); stickerViewModel.VehicleRecords.NoteRecords.Add(_noteDataAccess.GetNoteById(recordId));
recordsAdded++;
} }
} }
break; break;
case ImportMode.OdometerRecord: case ImportMode.OdometerRecord:
{ {
var records = new List<OdometerRecord>();
foreach (int recordId in recordIds) foreach (int recordId in recordIds)
{ {
records.Add(_odometerRecordDataAccess.GetOdometerRecordById(recordId)); stickerViewModel.VehicleRecords.OdometerRecords.Add(_odometerRecordDataAccess.GetOdometerRecordById(recordId));
recordsAdded++;
} }
} }
break; break;
case ImportMode.ReminderRecord: case ImportMode.ReminderRecord:
{ {
var records = new List<ReminderRecord>();
foreach (int recordId in recordIds) foreach (int recordId in recordIds)
{ {
records.Add(_reminderRecordDataAccess.GetReminderRecordById(recordId)); stickerViewModel.VehicleRecords.ReminderRecords.Add(_reminderRecordDataAccess.GetReminderRecordById(recordId));
recordsAdded++;
} }
} }
break; break;
case ImportMode.PlanRecord: case ImportMode.PlanRecord:
{ {
var records = new List<PlanRecord>();
foreach (int recordId in recordIds) foreach (int recordId in recordIds)
{ {
records.Add(_planRecordDataAccess.GetPlanRecordById(recordId)); stickerViewModel.VehicleRecords.PlanRecords.Add(_planRecordDataAccess.GetPlanRecordById(recordId));
recordsAdded++;
} }
} }
break; break;

8
Models/Shared/StickerViewModel.cs Normal file
View File

@@ -0,0 +1,8 @@
namespace CarCareTracker.Models
{
public class StickerViewModel
{
public Vehicle VehicleData { get; set; } = new Vehicle();
public VehicleRecords VehicleRecords { get; set; } = new VehicleRecords();
}
}

4
Models/Shared/VehicleRecords.cs
View File

@@ -8,5 +8,9 @@
public List<GasRecord> GasRecords { get; set; } = new List<GasRecord>(); public List<GasRecord> GasRecords { get; set; } = new List<GasRecord>();
public List<TaxRecord> TaxRecords { get; set; } = new List<TaxRecord>(); public List<TaxRecord> TaxRecords { get; set; } = new List<TaxRecord>();
public List<OdometerRecord> OdometerRecords { get; set; } = new List<OdometerRecord>(); public List<OdometerRecord> OdometerRecords { get; set; } = new List<OdometerRecord>();
public List<ReminderRecord> ReminderRecords { get; set; } = new List<ReminderRecord>();
public List<PlanRecord> PlanRecords { get; set; } = new List<PlanRecord>();
public List<Note> NoteRecords { get; set; } = new List<Note>();
public List<SupplyRecord> SupplyRecords { get; set; } = new List<SupplyRecord>();
} }
} }