From 7aad4cef169895d5e63868289f3517d1c44a5f31 Mon Sep 17 00:00:00 2001
From: c2065864 <barnards3@cardiff.ac.uk>
Date: Thu, 9 Dec 2021 14:52:44 +0000
Subject: [PATCH] Added validation to income input
---
.../web/controllers/signUpAndIn/SignInController.java | 2 +-
src/main/resources/static/js/registerbusiness.js | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/example/clientproject/web/controllers/signUpAndIn/SignInController.java b/src/main/java/com/example/clientproject/web/controllers/signUpAndIn/SignInController.java
index 2f482b5..c6bda81 100644
--- a/src/main/java/com/example/clientproject/web/controllers/signUpAndIn/SignInController.java
+++ b/src/main/java/com/example/clientproject/web/controllers/signUpAndIn/SignInController.java
@@ -78,7 +78,7 @@ public class SignInController {
if(shopId == 1){
shopId = userPermissionsRepo.findByUserId(userId).get(1).getShop().getShopId();
}
- return "redirect:/businessDetails?shopId="+shopId;
+ return "redirect:/redirect?url=businessDetails?shopId="+shopId;
}
List<Categories> categories = catRepo.findAll();
model.addAttribute("loggedInUser", user.get());
diff --git a/src/main/resources/static/js/registerbusiness.js b/src/main/resources/static/js/registerbusiness.js
index 985522e..fb10ea5 100644
--- a/src/main/resources/static/js/registerbusiness.js
+++ b/src/main/resources/static/js/registerbusiness.js
@@ -142,6 +142,11 @@ function progress(){
url.value = document.getElementById("business_register_url_prefix").value + url.value;
document.getElementById("businessTags").value = tags;
+ if(!/^([0-9]+)$/.test(document.getElementById("earnings").value)){
+ document.getElementById("business_register_amount_help")
+ .innerHTML = "Please enter a whole number"
+ return
+ }
document.getElementById("businessForm").submit();
}
@@ -239,6 +244,7 @@ function addTag(e){
inputField.value = ""
}
}
+
function removeTag(e){
let text = e.parentElement.children[0].innerHTML
tags = tags.filter(tag =>{return tag!=text});
--
GitLab