diff --git a/.classpath b/.classpath index 2846539..524e9db 100644 --- a/.classpath +++ b/.classpath @@ -3,15 +3,12 @@ - - - - - + + diff --git a/build/classes/.gitignore b/build/classes/.gitignore index 611b17f..32e6c58 100644 --- a/build/classes/.gitignore +++ b/build/classes/.gitignore @@ -1,3 +1,2 @@ /service/ /controller/ -/testing/ diff --git a/build/classes/testing/TestPersonalityCalculator.class b/build/classes/testing/TestPersonalityCalculator.class new file mode 100644 index 0000000..4e3e744 Binary files /dev/null and b/build/classes/testing/TestPersonalityCalculator.class differ diff --git a/src/controller/PersonalityViewController.java b/src/controller/PersonalityViewController.java index bbf6331..576e66f 100644 --- a/src/controller/PersonalityViewController.java +++ b/src/controller/PersonalityViewController.java @@ -9,6 +9,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import service.PersonalityCalculator; + @WebServlet(urlPatterns= {"/personality"}) public class PersonalityViewController extends HttpServlet { @@ -33,11 +35,11 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) String options=request.getParameter("selectedOptions"); System.out.println(options); - - /* + PersonalityCalculator person = new PersonalityCalculator(); + String message = person.findYourBrainType(options); request.setAttribute("message", message); - + System.out.println(message); if(message!=null) { if(message.equals("rightbrained")) { @@ -53,7 +55,7 @@ else if(message.equals("leftbrained")) { rd.forward(request, response); } - }*/ + } } } diff --git a/src/service/PersonalityCalculator.java b/src/service/PersonalityCalculator.java index da9ce41..5cfddfa 100644 --- a/src/service/PersonalityCalculator.java +++ b/src/service/PersonalityCalculator.java @@ -1,2 +1,35 @@ package service; - +public class PersonalityCalculator +{ + public String findYourBrainType(String inp) + { + System.out.println(inp); + int x = findAnswers(inp); + String str =""; + if(x>=20 && x <= 55) + str = "leftbrained"; + if(x>=56 && x <=64) + str = "No clear preference"; + if(x>=65 && x<=100) + str = "rightbrained"; + System.out.println(str); + return str; + } + public int findAnswers(String inp) + { + String[] values = inp.split(","); + int size = values.length; + System.out.println(size); + int [] arr = new int [size]; + for(int i=0; i