# 78/79 view all feedbacks by sender

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/Controller/PeerFeedbackController.java

@@ -2,11 +2,10 @@ package unipotsdam.gf.modules.peer2peerfeedback.peerfeedback.Controller;
 
 import unipotsdam.gf.core.database.mysql.MysqlConnect;
 import unipotsdam.gf.core.database.mysql.VereinfachtesResultSet;
-import unipotsdam.gf.modules.annotation.model.Annotation;
-import unipotsdam.gf.modules.annotation.model.AnnotationBody;
 import unipotsdam.gf.modules.peer2peerfeedback.Category;
 import unipotsdam.gf.modules.peer2peerfeedback.peerfeedback.Model.Peer2PeerFeedback;
 
+import java.util.ArrayList;
 import java.util.UUID;
 
 public class PeerFeedbackController {
@@ -71,6 +70,30 @@ public class PeerFeedbackController {
 
     }
 
+    public ArrayList<Peer2PeerFeedback> getAllFeedbacks(String sender) {
+
+        ArrayList<Peer2PeerFeedback> feedbacks = new ArrayList<>();
+
+        // establish connection
+        MysqlConnect connection = new MysqlConnect();
+        connection.connect();
+
+        // build and execute request
+        String request = "SELECT * FROM peerfeedback WHERE sender= ?;";
+        VereinfachtesResultSet rs = connection.issueSelectStatement(request, sender);
+
+        while (rs.next()) {
+            feedbacks.add(getPeerfeedbackFromResultSet(rs));
+        }
+
+        // close connection
+        connection.close();
+        System.out.print(feedbacks);
+        return feedbacks;
+
+    }
+
+
     private Peer2PeerFeedback getPeerfeedbackFromResultSet(VereinfachtesResultSet rs) {
 
         String id = rs.getString("id");

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/View/PeerFeedbackView.java

@@ -10,6 +10,7 @@ import unipotsdam.gf.modules.peer2peerfeedback.peerfeedback.Controller.PeerFeedb
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import java.util.ArrayList;
 
 @Path("/peerfeedback")
 //@Consumes({"application/json"})
@@ -44,11 +45,11 @@ public class PeerFeedbackView {
 
     @GET
     @Produces(MediaType.APPLICATION_JSON)
-    @Path("{id}")
-    public Response getPeerfeedback(@PathParam("id") String id){
+    @Path("{sender}")
+    public Response getPeerfeedback(@PathParam("sender") String sender){
 
         PeerFeedbackController controller = new PeerFeedbackController();
-        Peer2PeerFeedback fd = controller.getPeer2PeerFeedback(id);
+        ArrayList<Peer2PeerFeedback> fd = controller.getAllFeedbacks(sender);
         return Response.ok(fd).build();
     }
 

gemeinsamforschen/src/main/webapp/assets/js/givepeerfeedback.js

@@ -10,10 +10,11 @@ $(document).ready(function() {
     var peerfeedbackID = getQueryVariable("Peerfeedback");
     console.log(peerfeedbackID);
     var peerfeedbackID = "a3cef66d-e1b7-4030-8fcd-1413d6e77ba0";
+    var sender = "sender";
     console.log(peerfeedbackID);
     //if(peerfeedbackID) {
         $.ajax({
-            url: "../rest/peerfeedback/"+peerfeedbackID     //{id}
+            url: "../rest/peerfeedback/"+sender              //peerfeedbackID     {id}
 
         }).then(function (data) {
             //$('#editor').append(data.descriptionMD);
@@ -21,25 +22,26 @@ $(document).ready(function() {
             loadFeedback(data);
             console.log("function2");
 
-            document.getElementById("Peerfeedback").innerHTML = data;
+            //document.getElementById("Peerfeedback").innerHTML = data.text +"text";
             //document.write(data);
             //console.log(data);
-
+            /**
             var newDiv = document.createElement("div");
             var newContent = document.createTextNode(data.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");
-            document.body.insertBefore(newDiv, currentDiv);
-
+            currentDiv.appendChild(newDiv);
+            //document.body.insertBefore(newDiv, currentDiv);
+            */
             //$('#peerfeedbackID').val(peerfeedbackID);
             console.log(data);
         });
    // }
     function loadFeedback(data) {
         for (var feedback in data) {
-            var feedbackString = '<div class="pf-container">' +
+            /**var feedbackString = '<div class="pf-container">' +
                 '<div class="journal-date"> ' +
                 data[feedback].timestamp +
                 '</div>' +
@@ -56,8 +58,17 @@ $(document).ready(function() {
                 '<div class="journal-text">' +
                 data[feedback].entryHTML +
                 '</div>' +
-                '</div><br><br>';
+                '</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.
+
+            // 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);
 
-            $('.Peerfeedback').append(feedbackString)
+            //$('.Peerfeedback').append(feedbackString)
         }};
 })
\ No newline at end of file

gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp

@@ -49,7 +49,7 @@
                         <%--<iframe width="90%" height="200%" src="http://rocketchat.westeurope.cloudapp.azure.com/channel/general?layout=embedded"></iframe>
                         --%>
                         <%--<p id="view"></p>      type="hidden"--%>
-                        <input  name="peerfeedbackID" id="peerfeedbackID-input" value=""/>
+                        <input  type="hidden" name="peerfeedbackID" id="peerfeedbackID-input" value=""/>
 
                         <div id="div1"></div>