Merge pull request #51 from hargata/Hargata.international.numbers

added support for international number formats.
hargata · Jan 10, 2024 · a467ba0 · a467ba0
2 parents 7e4f580 + 7bfbb49
commit a467ba0
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 23 deletions.
diff --git a/Views/Vehicle/_CollisionRecordModal.cshtml b/Views/Vehicle/_CollisionRecordModal.cshtml
@@ -22,7 +22,7 @@
                     <label for="collisionRecordDescription">Description</label>
                     <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>
-                    <input type="number" 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)">
                 </div>
                 <div class="col-md-6 col-12">
                     <label for="collisionRecordNotes">Notes(optional)</label>

diff --git a/Views/Vehicle/_GasModal.cshtml b/Views/Vehicle/_GasModal.cshtml
@@ -51,7 +51,7 @@
                         <label class="form-check-label" for="gasIsFillToFull">Is Filled To Full</label>
                     </div>
                     <label for="GasRecordCost">Cost</label>
-                    <input type="number" id="gasRecordCost" class="form-control" placeholder="Cost of gas refueled" value="@(isNew ? "" : Model.GasRecord.Cost)">
+                    <input type="text" id="gasRecordCost" class="form-control" placeholder="Cost of gas refueled" value="@(isNew ? "" : Model.GasRecord.Cost)">
                 </div>
                 <div class="col-md-6 col-12">
                     @if (Model.GasRecord.Files.Any())

diff --git a/Views/Vehicle/_ServiceRecordModal.cshtml b/Views/Vehicle/_ServiceRecordModal.cshtml
@@ -22,7 +22,7 @@
                     <label for="serviceRecordDescription">Description</label>
                     <input type="text" id="serviceRecordDescription" class="form-control" placeholder="Description of item(s) serviced(i.e. Oil Change)" value="@Model.Description">
                     <label for="serviceRecordCost">Cost</label>
-                    <input type="number" id="serviceRecordCost" class="form-control" placeholder="Cost of the service" value="@(isNew ? "" : Model.Cost)">
+                    <input type="text" id="serviceRecordCost" class="form-control" placeholder="Cost of the service" value="@(isNew ? "" : Model.Cost)">
                 </div>
                 <div class="col-md-6 col-12">
                     <label for="serviceRecordNotes">Notes(optional)</label>

diff --git a/Views/Vehicle/_TaxRecordModal.cshtml b/Views/Vehicle/_TaxRecordModal.cshtml
@@ -20,7 +20,7 @@
                     <label for="taxRecordDescription">Description</label>
                     <input type="text" id="taxRecordDescription" class="form-control" placeholder="Description of tax paid(i.e. Registration)" value="@Model.Description">
                     <label for="taxRecordCost">Cost</label>
-                    <input type="number" id="taxRecordCost" class="form-control" placeholder="Cost of tax paid" value="@(isNew? "" : Model.Cost)">
+                    <input type="text" id="taxRecordCost" class="form-control" placeholder="Cost of tax paid" value="@(isNew? "" : Model.Cost)">
                 </div>
                 <div class="col-md-6 col-12">
                     <label for="taxRecordNotes">Notes(optional)</label>

diff --git a/Views/Vehicle/_UpgradeRecordModal.cshtml b/Views/Vehicle/_UpgradeRecordModal.cshtml
@@ -22,7 +22,7 @@
                     <label for="upgradeRecordDescription">Description</label>
                     <input type="text" id="upgradeRecordDescription" class="form-control" placeholder="Description of item(s) upgraded/modded" value="@Model.Description">
                     <label for="upgradeRecordCost">Cost</label>
-                    <input type="number" 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)">
                 </div>
                 <div class="col-md-6 col-12">
                     <label for="upgradeRecordNotes">Notes(optional)</label>

diff --git a/wwwroot/js/collisionrecord.js b/wwwroot/js/collisionrecord.js
@@ -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 {

diff --git a/wwwroot/js/gasrecord.js b/wwwroot/js/gasrecord.js
@@ -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 {

diff --git a/wwwroot/js/servicerecord.js b/wwwroot/js/servicerecord.js
@@ -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 {

diff --git a/wwwroot/js/shared.js b/wwwroot/js/shared.js
@@ -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));
 }
diff --git a/wwwroot/js/taxrecord.js b/wwwroot/js/taxrecord.js
@@ -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 {

diff --git a/wwwroot/js/upgraderecord.js b/wwwroot/js/upgraderecord.js
@@ -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
     }