added support for international number formats.
This commit is contained in:
@@ -103,7 +103,7 @@ function getAndValidateCollisionRecordValues() {
|
||||
} else {
|
||||
$("#collisionRecordDescription").removeClass("is-invalid");
|
||||
}
|
||||
if (collisionCost.trim() == '') {
|
||||
if (collisionCost.trim() == '' || !isValidMoney(collisionCost)) {
|
||||
hasError = true;
|
||||
$("#collisionRecordCost").addClass("is-invalid");
|
||||
} else {
|
||||
|
||||
@@ -99,7 +99,7 @@ function getAndValidateGasRecordValues() {
|
||||
} else {
|
||||
$("#gasRecordGallons").removeClass("is-invalid");
|
||||
}
|
||||
if (gasCost.trim() == '') {
|
||||
if (gasCost.trim() == '' || !isValidMoney(gasCost)) {
|
||||
hasError = true;
|
||||
$("#gasRecordCost").addClass("is-invalid");
|
||||
} else {
|
||||
|
||||
@@ -103,7 +103,7 @@ function getAndValidateServiceRecordValues() {
|
||||
} else {
|
||||
$("#serviceRecordDescription").removeClass("is-invalid");
|
||||
}
|
||||
if (serviceCost.trim() == '') {
|
||||
if (serviceCost.trim() == '' || !isValidMoney(serviceCost)) {
|
||||
hasError = true;
|
||||
$("#serviceRecordCost").addClass("is-invalid");
|
||||
} else {
|
||||
|
||||
@@ -110,4 +110,11 @@ function uploadFileAsync(event) {
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
function isValidMoney(input) {
|
||||
const euRegex = /^\$?(?=\(.*\)|[^()]*$)\(?\d{1,3}(\.?\d{3})?(,\d{1,3}?)?\)?$/;
|
||||
const usRegex = /^\$?(?=\(.*\)|[^()]*$)\(?\d{1,3}(,?\d{3})?(\.\d{1,3}?)?\)?$/;
|
||||
console.log(euRegex.test(input));
|
||||
console.log(usRegex.test(input));
|
||||
return (euRegex.test(input) || usRegex.test(input));
|
||||
}
|
||||
@@ -96,7 +96,7 @@ function getAndValidateTaxRecordValues() {
|
||||
} else {
|
||||
$("#taxRecordDescription").removeClass("is-invalid");
|
||||
}
|
||||
if (taxCost.trim() == '') {
|
||||
if (taxCost.trim() == '' || !isValidMoney(taxCost)) {
|
||||
hasError = true;
|
||||
$("#taxRecordCost").addClass("is-invalid");
|
||||
} else {
|
||||
|
||||
@@ -75,35 +75,35 @@ function saveUpgradeRecordToVehicle(isEdit) {
|
||||
})
|
||||
}
|
||||
function getAndValidateUpgradeRecordValues() {
|
||||
var serviceDate = $("#upgradeRecordDate").val();
|
||||
var serviceMileage = $("#upgradeRecordMileage").val();
|
||||
var serviceDescription = $("#upgradeRecordDescription").val();
|
||||
var serviceCost = $("#upgradeRecordCost").val();
|
||||
var serviceNotes = $("#upgradeRecordNotes").val();
|
||||
var upgradeDate = $("#upgradeRecordDate").val();
|
||||
var upgradeMileage = $("#upgradeRecordMileage").val();
|
||||
var upgradeDescription = $("#upgradeRecordDescription").val();
|
||||
var upgradeCost = $("#upgradeRecordCost").val();
|
||||
var upgradeNotes = $("#upgradeRecordNotes").val();
|
||||
var vehicleId = GetVehicleId().vehicleId;
|
||||
var upgradeRecordId = getUpgradeRecordModelData().id;
|
||||
var addReminderRecord = $("#addReminderCheck").is(":checked");
|
||||
//validation
|
||||
var hasError = false;
|
||||
if (serviceDate.trim() == '') { //eliminates whitespace.
|
||||
if (upgradeDate.trim() == '') { //eliminates whitespace.
|
||||
hasError = true;
|
||||
$("#upgradeRecordDate").addClass("is-invalid");
|
||||
} else {
|
||||
$("#upgradeRecordDate").removeClass("is-invalid");
|
||||
}
|
||||
if (serviceMileage.trim() == '' || parseInt(serviceMileage) < 0) {
|
||||
if (upgradeMileage.trim() == '' || parseInt(upgradeMileage) < 0) {
|
||||
hasError = true;
|
||||
$("#upgradeRecordMileage").addClass("is-invalid");
|
||||
} else {
|
||||
$("#upgradeRecordMileage").removeClass("is-invalid");
|
||||
}
|
||||
if (serviceDescription.trim() == '') {
|
||||
if (upgradeDescription.trim() == '') {
|
||||
hasError = true;
|
||||
$("#upgradeRecordDescription").addClass("is-invalid");
|
||||
} else {
|
||||
$("#upgradeRecordDescription").removeClass("is-invalid");
|
||||
}
|
||||
if (serviceCost.trim() == '') {
|
||||
if (upgradeCost.trim() == '' || !isValidMoney(upgradeCost)) {
|
||||
hasError = true;
|
||||
$("#upgradeRecordCost").addClass("is-invalid");
|
||||
} else {
|
||||
@@ -113,11 +113,11 @@ function getAndValidateUpgradeRecordValues() {
|
||||
id: upgradeRecordId,
|
||||
hasError: hasError,
|
||||
vehicleId: vehicleId,
|
||||
date: serviceDate,
|
||||
mileage: serviceMileage,
|
||||
description: serviceDescription,
|
||||
cost: serviceCost,
|
||||
notes: serviceNotes,
|
||||
date: upgradeDate,
|
||||
mileage: upgradeMileage,
|
||||
description: upgradeDescription,
|
||||
cost: upgradeCost,
|
||||
notes: upgradeNotes,
|
||||
files: uploadedFiles,
|
||||
addReminderRecord: addReminderRecord
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user