Skip to content
Snippets Groups Projects
Commit 94dc34f1 authored by KKlaue's avatar KKlaue
Browse files

fix sql tables, fix db communication, pngs for wiki

parent 8ef15542
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 143 additions and 169 deletions
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/Controller/PeerFeedbackController.java
+ 9
− 57
View file @ 94dc34f1
......@@ -14,22 +14,14 @@ public class PeerFeedbackController {
//@Override
public String createPeer2PeerFeedback(Peer2PeerFeedback feedback) {
// create a new id if we found no id.
String uuid = UUID.randomUUID().toString();
// while (existsfeedbackId(uuid)) {
// uuid = UUID.randomUUID().toString();
// }
System.out.print("FEEDBACK"+feedback);
// establish connection
MysqlConnect connection = new MysqlConnect();
connection.connect();
MysqlConnect connection1 = new MysqlConnect();
connection1.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());
System.out.print("FEEDBACKCREATE");
......@@ -48,67 +40,57 @@ public class PeerFeedbackController {
}
public ArrayList<Peer2PeerFeedback> getAllFeedbacks(String sender) {
public ArrayList<Peer2PeerFeedback> getsendedPeerfedback(String sender) {
ArrayList<Peer2PeerFeedback> feedbacks = new ArrayList<>();
ArrayList<Peer2PeerFeedback> feedbacksbysender = new ArrayList<>();
// establish connection
MysqlConnect connection = new MysqlConnect();
connection.connect();
System.out.print("SENDER"+sender);
// build and execute request
String request = "SELECT * FROM peerfeedback WHERE sender= ?;";
VereinfachtesResultSet rs = connection.issueSelectStatement(request, sender);
System.out.print("rs:"+rs);
//feedbacks.add(getPeerfeedbackFromResultSet(rs));
while (rs.next()) {
feedbacks.add(getPeerfeedbackFromResultSet(rs));
feedbacksbysender.add(getPeerfeedbackFromResultSet(rs));
}
// close connection
connection.close();
System.out.print("FEEDBACKS"+feedbacks);
return feedbacks;
System.out.print("FEEDBACKS"+feedbacksbysender);
return feedbacksbysender;
}
public ArrayList<Peer2PeerFeedback> getRecievedPeerfeedback(String reciever) {
ArrayList<Peer2PeerFeedback> rf = new ArrayList<>();
// establish connection
MysqlConnect connection = new MysqlConnect();
connection.connect();
System.out.print("RECIEVER"+reciever);
// build and execute request
String request = "SELECT * FROM peerfeedback WHERE reciever= ?;";
VereinfachtesResultSet rs = connection.issueSelectStatement(request, reciever);
System.out.print("rs:"+rs);
//feedbacks.add(getPeerfeedbackFromResultSet(rs));
while (rs.next()) {
rf.add(getPeerfeedbackFromResultSet(rs));
}
// close connection
connection.close();
System.out.print("FEEDBACKS"+rf);
return rf;
}
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);
......@@ -116,11 +98,9 @@ public class PeerFeedbackController {
feedbacks.add(getPeerfeedbackFromResultSet(rs));
}
// close connection
connection.close();
System.out.print(feedbacks);
return feedbacks;
}
public ArrayList<String> getSender(String token){
......@@ -128,17 +108,12 @@ public class PeerFeedbackController {
ArrayList<String> username = new ArrayList<>();
ArrayList<String> tok = new ArrayList<>();
// establish connection
MysqlConnect connection1 = new MysqlConnect();
connection1.connect();
//if (token) {
String[] pair = token.split(",");
System.out.print("TOKEN,,"+pair[0]+pair.length);
//System.out.print(pair[0].substring(token.indexOf("+")+1,token.indexOf(",")));
System.out.print(pair[0].substring(token.indexOf("+")+1));
//String[] p= null;
for(int j=0; j < pair.length; j++){
pair[j] = pair[j].substring(token.indexOf("+")+1);
......@@ -153,16 +128,6 @@ public class PeerFeedbackController {
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;
}
......@@ -178,7 +143,6 @@ public class PeerFeedbackController {
ArrayList<String> emails = new ArrayList<>();
ArrayList<String> groupid = new ArrayList<>();
// establish connection
MysqlConnect connection = new MysqlConnect();
connection.connect();
......@@ -191,8 +155,6 @@ public class PeerFeedbackController {
String el = email.get(0);
System.out.print("email"+el);
// establish connection
MysqlConnect connection1 = new MysqlConnect();
connection1.connect();
......@@ -205,8 +167,6 @@ public class PeerFeedbackController {
String us = groupid.get(0);
System.out.print("groupid"+us);
// establish connection
MysqlConnect connection2 = new MysqlConnect();
connection2.connect();
......@@ -221,8 +181,6 @@ public class PeerFeedbackController {
String[] e = ems.split(",");
System.out.print("emails:"+e);
// establish connection
MysqlConnect connection3 = new MysqlConnect();
connection3.connect();
......@@ -239,7 +197,6 @@ public class PeerFeedbackController {
}
System.out.print("rs4:" + users);
// close connection
connection.close();
connection1.close();
connection2.close();
......@@ -252,25 +209,21 @@ public class PeerFeedbackController {
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;
......@@ -289,7 +242,6 @@ public class PeerFeedbackController {
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);
}
......
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/View/PeerFeedbackView.java
+ 46
− 12
View file @ 94dc34f1
......@@ -21,13 +21,22 @@ import java.util.ArrayList;
@Produces(MediaType.APPLICATION_JSON)
public class PeerFeedbackView {
/**
* Returns String
* @param 'id' ID for peerfeedback
* @param 'timestamp' time of given feedback
* @param 'category' category of the document
* @param 'sender' is feedbacksender
* @param 'reciever' is feedbackreciever
* @param 'text' text from editor
* @param 'filename' name of the document
* @return name of feedbacksenders or feedbackrecievers
*/
@POST
@Path("/save")
public Response createPeerfeedback(@FormParam("id") String id, @FormParam("timestamp") Timestamp timestamp, @FormParam("category") Category category,
@FormParam("zsm") String sender, @FormParam("reciever") String reciever, @FormParam("text") String text, @FormParam("filename") String filename) {
//Peer2PeerFeedback feedback = new Peer2PeerFeedback(id, timestamp, Category.TITEL, sender, text, reciever, filename);
System.out.print("VIEW:"+sender);
Peer2PeerFeedback f = new Peer2PeerFeedback();
f.setID(id);
......@@ -38,27 +47,33 @@ public class PeerFeedbackView {
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();
String fp = controller.createPeer2PeerFeedback(f);
return Response.ok(fp).build(); //feedback
return Response.ok(fp).build();
}
/**
* Returns the sender from feedback
* @param 'zsm' name and token of student
* @return name of senders
*/
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("{zsm}")
@Path("/sendedfeedback/{zsm}")
public Response getPeerfeedback(@PathParam("zsm") String sender){
PeerFeedbackController controller = new PeerFeedbackController();
ArrayList<Peer2PeerFeedback> fd = controller.getAllFeedbacks(sender);
ArrayList<Peer2PeerFeedback> fd = controller.getsendedPeerfedback(sender);
System.out.print("getallfd:"+fd);
return Response.ok(fd).build();
}
/**
* Returns the reciever from feedback
* @param 'zsm' name and token of student
* @return name of reciever
*/
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("/recievedfeedback/{zsm}")
......@@ -70,6 +85,11 @@ public class PeerFeedbackView {
return Response.ok(rf).build();
}
/**
* Returns the names of feedbackreciever
* @param 'zsm' token of student
* @return name of feedbackreciever
*/
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("/getUsers/{token}")
......@@ -81,10 +101,15 @@ public class PeerFeedbackView {
return Response.ok(users).build();
}
/**
* Returns true or false for given feedback
* @param 'zsm' name and token of student
* @return true(feedback was given) or false(feedback was not given)
*/
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("/checkFeedback/{checkFeedback}")
public Response checkFeedback(@PathParam("checkFeedback") String checkFeedback){
@Path("/checkFeedback/{zsm}")
public Response checkFeedback(@PathParam("zsm") String checkFeedback){
System.out.print("sendcf:"+checkFeedback);
PeerFeedbackController controller = new PeerFeedbackController();
......@@ -93,6 +118,11 @@ public class PeerFeedbackView {
return Response.ok(check).build();
}
/**
* Returns names of feedbacksender or feedbackreciever
* @param 'list' name and token of feedbacksenders or feedbackrecievers
* @return name of feedbacksenders or feedbackrecievers
*/
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("/getSender/{list}")
......@@ -105,7 +135,11 @@ public class PeerFeedbackView {
return Response.ok(name).build();
}
/**
* Returns feedbacks
* @param 'student' is feedbackreciever and 'sender' is feedbacksender
* @return feedbacks
*/
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("/getfeedbackbysender/{student}/{sender}")
......
gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
+ 9
− 3
View file @ 94dc34f1
......@@ -64,19 +64,25 @@
<div class="journal-form-category">
Feedbackempfänger:
<select name="reciever" id="reciever" form="journalform"> <%--form="journalform"--%>
<%--option value="sandra"> sandra </option>--%>
</select>
</div>
<div class="journal-form-container">
<div class="journal-form-editor">
<div class="journal-form-editor" style="width: 80%">
<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="sub" class="btn btn-default btn-sm"> Speichern </button>
<button id="backLink" class="btn btn-default btn-sm"> Zur&uuml;ck </button>
<button id="sub" class="btn btn-default btn-sm"> Speichern </button>
</div>
</div>
</form>
......
gemeinsamforschen/src/main/webapp/feedback/js/givepeerfeedback.js
+ 9
− 28
View file @ 94dc34f1
......@@ -24,6 +24,11 @@ $(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();
});
......@@ -38,43 +43,24 @@ $(document).ready(function () {
forceSync: true,
});
/**console.log(student);
var nme = document.getElementById("user").innerHTML;
var zsm = nme +"+"+ student;*/
var checkFeedback = student;
console.log(checkFeedback);
//var checkFeedback = student;
//console.log(checkFeedback);
$('#sub').click(function () {
//event.preventDefault();
$.ajax({
url: "../rest/peerfeedback/save" //+ student
}).then(function (data) {
//$('#editor').append(data.descriptionMD);
//location.href="../feedback/give-feedback.jsp?="+getUserTokenFromUrl();
console.log("save:"+data);
location.href="../feedback/give-feedback.jsp?="+getUserTokenFromUrl();
});
//$("#journalform").submit();
//event.preventDefault();
return location.href="../feedback/give-feedback.jsp?="+getUserTokenFromUrl();
});
/**$.ajax({
url: "../rest/peerfeedback/save", //+ student
}).then(function (data) {
//$('#editor').append(data.descriptionMD);
//location.href="../feedback/give-feedback.jsp?="+getUserTokenFromUrl();
console.log("save:"+data);
});*/
$.ajax({
url: "../rest/peerfeedback/getUsers/" + student
url: "../rest/peerfeedback/getUsers/" + zsm
}).then(function (data) {
console.log("getUsers:"+data);
loadUsers(data);
......@@ -82,7 +68,7 @@ $(document).ready(function () {
$.ajax({
url: "../rest/peerfeedback/checkFeedback/" +checkFeedback
url: "../rest/peerfeedback/checkFeedback/" +student
}).then(function (data) {
console.log("checkFeedback:"+data);
});
......@@ -90,26 +76,21 @@ $(document).ready(function () {
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];
// füge das neu erstellte Element und seinen Inhalt ins DOM ein
var currentdiv = document.getElementById("reciever");
currentdiv.appendChild(newopt);
}
}
......
gemeinsamforschen/src/main/webapp/feedback/js/viewpeerfeedback.js
+ 14
− 44
View file @ 94dc34f1
......@@ -21,8 +21,9 @@ $(document).ready(function(){
$('#sended').click(function () {
$("#msg_history").empty();
$.ajax({
url: "../rest/peerfeedback/"+zsm , //peerfeedbackID {id}
url: "../rest/peerfeedback/sendedfeedback/"+zsm //peerfeedbackID {id}
}).then(function (data) {
console.log(data);
......@@ -39,16 +40,18 @@ $(document).ready(function(){
console.log(list);
getsenderFunction(list);
/**$.ajax({
url: "../rest/peerfeedback/getSender/" + list
$.ajax({
url: "../rest/peerfeedback/getSender/" + list,
async: true
}).then(function (data) {
console.log("getSender:" + data);
console.log(list);
console.log("getSender:"+data);
var s = data[0];
//loadFeedbackSender(data);
loadFeedbackSender(data);
});*/
//loadUsers(data);
});
console.log("getsenderFunction");
console.log("function2");
console.log(list);
});
......@@ -156,20 +159,13 @@ $(document).ready(function(){
var newdiv = document.createElement("button");
newdiv.className = "chat_list";
newdiv.id = data[feedback];
//newdiv.value = sender;
//newdiv.onclick = new function(){alert('clicked');};
//newdiv.setAttribute("onclick","myFunction(student, sender)");
newdiv.onclick = function () {
var h = this.id;
//console.log(document.getElementById(sender.toString()));
//console.log(h);
myFunction(h, zsm);
myFunction(zsm, h);
}
var ddiv = document.createElement("div");
ddiv.id = "ddiv";
......@@ -188,7 +184,6 @@ $(document).ready(function(){
newh.insertAdjacentHTML('beforeend', name.toString())
var newspan = document.createElement("span");
newspan.className = "chat_date";
//newspan.insertAdjacentHTML('beforeend',timestampToDateString(data[feedback].timestamp));
ddiv.appendChild(newdiv);
newdiv.insertBefore(newdiv4, newdiv.childNodes[0]);
......@@ -200,12 +195,7 @@ $(document).ready(function(){
var currentdiv = document.getElementById("inbox_chat");
currentdiv.appendChild(ddiv);
//var username = getUsername(data[feedback]);
//console.log("username:"+username);
}
//newdiv.disabled =true;
}
function loadFeedbackReciever(data) {
......@@ -220,33 +210,24 @@ $(document).ready(function(){
console.log(data[feedback]);
var sender = [];
var name = [];
var pair = data[feedback].split("+");
name.push(pair[0]);
sender.push(pair[1]);
console.log(name+sender);
var newdiv = document.createElement("button");
newdiv.className = "chat_list";
newdiv.id = data[feedback];
//newdiv.value = sender;
//newdiv.onclick = new function(){alert('clicked');};
//newdiv.setAttribute("onclick","myFunction(student, sender)");
newdiv.onclick = function () {
var h = this.id;
//console.log(document.getElementById(sender.toString()));
console.log(h);
myFunction(zsm, h);
}
var ddiv = document.createElement("div");
ddiv.id = "ddiv";
var newdiv2 = document.createElement("div");
newdiv2.className = "chat_people";
var newdiv4 = document.createElement("div");
......@@ -262,28 +243,19 @@ $(document).ready(function(){
newh.insertAdjacentHTML('beforeend', name)
var newspan = document.createElement("span");
newspan.className = "chat_date";
//newspan.insertAdjacentHTML('beforeend',timestampToDateString(data[feedback].timestamp));
ddiv.appendChild(newdiv);
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(ddiv);
//var username = getUsername(data[feedback]);
//console.log("username:"+username);
}
//newdiv.disabled =true;
}
//timestampToDateString(data[feedback].timestamp)
function timestampToDateString(timestamp) {
var date = new Date(timestamp);
return date.toLocaleString("de-DE");
......@@ -304,7 +276,7 @@ $(document).ready(function(){
console.log("pffürsender");
}
function getsenderFunction(list) {
/**function getsenderFunction(list) {
console.log(list);
$.ajax({
......@@ -318,7 +290,5 @@ $(document).ready(function(){
//loadUsers(data);
});
console.log("getsenderFunction");
}
}*/
})
\ No newline at end of file
gemeinsamforschen/src/main/webapp/libs/img/givefeedback.png 0 → 100644
+ 0
− 0
View file @ 94dc34f1
gemeinsamforschen/src/main/webapp/libs/img/givefeedback.png

31.1 KiB

gemeinsamforschen/src/main/webapp/libs/img/projekt_uebersicht.png 0 → 100644
+ 0
− 0
View file @ 94dc34f1
gemeinsamforschen/src/main/webapp/libs/img/projekt_uebersicht.png

316 KiB

gemeinsamforschen/src/main/webapp/libs/img/studenten_uebersicht.png 0 → 100644
+ 0
− 0
View file @ 94dc34f1
gemeinsamforschen/src/main/webapp/libs/img/studenten_uebersicht.png

26.9 KiB

gemeinsamforschen/src/main/webapp/libs/img/viewfeedback_recieved.png 0 → 100644
+ 0
− 0
View file @ 94dc34f1
gemeinsamforschen/src/main/webapp/libs/img/viewfeedback_recieved.png

36.2 KiB

gemeinsamforschen/src/main/webapp/project-student.jsp
+ 29
− 15
View file @ 94dc34f1
......@@ -34,14 +34,14 @@
<tr>
<td width="100px" valign="top">
<h3>student1</h3>
<h3 id="name-student">teststudent5</h3>
<img src="libs/img/1.jpg">
<a href="#">student1@uni.de</a>
<a href="#">test5@uni.de</a>
<hr>
<ul>
<li>
Projektübersicht hochgeladen
Projektübersicht
<a class="annotationview" role="button">
<label style="font-size:10px;"><i class="far fa-comments"
style="font-size:15px;"></i>feedback</label>
......@@ -59,42 +59,56 @@
<td></td>
<td width="100px" valign="top">
<h3>student2</h3>
<h3>teststudent2</h3>
<img src="libs/img/2.jpg">
<a href="#">student2@uni.de</a>
<a href="#">test2@uni.de</a>
<hr>
<ul>
<li>
Blumen an Vegetarier verfüttert
<a class="annotationview" role="button">
<%--<a class="annotationview" role="button">
<label style="font-size:10px;"><i class="far fa-comments"
style="font-size:15px;"></i>feedback</label>
</a>
</a>--%>
</li>
<li>
Literaturverzeichnis hochgeladen
<a class="annotationview" role="button">
"Forschungsfrage: Warum essen Vegetarier Blumen?"
<%--<a class="annotationview" role="button">
<label style="font-size:10px;"><i class="far fa-comments"
style="font-size:15px;"></i>feedback</label>
</a>
</a>--%>
</li>
<li>
Die armen Vegetarier
<a class="annotationview" role="button">
<%--<a class="annotationview" role="button">
<label style="font-size:10px;"><i class="far fa-comments"
style="font-size:15px;"></i>feedback</label>
</a>
</a>--%>
</li>
</ul>
</td>
<td></td>
<td width="100px" valign="top">
<h3>student3</h3>
<h3>teststudent3</h3>
<img src="libs/img/3.jpg">
<a href="#">student3@uni.de</a>
<a href="#">test3@uni.de</a>
<hr>
<ul id="submissionUpload">
<ul>
<li>
Vielen Dank für die Blumen
<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>
Durchführung
<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>
......
gemeinsamforschen/src/scripts/dbschema/createDummyUsersGroupsProject.sql
+ 9
− 9
View file @ 94dc34f1
......@@ -30,14 +30,14 @@ INSERT INTO `users` (`name`, `password`, `email`, `token`, `rocketChatId`, `rock
INSERT INTO `projects` (`id`, `password`,`active`,`timecreated`,`authorEmail`,`adminpassword`,`token`,`phase`) VALUES
('1','123',1,current_timestamp,'Julian','123','abc','CourseCreation');
INSERT INTO `projectuser` (`projectId`,`userId`) VALUES ('1','test1@uni.de');
INSERT INTO `projectuser` (`projectId`,`userId`) VALUES ('1','test2@uni.de');
INSERT INTO `projectuser` (`projectId`,`userId`) VALUES ('1','test3@uni.de');
INSERT INTO `projectuser` (`projectId`,`userId`) VALUES ('1','test4@uni.de');
INSERT INTO `projectuser` (`projectId`,`userId`) VALUES ('1','test5@uni.de');
INSERT INTO `projectuser` (`projectId`,`userId`) VALUES ('1','test6@uni.de');
INSERT INTO `projectuser` (`projectId`,`userId`) VALUES ('1','test7@uni.de');
INSERT INTO `projectuser` (`projectId`,`userId`) VALUES ('1','test8@uni.de');
INSERT INTO `projectuser` (`projectId`,`userId`) VALUES ('gemeinsamForschen','test1@uni.de');
INSERT INTO `projectuser` (`projectId`,`userId`) VALUES ('gemeinsamForschen','test2@uni.de');
INSERT INTO `projectuser` (`projectId`,`userId`) VALUES ('gemeinsamForschen','test3@uni.de');
INSERT INTO `projectuser` (`projectId`,`userId`) VALUES ('gemeinsamForschen','test4@uni.de');
INSERT INTO `projectuser` (`projectId`,`userId`) VALUES ('gemeinsamForschen','test5@uni.de');
INSERT INTO `projectuser` (`projectId`,`userId`) VALUES ('gemeinsamForschen','test6@uni.de');
INSERT INTO `projectuser` (`projectId`,`userId`) VALUES ('gemeinsamForschen','test7@uni.de');
INSERT INTO `projectuser` (`projectId`,`userId`) VALUES ('gemeinsamForschen','test8@uni.de');
INSERT INTO groups (projectId, chatRoomId) VALUES ('1','1');
INSERT INTO groups (projectId, chatRoomId) VALUES ('1','2');
......@@ -46,7 +46,7 @@ INSERT INTO groups (projectId, chatRoomId) VALUES ('1','4');
INSERT INTO groupuser (userEmail, groupId) VALUES ('test1@uni.de','1');
INSERT INTO groupuser (userEmail, groupId) VALUES ('test2@uni.de','2');
INSERT INTO groupuser (userEmail, groupId) VALUES ('test3@uni.de','3');
INSERT INTO groupuser (userEmail, groupId) VALUES ('test3@uni.de','1');
INSERT INTO groupuser (userEmail, groupId) VALUES ('test4@uni.de','4');
INSERT INTO groupuser (userEmail, groupId) VALUES ('test5@uni.de','1');
INSERT INTO groupuser (userEmail, groupId) VALUES ('test6@uni.de','2');
......
gemeinsamforschen/src/scripts/dbschema/peerfeedback
+ 18
− 1
View file @ 94dc34f1
......@@ -13,4 +13,21 @@ CREATE TABLE if not exists `peerfeedback` (
)
ENGINE = InnoDB
DEFAULT CHARSET = utf8;
\ No newline at end of file
DEFAULT CHARSET = utf8;
INSERT INTO `peerfeedback` (`id`, `timestamp`, `reciever`, `sender`, `text`, `category`, `filename`) VALUES
('1234', '2018-09-18 13:35:25', 'teststudent1+test1', 'teststudent3+test3','Ich habe deinen Beitrag gern gelesen
und fand ihn gut aber ich habe noch eine Frage und zwar ...','TITEL','Titel: Blumen&Vegetarier');
INSERT INTO `peerfeedback` (`id`, `timestamp`, `reciever`, `sender`, `text`, `category`, `filename`) VALUES
('12345', '2018-09-19 13:35:25', 'teststudent1+test1', 'teststudent5+test5','Was ich gut fand * Schreibstil * klar formuliert',
'AUSWERTUNG','Vegetarier essen Blumen');
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');
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
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