From 252a1e86c17c7d8c1a25fdee8fcd595f127dfb95 Mon Sep 17 00:00:00 2001
From: PRiNCE BHARDWAj <Prince>
Date: Tue, 24 Mar 2020 23:35:11 +0530
Subject: [PATCH 1/2] FSJ0320A021

---
 .classpath                                    |  5 +--
 build/classes/.gitignore                      |  2 +-
 src/controller/PersonalityViewController.java | 12 ++++---
 src/service/PersonalityCalculator.java        | 32 +++++++++++++++++++
 src/testing/TestPersonalityCalculator.java    |  3 +-
 5 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/.classpath b/.classpath
index 2846539..620aee7 100644
--- a/.classpath
+++ b/.classpath
@@ -3,15 +3,16 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v9.0">
+	<classpathentry exported="true" kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v9.0">
 		<attributes>
 			<attribute name="owner.project.facets" value="jst.web"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_241">
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_241">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/build/classes/.gitignore b/build/classes/.gitignore
index 611b17f..6423a15 100644
--- a/build/classes/.gitignore
+++ b/build/classes/.gitignore
@@ -1,3 +1,3 @@
+/testing/
 /service/
 /controller/
-/testing/
diff --git a/src/controller/PersonalityViewController.java b/src/controller/PersonalityViewController.java
index bbf6331..04c66d3 100644
--- a/src/controller/PersonalityViewController.java
+++ b/src/controller/PersonalityViewController.java
@@ -1,6 +1,7 @@
 package controller;
 
 import java.io.IOException;
+import service.PersonalityCalculator;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
@@ -33,8 +34,6 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 		String options=request.getParameter("selectedOptions");
 		
 		System.out.println(options);
-				
-		/* 
 
 		request.setAttribute("message", message);
 		
@@ -53,8 +52,11 @@ else if(message.equals("leftbrained")) {
 				rd.forward(request, response);
 			}
 		
-		}*/
 		}
+		}
+	public static void main(String[] args) {
+		PersonalityCalculator obj=new PersonalityCalculator();
+		String message = obj.findYourBrain(options);
 	}
-
-
+	
+	}
\ No newline at end of file
diff --git a/src/service/PersonalityCalculator.java b/src/service/PersonalityCalculator.java
index da9ce41..2fdbda5 100644
--- a/src/service/PersonalityCalculator.java
+++ b/src/service/PersonalityCalculator.java
@@ -1,2 +1,34 @@
 package service;
 
+public class PersonalityCalculator{
+	String[] options = {"5","2","3","1","4","3","2","1","5","4","3","2","1","5","4","3","2","1","2","2"};
+	int[] optionsInt=new int[options.length];
+	
+	//FUNCTION findAnswers
+	public int[] findAnswers(String options) {
+		for(int i=0;i<this.options.length;i++) {
+			optionsInt[i]=Integer.parseInt(this.options[i]);
+		}
+		return optionsInt;
+	}
+	
+	//FUNCTION findYourBrainType
+	public String findYourBrainType(String options) {
+		int A=0,B=0;
+		findAnswers(options);
+		for(int i=0;i<optionsInt.length;i++) {
+			A+=optionsInt[i];
+		}
+		int x=66-A+B;
+		
+		if(x>=20 && x<=55) {
+			return "leftbrained";
+		}
+		else if(x>=56 && x<=64) {
+			return "noclearpreference";
+		}
+		else {
+			return "rightbrained";
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/testing/TestPersonalityCalculator.java b/src/testing/TestPersonalityCalculator.java
index 653c596..eb1873f 100644
--- a/src/testing/TestPersonalityCalculator.java
+++ b/src/testing/TestPersonalityCalculator.java
@@ -1,5 +1,4 @@
 package testing;
-/* Uncomment the below code to test your application
 
 import static org.junit.Assert.assertEquals;
 
@@ -28,4 +27,4 @@ public void testFindYourBrainTypeMethod() {
 			e.printStackTrace();
 		}
 	}
-}*/
\ No newline at end of file
+}
\ No newline at end of file

From 0e0f812cc9347cb6f1d0bc94b3216c7dc9d1b6a6 Mon Sep 17 00:00:00 2001
From: PRiNCE BHARDWAj <Prince>
Date: Wed, 25 Mar 2020 00:26:37 +0530
Subject: [PATCH 2/2] FSJ0320A021

---
 src/controller/PersonalityViewController.java | 12 ++--
 src/service/PersonalityCalculator.java        | 59 +++++++++++--------
 2 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/src/controller/PersonalityViewController.java b/src/controller/PersonalityViewController.java
index 04c66d3..5b89189 100644
--- a/src/controller/PersonalityViewController.java
+++ b/src/controller/PersonalityViewController.java
@@ -34,6 +34,10 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 		String options=request.getParameter("selectedOptions");
 		
 		System.out.println(options);
+		
+		PersonalityCalculator obj=new PersonalityCalculator();
+		
+		String message=obj.findYourBrainType(options);
 
 		request.setAttribute("message", message);
 		
@@ -54,9 +58,9 @@ else if(message.equals("leftbrained")) {
 		
 		}
 		}
-	public static void main(String[] args) {
-		PersonalityCalculator obj=new PersonalityCalculator();
-		String message = obj.findYourBrain(options);
-	}
+//	public static void main(String[] args) {
+//		PersonalityCalculator obj=new PersonalityCalculator();
+//		String message = obj.findYourBrain(options);
+//	}
 	
 	}
\ No newline at end of file
diff --git a/src/service/PersonalityCalculator.java b/src/service/PersonalityCalculator.java
index 2fdbda5..02ceee0 100644
--- a/src/service/PersonalityCalculator.java
+++ b/src/service/PersonalityCalculator.java
@@ -1,34 +1,41 @@
 package service;
 
 public class PersonalityCalculator{
-	String[] options = {"5","2","3","1","4","3","2","1","5","4","3","2","1","5","4","3","2","1","2","2"};
-	int[] optionsInt=new int[options.length];
+//	String[] options = {"5","2","3","1","4","3","2","1","5","4","3","2","1","5","4","3","2","1","2","2"};
+//	int[] optionsInt=new int[options.length];
 	
-	//FUNCTION findAnswers
-	public int[] findAnswers(String options) {
-		for(int i=0;i<this.options.length;i++) {
-			optionsInt[i]=Integer.parseInt(this.options[i]);
-		}
-		return optionsInt;
+	//FUNCTION findYourBrainType
+	public String findYourBrainType(String input)
+	{
+		System.out.println(input);
+		int x = findAnswers(input);
+		String result ="";
+	      if(x>=20 && x <= 55)
+	    	  result = "leftbrained";
+	      if(x>=56 && x <=64)
+	    	  result = "noclearpreference";
+	      if(x>=65 && x<=100)
+	    	  result = "rightbrained";
+	      System.out.println(result);
+		return result;
 	}
 	
-	//FUNCTION findYourBrainType
-	public String findYourBrainType(String options) {
-		int A=0,B=0;
-		findAnswers(options);
-		for(int i=0;i<optionsInt.length;i++) {
-			A+=optionsInt[i];
-		}
-		int x=66-A+B;
-		
-		if(x>=20 && x<=55) {
-			return "leftbrained";
-		}
-		else if(x>=56 && x<=64) {
-			return "noclearpreference";
-		}
-		else {
-			return "rightbrained";
-		}
+	//FUNCTION findAnswers
+	public int findAnswers(String input)
+	{
+		 String[] values = input.split(",");
+	     int size = values.length;
+	     System.out.println(size);
+	      int [] arrInt = new int [size];
+	      for(int i=0; i<size; i++) {
+	         arrInt[i] = Integer.parseInt(values[i]);
+	         System.out.println(arrInt[i]);
+	      }
+	      int A = (arrInt[0]+arrInt[1]+arrInt[2]+arrInt[4]+arrInt[7]+arrInt[9]+arrInt[10]+arrInt[11]+arrInt[13]+arrInt[17]+arrInt[19]);
+	      System.out.println(A);
+	      int B = arrInt[3]+arrInt[5]+arrInt[6]+arrInt[8]+arrInt[12]+arrInt[14]+arrInt[15]+arrInt[16]+arrInt[18];
+	      System.out.println(B);
+	      int x = 66 - A + B;
+	      return x;
 	}
 }
\ No newline at end of file