From e0280ebe7d132e0ae77b68cd2f7de72edfe0670c Mon Sep 17 00:00:00 2001
From: tudtianus <tudtianus@gmail.com>
Date: Sat, 30 Jun 2018 22:09:57 +0200
Subject: [PATCH] fix: journalFilter all new filters correct
---
.../journal/service/DummyJournalService.java | 2 +-
.../src/main/webapp/pages/eportfolio.jsp | 17 +++++++++--------
2 files changed, 10 insertions(+), 9 deletions(-)
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 7190aad4..7d6ca431 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
@@ -44,7 +44,7 @@ public class DummyJournalService implements JournalService {
@Override
public ArrayList<Journal> getAllJournals(String student, String project, JournalFilter filter) {
- log.debug(">> get all journals(" + student , "," + project + ")");
+ log.debug(">> get all journals(" + student + "," + project + "," + filter + ")");
ArrayList<Journal> result = new ArrayList<>();
diff --git a/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp b/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp
index 8a8170f7..fb6807aa 100644
--- a/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp
@@ -71,16 +71,17 @@
</div>
<div id="journal-container" class="tab-pane fade">
- <h2>Lernatagebuch</h2>
- <select id="journalfilter" onchange="filterJournals()">
- <option>Alle</option>
- <option>Eigene</option>
- </select>
+ <h2>Lernatagebuch</h2>
- <a class="btn btn-default btn-sm" href="createJournal.jsp?token=test">Neu</a>
+ <select id="journalfilter" onchange="filterJournals()">
+ <option value="ALL">Alle</option>
+ <option value="OWN">Eigene</option>
+ </select>
- <div class="journal">
- </div>
+ <a class="btn btn-default btn-sm" href="createJournal.jsp?token=test">Neu</a>
+
+ <div class="journal">
+ </div>
</div>
</div>
</td>
--
GitLab