From b399ae7da2d409c44263b770e447549b3910da4f Mon Sep 17 00:00:00 2001
From: Axel <wiepke@uni-potsdam.de>
Date: Thu, 5 Jul 2018 11:38:31 +0200
Subject: [PATCH] fix: createProject as clickpath works
---
.../main/webapp/assets/js/createProject.js | 5 ++
.../main/webapp/assets/js/overview-docent.js | 7 +++
.../webapp/assets/js/specificRequirement.js | 5 ++
.../main/webapp/assets/js/specificSkills.js | 2 +-
.../src/main/webapp/pages/createProject.jsp | 47 ++++++++++++++
.../src/main/webapp/pages/overview-docent.jsp | 6 +-
.../src/main/webapp/pages/project-docent.jsp | 14 +++--
.../src/main/webapp/pages/project-student.jsp | 4 ++
.../main/webapp/pages/specificRequirement.jsp | 61 +++++++++++++++++++
.../src/main/webapp/pages/specificSkills.jsp | 10 ---
10 files changed, 143 insertions(+), 18 deletions(-)
create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/createProject.js
create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/specificRequirement.js
create mode 100644 gemeinsamforschen/src/main/webapp/pages/createProject.jsp
create mode 100644 gemeinsamforschen/src/main/webapp/pages/specificRequirement.jsp
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createProject.js b/gemeinsamforschen/src/main/webapp/assets/js/createProject.js
new file mode 100644
index 00000000..409171b0
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createProject.js
@@ -0,0 +1,5 @@
+$(document).ready(function(){
+ $('#submit').on('click', function(){
+ location.href="specificRequirement.jsp?token="+getUserTokenFromUrl();
+ });
+});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js b/gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js
index a0daa5f0..0bd803d8 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js
@@ -2,4 +2,11 @@ $(document).ready(function(){
$('#project1Link').on('click', function(){
location.href="project-docent.jsp?token="+getUserTokenFromUrl();
});
+ $('#project2Link').on('click', function(){
+ location.href="project-docent.jsp?token="+getUserTokenFromUrl();
+ });
+ $('#createProject').on('click', function(){
+ location.href="createProject.jsp?token="+getUserTokenFromUrl();
+ });
+
});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/specificRequirement.js b/gemeinsamforschen/src/main/webapp/assets/js/specificRequirement.js
new file mode 100644
index 00000000..40c84748
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/specificRequirement.js
@@ -0,0 +1,5 @@
+$(document).ready(function(){
+ $('#submit').on('click', function(){
+ location.href="project-docent.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
index 8d1851f2..d55c4b1f 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/specificSkills.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/specificSkills.js
@@ -1,5 +1,5 @@
$(document).ready(function () {
$('#submit').on('click',function(){
- document.location="project-student.jsp?token="+getUserTokenFromUrl();
+ document.location="project-docent.jsp?token="+getUserTokenFromUrl();
});
});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/createProject.jsp b/gemeinsamforschen/src/main/webapp/pages/createProject.jsp
new file mode 100644
index 00000000..b1336109
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/createProject.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/createProject.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-docent.jsp b/gemeinsamforschen/src/main/webapp/pages/overview-docent.jsp
index 58a41c26..a25d71d8 100644
--- a/gemeinsamforschen/src/main/webapp/pages/overview-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/overview-docent.jsp
@@ -12,6 +12,8 @@
<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-docent.js"></script>
<link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
<link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
@@ -66,7 +68,7 @@
</tr>
<tr class="pageChanger">
<td>
- <a href="project-docent.jsp">
+ <a id="project2Link">
<h1>dummy Projekt2</h1>
</a>
</td>
@@ -96,7 +98,7 @@
</tr>
</table>
</div>
- <button class="btn btn-default" type="button" style="margin-left:250px;">Projekt erstellen</button>
+ <button class="btn btn-default" type="button" id="createProject" style="margin-left:250px;">Projekt erstellen</button>
</div>
</div>
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp b/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp
index 45033b21..e7323fe3 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp
@@ -9,10 +9,16 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>project-student (copy)</title>
- <link rel="stylesheet" href="../assets/bootstrap/css/bootstrap.min.css">
- <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
+ <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>
</head>
<body>
@@ -142,8 +148,6 @@
</div>
</div>
<communication:chatWindow orientation="right"></communication:chatWindow>
- <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
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
index 99969f2b..d67bfa0b 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
@@ -3,6 +3,10 @@
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+
+<!--todo: E-mail an Studenten als Notifikation für Phasenwechsel -->
+
+
<!DOCTYPE html>
<html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/specificRequirement.jsp b/gemeinsamforschen/src/main/webapp/pages/specificRequirement.jsp
new file mode 100644
index 00000000..7c2a0432
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/specificRequirement.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><input placeholder="Kriterium1">
+ <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><input placeholder="Kriterium2">
+ <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>
+ <button type="button" class="btn btn-light"> + </button>
+ </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/specificSkills.jsp b/gemeinsamforschen/src/main/webapp/pages/specificSkills.jsp
index a8add053..1f5f24e2 100644
--- a/gemeinsamforschen/src/main/webapp/pages/specificSkills.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/specificSkills.jsp
@@ -36,18 +36,8 @@
<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>
--
GitLab