All Entrys Shown for Lecturer

A lecturer can now see all his entries in his lecture view. Entries from other semester are blue colored, cant be configured from the from lecture view and are not of relevance for the rule semester, since they don´t apply for the students, only for the lecturer him- or herself

backend/src/main/java/com/example/backend/anwprj/Database/DataBaseHandler.java

@@ -102,6 +102,42 @@ public class DataBaseHandler
         }
     }
 
+
+    public Entry[][] getAllEntrys(int semesterid, int daynumber, int yearnumber, int userid)
+    {
+        try {
+            ResultSet rs = st. executeQuery("select * from entries where " +
+                    "semesterid<>" + semesterid +
+                    " and yearnumber=" + yearnumber +
+                    " and usercreatedbyid=" + userid +
+                    " and daynumber between " + daynumber + " and " + daynumber + 6);
+            List<Entry> entryList = new ArrayList<>();
+            Entry current = null;
+            while((current = resultSetToEntry(rs)) != null)
+            {
+                entryList.add(current);
+            }
+            Entry[][] entries = new Entry[6][20];
+            for(int i = 0; i < 6; i++)
+            {
+                int f = 0;
+
+                for(int j = 0; j < entryList.size(); j++)
+                {
+                    if(entryList.get(j).getDaynumber() == i + daynumber)
+                    {
+                        entries[i][f] = entryList.get(j);
+                        f++;
+                    }
+                }
+            }
+            return entries;
+        }catch(Exception e)
+        {
+            return null;
+        }
+    }
+
     public void deleteEntry(int id)
     {
         try

backend/src/main/java/com/example/backend/anwprj/controller/EntriesController.java

@@ -34,7 +34,25 @@ public class EntriesController
 
         if (sessionUser != null)
         {
-            return new ResponseEntity<>(db.getEntries(semesterid, daynumber, yearnumber), HttpStatus.OK);
+            var lonelyEntry = db.getEntries(semesterid, daynumber, yearnumber);
+            var happyEntry = db.getAllEntrys(semesterid, daynumber, yearnumber, sessionUser.getId());
+            var combinedEntry = new Entry[6][20];
+            for (int i = 0; i < 6; i++) {
+                var idx = 0;
+                for (int j = 0; j < 20; j++) {
+                    if (lonelyEntry[i][j] != null){
+                        combinedEntry[i][idx] = lonelyEntry[i][j];
+                        idx++;
+                    }
+                    if (happyEntry[i][j] != null){
+                        combinedEntry[i][idx] = happyEntry[i][j];
+                        idx++;
+                    }
+                }
+            }
+
+
+            return new ResponseEntity<>(combinedEntry, HttpStatus.OK);
         }
 
         return new ResponseEntity<>(null, HttpStatus.FORBIDDEN);