From 0d2af4854e0dc6bb7555e2392906fa5dbd3402d9 Mon Sep 17 00:00:00 2001
From: Axel <wiepke@uni-potsdam.de>
Date: Tue, 19 Jun 2018 16:20:29 +0200
Subject: [PATCH] feat: first views for quizzes and rating of peer workethics.
html mutates to jsp step by step. first step
---
.gitignore | 1 +
.idea/workspace.xml | 114 +++---
.../gf/core/management/user/Menu.java | 26 ++
.../gf/interfaces/IPeerAssessment.java | 17 +
.../controller/model/PeerRating.java | 51 +++
.../controller/service/FBAssessement.java | 10 +
.../controller/service/PeerAssessment.java | 10 +
.../service/PeerAssessmentDummy.java | 71 ++--
.../assessment/controller/view/QuizView.java | 18 +-
.../src/main/webapp/assets/css/styles.css | 11 +
.../webapp/assets/js/assessmentCalculator.js | 1 -
.../main/webapp/assets/js/finalAssessment.js | 37 ++
.../src/main/webapp/assets/js/takeQuiz.js | 42 ++
...denUserField.tld => gemeinsamForschen.tld} | 7 +
...lculator.html => assessmentCalculator.jsp} | 4 +-
.../main/webapp/pages/finalAssessments.jsp | 365 ++++++++++++++++++
...oject-student.html => project-student.jsp} | 16 +-
.../src/main/webapp/pages/takeQuiz.jsp | 119 ++++++
18 files changed, 816 insertions(+), 104 deletions(-)
create mode 100644 gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
create mode 100644 gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/PeerRating.java
create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js
create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js
rename gemeinsamforschen/src/main/webapp/core/pages/{hiddenUserField.tld => gemeinsamForschen.tld} (65%)
rename gemeinsamforschen/src/main/webapp/pages/{assessmentCalculator.html => assessmentCalculator.jsp} (81%)
create mode 100644 gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp
rename gemeinsamforschen/src/main/webapp/pages/{project-student.html => project-student.jsp} (94%)
create mode 100644 gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
diff --git a/.gitignore b/.gitignore
index 21782104..65df02ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
**/.classpath
/.idea/vcs.xml
/.idea/workspace.xml
+/.idea/workspace.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9e9b2a43..05d70227 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="b207c042-3fc9-4102-bf50-ee6c9b45c20d" name="Default" comment="" />
+ <list default="true" id="b207c042-3fc9-4102-bf50-ee6c9b45c20d" name="Default" comment="">
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java" afterPath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java" afterPath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java" afterPath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java" afterPath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java" afterPath="$PROJECT_DIR$/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gemeinsamforschen/src/main/webapp/assets/css/styles.css" afterPath="$PROJECT_DIR$/gemeinsamforschen/src/main/webapp/assets/css/styles.css" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gemeinsamforschen/src/main/webapp/pages/project-student.html" afterPath="$PROJECT_DIR$/gemeinsamforschen/src/main/webapp/pages/project-student.html" />
+ </list>
<ignored path="fltrail.iws" />
<ignored path=".idea/workspace.xml" />
<ignored path="$PROJECT_DIR$/out/" />
@@ -44,25 +53,19 @@
<file leaf-file-name="projects.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/studentview/pages/projects.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="21">
+ <state relative-caret-position="2331">
<caret line="111" column="34" lean-forward="false" selection-start-line="111" selection-start-column="34" selection-end-line="111" selection-end-column="34" />
<folding>
<marker date="1528377403200" expanded="true" signature="10969:10996" ph="..." />
- <marker date="1528377403200" expanded="true" signature="10969:11019" ph="..." />
- <marker date="1528377403200" expanded="true" signature="10969:11038" ph="..." />
- <marker date="1528377403200" expanded="true" signature="10969:11053" ph="..." />
- <marker date="1528377403200" expanded="true" signature="10969:11064" ph="..." />
- <marker date="1528377403200" expanded="true" signature="10969:11071" ph="..." />
- <marker date="1528377403200" expanded="true" signature="10969:11079" ph="..." />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="newProject.js" pinned="false" current-in-tab="true">
+ <file leaf-file-name="newProject.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/studentview/assets/js/newProject.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-651">
+ <state relative-caret-position="21">
<caret line="20" column="7" lean-forward="false" selection-start-line="20" selection-start-column="7" selection-end-line="20" selection-end-column="7" />
<folding />
</state>
@@ -79,22 +82,12 @@
</provider>
</entry>
</file>
- <file leaf-file-name="overview.js" pinned="false" current-in-tab="false">
+ <file leaf-file-name="overview.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/studentview/assets/js/overview.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1827">
- <caret line="87" column="0" lean-forward="false" selection-start-line="87" selection-start-column="0" selection-end-line="87" selection-end-column="0" />
- <folding>
- <marker date="1528377403191" expanded="true" signature="2039:2586" ph="{...}" />
- <marker date="1528377403191" expanded="true" signature="2116:2586" ph="{"url": url...}" />
- <marker date="1528377403191" expanded="true" signature="2253:2586" ph="{...}" />
- <marker date="1528377403191" expanded="true" signature="2478:2586" ph="{...}" />
- <marker date="1528377403191" expanded="true" signature="5783:6754" ph="{"url": innerurl...}" />
- <marker date="1528377403191" expanded="true" signature="5783:6758" ph="{...}" />
- <marker date="1528377403191" expanded="true" signature="5932:6673" ph="{...}" />
- <marker date="1528377403191" expanded="true" signature="6102:6663" ph="{...}" />
- <marker date="1528377403191" expanded="true" signature="6709:6748" ph="{...}" />
- </folding>
+ <state relative-caret-position="357">
+ <caret line="103" column="33" lean-forward="true" selection-start-line="103" selection-start-column="33" selection-end-line="103" selection-end-column="33" />
+ <folding />
</state>
</provider>
</entry>
@@ -184,10 +177,10 @@
<component name="PhpWebServerValidation" path_to_validation_script="C:\dev\amp\htdocs\" selected_validation_type="LOCAL" web_path_to_validation_script="http://127.0.0.1/" />
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" interpreter_name="PHP" />
<component name="ProjectFrameBounds">
- <option name="x" value="-9" />
- <option name="y" value="-9" />
- <option name="width" value="1938" />
- <option name="height" value="1050" />
+ <option name="x" value="1" />
+ <option name="y" value="1" />
+ <option name="width" value="1918" />
+ <option name="height" value="1030" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
@@ -205,6 +198,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
+ <pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -292,7 +286,6 @@
</subPane>
</pane>
<pane id="Scope" />
- <pane id="Scratches" />
<pane id="PackagesPane" />
<pane id="AndroidView" />
</panes>
@@ -391,26 +384,27 @@
<workItem from="1528200793936" duration="888000" />
<workItem from="1528354427057" duration="403000" />
<workItem from="1528809757337" duration="698000" />
+ <workItem from="1529393931294" duration="714000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="76003000" />
+ <option name="totallyTimeSpent" value="76717000" />
</component>
<component name="ToolWindowManager">
- <frame x="-9" y="-9" width="1938" height="1050" extended-state="6" />
+ <frame x="1" y="1" width="1918" height="1030" extended-state="6" />
<layout>
<window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2125" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" x="9" y="79" width="408" height="943" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21473685" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" x="9" y="79" width="408" height="943" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23455825" sideWeight="0.47734374" order="8" side_tool="true" content_ui="tabs" />
- <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15729167" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.35496482" sideWeight="0.71510416" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15894736" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.35496482" sideWeight="0.71510416" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.331509" sideWeight="0.52265626" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.331509" sideWeight="0.52265626" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -720,52 +714,36 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/showProjects.js">
+ <entry file="file://$PROJECT_DIR$/studentview/pages/projects.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="651">
- <caret line="31" column="38" lean-forward="false" selection-start-line="31" selection-start-column="38" selection-end-line="31" selection-end-column="38" />
- <folding />
+ <state relative-caret-position="2331">
+ <caret line="111" column="34" lean-forward="false" selection-start-line="111" selection-start-column="34" selection-end-line="111" selection-end-column="34" />
+ <folding>
+ <marker date="1528377403200" expanded="true" signature="10969:10996" ph="..." />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/overview.js">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/newProject.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1827">
- <caret line="87" column="0" lean-forward="false" selection-start-line="87" selection-start-column="0" selection-end-line="87" selection-end-column="0" />
- <folding>
- <marker date="1528377403191" expanded="true" signature="2039:2586" ph="{...}" />
- <marker date="1528377403191" expanded="true" signature="2116:2586" ph="{"url": url...}" />
- <marker date="1528377403191" expanded="true" signature="2253:2586" ph="{...}" />
- <marker date="1528377403191" expanded="true" signature="2478:2586" ph="{...}" />
- <marker date="1528377403191" expanded="true" signature="5783:6754" ph="{"url": innerurl...}" />
- <marker date="1528377403191" expanded="true" signature="5783:6758" ph="{...}" />
- <marker date="1528377403191" expanded="true" signature="5932:6673" ph="{...}" />
- <marker date="1528377403191" expanded="true" signature="6102:6663" ph="{...}" />
- <marker date="1528377403191" expanded="true" signature="6709:6748" ph="{...}" />
- </folding>
+ <state relative-caret-position="21">
+ <caret line="20" column="7" lean-forward="false" selection-start-line="20" selection-start-column="7" selection-end-line="20" selection-end-column="7" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/pages/projects.php">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/showProjects.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="21">
- <caret line="111" column="34" lean-forward="false" selection-start-line="111" selection-start-column="34" selection-end-line="111" selection-end-column="34" />
- <folding>
- <marker date="1528377403200" expanded="true" signature="10969:10996" ph="..." />
- <marker date="1528377403200" expanded="true" signature="10969:11019" ph="..." />
- <marker date="1528377403200" expanded="true" signature="10969:11038" ph="..." />
- <marker date="1528377403200" expanded="true" signature="10969:11053" ph="..." />
- <marker date="1528377403200" expanded="true" signature="10969:11064" ph="..." />
- <marker date="1528377403200" expanded="true" signature="10969:11071" ph="..." />
- <marker date="1528377403200" expanded="true" signature="10969:11079" ph="..." />
- </folding>
+ <state relative-caret-position="651">
+ <caret line="31" column="38" lean-forward="false" selection-start-line="31" selection-start-column="38" selection-end-line="31" selection-end-column="38" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/newProject.js">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/overview.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-651">
- <caret line="20" column="7" lean-forward="false" selection-start-line="20" selection-start-column="7" selection-end-line="20" selection-end-column="7" />
+ <state relative-caret-position="357">
+ <caret line="103" column="33" lean-forward="true" selection-start-line="103" selection-start-column="33" selection-end-line="103" selection-end-column="33" />
<folding />
</state>
</provider>
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
new file mode 100644
index 00000000..1ded7610
--- /dev/null
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
@@ -0,0 +1,26 @@
+package unipotsdam.gf.core.management.user;
+
+import unipotsdam.gf.core.management.ManagementImpl;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+import java.io.IOException;
+
+public class Menu extends SimpleTagSupport {
+ public void doTag() throws JspException, IOException {
+ JspWriter out = getJspContext().getOut();
+ out.println("<div id=\"sidebar-wrapper\">\n" +
+ " <ul class=\"sidebar-nav\">\n" +
+ " <li class=\"sidebar-brand\"><a href=\"project-student.jspjsp\">overview</a></li>\n" +
+ " <li><a href=\"takeQuiz.jsp\">Quizfrage</a></li>\n" +
+ " <li><a href=\"#\">ePortfolio</a></li>\n" +
+ " <li><a href=\"#\">Beitrag</a></li>\n" +
+ " <li><a href=\"finalAssessments.jsp\">Bewertung</a></li>\n" +
+ " <li><a href=\"../index.jsp\">Logout</a></li>\n" +
+ " </ul>\n" +
+ " </div>");
+ }
+}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
index 32d91b2e..9a23d8f4 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
@@ -57,4 +57,21 @@ public interface IPeerAssessment {
* @return
*/
int meanOfAssessement(String ProjectId);
+
+ /**
+ * returns all quizzes in a project
+ *
+ * @param projectId
+ * @return all quizzes in projectId
+ */
+ ArrayList<Quiz> getQuiz(String projectId);
+
+ /**
+ * writes the peerRatings into db
+ *
+ * @param projectId
+ * @param groupId
+ * @param peerRatings
+ */
+ void postPeerRating(String projectId, String groupId, ArrayList<PeerRating> peerRatings);
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/PeerRating.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/PeerRating.java
new file mode 100644
index 00000000..80d35be3
--- /dev/null
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/PeerRating.java
@@ -0,0 +1,51 @@
+package unipotsdam.gf.modules.assessment.controller.model;
+
+import java.util.Arrays;
+
+public class PeerRating {
+ private String fromPeer;
+ private String toPeer;
+ private int[] workRating;
+
+ @Override
+ public String toString() {
+ return "PeerRating{" +
+ "fromPeer='" + fromPeer + '\'' +
+ ", toPeer='" + toPeer + '\'' +
+ ", workRating=" + Arrays.toString(workRating) +
+ '}';
+ }
+
+ public String getFromPeer() {
+ return fromPeer;
+ }
+
+ public PeerRating() {
+ }
+
+ public void setFromPeer(String fromPeer) {
+ this.fromPeer = fromPeer;
+ }
+
+ public String getToPeer() {
+ return toPeer;
+ }
+
+ public void setToPeer(String toPeer) {
+ this.toPeer = toPeer;
+ }
+
+ public int[] getWorkRating() {
+ return workRating;
+ }
+
+ public void setWorkRating(int[] workRating) {
+ this.workRating = workRating;
+ }
+
+ public PeerRating(String fromPeer, String toPeer, int[] workRating) {
+ this.fromPeer = fromPeer;
+ this.toPeer = toPeer;
+ this.workRating = workRating;
+ }
+}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java
index a8a5ef59..3368ce83 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java
@@ -47,4 +47,14 @@ public class FBAssessement extends AssessmentDAO {
public int meanOfAssessement(String projectId) {
return 0;
}
+
+ @Override
+ public ArrayList<Quiz> getQuiz(String projectId) {
+ return null;
+ }
+
+ @Override
+ public void postPeerRating(String projectId, String groupId, ArrayList<PeerRating> peerRatings) {
+
+ }
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java
index 71e4f14e..418f4fed 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java
@@ -41,4 +41,14 @@ public class PeerAssessment implements IPeerAssessment {
public int meanOfAssessement(String ProjectId) {
return 0;
}
+
+ @Override
+ public ArrayList<Quiz> getQuiz(String projectId) {
+ return null;
+ }
+
+ @Override
+ public void postPeerRating(String projectId, String groupId, ArrayList<PeerRating> peerRatings) {
+
+ }
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java
index e94c04ec..49d7a38e 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java
@@ -13,22 +13,49 @@ public class PeerAssessmentDummy implements IPeerAssessment {
}
@Override
- public Quiz getQuiz(String projectId, String groupId) {
+ public Quiz getQuiz(String projectId, String quizId) {
String[] correctAnswers = new String[2];
+ Quiz sampleQuiz;
+ if (quizId.equals("2")) {
+ correctAnswers[0] = "42";
+ correctAnswers[1] = "" + projectId + " " + quizId;
+ String[] wrongAnswers = {"a god created creature", "a sum of my mistakes"};
+ sampleQuiz = new Quiz("multiple", "Who am I and if so, how many?", correctAnswers, wrongAnswers);
+ } else {
+ correctAnswers[0] = "ja, nicht?!";
+ correctAnswers[1] = "nee, oder doch?!";
+ String[] wrongAnswers = {"Mephistopheles", "Der alte Hexenmeister!?", "Der Schimmelreiter", "alle beide"};
+ sampleQuiz = new Quiz("multiple", "Ist das nun des Pudels wahrer Kern?", correctAnswers, wrongAnswers);
+ }
+
+ return sampleQuiz;
+ }
+
+ public ArrayList<Quiz> getQuiz(String projectId) {
+ String[] correctAnswers = new String[2];
+ ArrayList<Quiz> sampleQuiz = new ArrayList<Quiz>();
correctAnswers[0] = "42";
- correctAnswers[1] = ""+projectId+" " + groupId;
+ correctAnswers[1] = "" + projectId + " 24";
String[] wrongAnswers = {"a god created creature", "a sum of my mistakes"};
- if (false){ //projectId with groupId does not exist
- return null;
- }
- Quiz sampleQuiz = new Quiz("multiple","Who am I and if so, how many?", correctAnswers,wrongAnswers);
+ sampleQuiz.add(new Quiz("multiple", "Who am I and if so, how many?", correctAnswers, wrongAnswers));
+
+ correctAnswers[0] = "ja, nicht?!";
+ correctAnswers[1] = "nee, oder doch?!";
+ wrongAnswers = new String[]{"Mephistopheles", "Der alte Hexenmeister!?", "Der Schimmelreiter", "alle beide"};
+ sampleQuiz.add(new Quiz("multiple", "Ist das nun des Pudels wahrer Kern?", correctAnswers, wrongAnswers));
+
return sampleQuiz;
+}
+
+ @Override
+ public void postPeerRating(String projectId, String groupId, ArrayList<PeerRating> peerRatings) {
+ int breakpoint = 0;
}
@Override
public Assessment getAssessmentDataFromDB(StudentIdentifier student) {
- int[] quizAnswer = {1,1,1,0,0,0,1,0,0,1,1};
- int[] workRating = {1,5,3,4,1,5,5};
+ int[] quizAnswer = {1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1};
+ int[] workRating = {1, 5, 3, 4, 1, 5, 5};
Performance performance = new Performance(student, quizAnswer, "what a nice guy", workRating);
Assessment assessment = new Assessment(student, performance);
return assessment;
@@ -40,18 +67,18 @@ public class PeerAssessmentDummy implements IPeerAssessment {
@Override
public List<Grading> calculateAssessment(ArrayList<Performance> totalPerformance) {
- double[] allAssessements = new double[totalPerformance.size()] ;
+ double[] allAssessements = new double[totalPerformance.size()];
Grading[] grading = new Grading[totalPerformance.size()];
- for (int i=0; i< totalPerformance.size();i++) {
- for (int j=0; j< totalPerformance.get(i).getQuizAnswer().length;j++) {
+ for (int i = 0; i < totalPerformance.size(); i++) {
+ for (int j = 0; j < totalPerformance.get(i).getQuizAnswer().length; j++) {
allAssessements[i] += totalPerformance.get(i).getQuizAnswer()[j];
}
- allAssessements[i] = allAssessements[i]/totalPerformance.get(i).getQuizAnswer().length;
+ allAssessements[i] = allAssessements[i] / totalPerformance.get(i).getQuizAnswer().length;
}
- for (int i=0; i<totalPerformance.size(); i++){
+ for (int i = 0; i < totalPerformance.size(); i++) {
Grading shuttle = new Grading(totalPerformance.get(i).getStudentIdentifier(), allAssessements[i]);
- grading[i]= shuttle;
+ grading[i] = shuttle;
}
return Arrays.asList(grading);
}
@@ -59,16 +86,16 @@ public class PeerAssessmentDummy implements IPeerAssessment {
@Override
public ArrayList<Performance> getTotalAssessment(StudentIdentifier studentIdentifier) {
StudentIdentifier[] students = new StudentIdentifier[2];
- StudentIdentifier student1 = new StudentIdentifier("gemeinsamForschen","Haralf");
- StudentIdentifier student2 = new StudentIdentifier("gemeinsamForschen","Regine");
+ StudentIdentifier student1 = new StudentIdentifier("gemeinsamForschen", "Haralf");
+ StudentIdentifier student2 = new StudentIdentifier("gemeinsamForschen", "Regine");
ArrayList<Performance> performances = new ArrayList<Performance>();
- int[] quiz = {1,0,1,0,0,0,1};
- int[] quiz2 = {0,1,0,1,1,1,0};
- int[] work = {5,4,3,2,1};
- int[] work2 = {1,2,3,4,5};
- Performance performance = new Performance(student1, quiz, "toller dude",work);
+ int[] quiz = {1, 0, 1, 0, 0, 0, 1};
+ int[] quiz2 = {0, 1, 0, 1, 1, 1, 0};
+ int[] work = {5, 4, 3, 2, 1};
+ int[] work2 = {1, 2, 3, 4, 5};
+ Performance performance = new Performance(student1, quiz, "toller dude", work);
performances.add(performance);
- performance = new Performance(student2, quiz2, "tolle dudine",work2);
+ performance = new Performance(student2, quiz2, "tolle dudine", work2);
performances.add(performance);
return performances;
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java
index 0c1c5c5d..077ebb23 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java
@@ -20,6 +20,22 @@ public class QuizView implements IPeerAssessment {
return peer.getQuiz(projectId, quizId);
} ///////////////////////////////funktioniert wie geplant//////////////////////////////////
+ @GET
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("/project/{projectId}/quiz")
+ @Override
+ public ArrayList<Quiz> getQuiz(@PathParam("projectId") String projectId) {
+ return peer.getQuiz(projectId);
+ }
+
+ @POST
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Path("/peer/project/{projectId}/group/{groupId}")
+ @Override
+ public void postPeerRating(@PathParam("projectId") String projectId, @PathParam("groupId") String groupId, ArrayList<PeerRating> peerRatings){
+ peer.postPeerRating(projectId,groupId,peerRatings);
+ }
+
@POST
@Produces(MediaType.TEXT_PLAIN)
@Consumes(MediaType.APPLICATION_JSON)
@@ -77,7 +93,7 @@ public class QuizView implements IPeerAssessment {
public ArrayList<Performance> getTotalAssessment(@PathParam("projectId") String ProjectId,@PathParam("student") String student){
StudentIdentifier studentIdentifier = new StudentIdentifier(ProjectId, student);
return getTotalAssessment(studentIdentifier);
- }; ///////////////////////////////funktioniert wie geplant//////////////////////////////////
+ } ///////////////////////////////funktioniert wie geplant//////////////////////////////////
@Override
public ArrayList<Performance> getTotalAssessment(StudentIdentifier studentIdentifier) {
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/styles.css b/gemeinsamforschen/src/main/webapp/assets/css/styles.css
index 8c1162d3..6ec6901b 100644
--- a/gemeinsamforschen/src/main/webapp/assets/css/styles.css
+++ b/gemeinsamforschen/src/main/webapp/assets/css/styles.css
@@ -100,6 +100,17 @@
margin-right: 20px;
}
+table .tableTd{
+ font-size: 27px;
+}
+
+table .table-striped{
+ margin-left:2%;
+ font-size:24px;
+ align-content: center;
+ width: 96%;
+}
+
table ul{
justify-items: center;
}
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/assessmentCalculator.js b/gemeinsamforschen/src/main/webapp/assets/js/assessmentCalculator.js
index d6ff5640..0cc6abce 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/assessmentCalculator.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/assessmentCalculator.js
@@ -65,7 +65,6 @@ $(document).ready(function () {
url: "http://localhost:8080/gemeinsamforschen/rest/assessments/calculate",
type: 'POST',
headers: {
- "Authorization": "Basic YeahSomethingInAWrap",
"Content-Type": "application/json",
"Cache-Control": "no-cache"
},
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js b/gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js
new file mode 100644
index 00000000..6a201dfc
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js
@@ -0,0 +1,37 @@
+$(document).ready(function() {
+ $(".carousel").carousel({
+ interval: false
+ });
+ $('#assessThePeer').on("click", function () {
+ assessPeer();
+ });
+});
+function assessPeer(){
+ var peerRating = {
+ "fromPeer": getUser(),
+ "toPeer": "",
+ "workRating": []
+ };
+ var dataP = [];
+ var peerStudents =$('.peerStudent');
+ for (var i=0; i< peerStudents.length; i++){
+ peerRating.toPeer = peerStudents[i].id;
+ peerRating.workRating = [5,4,3,2]
+ }
+ dataP.push(peerRating);
+ $.ajax({
+ url:'http://localhost:8080/gemeinsamforschen/rest/assessments/peer/project/1/group/1',
+ type: 'POST',
+ headers: {
+ "Content-Type": "application/json",
+ "Cache-Control": "no-cache"
+ },
+ data: JSON.stringify(dataP),
+ success: function(){
+
+ },
+ error: function(a,b,c){
+
+ }
+ });
+}
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js b/gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js
new file mode 100644
index 00000000..eda93884
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js
@@ -0,0 +1,42 @@
+$(document).ready(function () {
+ $.ajax({
+ url: 'http://localhost:8080/gemeinsamforschen/rest/assessments/project/1/quiz/',
+ type: 'GET',
+ success: function (data) {
+ var table = document.getElementById('tableQuiz');
+ for (var quiz = 0; quiz < data.length; quiz++){
+ var answers = data[quiz].correctAnswers.concat(data[quiz].incorrectAnswers);
+ var colspan = answers.length;
+ var trQuestion = document.createElement('TR');
+ var question = '<td colspan="' + colspan + '" class="questionTd">' + data[quiz].question + '</td>';
+ trQuestion.innerHTML = question;
+ var trAnswers = document.createElement('TR');
+ answers = shuffle(answers);
+ var answersTd='<td style="display: block;">';
+ for (var i = 0; i < answers.length; i++) {
+ answersTd = answersTd + '<div><label><input type="checkbox">' + answers[i] + '</label></div>';
+ }
+ trAnswers.innerHTML = answersTd+'</td>';
+ table.appendChild(trQuestion);
+ table.appendChild(trAnswers);
+ }
+ },
+ error: function (a, b, c) {
+ alert('Fehler ' + a);
+ }
+ });
+ $("#submitQuiz").on("click", function () {
+
+ });
+});
+
+function shuffle(a) {
+ var j, x, i;
+ for (i = a.length - 1; i > 0; i--) {
+ j = Math.floor(Math.random() * (i + 1));
+ x = a[i];
+ a[i] = a[j];
+ a[j] = x;
+ }
+ return a;
+}
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/core/pages/hiddenUserField.tld b/gemeinsamforschen/src/main/webapp/core/pages/gemeinsamForschen.tld
similarity index 65%
rename from gemeinsamforschen/src/main/webapp/core/pages/hiddenUserField.tld
rename to gemeinsamforschen/src/main/webapp/core/pages/gemeinsamForschen.tld
index bb1ceeb1..3704c718 100644
--- a/gemeinsamforschen/src/main/webapp/core/pages/hiddenUserField.tld
+++ b/gemeinsamforschen/src/main/webapp/core/pages/gemeinsamForschen.tld
@@ -8,4 +8,11 @@
<tag-class>unipotsdam.gf.core.management.user.HiddenUserTag</tag-class>
<body-content>empty</body-content>
</tag>
+
+ <tag>
+ <name>menu</name>
+ <tag-class>unipotsdam.gf.core.management.user.Menu</tag-class>
+ <body-content>empty</body-content>
+ </tag>
+
</taglib>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.html b/gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp
similarity index 81%
rename from gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.html
rename to gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp
index 92a5e719..5ce82ab3 100644
--- a/gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.html
+++ b/gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp
@@ -1,3 +1,5 @@
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+
<!DOCTYPE html>
<html lang="en">
<head>
@@ -9,6 +11,6 @@
<body>
<button id="calculateNow">Post Performance</button>
<button id="giveItBack">Get TotalPerformance</button>
-
+<menu:menu></menu:menu>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp b/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp
new file mode 100644
index 00000000..52b127d1
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp
@@ -0,0 +1,365 @@
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>muster-gemeinsam-forschen</title>
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <script src="../assets/js/finalAssessment.js"></script>
+ <link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
+ <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+</head>
+
+<body>
+<div id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <div class="container-fluid">
+ <h1 id="projectId">project1
+ <a href="#">
+ <span class="glyphicon glyphicon-envelope"
+ style="font-size:27px;margin-top:-17px;margin-left:600px;"></span>
+ </a>
+ <a href="#">
+ <span class="glyphicon glyphicon-cog"
+ style="font-size:29px;margin-left:5px;margin-top:-25px;"></span>
+ </a></h1>
+ </div>
+ <div>
+ <table>
+ <tr>
+ <td id="yourContent">
+ <h1>Assessment for project1 </h1>
+ <!-- here will be all the content -->
+ <div class="container">
+ <h2>Carousel Example</h2>
+ <div id="myCarousel" class="carousel slide" data-ride="carousel">
+ <!-- Indicators -->
+ <ol class="carousel-indicators">
+ <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+ <li data-target="#myCarousel" data-slide-to="1"></li>
+ <li data-target="#myCarousel" data-slide-to="2"></li>
+ </ol>
+
+ <!-- Wrapper for slides -->
+ <div class="carousel-inner">
+ <div class="item active">
+ <table class="table-striped peerStudent"
+ style="width:70%;border:1px solid; margin:auto;" id="student1">
+ <tr>
+ <td align="center">
+ <img src="../assets/img/1.jpg" alt="student1"
+ style="width:20%;">
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <h3>Führungsqualität</h3>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <label>gut<input type="radio" value="5"
+ name="leadership1"></label>
+ <input type="radio" value="4" name="leadership1">
+ <input type="radio" value="3" name="leadership1">
+ <input type="radio" value="2" name="leadership1">
+ <label><input type="radio" value="1" name="leadership1">
+ ungenügend</label>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <h3>Kooperationsbereitschaft</h3>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <label><input type="radio" value="5" name="cooparation1">
+ gut</label>
+ <input type="radio" value="4" name="cooparation1">
+ <input type="radio" value="3" name="cooparation1">
+ <input type="radio" value="2" name="cooparation1">
+ <label><input type="radio" value="1" name="cooparation1">
+ ungenügend</label>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <h3>Pünktlichkeit</h3>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <label><input type="radio" value="5" name="punctual1">
+ gut</label>
+ <input type="radio" value="4" name="punctual1">
+ <input type="radio" value="3" name="punctual1">
+ <input type="radio" value="2" name="punctual1">
+ <label><input type="radio" value="1" name="punctual1">
+ ungenügend</label>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <h3>Selbstständigkeit</h3>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <label><input type="radio" value="5" name="autonomous1">
+ gut</label>
+ <input type="radio" value="4" name="autonomous1">
+ <input type="radio" value="3" name="autonomous1">
+ <input type="radio" value="2" name="autonomous1">
+ <label><input type="radio" value="1" name="autonomous1">
+ ungenügend</label>
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ <div class="item">
+ <table class="table-striped peerStudent"
+ style="width:70%;border:1px solid; margin:auto;" id="student2">
+ <tr>
+ <td align="center">
+ <img src="../assets/img/2.jpg" alt="student2"
+ style="width:20%;">
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <h3>Führungsqualität</h3>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <label>gut<input type="radio" value="5"
+ name="leadership2"></label>
+ <input type="radio" value="4" name="leadership2">
+ <input type="radio" value="3" name="leadership2">
+ <input type="radio" value="2" name="leadership2">
+ <label><input type="radio" value="1" name="leadership2">
+ ungenügend</label>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <h3>Kooperationsbereitschaft</h3>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <label><input type="radio" value="5" name="cooparation2">
+ gut</label>
+ <input type="radio" value="4" name="cooparation2">
+ <input type="radio" value="3" name="cooparation2">
+ <input type="radio" value="2" name="cooparation2">
+ <label><input type="radio" value="1" name="cooparation2">
+ ungenügend</label>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <h3>Pünktlichkeit</h3>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <label><input type="radio" value="5" name="punctual2">
+ gut</label>
+ <input type="radio" value="4" name="punctual2">
+ <input type="radio" value="3" name="punctual2">
+ <input type="radio" value="2" name="punctual2">
+ <label><input type="radio" value="1" name="punctual2">
+ ungenügend</label>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <h3>Selbstständigkeit</h3>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <label><input type="radio" value="5" name="autonomous2">
+ gut</label>
+ <input type="radio" value="4" name="autonomous2">
+ <input type="radio" value="3" name="autonomous2">
+ <input type="radio" value="2" name="autonomous2">
+ <label><input type="radio" value="1" name="autonomous2">
+ ungenügend</label>
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ <div class="item">
+ <table class="table-striped peerStudent"
+ style="width:70%;border:1px solid; margin:auto;" id="student3">
+ <tr>
+ <td align="center">
+ <img src="../assets/img/3.jpg" alt="student3"
+ style="width:20%;">
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <h3>Führungsqualität</h3>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <label>gut<input type="radio" value="5"
+ name="leadership3"></label>
+ <input type="radio" value="4" name="leadership3">
+ <input type="radio" value="3" name="leadership3">
+ <input type="radio" value="2" name="leadership3">
+ <label><input type="radio" value="1" name="leadership3">
+ ungenügend</label>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <h3>Kooperationsbereitschaft</h3>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <label><input type="radio" value="5" name="cooparation3">
+ gut</label>
+ <input type="radio" value="4" name="cooparation3">
+ <input type="radio" value="3" name="cooparation3">
+ <input type="radio" value="2" name="cooparation3">
+ <label><input type="radio" value="1" name="cooparation3">
+ ungenügend</label>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <h3>Pünktlichkeit</h3>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <label><input type="radio" value="5" name="punctual3">
+ gut</label>
+ <input type="radio" value="4" name="punctual3">
+ <input type="radio" value="3" name="punctual3">
+ <input type="radio" value="2" name="punctual3">
+ <label><input type="radio" value="1" name="punctual3">
+ ungenügend</label>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <h3>Selbstständigkeit</h3>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <label><input type="radio" value="5" name="autonomous3">
+ gut</label>
+ <input type="radio" value="4" name="autonomous3">
+ <input type="radio" value="3" name="autonomous3">
+ <input type="radio" value="2" name="autonomous3">
+ <label><input type="radio" value="1" name="autonomous3">
+ ungenügend</label>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+
+ <!-- Left and right controls -->
+ <a class="left carousel-control" href="#myCarousel" data-slide="prev">
+ <span class="glyphicon glyphicon-chevron-left"></span>
+ <span class="sr-only">Previous</span>
+ </a>
+ <a class="right carousel-control" href="#myCarousel" data-slide="next">
+ <span class="glyphicon glyphicon-chevron-right"></span>
+ <span class="sr-only">Next</span>
+ </a>
+ </div>
+ <button class="btn btn-success" id="assessThePeer">Gruppe bewerten</button>
+ </div>
+ </td>
+ <td id="chat">
+ <div class="card">
+ <div class="card-header">
+ <h6 class="mb-0">Gruppen+Projekt Chat</h6>
+ </div>
+ <div class="card-body">
+ <ul class="list-group">
+ <li class="list-group-item">
+ <div class="media">
+ <div></div>
+ <div class="media-body">
+ <div class="media" style="overflow:visible;">
+ <div><img src="../assets/img/1.jpg" class="mr-3"
+ style="width: 25px; height:25px;"></div>
+ <div class="media-body" style="overflow:visible;">
+ <div class="row">
+ <div class="col-md-12">
+ <p><a href="#">Sara Doe:</a> This guy has been going
+ 100+ MPH on side streets. <br>
+ <small class="text-muted">August 6, 2016 @ 10:35am
+ </small>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </li>
+ <li class="list-group-item">
+ <div class="media">
+ <div></div>
+ <div class="media-body">
+ <div class="media" style="overflow:visible;">
+ <div><img src="../assets/img/2.jpg" class="mr-3"
+ style="width: 25px; height:25px;"></div>
+ <div class="media-body" style="overflow:visible;">
+ <div class="row">
+ <div class="col-md-12">
+ <p><a href="#">Brennan Prill:</a> This guy has been
+ going 100+ MPH on side streets. <br>
+ <small class="text-muted">August 6, 2016 @ 10:35am
+ </small>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </li>
+ </ul>
+ <button class="btn btn-light">
+ Add Comment
+ </button>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+</div>
+
+<script src="../assets/js/jquery.min.js"></script>
+<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
+<script src="../assets/js/Sidebar-Menu.js"></script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-student.html b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
similarity index 94%
rename from gemeinsamforschen/src/main/webapp/pages/project-student.html
rename to gemeinsamforschen/src/main/webapp/pages/project-student.jsp
index cff7c704..56d20300 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-student.html
+++ b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
@@ -1,3 +1,5 @@
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+
<!DOCTYPE html>
<html>
@@ -17,19 +19,11 @@
<body>
<div id="wrapper">
- <div id="sidebar-wrapper">
- <ul class="sidebar-nav">
- <li class="sidebar-brand"><a href="#">overview</a></li>
- <li><a href="#">Quizfrage</a></li>
- <li><a href="#">ePortfolio</a></li>
- <li><a href="#">Beitrag</a></li>
- <li><a href="#">Bewertung</a></li>
- <li><a href="#">Logout</a></li>
- </ul>
- </div>
+ <menu:menu></menu:menu>
+
<div class="page-content-wrapper">
<div class="container-fluid">
- <h1>gemeinsam Forschen
+ <h1 id="projectId">project1
<a href="#">
<span class="glyphicon glyphicon-envelope"
style="font-size:27px;margin-top:-17px;margin-left:600px;"></span>
diff --git a/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp b/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
new file mode 100644
index 00000000..3667a862
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
@@ -0,0 +1,119 @@
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>muster-gemeinsam-forschen</title>
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <script src="../assets/js/takeQuiz.js"></script>
+ <link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
+ <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+</head>
+
+<body>
+
+
+<div id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <div class="container-fluid">
+ <h1 id="projectId">project1
+ <a href="#">
+ <span class="glyphicon glyphicon-envelope"
+ style="font-size:27px;margin-top:-17px;margin-left:600px;"></span>
+ </a>
+ <a href="#">
+ <span class="glyphicon glyphicon-cog" style="font-size:29px;margin-left:5px;margin-top:-25px;"></span>
+ </a></h1>
+ </div>
+ <div>
+ <table>
+ <tr>
+ <td id="yourContent">
+ <h1>Quiz for project1 </h1>
+ <!-- here will be all the content -->
+
+ <table class="table-striped">
+ <tbody id="tableQuiz">
+
+ </tbody>
+ </table>
+ <button id="submitQuiz" class="btn btn-success">Antwort speichern</button>
+ </td>
+ <td id="chat">
+ <div class="card">
+ <div class="card-header">
+ <h6 class="mb-0">Gruppen+Projekt Chat</h6>
+ </div>
+ <div class="card-body">
+ <ul class="list-group">
+ <li class="list-group-item">
+ <div class="media">
+ <div></div>
+ <div class="media-body">
+ <div class="media" style="overflow:visible;">
+ <div><img src="../assets/img/1.jpg" class="mr-3"
+ style="width: 25px; height:25px;"></div>
+ <div class="media-body" style="overflow:visible;">
+ <div class="row">
+ <div class="col-md-12">
+ <p><a href="#">Sara Doe:</a> This guy has been going
+ 100+ MPH on side streets. <br>
+ <small class="text-muted">August 6, 2016 @ 10:35am
+ </small>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </li>
+ <li class="list-group-item">
+ <div class="media">
+ <div></div>
+ <div class="media-body">
+ <div class="media" style="overflow:visible;">
+ <div><img src="../assets/img/2.jpg" class="mr-3"
+ style="width: 25px; height:25px;"></div>
+ <div class="media-body" style="overflow:visible;">
+ <div class="row">
+ <div class="col-md-12">
+ <p><a href="#">Brennan Prill:</a> This guy has been
+ going 100+ MPH on side streets. <br>
+ <small class="text-muted">August 6, 2016 @ 10:35am
+ </small>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </li>
+ </ul>
+ <button class="btn btn-light">
+ Add Comment
+ </button>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+</div>
+
+<script src="../assets/js/jquery.min.js"></script>
+<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
+<script src="../assets/js/Sidebar-Menu.js"></script>
+</body>
+
+</html>
\ No newline at end of file
--
GitLab