diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/project/ProjectDAO.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/project/ProjectDAO.java
index e2f48c8396f27658c357befdccd9ee1e18a6ba60..755953bc7473de815402ea7f0dabfbd93b0ce572 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/project/ProjectDAO.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/project/ProjectDAO.java
@@ -9,6 +9,7 @@ import javax.annotation.Resource;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
@ManagedBean
@@ -25,20 +26,23 @@ public class ProjectDAO {
public void persist(Project project) {
- connect.connect();
- String mysqlRequest =
- "INSERT INTO projects (`name`, `password`, `active`, `timecreated`, `author`, " + "`adminPassword`, `phase`) values (?,?,?,?,?,?,?)";
- connect.issueInsertOrDeleteStatement(mysqlRequest, project.getName(), project.getPassword(), project.isActive(),
- project.getTimecreated(), project.getAuthorEmail(), project.getAdminPassword(),
- project.getPhase() == null ? ProjectPhase.CourseCreation : project.getPhase());
+ if (!exists(project)) {
- connect.close();
+ connect.connect();
+ String mysqlRequest = "INSERT INTO projects (`name`, `password`, `active`, `timecreated`, `author`, " + "`adminPassword`, `phase`) values (?,?,?,?,?,?,?)";
+ connect.issueInsertOrDeleteStatement(mysqlRequest, project.getName(), project.getPassword(), project.isActive(),
+ project.getTimecreated(), project.getAuthorEmail(), project.getAdminPassword(), project.getPhase() == null ? ProjectPhase.CourseCreation : project.getPhase());
- connect.connect();
- String[] tags = project.getTags();
- for (String tag : tags) {
- connect.issueInsertOrDeleteStatement(
- "INSERT INTO tags (`projectName`, `tag`) values (?,?)", project.getName(), tag);
+ connect.close();
+
+ connect.connect();
+ String[] tags = project.getTags();
+ if (tags.length > 5) {
+ tags = Arrays.copyOfRange(tags, 0, 4);
+ }
+ for (String tag : tags) {
+ connect.issueInsertOrDeleteStatement("INSERT INTO tags (`projectName`, `tag`) values (?,?)", project.getName(), tag);
+ }
}
connect.close();
diff --git a/gemeinsamforschen/src/main/webapp/annotation/js/annotationScript.js b/gemeinsamforschen/src/main/webapp/annotation/js/annotationScript.js
index 851670a7a4583d858f34f8f9c8be1bb764353202..646224b141247231c1aaf91a96d9eb5007c3b51a 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/js/annotationScript.js
+++ b/gemeinsamforschen/src/main/webapp/annotation/js/annotationScript.js
@@ -75,7 +75,7 @@ $(document).ready(function() {
* back button
*/
$('#btnBack').click(function () {
- location.href = "../../project/project-student.jsp" ;
+ location.href = "../../project/projects-student.jsp" ;
});
/**
diff --git a/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredAnnotation.js b/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredAnnotation.js
index 31e57771ecd98c1e0e0b5196fb96f1da974f578a..03a9f0f1692c2a12e4db1c008eb7415484104636 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredAnnotation.js
+++ b/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredAnnotation.js
@@ -285,11 +285,11 @@ function saveButtonHandler() {
$.when.apply($, promises).then(function () {
// redirect user to project page after saving
- location.href = "../../project/project-student.jsp"
+ location.href = "../../project/projects-student.jsp"
});
// redirect user to project page after saving
- // location.href="project-student.jsp" + getUserEmail() + "&projectName=" + getProjectIdFromUrl();
+ // location.href="projects-student.jsp" + getUserEmail() + "&projectName=" + getProjectIdFromUrl();
}
}
diff --git a/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js b/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js
index 8bfaf657277dc54e0e384e2f558477feac0b6ec2..518beb003adcee633cd2da60557a3e2cac2e2ef8 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js
+++ b/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js
@@ -38,14 +38,14 @@ $(document).ready(function () {
// jump to previous page
//window.history.back();
- location.href = "../../project/project-student.jsp";
+ location.href = "../../project/projects-student.jsp";
}
}
// nothing to check
else {
// jump to previous page
//window.history.back();
- location.href = "../../project/project-student.jsp";
+ location.href = "../../project/projects-student.jsp";
}
});
diff --git a/gemeinsamforschen/src/main/webapp/assessment/js/assessmentCalculator.js b/gemeinsamforschen/src/main/webapp/assessment/js/assessmentCalculator.js
index db4b9c22e7cc6538da6258b95af06fae83f0a3e9..9e27df27d641f6144de4ac8a4f596a37765301d4 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?projectName="+projectName;
+ location.href="../pages/projects-student.jsp?projectName="+projectName;
},
error: function (a, b, c) {
alert('some error' + a);
diff --git a/gemeinsamforschen/src/main/webapp/assessment/js/rateContribution.js b/gemeinsamforschen/src/main/webapp/assessment/js/rateContribution.js
index 9d5865b47a7d6b3d25c9aa74c01e5a113180c1c1..7ce052f96455b40992aab65c59e7d0fb3567cdf7 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?projectName="+projectName;
+ location.href = "projects-student.jsp?projectName="+projectName;
},
error: function (a, b, c) {
diff --git a/gemeinsamforschen/src/main/webapp/course/js/specificRequirement.js b/gemeinsamforschen/src/main/webapp/course/js/specificRequirement.js
index ade5f96885510f6f37a887daefe1db081a8a9960..451aff8b7966f2473a2e826a93aed96335667577 100644
--- a/gemeinsamforschen/src/main/webapp/course/js/specificRequirement.js
+++ b/gemeinsamforschen/src/main/webapp/course/js/specificRequirement.js
@@ -1,5 +1,5 @@
$(document).ready(function(){
$('#submit').on('click', function(){
- location.href="project-docent.jsp";
+ location.href="projects-docent.jsp";
});
});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/course/js/specificSkills.js b/gemeinsamforschen/src/main/webapp/course/js/specificSkills.js
index 92fb4bbcf23f5740d50dcb6b05e54c30377202c3..692b0c0f4fe73326e5c35a18d2c2e386587be1ee 100644
--- a/gemeinsamforschen/src/main/webapp/course/js/specificSkills.js
+++ b/gemeinsamforschen/src/main/webapp/course/js/specificSkills.js
@@ -1,5 +1,5 @@
$(document).ready(function () {
$('#submit').on('click',function(){
- document.location="project-docent.jsp";
+ document.location="projects-docent.jsp";
});
});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/groupfinding/create-groups-learninggoal.jsp b/gemeinsamforschen/src/main/webapp/groupfinding/create-groups-learninggoal.jsp
index 78067e27e7a78e27164734edee2bb0abb94b9379..70b6ccfb0d29257cbe0d2a0bccb553f8bbb10f64 100644
--- a/gemeinsamforschen/src/main/webapp/groupfinding/create-groups-learninggoal.jsp
+++ b/gemeinsamforschen/src/main/webapp/groupfinding/create-groups-learninggoal.jsp
@@ -17,7 +17,7 @@
<link rel="stylesheet" href="css/Sidebar-Menu1.css">
<script src="js/config.js"></script>
- <script src="js/myGroupsInit.js"></script>
+ <script src="js/create-groups-learninggoal.js"></script>
<script src="js/Sidebar-Menu.js"></script>
diff --git a/gemeinsamforschen/src/main/webapp/groupfinding/create-groups.jsp b/gemeinsamforschen/src/main/webapp/groupfinding/create-groups.jsp
deleted file mode 100644
index 0374bfca1a84aebbd10fb5fef3535bde833620df..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/groupfinding/create-groups.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" %>
-<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="omniDependencies" %>
-
-<html>
-<head>
- <omniDependencies:omniDependencies hierarchy="1"/>
- <script src="js/changePhase.js"></script>
-</head>
-
-<body>
-<div id="wrapper">
- <menu:menu hierarchy="1"/>
- <div class="page-content-wrapper">
- <headLine:headLine/>
- student1<br>
- student2<br>
- <br>
- in Gruppe 1 2 3
- </div>
-</div>
-</body>
-</html>
diff --git a/gemeinsamforschen/src/main/webapp/groupfinding/js/myGroupsInit.js b/gemeinsamforschen/src/main/webapp/groupfinding/js/create-groups-learninggoal.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/groupfinding/js/myGroupsInit.js
rename to gemeinsamforschen/src/main/webapp/groupfinding/js/create-groups-learninggoal.js
diff --git a/gemeinsamforschen/src/main/webapp/project/js/create-project.js b/gemeinsamforschen/src/main/webapp/project/js/create-project.js
index edb9e67075f4a7c4b19e6b732f9ac73a663106f3..7983afa206480a8673263e3368e8fed9729412e6 100644
--- a/gemeinsamforschen/src/main/webapp/project/js/create-project.js
+++ b/gemeinsamforschen/src/main/webapp/project/js/create-project.js
@@ -149,7 +149,7 @@ function createProjectinCompbase() {
success: function (response) {
console.log(response);
// it actually worked, too
- document.location.href = "project-docent.jsp?projectName="+projectName;
+ document.location.href = "projects-docent.jsp?projectName="+projectName;
},
error: function (a, b, c) {
console.log(a);
diff --git a/gemeinsamforschen/src/main/webapp/project/js/edit-group-settings.js b/gemeinsamforschen/src/main/webapp/project/js/edit-group-settings.js
index 79bdc07de220ac70a74fc4448c3b34085d859e08..bda9a6939cfffebf68c637accf1a0ca1fae4ee0b 100644
--- a/gemeinsamforschen/src/main/webapp/project/js/edit-group-settings.js
+++ b/gemeinsamforschen/src/main/webapp/project/js/edit-group-settings.js
@@ -29,7 +29,7 @@ $(document).ready(function () {
document.location.href = "../groupfinding/create-groups-preferences.jsp"+"&projectName="+projectToken;
}
else {
- document.location.href = "../groupfinding/create-groups-learninggoal.jsp"+"&projectName="+projectToken;
+ document.location.href = "../groupfinding/create-groups-learninggoal.js.jsp"+"&projectName="+projectToken;
}
return true;
},
diff --git a/gemeinsamforschen/src/main/webapp/project/js/overview-docent.js b/gemeinsamforschen/src/main/webapp/project/js/overview-docent.js
index 6e37e739daec95675606148e072d48d7ded9b4b8..a297d463caaa3120ca691241f74d2dd4828b82a4 100644
--- a/gemeinsamforschen/src/main/webapp/project/js/overview-docent.js
+++ b/gemeinsamforschen/src/main/webapp/project/js/overview-docent.js
@@ -1,12 +1,53 @@
$(document).ready(function(){
$('#project1Link').on('click', function(){
- location.href = "project-docent.jsp" + getUserEmail() + '&projectName=' + 'gemeinsamForschen';
+ location.href = "projects-docent.jsp" + getUserEmail() + '&projectName=' + 'gemeinsamForschen';
});
$('#project2Link').on('click', function(){
- location.href = "project-docent.jsp" + getUserEmail() + '&projectName=' + 'Kaleo';
+ location.href = "projects-docent.jsp" + getUserEmail() + '&projectName=' + 'Kaleo';
});
$('#createProject').on('click', function(){
location.href="create-project.jsp";
});
-});
\ No newline at end of file
+
+
+});
+
+function getProjectOverview(user) {
+ var url = compbaseUrl + "/api2/user/" + user + "/projects";
+ $.ajax({
+ url: url,
+ user: user,
+ type: 'GET',
+ contentType: "application/json",
+ dataType: "json",
+ success: function (data) {
+ var projects = data.data;
+ //printProjects(projects, 0);
+ //getProjectsOfAuthor(user, projects, printProjects);
+ },
+ error: function (a, b, c) {
+ console.log(a);
+ }
+ });
+}
+
+
+function getGroups(projectName) {
+
+ var url = compbaseUrl + "/api2/groups/" + projectName; //this API is used, since fleckenroller has security
+ // issues with
+ // CORS and stuff
+ $.ajax({
+ url: url,
+ type: 'GET',
+ contentType: "application/json",
+ dataType: "json",
+ success: function (data) {
+
+ },
+ error: function (a, b, c) {
+
+ }
+ });
+}
diff --git a/gemeinsamforschen/src/main/webapp/project/js/overview-student.js b/gemeinsamforschen/src/main/webapp/project/js/overview-student.js
index a2e234ee4be8419f5c2eca3f855c6783ed1cc70c..1f5e6551487097c0d0838ffdf02731e0502fbe22 100644
--- a/gemeinsamforschen/src/main/webapp/project/js/overview-student.js
+++ b/gemeinsamforschen/src/main/webapp/project/js/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="+response[projectName];
+ location.href="projects-student.jsp?projectName="+response[projectName];
});
updateStatus(response[projectName]);
diff --git a/gemeinsamforschen/src/main/webapp/project/js/overview.js b/gemeinsamforschen/src/main/webapp/project/js/overview.js
deleted file mode 100644
index 863218cbcaf71f4fe40552d35b70ae3bb041dc99..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/project/js/overview.js
+++ /dev/null
@@ -1,175 +0,0 @@
-/**
- * Created by fides-WHK on 02.03.2018.
- */
-
-$(document).ready(function () {
- getProjectOverview(document.getElementById('user').innerHTML);
- //getMembers($('#projectDropdown').innerHTML,$('#user').innerHTML);
-
-});
-
-
-function printProjects(projects, offset) {
- var table = document.getElementById("projectTable");
- var i = 0;
- if (projects != null) {
- for (i = 0; i < projects.length; i++) {
- var project = projects[i];
- var content = document.createElement("TR");
- content.role = "button";
- content.style = "cursor:pointer;";
- content.id = project;
-
- //'<a class="btn btn-default"><em class="fa fa-pencil" ></em></a>' +
- //'<button id="deleteButton' +i+ '" class="btn btn-danger fa fa-trash deleteButton"></button>' +
- content.innerHTML = '<td align="center">' +
- '<a href="delete-project.jsp class="btn btn-danger fa fa-trash"></a>' +
- '</td>' +
- '<td class="hidden-xs" href="#Div_Promo_Carousel" data-slide="next">' + projects[i] + '</td>' +
- '<td id="projectTags' + (i + offset) + '" href="#Div_Promo_Carousel" data-slide="next"></td>';
- table.appendChild(content);
- getTags(project, i + offset);
- $('#' + project).click(function () {
- getGroups(this.id);
- });
- }
- }
-
-
- //$('#deleteModal').modal('show');
-
-}
-
-function getProjectOverview(user) {
- var url = compbaseUrl + "/api2/user/" + user + "/projects";
- $.ajax({
- url: url,
- user: user,
- type: 'GET',
- contentType: "application/json",
- dataType: "json",
- success: function (data) {
- var projects = data.data;
- printProjects(projects, 0);
- getProjectsOfAuthor(user, projects, printProjects);
- },
- error: function (a, b, c) {
- console.log(a);
- }
- });
-}
-
-function getTags(projectName, number) {
- var url = "../database/printTags.php?project=" + projectName;
- $.ajax({
- url: url,
- Accept: "text/plain; charset=utf-8",
- contentType: "text/plain",
- success: function (response) {
- response = JSON.parse(response);
- var tagString = "";
- var i = 0;
- var table = document.getElementById("projectTags" + number);
- for (i = 0; i < response.length; i++) {
- tagString += "<label class=\"tagLabel\">" + response[i].tag + "</label>";
- ;
- //tagString += response[i].tag + " ";
- }
-
- table.innerHTML = tagString;
- //table.innerHTML = tagHtml;
- },
- error: function (a, b, c) {
- console.log(a);
- }
- });
-}
-
-
-function getGroups(projectName) {
- var pathName = document.getElementsByName("pathProject");
- pathName[0].innerHTML = projectName;
- pathName[1].innerHTML = projectName;
- var url = compbaseUrl + "/api2/groups/" + projectName; //this API is used, since fleckenroller has security
- // issues with
- // CORS and stuff
- $.ajax({
- url: url,
- type: 'GET',
- contentType: "application/json",
- dataType: "json",
- success: function (data) {
- var table = document.getElementById("groupTable");
- table.innerHTML = '';
- for (var i = 0; i < data.groups.length; i++) {
- var content = document.createElement("TR");
- content.role = "button";
- content.style = "cursor:pointer;";
- content.id = 'Gruppe' + data.groups[i].id;
- var groupMembers = '<td align="center">' +
- '<a class="btn btn-default"><em class="fa fa-pencil"></em></a>' +
- '<a class="btn btn-danger"><em class="fa fa-trash"></em></a>' +
- '</td>' +
- '<td class="hidden-xs" href="#Div_Promo_Carousel" data-slide="next">Gruppe' + data.groups[i].id + '</td>' +
- '<td id="memberOf' + content.id + '" href="#Div_Promo_Carousel" data-slide="next">';
- for (var j = 0; j < data.groups[i].users.length; j++) {
- groupMembers += data.groups[i].users[j] + " ";
- }
- groupMembers += '</td>';
- content.innerHTML = groupMembers;
- table.appendChild(content);
- $('#Gruppe' + data.groups[i].id).click(function () {
- var memberString = $('#memberOf' + this.id).html();
- getDetailsOfMembers(this.id, memberString);
- });
- }
- },
- error: function (a, b, c) {
- console.log(a);
- var table = document.getElementById("groupTable");
- table.innerHTML = '';
- var content = document.createElement("TR");
- content.innerHTML = '<td align="center">' +
- '</td>' +
- '<td class="hidden-xs">Es liegen noch keine Gruppen vor</td>' +
- '<td></td>';
- table.appendChild(content);
- }
- });
-}
-
-function getDetailsOfMembers(group, studentString) {
- var pathName = document.getElementsByName("pathGruppe");
- pathName[0].innerHTML = group;
- var students = studentString.split(" ");
- var innerurl = "../database/getAdresses.php?student1=" + students[0] + "&student2=" + students[1] + "&student3=" + students[2] + "&student4=" + students[3] + "&student5=" + students[4];
- $.ajax({
- student1: "" + students[0],
- student2: "" + students[1],
- student3: "" + students[2],
- student4: "" + students[3],
- student5: "" + students[4],
- url: innerurl,
- type: 'GET',
- contentType: "application/json",
- dataType: "json",
- success: function (response) {
- var table = document.getElementById("studentTable");
- table.innerHTML = '';
- var k;
- for (k = 0; k < response.length; k++) {
- var content = document.createElement("TR");
- content.innerHTML = '<td align="center">' +
- '<a class="btn btn-default"><em class="fa fa-pencil"></em></a>' +
- '<a class="btn btn-danger"><em class="fa fa-trash"></em></a>' +
- '</td>' +
- '<td class="hidden-xs">' + response[k].name + '</td>' +
- '<td> <a href="mailto:' + response[k].email + '">' + response[k].email + '</a></td>';
- table.appendChild(content);
- }
- },
- error: function (a, b, c) {
- console.log(a);
- }
- });
-}
diff --git a/gemeinsamforschen/src/main/webapp/project/js/project-student.js b/gemeinsamforschen/src/main/webapp/project/js/project-student.js
index 3eb7b88c594aec030a124e278d24f405d8683c36..c4371995609f4107f354509372e168c707019cc1 100644
--- a/gemeinsamforschen/src/main/webapp/project/js/project-student.js
+++ b/gemeinsamforschen/src/main/webapp/project/js/project-student.js
@@ -41,7 +41,7 @@ $(document).ready(function () {
});
$('.viewprojectstudent').click(function () {
- location.href = "project-student.jsp" + getUserEmail();
+ location.href = "projects-student.jsp" + getUserEmail();
})
});
diff --git a/gemeinsamforschen/src/main/webapp/project/js/showProjects.js b/gemeinsamforschen/src/main/webapp/project/js/showProjects.js
deleted file mode 100644
index e2e787d4a7790d6567a374491a08e62ae2570e68..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/project/js/showProjects.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Created by fides-WHK on 09.01.2018.
- */
-$(document).ready(function () {
- $("#projectWrongPassword").hide();
- $("#projectIsMissing").hide();
-
- $("#projectName").keypress(function (e) {
- if (e.which == 13) {
- document.getElementById("projectPassword").focus();
- }
- });
- $("#projectPassword").keypress(function (e) {
- if (e.which == 13) {
- seeProject($('#projectName').val());
- }
- });
- $("#loginProject").on('click', function () {
- seeProject($('#projectName').val());
- });
-});
-
-function seeProject(projectName) {
- var url = "../database/getProjects.php?project=" + projectName + "&password=" + document.getElementById('projectPassword').value;
- if (projectName === "") {
- return false;
- } else {
- $.ajax({
- url: url,
- projectName: projectName,
- Accept: "text/plain; charset=utf-8",
- contentType: "text/plain",
- success: function (response) {
- if (response === "project missing") {
- $("#projectIsMissing").show();
- } else {
- if (response !== "wrong password") { //if response !== project missing and not wrong password, its the projectName
- location.href="preferences.php"+"&projectName="+response;
- } else {
- $("#projectIsMissing").hide();
- $('#projectWrongPassword').show();
- }
- }
- },
- error: function (a, b, c) {
- console.log(a);
- }
- });
- }
-}
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/project/overview-docent.jsp b/gemeinsamforschen/src/main/webapp/project/overview-docent.jsp
index 721cb2fa065c2830d13b1c323914ebe5979eb3fe..76da5a02692febbac69685234535b990f386c4d0 100644
--- a/gemeinsamforschen/src/main/webapp/project/overview-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/project/overview-docent.jsp
@@ -15,74 +15,7 @@
<div id="wrapper">
<menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
-
<headLine:headLine/>
- <table id="projects"> <!-- getElementById('projects').append um neue Projekte anzufügen -->
- <tr class="pageChanger">
- <td>
- <a id="project1Link">
- <h1>gemeinsamForschen</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 class="pageChanger">
- <td>
- <a id="project2Link">
- <h1>Kaleo</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" id="createProject" style="margin-left:250px;">Projekt
erstellen</button>
diff --git a/gemeinsamforschen/src/main/webapp/project/project-docent.jsp b/gemeinsamforschen/src/main/webapp/project/project-docent.jsp
deleted file mode 100644
index f3da4fcf1875e4d5a535064414e59eb626971f5f..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/project/project-docent.jsp
+++ /dev/null
@@ -1,98 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@ taglib prefix="communication" uri="/communication/chatWindow.tld" %>
-<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="omniDependencies" %>
-<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="footer" %>
-
-
-<!DOCTYPE html>
-<html>
-
-<head>
- <omniDependencies:omniDependencies hierarchy="1"/>
-</head>
-
-<body>
-<div id="wrapper">
- <menu:menu hierarchy="1"/>
- <div class="page-content-wrapper">
- <headLine:headLine/>
- <button class="btn btn-default" type="button">Exportiere Zwischenstand
- </button>
- <button class="btn btn-default" type="button">Quizfrage erstellen</button>
- <div>
- <div class="container">
- <div class="row">
- <div class="col-md-6">
- <div class="table-responsive" style="width:294px;">
- <table class="table">
- <thead>
- <tr>
- <th>Gruppe1</th>
- <th>Beiträge</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>student1</td>
- <td>Interfaces</td>
- </tr>
- <tr>
- <td>student2</td>
- <td>Design</td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="table-responsive" style="width:294px;">
- <table class="table">
- <thead>
- <tr>
- <th>Gruppe2</th>
- <th>Beiträge</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>student3</td>
- <td>Interfaces</td>
- </tr>
- <tr>
- <td>student4</td>
- <td>Design</td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="table-responsive" style="width:294px;">
- <table class="table">
- <thead>
- <tr>
- <th>Gruppe3</th>
- <th>Beiträge</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>student5</td>
- <td>Interfaces</td>
- </tr>
- <tr>
- <td>student6</td>
- <td>Design</td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <footer:footer/>
-</div>
-<communication:chatWindow orientation="right"/>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/project/project-student.jsp b/gemeinsamforschen/src/main/webapp/project/project-student.jsp
deleted file mode 100644
index 3696a0e43a7ac02d665d2cfc21bf820ea2578c3c..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/project/project-student.jsp
+++ /dev/null
@@ -1,108 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%--suppress XmlDuplicatedId --%>
-<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="omniDependencies" %>
-
-
-<!DOCTYPE html>
-<html>
-
-<head>
- <omniDependencies:omniDependencies hierarchy="1"/>
- <script src="js/project-student.js"></script>
-</head>
-
-<body>
-<div id="wrapper">
- <menu:menu hierarchy="1"/>
-
- <div class="page-content-wrapper">
- <headLine:headLine/>
- <div>
- <table>
- <tr>
- <td id="yourContent">
- <h1>Feedbackable Students</h1>
- <!-- here will be all the content -->
- <table id="myGroupMembers">
- <tr>
-
- <td width="100px" valign="top">
- <h3>student1</h3>
- <img src="../libs/img/1.jpg">
- <a href="#">student1@uni.de</a>
- <hr>
- <ul>
-
- <li>
- Projektübersicht hochgeladen
- <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>
- Blumen ins Hausaufgabenheft geklebt
- <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>
-
- <td width="100px" valign="top">
- <h3>student2</h3>
- <img src="../libs/img/2.jpg">
- <a href="#">student2@uni.de</a>
- <hr>
- <ul>
- <li>
- Blumen an Vegetarier verfüttert
- <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
- <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
- <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>
-
- <td width="100px" valign="top">
- <h3>student3</h3>
- <img src="../libs/img/3.jpg">
- <a href="#">student3@uni.de</a>
- <hr>
- <ul id="submissionUpload">
- </ul>
- </td>
-
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </div>
- </div>
- <footer:footer/>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/create-evaluation.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-evaluation.jsp
index e19d4be28894715e99e986f7f5ae2d97985498b2..53e0df4275ed46dff078acf1b63f747abdc45cfe 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-evaluation.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-evaluation.jsp
@@ -37,7 +37,7 @@
</textarea>
</div>
<div class="ResearchReportButtons">
- <button class="researchReportButtons"><a href="../project/project-student.jsp">Speichern &
+ <button class="researchReportButtons"><a href="../project/projects-student.jsp">Speichern &
weiter</a></button>
<button class="researchReportButtons"><a href="create-process-description.jsp"> Zurück </a>
</button>
diff --git a/gemeinsamforschen/src/main/webapp/taglibs/js/utility.js b/gemeinsamforschen/src/main/webapp/taglibs/js/utility.js
index 5b34c6610838e008da2e457598d6f7648aa9ef80..48dab36e099a27df3b8ed53d89f36da653cd8a9f 100644
--- a/gemeinsamforschen/src/main/webapp/taglibs/js/utility.js
+++ b/gemeinsamforschen/src/main/webapp/taglibs/js/utility.js
@@ -49,7 +49,7 @@ function checkAssessementPhase() {
break;
}
case "done": {
- changeLocationTo("project-student.jsp");
+ changeLocationTo("projects-student.jsp");
break;
}
}