Merge pull request #810 from hargata/Hargata/801.2

added extra field and supplies to the sticker print.
This commit is contained in:
Hargata Softworks 2025-01-17 11:37:10 -07:00 committed by GitHub
commit 6a8fba535a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 42 additions and 4 deletions

View File

@ -1016,7 +1016,8 @@ namespace CarCareTracker.Controllers
Cost = record.Cost,
Date = record.Date,
Notes = record.Notes,
Mileage = record.Mileage
Mileage = record.Mileage,
ExtraFields = record.ExtraFields
});
recordsAdded++;
}
@ -1033,7 +1034,8 @@ namespace CarCareTracker.Controllers
Description = record.Description,
Cost = record.Cost,
Notes = record.Notes,
Date = record.Date
Date = record.Date,
ExtraFields = record.ExtraFields
});
recordsAdded++;
}
@ -1073,7 +1075,8 @@ namespace CarCareTracker.Controllers
{
Date = record.Date,
Mileage = record.Mileage,
Notes = record.Notes
Notes = record.Notes,
ExtraFields = record.ExtraFields
});
recordsAdded++;
}
@ -1100,7 +1103,9 @@ namespace CarCareTracker.Controllers
Description = record.Description,
Cost = record.Cost,
Notes = record.Notes,
Date = record.DateModified
Date = record.DateModified,
ExtraFields = record.ExtraFields,
RequisitionHistory = record.RequisitionHistory
});
recordsAdded++;
}

View File

@ -131,10 +131,43 @@
</li>
break;
}
@foreach(ExtraField extraField in genericRecord.ExtraFields){
<li class="list-group-item">
@($"{extraField.Name}: {extraField.Value}")
</li>
}
</ul>
</div>
</div>
<hr />
@if(genericRecord.RequisitionHistory.Any()){
<div class="row">
<div class="col-12">
<table class="table table-hover">
<thead class="sticky-top">
<tr class="d-flex">
<th scope="col" class="col-2">@translator.Translate(userLanguage, "Part Number")</th>
<th scope="col" class="col-6">@translator.Translate(userLanguage, "Description")</th>
<th scope="col" class="col-2">@translator.Translate(userLanguage, "Quantity")</th>
<th scope="col" class="col-2">@translator.Translate(userLanguage, "Cost")</th>
</tr>
</thead>
<tbody>
@foreach (SupplyUsageHistory usageHistory in genericRecord.RequisitionHistory)
{
<tr class="d-flex">
<td class="col-2 text-truncate">@usageHistory.PartNumber</td>
<td class="col-6 text-truncate">@usageHistory.Description</td>
<td class="col-2">@usageHistory.Quantity.ToString("F")</td>
<td class="col-2">@usageHistory.Cost.ToString("C2")</td>
</tr>
}
</tbody>
</table>
</div>
</div>
<hr />
}
<div class="row flex-grow-1 flex-shrink-1">
<div class="col-12">
<div class="stickerNote ms-1 me-1 p-1">