Skip to content
Snippets Groups Projects
Commit 85a28d51 authored by Axel's avatar Axel
Browse files

feat: reworked menu for student, docent and missing tag. 

feat: jsp pages are utf-8 encoded now
parent cf9d3b72
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 258 additions and 210 deletions
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/HiddenUserTag.java
+ 1
− 0
View file @ 85a28d51
......@@ -17,6 +17,7 @@ public class HiddenUserTag extends SimpleTagSupport {
PageContext pageContext = (PageContext) getJspContext();
HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
String token = request.getParameter("token");
ManagementImpl management = new ManagementImpl();
User user = management.getUserByToken(token);
JspWriter out = getJspContext().getOut();
......
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
+ 37
− 28
View file @ 85a28d51
package unipotsdam.gf.core.management.user;
import unipotsdam.gf.core.management.Management;
import unipotsdam.gf.core.management.ManagementImpl;
import javax.servlet.http.HttpServletRequest;
......@@ -12,38 +11,48 @@ import java.io.IOException;
public class Menu extends SimpleTagSupport {
public void doTag() throws JspException, IOException {
Management management = new ManagementImpl();
PageContext pageContext = (PageContext) getJspContext();
HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
String token = request.getParameter("token");
User user = management.getUserByToken(token);
ManagementImpl management = new ManagementImpl();
JspWriter out = getJspContext().getOut();
Boolean isStudent = user.getStudent();
if (isStudent){
out.println("<div id=\"sidebar-wrapper\">\n" +
" <ul class=\"sidebar-nav\">\n" +
" <li class=\"sidebar-brand\"><a href=\"overview-student.html\">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>");
} else {
out.println("<div id=\"sidebar-wrapper\">\n" +
" <ul class=\"sidebar-nav\">\n" +
" <li class=\"sidebar-brand\"><a href=\"overview-docent.html\">overview</a></li>\n" +
" <li><a href=\"createQuiz.jsp\">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=\"#\">Projektphase ändern</a></li>\n" +
" <li><a href=\"finalAssessments.jsp\">Bewertung</a></li>\n" +
" <li><a href=\"../index.jsp\">Logout</a></li>\n" +
" </ul>\n" +
" </div>");
if (token!=null){
User user = management.getUserByToken(token);
Boolean isStudent = user.getStudent();
if (isStudent){
out.println("<div id=\"sidebar-wrapper\">\n" +
" <ul class=\"sidebar-nav\">\n" +
" <li class=\"sidebar-brand\"><a href=\"overview-student.jsp?token="+token+"\">overview</a></li>\n" +
" <li><a href=\"takeQuiz.jsp?token="+token+"\">Quizfrage</a></li>\n" +
" <li><a href=\"#\">ePortfolio</a></li>\n" +
" <li><a href=\"#\">Beitrag</a></li>\n" +
" <li><a href=\"finalAssessments.jsp?token="+token+"\">Bewertung</a></li>\n" +
" <li><a href=\"../index.jsp\">Logout</a></li>\n" +
" </ul>\n" +
" </div>");
} else {
out.println("<div id=\"sidebar-wrapper\">\n" +
" <ul class=\"sidebar-nav\">\n" +
" <li class=\"sidebar-brand\"><a href=\"overview-docent.jsp?token="+token+"\">overview</a></li>\n" +
" <li><a href=\"createQuiz.jsp?token="+token+"\">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=\"#\">Projektphase ändern</a></li>\n" +
" <li><a href=\"finalAssessments.jsp?token="+token+"\">Bewertung</a></li>\n" +
" <li><a href=\"../index.jsp\">Logout</a></li>\n" +
" </ul>\n" +
" </div>");
}
}else{
out.println("<div class='alert alert-warning'>" +
"You probably did not give the token to the url" +
"</div>");
//in active System this will be the point to redirect to index.jsp, because token is "wrong"
}
}
};
\ No newline at end of file
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/UserService.java
+ 2
− 2
View file @ 85a28d51
......@@ -138,9 +138,9 @@ public class UserService {
private Response redirectToProjectPage(User user, ManagementImpl management) throws URISyntaxException {
String successUrl;
if (user.getStudent() != null && user.getStudent()) {
successUrl = "../pages/overview-student.html?token=";
successUrl = "../pages/overview-student.jsp?token=";
} else {
successUrl = "../pages/overview-docent.html?token=";
successUrl = "../pages/overview-docent.jsp?token=";
}
successUrl += management.getUserToken(user);
return forwardToLocation(successUrl);
......
gemeinsamforschen/src/main/webapp/index.jsp
+ 1
− 1
View file @ 85a28d51
......@@ -5,7 +5,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Gruppenmatcher</title>
<title>gemeinsam Forschen</title>
<link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Ubuntu:400,700">
<link rel="stylesheet" href="assets/css/Login-Form-Clean.css">
......
gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp
+ 1
− 0
View file @ 85a28d51
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html>
......
gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp
+ 3
− 2
View file @ 85a28d51
<%@ 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 charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>muster-gemeinsam-forschen</title>
<script src="../assets/js/finalAssessment.js"></script>
<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">
......
gemeinsamforschen/src/main/webapp/pages/overview-docent.html deleted 100644 → 0
+ 0
− 87
View file @ cf9d3b72
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>fltrail</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>
</head>
<body>
<h1>Übersicht für Dozent1</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>
<table id="projects"> <!-- getElementById('projects').append um neue Projekte anzufügen -->
<tr style="cursor:pointer" role="button">
<td>
<a id="project1Link">
<h1>dummy Projekt1</h1>
</a>
</td>
</tr>
<tr>
<td>
<div style="width:100px;"></div>
<div style="width:741px;">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Newsfeed </h3>
</div>
<div class="panel-body">
<ul class="list-group">
<li class="list-group-item">
<span>erste Abgabe vom Dozenten zu dd.mm.yyyy gefordert</span>
</li>
<li class="list-group-item"><span>Beitrag von Student1 wurde hochgeladen</span></li>
<li class="list-group-item"><span>Gruppe "gemeinsam forschen" rockt das Haus</span></li>
</ul>
</div>
</div>
</div>
</td>
</tr>
<tr>
<td></td>
</tr>
<tr style="cursor:pointer" role="button">
<td>
<a href="project-docent.jsp">
<h1>dummy Projekt2</h1>
</a>
</td>
</tr>
<tr>
<td>
<div style="width:100px;"></div>
<div style="width:741px;">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Newsfeed </h3>
</div>
<div class="panel-body">
<ul class="list-group">
<li class="list-group-item">
<span>erste Abgabe vom Dozenten zu dd.mm.yyyy gefordert</span>
</li>
<li class="list-group-item"><span>Beitrag von Student1 wurde hochgeladen</span></li>
<li class="list-group-item"><span>Gruppe "gemeinsam forschen" rockt das Haus</span></li>
</ul>
</div>
</div>
</div>
</td>
</tr>
</table>
</div>
<button class="btn btn-default" type="button" style="margin-left:250px;">Projekt erstellen</button>
<script src="../assets/js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
</body>
</html>
\ No newline at end of file
gemeinsamforschen/src/main/webapp/pages/overview-docent.jsp 0 → 100644
+ 105
− 0
View file @ 85a28d51
<%@ 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 charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>fltrail</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">
</head>
<body>
<div id="wrapper">
<menu:menu></menu:menu>
<div class="page-content-wrapper">
<h1>Übersicht für Dozent1</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>
<table id="projects"> <!-- getElementById('projects').append um neue Projekte anzufügen -->
<tr style="cursor:pointer" role="button">
<td>
<a id="project1Link">
<h1>dummy Projekt1</h1>
</a>
</td>
</tr>
<tr>
<td>
<div style="width:100px;"></div>
<div style="width:741px;">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Newsfeed </h3>
</div>
<div class="panel-body">
<ul class="list-group">
<li class="list-group-item">
<span>erste Abgabe vom Dozenten zu dd.mm.yyyy gefordert</span>
</li>
<li class="list-group-item"><span>Beitrag von Student1 wurde hochgeladen</span>
</li>
<li class="list-group-item">
<span>Gruppe "gemeinsam forschen" rockt das Haus</span></li>
</ul>
</div>
</div>
</div>
</td>
</tr>
<tr>
<td></td>
</tr>
<tr style="cursor:pointer" role="button">
<td>
<a href="project-docent.jsp">
<h1>dummy Projekt2</h1>
</a>
</td>
</tr>
<tr>
<td>
<div style="width:100px;"></div>
<div style="width:741px;">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Newsfeed </h3>
</div>
<div class="panel-body">
<ul class="list-group">
<li class="list-group-item">
<span>erste Abgabe vom Dozenten zu dd.mm.yyyy gefordert</span>
</li>
<li class="list-group-item"><span>Beitrag von Student1 wurde hochgeladen</span>
</li>
<li class="list-group-item">
<span>Gruppe "gemeinsam forschen" rockt das Haus</span></li>
</ul>
</div>
</div>
</div>
</td>
</tr>
</table>
</div>
<button class="btn btn-default" type="button" style="margin-left:250px;">Projekt erstellen</button>
</div>
</div>
</body>
</html>
\ No newline at end of file
gemeinsamforschen/src/main/webapp/pages/overview-student.html deleted 100644 → 0
+ 0
− 90
View file @ cf9d3b72
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>fltrail</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/utility.js"></script>
<script src="../assets/js/overview-student.js"></script>
</head>
<body>
<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>
<table id="projects"> <!-- getElementById('projects').append um neue Projekte anzufügen -->
<tr style="cursor:pointer" role="button">
<td>
<a id="project1Link">
<h1>dummy Projekt1</h1>
</a>
</td>
</tr>
<tr>
<td>
<div style="width:100px;"></div>
<div style="width:741px;">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Newsfeed </h3>
</div>
<div class="panel-body">
<ul class="list-group">
<li class="list-group-item">
<span>erste Abgabe vom Dozenten zu dd.mm.yyyy gefordert</span>
</li>
<li class="list-group-item"><span>Beitrag von Student1 wurde hochgeladen</span></li>
<li class="list-group-item"><span>Gruppe "gemeinsam forschen" rockt das Haus</span></li>
</ul>
</div>
</div>
</div>
</td>
</tr>
<tr>
<td></td>
</tr>
<tr style="cursor:pointer" role="button">
<td>
<a href="project-docent.jsp">
<h1>dummy Projekt2</h1>
</a>
</td>
</tr>
<tr>
<td>
<div style="width:100px;"></div>
<div style="width:741px;">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Newsfeed </h3>
</div>
<div class="panel-body">
<ul class="list-group">
<li class="list-group-item">
<span>erste Abgabe vom Dozenten zu dd.mm.yyyy gefordert</span>
</li>
<li class="list-group-item"><span>Beitrag von Student1 wurde hochgeladen</span></li>
<li class="list-group-item"><span>Gruppe "gemeinsam forschen" rockt das Haus</span></li>
</ul>
</div>
</div>
</div>
</td>
</tr>
</table>
</div>
</div><button class="btn btn-default" type="button" style="margin-left:250px;">Projekt beitreten</button>
<script src="../assets/js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
</body>
</html>
\ No newline at end of file
gemeinsamforschen/src/main/webapp/pages/overview-student.jsp 0 → 100644
+ 107
− 0
View file @ 85a28d51
<%@ 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/overview-student.js"></script>
</head>
<body>
<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>
<table id="projects"> <!-- getElementById('projects').append um neue Projekte anzufügen -->
<tr style="cursor:pointer" role="button">
<td>
<a id="project1Link">
<h1>dummy Projekt1</h1>
</a>
</td>
</tr>
<tr>
<td>
<div style="width:100px;"></div>
<div style="width:741px;">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Newsfeed </h3>
</div>
<div class="panel-body">
<ul class="list-group">
<li class="list-group-item">
<span>erste Abgabe vom Dozenten zu dd.mm.yyyy gefordert</span>
</li>
<li class="list-group-item"><span>Beitrag von Student1 wurde hochgeladen</span>
</li>
<li class="list-group-item">
<span>Gruppe "gemeinsam forschen" rockt das Haus</span></li>
</ul>
</div>
</div>
</div>
</td>
</tr>
<tr>
<td></td>
</tr>
<tr style="cursor:pointer" role="button">
<td>
<a href="project-docent.jsp">
<h1>dummy Projekt2</h1>
</a>
</td>
</tr>
<tr>
<td>
<div style="width:100px;"></div>
<div style="width:741px;">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Newsfeed </h3>
</div>
<div class="panel-body">
<ul class="list-group">
<li class="list-group-item">
<span>erste Abgabe vom Dozenten zu dd.mm.yyyy gefordert</span>
</li>
<li class="list-group-item"><span>Beitrag von Student1 wurde hochgeladen</span>
</li>
<li class="list-group-item">
<span>Gruppe "gemeinsam forschen" rockt das Haus</span></li>
</ul>
</div>
</div>
</div>
</td>
</tr>
</table>
</div>
<button class="btn btn-default" type="button" style="margin-left:250px;">Projekt beitreten</button>
</div>
</div>
</body>
</html>
\ No newline at end of file
gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
+ 1
− 0
View file @ 85a28d51
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html>
<html>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment