diff --git a/.classpath b/.classpath index 2846539..df7e5a8 100644 --- a/.classpath +++ b/.classpath @@ -1,14 +1,14 @@ - - - + + + - + diff --git a/build/classes/.gitignore b/build/classes/.gitignore index 611b17f..c6ca2cf 100644 --- a/build/classes/.gitignore +++ b/build/classes/.gitignore @@ -1,3 +1 @@ /service/ -/controller/ -/testing/ diff --git a/build/classes/controller/PersonalityViewController.class b/build/classes/controller/PersonalityViewController.class new file mode 100644 index 0000000..232bc10 Binary files /dev/null and b/build/classes/controller/PersonalityViewController.class differ 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..2deda8a 100644 --- a/src/controller/PersonalityViewController.java +++ b/src/controller/PersonalityViewController.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - +import service.PersonalityCalculator; @WebServlet(urlPatterns= {"/personality"}) public class PersonalityViewController extends HttpServlet { @@ -31,10 +31,10 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) String options=request.getParameter("selectedOptions"); - + PersonalityCalculator personality=new PersonalityCalculator(); System.out.println(options); - /* + String message=personality.findYourBrainType(options); request.setAttribute("message", message); @@ -53,7 +53,7 @@ else if(message.equals("leftbrained")) { rd.forward(request, response); } - }*/ + } } } diff --git a/src/service/PersonalityCalculator.java b/src/service/PersonalityCalculator.java index da9ce41..6845660 100644 --- a/src/service/PersonalityCalculator.java +++ b/src/service/PersonalityCalculator.java @@ -1,2 +1,32 @@ package service; +public class PersonalityCalculator{ + public String findYourBrainType(String options) { + int[] answers=findAnswers(options); + + int A=0, B=0; + A=answers[0]+answers[1]+answers[2]+answers[4]+answers[7]+answers[9]+answers[10]+answers[11]+answers[13]+answers[17]+answers[19]; + B=answers[3]+answers[5]+answers[6]+answers[8]+answers[12]+answers[14]+answers[15]+answers[16]+answers[18]; + int braintype=66-(A-B); + if(braintype>=20 && braintype<=55) + return "leftbrained"; + else if(braintype>=56 && braintype<=64) + return "noclearpreference"; + else + return "rightbrained"; + + + } + + public int[] findAnswers(String options) { + String[] selectedAnswer=options.split(","); + int[] answer=new int[selectedAnswer.length]; + for(int i=0;i