From 44a7d2fb2095ca61d46b03a1aea922c21cc65645 Mon Sep 17 00:00:00 2001
From: Thomas Schnaak <schnaak@uni-potsdam.de>
Date: Thu, 28 Jun 2018 15:15:24 +0200
Subject: [PATCH] fix: filter on eportfilio page
---
.../service/DummyProjectDescription.java | 2 +-
.../src/main/webapp/assets/js/e-portfolio.js | 42 ++-----------------
2 files changed, 5 insertions(+), 39 deletions(-)
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 d7c7d452..23a028f9 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
@@ -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>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());
}
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js b/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js
index 92c35675..3a4bc249 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js
@@ -18,26 +18,8 @@ $(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?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>')
- }
-
-
+ loadJournals(data)
console.log(data);
-
});
});
@@ -50,28 +32,12 @@ function timestamptToDateString(timestamp) {
function filterJournals() {
var filter = $( "#journalfilter option:selected" ).val();
+ $('.journal').empty();
+
$.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>')
- }
- }
-
+ loadJournals(data)
console.log(data);
});
--
GitLab