Skip to content
Snippets Groups Projects
Commit 4593fefe authored by tudtianus's avatar tudtianus
Browse files

feat: Add page to edit projectdescription

parent 7ce0c286
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 140 additions and 42 deletions
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java
+ 1
− 1
View file @ 4593fefe
......@@ -23,7 +23,7 @@ import java.util.ArrayList;
* TODO error handling
*/
@Path("/prejectdescription")
@Path("/projectdescription")
public class ProjectDescriptionView {
Logger log = LoggerFactory.getLogger(ProjectDescriptionView.class);
......
gemeinsamforschen/src/main/webapp/assets/css/editDescription.css 0 → 100644
+ 0
− 0
View file @ 4593fefe
gemeinsamforschen/src/main/webapp/assets/js/createJournal.js 0 → 100644
+ 40
− 0
View file @ 4593fefe
function getQueryVariable(variable)
{
var query = window.location.search.substring(1);
var vars = query.split("&");
for (var i=0;i<vars.length;i++) {
var pair = vars[i].split("=");
if(pair[0] == variable){return pair[1];}
}
return(false);
}
$(document).ready(function() {
var journalID = getQueryVariable("journal");
console.log(journalID);
if(journalID){
$.ajax({
url: "../rest/journal/"+journalID
}).then(function(data) {
$('#editor').append(data.entry);
//TODO preselet in select tags
new InscrybMDE({
element: document.getElementById("editor"),
spellChecker: false,
forceSync: true,
});
console.log(data);
});
} else {
new InscrybMDE({
element: document.getElementById("editor"),
spellChecker: false,
forceSync: true,
});
}
})
\ No newline at end of file
gemeinsamforschen/src/main/webapp/assets/js/editDescription.js 0 → 100644
+ 17
− 0
View file @ 4593fefe
$(document).ready(function() {
$.ajax({
url: "../rest/projectdescription/0"
}).then(function(data) {
$('#editor').append(data.description);
//TODO preselet in select tags
new InscrybMDE({
element: document.getElementById("editor"),
spellChecker: false,
forceSync: true,
});
console.log(data);
});
})
\ No newline at end of file
gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
+ 3
− 40
View file @ 4593fefe
......@@ -69,8 +69,8 @@
<div class ="journal-form-editor">
<textarea id = "editor" name="text" form="journalform" >
</textarea>
<textarea id = "editor" name="text" form="journalform" >
</textarea>
</div>
<div class="journal-form-buttons">
......@@ -91,44 +91,7 @@
<script src="../assets/js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
<script src="../assets/js/Sidebar-Menu.js"></script>
<script>
/*
*/
function getQueryVariable(variable)
{
var query = window.location.search.substring(1);
var vars = query.split("&");
for (var i=0;i<vars.length;i++) {
var pair = vars[i].split("=");
if(pair[0] == variable){return pair[1];}
}
return(false);
}
$(document).ready(function() {
var journalID = getQueryVariable("journal");
console.log(journalID);
if(journalID){
$.ajax({
url: "../rest/journal/"+journalID
}).then(function(data) {
$('#editor').append(data.entry);
//TODO preselet in select tags
console.log(data);
});
}
new InscrybMDE({
element: document.getElementById("editor"),
spellChecker: false,
forceSync: true,
});
})
</script>
<script src="../assets/js/createJournal.js"></script>
</body>
</html>
\ No newline at end of file
gemeinsamforschen/src/main/webapp/pages/editDescription.jsp 0 → 100644
+ 78
− 0
View file @ 4593fefe
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Tagebucheintrag erstellen</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<link rel="stylesheet" href="../assets/css/styles.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
<link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
<link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
<link rel="stylesheet" type="text/css" href="../assets/css/editDescription.css">
</head>
<body>
<div id="wrapper">
<menu:menu></menu:menu>
<div class="page-content-wrapper">
<div class="container-fluid">
<h1 id="projectId">project1
<a href="#">
<span class="glyphicon glyphicon-envelope"
style="font-size:27px;margin-top:-17px;margin-left:600px;"></span>
</a>
<a href="#">
<span class="glyphicon glyphicon-cog" style="font-size:29px;margin-left:5px;margin-top:-25px;"></span>
</a></h1>
</div>
<div>
<table>
<tr>
<td id="yourContent">
<h1> Projektbeschreibung bearbeiten </h1>
<form id="descriptionform" class="form-journal" method="POST" action="../rest/projectdescription/saveText">
<input type="hidden" name="student" value="0">
<input type="hidden" name="project" value="0">
<div class="description-form-container">
<div class ="description-form-editor">
<textarea id = "editor" name="text" form="descriptionform" >
</textarea>
</div>
<div class="description-form-buttons">
<input type="submit">
<button> Zur&uuml;ck </button>
</div>
</div>
</form>
</td>
</tr>
</table>
</div>
</div>
</div>
<script src="../assets/js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
<script src="../assets/js/Sidebar-Menu.js"></script>
<script src="../assets/js/editDescription.js"></script>
</body>
</html>
\ No newline at end of file
gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp
+ 1
− 1
View file @ 4593fefe
......@@ -42,7 +42,7 @@
<div class="journal-description-title">
</div>
<div class="journal-description-edit">
<i class="fa fa-pencil" aria-hidden="true"></i>
<a href="editDescription.jsp?project=0"> <i class="fa fa-pencil" aria-hidden="true"></i></a>
</div>
<div class="journal-description-text">
</div>
......
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