From 260d6b984c4cddb15e147b3a569efc3ef1ae6d15 Mon Sep 17 00:00:00 2001
From: Axel <wiepke@uni-potsdam.de>
Date: Tue, 28 Aug 2018 10:43:38 +0200
Subject: [PATCH] beaut: created sites and link for phase changing
---
.../gf/core/management/user/Menu.java | 4 +-
.../gf/core/states/PhasesService.java | 2 +-
.../src/main/webapp/assets/js/changePhase.js | 25 ++++++++++++
.../main/webapp/assets/js/createProject.js | 21 ++++++++++
.../src/main/webapp/assets/js/createQuiz.js | 28 ++++++-------
.../src/main/webapp/pages/changePhase.jsp | 39 +++++++++++++++++++
6 files changed, 102 insertions(+), 17 deletions(-)
create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/changePhase.js
create mode 100644 gemeinsamforschen/src/main/webapp/pages/changePhase.jsp
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 d08c07de..d7bdabdb 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
@@ -42,8 +42,8 @@ public class Menu extends SimpleTagSupport {
" <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=\"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" +
" </ul>\n" +
" </div>");
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/PhasesService.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/PhasesService.java
index e3ad4220..6e4a0b1d 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/PhasesService.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/PhasesService.java
@@ -38,7 +38,7 @@ public class PhasesService {
* @param projectId
* @return
*/
- @Path("/{projectPhase}/projects/{projectId}")
+ @Path("/projects/{projectId}")
@GET
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public String getCurrentPhase(@PathParam("projectId") String projectId) {
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/changePhase.js b/gemeinsamforschen/src/main/webapp/assets/js/changePhase.js
new file mode 100644
index 00000000..f26618fd
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/changePhase.js
@@ -0,0 +1,25 @@
+$(document).ready(function () {
+ //$("#save").on('click', function () {
+ let projectId = $('#projectId').html().trim();
+ $.ajax({
+ url: '../rest/phases/projects/'+projectId,
+ headers: {
+ "Content-Type": "application/json",
+ "Cache-Control": "no-cache"
+ },
+ type: 'GET',
+ success: function (response) {
+ let phaseDiv = $('#'+response);
+ if (phaseDiv !== null){
+ phaseDiv.toggleClass('alert','alert-info');
+ } else {
+ $('#end').addClass('alert-info');
+ }
+
+ },
+ error: function (a) {
+
+ }
+ });
+ //});
+});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createProject.js b/gemeinsamforschen/src/main/webapp/assets/js/createProject.js
index 409171b0..69657248 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/createProject.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createProject.js
@@ -2,4 +2,25 @@ $(document).ready(function(){
$('#submit').on('click', function(){
location.href="specificRequirement.jsp?token="+getUserTokenFromUrl();
});
+ let projectId = $('#projectId').html().trim();
+ $.ajax({
+ url: '../rest/phases/projects/'+projectId,
+ headers: {
+ "Content-Type": "application/json",
+ "Cache-Control": "no-cache"
+ },
+ type: 'GET',
+ success: function (response) {
+ let phaseDiv = $('#'+response);
+ if (phaseDiv !== null){
+ phaseDiv.toggleClass('alert','alert-info');
+ } else {
+ $('#end').addClass('alert-info');
+ }
+
+ },
+ error: function (a) {
+
+ }
+ });
});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js b/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js
index b8e097d0..37413173 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js
@@ -1,34 +1,34 @@
$(document).ready(function () {
$('#addCorrectAnswer').on('click', function(){
- var divCorrectAnswer = document.getElementById('correctAnswers');
- var i = divCorrectAnswer.children.length;
- var inputCorrectAnswer = document.createElement('INPUT');
+ let divCorrectAnswer = document.getElementById('correctAnswers');
+ let i = divCorrectAnswer.children.length;
+ let inputCorrectAnswer = document.createElement('INPUT');
inputCorrectAnswer.id='correctAnswer'+i;
divCorrectAnswer.appendChild(inputCorrectAnswer);
});
$('#addIncorrectAnswer').on('click', function(){
- var divIncorrectAnswer = document.getElementById('incorrectAnswers');
- var i = divIncorrectAnswer.children.length;
- var inputIncorrectAnswer = document.createElement('INPUT');
+ let divIncorrectAnswer = document.getElementById('incorrectAnswers');
+ let i = divIncorrectAnswer.children.length;
+ let inputIncorrectAnswer = document.createElement('INPUT');
inputIncorrectAnswer.id='incorrectAnswer'+i;
divIncorrectAnswer.appendChild(inputIncorrectAnswer);
});
$('#deleteCorrectAnswer').on('click', function(){
- var divCorrectAnswer = document.getElementById('correctAnswers');
+ let divCorrectAnswer = document.getElementById('correctAnswers');
divCorrectAnswer.removeChild(divCorrectAnswer.lastChild);
});
$('#deleteIncorrectAnswer').on('click', function(){
- var divIncorrectAnswer = document.getElementById('incorrectAnswers');
+ let divIncorrectAnswer = document.getElementById('incorrectAnswers');
divIncorrectAnswer.removeChild(divIncorrectAnswer.lastChild);
});
$("#save").on('click', function () {
- var correctAnswers= [];
- var incorrectAnswers= [];
- var shuttleList = document.getElementById('correctAnswers');
+ let correctAnswers= [];
+ let incorrectAnswers= [];
+ let shuttleList = document.getElementById('correctAnswers');
for (var i=0; i<shuttleList.children.length; i++)
{
correctAnswers.push(shuttleList.children[i].value.trim())
@@ -38,17 +38,17 @@ $(document).ready(function () {
{
incorrectAnswers.push(shuttleList.children[i].value.trim())
}
- var quiz = {
+ let quiz = {
question: $('#question').val().trim(),
type: 'mc',
correctAnswers: correctAnswers,
incorrectAnswers: incorrectAnswers
};
- var studentIdentifier = {
+ let studentIdentifier = {
studentId: $('#user').html().trim(),
projectId: $('#projectId').html().trim()
};
- var data = JSON.stringify({
+ let data = JSON.stringify({
studentIdentifier: studentIdentifier,
quiz: quiz
});
diff --git a/gemeinsamforschen/src/main/webapp/pages/changePhase.jsp b/gemeinsamforschen/src/main/webapp/pages/changePhase.jsp
new file mode 100644
index 00000000..f0461c62
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/changePhase.jsp
@@ -0,0 +1,39 @@
+<%@ 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/>
+ <div class="alert" id="CourseCreation">
+ Projekterstellungsphase
+ </div>
+ <div class="alert" id="GroupFormation">
+ Entwurfsphase
+ </div>
+ <div class="alert" id="Execution">
+ Durchführungsphase
+ </div>
+ <div class="alert" id="DossierFeedback">
+ Feedbackphase
+ </div>
+ <div class="alert" id="Assessment">
+ Bewertungsphase
+ </div>
+ <div class="alert" id="end">
+ Ende
+ </div>
+ </div>
+</div>
+
+</body>
+</html>
--
GitLab