Merge branch 'development_master' of C:\Users\Christian\Desktop\FInalGit\fltrail with conflicts.

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/Assessment.java

 package unipotsdam.gf.modules.assessment.controller;
+package unipotsdam.gf.modules.assessment.controller.model;
+
+import unipotsdam.gf.core.database.mysql.MysqlConnect;
+import unipotsdam.gf.core.database.mysql.VereinfachtesResultSet;
+import unipotsdam.gf.core.management.project.Project;
+import unipotsdam.gf.core.management.user.User;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.security.acl.Group;
+import java.util.ArrayList;
+
+@XmlRootElement
 
 public class Assessment {
     private StudentIdentifier student;
     private Performance performance;
+    private StudentIdentifier bewertender;
 
     public Assessment(StudentIdentifier student, Performance performance) {
         this.student = student;
@@ -25,6 +38,13 @@ public class Assessment {
         this.performance = performance;
     }
 
+    public void setAssessment(User user, Assessment assessment){
+        MysqlConnect connect = new MysqlConnect();
+        connect.connect();
+        String mysqlRequest = "INSERT INTO assessments ( `BewertenderId`, `BewerteterId`, `Bewertung`,`StuoGrp`) values (?,?,?,?)";
+        connect.issueInsertOrDeleteStatement(mysqlRequest, "tom" ,user.getName() , assessment.getPerformance().getWorkRating()[0], user.istStudent());
+        connect.close();
+    }
     @Override
     public String toString() {
         return "Assessment{" +

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java

+package unipotsdam.gf.modules.assessment.controller.service;
+
+import unipotsdam.gf.core.management.user.User;
+import unipotsdam.gf.modules.assessment.controller.model.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by dehne on 18.05.2018.
+ */
+public class FBAssessement extends AssessmentDAO {
+
+    @Override
+    public void addAssessmentDataToDB(Assessment assessment) {
+        // write it to db
+    }
+
+
+
+    @Override
+    public Quiz getQuiz(String projectId, String groupId) {
+        return null;
+    }
+
+    @Override
+    public void createQuiz(StudentAndQuiz studentAndQuiz) {
+
+    }
+
+    @Override
+    public List<Grading> calculateAssessment(ArrayList<Performance> totalPerformance) {
+        return null;
+    }
+
+    @Override
+    public ArrayList<Performance> getTotalAssessment(StudentIdentifier studentIdentifier) {
+        return null;
+    }
+
+    public void createQuiz(StudentIdentifier student, String question, String[] answers){  //writes a new question into the DB
+
+    }
+
+    public boolean permission(int feedbackCount){
+        return true;
+    }
+
+    @Override
+    public int meanOfAssessement(String projectId) {
+        return 0;
+    }
+}