added printing functionality for notes, fuel, and tax.
This commit is contained in:
@@ -965,7 +965,7 @@ namespace CarCareTracker.Controllers
|
|||||||
{
|
{
|
||||||
return Json(result);
|
return Json(result);
|
||||||
}
|
}
|
||||||
var stickerViewModel = new StickerViewModel();
|
var stickerViewModel = new StickerViewModel() { RecordType = importMode };
|
||||||
if (vehicleId != default)
|
if (vehicleId != default)
|
||||||
{
|
{
|
||||||
var vehicleData = _dataAccess.GetVehicleById(vehicleId);
|
var vehicleData = _dataAccess.GetVehicleById(vehicleId);
|
||||||
@@ -1010,7 +1010,14 @@ namespace CarCareTracker.Controllers
|
|||||||
{
|
{
|
||||||
foreach (int recordId in recordIds)
|
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++;
|
recordsAdded++;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1020,7 +1027,14 @@ namespace CarCareTracker.Controllers
|
|||||||
{
|
{
|
||||||
foreach (int recordId in recordIds)
|
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++;
|
recordsAdded++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1039,7 +1053,12 @@ namespace CarCareTracker.Controllers
|
|||||||
{
|
{
|
||||||
foreach (int recordId in recordIds)
|
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++;
|
recordsAdded++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
{
|
{
|
||||||
public class StickerViewModel
|
public class StickerViewModel
|
||||||
{
|
{
|
||||||
|
public ImportMode RecordType { get; set; }
|
||||||
public Vehicle VehicleData { get; set; } = new Vehicle();
|
public Vehicle VehicleData { get; set; } = new Vehicle();
|
||||||
public List<ReminderRecord> ReminderRecords { get; set; } = new List<ReminderRecord>();
|
public List<ReminderRecord> ReminderRecords { get; set; } = new List<ReminderRecord>();
|
||||||
public List<GenericRecord> GenericRecords { get; set; } = new List<GenericRecord>();
|
public List<GenericRecord> GenericRecords { get; set; } = new List<GenericRecord>();
|
||||||
|
|||||||
@@ -254,6 +254,8 @@
|
|||||||
<li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'GasRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
|
<li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'GasRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
|
||||||
<li><a class="dropdown-item" href="#" onclick="insertOdometer(selectedRow, 'GasRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Create Odometer")</span><i class="bi bi-speedometer"></i></div></a></li>
|
<li><a class="dropdown-item" href="#" onclick="insertOdometer(selectedRow, 'GasRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Create Odometer")</span><i class="bi bi-speedometer"></i></div></a></li>
|
||||||
<li><hr class="dropdown-divider"></li>
|
<li><hr class="dropdown-divider"></li>
|
||||||
|
<li><a class="dropdown-item" href="#" onclick="printTabStickers(selectedRow, 'GasRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Print")</span><i class="bi bi-printer"></i></div></a></li>
|
||||||
|
<li><hr class="dropdown-divider"></li>
|
||||||
<li><a class="dropdown-item text-danger" href="#" onclick="deleteRecords(selectedRow, 'GasRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
|
<li><a class="dropdown-item text-danger" href="#" onclick="deleteRecords(selectedRow, 'GasRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
|
||||||
<li><hr class="context-menu-odometer-adjustment dropdown-divider"></li>
|
<li><hr class="context-menu-odometer-adjustment dropdown-divider"></li>
|
||||||
<li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'GasRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Adjust Odometer")</span><i class="bi bi-speedometer"></i></div></a></li>
|
<li><a class="context-menu-odometer-adjustment dropdown-item" href="#" onclick="adjustRecordsOdometer(selectedRow, 'GasRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Adjust Odometer")</span><i class="bi bi-speedometer"></i></div></a></li>
|
||||||
|
|||||||
@@ -109,5 +109,8 @@
|
|||||||
<li><hr class="dropdown-divider"></li>
|
<li><hr class="dropdown-divider"></li>
|
||||||
<li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'NoteRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate")</span><i class="bi bi-copy"></i></div></a></li>
|
<li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'NoteRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate")</span><i class="bi bi-copy"></i></div></a></li>
|
||||||
<li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'NoteRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
|
<li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'NoteRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
|
||||||
|
<li><hr class="dropdown-divider"></li>
|
||||||
|
<li><a class="dropdown-item" href="#" onclick="printTabStickers(selectedRow, 'NoteRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Print")</span><i class="bi bi-printer"></i></div></a></li>
|
||||||
|
<li><hr class="dropdown-divider"></li>
|
||||||
<li><a class="dropdown-item text-danger" href="#" onclick="deleteRecords(selectedRow, 'NoteRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
|
<li><a class="dropdown-item text-danger" href="#" onclick="deleteRecords(selectedRow, 'NoteRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
@@ -84,19 +84,35 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="col-6">
|
<div class="col-6">
|
||||||
<ul class="list-group">
|
<ul class="list-group">
|
||||||
<li class="list-group-item text-wrap">
|
@if(!string.IsNullOrWhiteSpace(genericRecord.Description)){
|
||||||
@($"{translator.Translate(userLanguage, "Description")}: {genericRecord.Description}")
|
<li class="list-group-item text-wrap">
|
||||||
</li>
|
@($"{translator.Translate(userLanguage, "Description")}: {genericRecord.Description}")
|
||||||
<li class="list-group-item">
|
</li>
|
||||||
@($"{translator.Translate(userLanguage, "Date")}: {genericRecord.Date.ToShortDateString()}")
|
}
|
||||||
</li>
|
@switch(Model.RecordType){
|
||||||
<li class="list-group-item">
|
case ImportMode.ServiceRecord:
|
||||||
@($"{translator.Translate(userLanguage, "Odometer")}: {genericRecord.Mileage}")
|
case ImportMode.RepairRecord:
|
||||||
</li>
|
case ImportMode.UpgradeRecord:
|
||||||
<li class="list-group-item">
|
case ImportMode.GasRecord:
|
||||||
@($"{translator.Translate(userLanguage, "Cost")}: {genericRecord.Cost.ToString("C")}")
|
<li class="list-group-item">
|
||||||
</li>
|
@($"{translator.Translate(userLanguage, "Date")}: {genericRecord.Date.ToShortDateString()}")
|
||||||
|
</li>
|
||||||
|
<li class="list-group-item">
|
||||||
|
@($"{translator.Translate(userLanguage, "Odometer")}: {genericRecord.Mileage}")
|
||||||
|
</li>
|
||||||
|
<li class="list-group-item">
|
||||||
|
@($"{translator.Translate(userLanguage, "Cost")}: {genericRecord.Cost.ToString("C")}")
|
||||||
|
</li>
|
||||||
|
break;
|
||||||
|
case ImportMode.TaxRecord:
|
||||||
|
<li class="list-group-item">
|
||||||
|
@($"{translator.Translate(userLanguage, "Date")}: {genericRecord.Date.ToShortDateString()}")
|
||||||
|
</li>
|
||||||
|
<li class="list-group-item">
|
||||||
|
@($"{translator.Translate(userLanguage, "Cost")}: {genericRecord.Cost.ToString("C")}")
|
||||||
|
</li>
|
||||||
|
break;
|
||||||
|
}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -170,6 +170,9 @@
|
|||||||
<li><hr class="context-menu-multiple dropdown-divider"></li>
|
<li><hr class="context-menu-multiple dropdown-divider"></li>
|
||||||
<li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'TaxRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate")</span><i class="bi bi-copy"></i></div></a></li>
|
<li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'TaxRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate")</span><i class="bi bi-copy"></i></div></a></li>
|
||||||
<li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'TaxRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
|
<li><a class="dropdown-item" href="#" onclick="duplicateRecordsToOtherVehicles(selectedRow, 'TaxRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Duplicate To Vehicle")</span><i class="bi bi-copy"></i></div></a></li>
|
||||||
|
<li><hr class="dropdown-divider"></li>
|
||||||
|
<li><a class="dropdown-item" href="#" onclick="printTabStickers(selectedRow, 'TaxRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Print")</span><i class="bi bi-printer"></i></div></a></li>
|
||||||
|
<li><hr class="dropdown-divider"></li>
|
||||||
<li><a class="dropdown-item text-danger" href="#" onclick="deleteRecords(selectedRow, 'TaxRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
|
<li><a class="dropdown-item text-danger" href="#" onclick="deleteRecords(selectedRow, 'TaxRecord')"><div class="d-flex justify-content-between"><span class="me-5">@translator.Translate(userLanguage, "Delete")</span><i class="bi bi-trash"></i></div></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
@if (userColumnPreferences.Any())
|
@if (userColumnPreferences.Any())
|
||||||
|
|||||||
Reference in New Issue
Block a user