Skip to content
Snippets Groups Projects
Commit 44a7d2fb authored by Thomas Schnaak's avatar Thomas Schnaak
Browse files

fix: filter on eportfilio page

parent 7d4b2b20
No related branches found
No related tags found
No related merge requests found
...@@ -32,7 +32,7 @@ public class DummyProjectDescription implements ProjectDescriptionService { ...@@ -32,7 +32,7 @@ public class DummyProjectDescription implements ProjectDescriptionService {
"<p>Donec ut erat eget diam accumsan ornare condimentum eu purus. Morbi ullamcorper ex quam, ut varius magna iaculis ut. Maecenas rutrum vitae arcu ac pretium. Duis congue tempus eros non molestie. Vivamus at erat eu massa iaculis commodo. Nam aliquet, nibh a ultrices faucibus, diam ipsum molestie odio, quis imperdiet ligula nunc et erat. Sed vel leo vitae ex mattis pellentesque.</p>\n" + "<p>Donec ut erat eget diam accumsan ornare condimentum eu purus. Morbi ullamcorper ex quam, ut varius magna iaculis ut. Maecenas rutrum vitae arcu ac pretium. Duis congue tempus eros non molestie. Vivamus at erat eu massa iaculis commodo. Nam aliquet, nibh a ultrices faucibus, diam ipsum molestie odio, quis imperdiet ligula nunc et erat. Sed vel leo vitae ex mattis pellentesque.</p>\n" +
"<p>Nullam porttitor sit amet augue condimentum finibus. Curabitur ut pharetra lacus, in consequat nibh. Curabitur nec varius sapien, nec ornare felis. Mauris ornare varius arcu. Nulla quis tellus tempor, faucibus elit a, sollicitudin mi. Vivamus ligula diam, interdum a lorem in, pharetra tempor nunc. Mauris et dapibus erat, et sodales tortor. Vestibulum id tristique odio, ac vehicula orci. Quisque diam felis, volutpat nec condimentum vel, cursus eget justo.</p></p>"; "<p>Nullam porttitor sit amet augue condimentum finibus. Curabitur ut pharetra lacus, in consequat nibh. Curabitur nec varius sapien, nec ornare felis. Mauris ornare varius arcu. Nulla quis tellus tempor, faucibus elit a, sollicitudin mi. Vivamus ligula diam, interdum a lorem in, pharetra tempor nunc. Mauris et dapibus erat, et sodales tortor. Vestibulum id tristique odio, ac vehicula orci. Quisque diam felis, volutpat nec condimentum vel, cursus eget justo.</p></p>";
testProject = new ProjectDescription(0,"TestProjekt",desc, new Project(), link, group, new Date().getTime()); testProject = new ProjectDescription(0,"Eine kreative Überschrift",desc, new Project(), link, group, new Date().getTime());
} }
......
...@@ -18,26 +18,8 @@ $(document).ready(function() { ...@@ -18,26 +18,8 @@ $(document).ready(function() {
$.ajax({ $.ajax({
url: "../rest/journal//journals/0/0" url: "../rest/journal//journals/0/0"
}).then(function(data) { }).then(function(data) {
for (var journal in data) { loadJournals(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.jsp?token=test&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); console.log(data);
}); });
}); });
...@@ -50,28 +32,12 @@ function timestamptToDateString(timestamp) { ...@@ -50,28 +32,12 @@ function timestamptToDateString(timestamp) {
function filterJournals() { function filterJournals() {
var filter = $( "#journalfilter option:selected" ).val(); var filter = $( "#journalfilter option:selected" ).val();
$('.journal').empty();
$.ajax({ $.ajax({
url: "../rest/journal//journals/0/0/"+filter url: "../rest/journal//journals/0/0/"+filter
}).then(function(data) { }).then(function(data) {
function loadJournals() { loadJournals(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.jsp?token=test&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); console.log(data);
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment