Skip to content
Snippets Groups Projects
Commit 85677e2f authored by KKlaue's avatar KKlaue
Browse files

#80 better view for student

#78 fix db communication
fix merge errors
parent ca7faa4e
No related branches found
No related tags found
No related merge requests found
Showing
with 399 additions and 112 deletions
...@@ -15,7 +15,7 @@ public class PeerFeedbackController { ...@@ -15,7 +15,7 @@ public class PeerFeedbackController {
// create a new id if we found no id. // create a new id if we found no id.
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
// while (existsfeedbackId(uuid)) { //Todo: existsfeedbackId // while (existsfeedbackId(uuid)) {
// uuid = UUID.randomUUID().toString(); // uuid = UUID.randomUUID().toString();
// } // }
...@@ -23,49 +23,24 @@ public class PeerFeedbackController { ...@@ -23,49 +23,24 @@ public class PeerFeedbackController {
MysqlConnect connection = new MysqlConnect(); MysqlConnect connection = new MysqlConnect();
connection.connect(); connection.connect();
MysqlConnect connection1 = new MysqlConnect();
connection1.connect();
// build and execute request // build and execute request
String request = "INSERT INTO peerfeedback (`id`, `reciever`, `sender`, `text`, `category`, `filename`) VALUES (?,?,?,?,?,?);"; 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()); 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 // close connection
connection.close(); connection.close();
connection1.close();
// return Response.ok().build(); // return Response.ok().build();
//return null; //return null;
} }
//@Override
public Peer2PeerFeedback getPeer2PeerFeedback(String id) {
// establish connection
MysqlConnect connection = new MysqlConnect();
connection.connect();
// build and execute request
String request = "SELECT * FROM peerfeedback WHERE id = ?;";
VereinfachtesResultSet rs = connection.issueSelectStatement(request, id);
System.out.print(rs);
if (rs.next()) {
Peer2PeerFeedback feedback = getPeerfeedbackFromResultSet(rs);
// close connection
connection.close();
System.out.print(feedback);
return feedback;
} else {
// close connection
connection.close();
System.out.print("null");
return null;
}
}
public ArrayList<Peer2PeerFeedback> getAllFeedbacks(String reciever) { public ArrayList<Peer2PeerFeedback> getAllFeedbacks(String reciever) {
ArrayList<Peer2PeerFeedback> feedbacks = new ArrayList<>(); ArrayList<Peer2PeerFeedback> feedbacks = new ArrayList<>();
...@@ -77,6 +52,7 @@ public class PeerFeedbackController { ...@@ -77,6 +52,7 @@ public class PeerFeedbackController {
// build and execute request // build and execute request
String request = "SELECT * FROM peerfeedback WHERE reciever= ?;"; String request = "SELECT * FROM peerfeedback WHERE reciever= ?;";
VereinfachtesResultSet rs = connection.issueSelectStatement(request, reciever); VereinfachtesResultSet rs = connection.issueSelectStatement(request, reciever);
System.out.print("rs:"+rs);
while (rs.next()) { while (rs.next()) {
feedbacks.add(getPeerfeedbackFromResultSet(rs)); feedbacks.add(getPeerfeedbackFromResultSet(rs));
...@@ -102,53 +78,90 @@ public class PeerFeedbackController { ...@@ -102,53 +78,90 @@ public class PeerFeedbackController {
VereinfachtesResultSet rs = connection.issueSelectStatement(request); VereinfachtesResultSet rs = connection.issueSelectStatement(request);
while (rs.next()) { while (rs.next()) {
users.add(getUserFromResultSet(rs)); users.add(getUserFromResultSet(rs)+"+"+getTokenFromResultSet(rs));
} }
// close connection // close connection
connection.close(); connection.close();
System.out.print(users); System.out.print("userscontroller:"+users);
return users; return users;
} }
public void getTokenforFeedback(String user) { public boolean getTokenforFeedback(String user) {
System.out.print("getTokencontroller:"+user);
// establish connection // establish connection
MysqlConnect connection = new MysqlConnect(); MysqlConnect connection = new MysqlConnect();
connection.connect(); connection.connect();
// build and execute request // build and execute request
//String request = "SELECT * FROM users WHERE isStudent= 1"; /**String request = "UPDATE\n" +
//VereinfachtesResultSet rs = connection.issueSelectStatement(request); " peerfeedback\n" +
"SET\n" +
" reciever = (\n" +
" SELECT\n" +
" token\n" +
" FROM\n" +
" users\n" +
" WHERE\n" +
" name = ?\n" +
" ) WHERE reciever = ?";*/
String request = "UPDATE peerfeedback SET reciever =(SELECT token FROM users WHERE name=?) WHERE reciever=?";
//VereinfachtesResultSet rs = connection.issueSelectStatement(request, user); (SELECT token FROM users WHERE name=?)
//connection.issueInsertOrDeleteStatement(request, user);
connection.issueUpdateStatement(request, user, user);
// close connection
System.out.print("token");
connection.close();
return true;
}
public boolean checkFeedback(String checkFeedback) {
// establish connection
MysqlConnect connection = new MysqlConnect();
connection.connect();
// build and execute request // build and execute request
String request = "INSERT INTO peerfeedback (, , reciever, , , , ) SELECT token FROM users WHERE isStudent= 1 AND name=?"; String request = "SELECT * FROM peerfeedback WHERE sender = ?;";
VereinfachtesResultSet rs = connection.issueSelectStatement(request, user); VereinfachtesResultSet rs = connection.issueSelectStatement(request, checkFeedback);
System.out.print(rs);
if (rs!=null) {
System.out.print("true");
// close connection
connection.close();
return true;
/**while (rs.next()) { } else {
token.add(getTokenFromResultSet(rs)); System.out.print("false");
}*/ // close connection
connection.close();
// close connection return false;
connection.close(); }
System.out.print("token");
//return token;
} }
private Peer2PeerFeedback getPeerfeedbackFromResultSet(VereinfachtesResultSet rs) { private Peer2PeerFeedback getPeerfeedbackFromResultSet(VereinfachtesResultSet rs) {
String id = rs.getString("id"); String id = rs.getString("id");
long timestamp = rs.getTimestamp(2).getTime(); long timestamp = rs.getTimestamp(2).getTime();
String reciever = rs.getString("reciever"); String category = rs.getString("category");
String rec = rs.getString("text");
String sender = rs.getString("sender"); String sender = rs.getString("sender");
String text = rs.getString("text"); String txt = rs.getString("reciever");
Object category = rs.getObject("category");
String filename = rs.getString("filename"); String filename = rs.getString("filename");
//return new Peer2PeerFeedback("id", 1234, Category.TITEL, "reciever", "sender", "test", "filename"); //return new Peer2PeerFeedback("id", 1234, Category.TITEL, "reciever", "sender", "test", "filename");
return new Peer2PeerFeedback(id,timestamp,Category.TITEL,reciever, sender, text, filename); return new Peer2PeerFeedback(id,timestamp,Category.valueOf(category),rec, sender, txt, filename);
} }
private String getUserFromResultSet(VereinfachtesResultSet rs) { private String getUserFromResultSet(VereinfachtesResultSet rs) {
...@@ -162,4 +175,10 @@ public class PeerFeedbackController { ...@@ -162,4 +175,10 @@ public class PeerFeedbackController {
String token = rs.getString("token"); String token = rs.getString("token");
return new String(token); return new String(token);
} }
private String getCheckFromResultSet(VereinfachtesResultSet rs) {
String check = rs.getString("token");
return new String(check);
}
} }
...@@ -20,9 +20,6 @@ public class PeerFeedbackView { ...@@ -20,9 +20,6 @@ public class PeerFeedbackView {
public Response createPeerfeedback( @FormParam("id") String id, @FormParam("timestamp") Long timestamp, @FormParam("category") Category category, public Response createPeerfeedback( @FormParam("id") String id, @FormParam("timestamp") Long timestamp, @FormParam("category") Category category,
@FormParam("student") String sender, @FormParam("reciever") String reciever, @FormParam("text") String text, @FormParam("filename") String filename) { @FormParam("student") String sender, @FormParam("reciever") String reciever, @FormParam("text") String text, @FormParam("filename") String filename) {
System.out.print("id="+id +"time="+timestamp +"cat="+category +
"sender="+sender +"reciever="+reciever +"text="+text +"fn"+filename);
//Peer2PeerFeedback feedback = new Peer2PeerFeedback(id, timestamp, Category.TITEL, sender, text, reciever, filename); //Peer2PeerFeedback feedback = new Peer2PeerFeedback(id, timestamp, Category.TITEL, sender, text, reciever, filename);
Peer2PeerFeedback f = new Peer2PeerFeedback(); Peer2PeerFeedback f = new Peer2PeerFeedback();
f.setID(id); f.setID(id);
...@@ -50,7 +47,7 @@ public class PeerFeedbackView { ...@@ -50,7 +47,7 @@ public class PeerFeedbackView {
PeerFeedbackController controller = new PeerFeedbackController(); PeerFeedbackController controller = new PeerFeedbackController();
ArrayList<Peer2PeerFeedback> fd = controller.getAllFeedbacks(sender); ArrayList<Peer2PeerFeedback> fd = controller.getAllFeedbacks(sender);
System.out.print(fd); System.out.print("getallfd:"+fd);
return Response.ok(fd).build(); return Response.ok(fd).build();
} }
...@@ -61,20 +58,34 @@ public class PeerFeedbackView { ...@@ -61,20 +58,34 @@ public class PeerFeedbackView {
PeerFeedbackController controller = new PeerFeedbackController(); PeerFeedbackController controller = new PeerFeedbackController();
ArrayList<String> users = controller.getUserforFeedback(); ArrayList<String> users = controller.getUserforFeedback();
System.out.print(users); System.out.print("usersview:"+users);
return Response.ok(users).build(); return Response.ok(users).build();
} }
@POST @GET
//@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
@Path("{getToken}") @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("/getToken/{getToken}")
public Response getToken(@PathParam("getToken") String user){ public Response getToken(@PathParam("getToken") String user){
System.out.print("getToken:"+user);
PeerFeedbackController controller = new PeerFeedbackController(); PeerFeedbackController controller = new PeerFeedbackController();
controller.getTokenforFeedback(user); Boolean checktoken = controller.getTokenforFeedback(user);
System.out.print(user); System.out.print("getToken:"+checktoken);
return Response.ok().build(); return Response.ok(checktoken).build();
} }
} }
...@@ -8,4 +8,7 @@ $(document).ready(function(){ ...@@ -8,4 +8,7 @@ $(document).ready(function(){
$('#enrollProject').on('click', function(){ $('#enrollProject').on('click', function(){
location.href="enrollProject.jsp?token="+getUserTokenFromUrl(); location.href="enrollProject.jsp?token="+getUserTokenFromUrl();
}); });
$('.viewfeedback').click(function () {
location.href="viewfeedback.jsp?token="+getUserTokenFromUrl();
});
}); });
\ No newline at end of file
...@@ -52,3 +52,138 @@ ...@@ -52,3 +52,138 @@
width: 100%; width: 100%;
} }
.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:15px; 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: 11%;
}
.chat_ib {
float: left;
padding: 0 0 0 15px;
width: 88%;
}
.chat_people{ overflow:hidden; clear:both;}
.chat_list {
border-bottom: 1px solid #c4c4c4;
margin: 0;
padding: 18px 16px 10px;
}
.inbox_chat { height: 550px; overflow-y: scroll;}
.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%;
}
.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;
}
\ No newline at end of file
...@@ -30,6 +30,10 @@ $(document).ready(function() { ...@@ -30,6 +30,10 @@ $(document).ready(function() {
$('#project').val(project); $('#project').val(project);
$('#name').val(name); $('#name').val(name);
$('.viewfeedback').click(function () {
location.href="viewfeedback.jsp?token="+getUserTokenFromUrl();
});
new InscrybMDE({ new InscrybMDE({
element: document.getElementById("editor"), element: document.getElementById("editor"),
spellChecker: false, spellChecker: false,
...@@ -41,38 +45,50 @@ $(document).ready(function() { ...@@ -41,38 +45,50 @@ $(document).ready(function() {
var cln_user = user.cloneNode(true); var cln_user = user.cloneNode(true);
document.getElementById("journalform").appendChild(cln_user); 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(student);
console.log(user); console.log(getToken);
var checkFeedback = student;
console.log(checkFeedback);
$.ajax({ $.ajax({
url: "../rest/peerfeedback/save" //+ student url: "../rest/peerfeedback/save", //+ student
}).then(function (data) { }).then(function (data) {
$('#editor').append(data.descriptionMD); $('#editor').append(data.descriptionMD);
/** //TODO preselet in select tags console.log("save:"+data);
new InscrybMDE({
element: document.getElementById("editor"),
spellChecker: false,
forceSync: true,
});*/
console.log(data);
//location.href="give-feedback.jsp?token=" + getUserTokenFromUrl();
//alert("Feedback wurde gesendet!");
}); });
/**$.ajax({
url: "../rest/peerfeedback/getToken/" +getToken,
}).then(function (data) {
console.log("getToken-js:"+data);
});*/
$.ajax({ $.ajax({
url: "../rest/peerfeedback/getUsers" //+ student url: "../rest/peerfeedback/getUsers" //+ student
}).then(function (data) { }).then(function (data) {
console.log(data); console.log("getUsers:"+data);
loadUsers(data); loadUsers(data);
}); });
/**$.ajax({
url: "../rest/peerfeedback/getToken/" +getToken
}).then(function (data) {
console.log("getToken:"+data);
});*/
$.ajax({ $.ajax({
url: "../rest/peerfeedback/getToken" + user //+ student url: "../rest/peerfeedback/checkFeedback/" +checkFeedback
}).then(function (data) { }).then(function (data) {
console.log(data); console.log("checkFeedback:"+data);
//loadUsers(data);
}); });
function loadUsers(data) { function loadUsers(data) {
...@@ -90,4 +106,16 @@ $(document).ready(function() { ...@@ -90,4 +106,16 @@ $(document).ready(function() {
} }
} }
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);
}
}) })
\ No newline at end of file
...@@ -3,17 +3,17 @@ var student = getQueryVariable("token"); ...@@ -3,17 +3,17 @@ var student = getQueryVariable("token");
var project = getQueryVariable("projectId"); var project = getQueryVariable("projectId");
var name = getQueryVariable("user"); var name = getQueryVariable("user");
console.log(name);
$(document).ready(function(){ $(document).ready(function(){
$('#student').val(student); $('#student').val(student);
$('#project').val(project); $('#project').val(project);
//$('#name').val(name); //$('#name').val(name);
var user = document.getElementById("user"); /**var user = document.getElementById("user");
user.setAttribute("name", document.getElementById("user").textContent); user.setAttribute("name", document.getElementById("user").textContent);
var cln_user = user.cloneNode(true); var cln_user = user.cloneNode(true);
document.getElementById("filter-feedbacks").appendChild(cln_user); document.getElementById("filter-feedbacks").appendChild(cln_user);*/
console.log(student); console.log(student);
...@@ -29,7 +29,7 @@ $(document).ready(function(){ ...@@ -29,7 +29,7 @@ $(document).ready(function(){
}).then(function (data) { }).then(function (data) {
//$('#editor').append(data.descriptionMD); //$('#editor').append(data.descriptionMD);
console.log(data);
loadFeedback(data); loadFeedback(data);
console.log("function1"); console.log("function1");
...@@ -38,42 +38,109 @@ $(document).ready(function(){ ...@@ -38,42 +38,109 @@ $(document).ready(function(){
console.log(data); console.log(data);
}); });
$.ajax({
url: "../rest/peerfeedback/getUsers" //+ student
}).then(function (data) {
console.log("getUsers:"+data);
//loadUsers(data);
});
// } // }
function loadFeedback(data) { function loadFeedback(data) {
for (var feedback in data) { for (var feedback in data) {
var newdiv = document.createElement("div"); var newdiv = document.createElement("div");
newdiv.className = "feedback-container"; newdiv.className = "incoming_msg";
var newdiv4 = document.createElement("div");
newdiv4.className = "chat_img";
var newdiv5 = document.createElement("img");
newdiv5.src = "https://ptetutorials.com/images/user-profile.png";
newdiv4.appendChild(newdiv5);
var newdiv2 = document.createElement("div");
newdiv2.className = "received_msg";
var newdiv3 = document.createElement("div");
newdiv3.className = "received_withd_msg";
var newp = document.createElement("p"); var newp = document.createElement("p");
newp.insertAdjacentHTML('beforeend',data[feedback].text) //newp.className = "received_withd_msg";
newdiv.appendChild(newp); newp.insertAdjacentHTML('beforeend', data[feedback].text)
var newspan = document.createElement("span");
newspan.insertAdjacentHTML('beforeend',timestampToDateString(data[feedback].timestamp));
newdiv.insertBefore(newdiv4, newdiv.childNodes[0]);
newdiv.appendChild(newdiv2);
newdiv2.appendChild(newdiv3);
newdiv3.appendChild(newp);
//newdiv.appendChild(newdiv4);
newp.appendChild(newspan);
//newdiv.insertAdjacentHTML('beforeend',data[feedback].text); //newdiv.insertAdjacentHTML('beforeend',data[feedback].text);
//newdiv.className = "feedback-container"; //newdiv.className = "feedback-container";
// füge das neu erstellte Element und seinen Inhalt ins DOM ein // füge das neu erstellte Element und seinen Inhalt ins DOM ein
var currentdiv = document.getElementById("div1"); var currentdiv = document.getElementById("msg_history");
currentdiv.appendChild(newdiv); currentdiv.appendChild(newdiv);
}
}}; }
function loadFeedbackSender(data) { function loadFeedbackSender(data) {
for (var feedback in data) { for (var feedback in data) {
var newdiv = document.createElement("div"); var newdiv = document.createElement("div");
newdiv.className = "chat_list";
newdiv.insertAdjacentHTML('beforeend',data[feedback].feedbacksender); var newdiv2 = document.createElement("div");
newdiv.className = "feedback-container"; newdiv2.className = "chat_people";
var newdiv4 = document.createElement("div");
var currentdiv = document.getElementById("senderlist"); newdiv4.className = "chat_img";
currentdiv.appendChild(newdiv); var newdiv5 = document.createElement("img");
newdiv5.src = "https://ptetutorials.com/images/user-profile.png";
newdiv4.appendChild(newdiv5);
var newdiv3 = document.createElement("div");
newdiv3.className = "chat_ib";
var newh = document.createElement("h5");
newh.insertAdjacentHTML('beforeend', data[feedback].feedbacksender)
var newspan = document.createElement("span");
newspan.className = "chat_date";
newspan.insertAdjacentHTML('beforeend',timestampToDateString(data[feedback].timestamp));
newdiv.insertBefore(newdiv4, newdiv.childNodes[0]);
newdiv.appendChild(newdiv2);
newdiv2.appendChild(newdiv3);
newdiv3.appendChild(newh);
newh.appendChild(newspan);
var currentdiv = document.getElementById("inbox_chat");
currentdiv.appendChild(newdiv);
var username = getUsername(data);
console.log("username:"+username);
}
}
function getUsername(data) {
console.log("getusername:"+data);
var query = data.split(",");
//var vars = query.split(",");
console.log(query);
for (let i = 0; i < query.length; i++) {
let pair = query[i].split("+");
console.log(pair[i]);
if (pair[0] === data) {
return pair[1];
}
} }
return (false);
}
//timestampToDateString(data[feedback].timestamp) //timestampToDateString(data[feedback].timestamp)
function timestampToDateString(timestamp) { function timestampToDateString(timestamp) {
var date = new Date(timestamp); var date = new Date(timestamp);
return date.toLocaleString("de-DE"); return date.toLocaleString("de-DE");
}}; }
}) })
\ No newline at end of file
...@@ -25,12 +25,10 @@ ...@@ -25,12 +25,10 @@
<tr> <tr>
<h2> Gib dein Feedback ein!</h2> <h2> Gib dein Feedback ein!</h2>
<div class="line-spacer"></div> <div class="line-spacer"></div>
<p><span> Datei zum Feedback: SelectedFile.pdf </span></p>
<p class="text-primary"><span> Kategorie: Untersuchungskonzept </span></p>
<hr /> <hr />
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="checkbox" value="" id="defaultCheck1"> <input class="form-check-input" type="checkbox" value="" id="defaultCheck1">
<label class="form-check-label" for="defaultCheck1"> <label class="form-check-label" for="defaultCheck1" id="Check1">
Das fand ich gut Das fand ich gut
</label> </label>
</div> </div>
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
<script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
<link rel="stylesheet" type="text/css" href="css/create-journal.css"> <link rel="stylesheet" type="text/css" href="journal/css/create-journal.css">
<omniDependencies:omniDependencies hierarchy="1"/> <omniDependencies:omniDependencies hierarchy="1"/>
<script src="js/create-journal.js"></script> <script src="journal/js/create-journal.js"></script>
</head> </head>
<body> <body>
......
...@@ -17,12 +17,11 @@ ...@@ -17,12 +17,11 @@
<menu:menu hierarchy="1"/> <menu:menu hierarchy="1"/>
<div class="page-content-wrapper"> <div class="page-content-wrapper">
<headLine:headLine/> <headLine:headLine/>
<div> <%-- <div>
<div>Feedback Nachrichten</div> <div>Feedback Nachrichten</div>
<table> <table>
<tr> <tr>
<hr> <hr>
<td id="filter-feedbacks" class="feedback-table"> <td id="filter-feedbacks" class="feedback-table">
<input type="hidden" name="peerfeedbackID" id="peerfeedbackID-input" value=""/> <input type="hidden" name="peerfeedbackID" id="peerfeedbackID-input" value=""/>
...@@ -41,26 +40,16 @@ ...@@ -41,26 +40,16 @@
<span class="time-right">11:00</span> <span class="time-right">11:00</span>
</div> </div>
</div> </div>
</td> </td>
<td id="view-feedbacks" class="feedback-table"> <td id="view-feedbacks" class="feedback-table">
<div style="overflow: auto"> <div style="overflow: auto">
<div class="feedback-container"> <div class="feedback-container">
<p>Hello. How are you today?</p> <p>Hello. How are you today?</p>
<span class="time-right">11:00</span> <span class="time-right">11:00</span>
</div> </div>
<div id="div1"></div> <div id="div1"></div>
</div> </div>
</td> </td>
</tr> </tr>
</table> </table>
<hr> <hr>
...@@ -71,7 +60,33 @@ ...@@ -71,7 +60,33 @@
window.history.back(); window.history.back();
} }
</script> </script>
</div> </div>--%>
<div class="container">
<h3 class=" text-center">Feedback Nachrichten</h3>
<div class="messaging">
<div class="inbox_msg">
<div class="inbox_people">
<div class="headind_srch">
<div class="recent_heading">
<h4>Übersicht</h4>
</div>
</div>
<div class="inbox_chat" id="inbox_chat">
</div>
</div>
<div class="mesgs">
<div class="msg_history" id="msg_history">
</div>
</div>
</div>
</div></div>
<button class="btn btn-secondary" onclick="goBack()">Zur&uuml;ck</button>
<script>
function goBack() {
window.history.back();
}
</script>
</div> </div>
</div> </div>
</body> </body>
......
UPDATE
peerfeedback
SET
reciever = (
SELECT
token
FROM
users
WHERE
name = "kathi"
) WHERE reciever = "kathi"
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment