From 4593fefeeada3c7f797c95bc0ebae073f80fc410 Mon Sep 17 00:00:00 2001
From: tudtianus <tudtianus@gmail.com>
Date: Wed, 27 Jun 2018 13:01:20 +0200
Subject: [PATCH] feat: Add page to edit projectdescription
---
.../journal/view/ProjectDescriptionView.java | 2 +-
.../webapp/assets/css/editDescription.css | 0
.../main/webapp/assets/js/createJournal.js | 40 ++++++++++
.../main/webapp/assets/js/editDescription.js | 17 ++++
.../src/main/webapp/pages/createJournal.jsp | 43 +---------
.../src/main/webapp/pages/editDescription.jsp | 78 +++++++++++++++++++
.../src/main/webapp/pages/eportfolio.jsp | 2 +-
7 files changed, 140 insertions(+), 42 deletions(-)
create mode 100644 gemeinsamforschen/src/main/webapp/assets/css/editDescription.css
create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/createJournal.js
create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/editDescription.js
create mode 100644 gemeinsamforschen/src/main/webapp/pages/editDescription.jsp
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java
index 2f300993..4190c2fe 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
* TODO error handling
*/
-@Path("/prejectdescription")
+@Path("/projectdescription")
public class ProjectDescriptionView {
Logger log = LoggerFactory.getLogger(ProjectDescriptionView.class);
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/editDescription.css b/gemeinsamforschen/src/main/webapp/assets/css/editDescription.css
new file mode 100644
index 00000000..e69de29b
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createJournal.js b/gemeinsamforschen/src/main/webapp/assets/js/createJournal.js
new file mode 100644
index 00000000..33d99482
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createJournal.js
@@ -0,0 +1,40 @@
+function getQueryVariable(variable)
+{
+ var query = window.location.search.substring(1);
+ var vars = query.split("&");
+ for (var i=0;i<vars.length;i++) {
+ var pair = vars[i].split("=");
+ if(pair[0] == variable){return pair[1];}
+ }
+ return(false);
+}
+
+$(document).ready(function() {
+ var journalID = getQueryVariable("journal");
+ console.log(journalID);
+ if(journalID){
+ $.ajax({
+ url: "../rest/journal/"+journalID
+ }).then(function(data) {
+ $('#editor').append(data.entry);
+
+ //TODO preselet in select tags
+ new InscrybMDE({
+ element: document.getElementById("editor"),
+ spellChecker: false,
+ forceSync: true,
+ });
+
+ console.log(data);
+
+ });
+ } else {
+ new InscrybMDE({
+ element: document.getElementById("editor"),
+ spellChecker: false,
+ forceSync: true,
+ });
+ }
+
+
+})
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/editDescription.js b/gemeinsamforschen/src/main/webapp/assets/js/editDescription.js
new file mode 100644
index 00000000..cfcafbd7
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/editDescription.js
@@ -0,0 +1,17 @@
+$(document).ready(function() {
+ $.ajax({
+ url: "../rest/projectdescription/0"
+ }).then(function(data) {
+ $('#editor').append(data.description);
+
+ //TODO preselet in select tags
+ new InscrybMDE({
+ element: document.getElementById("editor"),
+ spellChecker: false,
+ forceSync: true,
+ });
+
+ console.log(data);
+
+ });
+})
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp b/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
index 5fc2dbfd..8faec113 100644
--- a/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
@@ -69,8 +69,8 @@
<div class ="journal-form-editor">
- <textarea id = "editor" name="text" form="journalform" >
- </textarea>
+ <textarea id = "editor" name="text" form="journalform" >
+ </textarea>
</div>
<div class="journal-form-buttons">
@@ -91,44 +91,7 @@
<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>
-<script>
- /*
-*/
- function getQueryVariable(variable)
- {
- var query = window.location.search.substring(1);
- var vars = query.split("&");
- for (var i=0;i<vars.length;i++) {
- var pair = vars[i].split("=");
- if(pair[0] == variable){return pair[1];}
- }
- return(false);
- }
-
- $(document).ready(function() {
- var journalID = getQueryVariable("journal");
- console.log(journalID);
- if(journalID){
- $.ajax({
- url: "../rest/journal/"+journalID
- }).then(function(data) {
- $('#editor').append(data.entry);
-
- //TODO preselet in select tags
-
-
- console.log(data);
-
- });
- }
- new InscrybMDE({
- element: document.getElementById("editor"),
- spellChecker: false,
- forceSync: true,
- });
-
- })
-</script>
+<script src="../assets/js/createJournal.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp b/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp
new file mode 100644
index 00000000..a5673151
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp
@@ -0,0 +1,78 @@
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>Tagebucheintrag erstellen</title>
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
+ <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+ <link rel="stylesheet" type="text/css" href="../assets/css/editDescription.css">
+
+</head>
+
+<body>
+<div id="wrapper">
+ <menu:menu></menu:menu>
+
+ <div class="page-content-wrapper">
+ <div class="container-fluid">
+ <h1 id="projectId">project1
+ <a href="#">
+ <span class="glyphicon glyphicon-envelope"
+ style="font-size:27px;margin-top:-17px;margin-left:600px;"></span>
+ </a>
+ <a href="#">
+ <span class="glyphicon glyphicon-cog" style="font-size:29px;margin-left:5px;margin-top:-25px;"></span>
+ </a></h1>
+ </div>
+ <div>
+ <table>
+ <tr>
+ <td id="yourContent">
+ <h1> Projektbeschreibung bearbeiten </h1>
+
+ <form id="descriptionform" class="form-journal" method="POST" action="../rest/projectdescription/saveText">
+
+ <input type="hidden" name="student" value="0">
+ <input type="hidden" name="project" value="0">
+
+ <div class="description-form-container">
+
+ <div class ="description-form-editor">
+ <textarea id = "editor" name="text" form="descriptionform" >
+ </textarea>
+ </div>
+
+ <div class="description-form-buttons">
+ <input type="submit">
+ <button> Zurück </button>
+ </div>
+
+ </div>
+ </form>
+
+ </td>
+ </tr>
+ </table>
+ </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>
+<script src="../assets/js/editDescription.js"></script>
+</body>
+
+</html>
\ 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 4cd3b008..df742379 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">
- <i class="fa fa-pencil" aria-hidden="true"></i>
+ <a href="editDescription.jsp?project=0"> <i class="fa fa-pencil" aria-hidden="true"></i></a>
</div>
<div class="journal-description-text">
</div>
--
GitLab