Skip to content
Snippets Groups Projects
Commit d6b7b84c authored by Axel's avatar Axel
Browse files

feat: check if project exists for joining it

parent 26ac99a2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 32 additions and 38 deletions
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/ProjectView.java
+ 15
− 0
View file @ d6b7b84c
......@@ -63,5 +63,20 @@ public class ProjectView {
return projects;
}
@GET
@Consumes(MediaType.TEXT_PLAIN)
@Produces(MediaType.APPLICATION_JSON)
@Path("/join/project/{projectId}/password/{password}")
public String logInProject(@PathParam("projectId") String projectId, @PathParam("password") String password) {
Project project = iManagement.getProjectById(projectId);
if (project == null){
return "project missing";
}
if (project.getPassword().equals(password))
return "wrong password";
return "success";
}
}
gemeinsamforschen/src/main/webapp/core/overview-student.js
+ 1
− 1
View file @ d6b7b84c
......@@ -8,7 +8,7 @@ $(document).ready(function(){
location.href="project-student.jsp?token="+getUserTokenFromUrl()+'&projectId='+'Kaleo';
});
$('#enrollProject').on('click', function(){
location.href="management/enroll-project.jsp?token="+getUserTokenFromUrl();
location.href="management/join-project.jsp?token="+getUserTokenFromUrl();
});
});
......
gemeinsamforschen/src/main/webapp/enroll-project.jsp
+ 1
− 1
View file @ d6b7b84c
......@@ -12,7 +12,7 @@
<title>Gruppenmatcher</title>
<script src="core/config.js"></script>
<script src="core/utility.js"></script>
<script src="management/js/showProjects.js"></script>
<script src="management/js/join-project.js"></script>
</head>
......
gemeinsamforschen/src/main/webapp/management/join-project.jsp
+ 14
− 34
View file @ d6b7b84c
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="footer" %>
<!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>
<omniDependencies:omniDependencies hierarchy="1"/>
<script src="../core/config.js"></script>
<script src="js/utility.js"></script>
<script src="js/showProjects.js"></script>
<script src="js/GETfile.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
<script src="js/Sidebar-Menu.js"></script>
<script src="js/join-project.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 id="wrapper" class="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">
<h3>Tragen sie sich in ein neues Projekt ein. </h3>
<div class="page-header"></div>
</div>
</div>
</div>
</div>
<headLine:headLine/>
<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;">
style="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>
......@@ -54,12 +33,13 @@
<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;">
style="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>
</div>
</body>
......
gemeinsamforschen/src/main/webapp/management/js/showProjects.js → gemeinsamforschen/src/main/webapp/management/js/join-project.js
+ 1
− 1
View file @ d6b7b84c
......@@ -21,7 +21,7 @@ $(document).ready(function () {
});
function seeProject(projectName) {
var url = "../database/getProjects.php?project=" + projectName + "&password=" + document.getElementById('projectPassword').value;
var url = "../project/join/project/"+projectName+"/password/" + $('#projectPassword').val();
if (projectName === "") {
return false;
} else {
......
gemeinsamforschen/src/main/webapp/project-student.jsp
+ 0
− 1
View file @ d6b7b84c
......@@ -16,7 +16,6 @@
<head>
<omniDependencies:omniDependencies hierarchy="0"/>
<script src="core/project-student.js"></script>
<link rel="stylesheet" href="../libs/css/Community-ChatComments.css">
</head>
......
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