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

Merge remote-tracking branch 'origin/main' into Hargata/translation.helper

Browse Source
This commit is contained in:
DESKTOP-GENO133\IvanPlex
2024-02-03 22:30:52 -07:00
parent 9cb8bbd5b7 4ecdaf5225
commit 60f28b16e7
17 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Views/Admin/Index.cshtml
View File

@@ -92,7 +92,7 @@
if (data){
reloadPage();
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
});
}
@@ -104,7 +104,7 @@
if (data) {
reloadPage();
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
});
}
@@ -113,7 +113,7 @@
if (data) {
reloadPage();
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
})
}

8
Views/Home/_Settings.cshtml
View File

@@ -236,7 +236,7 @@
if (data) {
setTimeout(function () { window.location.href = '/Home/Index?tab=settings' }, 500);
} else {
errorToast("An error occurred, please try again later.")
errorToast(genericErrorMessage());
}
})
}
@@ -267,7 +267,7 @@
successToast("Backup Restored");
setTimeout(function () { window.location.href = '/Home/Index' }, 500);
} else {
errorToast("An error occurred, please try again later.");
errorToast(genericErrorMessage());
}
});
}
@@ -300,7 +300,7 @@
if (data) {
setTimeout(function () { window.location.href = '/Login' }, 500);
} else {
errorToast("An error occurred, please try again later.");
errorToast(genericErrorMessage());
}
})
}
@@ -310,7 +310,7 @@
if (data) {
setTimeout(function () { window.location.href = '/Home' }, 1000);
} else {
errorToast("An error occurred, please try again later.");
errorToast(genericErrorMessage());
}
});
}

3
Views/Shared/_Layout.cshtml
View File

@@ -85,6 +85,9 @@
input = input.replace(".", decimalSeparator);
return input;
}
function genericErrorMessage(){
return "An error has occurred, please try again later";
}
</script>
@await RenderSectionAsync("Scripts", required: false)
</head>

2
Views/Vehicle/_BulkDataImporter.cshtml
View File

@@ -89,7 +89,7 @@
getVehicleOdometerRecords(vehicleId);
}
} else {
errorToast("An error has occurred, please double check the data and try again.");
errorToast(genericErrorMessage());
}
});
}

2
Views/Vehicle/_Collaborators.cshtml
View File

@@ -44,7 +44,7 @@
if (data) {
refreshCollaborators();
} else {
errorToast("An error occurred, please try again later");
errorToast(genericErrorMessage());
}
})
}

6
wwwroot/js/collisionrecord.js
View File

@@ -45,7 +45,7 @@ function deleteCollisionRecord(collisionRecordId) {
var vehicleId = GetVehicleId().vehicleId;
getVehicleCollisionRecords(vehicleId);
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
});
} else {
@@ -72,7 +72,7 @@ function saveCollisionRecordToVehicle(isEdit) {
setTimeout(function () { showAddReminderModal(formValues); }, 500);
}
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
})
}
@@ -94,7 +94,7 @@ function getAndValidateCollisionRecordValues() {
} else {
$("#collisionRecordDate").removeClass("is-invalid");
}
if (collisionMileage.trim() == '' || parseInt(collisionMileage) < 0) {
if (collisionMileage.trim() == '' || isNaN(collisionMileage) || parseInt(collisionMileage) < 0) {
hasError = true;
$("#collisionRecordMileage").addClass("is-invalid");
} else {

4
wwwroot/js/gasrecord.js
View File

@@ -45,7 +45,7 @@ function deleteGasRecord(gasRecordId) {
var vehicleId = GetVehicleId().vehicleId;
getVehicleGasRecords(vehicleId);
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
});
} else {
@@ -69,7 +69,7 @@ function saveGasRecordToVehicle(isEdit) {
saveScrollPosition();
getVehicleGasRecords(formValues.vehicleId);
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
})
}

4
wwwroot/js/note.js
View File

@@ -41,7 +41,7 @@ function deleteNote(noteId) {
var vehicleId = GetVehicleId().vehicleId;
getVehicleNotes(vehicleId);
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
});
} else {
@@ -65,7 +65,7 @@ function saveNoteToVehicle(isEdit) {
saveScrollPosition();
getVehicleNotes(formValues.vehicleId);
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
})
}

6
wwwroot/js/odometerrecord.js
View File

@@ -45,7 +45,7 @@ function deleteOdometerRecord(odometerRecordId) {
var vehicleId = GetVehicleId().vehicleId;
getVehicleOdometerRecords(vehicleId);
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
});
} else {
@@ -72,7 +72,7 @@ function saveOdometerRecordToVehicle(isEdit) {
setTimeout(function () { showAddReminderModal(formValues); }, 500);
}
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
})
}
@@ -91,7 +91,7 @@ function getAndValidateOdometerRecordValues() {
} else {
$("#odometerRecordDate").removeClass("is-invalid");
}
if (serviceMileage.trim() == '' || parseInt(serviceMileage) < 0) {
if (serviceMileage.trim() == '' || isNaN(serviceMileage) || parseInt(serviceMileage) < 0) {
hasError = true;
$("#odometerRecordMileage").addClass("is-invalid");
} else {

8
wwwroot/js/planrecord.js
View File

@@ -43,7 +43,7 @@ function deletePlanRecord(planRecordId) {
var vehicleId = GetVehicleId().vehicleId;
getVehiclePlanRecords(vehicleId);
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
});
} else {
@@ -70,7 +70,7 @@ function savePlanRecordToVehicle(isEdit) {
setTimeout(function () { showAddReminderModal(formValues); }, 500);
}
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
})
}
@@ -163,7 +163,7 @@ function updatePlanRecordProgress(newProgress) {
var vehicleId = GetVehicleId().vehicleId;
getVehiclePlanRecords(vehicleId);
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
});
}
@@ -176,7 +176,7 @@ function updatePlanRecordProgress(newProgress) {
var vehicleId = GetVehicleId().vehicleId;
getVehiclePlanRecords(vehicleId);
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
});
draggedId = 0;

8
wwwroot/js/reminderrecord.js
View File

@@ -64,7 +64,7 @@ function deleteReminderRecord(reminderRecordId, e) {
var vehicleId = GetVehicleId().vehicleId;
getVehicleReminders(vehicleId);
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
});
} else {
@@ -88,7 +88,7 @@ function saveReminderRecordToVehicle(isEdit) {
saveScrollPosition();
getVehicleReminders(formValues.vehicleId);
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
})
}
@@ -123,7 +123,7 @@ function markDoneReminderRecord(reminderRecordId, e) {
successToast("Reminder Updated");
getVehicleReminders(vehicleId);
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
});
}
@@ -143,7 +143,7 @@ function getAndValidateReminderRecordValues() {
//validation
var hasError = false;
var reminderDateIsInvalid = reminderDate.trim() == ''; //eliminates whitespace.
var reminderMileageIsInvalid = reminderMileage.trim() == '' || parseInt(reminderMileage) < 0;
var reminderMileageIsInvalid = reminderMileage.trim() == '' || isNaN(reminderMileage) || parseInt(reminderMileage) < 0;
if ((reminderOption == "Both" || reminderOption == "Date") && reminderDateIsInvalid) {
hasError = true;
$("#reminderDate").addClass("is-invalid");

6
wwwroot/js/servicerecord.js
View File

@@ -45,7 +45,7 @@ function deleteServiceRecord(serviceRecordId) {
var vehicleId = GetVehicleId().vehicleId;
getVehicleServiceRecords(vehicleId);
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
});
} else {
@@ -72,7 +72,7 @@ function saveServiceRecordToVehicle(isEdit) {
setTimeout(function () { showAddReminderModal(formValues); }, 500);
}
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
})
}
@@ -94,7 +94,7 @@ function getAndValidateServiceRecordValues() {
} else {
$("#serviceRecordDate").removeClass("is-invalid");
}
if (serviceMileage.trim() == '' || parseInt(serviceMileage) < 0) {
if (serviceMileage.trim() == '' || isNaN(serviceMileage) || parseInt(serviceMileage) < 0) {
hasError = true;
$("#serviceRecordMileage").addClass("is-invalid");
} else {

2
wwwroot/js/shared.js
View File

@@ -92,7 +92,7 @@ function saveVehicle(isEdit) {
viewVehicle(vehicleId);
}
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
});
}

4
wwwroot/js/supplyrecord.js
View File

@@ -43,7 +43,7 @@ function deleteSupplyRecord(supplyRecordId) {
var vehicleId = GetVehicleId().vehicleId;
getVehicleSupplyRecords(vehicleId);
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
});
} else {
@@ -70,7 +70,7 @@ function saveSupplyRecordToVehicle(isEdit) {
setTimeout(function () { showAddReminderModal(formValues); }, 500);
}
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
})
}

4
wwwroot/js/taxrecord.js
View File

@@ -53,7 +53,7 @@ function deleteTaxRecord(taxRecordId) {
var vehicleId = GetVehicleId().vehicleId;
getVehicleTaxRecords(vehicleId);
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
});
} else {
@@ -80,7 +80,7 @@ function saveTaxRecordToVehicle(isEdit) {
setTimeout(function () { showAddReminderModal(formValues); }, 500);
}
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
})
}

6
wwwroot/js/upgraderecord.js
View File

@@ -45,7 +45,7 @@ function deleteUpgradeRecord(upgradeRecordId) {
var vehicleId = GetVehicleId().vehicleId;
getVehicleUpgradeRecords(vehicleId);
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
});
} else {
@@ -72,7 +72,7 @@ function saveUpgradeRecordToVehicle(isEdit) {
setTimeout(function () { showAddReminderModal(formValues); }, 500);
}
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
})
}
@@ -94,7 +94,7 @@ function getAndValidateUpgradeRecordValues() {
} else {
$("#upgradeRecordDate").removeClass("is-invalid");
}
if (upgradeMileage.trim() == '' || parseInt(upgradeMileage) < 0) {
if (upgradeMileage.trim() == '' || isNaN(upgradeMileage) || parseInt(upgradeMileage) < 0) {
hasError = true;
$("#upgradeRecordMileage").addClass("is-invalid");
} else {

4
wwwroot/js/vehicle.js
View File

@@ -226,7 +226,7 @@ function exportVehicleData(mode) {
var vehicleId = GetVehicleId().vehicleId;
$.get('/Vehicle/ExportFromVehicleToCsv', { vehicleId: vehicleId, mode: mode }, function (data) {
if (!data) {
errorToast("An error occurred, please try again later");
errorToast(genericErrorMessage());
} else {
window.location.href = data;
}
@@ -408,7 +408,7 @@ function moveRecord(recordId, source, dest) {
var vehicleId = GetVehicleId().vehicleId;
refreshDataCallBack(vehicleId);
} else {
errorToast("An error has occurred, please try again later.");
errorToast(genericErrorMessage());
}
});
} else {