From 3b3bbefe18767184cd638b2b6e278581bf44395d Mon Sep 17 00:00:00 2001
From: Axel <wiepke@uni-potsdam.de>
Date: Mon, 1 Oct 2018 10:03:10 +0200
Subject: [PATCH] fix projectName works in URL again in menu and from login to
project-student
---
.../unipotsdam/gf/core/management/pageAppearance/Menu.java | 2 +-
.../gf/modules/submission/view/SubmissionService.java | 4 ++--
.../src/main/webapp/assessment/js/Quiz-docent.js | 4 ++--
gemeinsamforschen/src/main/webapp/assessment/js/Quiz.js | 2 +-
.../src/main/webapp/assessment/js/assess-work.js | 2 +-
.../src/main/webapp/assessment/js/assessmentCalculator.js | 2 +-
.../src/main/webapp/assessment/js/create-quiz.js | 4 ++--
.../src/main/webapp/assessment/js/rateContribution.js | 2 +-
gemeinsamforschen/src/main/webapp/assessment/js/take-quiz.js | 2 +-
gemeinsamforschen/src/main/webapp/assessment/js/view-quiz.js | 4 ++--
gemeinsamforschen/src/main/webapp/core/overview-student.js | 2 +-
gemeinsamforschen/src/test/resources/database/fltrail.sql | 2 +-
12 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java
index 86fd4ecf..e7406cc1 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java
@@ -23,7 +23,7 @@ public class Menu extends SimpleTagSupport {
PageContext pageContext = (PageContext) getJspContext();
HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
String userEmail = request.getSession().getAttribute(GFContexts.USEREMAIL).toString();
- String projectName="";
+ String projectName=request.getParameter("projectName");
ProjectPhase projectPhase;
try {
ProjectDAO projectDAO = new ProjectDAO(new MysqlConnect());
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/view/SubmissionService.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/view/SubmissionService.java
index 55a7ed57..0eb505c5 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/view/SubmissionService.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/view/SubmissionService.java
@@ -105,8 +105,8 @@ public class SubmissionService {
}
@GET
- @Path("/project/{id}")
- public Response getSubmissionPartsByProjectId(@PathParam("id") String projectName) {
+ @Path("/project/{projectName}")
+ public Response getSubmissionPartsByProjectId(@PathParam("projectName") String projectName) {
// get submission project representation from database based by project id
SubmissionController controller = new SubmissionController();
ArrayList<SubmissionProjectRepresentation> representations = controller.getSubmissionPartsByProjectId(projectName);
diff --git a/gemeinsamforschen/src/main/webapp/assessment/js/Quiz-docent.js b/gemeinsamforschen/src/main/webapp/assessment/js/Quiz-docent.js
index 43ceb243..8e2bb8a9 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/js/Quiz-docent.js
+++ b/gemeinsamforschen/src/main/webapp/assessment/js/Quiz-docent.js
@@ -1,6 +1,6 @@
$(document).ready(function () {
$('#newQuiz').on('click', function () {
- location.href = "create-quiz.jsp";
+ location.href = "create-quiz.jsp?projectName="+projectName;
});
let loading = $('#loadbar').hide();
@@ -78,7 +78,7 @@ $(document).ready(function () {
url: '../rest/assessments/quiz/' + encodeURIComponent(event.data.quizId),
type: 'POST',
success: function () {
- document.location.href = "quiz-docent.jsp";
+ document.location.href = "quiz-docent.jsp?projectName="+projectName;
},
error: function (a) {
alert(a)
diff --git a/gemeinsamforschen/src/main/webapp/assessment/js/Quiz.js b/gemeinsamforschen/src/main/webapp/assessment/js/Quiz.js
index 5cea13c9..02016746 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/js/Quiz.js
+++ b/gemeinsamforschen/src/main/webapp/assessment/js/Quiz.js
@@ -25,6 +25,6 @@ $(document).ready(function () {
});
$('#newQuiz').on('click', function () {
- location.href = "create-quiz.jsp";
+ location.href = "create-quiz.jsp?projectName="+projectName;
});
});
diff --git a/gemeinsamforschen/src/main/webapp/assessment/js/assess-work.js b/gemeinsamforschen/src/main/webapp/assessment/js/assess-work.js
index 1346e7bc..790b2481 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/js/assess-work.js
+++ b/gemeinsamforschen/src/main/webapp/assessment/js/assess-work.js
@@ -172,7 +172,7 @@ function assessPeer() {
},
data: JSON.stringify(dataP),
success: function () {
- location.href = "take-quiz.jsp";
+ location.href = "take-quiz.jsp?projectName="+projectName;
},
error: function (a, b, c) {
diff --git a/gemeinsamforschen/src/main/webapp/assessment/js/assessmentCalculator.js b/gemeinsamforschen/src/main/webapp/assessment/js/assessmentCalculator.js
index 80294fd8..db4b9c22 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/js/assessmentCalculator.js
+++ b/gemeinsamforschen/src/main/webapp/assessment/js/assessmentCalculator.js
@@ -6,7 +6,7 @@ $(document).ready(function () { //todo: paths should be relative
success: function (data) {
alert("here is the TotalPerformance: " + data);
- location.href="../pages/project-student.jsp";
+ location.href="../pages/project-student.jsp?projectName="+projectName;
},
error: function (a, b, c) {
alert('some error' + a);
diff --git a/gemeinsamforschen/src/main/webapp/assessment/js/create-quiz.js b/gemeinsamforschen/src/main/webapp/assessment/js/create-quiz.js
index 7386f0b2..33b4a7ff 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/js/create-quiz.js
+++ b/gemeinsamforschen/src/main/webapp/assessment/js/create-quiz.js
@@ -60,10 +60,10 @@ $(document).ready(function () {
type: 'POST',
success: function (response) {
if (response === "student") {
- location.href = "Quiz.jsp";
+ location.href = "Quiz.jsp?projectName="+projectName;
}
if (response === "docent") {
- location.href = "Quiz-docent.jsp";
+ location.href = "Quiz-docent.jsp?projectName="+projectName;
}
},
diff --git a/gemeinsamforschen/src/main/webapp/assessment/js/rateContribution.js b/gemeinsamforschen/src/main/webapp/assessment/js/rateContribution.js
index 03ac4e9a..9d5865b4 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/js/rateContribution.js
+++ b/gemeinsamforschen/src/main/webapp/assessment/js/rateContribution.js
@@ -62,7 +62,7 @@ function safeContributionRating() {
},
data: JSON.stringify(dataP),
success: function () {
- location.href = "project-student.jsp";
+ location.href = "project-student.jsp?projectName="+projectName;
},
error: function (a, b, c) {
diff --git a/gemeinsamforschen/src/main/webapp/assessment/js/take-quiz.js b/gemeinsamforschen/src/main/webapp/assessment/js/take-quiz.js
index 8ee5d47d..40a79918 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/js/take-quiz.js
+++ b/gemeinsamforschen/src/main/webapp/assessment/js/take-quiz.js
@@ -110,7 +110,7 @@ function safeQuizAnswers() {
},
data: JSON.stringify(dataP),
success: function () {
- location.href = "rate-contribution.jsp";
+ location.href = "rate-contribution.jsp?projectName="+projectName;
},
error: function (a, b, c) {
diff --git a/gemeinsamforschen/src/main/webapp/assessment/js/view-quiz.js b/gemeinsamforschen/src/main/webapp/assessment/js/view-quiz.js
index 0c75c004..98add8fb 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/js/view-quiz.js
+++ b/gemeinsamforschen/src/main/webapp/assessment/js/view-quiz.js
@@ -51,7 +51,7 @@ $(document).ready(function () {
for (let i = 0; i < data.correctAnswers.length; i++) {
answersTd = answersTd + '<div><label class="element-animation1 btn btn-lg btn-success btn-block"><span class="btn-label"><i class="glyphicon glyphicon-chevron-right"></i></span><input type="checkbox">' + data.correctAnswers[i] + '</label></div>';
}
- for (i = 0; i < data.incorrectAnswers.length; i++) {
+ for (let i = 0; i < data.incorrectAnswers.length; i++) {
answersTd = answersTd + '<div><label class="element-animation1 btn btn-lg btn-danger btn-block"><span class="btn-label"><i class="glyphicon glyphicon-chevron-right"></i></span><input type="checkbox">' + data.incorrectAnswers[i] + '</label></div>';
}
trAnswers.innerHTML = answersTd + '</div></td>';
@@ -67,7 +67,7 @@ $(document).ready(function () {
url: '../rest/assessments/quiz/' + encodeURIComponent(quizId),
type: 'POST',
success: function () {
- document.location.href = "quiz.jsp";
+ document.location.href = "Quiz.jsp?projectName="+projectName;
},
error: function (a) {
alert(a)
diff --git a/gemeinsamforschen/src/main/webapp/core/overview-student.js b/gemeinsamforschen/src/main/webapp/core/overview-student.js
index 1200f58e..ddb8028c 100644
--- a/gemeinsamforschen/src/main/webapp/core/overview-student.js
+++ b/gemeinsamforschen/src/main/webapp/core/overview-student.js
@@ -81,7 +81,7 @@ function getProjects(userName){
for (let projectName in response){
if (response.hasOwnProperty(projectName)) {
$('#project' + response[projectName]).on('click', function () {
- location.href="project-student.jsp?projectName="+projectName;
+ location.href="project-student.jsp?projectName="+response[projectName];
});
updateStatus(response[projectName]);
diff --git a/gemeinsamforschen/src/test/resources/database/fltrail.sql b/gemeinsamforschen/src/test/resources/database/fltrail.sql
index c1c7f8ee..2ea83f70 100644
--- a/gemeinsamforschen/src/test/resources/database/fltrail.sql
+++ b/gemeinsamforschen/src/test/resources/database/fltrail.sql
@@ -21,7 +21,7 @@ CREATE TABLE if not exists `annotations` (
CREATE TABLE if not exists `fullsubmissions` (
`id` VARCHAR(120) NOT NULL,
`timestamp` TIMESTAMP on update CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
- `user` VARCHAR(120) NOT NULL,
+ `userEmail` VARCHAR(120) NOT NULL,
`text` MEDIUMTEXT NOT NULL,
`projectName` VARCHAR(120) NOT NULL,
PRIMARY KEY (`id`)
--
GitLab