From 8ce7096712926f1c0bac93c94db9f2d8f81c9931 Mon Sep 17 00:00:00 2001 From: MSKeerthana Date: Wed, 18 Mar 2020 21:26:56 +0530 Subject: [PATCH 1/2] committed successfully --- .classpath | 7 ++-- build/classes/.gitignore | 2 +- src/controller/PersonalityViewController.java | 8 +++-- src/service/PersonalityCalculator.java | 34 ++++++++++++++++++- src/testing/TestPersonalityCalculator.java | 4 +-- 5 files changed, 43 insertions(+), 12 deletions(-) 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..710eab3 100644 --- a/build/classes/.gitignore +++ b/build/classes/.gitignore @@ -1,3 +1,3 @@ /service/ -/controller/ /testing/ +/controller/ diff --git a/src/controller/PersonalityViewController.java b/src/controller/PersonalityViewController.java index bbf6331..214f25c 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,8 +35,8 @@ 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); @@ -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..0cbd59a 100644 --- a/src/service/PersonalityCalculator.java +++ b/src/service/PersonalityCalculator.java @@ -1,2 +1,34 @@ package service; - +public class PersonalityCalculator +{ + public String findYourBrainType(String inp) + { + + int x = findAnswers(inp); + String str =""; + if(x>=20 && x <= 55) + str = "Left-brained"; + if(x>=56 && x <=64) + str = "No clear preference"; + if(x>=65 && x<=100) + str = "Right-brained"; + 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 Date: Tue, 24 Mar 2020 20:19:51 +0530 Subject: [PATCH 2/2] Commited with proper return statements --- build/classes/.gitignore | 1 - .../testing/TestPersonalityCalculator.class | Bin 0 -> 1329 bytes src/controller/PersonalityViewController.java | 2 +- src/service/PersonalityCalculator.java | 7 ++++--- 4 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 build/classes/testing/TestPersonalityCalculator.class diff --git a/build/classes/.gitignore b/build/classes/.gitignore index 710eab3..32e6c58 100644 --- a/build/classes/.gitignore +++ b/build/classes/.gitignore @@ -1,3 +1,2 @@ /service/ -/testing/ /controller/ diff --git a/build/classes/testing/TestPersonalityCalculator.class b/build/classes/testing/TestPersonalityCalculator.class new file mode 100644 index 0000000000000000000000000000000000000000..4e3e7447f1f26c9fad6f78729a9c57bfc4143a13 GIT binary patch literal 1329 zcmah}?NZxD6g_LZNC*)?Nm~dZKuH0Ei}`R$6VoKXBtJT$&D4w;lKxr50-{1P@|tNL zrBBe`nQ2L6^|Z7F?}>npQMN7;}%I~Ijq_k5tvyjEtgjKE|n^!yV>4+E17O3)0xwX zjZpzN4G)j>o{6gV4c##pw=pg-bnrSNf$3TQsune!vUb(t|5XkqF=gQs0=&Yv-ejh= zi#zy~QDr7QK5fZ}JZ8H6wrgDNa@)}q>o#V1xlLx7lrkDz4LL*ff?~F}Q55Kl)WHQi z8}qLvXPGwb=fbi=xs#mFn1eV8A|=yCst#1D;y~Fb3y4JrOIWe6{GaA*C&XoY-xaWf zB-TtS*^PFy+dPtKO`W!kvug2~gH_zK@P)wjtIR(BAy5rdVi)&ev*{Ylw619xe7~K_ zfK6v5**TqiU3uzMgaCQv!>)r%hwQfg%+Ho=bXwJ^vFif$Bs9%@`>m6>VBoQ?oFz`M z;LCa7n&Y0c#I={w22ah|;M^-XbHBsgeT8ekVBlqTbBOD;%-%r(eHefPk2<$)gX_3K ziO}gUhmW}Lq4Y7o#`j;eG_k+)hJEkm+|L-8KgX?KG2u=7-fXu#=X<3tdEQ$%$KsE0 zFLXQeB2(PBRQv>ct8|XfUozezYN)d;c^JI+i5Nth#~_~}V)QVNJc#@ykS$1bW^W0W0c;7dFp&xgF#kNn@}r?^zJuv*~pBPw%P F{}(4KHqQV6 literal 0 HcmV?d00001 diff --git a/src/controller/PersonalityViewController.java b/src/controller/PersonalityViewController.java index 214f25c..576e66f 100644 --- a/src/controller/PersonalityViewController.java +++ b/src/controller/PersonalityViewController.java @@ -39,7 +39,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) String message = person.findYourBrainType(options); request.setAttribute("message", message); - + System.out.println(message); if(message!=null) { if(message.equals("rightbrained")) { diff --git a/src/service/PersonalityCalculator.java b/src/service/PersonalityCalculator.java index 0cbd59a..5cfddfa 100644 --- a/src/service/PersonalityCalculator.java +++ b/src/service/PersonalityCalculator.java @@ -3,15 +3,16 @@ public class PersonalityCalculator { public String findYourBrainType(String inp) { - + System.out.println(inp); int x = findAnswers(inp); String str =""; if(x>=20 && x <= 55) - str = "Left-brained"; + str = "leftbrained"; if(x>=56 && x <=64) str = "No clear preference"; if(x>=65 && x<=100) - str = "Right-brained"; + str = "rightbrained"; + System.out.println(str); return str; } public int findAnswers(String inp)