adding requisiton functionality to upgrades and repairs.

This commit is contained in:
DESKTOP-T0O5CDB\DESK-555BD 2024-01-22 12:04:33 -07:00
parent 4ec11a47a1
commit b542bd54fb
8 changed files with 42 additions and 2 deletions

View File

@ -615,7 +615,7 @@ namespace CarCareTracker.Controllers
//move files from temp. //move files from temp.
serviceRecord.Files = serviceRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, 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();
var result = _serviceRecordDataAccess.SaveServiceRecordToVehicle(serviceRecord.ToServiceRecord()); var result = _serviceRecordDataAccess.SaveServiceRecordToVehicle(serviceRecord.ToServiceRecord());
if (result) if (result && serviceRecord.Supplies.Any())
{ {
RequisitionSupplyRecordsByUsage(serviceRecord.Supplies); RequisitionSupplyRecordsByUsage(serviceRecord.Supplies);
} }
@ -674,6 +674,10 @@ namespace CarCareTracker.Controllers
//move files from temp. //move files from temp.
collisionRecord.Files = collisionRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, 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();
var result = _collisionRecordDataAccess.SaveCollisionRecordToVehicle(collisionRecord.ToCollisionRecord()); var result = _collisionRecordDataAccess.SaveCollisionRecordToVehicle(collisionRecord.ToCollisionRecord());
if (result && collisionRecord.Supplies.Any())
{
RequisitionSupplyRecordsByUsage(collisionRecord.Supplies);
}
return Json(result); return Json(result);
} }
[HttpGet] [HttpGet]
@ -1176,6 +1180,10 @@ namespace CarCareTracker.Controllers
//move files from temp. //move files from temp.
upgradeRecord.Files = upgradeRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, 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();
var result = _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(upgradeRecord.ToUpgradeRecord()); var result = _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(upgradeRecord.ToUpgradeRecord());
if (result && upgradeRecord.Supplies.Any())
{
RequisitionSupplyRecordsByUsage(upgradeRecord.Supplies);
}
return Json(result); return Json(result);
} }
[HttpGet] [HttpGet]

View File

@ -10,6 +10,7 @@
public decimal Cost { get; set; } public decimal Cost { get; set; }
public string Notes { get; set; } public string Notes { get; set; }
public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>(); public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
public List<SupplyUsage> Supplies { get; set; } = new List<SupplyUsage>();
public CollisionRecord ToCollisionRecord() { return new CollisionRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Cost = Cost, Mileage = Mileage, Description = Description, Notes = Notes, Files = Files }; } public CollisionRecord ToCollisionRecord() { return new CollisionRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Cost = Cost, Mileage = Mileage, Description = Description, Notes = Notes, Files = Files }; }
} }
} }

View File

@ -10,6 +10,7 @@
public decimal Cost { get; set; } public decimal Cost { get; set; }
public string Notes { get; set; } public string Notes { get; set; }
public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>(); public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
public List<SupplyUsage> Supplies { get; set; } = new List<SupplyUsage>();
public UpgradeRecord ToUpgradeRecord() { return new UpgradeRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Cost = Cost, Mileage = Mileage, Description = Description, Notes = Notes, Files = Files }; } public UpgradeRecord ToUpgradeRecord() { return new UpgradeRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Cost = Cost, Mileage = Mileage, Description = Description, Notes = Notes, Files = Files }; }
} }
} }

View File

@ -23,6 +23,10 @@
<input type="text" id="collisionRecordDescription" class="form-control" placeholder="Description of item(s) repaired(i.e. Alternator)" value="@Model.Description"> <input type="text" id="collisionRecordDescription" class="form-control" placeholder="Description of item(s) repaired(i.e. Alternator)" value="@Model.Description">
<label for="collisionRecordCost">Cost</label> <label for="collisionRecordCost">Cost</label>
<input type="text" id="collisionRecordCost" class="form-control" placeholder="Cost of the repair" value="@(isNew ? "" : Model.Cost)"> <input type="text" id="collisionRecordCost" class="form-control" placeholder="Cost of the repair" value="@(isNew ? "" : Model.Cost)">
@if (isNew)
{
@await Html.PartialAsync("_SupplyStore", "RepairRecord")
}
</div> </div>
<div class="col-md-6 col-12"> <div class="col-md-6 col-12">
<label for="collisionRecordNotes">Notes(optional)</label> <label for="collisionRecordNotes">Notes(optional)</label>
@ -71,6 +75,7 @@
</div> </div>
<script> <script>
var uploadedFiles = []; var uploadedFiles = [];
var selectedSupplies = [];
getUploadedFilesFromModel(); getUploadedFilesFromModel();
function getUploadedFilesFromModel() { function getUploadedFilesFromModel() {
@foreach (UploadedFiles filesUploaded in Model.Files) @foreach (UploadedFiles filesUploaded in Model.Files)

View File

@ -1,5 +1,5 @@
@model string @model string
<a onclick="toggleSuppliesDiv()" class="btn btn-link">Available Supplies</a> <a onclick="toggleSuppliesDiv()" class="btn btn-link">Choose Supplies</a>
<script> <script>
resetSuppliesModal(); resetSuppliesModal();
function GetCaller() { function GetCaller() {
@ -15,6 +15,12 @@
case "ServiceRecord": case "ServiceRecord":
$('#serviceRecordCost').val(selectedSupplyResult.totalSum); $('#serviceRecordCost').val(selectedSupplyResult.totalSum);
break; break;
case "RepairRecord":
$('#collisionRecordCost').val(selectedSupplyResult.totalSum);
break;
case "UpgradeRecord":
$('#upgradeRecordCost').val(selectedSupplyResult.totalSum);
break;
} }
selectedSupplies = getSuppliesAndQuantity().selectedSupplies; selectedSupplies = getSuppliesAndQuantity().selectedSupplies;
hideSuppliesModal(); hideSuppliesModal();
@ -25,6 +31,12 @@
case "ServiceRecord": case "ServiceRecord":
$('#serviceRecordModal').modal('hide'); $('#serviceRecordModal').modal('hide');
break; break;
case "RepairRecord":
$('#collisionRecordModal').modal('hide');
break;
case "UpgradeRecord":
$('#upgradeRecordModal').modal('hide');
break;
} }
} }
function showParentModal() { function showParentModal() {
@ -33,6 +45,12 @@
case "ServiceRecord": case "ServiceRecord":
$('#serviceRecordModal').modal('show'); $('#serviceRecordModal').modal('show');
break; break;
case "RepairRecord":
$('#collisionRecordModal').modal('show');
break;
case "UpgradeRecord":
$('#upgradeRecordModal').modal('show');
break;
} }
} }
function toggleSuppliesDiv(){ function toggleSuppliesDiv(){

View File

@ -23,6 +23,10 @@
<input type="text" id="upgradeRecordDescription" class="form-control" placeholder="Description of item(s) upgraded/modded" value="@Model.Description"> <input type="text" id="upgradeRecordDescription" class="form-control" placeholder="Description of item(s) upgraded/modded" value="@Model.Description">
<label for="upgradeRecordCost">Cost</label> <label for="upgradeRecordCost">Cost</label>
<input type="text" id="upgradeRecordCost" class="form-control" placeholder="Cost of the upgrade/mods" value="@(isNew ? "" : Model.Cost)"> <input type="text" id="upgradeRecordCost" class="form-control" placeholder="Cost of the upgrade/mods" value="@(isNew ? "" : Model.Cost)">
@if (isNew)
{
@await Html.PartialAsync("_SupplyStore", "UpgradeRecord")
}
</div> </div>
<div class="col-md-6 col-12"> <div class="col-md-6 col-12">
<label for="upgradeRecordNotes">Notes(optional)</label> <label for="upgradeRecordNotes">Notes(optional)</label>
@ -71,6 +75,7 @@
</div> </div>
<script> <script>
var uploadedFiles = []; var uploadedFiles = [];
var selectedSupplies = [];
getUploadedFilesFromModel(); getUploadedFilesFromModel();
function getUploadedFilesFromModel() { function getUploadedFilesFromModel() {
@foreach (UploadedFiles filesUploaded in Model.Files) @foreach (UploadedFiles filesUploaded in Model.Files)

View File

@ -114,6 +114,7 @@ function getAndValidateCollisionRecordValues() {
cost: collisionCost, cost: collisionCost,
notes: collisionNotes, notes: collisionNotes,
files: uploadedFiles, files: uploadedFiles,
supplies: selectedSupplies,
addReminderRecord: addReminderRecord addReminderRecord: addReminderRecord
} }
} }

View File

@ -114,6 +114,7 @@ function getAndValidateUpgradeRecordValues() {
cost: upgradeCost, cost: upgradeCost,
notes: upgradeNotes, notes: upgradeNotes,
files: uploadedFiles, files: uploadedFiles,
supplies: selectedSupplies,
addReminderRecord: addReminderRecord addReminderRecord: addReminderRecord
} }
} }