From a749de71e90d50507756f65042284bf743525850 Mon Sep 17 00:00:00 2001 From: "DESKTOP-T0O5CDB\\DESK-555BD" Date: Wed, 18 Jun 2025 17:06:10 -0600 Subject: [PATCH] cleaned up code. --- Controllers/APIController.cs | 7 +++---- Controllers/FilesController.cs | 2 +- Controllers/Vehicle/GasController.cs | 2 +- Controllers/Vehicle/NoteController.cs | 2 +- Controllers/Vehicle/OdometerController.cs | 2 +- Controllers/Vehicle/PlanController.cs | 4 ++-- Controllers/Vehicle/RepairController.cs | 2 +- Controllers/Vehicle/ServiceController.cs | 2 +- Controllers/Vehicle/SupplyController.cs | 2 +- Controllers/Vehicle/TaxController.cs | 2 +- Controllers/Vehicle/UpgradeController.cs | 2 +- Enum/FileUploadType.cs | 8 -------- Helper/StaticHelper.cs | 5 +++-- Models/Shared/ImportModel.cs | 6 ------ Models/Shared/UploadedFiles.cs | 2 -- Views/Vehicle/_FilesToUpload.cshtml | 2 +- Views/Vehicle/_UploadedFiles.cshtml | 4 ++-- wwwroot/js/shared.js | 2 +- 18 files changed, 21 insertions(+), 37 deletions(-) delete mode 100644 Enum/FileUploadType.cs diff --git a/Controllers/APIController.cs b/Controllers/APIController.cs index ae292c0..190a2b2 100644 --- a/Controllers/APIController.cs +++ b/Controllers/APIController.cs @@ -1868,7 +1868,7 @@ namespace CarCareTracker.Controllers { if (documents.Any()) { - List uploadedFiles = new List(); + List uploadedFiles = new List(); string uploadDirectory = "documents/"; string uploadPath = Path.Combine(_webEnv.ContentRootPath, "data", uploadDirectory); if (!Directory.Exists(uploadPath)) @@ -1881,11 +1881,10 @@ namespace CarCareTracker.Controllers { document.CopyTo(stream); } - uploadedFiles.Add(new UploadedFileExportModel + uploadedFiles.Add(new UploadedFiles { Location = Path.Combine("/", uploadDirectory, fileName), - Name = Path.GetFileName(document.FileName), - UploadType = FileUploadType.File.ToString() + Name = Path.GetFileName(document.FileName) }); } return Json(uploadedFiles); diff --git a/Controllers/FilesController.cs b/Controllers/FilesController.cs index 30d31cd..577add8 100644 --- a/Controllers/FilesController.cs +++ b/Controllers/FilesController.cs @@ -53,7 +53,7 @@ namespace CarCareTracker.Controllers foreach (IFormFile fileToUpload in file) { var fileName = UploadFile(fileToUpload); - uploadedFiles.Add(new UploadedFiles { Name = fileToUpload.FileName, Location = fileName, UploadType = FileUploadType.File, IsPending = true}); + uploadedFiles.Add(new UploadedFiles { Name = fileToUpload.FileName, Location = fileName, IsPending = true}); } return Json(uploadedFiles); } diff --git a/Controllers/Vehicle/GasController.cs b/Controllers/Vehicle/GasController.cs index 738b3ce..4380202 100644 --- a/Controllers/Vehicle/GasController.cs +++ b/Controllers/Vehicle/GasController.cs @@ -50,7 +50,7 @@ namespace CarCareTracker.Controllers Notes = $"Auto Insert From Gas Record. {gasRecord.Notes}" }); } - gasRecord.Files = gasRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, UploadType = x.UploadType, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); + gasRecord.Files = gasRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); var result = _gasRecordDataAccess.SaveGasRecordToVehicle(gasRecord.ToGasRecord()); if (result) { diff --git a/Controllers/Vehicle/NoteController.cs b/Controllers/Vehicle/NoteController.cs index 0e7bede..b90df5d 100644 --- a/Controllers/Vehicle/NoteController.cs +++ b/Controllers/Vehicle/NoteController.cs @@ -31,7 +31,7 @@ namespace CarCareTracker.Controllers { return Json(false); } - note.Files = note.Files.Select(x => { return new UploadedFiles { Name = x.Name, UploadType = x.UploadType, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); + note.Files = note.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); bool isCreate = note.Id == default; //needed here since Notes don't use an input object. var result = _noteDataAccess.SaveNoteToVehicle(note); if (result) diff --git a/Controllers/Vehicle/OdometerController.cs b/Controllers/Vehicle/OdometerController.cs index d0be719..cb645c8 100644 --- a/Controllers/Vehicle/OdometerController.cs +++ b/Controllers/Vehicle/OdometerController.cs @@ -45,7 +45,7 @@ namespace CarCareTracker.Controllers return Json(false); } //move files from temp. - odometerRecord.Files = odometerRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, UploadType = x.UploadType, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); + odometerRecord.Files = odometerRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); var result = _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord.ToOdometerRecord()); if (result) { diff --git a/Controllers/Vehicle/PlanController.cs b/Controllers/Vehicle/PlanController.cs index 20fec3c..c8fba57 100644 --- a/Controllers/Vehicle/PlanController.cs +++ b/Controllers/Vehicle/PlanController.cs @@ -29,7 +29,7 @@ namespace CarCareTracker.Controllers } planRecord.DateModified = DateTime.Now.ToString("G"); //move files from temp. - planRecord.Files = planRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, UploadType = x.UploadType, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); + planRecord.Files = planRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); if (planRecord.Supplies.Any()) { planRecord.RequisitionHistory.AddRange(RequisitionSupplyRecordsByUsage(planRecord.Supplies, DateTime.Parse(planRecord.DateCreated), planRecord.Description)); @@ -63,7 +63,7 @@ namespace CarCareTracker.Controllers { return Json(OperationResponse.Failed("A template with that description already exists for this vehicle")); } - planRecord.Files = planRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, UploadType = x.UploadType, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); + planRecord.Files = planRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); var result = _planRecordTemplateDataAccess.SavePlanRecordTemplateToVehicle(planRecord); return Json(OperationResponse.Conditional(result, "Template Added", string.Empty)); } diff --git a/Controllers/Vehicle/RepairController.cs b/Controllers/Vehicle/RepairController.cs index 031d42e..c60d929 100644 --- a/Controllers/Vehicle/RepairController.cs +++ b/Controllers/Vehicle/RepairController.cs @@ -42,7 +42,7 @@ namespace CarCareTracker.Controllers }); } //move files from temp. - collisionRecord.Files = collisionRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, UploadType = x.UploadType, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); + collisionRecord.Files = collisionRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); if (collisionRecord.Supplies.Any()) { collisionRecord.RequisitionHistory.AddRange(RequisitionSupplyRecordsByUsage(collisionRecord.Supplies, DateTime.Parse(collisionRecord.Date), collisionRecord.Description)); diff --git a/Controllers/Vehicle/ServiceController.cs b/Controllers/Vehicle/ServiceController.cs index 3398870..1ab9ccb 100644 --- a/Controllers/Vehicle/ServiceController.cs +++ b/Controllers/Vehicle/ServiceController.cs @@ -42,7 +42,7 @@ namespace CarCareTracker.Controllers }); } //move files from temp. - serviceRecord.Files = serviceRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, UploadType = x.UploadType, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); + serviceRecord.Files = serviceRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); if (serviceRecord.Supplies.Any()) { serviceRecord.RequisitionHistory.AddRange(RequisitionSupplyRecordsByUsage(serviceRecord.Supplies, DateTime.Parse(serviceRecord.Date), serviceRecord.Description)); diff --git a/Controllers/Vehicle/SupplyController.cs b/Controllers/Vehicle/SupplyController.cs index 5d3d72e..b742fc4 100644 --- a/Controllers/Vehicle/SupplyController.cs +++ b/Controllers/Vehicle/SupplyController.cs @@ -146,7 +146,7 @@ namespace CarCareTracker.Controllers public IActionResult SaveSupplyRecordToVehicleId(SupplyRecordInput supplyRecord) { //move files from temp. - supplyRecord.Files = supplyRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, UploadType = x.UploadType, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); + supplyRecord.Files = supplyRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); var result = _supplyRecordDataAccess.SaveSupplyRecordToVehicle(supplyRecord.ToSupplyRecord()); if (result) { diff --git a/Controllers/Vehicle/TaxController.cs b/Controllers/Vehicle/TaxController.cs index 42be092..8eef08d 100644 --- a/Controllers/Vehicle/TaxController.cs +++ b/Controllers/Vehicle/TaxController.cs @@ -47,7 +47,7 @@ namespace CarCareTracker.Controllers return Json(false); } //move files from temp. - taxRecord.Files = taxRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, UploadType = x.UploadType, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); + taxRecord.Files = taxRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); //push back any reminders if (taxRecord.ReminderRecordId.Any()) { diff --git a/Controllers/Vehicle/UpgradeController.cs b/Controllers/Vehicle/UpgradeController.cs index 0331471..6992466 100644 --- a/Controllers/Vehicle/UpgradeController.cs +++ b/Controllers/Vehicle/UpgradeController.cs @@ -42,7 +42,7 @@ namespace CarCareTracker.Controllers }); } //move files from temp. - upgradeRecord.Files = upgradeRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, UploadType = x.UploadType, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); + upgradeRecord.Files = upgradeRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); if (upgradeRecord.Supplies.Any()) { upgradeRecord.RequisitionHistory.AddRange(RequisitionSupplyRecordsByUsage(upgradeRecord.Supplies, DateTime.Parse(upgradeRecord.Date), upgradeRecord.Description)); diff --git a/Enum/FileUploadType.cs b/Enum/FileUploadType.cs deleted file mode 100644 index 9995bd1..0000000 --- a/Enum/FileUploadType.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace CarCareTracker.Models -{ - public enum FileUploadType - { - File = 0, - Link = 1 - } -} diff --git a/Helper/StaticHelper.cs b/Helper/StaticHelper.cs index 968c184..1286f15 100644 --- a/Helper/StaticHelper.cs +++ b/Helper/StaticHelper.cs @@ -727,9 +727,10 @@ namespace CarCareTracker.Helper return string.IsNullOrWhiteSpace(decorations) ? input.ToString("C2") : $"{input.ToString("C2")}{decorations}"; } } - public static string GetIconByFileExtension(FileUploadType uploadType, string fileExt) + public static string GetIconByFileExtension(string fileLocation) { - if (uploadType == FileUploadType.Link) + var fileExt = Path.GetExtension(fileLocation); + if (!fileLocation.StartsWith("/documents") && !fileLocation.StartsWith("documents") && !fileLocation.StartsWith("/temp") && !fileLocation.StartsWith("temp")) { return "bi-link-45deg"; } diff --git a/Models/Shared/ImportModel.cs b/Models/Shared/ImportModel.cs index cf92aaf..6b5d777 100644 --- a/Models/Shared/ImportModel.cs +++ b/Models/Shared/ImportModel.cs @@ -172,10 +172,4 @@ namespace CarCareTracker.Models [JsonConverter(typeof(FromBoolOptional))] public string IsRoot { get; set; } } - public class UploadedFileExportModel - { - public string Name { get; set; } - public string Location { get; set; } - public string UploadType { get; set; } - } } diff --git a/Models/Shared/UploadedFiles.cs b/Models/Shared/UploadedFiles.cs index 98fbbd1..c14f16f 100644 --- a/Models/Shared/UploadedFiles.cs +++ b/Models/Shared/UploadedFiles.cs @@ -4,8 +4,6 @@ { public string Name { get; set; } public string Location { get; set; } - public FileUploadType UploadType { get; set; } = FileUploadType.File; - public string FileExtension { get { return Path.GetExtension(Location); } } public bool IsPending { get; set; } } } diff --git a/Views/Vehicle/_FilesToUpload.cshtml b/Views/Vehicle/_FilesToUpload.cshtml index 2301b7b..a1ad28a 100644 --- a/Views/Vehicle/_FilesToUpload.cshtml +++ b/Views/Vehicle/_FilesToUpload.cshtml @@ -13,7 +13,7 @@
  • - @filesUploaded.Name + @filesUploaded.Name
    diff --git a/Views/Vehicle/_UploadedFiles.cshtml b/Views/Vehicle/_UploadedFiles.cshtml index f5d5e05..91d8046 100644 --- a/Views/Vehicle/_UploadedFiles.cshtml +++ b/Views/Vehicle/_UploadedFiles.cshtml @@ -15,7 +15,7 @@
  • - @filesUploaded.Name + @filesUploaded.Name
    @@ -30,6 +30,6 @@ var uploadedFiles = []; @foreach (UploadedFiles filesUploaded in Model) { - @:uploadedFiles.push({ name: "@filesUploaded.Name", location: "@filesUploaded.Location", uploadType: "@filesUploaded.UploadType" }); + @:uploadedFiles.push({ name: "@filesUploaded.Name", location: "@filesUploaded.Location" }); } \ No newline at end of file diff --git a/wwwroot/js/shared.js b/wwwroot/js/shared.js index 5407649..d4f2816 100644 --- a/wwwroot/js/shared.js +++ b/wwwroot/js/shared.js @@ -606,7 +606,7 @@ function uploadVehicleLinksAsync(event) { }, }).then(function (result) { if (result.isConfirmed) { - uploadedFiles.push({ name: result.value.newLinkName, location: result.value.newLinkLocation, uploadType: 1, isPending: true }); + uploadedFiles.push({ name: result.value.newLinkName, location: result.value.newLinkLocation, isPending: true }); $.post('/Vehicle/GetFilesPendingUpload', { uploadedFiles: uploadedFiles }, function (viewData) { $("#filesPendingUpload").html(viewData); });