diff --git a/gemeinsamforschen/src/main/webapp/assets/js/project-student.js b/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
index ffc7facbdd443de53ce28d7faeb0cefd84298e7a..6b58999b9521762e5bab6acad8b992330f03b13c 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
@@ -20,4 +20,8 @@ $(document).ready(function(){
$('#btnUnstructuredUpload').click(function () {
location.href="upload-unstructured.jsp?token="+getUserTokenFromUrl();
})
+
+ $('.viewprojectstudent').click(function () {
+ location.href="project-student.jsp?token="+getUserTokenFromUrl();
+ })
});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp b/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp
index c01c2a3c665c4a23f249fac3e5cba112107e885e..5e6043db7e9b0f30eb882140d0ff7bdc23f6d8b8 100644
--- a/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp
@@ -21,6 +21,11 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
<script src="../assets/js/utility.js"></script>
<script src="../assets/js/project-student.js"></script>
+ <link rel="stylesheet" type="text/css" href="../assets/css/editDescription.css">
+ <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>
</head>
<body>
@@ -85,110 +90,55 @@
</label>
</div>
<hr />
- <div class="line-spacer"></div>
- <td id="Peerfeedback" valign="top">
+ <div>
+ <table>
+ <tr>
+ <td id="yourContent">
+ <h2> Schreibe dein Feedback! </h2>
- <div style="height:100px;padding-bottom:100px;">
- <textarea id="demo1">
- Das ist ein Test!
- </textarea>
- </div>
+ <form id="descriptionform" class="form-journal" method="POST" action="../rest/projectdescription/saveText">
- <button onclick="save()">Speichern</button>
+ <input type="hidden" name="student" value="0">
+ <input type="hidden" name="project" value="0">
- <p id = "output"> Output... </p>
- <script>
- var editor = new InscrybMDE({
- element: document.getElementById("demo1"),
- spellChecker: false,
- //toolbar: ["bold", "italic", "heading", "|", "quote", "table", "code", "|" , "side-by-side", "fullscreen"],
- minHeight: "80px",
- });
+ <div class="description-form-container">
+ <div class ="description-form-editor">
+ <textarea id = "editor" name="text" form="descriptionform" >
+ </textarea>
+ </div>
- editor.style = "min-height: 100px";
+ <div class="description-form-buttons">
- function save() {
- console.log("save");
- console.log(editor.value());
+ <button type="button" onclick="goBack()">Zurück</button>
+ <button type="button" class="viewprojectstudent">Speichern</button>
- var converter = new showdown.Converter(),
- text = editor.value(),
- html = converter.makeHtml(text);
+ </div>
+ <div>
- document.getElementById('output').innerHTML = html;11
- }
+ </div>
+
+ </div>
+ </form>
+
+
+ </td>
+ </tr>
+ </table>
+ </div>
- </script>
- <button class="btn btn-secondary" onclick="goBack()">Zurück</button>
<script>
function goBack() {
window.history.back();
}
</script>
- </td>
-
- <td id="chat">
- <div class="card">
- <div class="card-header">
- <h6 class="mb-0">Gruppen+Projekt Chat</h6>
- </div>
- <div class="card-body">
- <ul class="list-group">
- <li class="list-group-item">
- <div class="media">
- <div></div>
- <div class="media-body">
- <div class="media" style="overflow:visible;">
- <div><img src="../assets/img/1.jpg" class="mr-3"
- style="width: 25px; height:25px;"></div>
- <div class="media-body" style="overflow:visible;">
- <div class="row">
- <div class="col-md-12">
- <p><a href="#">Sara Doe:</a> This guy has been going
- 100+ MPH on side streets. <br>
- <small class="text-muted">August 6, 2016 @ 10:35am
- </small>
- </p>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </li>
- <li class="list-group-item">
- <div class="media">
- <div></div>
- <div class="media-body">
- <div class="media" style="overflow:visible;">
- <div><img src="../assets/img/2.jpg" class="mr-3"
- style="width: 25px; height:25px;"></div>
- <div class="media-body" style="overflow:visible;">
- <div class="row">
- <div class="col-md-12">
- <p><a href="#">Brennan Prill:</a> This guy has been
- going 100+ MPH on side streets. <br>
- <small class="text-muted">August 6, 2016 @ 10:35am
- </small>
- </p>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </li>
- </ul>
- <button class="btn btn-light">
- Add Comment
- </button>
- </div>
- </div>
- </td>
+ </tr>
+ </td>
+
+
</tr>
</table>
</div>
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
index 99969f2b225d63cb6dddda7a23552eb02b5cc96b..a1f0d20a2bdaf395fac59ef662bea2bb2dde341a 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
@@ -130,7 +130,7 @@
</tr>
</table>
- <button onclick="goBack()" class="btn btn-secondary">Zurueck</button>
+ <button onclick="goBack()" class="btn btn-secondary">Zurück</button>
<script>
function goBack() {
diff --git a/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp b/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
index 250d61bbce01c1074abeb0292fc304fd6a56a62f..8d5508d78ef14e3015334abce70177c825a25395 100644
--- a/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
@@ -48,13 +48,13 @@
<div>
<table>
<tr>
-
+
<td id="Peerfeedback">
<h2>Feedback Nachrichten von Student X</h2>
<iframe width="90%" height="200%" src="http://rocketchat.westeurope.cloudapp.azure.com/channel/general?layout=embedded"></iframe>
- <button class="btn btn-secondary" onclick="goBack()">Zurück</button>
+ <button class="btn btn-secondary" onclick="goBack()">Zurück</button>
<script>
function goBack() {