Skip to content
Snippets Groups Projects
Commit 6d2eeb64 authored by tudtianus's avatar tudtianus
Browse files

fix: Add menu to e-portfolio page

parent 71a9cdcc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js 0 → 100644
+ 46
− 0
View file @ 6d2eeb64
//TODO Get student and project form context
$(document).ready(function() {
$.ajax({
url: "../rest/prejectdescription/0"
}).then(function(data) {
$('.journal-description-title').append('<h2>' + data.name + '</h2>');
$('.journal-description-text').append(data.description);
for(var link in data.links){
$('.journal-description-links').append('<a href=' + data.links[link] + '>' + link + '</a><br/>');
}
for(var g in data.group){
$('.journal-description-group').append(data.group[g]+ '<br/>');
}
});
$.ajax({
url: "../rest/journal//journals/0/0"
}).then(function(data) {
for (var journal in data){
$('.journal').append(
'<div class="journal-container"><div class="journal-avatar">' +
'getBild' +
'</div><div class="journal-date"> ' +
timestamptToDateString(data[journal].timestamp) +
'</div><div class="journal-name">' +
data[journal].creator +'' +
'</div><div class="journal-category">' +
data[journal].category +
'</div><div class="journal-edit">' +
'<a href="createJournal.html?journal='+ data[journal].id + '"><i class="fa fa-pencil" aria-hidden="true"></i></a>' +
' </div><div class="journal-text">' +
data[journal].entry +
'</div>')
}
console.log(data);
});
});
function timestamptToDateString(timestamp) {
var date = new Date(timestamp);
return date.toLocaleString("de-DE");
}
gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp
+ 3
− 53
View file @ 6d2eeb64
......@@ -6,7 +6,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>muster-gemeinsam-forschen</title>
<title>E-Portfolio</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">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
......@@ -15,7 +15,7 @@
<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" href="../assets/css/eportfolio.css">
<link rel="stylesheet" href="../assets/css/e-portfolio.css">
</head>
<body>
......@@ -76,57 +76,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>
//TODO Get student and project form context
$(document).ready(function() {
$.ajax({
url: "../rest/prejectdescription/0"
}).then(function(data) {
$('.journal-description-title').append('<h2>' + data.name + '</h2>');
$('.journal-description-text').append(data.description);
for(var link in data.links){
$('.journal-description-links').append('<a href=' + data.links[link] + '>' + link + '</a><br/>');
}
for(var g in data.group){
$('.journal-description-group').append(data.group[g]+ '<br/>');
}
});
$.ajax({
url: "../rest/journal//journals/0/0"
}).then(function(data) {
for (var journal in data){
$('.journal').append(
'<div class="journal-container"><div class="journal-avatar">' +
'getBild' +
'</div><div class="journal-date"> ' +
data[journal].creator +
'</div><div class="journal-name">' +
timestamptToDateString(data[journal].timestamp) +
'</div><div class="journal-category">' +
data[journal].category +
'</div><div class="journal-edit">' +
'<a href="createJournal.html?journal='+ data[journal].id + '"><i class="fa fa-pencil" aria-hidden="true"></i></a>' +
' </div><div class="journal-text">' +
data[journal].entry +
'</div>')
}
console.log(data);
});
});
function timestamptToDateString(timestamp) {
var date = new Date(timestamp);
return date.toLocaleString("de-DE");
}
</script>
<script src="../assets/js/e-portfolio.js"></script>
</body>
</html>
\ 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