diff --git a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js b/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js index 2e5891fff68b82252a7959f7ba1f8406e283f712..911258a2b11a38c13274b4590ed4ea9091c8b717 100644 --- a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js +++ b/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js @@ -49,22 +49,30 @@ function filterJournals() { function loadJournals(data) { for (var journal in data) { $('.journal').append( - '<div class="journal-container"><div class="journal-avatar">' + - 'getBild' + - '</div><div class="journal-date"> ' + - timestampToDateString(data[journal].timestamp) + - '</div><div class="journal-name">' + - data[journal].creator + '' + - '</div><div class="journal-category">' + - data[journal].category + - '</div><div class="journal-edit" align="right">' + - '<a class="btn btn-default btn-sm" href="createJournal.jsp?token=test&journal=' + data[journal].id + '"><i class="fa fa-pencil"></i> Bearbeiten</a>' + - '<a class="btn btn-default btn-sm" href="#"><i class="fa fa-check-square" aria-hidden="true"></i>Abschließen</a>' + - ' </div><div class="journal-text">' + - data[journal].entry + - '</div>') + '<div class="journal-container">' + + '<div class="journal-avatar">' + + 'getBild' + + '</div>' + + '<div class="journal-date"> ' + + timestampToDateString(data[journal].timestamp) + + '</div>' + + '<div class="journal-name">' + + data[journal].creator + + '</div>' + + '<div class="journal-category">' + + data[journal].category + + '</div>' + + '<div class="journal-edit" align="right">' + + '<a class="btn btn-default btn-sm" href="createJournal.jsp?token=test&journal=' + data[journal].id + '"><i class="fa fa-pencil"></i> Bearbeiten</a>' + + '<a class="btn btn-default btn-sm" data-toggle="modal" data-target="#closeJournalModal"><i class="fa fa-check-square" aria-hidden="true"></i>Abschließen</a>' + + '</div>' + + '<div class="journal-text">' + + data[journal].entry + + '</div>' + + '</div><br><br>') }}; + function linkLoeschen(name) { console.log("löschen" + name); $.ajax({ @@ -80,4 +88,21 @@ function linkLoeschen(name) { } }); +} + +function closeJournal(journal) { + console.log("löschen" + journal); + $.ajax({ + type: "POST", + url: "../rest/journal/close", + data: JSON.stringify(journal), + contentType: "application/json; charset=utf-8", + crossDomain: true, + dataType: "json", + success: function (data, status, jqXHR) { + + alert(success); + } + }); + } \ 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 fb6807aa29f5e13e9ecab0db508461fcb25d5c17..de36f7dbde296f1838530dbe8435b41208b18f53 100644 --- a/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp +++ b/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp @@ -53,8 +53,7 @@ <div class="journal-description-edit" align="right"> <a class="btn btn-default btn-sm" href="editDescription.jsp?project=0&token=test"> <i class="fa fa-pencil"></i> Bearbeiten</a> - <a class="btn btn-default btn-sm" href="#"> - <i class="fa fa-check-square" aria-hidden="true"></i>Abschließen</a> + <a class="btn btn-default btn-sm" data-toggle="modal" data-target="#closeDescriptionModal"><i class="fa fa-check-square" aria-hidden="true"></i>Abschließen</a>' </div> <div class="journal-description-text"> @@ -71,15 +70,15 @@ </div> <div id="journal-container" class="tab-pane fade"> - <h2>Lernatagebuch</h2> - - <select id="journalfilter" onchange="filterJournals()"> - <option value="ALL">Alle</option> - <option value="OWN">Eigene</option> - </select> - - <a class="btn btn-default btn-sm" href="createJournal.jsp?token=test">Neu</a> - + <h2>Lernatagebuch</h2> + <div class="input-group"> + <select id="journalfilter" class="form-control" style="width:auto;" onchange="filterJournals()"> + <option value="ALL">Alle</option> + <option value="OWN">Eigene</option> + </select> + + <a class="btn btn-default btn-sm" href="createJournal.jsp?token=test">Neu</a> + </div> <div class="journal"> </div> </div> @@ -115,6 +114,48 @@ </div> +<div class="modal fade" id="closeJournalModal" role="dialog"> + <div class="modal-dialog modal-sm"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal">×</button> + <h4 class="modal-title">Tagebucheintrag schließen</h4> + </div> + <div class="modal-body"> + Tagebucheintrag schließen? Dieser Eintrag kann nach Bestätigung nicht mehr bearbeitet werden. + </div> + <div class="modal-footer"> + <div class="btn-group"> + <button type="button" class="btn btn-primary mr-auto">Ja</button> + <button type="button" class="btn btn-secondary" data-dismiss="modal">Nein</button> + + </div> + </div> + </div> + </div> +</div> + +<div class="modal fade" id="closeDescriptionModal" role="dialog"> + <div class="modal-dialog modal-sm"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal">×</button> + <h4 class="modal-title">Beschreibung schließen</h4> + </div> + <div class="modal-body"> + Beschreibung schließen? Die Projektbeschreibung kann nach Bestätigung nicht mehr bearbeitet werden. + </div> + <div class="modal-footer"> + <div class="btn-group"> + <button type="button" class="btn btn-primary mr-auto">Ja</button> + <button type="button" class="btn btn-secondary" data-dismiss="modal">Nein</button> + + </div> + </div> + </div> + </div> +</div> + <script src="../assets/js/jquery.min.js"></script> <script src="../assets/bootstrap/js/bootstrap.min.js"></script> <script src="../assets/js/Sidebar-Menu.js"></script>