From 238aba3499809f17777f809df5831b9b089eda32 Mon Sep 17 00:00:00 2001
From: KKlaue <kathariina.klaue@gmail.com>
Date: Sun, 30 Sep 2018 22:34:50 +0200
Subject: [PATCH] final commit
---
.../PeerFeedbackService.java | 5 -
.../Controller/PeerFeedbackController.java | 45 +--
.../PeerFeedbackController.java.orig | 282 ------------------
.../Model/Peer2PeerFeedback.java.orig | 120 --------
.../peerfeedback/View/PeerFeedbackView.java | 9 +-
.../View/PeerFeedbackView.java.orig | 118 --------
.../webapp/annotation/annotation-document.jsp | 15 +-
.../main/webapp/core/overview-student.js.orig | 101 -------
.../webapp/feedback/css/viewfeedback.css.orig | 153 ----------
.../main/webapp/feedback/give-feedback.jsp | 27 +-
.../webapp/feedback/js/givepeerfeedback.js | 17 +-
.../feedback/js/givepeerfeedback.js.orig | 198 ------------
.../webapp/feedback/js/viewpeerfeedback.js | 33 +-
.../src/main/webapp/project-student.jsp.orig | 126 --------
.../src/scripts/dbschema/peerfeedback | 4 +-
15 files changed, 79 insertions(+), 1174 deletions(-)
delete mode 100644 gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/PeerFeedbackService.java
delete mode 100644 gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/Controller/PeerFeedbackController.java.orig
delete mode 100644 gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/Model/Peer2PeerFeedback.java.orig
delete mode 100644 gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/View/PeerFeedbackView.java.orig
delete mode 100644 gemeinsamforschen/src/main/webapp/core/overview-student.js.orig
delete mode 100644 gemeinsamforschen/src/main/webapp/feedback/css/viewfeedback.css.orig
delete mode 100644 gemeinsamforschen/src/main/webapp/feedback/js/givepeerfeedback.js.orig
delete mode 100644 gemeinsamforschen/src/main/webapp/project-student.jsp.orig
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/PeerFeedbackService.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/PeerFeedbackService.java
deleted file mode 100644
index 60a1f827..00000000
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/PeerFeedbackService.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package unipotsdam.gf.modules.peer2peerfeedback;
-
-public interface PeerFeedbackService {
-
-}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/Controller/PeerFeedbackController.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/Controller/PeerFeedbackController.java
index 57c5d593..86530f22 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/Controller/PeerFeedbackController.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/Controller/PeerFeedbackController.java
@@ -5,13 +5,14 @@ import unipotsdam.gf.core.database.mysql.VereinfachtesResultSet;
import unipotsdam.gf.modules.peer2peerfeedback.Category;
import unipotsdam.gf.modules.peer2peerfeedback.peerfeedback.Model.Peer2PeerFeedback;
+import java.net.URL;
+import java.net.URLConnection;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.UUID;
public class PeerFeedbackController {
- //@Override
public String createPeer2PeerFeedback(Peer2PeerFeedback feedback) {
String uuid = UUID.randomUUID().toString();
@@ -19,47 +20,52 @@ public class PeerFeedbackController {
MysqlConnect connection = new MysqlConnect();
connection.connect();
- //MysqlConnect connection1 = new MysqlConnect();
- //connection1.connect();
-
String request = "INSERT INTO peerfeedback (`id`, `reciever`, `sender`, `text`, `category`, `filename`) VALUES (?,?,?,?,?,?);";
connection.issueInsertOrDeleteStatement(request, uuid, feedback.getFeedbackreceiver(), feedback.getFeedbacksender(), feedback.getText(), feedback.getFeedbackcategory(), feedback.getFilename());
System.out.print("FEEDBACKCREATE");
- //String req = "UPDATE peerfeedback SET reciever =(SELECT token FROM users WHERE name=?) WHERE reciever=?";
- //connection1.issueUpdateStatement(req, feedback.getFeedbackreceiver(), feedback.getFeedbackreceiver());
- //System.out.print("FEEDBACKUPDATE");
- // close connection
+
connection.close();
- //connection1.close();
String pair = feedback.getFeedbacksender();
String[] pp = pair.split("'+'");
System.out.print("pair" + pp[0]);
String ur = "../give-feedback.jsp?token="+pp[0];
+ try{
+ URL url = new URL ("http://localhost:8080/feedback/give-feedback.jsp?token=");
+ URLConnection urlcon = url.openConnection();
+ urlcon.connect();
+ System.out.print("connect");
+ }
+ catch (Exception exp){
+ System.out.print("error to connect");
+ }
+
return ("wurde gesendet!"+ur);
}
- public ArrayList<Peer2PeerFeedback> getsendedPeerfedback(String sender) {
+ public ArrayList<Peer2PeerFeedback> getsendedPeerfeedback(String sender) {
- ArrayList<Peer2PeerFeedback> feedbacksbysender = new ArrayList<>();
+ ArrayList<Peer2PeerFeedback> fe = new ArrayList<>();
MysqlConnect connection = new MysqlConnect();
connection.connect();
- System.out.print("SENDER"+sender);
+ System.out.print("SENDER" + sender);
String request = "SELECT * FROM peerfeedback WHERE sender= ?;";
- VereinfachtesResultSet rs = connection.issueSelectStatement(request, sender);
- System.out.print("rs:"+rs);
+ VereinfachtesResultSet rss = connection.issueSelectStatement(request, sender);
+ System.out.print("rs:" + rss);
+ System.out.print("rs:" + rss.next());
- while (rs.next()) {
- feedbacksbysender.add(getPeerfeedbackFromResultSet(rs));
+ while (rss.next()) {
+ fe.add(getPeerfeedbackFromResultSet(rss));
+ System.out.print("FEEDBACKSSS" + fe);
}
connection.close();
- System.out.print("FEEDBACKS"+feedbacksbysender);
- return feedbacksbysender;
+ System.out.print("FEEDBACKSSS" + fe);
+ return fe;
}
public ArrayList<Peer2PeerFeedback> getRecievedPeerfeedback(String reciever) {
@@ -80,7 +86,7 @@ public class PeerFeedbackController {
}
connection.close();
- System.out.print("FEEDBACKS"+rf);
+ System.out.print("FEEDBACKSRR"+rf);
return rf;
}
@@ -94,6 +100,7 @@ public class PeerFeedbackController {
String request = "SELECT * FROM peerfeedback WHERE reciever= ? AND sender= ?;";
VereinfachtesResultSet rs = connection.issueSelectStatement(request, reciever, sender);
System.out.print("rsfb:"+rs);
+
while (rs.next()) {
feedbacks.add(getPeerfeedbackFromResultSet(rs));
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/Controller/PeerFeedbackController.java.orig b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/Controller/PeerFeedbackController.java.orig
deleted file mode 100644
index 5a7301fb..00000000
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/Controller/PeerFeedbackController.java.orig
+++ /dev/null
@@ -1,282 +0,0 @@
-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.peer2peerfeedback.Category;
-import unipotsdam.gf.modules.peer2peerfeedback.peerfeedback.Model.Peer2PeerFeedback;
-
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.UUID;
-
-public class PeerFeedbackController {
-
- //@Override
- public void createPeer2PeerFeedback(Peer2PeerFeedback feedback) {
-
- // create a new id if we found no id.
- String uuid = UUID.randomUUID().toString();
- // while (existsfeedbackId(uuid)) {
- // uuid = UUID.randomUUID().toString();
- // }
-
- // establish connection
- MysqlConnect connection = new MysqlConnect();
- connection.connect();
-
- MysqlConnect connection1 = new MysqlConnect();
- connection1.connect();
-
- // build and execute request
- String request = "INSERT INTO peerfeedback (`id`, `reciever`, `sender`, `text`, `category`, `filename`) VALUES (?,?,?,?,?,?);";
- connection.issueInsertOrDeleteStatement(request, uuid, feedback.getFeedbackreceiver(), feedback.getFeedbacksender(), feedback.getText(), feedback.getFeedbackcategory(), feedback.getFilename());
-
- String req = "UPDATE peerfeedback SET reciever =(SELECT token FROM users WHERE name=?) WHERE reciever=?";
- connection1.issueUpdateStatement(req, feedback.getFeedbackreceiver(), feedback.getFeedbackreceiver());
- // close connection
- connection.close();
- connection1.close();
-
- // return Response.ok().build();
- //return null;
-
- }
-
- public ArrayList<Peer2PeerFeedback> getAllFeedbacks(String reciever) {
-
- ArrayList<Peer2PeerFeedback> feedbacks = new ArrayList<>();
-
- // establish connection
- MysqlConnect connection = new MysqlConnect();
- connection.connect();
-
- // build and execute request
- String request = "SELECT * FROM peerfeedback WHERE reciever= ?;";
- VereinfachtesResultSet rs = connection.issueSelectStatement(request, reciever);
- System.out.print("rs:"+rs);
- while (rs.next()) {
- feedbacks.add(getPeerfeedbackFromResultSet(rs));
- }
-
- // close connection
- connection.close();
- System.out.print(feedbacks);
- return feedbacks;
-
- }
-
- public ArrayList<Peer2PeerFeedback> getFeedbacksBySender(String reciever, 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 reciever= ? AND sender= ?;";
- VereinfachtesResultSet rs = connection.issueSelectStatement(request, reciever, sender);
- System.out.print("rsfb:"+rs);
- while (rs.next()) {
- feedbacks.add(getPeerfeedbackFromResultSet(rs));
- }
-
- // close connection
- connection.close();
- System.out.print(feedbacks);
- return feedbacks;
-
- }
- } else {
- public ArrayList<String> getSender(String token){
-
- ArrayList<String> username = new ArrayList<>();
- ArrayList<String> tok = new ArrayList<>();
-
- // establish connection
- MysqlConnect connection1 = new MysqlConnect();
- connection1.connect();
-
- //for (int i = 0; i < token.length(); i++) {
- String[] pair = token.split(",");
- System.out.print("pair" + pair);
- for(int i = 0; i < pair.length; i++) {
- String request1 = "SELECT * FROM users WHERE token= ?;";
- VereinfachtesResultSet rs1 = connection1.issueSelectStatement(request1, pair[i]);
-
- while (rs1.next()) {
- username.add(getNameFromResultSet(rs1));
- }
- }
- //}
- // build and execute request
- /**System.out.print("token:"+token);
- String request1 = "SELECT * FROM users WHERE token= ?;";
- VereinfachtesResultSet rs1 = connection1.issueSelectStatement(request1, token);
- System.out.print("getSender:"+rs1);
-
- while (rs1.next()) {
- username.add(getNameFromResultSet(rs1));
- }*/
- System.out.print("getSender:"+username);
- return username;
- }
-
-
-
- public ArrayList<String> getUserforFeedback(String token) {
-
- System.out.print("IN");
-
- ArrayList<String> users = new ArrayList<>();
- ArrayList<String> email = new ArrayList<>();
- ArrayList<String> emails = new ArrayList<>();
- ArrayList<String> groupid = new ArrayList<>();
-
- // establish connection
- MysqlConnect connection = new MysqlConnect();
- connection.connect();
-
- String request1 = "SELECT * FROM users WHERE token=?";
- VereinfachtesResultSet rs1 = connection.issueSelectStatement(request1, token);
- while (rs1.next()) {
- email.add(getMailFromResultSet(rs1));
- }
- System.out.print("rs1:"+email);
- String el = email.get(0);
- System.out.print("email"+el);
-
-
- // establish connection
- MysqlConnect connection1 = new MysqlConnect();
- connection1.connect();
-
- String request2 = "SELECT * FROM groupuser WHERE userEmail=?";
- VereinfachtesResultSet rs2 = connection1.issueSelectStatement(request2, el);
-
- while (rs2.next()) {
- groupid.add(getGroupIDFromResultSet(rs2));
- }
- String us = groupid.get(0);
- System.out.print("groupid"+us);
-
-
- // establish connection
- MysqlConnect connection2 = new MysqlConnect();
- connection2.connect();
-
- String request3 = "SELECT * FROM groupuser WHERE groupId=?";
- VereinfachtesResultSet rs3 = connection2.issueSelectStatement(request3, us);
-
- while (rs3.next()) {
- emails.add(getEmailFromResultSet(rs3));
- }
- String ems = emails.get(0);
- System.out.print("emails:"+emails);
- String[] e = ems.split(",");
- System.out.print("emails:"+e);
-
-
- // establish connection
- MysqlConnect connection3 = new MysqlConnect();
- connection3.connect();
-
- for (int i = 0; i < emails.size(); i++) {
- String pair = emails.get(i);
- System.out.print("pair" + pair);
- String request4 = "SELECT * FROM users WHERE email=? AND NOT token=?";
- VereinfachtesResultSet rs4 = connection3.issueSelectStatement(request4, pair, token);
-
- while (rs4.next()) {
- users.add(getNameFromResultSet(rs4));
- }
-
- }
-
- System.out.print("rs4:" + users);
- // close connection
- connection.close();
- connection1.close();
- connection2.close();
- connection3.close();
- System.out.print("userscontroller:"+users);
- return users;
-
- }
-
-
- public boolean checkFeedback(String checkFeedback) {
-
- // establish connection
- MysqlConnect connection = new MysqlConnect();
- connection.connect();
-
- // build and execute request
- String request = "SELECT * FROM peerfeedback WHERE sender = ?;";
- VereinfachtesResultSet rs = connection.issueSelectStatement(request, checkFeedback);
- System.out.print(rs);
-
- if (rs!=null) {
- System.out.print("true");
- // close connection
- connection.close();
-
- return true;
-
- } else {
- System.out.print("false");
- // close connection
- connection.close();
-
- return false;
- }
-
- }
-
-
- private Peer2PeerFeedback getPeerfeedbackFromResultSet(VereinfachtesResultSet rs) {
-
- String id = rs.getString("id");
- Timestamp timestamp = rs.getTimestamp(2);
- String category = rs.getString("category");
- String rec = rs.getString("text");
- String sender = rs.getString("sender");
- String txt = rs.getString("reciever");
- String filename = rs.getString("filename");
-
- //return new Peer2PeerFeedback("id", 1234, Category.TITEL, "reciever", "sender", "test", "filename");
- return new Peer2PeerFeedback(id,timestamp,Category.valueOf(category),rec, sender, txt, filename);
- }
-
- private String getGroupIDFromResultSet(VereinfachtesResultSet rs) {
-
- String grID = rs.getString("groupId");
- return new String(grID);
- }
-
- private String getEmailFromResultSet(VereinfachtesResultSet rs) {
-
- String mail = rs.getString("userEmail");
- return new String(mail);
- }
-
- private String getNameFromResultSet(VereinfachtesResultSet rs) {
-
- String name = rs.getString("name");
- String token = rs.getString("token");
- return new String(name+"+"+token);
- }
-
- private String getMailFromResultSet(VereinfachtesResultSet rs) {
-
- String mail = rs.getString("email");
- return new String(mail);
- }
-
- private String getTokenFromResultSet(VereinfachtesResultSet rs) {
-
- String token = rs.getString("sender");
- return new String(token);
- }
-
-}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/Model/Peer2PeerFeedback.java.orig b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/Model/Peer2PeerFeedback.java.orig
deleted file mode 100644
index c7b2505b..00000000
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/Model/Peer2PeerFeedback.java.orig
+++ /dev/null
@@ -1,120 +0,0 @@
-package unipotsdam.gf.modules.peer2peerfeedback.peerfeedback.Model;
-
-import unipotsdam.gf.modules.peer2peerfeedback.Category;
-
-<<<<<<< HEAD
-import java.io.File;
-import java.sql.Time;
-import java.sql.Timestamp;
-=======
-import static unipotsdam.gf.view.MarkdownUtils.convertMarkdownToHtml;
->>>>>>> origin/development_master
-
-/**
- * Peer2PeerFeedback Object
- * created by Katharina
- */
-
-public class Peer2PeerFeedback {
-
-
- private String id;
- private Timestamp timestamp;
- private Category category;
- private String text;
- private String sender;
- private String receiver;
- private String filename;
-
- public Peer2PeerFeedback(String id, Timestamp timestamp, Category category, String text, String sender, String receiver, String filename) {
- this.id = id;
- this.timestamp = timestamp;
- this.category = category;
- this.text = convertMarkdownToHtml(text);
- this.sender = sender;
- this.receiver = receiver;
- this.filename = filename;
- }
-
- public Peer2PeerFeedback() {
-
- }
-
- public String getID() {
- return id;
- }
-
- public void setID(String id) {
- this.id = id;
- }
-
-<<<<<<< HEAD
- public Timestamp getTimestamp() { return timestamp; }
-
- public void setTimestamp(Timestamp timestamp) { this.timestamp = timestamp; }
-=======
- public long getTimestamp() {
- return timestamp;
- }
-
- public void setTimestamp(long timestamp) {
- this.timestamp = timestamp;
- }
->>>>>>> origin/development_master
-
- public Category getFeedbackcategory() {
- return category;
- }
-
- public void setFeedbackcategory(Category category) {
- this.category = category;
- }
-
- public String getText() {
- return text;
- }
-
- public void setText(String text) {
- this.text = text;
- }
-
- public String getFilename() {
- return filename;
- }
-
- public void setFilename(String filename) {
- this.filename = filename;
- }
-
- public String getFeedbacksender() {
- return sender;
- }
-
- public void setFeedbacksender(String sender) {
- this.sender = sender;
- }
-
- public String getFeedbackreceiver() {
- return receiver;
- }
-
- public void setFeedbackreceiver(String receiver) {
- this.receiver = receiver;
- }
-
-
- @Override
- public String toString() {
- return "Peer2PeerFeedback{" +
- "id=" + id +
- ", timestamp=" + timestamp +
- ", category=" + category +
- ", sender='" + sender +
- ", receiver=" + receiver +
- ", text=" + text +
- ", filename=" + filename +
- '}';
- }
-
-
-}
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/View/PeerFeedbackView.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/View/PeerFeedbackView.java
index 72ce0680..c68e87a1 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/View/PeerFeedbackView.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/View/PeerFeedbackView.java
@@ -61,10 +61,10 @@ public class PeerFeedbackView {
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("/sendedfeedback/{zsm}")
- public Response getPeerfeedback(@PathParam("zsm") String sender){
+ public Response getSendedPeerfeedback(@PathParam("zsm") String sender){
PeerFeedbackController controller = new PeerFeedbackController();
- ArrayList<Peer2PeerFeedback> fd = controller.getsendedPeerfedback(sender);
+ ArrayList<Peer2PeerFeedback> fd = controller.getsendedPeerfeedback(sender);
System.out.print("getallfd:"+fd);
return Response.ok(fd).build();
}
@@ -92,9 +92,10 @@ public class PeerFeedbackView {
*/
@GET
@Produces(MediaType.APPLICATION_JSON)
- @Path("/getUsers/{token}")
- public Response getUsers(@PathParam("token") String token){
+ @Path("/getUsers/{student}")
+ public Response getUsers(@PathParam("student") String token){
+ System.out.print("usersview:"+token);
PeerFeedbackController controller = new PeerFeedbackController();
ArrayList<String> users = controller.getUserforFeedback(token);
System.out.print("usersview:"+users);
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/View/PeerFeedbackView.java.orig b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/View/PeerFeedbackView.java.orig
deleted file mode 100644
index ff29f7a5..00000000
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/View/PeerFeedbackView.java.orig
+++ /dev/null
@@ -1,118 +0,0 @@
-package unipotsdam.gf.modules.peer2peerfeedback.peerfeedback.View;
-
-import unipotsdam.gf.modules.peer2peerfeedback.Category;
-import unipotsdam.gf.modules.peer2peerfeedback.peerfeedback.Controller.PeerFeedbackController;
-import unipotsdam.gf.modules.peer2peerfeedback.peerfeedback.Model.Peer2PeerFeedback;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-
-@Path("/peerfeedback")
-@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
-@Produces(MediaType.APPLICATION_JSON)
-public class PeerFeedbackView {
-
-
- @POST
- @Path("/save")
-<<<<<<< HEAD
- public Response createPeerfeedback(@FormParam("id") String id, @FormParam("timestamp") Timestamp timestamp, @FormParam("category") Category category,
- @FormParam("student") String sender, @FormParam("reciever") String reciever, @FormParam("text") String text, @FormParam("filename") String filename) {
-=======
- public Response createPeerfeedback(@FormParam("text") String text, @FormParam("student") String student, @FormParam("id") String id, @FormParam("reciever") String reciever,
- @FormParam("sender") String sender, @FormParam("filename") String filename, @FormParam("category") Category category, @FormParam("timestamp") Long timestamp) {
->>>>>>> origin/development_master
-
- //Peer2PeerFeedback feedback = new Peer2PeerFeedback(id, timestamp, Category.TITEL, sender, text, reciever, filename);
- Peer2PeerFeedback f = new Peer2PeerFeedback();
- f.setID(id);
- f.setTimestamp(timestamp);
- f.setFeedbackcategory(category);
- f.setFeedbacksender(sender);
- f.setFeedbackreceiver(reciever);
- f.setText(text);
- f.setFilename(filename);
- System.out.print(f);
- //Peer2PeerFeedback fd = new Peer2PeerFeedback(id="1234", timestamp=null, Category.TITEL, sender="sender", text="test1", reciever="reciever", filename="filename");
-
- PeerFeedbackController controller = new PeerFeedbackController();
- controller.createPeer2PeerFeedback(f);
-
-
- return Response.ok().build(); //feedback
-
- }
-
- @GET
- @Produces(MediaType.APPLICATION_JSON)
-<<<<<<< HEAD
- @Path("{student}")
- public Response getPeerfeedback(@PathParam("student") String sender){
-=======
- @Path("{sender}")
- public Response getPeerfeedback(@PathParam("sender") String sender) {
->>>>>>> origin/development_master
-
- PeerFeedbackController controller = new PeerFeedbackController();
- ArrayList<Peer2PeerFeedback> fd = controller.getAllFeedbacks(sender);
- System.out.print("getallfd:"+fd);
- return Response.ok(fd).build();
- }
-
- @GET
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/getUsers/{token}")
- public Response getUsers(@PathParam("token") String token){
-
- PeerFeedbackController controller = new PeerFeedbackController();
- ArrayList<String> users = controller.getUserforFeedback(token);
- System.out.print("usersview:"+users);
- return Response.ok(users).build();
- }
-
- @GET
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/checkFeedback/{checkFeedback}")
- public Response checkFeedback(@PathParam("checkFeedback") String checkFeedback){
-
- System.out.print("sendcf:"+checkFeedback);
- PeerFeedbackController controller = new PeerFeedbackController();
- Boolean check = controller.checkFeedback(checkFeedback);
- System.out.print("checkcf:"+check);
- return Response.ok(check).build();
- }
-
- @GET
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/getSender/{list}")
- public Response getSender(@PathParam("list") String token){
-
- System.out.print("sendcf:"+token);
- PeerFeedbackController controller = new PeerFeedbackController();
- ArrayList<String> name = controller.getSender(token);
- System.out.print("checkcf:"+name);
- return Response.ok(name).build();
- }
-
-
- @GET
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/getfeedbackbysender/{student}/{sender}")
- public Response getFeedbackBySender(@PathParam("student") String reciever, @PathParam("sender") String sender){
-
- System.out.print("fb:"+reciever+sender);
- PeerFeedbackController controller = new PeerFeedbackController();
- ArrayList<Peer2PeerFeedback> fb = controller.getFeedbacksBySender(reciever, sender);
- System.out.print("fb:"+fb);
- return Response.ok(fb).build();
- }
-}
diff --git a/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp b/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
index f521bcbc..ac44fedf 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
@@ -50,13 +50,14 @@
<div class="leftcolumn">
<div class="leftcontent">
<div class="leftcontent-text context-menu-one" id="documentText">
- hier steht etwas
- Lorem
- lipsum
- <script>
- document.getElementById("documentText").innerHTML = Math.random().toString(36);
- </script>
-
+ Nunc scelerisque luctus inceptos libero convallis dolor lacus curabitur metus augue auctor
+ Gravida phasellus vulputate neque odio sociosqu scelerisque rhoncus fusce, risus aliquam volutpat lacus litora curae
+ Posuere diam placerat metus feugiat primis etiam cursus aenean justo hendrerit fringilla auctor
+ Eget cursus neque non ornare egestas mattis donec dapibus, platea augue conubia phasellus tempus dolor
+ Ullamcorper fermentum sociosqu maecenas habitant in senectus hac
+ Fermentum integer aliquet sapien mollis dolor torquent vulputate arcu mollis
+ Vulputate erat at augue odio quis, himenaeos luctus nostra eu velit, gravida risus vestibulum accumsan
+ Condimentum aptent porttitor volutpat sagittis
</div>
<div class="leftcontent-buttons">
<div class="leftcontent-buttons-back">
diff --git a/gemeinsamforschen/src/main/webapp/core/overview-student.js.orig b/gemeinsamforschen/src/main/webapp/core/overview-student.js.orig
deleted file mode 100644
index 88970518..00000000
--- a/gemeinsamforschen/src/main/webapp/core/overview-student.js.orig
+++ /dev/null
@@ -1,101 +0,0 @@
-$(document).ready(function(){
- let studentId = $('#user').html().trim();
- getProjects(studentId);
- $('#enrollProject').on('click', function(){
- location.href="management/join-project.jsp?token="+getUserTokenFromUrl();
- });
-});
-
-function updateStatus(projectId){
- $.ajax({
- url: 'rest/phases/projects/'+projectId,
- headers: {
- "Content-Type": "application/json",
- "Cache-Control": "no-cache"
- },
- type: 'GET',
- success: function (response) {
- let statusField = $('#status'+projectId);
- switch (response){
- case "CourseCreation":
- statusField.html("Der Kurs wurde gerade angelegt. Sie können sich nun anmelden.");
- break;
- case "GroupFormation":
- statusField.html("Ihr Dozent ordnet Sie nun einer Gruppe zu.");
- break;
- case "DossierFeedback":
- statusField.html("Geben sie wenigstens einem Gruppenmitglied Feedback und erstellen sie ein Dossier in Ihrer Gruppe.");
- break;
- case "Execution":
- statusField.html("Forschen Sie zu Ihrer Forschungsfrage und reflektieren Sie ihr Vorgehen mit dem Journal");
- break;
- case "Assessment":
- statusField.html("Nehmen Sie die Bewertungen vor.");
- break;
- case "Projectfinished":
- getGrade(projectId);
- break;
- default:
- break;
- }
-
- },
- error: function (a) {
-
- }
- });
-}
-
-function getGrade(projectId){
- let studentId = $('#user').html().trim();
- $.ajax({
- url: 'rest/assessments/get/project/'+projectId+'/student/'+studentId,
- headers: {
- "Content-Type": "application/json",
- "Cache-Control": "no-cache"
- },
- type: 'GET',
- success: function (response) {
- $('#status'+projectId).html("Sie erreichten "+response+"%");
- },
- error: function(a){
- }
- });
-}
-
-function getProjects(studentId){
- $.ajax({
- url: 'rest/project/all/student/' + studentId,
- headers: {
- "Content-Type": "text/plain",
- "Cache-Control": "no-cache"
- },
- type: 'GET',
- success: function (response) {
- let tmplObject = [];
- for (let project in response){
- if (response.hasOwnProperty(project))
- tmplObject.push({projectName: response[project]});
- }
- $('#projectTRTemplate').tmpl(tmplObject).appendTo('#projects');
-
- for (let i=0; i<response.length; i++){
- let projectName = response[i];
- updateStatus(projectName);
- $('#project'+projectName).on('click', function(){
- location.href = "project-student.jsp?token=" + getUserTokenFromUrl() + '&projectId=' + projectName;
- });
- }
- },
- error: function(a){
-
- }
- });
-<<<<<<< HEAD
- $('.viewfeedback').click(function () {
- location.href="viewfeedback.jsp?token="+getUserTokenFromUrl();
- });
-});
-=======
-}
->>>>>>> origin/development_master
diff --git a/gemeinsamforschen/src/main/webapp/feedback/css/viewfeedback.css.orig b/gemeinsamforschen/src/main/webapp/feedback/css/viewfeedback.css.orig
deleted file mode 100644
index d95003f4..00000000
--- a/gemeinsamforschen/src/main/webapp/feedback/css/viewfeedback.css.orig
+++ /dev/null
@@ -1,153 +0,0 @@
-
-.container{max-width:1170px; margin:auto;}
-img{ max-width:100%;}
-.inbox_people {
- background: #f8f8f8 none repeat scroll 0 0;
- float: left;
- overflow: hidden;
- width: 40%; border-right:1px solid #c4c4c4;
-}
-.inbox_msg {
- border: 1px solid #c4c4c4;
- clear: both;
- overflow: hidden;
-}
-.top_spac{ margin: 20px 0 0;}
-
-
-.recent_heading {float: left; width:40%;}
-.srch_bar {
- display: inline-block;
- text-align: right;
- width: 60%;
-}
-.headind_srch{ padding:10px 29px 10px 20px; overflow:hidden; border-bottom:1px solid #c4c4c4;}
-
-.recent_heading h4 {
- color: #05728f;
- font-size: 21px;
- margin: auto;
-}
-.srch_bar input{ border:1px solid #cdcdcd; border-width:0 0 1px 0; width:80%; padding:2px 0 4px 6px; background:none;}
-.srch_bar .input-group-addon button {
- background: rgba(0, 0, 0, 0) none repeat scroll 0 0;
- border: medium none;
- padding: 0;
- color: #707070;
- font-size: 18px;
-}
-.srch_bar .input-group-addon { margin: 0 0 0 -27px;}
-
-.chat_ib h5{ font-size:17px; color:#464646; margin:0 0 8px 0;}
-.chat_ib h5 span{ font-size:13px; float:right;}
-.chat_ib p{ font-size:14px; color:#989898; margin:auto}
-.chat_img {
- float: left;
- width: 19%;
-}
-.chat_ib {
- float: left;
- padding-top: 30px;
- width: 88%;
-}
-
-.chat_people{ overflow:hidden;}
-.chat_list {
- border-bottom: 1px solid #c4c4c4;
- margin: 0;
- padding: 18px 16px 10px;
- width: 100%;
- height: 50%;
-}
-.inbox_chat { height: 550px; overflow-y: scroll;}
-
-<<<<<<< HEAD
-.active_chat{ background:#ebebeb;}
-
-.incoming_msg_img {
- display: inline-block;
- width: 6%;
-}
-.received_msg {
- display: inline-block;
- padding: 0 0 0 10px;
- vertical-align: top;
- width: 92%;
-}
-.received_withd_msg p {
- background: #ebebeb none repeat scroll 0 0;
- border-radius: 3px;
- color: #646464;
- font-size: 14px;
- margin: 0;
- padding: 5px 10px 5px 12px;
- width: 100%;
-}
-.time_date {
- color: #747474;
- display: block;
- font-size: 12px;
- margin: 8px 0 0;
-}
-.received_withd_msg { width: 57%;}
-.mesgs {
- float: left;
- padding: 30px 15px 0 25px;
- width: 60%;
-=======
-.feedback-container img.right {
- float: right;
- margin-left: 20px;
- margin-right: 0;
->>>>>>> origin/development_master
-}
-
-.sent_msg p {
- background: #05728f none repeat scroll 0 0;
- border-radius: 3px;
- font-size: 14px;
- margin: 0; color:#fff;
- padding: 5px 10px 5px 12px;
- width:100%;
-}
-.outgoing_msg{ overflow:hidden; margin:26px 0 26px;}
-.sent_msg {
- float: right;
- width: 46%;
-}
-.input_msg_write input {
- background: rgba(0, 0, 0, 0) none repeat scroll 0 0;
- border: medium none;
- color: #4c4c4c;
- font-size: 15px;
- min-height: 48px;
- width: 100%;
-}
-
-.type_msg {border-top: 1px solid #c4c4c4;position: relative;}
-.msg_send_btn {
- background: #05728f none repeat scroll 0 0;
- border: medium none;
- border-radius: 50%;
- color: #fff;
- cursor: pointer;
- font-size: 17px;
- height: 33px;
- position: absolute;
- right: 0;
- top: 11px;
- width: 33px;
-}
-.messaging { padding: 0 0 50px 0;}
-.msg_history {
- height: 516px;
- overflow-y: auto;
-}
-.img-reciever{
- width: 30%;
- height: 30%;
- border-radius: 50%;
-}
-.img-sender{
- border-radius: 50%;
-}
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp b/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
index 90d2cb7a..7cc2c4c9 100644
--- a/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
@@ -26,7 +26,22 @@
<h2 style="padding-left: 15px"> Schreibe dein Feedback ein!</h2>
<div class="line-spacer"></div>
<hr />
+ <div style="padding-left: 17px">
+ <h3>Vorschläge für ein gutes Feedback:</h3>
+ <div>1. Beginne das Feedback mit etwas Positiven</div>
+ <div>2. Äußere dein Feedback</div>
+ <div>3. Beende das Feedback mit etwas Positiven</div>
+ <div style="height: 10px"></div>
+ <div>Hilfestellungen für Formulierungen: </div>
+ <div style="height: 10px"></div>
+ <div> - das hat mir gut gefallen, weil ...</div>
+ <div> - das habe ich nicht verstanden, weil ...</div>
+ <div> - an diesem Punkt kam ich nicht weiter, weil ...</div>
+ <div> - das könnte man besser machen, z. B. durch ...</div>
+ <div> - dabei habe ich noch eine Idee, z.B. ...</div>
+ </div>
+ <hr>
<div>
<table>
<tr>
@@ -59,8 +74,7 @@
</select>
</div>
- <div></div>
-
+ <div style="height: 10px"></div>
<div class="journal-form-category">
Feedbackempfänger:
<select name="reciever" id="reciever" form="journalform"> <%--form="journalform"--%>
@@ -69,17 +83,10 @@
<div class="journal-form-container">
- <div class="journal-form-editor" style="width: 80%">
+ <div class="journal-form-editor" style="width: 150%">
<textarea id="editor" name="text" form="journalform"></textarea> <%--form="journalform"--%>
</div>
- <div>
- Vorschläge für ein gutes Feedback
- 1 kkllaf
- 2 dasfna
- 3 jkdavnaol
- </div>
-
<div class="journal-form-buttons">
<button id="backLink" class="btn btn-default btn-sm"> Zurück </button>
<button id="sub" class="btn btn-default btn-sm"> Speichern </button>
diff --git a/gemeinsamforschen/src/main/webapp/feedback/js/givepeerfeedback.js b/gemeinsamforschen/src/main/webapp/feedback/js/givepeerfeedback.js
index 6cd4a469..3ad68eac 100644
--- a/gemeinsamforschen/src/main/webapp/feedback/js/givepeerfeedback.js
+++ b/gemeinsamforschen/src/main/webapp/feedback/js/givepeerfeedback.js
@@ -24,10 +24,6 @@ $(document).ready(function () {
$('#zsm').val(zsm);
console.log(zsm);
- console.log(window.parent.document.getElementById("user"));
-
- var x = localStorage.getItem("user");
- console.log(x);
$('#viewfeedback').click(function () {
location.href="../feedback/view-feedback.jsp?token="+getUserTokenFromUrl();
@@ -43,24 +39,21 @@ $(document).ready(function () {
forceSync: true,
});
- //var checkFeedback = student;
- //console.log(checkFeedback);
$('#sub').click(function () {
$.ajax({
- url: "../rest/peerfeedback/save" //+ student
+ url: "../rest/peerfeedback/save"
}).then(function (data) {
- console.log("save:"+data);
- location.href="../feedback/give-feedback.jsp?="+getUserTokenFromUrl();
-
+ //console.log("save:"+data);
+ return location.href="../feedback/give-feedback.jsp?="+getUserTokenFromUrl();
});
- return location.href="../feedback/give-feedback.jsp?="+getUserTokenFromUrl();
+ location.href="../feedback/give-feedback.jsp?="+getUserTokenFromUrl();
});
$.ajax({
- url: "../rest/peerfeedback/getUsers/" + zsm
+ url: "../rest/peerfeedback/getUsers/" + student
}).then(function (data) {
console.log("getUsers:"+data);
loadUsers(data);
diff --git a/gemeinsamforschen/src/main/webapp/feedback/js/givepeerfeedback.js.orig b/gemeinsamforschen/src/main/webapp/feedback/js/givepeerfeedback.js.orig
deleted file mode 100644
index 4c427efb..00000000
--- a/gemeinsamforschen/src/main/webapp/feedback/js/givepeerfeedback.js.orig
+++ /dev/null
@@ -1,198 +0,0 @@
-var student = getQueryVariable("token");
-var project = getQueryVariable("projectId");
-var name = getQueryVariable("user");
-var email = getQueryVariable("email");
-
-var sender = getQueryVariable("sender");
-var reciever = getQueryVariable("reciever");
-var filename = getQueryVariable("filename");
-var category = getQueryVariable("category");
-var timetamp = getQueryVariable("timestamp");
-//var project = getQueryVariable("projectId");
-
-console.log(student);
-
-function getQueryVariable(variable) {
- let query = window.location.search.substring(1);
- let vars = query.split("&");
- for (let i = 0; i < vars.length; i++) {
- let pair = vars[i].split("=");
- if (pair[0] === variable) {
- return pair[1];
- }
- }
- return (false);
-}
-
-$(document).ready(function () {
- $('#student').val(student);
- $('#project').val(project);
- $('#name').val(name);
-
- $('.viewfeedback').click(function () {
- location.href="viewfeedback.jsp?token="+getUserTokenFromUrl();
- });
-
-<<<<<<< HEAD
- new InscrybMDE({
- element: document.getElementById("editor"),
- spellChecker: false,
- forceSync: true,
- });
-
- var user = document.getElementById("user");
- user.setAttribute("name", document.getElementById("user").textContent);
- var cln_user = user.cloneNode(true);
- document.getElementById("journalform").appendChild(cln_user);
-
- var getToken = document.getElementById("user").textContent;
- //var checkFeedback = document.getElementById("user").textContent;
-
- //var i = document.getElementById("defaultCheck1").onclick.valueOf();
- //console.log("i:"+i);
-
- console.log(student);
- console.log(getToken);
-
- var checkFeedback = student;
- console.log(checkFeedback);
-
- $.ajax({
- url: "../rest/peerfeedback/save", //+ student
- }).then(function (data) {
- $('#editor').append(data.descriptionMD);
-
- console.log("save:"+data);
-
- });
-
- /**$.ajax({
- url: "../rest/peerfeedback/getToken/" +getToken,
- }).then(function (data) {
- console.log("getToken-js:"+data);
- });*/
-
- $.ajax({
- url: "../rest/peerfeedback/getUsers/" + student
- }).then(function (data) {
- console.log("getUsers:"+data);
- loadUsers(data);
- });
-
-
- $.ajax({
- url: "../rest/peerfeedback/checkFeedback/" +checkFeedback
- }).then(function (data) {
- console.log("checkFeedback:"+data);
- });
-
- function loadUsers(data) {
-
-
- for (var user in data) {
-
- var sender = [];
- var name = [];
-
- var pair = data[user].split("+");
- name.push(pair[0]);
- sender.push(pair[1]);
- console.log(name+sender);
-
- var newopt = document.createElement("OPTION");
-
- newopt.insertAdjacentHTML('beforeend', name);
- newopt.value = data[user];
-=======
- 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/" + sender //peerfeedbackID {id}
-
- }).then(function (data) {
- //$('#editor').append(data.descriptionMD);
- console.log("function1");
- loadFeedback(data);
- console.log("function2");
-
- //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");
- 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">' +
- '<div class="journal-date"> ' +
- data[feedback].timestamp +
- '</div>' +
- '<div class="journal-name">' +
- // TODO id to name
- data[feedback].text +
- '</div>' +
- '<div class="journal-category">' +
- data[feedback].id +
- '</div>' +
- '<div class="journal-edit" align="right">';
-
- feedbackString = feedbackString + '</div>' +
- '<div class="journal-text">' +
- data[feedback].entryHTML +
- '</div>' +
- '</div><br><br>';*/
-
- var newdiv = document.createElement("div");
-
-
- //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.
->>>>>>> origin/development_master
-
- // füge das neu erstellte Element und seinen Inhalt ins DOM ein
- var currentdiv = document.getElementById("reciever");
- currentdiv.appendChild(newopt);
-
- }
-
- }
-
-<<<<<<< HEAD
- /**function getUsername(name) {
- let query = data;
- let vars = query.split("+");
- for (let i = 0; i < vars.length; i++) {
- let pair = vars[i].split("=");
- if (pair[0] === name) {
- return pair[1];
- }
- }
- return (false);
- }*/
-=======
- //$('.Peerfeedback').append(feedbackString)
- }
- };
->>>>>>> origin/development_master
-})
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/feedback/js/viewpeerfeedback.js b/gemeinsamforschen/src/main/webapp/feedback/js/viewpeerfeedback.js
index fc88a04e..1ef53774 100644
--- a/gemeinsamforschen/src/main/webapp/feedback/js/viewpeerfeedback.js
+++ b/gemeinsamforschen/src/main/webapp/feedback/js/viewpeerfeedback.js
@@ -1,4 +1,3 @@
-
var student = getQueryVariable("token");
var project = getQueryVariable("projectId");
var name = getQueryVariable("user");
@@ -9,25 +8,21 @@ $(document).ready(function(){
$('#project').val(project);
$('#name').val(name);
-
console.log(student);
var nme = document.getElementById("user").innerHTML;
var zsm = nme +"+"+ student;
$('#zsm').val(zsm);
console.log(zsm);
- //var sender = "sender";
- //var sended = document.getElementById("sended");
- $('#sended').click(function () {
+ $('#recieved').click(function () {
- $("#msg_history").empty();
+ //$("#msg_history").empty();
$.ajax({
- url: "../rest/peerfeedback/sendedfeedback/"+zsm //peerfeedbackID {id}
+ url: "../rest/peerfeedback/sendedfeedback/"+zsm
}).then(function (data) {
console.log(data);
- //loadFeedback(data);
console.log("function1");
var list = [];
for (var id in data) {
@@ -46,18 +41,14 @@ $(document).ready(function(){
}).then(function (data) {
console.log("getSender:"+data);
var s = data[0];
- //loadFeedbackSender(data);
loadFeedbackSender(data);
- //loadUsers(data);
});
- console.log("getsenderFunction");
-
console.log("function2");
console.log(list);
});
});
- $('#recieved').click(function () {
+ $('#sended').click(function () {
$("#msg_history").empty();
$.ajax({
@@ -65,7 +56,6 @@ $(document).ready(function(){
}).then(function (data) {
console.log(data);
- //loadFeedback(data);
console.log("function1");
var list = [];
for (var id in data) {
@@ -82,9 +72,7 @@ $(document).ready(function(){
console.log("getSender:"+data);
console.log(list);
var s = data[0];
- //loadFeedbackSender(data);
loadFeedbackReciever(data);
- //loadUsers(data);
})
console.log("function2");
console.log(data);
@@ -121,13 +109,24 @@ $(document).ready(function(){
var newspan = document.createElement("span");
newspan.className = "chat_date";
newspan.insertAdjacentHTML('beforeend',timestampToDateString(data[feedback].timestamp));
+ var newspan1 = document.createElement("span");
+ newspan1.className = "chat_date";
+ newspan1.insertAdjacentHTML('beforeend',data[feedback].feedbackcategory);
+ var newspan2 = document.createElement("span");
+ newspan2.className = "chat_date";
+ newspan2.insertAdjacentHTML('beforeend',data[feedback].filename);
var newhr =document.createElement("hr");
newdiv2.insertBefore(newdiv4, newdiv.childNodes[0]);
newdiv.appendChild(newdiv2);
newdiv2.appendChild(newdiv3);
+ newdiv2.appendChild(newspan1);
newdiv3.appendChild(newp);
+
+ newp.insertBefore(newspan1, newp.childNodes[0]);
+ newp.insertBefore(newspan2, newp.childNodes[1]);
newp.appendChild(newspan);
+
var currentdiv = document.getElementById("msg_history");
currentdiv.appendChild(newdiv);
currentdiv.appendChild(newhr);
@@ -162,7 +161,7 @@ $(document).ready(function(){
newdiv.onclick = function () {
var h = this.id;
- myFunction(zsm, h);
+ myFunction(h, zsm);
}
diff --git a/gemeinsamforschen/src/main/webapp/project-student.jsp.orig b/gemeinsamforschen/src/main/webapp/project-student.jsp.orig
deleted file mode 100644
index 17e3bad5..00000000
--- a/gemeinsamforschen/src/main/webapp/project-student.jsp.orig
+++ /dev/null
@@ -1,126 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%--suppress XmlDuplicatedId --%>
-<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
-<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="footer" %>
-
-
-<!--todo: E-mail an Studenten als Notifikation für Phasenwechsel -->
-
-
-<!DOCTYPE html>
-<html>
-
-<head>
- <omniDependencies:omniDependencies hierarchy="0"/>
- <script src="core/project-student.js"></script>
-<<<<<<< HEAD
- <script src="management/js/project-student.js"></script>
- <link rel="stylesheet" href="../libs/css/Community-ChatComments.css">
-=======
->>>>>>> origin/development_master
-
-</head>
-
-<body>
-<div id="wrapper">
- <menu:menu hierarchy="0"/>
-
- <div class="page-content-wrapper">
- <headLine:headLine/>
- <div>
- <table>
- <tr>
- <td id="yourContent">
- <h1>Feedbackable Students</h1>
- <!-- here will be all the content -->
- <table id="myGroupMembers">
- <tr>
-
- <td width="100px" valign="top">
- <h3>student1</h3>
- <img src="libs/img/1.jpg">
- <a href="#">student1@uni.de</a>
- <hr>
- <ul>
-
- <li>
- Projektübersicht hochgeladen
- <a class="annotationview" role="button">
- <label style="font-size:10px;"><i class="far fa-comments"
- style="font-size:15px;"></i>feedback</label>
- </a>
- </li>
- <li>
- Blumen ins Hausaufgabenheft geklebt
- <a class="annotationview" role="button">
- <label style="font-size:10px;"><i class="far fa-comments"
- style="font-size:15px;"></i>feedback</label>
- </a>
- </li>
- <li>
- Peerfeedback
- <a class="givefeedback" role="button">
- <label style="font-size:10px;"><i class="far fa-comments"
- style="font-size:15px;"></i>feedback</label>
- </a>
- </li>
- </ul>
- </td>
- <td></td>
-
- <td width="100px" valign="top">
- <h3>student2</h3>
- <img src="libs/img/2.jpg">
- <a href="#">student2@uni.de</a>
- <hr>
- <ul>
- <li>
- Blumen an Vegetarier verfüttert
- <a class="annotationview" role="button">
- <label style="font-size:10px;"><i class="far fa-comments"
- style="font-size:15px;"></i>feedback</label>
- </a>
- </li>
- <li>
- Literaturverzeichnis hochgeladen
- <a class="annotationview" role="button">
- <label style="font-size:10px;"><i class="far fa-comments"
- style="font-size:15px;"></i>feedback</label>
- </a>
- </li>
- <li>
- Die armen Vegetarier
- <a class="annotationview" role="button">
- <label style="font-size:10px;"><i class="far fa-comments"
- style="font-size:15px;"></i>feedback</label>
- </a>
- </li>
- </ul>
- </td>
- <td></td>
-
- <td width="100px" valign="top">
- <h3>student3</h3>
- <img src="libs/img/3.jpg">
- <a href="#">student3@uni.de</a>
- <hr>
- <ul id="submissionUpload">
- </ul>
- </td>
-
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </div>
- </div>
- <footer:footer/>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/scripts/dbschema/peerfeedback b/gemeinsamforschen/src/scripts/dbschema/peerfeedback
index b9a600dd..ae2bb938 100644
--- a/gemeinsamforschen/src/scripts/dbschema/peerfeedback
+++ b/gemeinsamforschen/src/scripts/dbschema/peerfeedback
@@ -26,8 +26,8 @@ INSERT INTO `peerfeedback` (`id`, `timestamp`, `reciever`, `sender`, `text`, `ca
INSERT INTO `peerfeedback` (`id`, `timestamp`, `reciever`, `sender`, `text`, `category`, `filename`) VALUES
('12346', '2018-09-15 13:35:25', 'teststudent3+test3', 'teststudent1+test1','Ich habe deinen Beitrag gern gelesen
- und fand ihn gut aber ich habe noch eine Idee und zwar ...','DURCHFÜHRUNG','Durchführung: Blumen&Vegetarier');
+ und fand ihn gut aber ich habe noch eine Idee und zwar ...','DURCHFUEHRUNG','Durchführung: Blumen&Vegetarier');
INSERT INTO `peerfeedback` (`id`, `timestamp`, `reciever`, `sender`, `text`, `category`, `filename`) VALUES
('12347', '2018-09-13 13:35:25', 'teststudent5+test5', 'teststudent1+test1','Ich habe deinen Beitrag gern gelesen
- und fand ihn gut aber dass würde ich anders machen und zwar ...','METHODE','Methode: Blumen gießen');
\ No newline at end of file
+ und fand ihn gut aber dass würde ich anders machen und zwar ...','METHODIK','Methode: Blumen gießen');
\ No newline at end of file
--
GitLab