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

Merge pull request #378 from hargata/Hargata/fix.print

Browse Source 
Improved Attachment Export
This commit is contained in:
Hargata Softworks
2024-03-08 11:49:57 -07:00
committed by GitHub
parent 94dfe9a0bb 90755d68b3
commit 8c15bd5534
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Controllers/VehicleController.cs
View File

@@ -1132,6 +1132,7 @@ namespace CarCareTracker.Controllers
var records = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId).Where(x => x.Files.Any()); var records = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId).Where(x => x.Files.Any());
attachmentData.AddRange(records.Select(x => new GenericReportModel attachmentData.AddRange(records.Select(x => new GenericReportModel
{ {
DataType = ImportMode.ServiceRecord,
Date = x.Date, Date = x.Date,
Odometer = x.Mileage, Odometer = x.Mileage,
Files = x.Files Files = x.Files
@@ -1142,6 +1143,7 @@ namespace CarCareTracker.Controllers
var records = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId).Where(x => x.Files.Any()); var records = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId).Where(x => x.Files.Any());
attachmentData.AddRange(records.Select(x => new GenericReportModel attachmentData.AddRange(records.Select(x => new GenericReportModel
{ {
DataType = ImportMode.RepairRecord,
Date = x.Date, Date = x.Date,
Odometer = x.Mileage, Odometer = x.Mileage,
Files = x.Files Files = x.Files
@@ -1152,6 +1154,7 @@ namespace CarCareTracker.Controllers
var records = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId).Where(x => x.Files.Any()); var records = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId).Where(x => x.Files.Any());
attachmentData.AddRange(records.Select(x => new GenericReportModel attachmentData.AddRange(records.Select(x => new GenericReportModel
{ {
DataType = ImportMode.UpgradeRecord,
Date = x.Date, Date = x.Date,
Odometer = x.Mileage, Odometer = x.Mileage,
Files = x.Files Files = x.Files
@@ -1162,6 +1165,7 @@ namespace CarCareTracker.Controllers
var records = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId).Where(x => x.Files.Any()); var records = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId).Where(x => x.Files.Any());
attachmentData.AddRange(records.Select(x => new GenericReportModel attachmentData.AddRange(records.Select(x => new GenericReportModel
{ {
DataType = ImportMode.GasRecord,
Date = x.Date, Date = x.Date,
Odometer = x.Mileage, Odometer = x.Mileage,
Files = x.Files Files = x.Files
@@ -1172,6 +1176,7 @@ namespace CarCareTracker.Controllers
var records = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId).Where(x => x.Files.Any()); var records = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId).Where(x => x.Files.Any());
attachmentData.AddRange(records.Select(x => new GenericReportModel attachmentData.AddRange(records.Select(x => new GenericReportModel
{ {
DataType = ImportMode.TaxRecord,
Date = x.Date, Date = x.Date,
Odometer = 0, Odometer = 0,
Files = x.Files Files = x.Files
@@ -1182,6 +1187,7 @@ namespace CarCareTracker.Controllers
var records = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId).Where(x => x.Files.Any()); var records = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId).Where(x => x.Files.Any());
attachmentData.AddRange(records.Select(x => new GenericReportModel attachmentData.AddRange(records.Select(x => new GenericReportModel
{ {
DataType = ImportMode.OdometerRecord,
Date = x.Date, Date = x.Date,
Odometer = x.Mileage, Odometer = x.Mileage,
Files = x.Files Files = x.Files

2
Helper/FileHelper.cs
View File

@@ -173,7 +173,7 @@ namespace CarCareTracker.Helper
foreach (UploadedFiles file in reportModel.Files) foreach (UploadedFiles file in reportModel.Files)
{ {
var fileToCopy = GetFullFilePath(file.Location); var fileToCopy = GetFullFilePath(file.Location);
var destFileName = $"{tempPath}/{fileIndex}{Path.GetExtension(file.Location)}"; var destFileName = $"{tempPath}/{fileIndex}_{reportModel.DataType}_{reportModel.Date.ToString("yyyy-MM-dd")}_{file.Name}{Path.GetExtension(file.Location)}";
File.Copy(fileToCopy, destFileName); File.Copy(fileToCopy, destFileName);
fileIndex++; fileIndex++;
} }

2
Helper/StaticHelper.cs
View File

@@ -8,7 +8,7 @@ namespace CarCareTracker.Helper
/// </summary> /// </summary>
public static class StaticHelper public static class StaticHelper
{ {
public static string VersionNumber = "1.2.5"; public static string VersionNumber = "1.2.6";
public static string DbName = "data/cartracker.db"; public static string DbName = "data/cartracker.db";
public static string UserConfigPath = "config/userConfig.json"; public static string UserConfigPath = "config/userConfig.json";
public static string GenericErrorMessage = "An error occurred, please try again later"; public static string GenericErrorMessage = "An error occurred, please try again later";