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

- feat: continued porting features from the existing group finding tool.

parent 0551dee3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 161 additions and 137 deletions
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/Management.java
+ 2
− 0
View file @ 4830d616
......@@ -134,5 +134,7 @@ public interface Management {
String getProjectToken(String projectName, String password);
Project getProjectByToken(String projectToken);
List<String> getProjects(String userToken);
}
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java
+ 24
− 0
View file @ 4830d616
......@@ -384,6 +384,30 @@ public class ManagementImpl implements Management {
}
}
@Override
public List<String> getProjects(String authorToken) {
if (authorToken == null) {
return null;
}
MysqlConnect connect = new MysqlConnect();
connect.connect();
String mysqlRequest =
"SELECT p.id FROM users u " +
" JOIN projects p ON u.email = p.author" +
" WHERE u.token = ?";
//49c6eeda-62d2-465e-8832-dc2db27e760c
List<String> result = new ArrayList<>();
VereinfachtesResultSet vereinfachtesResultSet = connect.issueSelectStatement(mysqlRequest, authorToken);
while (vereinfachtesResultSet.next()) {
String project = vereinfachtesResultSet.getString("id");
result.add(project);
}
connect.close();
return result;
}
public String saveProfilePicture(FileInputStream image, String studentId) {
MysqlConnect connect = new MysqlConnect();
connect.connect();
......
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java
+ 1
− 1
View file @ 4830d616
......@@ -85,7 +85,7 @@ public class Menu extends SimpleTagSupport {
" <li><a href=\""+OmniDependencies.hierarchyToString(hierarchyLevel)+"management/change-phase.jsp?token="+token+"&projectId="+projectId+"\">Projektphase ändern</a></li>\n";
}else {
menuString += "<li><a href=\""+OmniDependencies.hierarchyToString(hierarchyLevel)+"assessment/quiz-docent.jsp?token="+token+"&projectId="+projectId+"\">Quizfrage</a></li>\n" +
" <li><a href=\""+OmniDependencies.hierarchyToString(hierarchyLevel)+"groupfinding/create-groups.jsp?token="+token+"&projectId="+projectId+"\">Gruppen erstellen</a></li>\n" +
" <li><a href=\""+OmniDependencies.hierarchyToString(hierarchyLevel)+"groupfinding/create-create-groups-learninggoal.jsp?token="+token+"&projectId="+projectId+"\">Gruppen erstellen</a></li>\n" +
" <li><a href=\""+OmniDependencies.hierarchyToString(hierarchyLevel)+"management/change-phase.jsp?token="+token+"&projectId="+projectId+"\">Projektphase ändern</a></li>\n";
}
}
......
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/ProjectView.java
+ 12
− 0
View file @ 4830d616
package unipotsdam.gf.core.management.project;
import jdk.nashorn.internal.objects.annotations.Getter;
import unipotsdam.gf.core.management.Management;
import unipotsdam.gf.core.management.ManagementImpl;
import unipotsdam.gf.core.management.user.User;
......@@ -51,5 +52,16 @@ public class ProjectView {
return token;
}
@GET
@Consumes(MediaType.TEXT_PLAIN)
@Produces(MediaType.APPLICATION_JSON)
@Path("/all/author/{userToken}")
public java.util.List<String> getProjects(
@PathParam("userToken") String authorToken) {
java.util.List<String> projects = iManagement.getProjects(authorToken);
return projects;
}
}
gemeinsamforschen/src/main/webapp/groupfinding/create-groups-learninggoal.jsp
+ 83
− 10
View file @ 4830d616
<%--
Created by IntelliJ IDEA.
User: dehne
Date: 18.09.2018
Time: 13:36
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
<head>
<title>Title</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>student-form-design</title>
<omniDependencies:omniDependencies hierarchy="1"/>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Ubuntu:400,700">
<link rel="stylesheet" href="css/Login-Form-Clean.css">
<link rel="stylesheet" href="css/Navigation-with-Button1.css">
<link rel="stylesheet" href="css/Sidebar-Menu.css">
<link rel="stylesheet" href="css/Sidebar-Menu1.css">
<script src="../management/js/config.js"></script>
<script src="js/myGroupsInit.js"></script>
<script src="js/Sidebar-Menu.js"></script>
</head>
<body>
<div id="wrapper">
<menu:menu hierarchy="1"/>
<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">
<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>
</html>
\ No newline at end of file
gemeinsamforschen/src/main/webapp/groupfinding/create-groups-preferences.jsp
+ 4
− 1
View file @ 4830d616
......@@ -8,7 +8,10 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
<title>Title</title>
<title>Gruppenfindung basierend auf psychometrischen Merkmalen wurde noch nicht implementiert. Klicken sie
auf zurück im browser</title>
<span>@Mirjam: Hier kämen deine Einstellungen für den Dozierenden bezüglich der Gruppenfindung basierend auf
Merkmalen</span>
</head>
<body>
......
gemeinsamforschen/src/main/webapp/groupfinding/groups.jsp deleted 100644 → 0
+ 0
− 91
View file @ 0551dee3
<%@ page contentType="text/html;charset=UTF-8" %>
<!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="../management/js/config.js"></script>
<script src="js/myGroupsInit.js"></script>
<script src="../management/js/getProjects.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
<script src="js/Sidebar-Menu.js"></script>
</head>
<body>
<p id="user" hidden><?php echo $userName; ?></p>
<div id="wrapper">
<?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">
<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/groupfinding/js/myGroupsInit.js
+ 34
− 0
View file @ 4830d616
......@@ -122,4 +122,38 @@ function getMembers(project, user) { //gets all Members in the chosen Pro
function showProject(project, user) { //will display the chosen option in the dropdown button and show all students in a unordered list
$("#projectDropdown").text(project); //the dropdown button
getMembers(project, user); //the students
}
/**
* Created by dehne on 28.03.2018.
*/
function getProjectsOfAuthor(author, printedProjects, handleProjects) {
var url = "../../gemeinsamforschen/rest/project/all/author/"+getUserTokenFromUrl();
$.ajax({
url: url,
Accept: "application/json",
contentType: "text/plain",
success: function (response) {
// var authoredProjects = JSON.parse(response);
var authoredProjects = response;
if (authoredProjects != null) {
if (printedProjects != null) {
for (var i = 0; i < printedProjects.length; i++) {
authoredProjects = authoredProjects.filter(function (el) {
return el !== printedProjects[i];
});
}
handleProjects(authoredProjects, printedProjects.length);
} else {
handleProjects(authoredProjects, 0);
}
}
},
error: function (a, b, c) {
console.log(a);
}
});
}
\ No newline at end of file
gemeinsamforschen/src/main/webapp/management/edit-group-settings.jsp
+ 1
− 1
View file @ 4830d616
......@@ -25,7 +25,7 @@
<button class="btn btn-primary" style="margin-left:129px;" id="selectGFM">wählen</button>
<%--
<a href="../groupfinding/create-groups.jsp?token=<%=request.getParameter("token")+"&projectToken="+request.getParameter("projectToken") %>" > Weiter </a>
<a href="../groupfinding/create-create-groups-learninggoal.jsp?token=<%=request.getParameter("token")+"&projectToken="+request.getParameter("projectToken") %>" > Weiter </a>
--%>
......
gemeinsamforschen/src/main/webapp/management/js/create-project.js
+ 0
− 2
View file @ 4830d616
......@@ -39,9 +39,7 @@ function createNewProject(allTheTags, activ) {
// it actually worked
projectToken = response;
createProjectinCompbase(project.id);
}
}
},
error: function (a, b, c) {
......
gemeinsamforschen/src/main/webapp/management/js/getProjects.js deleted 100644 → 0
+ 0
− 31
View file @ 0551dee3
/**
* Created by dehne on 28.03.2018.
*/
function getProjectsOfAuthor(author, printedProjects, handleProjects) {
var url = "../database/getProjectsOfAuthor.php?author=" + author;
$.ajax({
url: url,
Accept: "text/plain; charset=utf-8",
contentType: "text/plain",
success: function (response) {
var authoredProjects = JSON.parse(response);
if (authoredProjects != null) {
if (printedProjects != null) {
for (var i = 0; i < printedProjects.length; i++) {
authoredProjects = authoredProjects.filter(function (el) {
return el !== printedProjects[i];
});
}
handleProjects(authoredProjects, printedProjects.length);
} else {
handleProjects(authoredProjects, 0);
}
}
},
error: function (a, b, c) {
console.log(a);
}
});
}
\ No newline at end of file
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