Skip to content

Commit 1784c0f

Browse files
hargatahargata
authored
Merge pull request #1374 from hargata/Hargata/167
1.6.7 Changes
2 parents c0b2f29 + 86fb719 commit 1784c0f

11 files changed

Lines changed: 85 additions & 14 deletions

File tree

‎Controllers/HomeController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ public async Task<IActionResult> DownloadAllTranslations()
534534
return Json(OperationResponse.Failed());
535535
}
536536
}
537-
public ActionResult GetVehicleSelector(int vehicleId)
537+
public IActionResult GetVehicleSelector(int vehicleId)
538538
{
539539
var vehiclesStored = _dataAccess.GetVehicles();
540540
if (!User.IsInRole(nameof(UserData.IsRootUser)))
@@ -552,7 +552,7 @@ public ActionResult GetVehicleSelector(int vehicleId)
552552
}
553553
return PartialView("_VehicleSelector", vehiclesStored);
554554
}
555-
public ActionResult GetVehicleSelectorOdometer(int vehicleId)
555+
public IActionResult GetVehicleSelectorOdometer(int vehicleId)
556556
{
557557
var vehiclesStored = _dataAccess.GetVehicles();
558558
if (!User.IsInRole(nameof(UserData.IsRootUser)))

‎Controllers/Vehicle/InspectionController.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,12 @@ public IActionResult GetAddInspectionRecordFieldPartialView()
7070
{
7171
return PartialView("Inspection/_InspectionRecordField", new InspectionRecordTemplateField());
7272
}
73-
public IActionResult GetAddInspectionRecordFieldOptionsPartialView()
73+
public IActionResult GetAddInspectionRecordFieldOptionsPartialView(List<InspectionRecordTemplateFieldOption> currentOptions)
7474
{
75+
if (currentOptions != null && currentOptions.Any())
76+
{
77+
return PartialView("Inspection/_InspectionRecordFieldOptions", currentOptions);
78+
}
7579
return PartialView("Inspection/_InspectionRecordFieldOptions", new List<InspectionRecordTemplateFieldOption>());
7680
}
7781
public IActionResult GetAddInspectionRecordFieldOptionPartialView()

‎Helper/LiteDBHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public interface ILiteDBHelper
99
}
1010
public class LiteDBHelper: ILiteDBHelper
1111
{
12-
public LiteDatabase db { get; set; }
12+
public LiteDatabase? db { get; set; }
1313
public LiteDBHelper()
1414
{
1515
if (db == null)

‎Helper/StaticHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace CarCareTracker.Helper
1414
/// </summary>
1515
public static class StaticHelper
1616
{
17-
public const string VersionNumber = "1.6.6";
17+
public const string VersionNumber = "1.6.7";
1818
public const string DbName = "data/cartracker.db";
1919
public const string UserConfigPath = "data/config/userConfig.json";
2020
public const string ServerConfigPath = "data/config/serverConfig.json";

‎Views/Vehicle/Inspection/_InspectionRecordFieldOption.cshtml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@
1212
<input class="form-check-input" data-type="fieldOptionIsFail" type="checkbox" role="switch" @(Model.IsFail ? "checked" : "")>
1313
<label class="form-check-label" onclick="stretchedLinkClick(this)">@translator.Translate(userLanguage, "Fail")</label>
1414
</div>
15-
<button type="button" class="btn btn-outline-danger btn-sm" onclick="deleteInspectionRecordFieldOption(this)"><i class="bi bi-trash"></i></button>
15+
<button type="button" class="btn btn-outline-secondary btn-sm" onclick="moveInspectionRecordFieldOption(this)"><i class="bi bi-arrow-up"></i></button>
16+
<button type="button" class="btn btn-outline-secondary btn-sm ms-2" onclick="moveInspectionRecordFieldOption(this, true)"><i class="bi bi-arrow-down"></i></button>
17+
<button type="button" class="btn btn-outline-danger btn-sm ms-2" onclick="deleteInspectionRecordFieldOption(this)"><i class="bi bi-trash"></i></button>
1618
</div>

‎Views/Vehicle/Supply/_SupplyRecords.cshtml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,26 @@
5555
</div>
5656
</li>
5757
<li><hr class="dropdown-divider"></li>
58+
<li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Filter Supplies")</h6></li>
59+
<li>
60+
<div class="list-group-item">
61+
<input class="btn-check" type="checkbox" id="chkAllSupplies" onchange="checkSupplyFilterToggle(this)" checked data-filter="all">
62+
<label class="dropdown-item" for="chkAllSupplies">@translator.Translate(userLanguage, "All Supplies")</label>
63+
</div>
64+
</li>
65+
<li>
66+
<div class="list-group-item">
67+
<input class="btn-check" type="checkbox" id="chkAvailableSupplies" onchange="checkSupplyFilterToggle(this)" data-filter="available">
68+
<label class="dropdown-item" for="chkAvailableSupplies">@translator.Translate(userLanguage, "Available Supplies")</label>
69+
</div>
70+
</li>
71+
<li>
72+
<div class="list-group-item">
73+
<input class="btn-check" type="checkbox" id="chkDepletedSupplies" onchange="checkSupplyFilterToggle(this)" data-filter="depleted">
74+
<label class="dropdown-item" for="chkDepletedSupplies">@translator.Translate(userLanguage, "Depleted Supplies")</label>
75+
</div>
76+
</li>
77+
<li><hr class="dropdown-divider"></li>
5878
<li><h6 class="dropdown-header">@translator.Translate(userLanguage, "Visible Columns")</h6></li>
5979
<li class="dropdown-item" draggable="true" ondragstart="handleTableColumnDragStart(event)" ondragover="handleTableColumnDragOver(event)" ondragend="handleTableColumnDragEnd('SupplyRecord')">
6080
<div class="list-group-item">

‎wwwroot/defaults/en_US.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎wwwroot/js/garage.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ function viewVehicleWithTab(vehicleIds, tab) {
335335
return;
336336
}
337337
let vehicleId = vehicleIds[0];
338-
ViewVehicle(vehicleId, tab);
338+
viewVehicle(vehicleId, tab);
339339
}
340340
function handleGarageItemClick(e, vehicleId) {
341341
if (!(event.ctrlKey || event.metaKey)) {

‎wwwroot/js/inspectionrecord.js‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,17 @@ function handleInspectionRecordFieldTypeChange(e) {
6464
switch (selectedVal) {
6565
case 'Radio':
6666
case 'Check':
67-
$.get('/Vehicle/GetAddInspectionRecordFieldOptionsPartialView', function (data) {
67+
let currentFieldOptions = $(e).closest('[data-type="field"]').find('[data-type="fieldOptions"]').find('[data-type="fieldOption"]');
68+
let currentFieldOptionsArray = [];
69+
if (currentFieldOptions.length > 0) {
70+
currentFieldOptions.map((index, elem) => {
71+
currentFieldOptionsArray.push({
72+
description: $(elem).find('[data-type="fieldOptionText"]').val(),
73+
isFail: $(elem).find('[data-type="fieldOptionIsFail"]').is(":checked")
74+
});
75+
});
76+
}
77+
$.post('/Vehicle/GetAddInspectionRecordFieldOptionsPartialView', { currentOptions: currentFieldOptionsArray }, function (data) {
6878
$(e).closest('[data-type="field"]').find('[data-type="fieldOptions"]').html(data);
6979
});
7080
$(e).closest('[data-type="field"]').find('[data-type="fieldActionItem"]').show();
@@ -439,6 +449,20 @@ function moveInspectionRecordField(e, isDown) {
439449
}
440450
}
441451
}
452+
function moveInspectionRecordFieldOption(e, isDown) {
453+
let currentField = $(e).closest('[data-type="fieldOption"]');
454+
if (isDown) {
455+
let nextField = currentField.next('[data-type="fieldOption"]');
456+
if (nextField.length != 0) {
457+
currentField.insertAfter(nextField);
458+
}
459+
} else {
460+
let prevField = currentField.prev('[data-type="fieldOption"]');
461+
if (prevField.length != 0) {
462+
currentField.insertBefore(prevField);
463+
}
464+
}
465+
}
442466
function duplicateInspectionRecordTemplateToVehicle() {
443467
let inspectionRecordsIds = [];
444468
inspectionRecordsIds.push(getInspectionRecordModelData().id);

‎wwwroot/js/shared.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ function updateAggregateLabels() {
618618
var labelsToSum = $("[data-record-type='cost']").parent(":not('.override-hide')").children("[data-record-type='cost']").toArray();
619619
var newSum = "0.00";
620620
if (labelsToSum.length > 0) {
621-
newSum = labelsToSum.map(x => globalParseFloat(x.textContent)).reduce((a, b,) => a + b).toFixed(2);
621+
newSum = labelsToSum.map(x => globalParseFloat(x.textContent)).reduce((a, b) => a + b).toFixed(2);
622622
}
623623
sumLabel.text(`${sumLabel.text().split(':')[0]}: ${globalAppendCurrency(globalFloatToString(newSum))}`)
624624
}
@@ -628,7 +628,7 @@ function updateAggregateLabels() {
628628
var distanceLabelsToSum = $("[data-record-type='distance']").parent(":not('.override-hide')").children("[data-record-type='distance']").toArray();
629629
var newDistanceSum = 0;
630630
if (distanceLabelsToSum.length > 0) {
631-
newDistanceSum = distanceLabelsToSum.map(x => globalParseFloat(x.textContent)).reduce((a, b,) => a + b).toFixed(0);
631+
newDistanceSum = distanceLabelsToSum.map(x => globalParseFloat(x.textContent)).reduce((a, b) => a + b).toFixed(0);
632632
}
633633
sumDistanceLabel.text(`${sumDistanceLabel.text().split(':')[0]}: ${newDistanceSum}`)
634634
}
@@ -2148,17 +2148,17 @@ function bindTabEvents(tab) {
21482148
case "gas-tab":
21492149
checkQueryParams('#gasRecordModalContent', showEditGasRecordModal, 'id');
21502150
checkQueryParams('#gasRecordModalContent', showAddGasRecordModal, 'add');
2151-
setupEventHub(`vehicleId_${GetVehicleId().vehicleId}`, getVehicleNotes, GetVehicleId().vehicleId);
2151+
setupEventHub(`vehicleId_${GetVehicleId().vehicleId}`, getVehicleGasRecords, GetVehicleId().vehicleId);
21522152
break;
21532153
case "accident-tab":
21542154
checkQueryParams('#collisionRecordModalContent', showEditCollisionRecordModal, 'id');
21552155
checkQueryParams('#collisionRecordModalContent', showAddCollisionRecordModal, 'add');
2156-
setupEventHub(`vehicleId_${GetVehicleId().vehicleId}`, getVehicleNotes, GetVehicleId().vehicleId);
2156+
setupEventHub(`vehicleId_${GetVehicleId().vehicleId}`, getVehicleCollisionRecords, GetVehicleId().vehicleId);
21572157
break;
21582158
case "tax-tab":
21592159
checkQueryParams('#taxRecordModalContent', showEditTaxRecordModal, 'id');
21602160
checkQueryParams('#taxRecordModalContent', showAddTaxRecordModal, 'add');
2161-
setupEventHub(`vehicleId_${GetVehicleId().vehicleId}`, getVehicleNotes, GetVehicleId().vehicleId);
2161+
setupEventHub(`vehicleId_${GetVehicleId().vehicleId}`, getVehicleTaxRecords, GetVehicleId().vehicleId);
21622162
break;
21632163
case "report-tab":
21642164
setupEventHub(`vehicleId_${GetVehicleId().vehicleId}`, getVehicleReport, GetVehicleId().vehicleId);

0 commit comments

Comments
 (0)