Skip to content
Snippets Groups Projects
Commit 6bd453b9 authored by Julian Dehne's avatar Julian Dehne
Browse files

- started working on group finding prototyp (basic group management prototyp... 

- started working on group finding prototyp (basic group management prototyp for development - not advanced groupfinding i.e. mirjams project)
parent 45f4c5f0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 323 additions and 41 deletions
gemeinsamforschen/src/main/webapp/assets/js/showProjects.js
+ 1
− 1
View file @ 6bd453b9
......@@ -35,7 +35,7 @@ function seeProject(projectName) {
$("#projectIsMissing").show();
} else {
if (response !== "wrong password") { //if response !== project missing and not wrong password, its the projectToken
location.href="preferences.php?token="+getUserTokenFromUrl()+"&projectToken="+response;
location.href="enter-preferences.jsp?token="+getUserTokenFromUrl()+"&projectToken="+response;
} else {
$("#projectIsMissing").hide();
$('#projectWrongPassword').show();
......
gemeinsamforschen/src/main/webapp/core/management/create-project.jsp
+ 7
− 19
View file @ 6bd453b9
......@@ -7,27 +7,17 @@
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<!DOCTYPE html>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>dozent-view-alternativ slider</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">
<link rel="stylesheet" href="../../assets/css/Navigation-with-Button1.css">
<link rel="stylesheet" href="../../assets/css/Sidebar-Menu.css">
<link rel="stylesheet" href="../../assets/css/Sidebar-Menu1.css">
<link rel="stylesheet" href="../../assets/css/styles.css">
<link rel="stylesheet" type="text/css" href="../../assets/jQuery-Tags-Input-master/src/jquery.tagsinput.css"/>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<script type="text/javascript" src="../../assets/jQuery-Tags-Input-master/src/jquery.tagsinput.js"></script>
<script src="../assets/js/config.js"></script>
<script src="../assets/js/newProject.js"></script>
<script src="../../assets/js/utility.js"></script>
<script src="../../assets/bootstrap/js/bootstrap.min.js"></script>
<script src="../../assets/js/Sidebar-Menu.js"></script>
<title>Projekterstellung</title>
<script src="js/config.js"></script>
<script src="js/newProject.js"></script>
</head>
<body>
......@@ -41,9 +31,7 @@
</div>
<div id="wrapper" style="margin:0px;">
<?php
include_once 'menu.php'
?>
<menu:menu/>
<div class="page-content-wrapper">
<div class="container-fluid">
<div class="row">
......
gemeinsamforschen/src/main/webapp/core/management/delete-project.jsp 0 → 100644
+ 58
− 0
View file @ 6bd453b9
<%--
Created by IntelliJ IDEA.
User: dehne
Date: 12.09.2018
Time: 12:06
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<!DOCTYPE html>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Gruppenmatcher</title>
<script src="js/config.js"></script>
<script src="js/deleteProject.js"></script>
</head>
<body>
<div class="loader-inactive" id="loader"></div>
<div id="wrapper" class="wrapper" style="margin:0px;">
<menu:menu></menu:menu>
<div class="page-content-wrapper">
<div class="container-fluid"><a class="btn btn-link" role="button" href="#menu-toggle" id="menu-toggle"></a>
<div class="row">
<div class="col-md-12">
<h3>Projekt löschen! </h3>
<div class="page-header"></div>
</div>
</div>
</div>
</div>
<fieldset>
<legend style="margin-left:13px;">Projektnamen</legend>
<input class="form-control" type="text" id="projectName" name="Project" required=""
placeholder="Projekt1" autofocus=""
style="margin:0px;max-width:417px;margin-left:14px;padding-top:10px;margin-top:2px;margin-bottom:13px;">
<div class="alert alert-warning" role="alert" id="projectIsMissing">
Dieser Projektname existiert nicht oder das Passwort ist falsch.
</div>
</fieldset>
<fieldset>
<legend style="margin-left:13px;">Passwort zum löschen</legend>
<input class="form-control" type="password" id="projectPassword" name="Password" required=""
placeholder="******"
style="margin:0px;max-width:417px;margin-left:14px;padding-top:10px;margin-top:2px;margin-bottom:13px;">
<div class="alert alert-warning" role="alert" id="projectWrongPassword">
Falsches Passwort.
</div>
</fieldset>
<button id="deleteProject" class="btn btn-danger">löschen</button>
</div>
</body>
</html>
\ No newline at end of file
gemeinsamforschen/src/main/webapp/core/management/enter-preferences.jsp 0 → 100644
+ 93
− 0
View file @ 6bd453b9
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Gruppenmatcher</title>
<script src="js/config.js"></script>
<script src="js/createPreferences.js"></script>
</head>
<body>
<p id="user" hidden><?php echo $userName; ?></p>
<p id="projectName" hidden><?php echo $projectName; ?></p>
<div class="loader-inactive" id="loader">
<div class="sk-cube1 sk-cube"></div>
<div class="sk-cube2 sk-cube"></div>
<div class="sk-cube4 sk-cube"></div>
<div class="sk-cube3 sk-cube"></div>
</div>
<div id="wrapper" class="wrapper" style="margin:0px;">
<?php
include_once 'menu.php'
?>
<div class="page-content-wrapper">
<div class="container-fluid"><a class="btn btn-link" role="button" href="#menu-toggle" id="menu-toggle"></a>
<div class="row">
<div class="col-md-12">
<h3>Geben Sie hier ihre Präferenzen für das Projekt <?php echo $projectName; ?> ein!</h3>
<div class="page-header"></div>
</div>
</div>
</div>
</div>
<fieldset>
<legend style="margin-left:13px;">Lernziele</legend>
<div id="competencies">
<input class="form-control" type="text" id="competencies0" name="competencies" required=""
placeholder="Ich möchte folgendes lernen:"
style="margin:0px;max-width:417px;margin-left:14px;padding-top:10px;margin-top:2px;margin-bottom:13px;">
</div>
<button
class="btn btn-default" type="button"
style="margin-left:443px;margin-top:-88px;height:36px;width:33px;"
id="addCompetenceButton">+
</button>
<button
class="btn btn-default" type="button"
style="margin-left:10px;margin-top:-88px;height:36px;width:33px;"
id="subtractCompetenceButton">-
</button>
</fieldset>
<fieldset style="margin-bottom:-3px;">
<legend style="margin-left:13px;">Forschungsfrage</legend>
<div id="researchQuestion">
<input class="form-control" id="researchQuestion0" type="text" name="researchQuestion" required=""
placeholder="Meine Forschungsfrage(n): "
style="margin:0px;max-width:417px;margin-left:14px;padding-top:10px;margin-top:2px;margin-bottom:13px;">
</div>
<button class="btn btn-default" type="button"
style="margin-left:443px;margin-top:-88px;height:36px;width:33px;"
id="addResearchQuestionButton">+
</button>
<button
class="btn btn-default" type="button"
style="margin-left:10px;margin-top:-88px;height:36px;width:33px;"
id="subtractCResearchQuestionButton">-
</button>
</fieldset>
<fieldset>
<legend style="margin-left:13px;">Tags</legend>
<p class="alert alert-warning" style="width:520px;">Wähle 2 der hier angegebenen Tags aus, die am ehesten zu deiner Forschungsfrage passen.</p>
<div id="tags">
</div>
</fieldset>
<button class="btn btn-primary" id="studentFormSubmit" style="width:90px;margin-left:169px;margin-top:13px;">
eintragen
</button>
<div class="alert alert-warning" style="width:520px" role="alert">
Das Verarbeiten der Lernziele und das Gruppenmatching kann einen Moment dauern!
</div>
</div>
</body>
gemeinsamforschen/src/main/webapp/core/management/groups.jsp 0 → 100644
+ 91
− 0
View file @ 6bd453b9
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>student-form-design</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">
<link rel="stylesheet" href="../assets/css/Navigation-with-Button1.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu1.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src="../assets/js/config.js"></script>
<script src="../assets/js/myGroupsInit.js"></script>
<script src="../assets/js/getProjects.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
<script src="../assets/js/Sidebar-Menu.js"></script>
</head>
<body>
<p id="user" hidden><?php echo $userName; ?></p>
<div id="wrapper" style="margin:0px;">
<?php
include_once 'menu.php'
?>
<div class="page-content-wrapper">
<div class="container-fluid"><a class="btn btn-link" role="button" href="#menu-toggle" id="menu-toggle"></a>
<div class="row">
<div class="col-md-12">
<div class="page-header"></div>
</div>
</div>
</div>
</div>
<div>
<div class="container" style="margin-left:0px;">
<div class="row">
<div class="col-md-offset-3 col-sm-8 col-xs-1">
<h3>Projekt</h3>
<div class="dropdown">
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown"
id="projectDropdown">Projekt auswählen
<span class="caret"></span></button>
<ul class="dropdown-menu" id="dropdownOptions">
</ul>
</div>
</div>
</div>
<div id="tablesHolder"></div>
<!-- <table class="table table-striped table-bordered table-list" style="width: 40%;margin-top: 10px;">
<thead id="tableHead">
<tr>
<th class="hidden-xs">Student</th>
<th>E-Mail</th>
</tr>
</thead>
<tbody>
<tr id="student2">
</tr>
<tr id="student3">
</tr>
<tr id="student4">
</tr>
<tr id="student5">
</tr>
</tbody>
</table>-->
<!--<p>Hier können sie ihre Gruppen zu allen Projekten einsehen. Klicken sie dafür auf das Dropdownmenü
um ihren Kurs auszuwählen.</p>-->
</div>
</div>
</div>
</body>
</html>
\ No newline at end of file
gemeinsamforschen/src/main/webapp/core/management/join-project.jsp 0 → 100644
+ 66
− 0
View file @ 6bd453b9
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Gruppenmatcher</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">
<link rel="stylesheet" href="../assets/css/Navigation-with-Button1.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu1.css">
<link rel="stylesheet" href="../assets/css/styles.css">
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<script src="../assets/js/config.js"></script>
<script src="../assets/js/utility.js"></script>
<script src="../assets/js/showProjects.js"></script>
<script src="../assets/js/GETfile.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
<script src="../assets/js/Sidebar-Menu.js"></script>
</head>
<body>
<p id="user" hidden><?php echo $userName; ?></p>
<div class="loader-inactive" id="loader"></div>
<div id="wrapper" class="wrapper" style="margin:0px;">
<?php
include_once 'menu.php'
?>
<div class="page-content-wrapper">
<div class="container-fluid"><a class="btn btn-link" role="button" href="#menu-toggle" id="menu-toggle"></a>
<div class="row">
<div class="col-md-12">
<h3>Tragen sie sich in ein neues Projekt ein. </h3>
<div class="page-header"></div>
</div>
</div>
</div>
</div>
<fieldset>
<legend style="margin-left:13px;">Projektnamen</legend>
<input class="form-control" type="text" id="projectName" name="Project" required=""
placeholder="Projekt1" autofocus=""
style="margin:0px;max-width:417px;margin-left:14px;padding-top:10px;margin-top:2px;margin-bottom:13px;">
<div class="alert alert-warning" role="alert" id="projectIsMissing">
Dieser Projektname existiert nicht.
</div>
</fieldset>
<fieldset>
<legend style="margin-left:13px;">Passwort</legend>
<input class="form-control" type="password" id="projectPassword" name="Password" required=""
placeholder="******"
style="margin:0px;max-width:417px;margin-left:14px;padding-top:10px;margin-top:2px;margin-bottom:13px;">
<div class="alert alert-warning" role="alert" id="projectWrongPassword">
Falsches Passwort.
</div>
</fieldset>
<button id="seeProject" class="btn btn-primary">Einsehen</button>
</div>
</body>
</html>
\ No newline at end of file
gemeinsamforschen/src/main/webapp/core/management/js/Sidebar-Menu.js deleted 100644 → 0
+ 0
− 4
View file @ 45f4c5f0
$("#menu-toggle").click(function(e) {
e.preventDefault();
$("#wrapper").toggleClass("toggled");
});
\ No newline at end of file
gemeinsamforschen/src/main/webapp/core/management/js/deleteProject.js
+ 1
− 1
View file @ 6bd453b9
......@@ -12,7 +12,7 @@ $(document).ready(function () {
function deleteProject(projectName) {
var token = getUserTokenFromUrl();
var url = "../database/deleteProject.php?project=" + projectName + "&password=" + document.getElementById('projectPassword').value.trim() + "&token=" + token;
var url = "../database/delete-project.jsp?project=" + projectName + "&password=" + document.getElementById('projectPassword').value.trim() + "&token=" + token;
if (projectName === "") {
return false;
} else {
......
gemeinsamforschen/src/main/webapp/core/management/js/newProject.js
+ 2
− 2
View file @ 6bd453b9
......@@ -113,7 +113,7 @@ function createNewProject(allTheTags, activ) {
$.when(addProjectNeo4j, addProjectToLocalDB(allTheTags, projectName, password, activ, adminPassword)).done(function () {
document.getElementById('loader').className = "loader-inactive";
document.getElementById('wrapper').className = "wrapper";
if ($('#Teilnehmer').prop("checked")) { //if author wants to join the course, he needs to be redirected to preferences.php
if ($('#Teilnehmer').prop("checked")) { //if author wants to join the course, he needs to be redirected to enter-preferences.jsp
var url = "../database/getProjects.php?project=" + projectName + "&password=" + document.getElementById('passwordProject').value;
$.ajax({
url: url,
......@@ -121,7 +121,7 @@ function createNewProject(allTheTags, activ) {
Accept: "text/plain; charset=utf-8",
contentType: "text/plain",
success: function (response) {
location.href = "preferences.php?token=" + getUserTokenFromUrl() + "&projectToken=" + response;
location.href = "enter-preferences.jsp?token=" + getUserTokenFromUrl() + "&projectToken=" + response;
},
error: function (a, b, c) {
console.log(a);
......
gemeinsamforschen/src/main/webapp/core/management/js/overview.js
+ 1
− 1
View file @ 6bd453b9
......@@ -23,7 +23,7 @@ function printProjects(projects, offset) {
//'<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="deleteProject.php?token='+getUserTokenFromUrl()+'" class="btn btn-danger fa fa-trash"></a>' +
'<a href="delete-project.jsp?token='+getUserTokenFromUrl()+'" 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>';
......
gemeinsamforschen/src/main/webapp/core/management/js/showProjects.js
+ 1
− 1
View file @ 6bd453b9
......@@ -35,7 +35,7 @@ function seeProject(projectName) {
$("#projectIsMissing").show();
} else {
if (response !== "wrong password") { //if response !== project missing and not wrong password, its the projectToken
location.href="preferences.php?token="+getUserTokenFromUrl()+"&projectToken="+response;
location.href="enter-preferences.jsp?token="+getUserTokenFromUrl()+"&projectToken="+response;
} else {
$("#projectIsMissing").hide();
$('#projectWrongPassword').show();
......
gemeinsamforschen/src/main/webapp/core/management/js/utility.js deleted 100644 → 0
+ 0
− 10
View file @ 45f4c5f0
function getUserTokenFromUrl() {
var parts = window.location.search.substr(1).split("&");
var $_GET = {};
for (var i = 0; i < parts.length; i++) {
var temp = parts[i].split("=");
$_GET[decodeURIComponent(temp[0])] = decodeURIComponent(temp[1]);
}
return $_GET['token'];
}
gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
+ 2
− 2
View file @ 6bd453b9
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!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