hargata/lubelog
1
0
Fork 0
mirror of https://github.com/hargata/lubelog.git synced 2025-12-10 00:46:08 -06:00
Code Issues Packages Projects Releases 51 Wiki Activity

Merge pull request #973 from hargata/Hargata/updated.uploader

Browse Source 
cleaned up code.
This commit is contained in:
Hargata Softworks 2025-06-18 17:11:42 -06:00 committed by GitHub
commit ebaf55e3b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 25 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Controllers/APIController.cs
View File

@ -1868,7 +1868,7 @@ namespace CarCareTracker.Controllers
{
if (documents.Any())
{
List<UploadedFileExportModel> uploadedFiles = new List<UploadedFileExportModel>();
List<UploadedFiles> uploadedFiles = new List<UploadedFiles>();
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);

2
Controllers/FilesController.cs
View File

@ -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);
}

2
Controllers/Vehicle/GasController.cs
View File

@ -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)
{

2
Controllers/Vehicle/NoteController.cs
View File

@ -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)

2
Controllers/Vehicle/OdometerController.cs
View File

@ -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)
{

4
Controllers/Vehicle/PlanController.cs
View File

@ -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));
}

2
Controllers/Vehicle/RepairController.cs
View File

@ -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));

2
Controllers/Vehicle/ServiceController.cs
View File

@ -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));

2
Controllers/Vehicle/SupplyController.cs
View File

@ -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)
{

2
Controllers/Vehicle/TaxController.cs
View File

@ -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())
{

2
Controllers/Vehicle/UpgradeController.cs
View File

@ -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));

8
Enum/FileUploadType.cs
View File

@ -1,8 +0,0 @@
namespace CarCareTracker.Models
{
public enum FileUploadType
{
File = 0,
Link = 1
}
}

5
Helper/StaticHelper.cs
View File

@ -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";
}

6
Models/Shared/ImportModel.cs
View File

@ -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; }
}
}

2
Models/Shared/UploadedFiles.cs
View File

@ -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; }
}
}

2
Views/Vehicle/_FilesToUpload.cshtml
View File

@ -13,7 +13,7 @@
<li class="list-group-item">
<div class="d-flex justify-content-between">
<a class="uploadedFileName d-flex align-items-center text-truncate" href="@filesUploaded.Location" title="@filesUploaded.Name" target="_blank">
<span class="lead me-2"><i class="bi @StaticHelper.GetIconByFileExtension(filesUploaded.UploadType, filesUploaded.FileExtension)"></i></span><span class="text-link">@filesUploaded.Name</span>
<span class="lead me-2"><i class="bi @StaticHelper.GetIconByFileExtension(filesUploaded.Location)"></i></span><span class="text-link">@filesUploaded.Name</span>
</a>
<div class="d-flex align-items-center">
<button type="button" class="btn btn-sm btn-outline-secondary me-2" onclick="editFileName('@filesUploaded.Location', this)"><i class="bi bi-pencil"></i></button>

4
Views/Vehicle/_UploadedFiles.cshtml
View File

@ -15,7 +15,7 @@
<li class="list-group-item">
<div class="d-flex justify-content-between align-items-center">
<a class="uploadedFileName d-flex align-items-center text-truncate" href="@filesUploaded.Location" title="@filesUploaded.Name" target="_blank">
<span class="lead me-2"><i class="bi @StaticHelper.GetIconByFileExtension(filesUploaded.UploadType, filesUploaded.FileExtension)"></i></span><span class="text-link">@filesUploaded.Name</span>
<span class="lead me-2"><i class="bi @StaticHelper.GetIconByFileExtension(filesUploaded.Location)"></i></span><span class="text-link">@filesUploaded.Name</span>
</a>
<div class="d-flex align-items-center">
<button type="button" class="btn btn-sm btn-outline-secondary me-2" onclick="editFileName('@filesUploaded.Location', this)"><i class="bi bi-pencil"></i></button>
@ -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" });
}
</script>

10
wwwroot/js/shared.js
View File

@ -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);
});
@ -1509,10 +1509,10 @@ function bindModalInputChanges(modalName) {
}
function handleModalPaste(e) {
let recordType = getUploaderId().uploaderId;
var clipboardFiles = e.clipboardData.files;
var acceptableFileFormats = $(`#${recordType}`).attr("accept");
var acceptableFileFormatsArray = acceptableFileFormats.split(',');
var acceptableFiles = new DataTransfer();
let clipboardFiles = e.clipboardData.files;
let acceptableFileFormats = $(`#${recordType}`).attr("accept");
let acceptableFileFormatsArray = acceptableFileFormats.split(',');
let acceptableFiles = new DataTransfer();
if (clipboardFiles.length > 0) {
for (var x = 0; x < clipboardFiles.length; x++) {
if (acceptableFileFormats != "*") {