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
index d7bdabdb7c42104c5f32d82cbcabfa51cf37f61c..3af91e3ef5eff33823f6e5ad5e687ac8ee0627fc 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
@@ -34,19 +34,18 @@ public class Menu extends SimpleTagSupport {
" <li><a href=\"../index.jsp\">Logout</a></li>\n" +
" </ul>\n" +
" </div>");
+ out.println("<p id=\"userRole\" hidden>isStudent</p>");
} else {
out.println("<div id=\"sidebar-wrapper\">\n" +
" <ul class=\"sidebar-nav\">\n" +
" <li class=\"sidebar-brand\"><a href=\"overview-docent.jsp?token="+token+"&projectId="+projectId+"\">overview</a></li>\n" +
" <li><a href=\"Quiz-docent.jsp?token="+token+"&projectId="+projectId+"\">Quizfrage</a></li>\n" +
- " <li><a href=\"#\">ePortfolio</a></li>\n" +
- " <li><a href=\"#\">Beitrag</a></li>\n" +
- " <li><a href=\"#\">Gruppen erstellen</a></li>\n" +
+ " <li><a href=\"createGroups.jsp?token="+token+"&projectId="+projectId+"\">Gruppen erstellen</a></li>\n" +
" <li><a href=\"changePhase.jsp?token="+token+"&projectId="+projectId+"\">Projektphase ändern</a></li>\n" +
- " <li><a href=\"finalAssessments.jsp?token="+token+"&projectId="+projectId+"\">Bewertung</a></li>\n" +
- " <li><a href=\"../index.jsp\">Logout</a></li>\n" +
+ " <li><a id=\"logout\">Logout</a></li>\n" +
" </ul>\n" +
" </div>");
+ out.println("<p id=\"userRole\" hidden>isDocent</p>");
}
}else{
out.println("<div class='alert alert-warning'>" +
@@ -61,6 +60,7 @@ public class Menu extends SimpleTagSupport {
out.println("<p id=\"user\" hidden>"+user.getName()+"</p>");
+
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/footer.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/footer.java
new file mode 100644
index 0000000000000000000000000000000000000000..fad401c7fa6ec4189c9af201ff3f92c6ae4c51bc
--- /dev/null
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/footer.java
@@ -0,0 +1,29 @@
+package unipotsdam.gf.core.management.user;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+import java.io.IOException;
+
+public class footer extends SimpleTagSupport {
+ public void doTag() throws JspException, IOException {
+ JspWriter out = getJspContext().getOut();
+ out.println("<footer>\n" +
+ " <div class=\"container\">\n" +
+ " <div class=\"progress\">\n" +
+ " <div class=\"progress-bar pg-groups\" role=\"progressbar\" id=\"progressbar\">\n" +
+ " </div>\n" +
+ " <div>\n" +
+ " Assessment - Präsentationsphase - Dossier - Reflexionsphase - Feedbackphase - Gruppenbildung\n" +
+ " </div>\n" +
+ " <div class=\"progress-bar pg-rest\" role=\"progressbar\">\n" +
+ " </div>\n" +
+ " </div>\n" +
+ " <button id=\"nextPhase\" class=\"btn btn-light\">nächste Phase</button>\n" +
+ " <button id=\"btnUnstructuredUpload\" class=\"btn btn-light\">Unstrukturierte Abgabe</button>\n" +
+ " </div>\n" +
+ " </footer>");
+ }
+
+
+};
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Categories.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Categories.java
index 2937b2e3766b6fc3a15fd4595e2878d540dea5cd..66608a7d713d6dde0db06566e77a13313f7ed80b 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Categories.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Categories.java
@@ -16,8 +16,7 @@ public class Categories {
);
public static final List<String> contributionRatingCategories = Collections.unmodifiableList(
new ArrayList<String>() {{
- add("Dossier");
- add("eJournal");
+ add("dossier");
add("research");
}}
);
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Performance.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Performance.java
index c5bdd8cb17e438fcfc4865cb9e97de9476b7a325..4f97bdb7384a3e37deb26bf85e60d31573c027d4 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Performance.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Performance.java
@@ -1,6 +1,5 @@
package unipotsdam.gf.modules.assessment.controller.model;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java
index c5e803245536598c1664156205fb56e1067eb4b2..eaa910c0d173bd4ec008c0588f90e49c198d2296 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java
@@ -122,6 +122,7 @@ class AssessmentDBCommunication {
connect.close();
}
+ //todo: Studentidentifier student should be replaced by groupID. then you get the students in the group ...
void writeContributionRatingToDB(StudentIdentifier student, String fromStudent, Map<String, Integer> contributionRating) {
MysqlConnect connect = new MysqlConnect();
connect.connect();
@@ -130,7 +131,6 @@ class AssessmentDBCommunication {
"`projectId`, " +
"`fromPeer`, " +
"`dossier`, " +
- "`eJournal`, " +
"`research`) " +
"VALUES (?,?,?,?,?,?)";
connect.issueInsertOrDeleteStatement(mysqlRequest,
@@ -138,7 +138,6 @@ class AssessmentDBCommunication {
student.getProjectId(),
fromStudent,
contributionRating.get("dossier"),
- contributionRating.get("eJournal"),
contributionRating.get("research")
);
connect.close();
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js b/gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js
index a56e8a766a20f895dd8674056e796e5613bbc5b0..ca4916720422d9b9d080852bd57d4a6b92f114e0 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js
@@ -6,6 +6,15 @@ $(document).ready(function() {
$('#assessThePeer').on("click", function () {
assessPeer();
});
+ $('#btnJournalStudent1').on("click", function(){
+ $('#eJournalStudent1').toggle();
+ });
+ $('#btnJournalStudent2').on("click", function(){
+ $('#eJournalStudent2').toggle();
+ });
+ $('#btnJournalStudent3').on("click", function(){
+ $('#eJournalStudent3').toggle();
+ });
});
function assessPeer(){
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/rateContribution.js b/gemeinsamforschen/src/main/webapp/assets/js/rateContribution.js
index b7e3c6b5fcaafd34e8c7c7066027d6d1a7d6069c..9d39a066f99ce837b6c65f5e9d065151966d5a1c 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/rateContribution.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/rateContribution.js
@@ -1,10 +1,4 @@
$(document).ready(function () {
- new InscrybMDE({
- element: document.getElementById("ejournalFeedback"),
- spellChecker: false,
- //toolbar: ["bold", "italic", "heading", "|", "quote", "table", "code", "|" , "side-by-side", "fullscreen"],
- minHeight: "80px",
- });
new InscrybMDE({
element: document.getElementById("presentationFeedback"),
spellChecker: false,
@@ -39,10 +33,10 @@ function safeContributionRating() {
}
let projectId = $('#projectId').html().trim();
let fromPeer = $('#user').html().trim();
- let toStudent = $('.peerStudent').attr('id');
+ let toGroup = $('.peerStudent').attr('id');
$.ajax({
url: '../rest/assessments/contributionRating/projectId/' + projectId +
- '/studentId/' + toStudent + '/fromPeer/' + fromPeer,
+ '/studentId/' + toGroup + '/fromPeer/' + fromPeer,
type: 'POST',
headers: {
"Content-Type": "application/json",
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/utility.js b/gemeinsamforschen/src/main/webapp/assets/js/utility.js
index c5b8b37d083e2cc80f2260ded050c6c710143ade..baffe52ca6ee3f3a226ab8e2676e550c7ab1c1ad 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/utility.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/utility.js
@@ -1,12 +1,19 @@
$(document).ready(function(){
$('#headLineProject').html($('#projectId').html());
+ $('#logout').click(function(){
+ //todo: delete cookies / reset session
+ document.location="../index.jsp";
+ });
+ function goBack() {
+ window.history.back();
+ }
});
function getUserTokenFromUrl() {
- var parts = window.location.search.substr(1).split("&");
- var $_GET = {};
- for (var i = 0; i < parts.length; i++) {
- var temp = parts[i].split("=");
+ let parts = window.location.search.substr(1).split("&");
+ let $_GET = {};
+ for (let i = 0; i < parts.length; i++) {
+ let temp = parts[i].split("=");
$_GET[decodeURIComponent(temp[0])] = decodeURIComponent(temp[1]);
}
return $_GET['token'];
@@ -14,11 +21,11 @@ function getUserTokenFromUrl() {
}
function getQueryVariable(variable) {
- var query = window.location.search.substring(1);
- var vars = query.split("&");
- for (var i = 0; i < vars.length; i++) {
- var pair = vars[i].split("=");
- if (pair[0] == variable) {
+ let query = window.location.search.substring(1);
+ let vars = query.split("&");
+ for (let i = 0; i < vars.length; i++) {
+ let pair = vars[i].split("=");
+ if (pair[0] === variable) {
return pair[1];
}
}
diff --git a/gemeinsamforschen/src/main/webapp/core/pages/gemeinsamForschen.tld b/gemeinsamforschen/src/main/webapp/core/pages/gemeinsamForschen.tld
index 3c2db0269960c9ff430c6e6d82e74a225d195972..442302647a6d7d6c3c027747fc7740cbf0cb216e 100644
--- a/gemeinsamforschen/src/main/webapp/core/pages/gemeinsamForschen.tld
+++ b/gemeinsamforschen/src/main/webapp/core/pages/gemeinsamForschen.tld
@@ -32,6 +32,12 @@
<tag-class>unipotsdam.gf.core.management.user.headLine</tag-class>
<body-content>empty</body-content>
</tag>
+
+ <tag>
+ <name>footer</name>
+ <tag-class>unipotsdam.gf.core.management.user.footer</tag-class>
+ <body-content>empty</body-content>
+ </tag>
<tag>
<name>context</name>
diff --git a/gemeinsamforschen/src/main/webapp/pages/Quiz-docent.jsp b/gemeinsamforschen/src/main/webapp/pages/Quiz-docent.jsp
index 64db788d2e1fb91279b7fa9f339d33d0b232c26e..fd73ecc1dda7a7fdbc51b0bf7878e46d7361c0d3 100644
--- a/gemeinsamforschen/src/main/webapp/pages/Quiz-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/Quiz-docent.jsp
@@ -2,6 +2,7 @@
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
<html>
<head>
@@ -23,6 +24,6 @@
</div>
</div>
-
+<footer:footer/>
</body>
</html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/Quiz.jsp b/gemeinsamforschen/src/main/webapp/pages/Quiz.jsp
index f5f04d45e484bec9d965916f9910f85a5fb176cf..ad5514dae23f655827fbf42c0ae6531f04bc338c 100644
--- a/gemeinsamforschen/src/main/webapp/pages/Quiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/Quiz.jsp
@@ -2,6 +2,7 @@
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
<html>
<head>
@@ -23,6 +24,6 @@
</div>
</div>
-
+<footer:footer/>
</body>
</html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/changePhase.jsp b/gemeinsamforschen/src/main/webapp/pages/changePhase.jsp
index f0461c625a66652f593ac43b7e9c329d1b64a590..6e0595f1e80ff0f4908a7cc5848ae7faf44629bf 100644
--- a/gemeinsamforschen/src/main/webapp/pages/changePhase.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/changePhase.jsp
@@ -2,6 +2,8 @@
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+
<html>
<head>
@@ -34,6 +36,6 @@
</div>
</div>
</div>
-
+<footer:footer/>
</body>
</html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/createGroups.jsp b/gemeinsamforschen/src/main/webapp/pages/createGroups.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..4b22ba4e92ae53aeaf9abfc1a7a2ebdd16469a75
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/createGroups.jsp
@@ -0,0 +1,24 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+
+<html>
+<head>
+ <omniDependencies:omniDependencies/>
+ <script src="../assets/js/changePhase.js"></script>
+</head>
+
+<body>
+<div id="wrapper">
+ <menu:menu/>
+ <div class="page-content-wrapper">
+ <headLine:headLine/>
+ student1<br>
+ student2<br>
+ <br>
+ in Gruppe 1 2 3
+ </div>
+</div>
+</body>
+</html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/createProject.jsp b/gemeinsamforschen/src/main/webapp/pages/createProject.jsp
index 3984538cbfcaa344fa73305dcfd271d368ce6209..84f529a57f133988191875eac3c9f327d3217b23 100644
--- a/gemeinsamforschen/src/main/webapp/pages/createProject.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/createProject.jsp
@@ -2,6 +2,8 @@
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+
<!DOCTYPE html>
<html>
@@ -26,7 +28,7 @@
</div>
</div>
-
+<footer:footer/>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp b/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
index 512844f6c308bac4903aaa02e3f92af58f0405a1..4aadc39184545ec6f30ac5ac0cf9861e6e572d80 100644
--- a/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
@@ -2,6 +2,7 @@
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<html>
<head>
@@ -29,6 +30,6 @@
</div>
</div>
</div>
-
+<footer:footer/>
</body>
</html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp b/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp
index 1273a5887b11dd21268eb8c61084693d21ef565c..7b9112fe496f0f5604934cccff0bc46f49ffef84 100644
--- a/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp
@@ -2,6 +2,7 @@
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
<!DOCTYPE html>
<html>
@@ -43,13 +44,6 @@
<!-- here will be all the content -->
<div class="container">
<div id="myCarousel" class="carousel slide" data-ride="carousel" data-interval="false">
- <!-- 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="alert alert-info" id="notAllRated">
Es wurden noch nicht alle Studenten vollständig bewertet
@@ -146,6 +140,12 @@
</td>
</tr>
</table>
+ <div align="center">
+ <button class="btn btn-primary" id="btnJournalStudent1" >zeige Lernzieltagebuch</button>
+ <div id="eJournalStudent1">
+ Fasel Blubba Bla
+ </div>
+ </div>
</div>
<div class="item">
@@ -238,6 +238,12 @@
</td>
</tr>
</table>
+ <div align="center">
+ <button class="btn btn-primary" id="btnJournalStudent2">zeige Lernzieltagebuch</button>
+ <div id="eJournalStudent2">
+ Fasel Blubba Bla
+ </div>
+ </div>
</div>
<div class="item">
@@ -330,6 +336,12 @@
</td>
</tr>
</table>
+ <div align="center">
+ <button class="btn btn-primary" id="btnJournalStudent3">zeige Lernzieltagebuch</button>
+ <div id="eJournalStudent3" align="center">
+ Fasel Blubba Bla
+ </div>
+ </div>
</div>
</div>
@@ -410,9 +422,7 @@
</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>
+<footer:footer/>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/profile.jsp b/gemeinsamforschen/src/main/webapp/pages/profile.jsp
index 7f37281156d4d10c858001fff953e5d9c5aa6b29..a14b0b5d3c0afde4da5a4061b82f98fe62614882 100644
--- a/gemeinsamforschen/src/main/webapp/pages/profile.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/profile.jsp
@@ -1,22 +1,17 @@
<%@ page import="unipotsdam.gf.core.management.ManagementImpl" %>
<%@ page import="unipotsdam.gf.core.management.user.User" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
+
<!DOCTYPE html>
<html>
<head>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>Profil</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>
- <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">
+ <omniDependencies:omniDependencies/>
+
</head>
@@ -29,25 +24,10 @@
<body>
<div id="wrapper">
- <menu:menu></menu:menu>
+ <menu:menu/>
<div class="page-content-wrapper">
- <div class="container-fluid">
- <h1 id="projectId">
- <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 id="content">
-
- <div class="page-header text-center">
- <h1>Mein Profil</h1>
- </div>
-
+ <headLine:headLine/>
<div class="container">
<div class="row">
<%-- about --%>
@@ -125,11 +105,7 @@
</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>
-
+<footer:footer/>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp b/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp
index 9dbf5687f892d59a4d44927e6bce2832aed4d305..5aafa19554988dc0438d51b9bd5fe573390cc479 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp
@@ -3,6 +3,8 @@
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
+
<!DOCTYPE html>
@@ -86,74 +88,13 @@
</table>
</div>
</div>
- <div class="col-md-6">
- <div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">ProjektChat</h3>
- </div>
- <div class="panel-body" style="height:233px;">
- <ul class="list-group">
- <li class="list-group-item" style="margin-bottom:6px;">
- <div class="media">
- <div class="media-left"><a></a></div>
- <div class="media-body">
- <div class="media" style="overflow:visible;">
- <div class="media-left"><a><img src="../assets/img/1.jpg"
- class="img-rounded"
- style="width: 25px; height:25px;"></a>
- </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" style="margin-bottom:6px;">
- <div class="media">
- <div class="media-left"><a></a></div>
- <div class="media-body">
- <div class="media" style="overflow:visible;">
- <div class="media-left"><a><img src="../assets/img/1.jpg"
- class="img-rounded"
- style="width: 25px; height:25px;"></a>
- </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-default" type="button"
- style="margin-left:601px;margin-top:-9px;">Add Comment
- </button>
- </div>
- </div>
- </div>
</div>
</div>
</div>
</div>
</div>
<communication:chatWindow orientation="right" />
+<footer:footer/>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
index 55567371949904fc7116ef7cf01bab56f50def4a..c5d52dcf7f2b2a36ba8f7add63c82ae81d17d9e6 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
@@ -3,6 +3,8 @@
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
+
<!--todo: E-mail an Studenten als Notifikation für Phasenwechsel -->
@@ -118,83 +120,12 @@
</script>
</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>
- <footer>
- <div class="container">
- <div class="progress">
- <div class="progress-bar pg-groups" role="progressbar" id="progressbar">
- </div>
- <div>
- Assessment - Präsentationsphase - Dossier - Reflexionsphase - Feedbackphase - Gruppenbildung
- </div>
- <div class="progress-bar pg-rest" role="progressbar">
- </div>
- </div>
- <button id="nextPhase" class="btn btn-light">nächste Phase</button>
- <button id="btnUnstructuredUpload" class="btn btn-light">Unstrukturierte Abgabe</button>
- </div>
- </footer>
+ <footer:footer/>
+
</div>
</body>
diff --git a/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp b/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp
index 50431a5333efaf8cfbe617b8c561a1828a63aac2..bf7ea1b72780a4d8b2347b192ab19e85f906f888 100644
--- a/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp
@@ -2,6 +2,7 @@
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
<!DOCTYPE html>
<html>
@@ -22,29 +23,12 @@
<table>
<tr>
<td id="yourContent">
- <h1>letzter Schritt im Projekt1 </h1>
+ <h2>letzter Schritt im Projekt1 </h2>
<table class="table-striped peerStudent"
style="width:100%;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>
- <div class="contributionRating" id="eJournal">
- Lernzieltagebuch:
- Lernen ist wie Rudern gegen den Strom. Hört man damit auf, treibt man zurück.
- <textarea id="ejournalFeedback">
- meine Bewertung
- </textarea>
- <label><input type="radio" name="eJournal" value="5">Perfekt</label>
- <label><input type="radio" name="eJournal" value="4">Makellos</label>
- <label><input type="radio" name="eJournal" value="3">regulär</label>
- <label><input type="radio" name="eJournal" value="2">Makelhaft</label>
- <label><input type="radio" name="eJournal" value="1">Lädiert</label>
- </div>
+ <h3>Gruppe 4</h3>
</td>
</tr>
<tr>
@@ -83,69 +67,12 @@
</table>
<button id="submit" class="btn btn-success">Feedback hochladen</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>
+<footer:footer/>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp b/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
index 0eb33c1eaf3afbddc608bf14f0ce7c50692e380d..f0e94d8ac40d4df0e97cfcb5b41162d66fb3614f 100644
--- a/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
@@ -2,6 +2,7 @@
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
<!DOCTYPE html>
<html>
@@ -32,69 +33,12 @@
</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>
+<footer:footer/>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp b/gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp
index e105590e4a126bb3c2c390e9c9db96ff145dee07..6dab081ab731d4c547fc823921e1513578f5c06f 100644
--- a/gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp
@@ -1,7 +1,9 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %><!DOCTYPE html>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
+<!DOCTYPE html>
<html>
<head>
@@ -30,69 +32,12 @@
</table>
<button id="deleteQuiz" class="btn btn-danger">Quiz löschen</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>
+<footer:footer/>
</body>
</html>
\ No newline at end of file