diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js b/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js
index 885e1cf5065d36a77232437b1b2d2722492ef396..764a7a90dfd06ce45531d359c31d592b3a39c0f7 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js
@@ -1,5 +1,5 @@
$(document).ready(function () {
$("#save").on('click', function () {
- document.location = "project-student.jsp?token=" + getUserTokenFromUrl();
+ document.location = "Quiz.jsp?token=" + getUserTokenFromUrl();
});
});
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/enrollProject.js b/gemeinsamforschen/src/main/webapp/assets/js/enrollProject.js
new file mode 100644
index 0000000000000000000000000000000000000000..5969e8ae46238871a6b97f80c039b3df93fee435
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/enrollProject.js
@@ -0,0 +1,5 @@
+$(document).ready(function () {
+ $('#submit').on('click',function(){
+ document.location="specificSkills.jsp?token="+getUserTokenFromUrl();
+ });
+});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/footer.js b/gemeinsamforschen/src/main/webapp/assets/js/footer.js
index e93d6572d8c15e64128770f53f1e098e92dc93dd..33e3ada606d22727234e01d6fa131f67e1240009 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/footer.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/footer.js
@@ -2,10 +2,6 @@ $(document).ready(function(){
$('#nextPhase').click(function(){
var progressbar =$('#progressbar');
switch (progressbar.attr('class')){
- case 'progress-bar pg-enrollment':
- progressbar.removeClass('pg-enrollment');
- progressbar.addClass('pg-groups');
- break;
case 'progress-bar pg-groups':
progressbar.removeClass('pg-groups');
progressbar.addClass('pg-dossier');
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/overview-student.js b/gemeinsamforschen/src/main/webapp/assets/js/overview-student.js
index 58a1b769651bb338348cdd908d25faa7b9c4037e..2cf207efe43ac69de868491e3264e78c837b0e9c 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/overview-student.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/overview-student.js
@@ -2,4 +2,7 @@ $(document).ready(function(){
$('#project1Link').on('click', function(){
location.href="project-student.jsp?token="+getUserTokenFromUrl();
});
+ $('#enrollProject').on('click', function(){
+ location.href="enrollProject.jsp?token="+getUserTokenFromUrl();
+ });
});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/project-student.js b/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
index 2a714319632270bda633f5c91cc11b6959a18083..9a7b01bf581634f5e54b27001da6f658bb8e01a7 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
@@ -1,23 +1,19 @@
$(document).ready(function(){
-
- $('.projectId').click(function () {
- location.href="project-student.jsp?token="+getUserTokenFromUrl();
+ /*
+ var memberTable = $('#myGroupMembers');
+ memberTable.hide();
+ $('#nextPhase').on('click',function(){
+ memberTable.show();
});
-
+ */
$('.givefeedback').click(function () {
location.href="givefeedback.jsp?token="+getUserTokenFromUrl();
- })
-
+ });
$('.viewfeedback').click(function () {
location.href="viewfeedback.jsp?token="+getUserTokenFromUrl();
- })
+ });
$('.annotationview').click(function () {
location.href="annotation-document.jsp?token="+getUserTokenFromUrl();
- })
-
- $('. overviewstudent').click(function () {
- location.href="project-student.jsp?token="+getUserTokenFromUrl();
- })
-
+ });
});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/rateContribution.js b/gemeinsamforschen/src/main/webapp/assets/js/rateContribution.js
new file mode 100644
index 0000000000000000000000000000000000000000..8d6c7c7b53d0fd8323dd23e2abea8d79c298954c
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/rateContribution.js
@@ -0,0 +1,28 @@
+$(document).ready(function () {
+ var ejournalFeedback = new InscrybMDE({
+ element: document.getElementById("ejournalFeedback"),
+ spellChecker: false,
+ //toolbar: ["bold", "italic", "heading", "|", "quote", "table", "code", "|" , "side-by-side", "fullscreen"],
+ minHeight: "80px",
+ });
+ var presentationFeedback = new InscrybMDE({
+ element: document.getElementById("presentationFeedback"),
+ spellChecker: false,
+ //toolbar: ["bold", "italic", "heading", "|", "quote", "table", "code", "|" , "side-by-side", "fullscreen"],
+ minHeight: "80px",
+ });
+ var dossierFeedback = new InscrybMDE({
+ element: document.getElementById("dossierFeedback"),
+ spellChecker: false,
+ //toolbar: ["bold", "italic", "heading", "|", "quote", "table", "code", "|" , "side-by-side", "fullscreen"],
+ minHeight: "80px",
+ });
+
+
+ editor.style = "min-height: 100px";
+
+
+ $('#submit').on('click',function(){
+ document.location="project-student.jsp?token="+getUserTokenFromUrl();
+ });
+});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/specificSkills.js b/gemeinsamforschen/src/main/webapp/assets/js/specificSkills.js
new file mode 100644
index 0000000000000000000000000000000000000000..8d1851f25824e78c10507f81b2e988fddafabbd2
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/specificSkills.js
@@ -0,0 +1,5 @@
+$(document).ready(function () {
+ $('#submit').on('click',function(){
+ document.location="project-student.jsp?token="+getUserTokenFromUrl();
+ });
+});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/enrollProject.jsp b/gemeinsamforschen/src/main/webapp/pages/enrollProject.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..4de718d37303e1c498deb9b562be7b2826f68a4b
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/enrollProject.jsp
@@ -0,0 +1,47 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>fltrail</title>
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.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">
+ <script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/enrollProject.js"></script>
+
+</head>
+
+<body>
+<div id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <div class="container-fluid">
+
+ <h1>Einschreiben in einen Kurs</h1>
+ <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>
+ </div>
+ <div style="margin-left: 2%;">
+ <br><br>
+ <label>Projektname: <input placeholder="Projektname"></label>
+ <label>Passwort: <input placeholder="Passwort"></label>
+ </div>
+ <button class="btn btn-default" type="button" id="submit">beitreten</button>
+ </div>
+</div>
+
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/overview-student.jsp b/gemeinsamforschen/src/main/webapp/pages/overview-student.jsp
index d2901ab75448fe5571bde4a4c47ad62bb51ed5b1..ab21d52a2995b2e150d0883d456dd72fce018d53 100644
--- a/gemeinsamforschen/src/main/webapp/pages/overview-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/overview-student.jsp
@@ -1,4 +1,4 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
<!DOCTYPE html>
@@ -24,12 +24,13 @@
<div id="wrapper">
<menu:menu></menu:menu>
<div class="page-content-wrapper">
-
- <h1>Übersicht für Student1</h1>
- <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>
+ <div class="container-fluid">
+ <h1>Übersicht für Student1</h1>
+ <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>
+ </div>
<div>
<table id="projects"> <!-- getElementById('projects').append um neue Projekte anzufügen -->
<tr class="pageChanger">
@@ -46,6 +47,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Newsfeed </h3>
+ Status: abgeschlossen mit Bewertung 2+
</div>
<div class="panel-body">
<ul class="list-group">
@@ -67,7 +69,7 @@
</tr>
<tr class="pageChanger">
<td>
- <a href="project-docent.jsp">
+ <a href="project-student.jsp">
<h1>dummy Projekt2</h1>
</a>
</td>
@@ -79,6 +81,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Newsfeed </h3>
+ Status: Gruppenbildung
</div>
<div class="panel-body">
<ul class="list-group">
@@ -97,7 +100,7 @@
</tr>
</table>
</div>
- <button class="btn btn-default" type="button" style="margin-left:250px;">Projekt beitreten</button>
+ <button class="btn btn-default" type="button" style="margin-left:250px;" id="enrollProject">Projekt beitreten</button>
</div>
</div>
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
index f74e00a24a7a90fe0c0fd9e58c1d33f15df8b417..5e04db86418a93cc02d7a2ba0638316429492249 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
@@ -57,7 +57,7 @@
<td id="yourContent">
<h1>Feedbackable Students</h1>
<!-- here will be all the content -->
- <table>
+ <table id="myGroupMembers">
<tr>
<td width="100px" valign="top">
@@ -67,14 +67,16 @@
<hr>
<ul>
- <li><a class="annotationview" role="button">
+ <li>
Projektübersicht hochgeladen
- <i class="far fa-comments"></i>
+ <a class="annotationview" role="button">
+ <label style="font-size:10px;"><i class="far fa-comments" style="font-size:15px;"></i>feedback</label>
</a>
</li>
- <li><a class="annotationview" role="button">
+ <li>
Blumen ins Hausaufgabenheft geklebt
- <i class="far fa-comments"></i>
+ <a class="annotationview" role="button">
+ <label style="font-size:10px;"><i class="far fa-comments" style="font-size:15px;"></i>feedback</label>
</a>
</li>
</a>
@@ -88,18 +90,24 @@
<a href="#">student2@uni.de</a>
<hr>
<ul>
- <li><a class="annotationview" role="button">
+ <li>
Blumen an Vegetarier verfüttert
- <i class="far fa-comments"></i>
- </a></li>
- <li><a class="annotationview" role="button">
+ <a class="annotationview" role="button">
+ <label style="font-size:10px;"><i class="far fa-comments" style="font-size:15px;"></i>feedback</label>
+ </a>
+ </li>
+ <li>
Literaturverzeichnis hochgeladen
- <i class="far fa-comments"></i>
- </a></li>
- <li><a class="annotationview" role="button">
+ <a class="annotationview" role="button">
+ <label style="font-size:10px;"><i class="far fa-comments" style="font-size:15px;"></i>feedback</label>
+ </a>
+ </li>
+ <li>
Die armen Vegetarier
- <i class="far fa-comments"></i>
- </a></li>
+ <a class="annotationview" role="button">
+ <label style="font-size:10px;"><i class="far fa-comments" style="font-size:15px;"></i>feedback</label>
+ </a>
+ </li>
</ul>
</td>
<td></td>
@@ -110,9 +118,10 @@
<a href="#">student3@uni.de</a>
<hr>
<ul>
- <li><a class="annotationview" role="button">
+ <li>
"Viva la Floristika" - Titel hochgeladen
- <i class="far fa-comments"></i>
+ <a class="annotationview" role="button">
+ <label style="font-size:10px;"><i class="far fa-comments" style="font-size:15px;"></i>feedback</label>
</a>
</li>
</ul>
@@ -195,10 +204,10 @@
<footer>
<div class="container">
<div class="progress">
- <div class="progress-bar pg-enrollment" role="progressbar" id="progressbar">
+ <div class="progress-bar pg-groups" role="progressbar" id="progressbar">
</div>
<div>
- Assessment - Präsentationsphase - Dossier - Reflexionsphase - Feedbackphase - Gruppenbildung - Kursanmeldung
+ Assessment - Präsentationsphase - Dossier - Reflexionsphase - Feedbackphase - Gruppenbildung
</div>
<div class="progress-bar pg-rest" role="progressbar">
</div>
diff --git a/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp b/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp
index a6813d433a1e04ea3188d0b640a34a4ad0caa7db..1cbd97668612b785995299c089e0dc8313a71732 100644
--- a/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp
@@ -1,5 +1,5 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
<!DOCTYPE html>
<html>
@@ -11,6 +11,11 @@
<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="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <script src="https://cdn.rawgit.com/showdownjs/showdown/1.8.5/dist/showdown.min.js"></script>
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+ <script src="../assets/js/rateContribution.js"></script>
+ <script src="../assets/js/utility.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">
@@ -28,16 +33,17 @@
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>
+ <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">
+ <td id="yourContent">
<h1>letzter Schritt im Projekt1 </h1>
<table class="table-striped peerStudent"
- style="width:70%;border:1px solid; margin:auto;" id="student1">
+ style="width:100%;border:1px solid; margin:auto;" id="student1">
<tr>
<td align="center">
<img src="../assets/img/1.jpg" alt="student1"
@@ -47,18 +53,49 @@
<tr>
<td>
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="ejournalRating">Perfekt</label>
+ <label><input type="radio" name="ejournalRating">Makellos</label>
+ <label><input type="radio" name="ejournalRating">regulär</label>
+ <label><input type="radio" name="ejournalRating">Makelhaft</label>
+ <label><input type="radio" name="ejournalRating">Lädiert</label>
</td>
+ </tr>
+ <tr>
<td>
Dossier:
+ Die meisten Menschen sind bereit zu lernen, aber nur die wenigsten, sich belehren zu
+ lassen.
+ <textarea id="dossierFeedback">
+ meine Bewertung
+ </textarea>
+ <label><input type="radio" name="dossierlRating">Perfekt</label>
+ <label><input type="radio" name="dossierRating">Makellos</label>
+ <label><input type="radio" name="dossierRating">regulär</label>
+ <label><input type="radio" name="dossierRating">Makelhaft</label>
+ <label><input type="radio" name="dossierRating">Lädiert</label>
</td>
+ </tr>
+ <tr>
<td>
- villt Präsentation:
+ Präsentation: <a href="#"><i class="fa fa-paperclip"></i></a>
+ <textarea id="presentationFeedback">
+ meine Bewertung
+ </textarea>
+ <label><input type="radio" name="presentationRating">Perfekt</label>
+ <label><input type="radio" name="presentationRating">Makellos</label>
+ <label><input type="radio" name="presentationRating">regulär</label>
+ <label><input type="radio" name="presentationRating">Makelhaft</label>
+ <label><input type="radio" name="presentationRating">Lädiert</label>
</td>
</tr>
</table>
<button id="submit" class="btn btn-success">Feedback hochladen</button>
</td>
- <td id="chat">
+ <td id="chat">
<div class="card">
<div class="card-header">
<h6 class="mb-0">Gruppen+Projekt Chat</h6>
diff --git a/gemeinsamforschen/src/main/webapp/pages/specificSkills.jsp b/gemeinsamforschen/src/main/webapp/pages/specificSkills.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..a8add05364b2cc1a7ba26c56a7333e44dc4bf399
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/specificSkills.jsp
@@ -0,0 +1,61 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>fltrail</title>
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.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">
+ <script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/specificSkills.js"></script>
+
+</head>
+
+<body>
+<div id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <div class="container-fluid">
+
+ <h1>Einschreiben in einen Kurs</h1>
+ <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>
+ </div>
+ <div align="center">
+ <h2>Wie schätzen Sie sich in folgenden Kategorien ein?</h2>
+ <br><br>
+ <p>groupCriterion1
+ <label>stark<input type="radio" name="groupCriterion1"></label>
+ <input type="radio" name="groupCriterion1">
+ <input type="radio" name="groupCriterion1">
+ <input type="radio" name="groupCriterion1">
+ <label><input type="radio" name="groupCriterion1">schwach</label>
+ </p>
+ <p>groupCriterion2
+ <label>stark<input type="radio" name="groupCriterion2"></label>
+ <input type="radio" name="groupCriterion2">
+ <input type="radio" name="groupCriterion2">
+ <input type="radio" name="groupCriterion2">
+ <label><input type="radio" name="groupCriterion2">schwach</label>
+ </p>
+
+ </div>
+ <button class="btn btn-default" type="button" id="submit">beitreten</button>
+ </div>
+</div>
+
+
+</body>
+
+</html>
\ No newline at end of file