From c232a4707f8b7d5bef6ce75c50cb390eeae471e2 Mon Sep 17 00:00:00 2001 From: SanjayTalya <46246845+SanjayTalyaOfficial@users.noreply.github.com> Date: Tue, 3 Mar 2020 16:41:51 +0530 Subject: [PATCH 1/3] Just filled - lot to fillin and correct --- .classpath | 6 +----- build/classes/.gitignore | 3 --- .../PersonalityViewController.class | Bin 0 -> 3548 bytes .../service/PersonalityCalculator.class | Bin 0 -> 304 bytes .../testing/TestPersonalityCalculator.class | Bin 0 -> 1757 bytes src/controller/PersonalityViewController.java | 2 +- src/service/PersonalityCalculator.java | 18 ++++++++++++++++++ src/testing/TestPersonalityCalculator.java | 2 +- 8 files changed, 21 insertions(+), 10 deletions(-) delete mode 100644 build/classes/.gitignore create mode 100644 build/classes/controller/PersonalityViewController.class create mode 100644 build/classes/service/PersonalityCalculator.class create mode 100644 build/classes/testing/TestPersonalityCalculator.class diff --git a/.classpath b/.classpath index 2846539..20c137d 100644 --- a/.classpath +++ b/.classpath @@ -8,10 +8,6 @@ - - - - - + diff --git a/build/classes/.gitignore b/build/classes/.gitignore deleted file mode 100644 index 611b17f..0000000 --- a/build/classes/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/service/ -/controller/ -/testing/ diff --git a/build/classes/controller/PersonalityViewController.class b/build/classes/controller/PersonalityViewController.class new file mode 100644 index 0000000000000000000000000000000000000000..f6ec73c7cbbf105fd217919d42a5bb68a92b6c1d GIT binary patch literal 3548 zcmeHKZBJ7%6h0j7iDZ~NBkKNs2E4gcD+fDYt-({kS ze)l&S5)9@8t(?(eh-P^mjnzto z($%*lzP-Qqj|YPcCU-Tk?* z4VZ_!0ajwC2eOVmHG(~mUCFu1!Qwnbi(FkfvCA>ye~Gu2V7V~JwF>K;7^Y1i^10mR zR##1cJj5D?Tv~o3bBk-kiw1>5<0oHXzR6;jC2^;@;I3Z5#wG~ojLcUZ@~R2fsfR|{ z2(_vTxGfc>z&3$9+U{0lu|043@sm%8!2X=J&1|O1K2dfU*a~Gh?qktM4z<(JPsX;- zk5a#kuA~dRh_2}@I`>iwNgEk9h}wM}(C!S}TgZsjdl9Aj(KTc^EVO?Wc0CFc>Q6$4JF;DV^=mkhngr zbdEK2C6315t3B3(vs7z;mJ<)oGnkH7BK7j>+TQ#T;Edhwqj>%r&OVCPVepS?Al*_5 zdR<#L0+(3g>t9J@Zvkl(kpH6j>$U7pm)5^fG#U80_>%WXMrwGz=fxotsSpY4sv=Fa z(mImdClZY?L8Vh@^^Ate>F2e#n0j|^6r--k> IB3y&H@1&8JT>t<8 literal 0 HcmV?d00001 diff --git a/build/classes/service/PersonalityCalculator.class b/build/classes/service/PersonalityCalculator.class new file mode 100644 index 0000000000000000000000000000000000000000..99d84c1d3ddeef38525d91f208c52b6566fa42a7 GIT binary patch literal 304 zcmaKn!Ab)`42J(~*RHOuEgl8Yqk8B*fa0a#X|V;R_v{#S%D4lwvjrc^liF4*)Yv3uJ`jPQu0-sg@Et-?FpuWzNp@j-w9+a>8`Y8?GF;kJX}C zi;0Bcm2GXjCJfHbSA=}-AEd+pdn4>%NSM^NmD~Qgk#NtA6T)Hb4Z9TwoBH1{k59HE zoYen9ToTGV-v=W%Hk~^96Lpp-aSCP9_n?l%qF!iKsedOIZ`gg+AVaB|#=sc+s-vF; M^|5w@1Jw+ZEkmM4G5`Po literal 0 HcmV?d00001 diff --git a/build/classes/testing/TestPersonalityCalculator.class b/build/classes/testing/TestPersonalityCalculator.class new file mode 100644 index 0000000000000000000000000000000000000000..ef63c0449b17bcbefb40bd982e123b92bf20daf3 GIT binary patch literal 1757 zcmeHIPis>_5T8wBlRQ&X>z}Gsnbu2%@QR=pD}oK}DODk{(BtN1nrz(c#@$UY2fvPA zK~T`UA4;5kt<+*lv50u^@Mizb%x`D*H}k%J`}i3EQn*usf`HXPJ}A@MX!H1zoVP}5 z6{ZcTv$2-Jx)KxxEDq#EZfMDhFFFItf`Gy(6R_NzX|pL{{)sXwJQXmvet%Cuv0=MZ zf{Oxb$F8=Wv#tyaVy^JYIPz9csEe5$jub;HYjEUjN7K+h#-!4knjqgIMI+?1U|*B* zb?lO+Kp6VuS>~H3mFwsOyUS1wN7e<8(h)n*Q{b+&AGnk0}wtqLVr6mV_5d0Zu};J83HV-?k!%Fy%iutTmLX)9o|;ns4G!vN15(E^MA`pW!g-mT?&2MEyJ=9?|-v4|MTalk^Rw{Jd-~H zl2+cqc2p$B-BTNS8mU!+6{gwD@)1zoRo*k_A`v{S0ylB~WeEN*z&y(W&r48dS>e?~ zK8 Date: Tue, 3 Mar 2020 19:38:55 +0530 Subject: [PATCH 2/3] Minor changes --- .classpath | 8 ++++++-- ....eclipse.wst.common.project.facet.core.xml | 2 +- .../PersonalityViewController.class | Bin 3548 -> 1357 bytes 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.classpath b/.classpath index 20c137d..6e242d3 100644 --- a/.classpath +++ b/.classpath @@ -3,11 +3,15 @@ - + - + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index 524dbc8..3282512 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,6 +1,6 @@ - + diff --git a/build/classes/controller/PersonalityViewController.class b/build/classes/controller/PersonalityViewController.class index f6ec73c7cbbf105fd217919d42a5bb68a92b6c1d..34be0c9df99e0f5f9c9cb2ab0501f22dd7350e4e 100644 GIT binary patch delta 271 zcmca3eU^*s)W2Q(7#JAz7}O?m>C4GwC6*;t=ohCJmF1+C=x3Ca6zF>ZiD0n6M9%~! zM!m`UoXV3WnF1y=vr0`i;9#44o(05~0gCZW=HgMD{Ee;IHb}z7iDZ~NBkKNs2E4gcD+fDYt-({kS ze)l&S5)9@8t(?(eh-P^mjnzto z($%*lzP-Qqj|YPcCU-Tk?* z4VZ_!0ajwC2eOVmHG(~mUCFu1!Qwnbi(FkfvCA>ye~Gu2V7V~JwF>K;7^Y1i^10mR zR##1cJj5D?Tv~o3bBk-kiw1>5<0oHXzR6;jC2^;@;I3Z5#wG~ojLcUZ@~R2fsfR|{ z2(_vTxGfc>z&3$9+U{0lu|043@sm%8!2X=J&1|O1K2dfU*a~Gh?qktM4z<(JPsX;- zk5a#kuA~dRh_2}@I`>iwNgEk9h}wM}(C!S}TgZsjdl9Aj(KTc^EVO?Wc0CFc>Q6$4JF;DV^=mkhngr zbdEK2C6315t3B3(vs7z;mJ<)oGnkH7BK7j>+TQ#T;Edhwqj>%r&OVCPVepS?Al*_5 zdR<#L0+(3g>t9J@Zvkl(kpH6j>$U7pm)5^fG#U80_>%WXMrwGz=fxotsSpY4sv=Fa z(mImdClZY?L8Vh@^^Ate>F2e#n0j|^6r--k> IB3y&H@1&8JT>t<8 From cfdcd59b6aa6155393c857a197603b6b51b3cb89 Mon Sep 17 00:00:00 2001 From: SanjayTalya <46246845+SanjayTalyaOfficial@users.noreply.github.com> Date: Thu, 5 Mar 2020 22:12:31 +0530 Subject: [PATCH 3/3] yes done --- .../PersonalityViewController.class | Bin 1357 -> 0 bytes .../service/PersonalityCalculator.class | Bin 304 -> 0 bytes .../testing/TestPersonalityCalculator.class | Bin 1757 -> 0 bytes .classpath => lab-braintest-master/.classpath | 30 +- .project => lab-braintest-master/.project | 62 +- .../.settings}/.jsdtscope | 24 +- .../org.eclipse.core.resources.prefs | 4 +- .../.settings}/org.eclipse.jdt.core.prefs | 14 +- .../org.eclipse.wst.common.component | 16 +- ....eclipse.wst.common.project.facet.core.xml | 20 +- ...rg.eclipse.wst.jsdt.ui.superType.container | 0 .../org.eclipse.wst.jsdt.ui.superType.name | 0 README.md => lab-braintest-master/README.md | 0 .../WebContent}/META-INF/MANIFEST.MF | 6 +- .../WEB-INF/lib/hamcrest-core-1.3.jar | Bin .../lib/javax.servlet.jsp.jstl-api-1.2.1.jar | Bin .../WebContent}/WEB-INF/lib/jstl-api-1.2.jar | Bin .../WebContent}/WEB-INF/lib/junit-4.12.jar | Bin .../lib/taglibs-standard-impl-1.2.5.jar | Bin .../WEB-INF/views/leftBrainView.jsp | 24 +- .../WebContent}/WEB-INF/views/neutralView.jsp | 24 +- .../WEB-INF/views/personalityView.jsp | 160 ++-- .../WEB-INF/views/rightBrainView.jsp | 22 +- .../WebContent}/WEB-INF/web.xml | 14 +- .../WebContent}/appscript/script.js | 346 +++---- .../assets/Background for home page.svg | 0 .../WebContent}/assets/Brain logo.svg | 0 .../WebContent}/assets/Footer.svg | 0 .../WebContent}/assets/leftbrain.svg | 0 .../WebContent}/assets/logoimage.svg | 0 .../WebContent}/assets/prograd-heart.svg | 0 .../WebContent}/assets/rightbrain.svg | 0 .../WebContent}/assets/style.css | 878 +++++++++--------- .../WebContent}/assets/wellbalanced.svg | 0 lab-braintest-master/build/classes/.gitignore | 3 + .../controller/PersonalityViewController.java | 145 +-- .../src/service/PersonalityCalculator.java | 49 + .../testing/TestPersonalityCalculator.java | 63 +- src/service/PersonalityCalculator.java | 29 - 39 files changed, 980 insertions(+), 953 deletions(-) delete mode 100644 build/classes/controller/PersonalityViewController.class delete mode 100644 build/classes/service/PersonalityCalculator.class delete mode 100644 build/classes/testing/TestPersonalityCalculator.class rename .classpath => lab-braintest-master/.classpath (74%) rename .project => lab-braintest-master/.project (96%) rename {.settings => lab-braintest-master/.settings}/.jsdtscope (97%) rename {.settings => lab-braintest-master/.settings}/org.eclipse.core.resources.prefs (97%) rename {.settings => lab-braintest-master/.settings}/org.eclipse.jdt.core.prefs (98%) rename {.settings => lab-braintest-master/.settings}/org.eclipse.wst.common.component (98%) rename {.settings => lab-braintest-master/.settings}/org.eclipse.wst.common.project.facet.core.xml (85%) rename {.settings => lab-braintest-master/.settings}/org.eclipse.wst.jsdt.ui.superType.container (100%) rename {.settings => lab-braintest-master/.settings}/org.eclipse.wst.jsdt.ui.superType.name (100%) rename README.md => lab-braintest-master/README.md (100%) rename {WebContent => lab-braintest-master/WebContent}/META-INF/MANIFEST.MF (92%) rename {WebContent => lab-braintest-master/WebContent}/WEB-INF/lib/hamcrest-core-1.3.jar (100%) rename {WebContent => lab-braintest-master/WebContent}/WEB-INF/lib/javax.servlet.jsp.jstl-api-1.2.1.jar (100%) rename {WebContent => lab-braintest-master/WebContent}/WEB-INF/lib/jstl-api-1.2.jar (100%) rename {WebContent => lab-braintest-master/WebContent}/WEB-INF/lib/junit-4.12.jar (100%) rename {WebContent => lab-braintest-master/WebContent}/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar (100%) rename {WebContent => lab-braintest-master/WebContent}/WEB-INF/views/leftBrainView.jsp (95%) rename {WebContent => lab-braintest-master/WebContent}/WEB-INF/views/neutralView.jsp (96%) rename {WebContent => lab-braintest-master/WebContent}/WEB-INF/views/personalityView.jsp (98%) rename {WebContent => lab-braintest-master/WebContent}/WEB-INF/views/rightBrainView.jsp (96%) rename {WebContent => lab-braintest-master/WebContent}/WEB-INF/web.xml (98%) rename {WebContent => lab-braintest-master/WebContent}/appscript/script.js (96%) rename {WebContent => lab-braintest-master/WebContent}/assets/Background for home page.svg (100%) rename {WebContent => lab-braintest-master/WebContent}/assets/Brain logo.svg (100%) rename {WebContent => lab-braintest-master/WebContent}/assets/Footer.svg (100%) rename {WebContent => lab-braintest-master/WebContent}/assets/leftbrain.svg (100%) rename {WebContent => lab-braintest-master/WebContent}/assets/logoimage.svg (100%) rename {WebContent => lab-braintest-master/WebContent}/assets/prograd-heart.svg (100%) rename {WebContent => lab-braintest-master/WebContent}/assets/rightbrain.svg (100%) rename {WebContent => lab-braintest-master/WebContent}/assets/style.css (94%) rename {WebContent => lab-braintest-master/WebContent}/assets/wellbalanced.svg (100%) create mode 100644 lab-braintest-master/build/classes/.gitignore rename {src => lab-braintest-master/src}/controller/PersonalityViewController.java (90%) create mode 100644 lab-braintest-master/src/service/PersonalityCalculator.java rename {src => lab-braintest-master/src}/testing/TestPersonalityCalculator.java (90%) delete mode 100644 src/service/PersonalityCalculator.java diff --git a/build/classes/controller/PersonalityViewController.class b/build/classes/controller/PersonalityViewController.class deleted file mode 100644 index 34be0c9df99e0f5f9c9cb2ab0501f22dd7350e4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1357 zcmdT^T~8B16g^W5Eh|_)#1BvyPzffctBJmd@dZ&ajS?zNd>qGRYu37 zhNcgjgPjtJ0!!~yUmd1_eBV$^4`S@5&)L+E9Rkz5rIl$gi*|Nz`-y;fAuz=}Au1ai z%JgWAb7zkb7=NU#j*kV-t>1146gORqO1L0U$ugxz*><|+z4K*E3sK#(o`N%dYRRVS zbhS~D)5xxO`-VEeWMNmK9J7KwkH+IClehCLA6OXb1Jz{a!^8aQpvvJhMDW%AV;zM*_*aJ>?l`1u1c;X zn+Kl>$vXE-9kMY=FooGkB$yMJU$6b1Xgzvu+Z)-$D>ZHDWv{bO{&m)dz--Mm`23IoJx+VNWOnI&k3!tYs~ZIiU6v5#H78q#P3mSRA4<6P zmnu)hH~^KfBrunEuU)$RYOqm;6j&LpDV7wgwB>eOh-KUm_%RxvYw$nTj6hP)Z^Tob ziDBu~|3NhyC|1B%H@nJMz!=8)UE);%W%e=^&a<6l&;5K2BwsM~X14MPGv9LDMYdTK zFoSuvllgaoOSsIdBCg;nvn}MP0v2(7z?Nk_W?LS@wm6h+S5UyM EU)~6QSpWb4 diff --git a/build/classes/service/PersonalityCalculator.class b/build/classes/service/PersonalityCalculator.class deleted file mode 100644 index 99d84c1d3ddeef38525d91f208c52b6566fa42a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmaKn!Ab)`42J(~*RHOuEgl8Yqk8B*fa0a#X|V;R_v{#S%D4lwvjrc^liF4*)Yv3uJ`jPQu0-sg@Et-?FpuWzNp@j-w9+a>8`Y8?GF;kJX}C zi;0Bcm2GXjCJfHbSA=}-AEd+pdn4>%NSM^NmD~Qgk#NtA6T)Hb4Z9TwoBH1{k59HE zoYen9ToTGV-v=W%Hk~^96Lpp-aSCP9_n?l%qF!iKsedOIZ`gg+AVaB|#=sc+s-vF; M^|5w@1Jw+ZEkmM4G5`Po diff --git a/build/classes/testing/TestPersonalityCalculator.class b/build/classes/testing/TestPersonalityCalculator.class deleted file mode 100644 index ef63c0449b17bcbefb40bd982e123b92bf20daf3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1757 zcmeHIPis>_5T8wBlRQ&X>z}Gsnbu2%@QR=pD}oK}DODk{(BtN1nrz(c#@$UY2fvPA zK~T`UA4;5kt<+*lv50u^@Mizb%x`D*H}k%J`}i3EQn*usf`HXPJ}A@MX!H1zoVP}5 z6{ZcTv$2-Jx)KxxEDq#EZfMDhFFFItf`Gy(6R_NzX|pL{{)sXwJQXmvet%Cuv0=MZ zf{Oxb$F8=Wv#tyaVy^JYIPz9csEe5$jub;HYjEUjN7K+h#-!4knjqgIMI+?1U|*B* zb?lO+Kp6VuS>~H3mFwsOyUS1wN7e<8(h)n*Q{b+&AGnk0}wtqLVr6mV_5d0Zu};J83HV-?k!%Fy%iutTmLX)9o|;ns4G!vN15(E^MA`pW!g-mT?&2MEyJ=9?|-v4|MTalk^Rw{Jd-~H zl2+cqc2p$B-BTNS8mU!+6{gwD@)1zoRo*k_A`v{S0ylB~WeEN*z&y(W&r48dS>e?~ zK8 - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/.project b/lab-braintest-master/.project similarity index 96% rename from .project rename to lab-braintest-master/.project index def99df..772052d 100644 --- a/.project +++ b/lab-braintest-master/.project @@ -1,31 +1,31 @@ - - - lab-java-11-braintest - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.jsdt.core.jsNature - - + + + lab-java-11-braintest + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.jdt.core.javanature + org.eclipse.wst.jsdt.core.jsNature + + diff --git a/.settings/.jsdtscope b/lab-braintest-master/.settings/.jsdtscope similarity index 97% rename from .settings/.jsdtscope rename to lab-braintest-master/.settings/.jsdtscope index 5cee5ac..92e666d 100644 --- a/.settings/.jsdtscope +++ b/lab-braintest-master/.settings/.jsdtscope @@ -1,12 +1,12 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/.settings/org.eclipse.core.resources.prefs b/lab-braintest-master/.settings/org.eclipse.core.resources.prefs similarity index 97% rename from .settings/org.eclipse.core.resources.prefs rename to lab-braintest-master/.settings/org.eclipse.core.resources.prefs index a835c80..c883bbb 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/lab-braintest-master/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding//WebContent/WEB-INF/views/rightBrainView.jsp=UTF-8 +eclipse.preferences.version=1 +encoding//WebContent/WEB-INF/views/rightBrainView.jsp=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/lab-braintest-master/.settings/org.eclipse.jdt.core.prefs similarity index 98% rename from .settings/org.eclipse.jdt.core.prefs rename to lab-braintest-master/.settings/org.eclipse.jdt.core.prefs index 295926d..0c68a61 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/lab-braintest-master/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.settings/org.eclipse.wst.common.component b/lab-braintest-master/.settings/org.eclipse.wst.common.component similarity index 98% rename from .settings/org.eclipse.wst.common.component rename to lab-braintest-master/.settings/org.eclipse.wst.common.component index ce2a30e..8abd7a6 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/lab-braintest-master/.settings/org.eclipse.wst.common.component @@ -1,8 +1,8 @@ - - - - - - - - + + + + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/lab-braintest-master/.settings/org.eclipse.wst.common.project.facet.core.xml similarity index 85% rename from .settings/org.eclipse.wst.common.project.facet.core.xml rename to lab-braintest-master/.settings/org.eclipse.wst.common.project.facet.core.xml index 3282512..01f950a 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/lab-braintest-master/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,10 +1,10 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/lab-braintest-master/.settings/org.eclipse.wst.jsdt.ui.superType.container similarity index 100% rename from .settings/org.eclipse.wst.jsdt.ui.superType.container rename to lab-braintest-master/.settings/org.eclipse.wst.jsdt.ui.superType.container diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/lab-braintest-master/.settings/org.eclipse.wst.jsdt.ui.superType.name similarity index 100% rename from .settings/org.eclipse.wst.jsdt.ui.superType.name rename to lab-braintest-master/.settings/org.eclipse.wst.jsdt.ui.superType.name diff --git a/README.md b/lab-braintest-master/README.md similarity index 100% rename from README.md rename to lab-braintest-master/README.md diff --git a/WebContent/META-INF/MANIFEST.MF b/lab-braintest-master/WebContent/META-INF/MANIFEST.MF similarity index 92% rename from WebContent/META-INF/MANIFEST.MF rename to lab-braintest-master/WebContent/META-INF/MANIFEST.MF index 5e94951..254272e 100644 --- a/WebContent/META-INF/MANIFEST.MF +++ b/lab-braintest-master/WebContent/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ -Manifest-Version: 1.0 -Class-Path: - +Manifest-Version: 1.0 +Class-Path: + diff --git a/WebContent/WEB-INF/lib/hamcrest-core-1.3.jar b/lab-braintest-master/WebContent/WEB-INF/lib/hamcrest-core-1.3.jar similarity index 100% rename from WebContent/WEB-INF/lib/hamcrest-core-1.3.jar rename to lab-braintest-master/WebContent/WEB-INF/lib/hamcrest-core-1.3.jar diff --git a/WebContent/WEB-INF/lib/javax.servlet.jsp.jstl-api-1.2.1.jar b/lab-braintest-master/WebContent/WEB-INF/lib/javax.servlet.jsp.jstl-api-1.2.1.jar similarity index 100% rename from WebContent/WEB-INF/lib/javax.servlet.jsp.jstl-api-1.2.1.jar rename to lab-braintest-master/WebContent/WEB-INF/lib/javax.servlet.jsp.jstl-api-1.2.1.jar diff --git a/WebContent/WEB-INF/lib/jstl-api-1.2.jar b/lab-braintest-master/WebContent/WEB-INF/lib/jstl-api-1.2.jar similarity index 100% rename from WebContent/WEB-INF/lib/jstl-api-1.2.jar rename to lab-braintest-master/WebContent/WEB-INF/lib/jstl-api-1.2.jar diff --git a/WebContent/WEB-INF/lib/junit-4.12.jar b/lab-braintest-master/WebContent/WEB-INF/lib/junit-4.12.jar similarity index 100% rename from WebContent/WEB-INF/lib/junit-4.12.jar rename to lab-braintest-master/WebContent/WEB-INF/lib/junit-4.12.jar diff --git a/WebContent/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar b/lab-braintest-master/WebContent/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar similarity index 100% rename from WebContent/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar rename to lab-braintest-master/WebContent/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar diff --git a/WebContent/WEB-INF/views/leftBrainView.jsp b/lab-braintest-master/WebContent/WEB-INF/views/leftBrainView.jsp similarity index 95% rename from WebContent/WEB-INF/views/leftBrainView.jsp rename to lab-braintest-master/WebContent/WEB-INF/views/leftBrainView.jsp index 97c79e5..267f1de 100644 --- a/WebContent/WEB-INF/views/leftBrainView.jsp +++ b/lab-braintest-master/WebContent/WEB-INF/views/leftBrainView.jsp @@ -1,13 +1,13 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - -LEFT BRAIN - - - - +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + + + + + +LEFT BRAIN + + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/views/neutralView.jsp b/lab-braintest-master/WebContent/WEB-INF/views/neutralView.jsp similarity index 96% rename from WebContent/WEB-INF/views/neutralView.jsp rename to lab-braintest-master/WebContent/WEB-INF/views/neutralView.jsp index 336de77..5746f6b 100644 --- a/WebContent/WEB-INF/views/neutralView.jsp +++ b/lab-braintest-master/WebContent/WEB-INF/views/neutralView.jsp @@ -1,13 +1,13 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - -WELL BALANCED - - - - +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + + + + + +WELL BALANCED + + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/views/personalityView.jsp b/lab-braintest-master/WebContent/WEB-INF/views/personalityView.jsp similarity index 98% rename from WebContent/WEB-INF/views/personalityView.jsp rename to lab-braintest-master/WebContent/WEB-INF/views/personalityView.jsp index 72bbc6d..c02c9e1 100644 --- a/WebContent/WEB-INF/views/personalityView.jsp +++ b/lab-braintest-master/WebContent/WEB-INF/views/personalityView.jsp @@ -1,81 +1,81 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> - - - - -Guess Me - - - - - - - -
-
THE 50 SECONDS BRAIN TEST
-
Which side does your brain belongs to? Time to find out!
- -
- -
HERE YOU GO...
- -
-
-
-
-
- -
- - - - - - - - - - - - - - -
-
-
- -
- - -
-
-
- - - - - -

Made with by ProGrad

- - +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> + + + + +Guess Me + + + + + + + +
+
THE 50 SECONDS BRAIN TEST
+
Which side does your brain belongs to? Time to find out!
+ +
+ +
HERE YOU GO...
+ +
+
+
+
+
+ +
+ + + + + + + + + + + + + + +
+
+
+ +
+ + +
+
+
+ + + + + +

Made with by ProGrad

+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/views/rightBrainView.jsp b/lab-braintest-master/WebContent/WEB-INF/views/rightBrainView.jsp similarity index 96% rename from WebContent/WEB-INF/views/rightBrainView.jsp rename to lab-braintest-master/WebContent/WEB-INF/views/rightBrainView.jsp index 91cbcbc..2f79064 100644 --- a/WebContent/WEB-INF/views/rightBrainView.jsp +++ b/lab-braintest-master/WebContent/WEB-INF/views/rightBrainView.jsp @@ -1,12 +1,12 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> - - - - -RIGHT BRAIN - - - - - +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> + + + + +RIGHT BRAIN + + + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/web.xml b/lab-braintest-master/WebContent/WEB-INF/web.xml similarity index 98% rename from WebContent/WEB-INF/web.xml rename to lab-braintest-master/WebContent/WEB-INF/web.xml index 40b6e68..1ffc5c2 100644 --- a/WebContent/WEB-INF/web.xml +++ b/lab-braintest-master/WebContent/WEB-INF/web.xml @@ -1,8 +1,8 @@ - - - lab-java-11-braintest - - personality - - + + + lab-java-11-braintest + + personality + + \ No newline at end of file diff --git a/WebContent/appscript/script.js b/lab-braintest-master/WebContent/appscript/script.js similarity index 96% rename from WebContent/appscript/script.js rename to lab-braintest-master/WebContent/appscript/script.js index fae6e33..eedfefb 100644 --- a/WebContent/appscript/script.js +++ b/lab-braintest-master/WebContent/appscript/script.js @@ -1,173 +1,173 @@ -// QUESTIONS - -const questions = [ - { - "question": "I do not expect to be praised by others.", - - }, - { - "question": "I like sitting in the Math class rather than sitting in the Pottery class (I am vividly imaginative & I enjoy classes where I can move around and try things).", - - }, - { - "question": "I always show up in/on time.", - - }, - { - "question": "I do not care to read to the instructions before I start putting something together, I like learning along the way.", - - }, - { - "question": "I am tidy and organized and cannot live in a mess.", - - }, - { - "question": "My thinking is random & unstructured.", - - }, - { - "question": "I am an effective communicator", - - }, - { - "question": "I can picture things clearly in my head.", - - }, - { - "question": "I often come up with new ideas.", - - }, - { - "question": "I am not easily disturbed by events.", - - }, - { - "question": "I rarely cry while watching sad movies or incidents.", - - }, - { - "question": "I am good at laying out a step-by-step plan.", - - }, - { - "question": "I am the happiest when I am creating or expressing myself.", - - }, - { - "question": "I make decisions based on facts, not feelings. (I like info that is precise and measurable).", - - }, - { - "question": "I make a mess of things.", - - }, - { - "question": "I get stressed out easily.", - - }, - { - "question": "I like fantasy and make believe.", - - }, - { - "question": "I prize logic above all else. (For something to be credible, it needs to be logical).", - - }, - { - "question": "I often forget to put things back in their proper place.", - - }, - { - "question": "I keep my feelings controlled.", - - } -] - -/*Declare all the variables outside the scope of the function*/ - -let currentQuestion = 0; -const form=document.getElementById("myForm"); -const totalQuestions =questions.length; -const container = document.querySelector('.quiz-container'); -const questionEl = document.querySelector('.question'); -const nextButton = document.querySelector('.next'); -const previousButton = document.querySelector('.previous'); - -const answers=document.getElementsByName("option"); -const hiddenSelectedAnswers = document.getElementById("selectedOptions"); -const selectedAnswers=[]; - -//Function to generate question -function generateQuestions (index) { - //console.log("Entering generate question"); - //Select each question by passing it a particular index - const question = questions[index]; - questionEl.innerHTML = `${index + 1}. ${question.question}` - -} - - -function loadNextQuestion () { - console.log("Load next question"); - var selectedOption = document.querySelector('input[type="radio"]:checked'); - - //Check if there is a radio input checked - if(!selectedOption) { - alert('Please select your answer!'); - return; - } -for(var i=0;i * { - margin: 1rem; - -} -button { - padding: 0.5rem 1.5rem; - border: none; - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1); - border-radius: 1rem; - font-weight: 300; - color: white; - outline: none; - transform: scale(0.98); - transition: all 0.2s; - font-family: Nunito Sans; - font-style: normal; - font-weight: normal; - font-size: 24px; - line-height: 33px; -/* identical to box height */ - - -} -button.previous { - background: #000000; -} -button.next { - background: #000000; -} -button.restart { - background: #0cf574; - color: #00000050; - font-size: 2rem; - margin-bottom: 1rem; - transition: all 0.4s; -} -button.restart:hover { - color: #00000098; -} -button:hover, -button:focus { - transform: scale(1); - font-weight: 500; - box-shadow: 1px 1px 1px rgba(255, 255, 255, 0.5); -} - - -/*new radio button */ -.card { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - flex-direction:row; - margin: auto; - -webkit-box-shadow: 0 0.5rem 1rem rgba(0, 0, 16, 0.19), 0 0.3rem 0.3rem rgba(0, 0, 16, 0.23); - -} - -.rating-container { - - display: flex; - flex-direction: row; - - justify-content: space-between; - padding: 0.4rem 0.8rem; - width: 100%; -} - -.rating-text p { - color: rgba(0, 0, 16, 0.8); - font-size: 1.3rem; - padding: 0.3rem; -} - -.rating { - display:flex; - background-color: rgba(0, 0, 16, 0.8); - padding: 0.4rem 0.4rem 0.1rem 0.4rem; - border-radius: 2.2rem; -} - -svg { - fill: rgb(242, 242, 242); - height: 3.6rem; - width: 3.6rem; - margin: 0.2rem; -} - -.rating-form-2 svg { - height: 3rem; - width: 3rem; - margin: 0.5rem; -} - -#radios label { - position: relative; -} - -input[type="radio"] { - position: absolute; - opacity: 0; -} - -input[type="radio"] + svg { - -webkit-transition: all 0.2s; - transition: all 0.2s; -} - -input + svg { - cursor: pointer; -} - -input[class="super-happy"]:hover + svg, -input[class="super-happy"]:checked + svg, -input[class="super-happy"]:focus + svg { - fill: rgb(0, 109, 217); -} - -input[class="happy"]:hover + svg, -input[class="happy"]:checked + svg, -input[class="happy"]:focus + svg { - fill: rgb(0, 204, 79); -} - -input[class="neutral"]:hover + svg, -input[class="neutral"]:checked + svg, -input[class="neutral"]:focus + svg { - fill: rgb(232, 214, 0); -} - -input[class="sad"]:hover + svg, -input[class="sad"]:checked + svg, -input[class="sad"]:focus + svg { - fill: rgb(229, 132, 0); -} - -input[class="super-sad"]:hover + svg, -input[class="super-sad"]:checked + svg, -input[class="super-sad"]:focus + svg { - fill: rgb(239, 42, 16); -} - -/*rightBrainView */ - -.output-header-text{ - display:flex; - position: absolute; - width: 610px; - height: 120px; - left: 74px; - top: 65px; - font-family: Ubuntu; - font-style: normal; - font-weight: bold; - font-size: 44px; - line-height: 60px; -/* or 136% */ - -letter-spacing: 0.05em; - -color: #FFFFFF; -} -.outputlogo{ - display: flex; - flex-direction: row; - - color: var(--main-text-color); - width:100%; -} - -.output{ - display:flex; - flex-direction:row; -} -.output-text{ - display:flex; - flex-direction:column; - justify-content:space-between; - position: absolute; - width: 807px; - height: 315px; - left: 62px; - top: 362.98px; - font-family: Ubuntu; - font-style: normal; - font-weight: 300; - font-size: 18px; - line-height: 21px; - align-items: center; - - color: #000000; -} -.filler-div{ - flex:1; - -} -.output-brain{ - display:flex; - flex-direction:row; - position: absolute; -width: 362.03px; -height: 395.99px; -left: 973px; -top: 303px; - -} - -/*dynamically displaying form fields*/ -.result { - display: flex; - flex-direction: column; - padding: 2rem; - justify-content: center; - align-items: center; - text-align: center; - font-size: 2.5rem; - min-height: 100vh; -} -.final-score { - color: #00000099; -} -.summary { - font-size: 1rem; - text-shadow: 1px 1px #ffffff50; - color: #00000099; - background: rgba(255, 255, 255, 0.4); - border-radius: 5px; - display: flex; - flex-direction: column; - align-items: flex-start; - padding: 0 2rem; - margin-bottom: 2rem; -} -.summary h1 { - align-self: center; -} -button.restart { - background: #0cf574; - color: #00000050; - font-size: 2rem; - margin-bottom: 1rem; - transition: all 0.4s; -} -button.restart:hover { - color: #00000098; -} - -.footer-text{ - display:flex; - flex-direction: row; - align-content: flex-end; - position: absolute; - margin: 275px 0px 0px 80px; - - font-size: 18px; - font-family: Ubuntu; - font-style: normal; - z-index:9; +@import url('https://fonts.googleapis.com/css?family=Ubuntu&display=swap'); + +*{margin:0;padding:0;} + + +.leftbrain{ + display:flex; + background:url('leftbrain.svg'); + /* background-size: 100%; */ + /* Center and scale the image nicely */ + /* background-position: center; */ + background-repeat: no-repeat; + /* background-size: cover; */ +} +.rightbrain{ + display:flex; + background:url('rightbrain.svg'); + background-size: 100%; + /* Center and scale the image nicely */ + /* background-position: center; */ + background-repeat: no-repeat; + /* background-size: cover; */ +} +.wellbalanced{ + display:flex; + background:url('wellbalanced.svg'); + background-size: 100%; + /* Center and scale the image nicely */ + /* background-position: center; */ + background-repeat: no-repeat; + /* background-size: cover; */ +} +.logo{ + + position: absolute; + margin:0 auto; + width: 314px; + height: 314px; +/* left: 563px; + top: 237px;*/ + top: 50%; + left: 50%; + /* bring your own prefixes */ + transform: translate(-50%, -50%); + } + +.header{ + display: flex; + flex-direction: row; + justify-content: center; + background: url('Background for home page.svg') ; + color: var(--main-text-color); + height: 635px; + left: 0px; + top: 0px; + background-size: cover; + } + + +.header-text{ + position: absolute; + font-family: Ubuntu; + font-style: normal; + font-weight: 500; + font-size: 44px; + line-height: 51px; + /* identical to box height */ + display: flex; + flex-direction:row; + flex-wrap:wrap; + align-items: center; + padding:73px; + text-align: center; + letter-spacing: 0.05em; + color: #FFFFFF; + +} +.header-text-small{ + position: absolute; + font-family: Ubuntu; + font-style: normal; + font-weight: normal; + font-size: 18px; + line-height: 21px; + /* identical to box height */ + display: flex; + flex-direction:row; + justify-content:center; + align-items: center; + color: #FFFFFF; + padding:152px; + } +.footer +{ + display: flex; + flex-direction: row; + background: url('Footer.svg'); + position: absolute; + width: 100%; + height: 346px; + left: 0px; + -webkit-background-size: cover; + -moz-background-size: cover; + -o-background-size: cover; + background-size: cover; + } +main{ + padding:50px; + font-family: Ubuntu; + font-style: normal; + font-weight: bold; + font-size: 24px; + line-height: 28px; + /* identical to box height */ + display: flex; + flex-flow:row wrap; + justify-content:center; + align-items: center; + text-align: center; + color: #000000; + } + + +.quiz-container { + /* box-shadow: 1px 1px 1px 1px rgba(0, 0, 0, 0.2); + // text-shadow: 1px 1px white; + // padding: 3rem; + / text-shadow: 0 1px #576071; + width: 80%; + /* margin: 5rem auto;*/ + display: flex; + flex-direction: column; + text-align: center; + font-family: Ubuntu; + font-style: normal; + font-weight: normal; + font-size: 24px; + line-height: 35px; + box-sizing: border-box; + /* border: 2px solid #0099FF;*/ + border-radius: 1rem; +} + +/* for js*/ + +.question { + margin: 2rem 0; +font-family: Ubuntu; +font-style: normal; +font-weight: normal; +font-size: 24px; +line-height: 28px; + justify-content: center; + +/* identical to box height */ + +display: flex; +align-items: center; +text-align: center; +} +.option { + display:flex; + flex-direction:row; + justify-content:center; + padding: 1rem; + color: #576071; + background: rgba(255, 255, 255, 0.1); + border-radius: 5px; + transition: all 0.3s; + +} +.option:hover { + background: rgba(255, 255, 255, 0.4); +} +.option input:checked .option { + background: #08038c; + color: #000; +} +.controls{ + padding:2rem; +} +.controls > * { + margin: 1rem; + +} +button { + padding: 0.5rem 1.5rem; + border: none; + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1); + border-radius: 1rem; + font-weight: 300; + color: white; + outline: none; + transform: scale(0.98); + transition: all 0.2s; + font-family: Nunito Sans; + font-style: normal; + font-weight: normal; + font-size: 24px; + line-height: 33px; +/* identical to box height */ + + +} +button.previous { + background: #000000; +} +button.next { + background: #000000; +} +button.restart { + background: #0cf574; + color: #00000050; + font-size: 2rem; + margin-bottom: 1rem; + transition: all 0.4s; +} +button.restart:hover { + color: #00000098; +} +button:hover, +button:focus { + transform: scale(1); + font-weight: 500; + box-shadow: 1px 1px 1px rgba(255, 255, 255, 0.5); +} + + +/*new radio button */ +.card { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + flex-direction:row; + margin: auto; + -webkit-box-shadow: 0 0.5rem 1rem rgba(0, 0, 16, 0.19), 0 0.3rem 0.3rem rgba(0, 0, 16, 0.23); + +} + +.rating-container { + + display: flex; + flex-direction: row; + + justify-content: space-between; + padding: 0.4rem 0.8rem; + width: 100%; +} + +.rating-text p { + color: rgba(0, 0, 16, 0.8); + font-size: 1.3rem; + padding: 0.3rem; +} + +.rating { + display:flex; + background-color: rgba(0, 0, 16, 0.8); + padding: 0.4rem 0.4rem 0.1rem 0.4rem; + border-radius: 2.2rem; +} + +svg { + fill: rgb(242, 242, 242); + height: 3.6rem; + width: 3.6rem; + margin: 0.2rem; +} + +.rating-form-2 svg { + height: 3rem; + width: 3rem; + margin: 0.5rem; +} + +#radios label { + position: relative; +} + +input[type="radio"] { + position: absolute; + opacity: 0; +} + +input[type="radio"] + svg { + -webkit-transition: all 0.2s; + transition: all 0.2s; +} + +input + svg { + cursor: pointer; +} + +input[class="super-happy"]:hover + svg, +input[class="super-happy"]:checked + svg, +input[class="super-happy"]:focus + svg { + fill: rgb(0, 109, 217); +} + +input[class="happy"]:hover + svg, +input[class="happy"]:checked + svg, +input[class="happy"]:focus + svg { + fill: rgb(0, 204, 79); +} + +input[class="neutral"]:hover + svg, +input[class="neutral"]:checked + svg, +input[class="neutral"]:focus + svg { + fill: rgb(232, 214, 0); +} + +input[class="sad"]:hover + svg, +input[class="sad"]:checked + svg, +input[class="sad"]:focus + svg { + fill: rgb(229, 132, 0); +} + +input[class="super-sad"]:hover + svg, +input[class="super-sad"]:checked + svg, +input[class="super-sad"]:focus + svg { + fill: rgb(239, 42, 16); +} + +/*rightBrainView */ + +.output-header-text{ + display:flex; + position: absolute; + width: 610px; + height: 120px; + left: 74px; + top: 65px; + font-family: Ubuntu; + font-style: normal; + font-weight: bold; + font-size: 44px; + line-height: 60px; +/* or 136% */ + +letter-spacing: 0.05em; + +color: #FFFFFF; +} +.outputlogo{ + display: flex; + flex-direction: row; + + color: var(--main-text-color); + width:100%; +} + +.output{ + display:flex; + flex-direction:row; +} +.output-text{ + display:flex; + flex-direction:column; + justify-content:space-between; + position: absolute; + width: 807px; + height: 315px; + left: 62px; + top: 362.98px; + font-family: Ubuntu; + font-style: normal; + font-weight: 300; + font-size: 18px; + line-height: 21px; + align-items: center; + + color: #000000; +} +.filler-div{ + flex:1; + +} +.output-brain{ + display:flex; + flex-direction:row; + position: absolute; +width: 362.03px; +height: 395.99px; +left: 973px; +top: 303px; + +} + +/*dynamically displaying form fields*/ +.result { + display: flex; + flex-direction: column; + padding: 2rem; + justify-content: center; + align-items: center; + text-align: center; + font-size: 2.5rem; + min-height: 100vh; +} +.final-score { + color: #00000099; +} +.summary { + font-size: 1rem; + text-shadow: 1px 1px #ffffff50; + color: #00000099; + background: rgba(255, 255, 255, 0.4); + border-radius: 5px; + display: flex; + flex-direction: column; + align-items: flex-start; + padding: 0 2rem; + margin-bottom: 2rem; +} +.summary h1 { + align-self: center; +} +button.restart { + background: #0cf574; + color: #00000050; + font-size: 2rem; + margin-bottom: 1rem; + transition: all 0.4s; +} +button.restart:hover { + color: #00000098; +} + +.footer-text{ + display:flex; + flex-direction: row; + align-content: flex-end; + position: absolute; + margin: 275px 0px 0px 80px; + + font-size: 18px; + font-family: Ubuntu; + font-style: normal; + z-index:9; } \ No newline at end of file diff --git a/WebContent/assets/wellbalanced.svg b/lab-braintest-master/WebContent/assets/wellbalanced.svg similarity index 100% rename from WebContent/assets/wellbalanced.svg rename to lab-braintest-master/WebContent/assets/wellbalanced.svg diff --git a/lab-braintest-master/build/classes/.gitignore b/lab-braintest-master/build/classes/.gitignore new file mode 100644 index 0000000..3a11f75 --- /dev/null +++ b/lab-braintest-master/build/classes/.gitignore @@ -0,0 +1,3 @@ +/controller/ +/service/ +/testing/ diff --git a/src/controller/PersonalityViewController.java b/lab-braintest-master/src/controller/PersonalityViewController.java similarity index 90% rename from src/controller/PersonalityViewController.java rename to lab-braintest-master/src/controller/PersonalityViewController.java index 5a00563..8524cbb 100644 --- a/src/controller/PersonalityViewController.java +++ b/lab-braintest-master/src/controller/PersonalityViewController.java @@ -1,69 +1,76 @@ -package controller; - -import java.io.IOException; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - - -// Do not edit or modify this class unless required. -// This file acts as a controller class -// Instructions would be given at specific places to create or modify the existing code - -@WebServlet(urlPatterns= {"/personality"}) -public class PersonalityViewController extends HttpServlet { - private static final long serialVersionUID = 1L; - - - public PersonalityViewController() { - super(); - - } - - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - System.out.println("Entering do get"); - RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/personalityView.jsp"); - rd.forward(request, response); - } - - - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - - String options=request.getParameter("selectedOptions"); - - System.out.println(options); - - // create an object for the PersonalityCalculator - // call the findYourBrainType method using the object created above and pass options as argument. - // The value returned from the method is of type string. - // Store the String returned in a string literal called as message - - - - request.setAttribute("message", message); - - if(message!=null) - { - if(message.equals("rightbrained")) { - RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/rightBrainView.jsp"); - rd.forward(request, response); - } - else if(message.equals("leftbrained")) { - RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/leftBrainView.jsp"); - rd.forward(request, response); - } - else { - RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/neutralView.jsp"); - rd.forward(request, response); - } - - }*/ - } - } - - +package controller; + +import java.io.IOException; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import service.PersonalityCalculator; + + + +// Do not edit or modify this class unless required. +// This file acts as a controller class +// Instructions would be given at specific places to create or modify the existing code + +@WebServlet(urlPatterns= {"/personality"}) +public class PersonalityViewController extends HttpServlet { + private static final long serialVersionUID = 1L; + + + public PersonalityViewController() { + super(); + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + System.out.println("Entering do get"); + RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/personalityView.jsp"); + rd.forward(request, response); + } + + + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + + String options=request.getParameter("selectedOptions"); + + System.out.println(options); + PersonalityCalculator obj= new PersonalityCalculator(); + String message= obj.findYourBrainType(options); + + + // create an object for the PersonalityCalculator + // call the findYourBrainType method using the object created above and pass options as argument. + // The value returned from the method is of type string. + // Store the String returned in a string literal called as message + + + /*un the below lines to test your code l*/ + + + + + request.setAttribute("message", message); + + if(message!=null) + { + if(message.equals("rightbrained")) { + RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/rightBrainView.jsp"); + rd.forward(request, response); + } + else if(message.equals("leftbrained")) { + RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/leftBrainView.jsp"); + rd.forward(request, response); + } + else { + RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/neutralView.jsp"); + rd.forward(request, response); + } + + } + } + } + diff --git a/lab-braintest-master/src/service/PersonalityCalculator.java b/lab-braintest-master/src/service/PersonalityCalculator.java new file mode 100644 index 0000000..692abd1 --- /dev/null +++ b/lab-braintest-master/src/service/PersonalityCalculator.java @@ -0,0 +1,49 @@ +package service; + +// Create a class called PersonalityCalculator +// PersonalityCalculator has two methods findAnswers and findYourBrainType +// int[] findAnswers(String options) and String findYourBrainType(String options) is the method prototype +// findAnswer() accepts String as an argument and returns integer array as an output +// findYourBrainType accepts String as an argument and returns String as an output +// option is a string which contains all the options selected as a string +// Use the split method to segregate the options and store it in a string array. +// Convert the string array into an integer array. +// return the entire integer array to findyourBrainType +public class PersonalityCalculator +{ + public int[] findAnswers(String options) + { + String c[]=options.split(","); + int n=c.length; + int a[]=new int[n]; + int i=0; + for(String s:c) + { + a[i]=Integer.parseInt(s); + i++; + + } + + + return a; + + } + public String findYourBrainType(String options) + { + int a[]=findAnswers(options); + int x=a[0]+a[1]+a[2]+a[4]+a[7]+a[9]+a[10]+a[11]+a[13]+a[17]+a[19]; + int y=a[3]+a[5]+a[6]+a[12]+a[14]+a[15]+a[16]+a[18]; + int z=66-x+y; + System.out.println("Yor total score "+z); + if((z>=22)&&(z<=55)) + return "Left-brained "; + if((z>=56)&&(z<=64)) + return "No clear preference "; + if((z>=65)&&(z<=100)) + return "Right-brained"; + return "false"; + + + } + +} \ No newline at end of file diff --git a/src/testing/TestPersonalityCalculator.java b/lab-braintest-master/src/testing/TestPersonalityCalculator.java similarity index 90% rename from src/testing/TestPersonalityCalculator.java rename to lab-braintest-master/src/testing/TestPersonalityCalculator.java index fa81111..c7675d5 100644 --- a/src/testing/TestPersonalityCalculator.java +++ b/lab-braintest-master/src/testing/TestPersonalityCalculator.java @@ -1,31 +1,32 @@ -package testing; -Uncomment the below code to test your application - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -import service.PersonalityCalculator; - -public class TestPersonalityCalculator { - PersonalityCalculator pc = new PersonalityCalculator(); - - @Test - public void testFindYourBrainTypeMethod() { - String options = "1,2,3,2,1,4,5,2,3,4,5,4,3,2,3,4,5,3,2,4"; - assertEquals("rightbrained",pc.findYourBrainType(options)); - options = "4,5,4,2,5,3,2,4,3,5,4,5,2,4,3,2,3,5,2,4"; - assertEquals("leftbrained",pc.findYourBrainType(options)); - options = "1,2,3,2,1,4,2,2,2,2,2,4,3,2,3,4,2,3,2,4"; - assertEquals("noclearpreference",pc.findYourBrainType(options)); - try { - if(options.contains("0")) - pc.findYourBrainType(options); - if(options.contains(null)) - pc.findYourBrainType(options); - } - catch(Exception e) { - e.printStackTrace(); - } - } -}*/ \ No newline at end of file +package testing; + +//Uncomment the below code to test your application + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +import service.PersonalityCalculator; + +public class TestPersonalityCalculator { + PersonalityCalculator pc = new PersonalityCalculator(); + + @Test + public void testFindYourBrainTypeMethod() { + String options = "1,2,3,2,1,4,5,2,3,4,5,4,3,2,3,4,5,3,2,4"; + assertEquals("rightbrained",pc.findYourBrainType(options)); + options = "4,5,4,2,5,3,2,4,3,5,4,5,2,4,3,2,3,5,2,4"; + assertEquals("leftbrained",pc.findYourBrainType(options)); + options = "1,2,3,2,1,4,2,2,2,2,2,4,3,2,3,4,2,3,2,4"; + assertEquals("noclearpreference",pc.findYourBrainType(options)); + try { + if(options.contains("0")) + pc.findYourBrainType(options); + if(options.contains(null)) + pc.findYourBrainType(options); + } + catch(Exception e) { + e.printStackTrace(); + } + } +} \ No newline at end of file diff --git a/src/service/PersonalityCalculator.java b/src/service/PersonalityCalculator.java deleted file mode 100644 index 7394491..0000000 --- a/src/service/PersonalityCalculator.java +++ /dev/null @@ -1,29 +0,0 @@ -package service; -import java.util.Scanner; - -// Create a class called PersonalityCalculator -// PersonalityCalculator has two methods findAnswers and findYourBrainType -// int[] findAnswers(String options) and String findYourBrainType(String options) is the method prototype -// findAnswer() accepts String as an argument and returns integer array as an output -// findYourBrainType accepts String as an argument and returns String as an output -// option is a string which contains all the options selected as a string -// Use the split method to segregate the options and store it in a string array. -// Convert the string array into an integer array. -// return the entire integer array to findyourBrainType -class PersonalityCalculator{ - findAnswers(){ - String[] array = new String[6]; - Scanner sc = new Scanner(System.in); - for(int i=0;i<=6;i++) - { - array[i]=sc.nextLine(); - } - findYourBrainType(){ - String[] array = new String[6]; - Scanner sc = new Scanner(System.in); - for(int i=0;i<=6;i++) - { - array[i]=sc.nextLine(); - } -} -} \ No newline at end of file