Skip to content
Snippets Groups Projects
Commit 7366043c authored by KKlaue's avatar KKlaue
Browse files

#80 change view for feedbacks

parent fcdda14d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/Model/Peer2PeerFeedback.java
+ 2
− 1
View file @ 7366043c
......@@ -2,6 +2,7 @@ package unipotsdam.gf.modules.peer2peerfeedback.peerfeedback.Model;
import unipotsdam.gf.core.management.user.User;
import unipotsdam.gf.modules.peer2peerfeedback.Category;
import static unipotsdam.gf.view.MarkdownUtils.convertMarkdownToHtml;
import java.io.File;
......@@ -25,7 +26,7 @@ public class Peer2PeerFeedback{
this.id = id;
this.timestamp = timestamp;
this.category = category;
this.text = text;
this.text = convertMarkdownToHtml(text);
this.sender = sender;
this.receiver = receiver;
this.filename = filename;
......
gemeinsamforschen/src/main/webapp/assets/css/viewfeedback.css 0 → 100644
+ 42
− 0
View file @ 7366043c
.feedback-container {
border: 2px solid #dedede;
background-color: #f1f1f1;
border-radius: 5px;
padding: 10px;
margin: 10px 0;
}
.darker {
border-color: #ccc;
background-color: #ddd;
}
.feedback-container::after {
content: "";
clear: both;
display: table;
}
.feedback-container img {
float: left;
max-width: 60px;
width: 100%;
margin-right: 20px;
border-radius: 50%;
}
.feedback-container img.right {
float: right;
margin-left: 20px;
margin-right:0;
}
.time-right {
float: right;
color: #aaa;
}
.time-left {
float: left;
color: #999;
}
\ No newline at end of file
gemeinsamforschen/src/main/webapp/assets/js/givepeerfeedback.js
+ 10
− 2
View file @ 7366043c
......@@ -61,13 +61,21 @@ $(document).ready(function() {
'</div><br><br>';*/
var newdiv = document.createElement("div");
var newcontent = document.createTextNode(data[feedback].text);
newdiv.appendChild(newcontent); // füge den Textknoten zum neu erstellten div hinzu.
//newdiv.innerHTML = data[feedback].text;
//newdiv.append(data[feedback].text);
newdiv.insertAdjacentHTML('beforeend',data[feedback].text);
newdiv.className = "feedback-container";
//var text = convertMarkdownToHtml(data[feedback].text);
//var newcontent = document.createTextNode(data[feedback].text);
//newdiv.appendChild(newcontent); // füge den Textknoten zum neu erstellten div hinzu.
// füge das neu erstellte Element und seinen Inhalt ins DOM ein
var currentdiv = document.getElementById("div1");
currentdiv.appendChild(newdiv);
//document.body.insertBefore(newDiv, currentDiv);
//document.getElementById("div").innerHTML = data[feedback].text;
//$('.Peerfeedback').append(feedbackString)
}};
......
gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
+ 52
− 13
View file @ 7366043c
......@@ -7,6 +7,7 @@
<html>
<head>
<link rel="stylesheet" href="../assets/css/viewfeedback.css">
<omniDependencies:omniDependencies/>
<script src="../assets/js/utility.js"></script>
<script src="../assets/js/project-student.js"></script>
......@@ -42,28 +43,66 @@
<div>
<table>
<tr>
<tr>
<th>Feedback Nachrichten von Student X</th>
</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>
--%>
<%--<p id="view"></p> type="hidden"--%>
<input type="hidden" name="peerfeedbackID" id="peerfeedbackID-input" value=""/>
<td id="filter-feedbacks">
<div id="div1"></div>
<button class="btn btn-secondary" onclick="goBack()">Zur&uuml;ck</button>
<%--<iframe width="90%" height="200%" src="http://rocketchat.westeurope.cloudapp.azure.com/channel/general?layout=embedded"></iframe>
--%>
<%--<p id="view"></p> type="hidden"--%>
<input type="hidden" name="peerfeedbackID" id="peerfeedbackID-input" value=""/>
<div style="height: 100px; overflow: auto">
<div class="feedback-container">
<p>Sender</p>
<span class="time-right">11:00</span>
</div>
</div>
<script>
function goBack() {
window.history.back();
}
</script>
</td>
<td id="view-feedbacks">
<div style="height: 300px; overflow: auto">
<div class="feedback-container">
<p>Hello. How are you today?</p>
<span class="time-right">11:00</span>
</div>
<div class="feedback-container">
<p>Hey! I'm fine. Thanks for asking!</p>
<span class="time-left">11:01</span>
</div>
<div class="feedback-container">
<p>Sweet! So, what do you wanna do today?</p>
<span class="time-right">11:02</span>
</div>
<div id="div1"></div>
</div>
</td>
<button class="btn btn-secondary" onclick="goBack()">Zur&uuml;ck</button>
<script>
function goBack() {
window.history.back();
}
</script>
</td>
<td id="chat">
<div class="card">
<div class="card-header">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment