diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/DummyJournalService.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/DummyJournalService.java
index 60d00cf5dafa6a5b0d3326d928cdcef2fed6af09..84550ecc55f7ce5e8124b2b907002a6542329e70 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/DummyJournalService.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/DummyJournalService.java
@@ -124,18 +124,21 @@ public class DummyJournalService implements JournalService {
}
ArrayList<Journal> resetList () {
+
StudentIdentifier studentIdentifier = new StudentIdentifier("0","0");
StudentIdentifier studentIdentifier2 = new StudentIdentifier("0","1");
- Journal j1 = new Journal(0,studentIdentifier,"test", cal.getTimeInMillis() , Visibility.ALL, "test1");
+ String test = "Donec nec facilisis nibh, sed sagittis tortor. Suspendisse vel felis ac leo dignissim efficitur. Nunc non egestas eros, sit amet vestibulum nunc. Sed bibendum varius molestie. Proin augue mauris, mollis sed efficitur efficitur, sagittis quis eros. Praesent tincidunt tincidunt porttitor. Maecenas quis ornare tellus. Nunc euismod vestibulum neque, sed luctus neque convallis in. Duis molestie ex ut nunc dignissim condimentum ut vitae dui. Vestibulum diam lorem, eleifend sit amet lobortis nec, vulputate a leo. In nec ante felis. Maecenas interdum nunc et odio placerat fringilla. Aenean felis purus, mollis id lectus non, fringilla tincidunt mi. Nunc sed rutrum ex, vel tempus odio.";
+
+ Journal j1 = new Journal(0,studentIdentifier,test, cal.getTimeInMillis() , Visibility.ALL, "test1");
j1.setCreator("Test Test");
- Journal j2 = new Journal(1,studentIdentifier,"test2", cal.getTimeInMillis() , Visibility.NONE, "test2");
+ Journal j2 = new Journal(1,studentIdentifier,test, cal.getTimeInMillis() , Visibility.NONE, "test2");
j2.setCreator("Test Test");
- Journal j3 = new Journal(2,studentIdentifier,"test3", cal.getTimeInMillis() , Visibility.GROUP, "test3");
+ Journal j3 = new Journal(2,studentIdentifier,test, cal.getTimeInMillis() , Visibility.GROUP, "test3");
j3.setCreator("Test Test");
- Journal j4 = new Journal(3,studentIdentifier,"test4", cal.getTimeInMillis() , Visibility.DOZENT ,"test4");
+ Journal j4 = new Journal(3,studentIdentifier,test, cal.getTimeInMillis() , Visibility.DOZENT ,"test4");
j4.setCreator("Test Test");
- Journal j5 = new Journal(4,studentIdentifier2,"test5", cal.getTimeInMillis() , Visibility.GROUP, "test5");
+ Journal j5 = new Journal(4,studentIdentifier2,test, cal.getTimeInMillis() , Visibility.GROUP, "test5");
j5.setCreator("ASD DSA");
journals = new ArrayList<>();
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/DummyProjectDescription.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/DummyProjectDescription.java
index 93463122587ef0203d17906f43200b6db6acc24c..d7c7d45239e6379a30925d96b19c34796c91105c 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/DummyProjectDescription.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/DummyProjectDescription.java
@@ -25,7 +25,14 @@ public class DummyProjectDescription implements ProjectDescriptionService {
group.add("Test Person");
group.add("Person Test");
- testProject = new ProjectDescription(0,"Test","Testdesription", new Project(), link, group, new Date().getTime());
+ String desc = "<p id=\"output\"><p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus urna purus, interdum vel efficitur et, consectetur nec nulla. Donec ut diam tellus. Donec vitae tellus ac dolor finibus luctus sed eget velit. Aliquam vitae ullamcorper eros, sit amet venenatis enim. Phasellus dui enim, viverra eu odio eget, ultrices tincidunt neque. Mauris venenatis luctus malesuada. Etiam vehicula turpis sed enim rhoncus, interdum interdum leo pretium. Pellentesque nec porttitor tellus, id tincidunt lacus. Mauris vitae cursus dui. Suspendisse ut ante quis nibh fermentum euismod a et ipsum. Donec aliquet id enim ut iaculis. Proin pulvinar est ac mollis fermentum. Quisque placerat pulvinar sapien, in dapibus mi aliquam finibus. Suspendisse fermentum vel lorem eget viverra. Aliquam eu orci ac nunc varius feugiat pellentesque quis dolor. Praesent erat sem, dictum eu elit quis, accumsan maximus leo.</p>\n" +
+ "<p><strong>Donec nec facilisis nibh, sed sagittis tortor. Suspendisse vel felis ac leo dignissim efficitur. Nunc non egestas eros, sit amet vestibulum nunc. Sed bibendum varius molestie. Proin augue mauris, mollis sed efficitur efficitur, sagittis quis eros. Praesent</strong> tincidunt tincidunt porttitor. Maecenas quis ornare tellus. Nunc euismod vestibulum neque, sed luctus neque convallis in. Duis molestie ex ut nunc dignissim condimentum ut vitae dui. Vestibulum diam lorem, eleifend sit amet lobortis nec, vulputate a leo. In nec ante felis. Maecenas interdum nunc et odio placerat fringilla. Aenean felis purus, mollis id lectus non, fringilla tincidunt mi. Nunc sed rutrum ex, vel tempus odio.</p>\n" +
+ "<p>Aenean turpis risus, ultrices nec fermentum quis, condimentum id orci. Vestibulum eu nibh dapibus, dictum ligula sed, tempus urna. Suspendisse scelerisque volutpat nibh sed accumsan. Ut laoreet condimentum ullamcorper. Nulla a dui eu mauris dictum accumsan. Nam viverra mauris in ultrices sollicitudin. Donec bibendum velit molestie ultricies commodo. Phasellus vulputate ullamcorper sapien eu ultricies. Pellentesque volutpat sed augue ac posuere. Integer finibus tempor eros a laoreet. Maecenas porta nibh elit, sed lacinia odio iaculis eu. Sed ornare ligula ipsum. Nunc vestibulum, arcu eget dapibus interdum, augue mi tempus velit, et sagittis massa magna sed eros. Nulla vehicula ac tortor a fringilla. Quisque in justo urna.</p>\n" +
+ "<p><img src=\"https://upload.wikimedia.org/wikipedia/commons/thumb/1/1c/FuBK_testcard_vectorized.svg/2000px-FuBK_testcard_vectorized.svg.png\" alt=\"asd\"></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>";
+
+ testProject = new ProjectDescription(0,"TestProjekt",desc, new Project(), link, group, new Date().getTime());
}
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js b/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js
index e26ac7846c8acf905108449153324a8efdbd7574..92c356755e9129165775b5a9ad9a04bbe38a3893 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js
@@ -2,7 +2,7 @@
$(document).ready(function() {
$.ajax({
- url: "../rest/prejectdescription/0"
+ url: "../rest/projectdescription/0"
}).then(function(data) {
$('.journal-description-title').append('<h2>' + data.name + '</h2>');
$('.journal-description-text').append(data.description);
@@ -18,22 +18,24 @@ $(document).ready(function() {
$.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.jsp?journal='+ data[journal].id + '"><i class="fa fa-pencil" aria-hidden="true"></i></a>' +
- ' </div><div class="journal-text">' +
- data[journal].entry +
- '</div>')
- }
+ 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);
});
@@ -44,3 +46,52 @@ function timestamptToDateString(timestamp) {
var date = new Date(timestamp);
return date.toLocaleString("de-DE");
}
+
+function filterJournals() {
+ var filter = $( "#journalfilter option:selected" ).val();
+
+ $.ajax({
+ url: "../rest/journal//journals/0/0/"+filter
+ }).then(function(data) {
+ function loadJournals() {
+ 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);
+
+ });
+
+}
+
+function 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>')
+ }}
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp b/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp
index df742379b6a4357201e359f38de02089161d2bee..4c3111d3502fb2804203dcf2ce140bec64cb4539 100644
--- a/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp
@@ -42,7 +42,7 @@
<div class="journal-description-title">
</div>
<div class="journal-description-edit">
- <a href="editDescription.jsp?project=0"> <i class="fa fa-pencil" aria-hidden="true"></i></a>
+ <a href="editDescription.jsp?project=0&token=test"> <i class="fa fa-pencil" aria-hidden="true"></i></a>
</div>
<div class="journal-description-text">
</div>
@@ -57,12 +57,12 @@
</div>
<h2>Lernatagebuch</h2>
- <select>
+ <select id="journalfilter" onchange="filterJournals()">
<option>Alle</option>
<option>Eigene</option>
</select>
- <a href="createJournal.jsp">Neu</a>
+ <a href="createJournal.jsp?token=test">Neu</a>
<div class="journal">
</div>