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 7190aad479489b845eae9dc995d89b842fba3695..7d6ca4311789c36ae68baee7a95e53b669765876 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 8a8170f71fb7132ee62ebc9a7d90109bcfc220ec..fb6807aa29f5e13e9ecab0db508461fcb25d5c17 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>