Added Status Check

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

@@ -52,9 +52,9 @@ public class DataBaseHandler
     {
         try
         {
-            st.executeUpdate("insert into entries (daynumber, yearnumber, semesterid, usercreatedbyid, timestart, timeend, info) values (" +
+            st.executeUpdate("insert into entries (daynumber, yearnumber, semesterid, usercreatedbyid, timestart, timeend, moduleid, info) values (" +
                     entry.getDaynumber() + ", " + entry.getYearnumber() + ", " + entry.getSemesterid() + ", " +
-                    entry.getUsercreatedbyid() + ", " + entry.getTimestart() + ", " + entry.getTimeend() + ", '" + entry.getInfo() + "')"
+                    entry.getUsercreatedbyid() + ", " + entry.getTimestart() + ", " + entry.getTimeend() + ", " + entry.getModuleid() + " ,'" + entry.getInfo() + "')"
                     );
         }
         catch(Exception e)
@@ -156,6 +156,25 @@ public class DataBaseHandler
         }
     }
 
+    public Entry[] getAllEntries(int userid)
+    {
+        try {
+            ResultSet rs = st.executeQuery("select * from entries where " +
+                    "usercreatedbyid=" + userid);
+            List<Entry> entriestate = new ArrayList<>();
+            Entry current  = null;
+            while((current = resultSetToEntry(rs)) != null)
+            {
+                entriestate.add(current);
+            }
+            Entry[] entryArray = new Entry[entriestate.toArray().length];
+            return entriestate.toArray(entryArray);
+        }catch (Exception e){
+            System.out.println(e.getMessage());
+            return null;
+        }
+    }
+
     public void deleteEntry(int id)
     {
         try
@@ -193,6 +212,7 @@ public class DataBaseHandler
                     rs.getInt("timestart"),
                     rs.getInt("timeend"),
                     rs.getInt("semesterid"),
+                    rs.getInt("moduleid"),
                     rs.getString("info")
             );
         }

backend/src/main/java/com/example/backend/anwprj/Entries/Entry.java

@@ -10,9 +10,10 @@ public class Entry
     private int timestart;
     private int timeend;
     private int semesterid;
+    private int moduleid;
     private String info;
 
-    public Entry(int id, int daynumber, int yearnumber, int usercreatedbyid, int timestart, int timeend, int semesterid, String info)
+    public Entry(int id, int daynumber, int yearnumber, int usercreatedbyid, int timestart, int timeend, int semesterid, int moduleid, String info)
     {
         this.id = id;
         this.daynumber = daynumber;
@@ -21,6 +22,7 @@ public class Entry
         this.timestart = timestart;
         this.timeend = timeend;
         this.semesterid = semesterid;
+        this.moduleid = moduleid;
         this.info = info;
     }
 
@@ -59,6 +61,8 @@ public class Entry
         return semesterid;
     }
 
+    public int getModuleid() {return moduleid;}
+
     public String getInfo()
     {
         return info;

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

@@ -60,22 +60,36 @@ public class EntriesController
 
     @CrossOrigin
     @GetMapping("/entries/planned")
-    public ResponseEntity<Integer[]> getEntries(@RequestParam(name = "semesterid") int semesterid,
-                                                @RequestParam(name = "sessionid") String sessionid)
+    public ResponseEntity<Entry[]> getAllEntries(@RequestParam(name = "sessionid") String sessionid)
     {
         User sessionUser = UserSessionIDHandler.getUserBySessionID(sessionid);
         if (sessionUser != null)
         {
-            var entries = db.getAllEntries(semesterid, sessionUser.getId());
-            var count = 0;
-            for (int i = 0; i < entries.length; i++) {
-                count += entries[i].getTimeend()-entries[i].getTimestart();
-            }
-            return new ResponseEntity<>(new Integer[]{count}, HttpStatus.OK);
+            var entries = db.getAllEntries(sessionUser.getId());
+
+            return new ResponseEntity<>(entries, HttpStatus.OK);
         }
         return new ResponseEntity<>(HttpStatus.FORBIDDEN);
     }
 
+//    @CrossOrigin
+//    @GetMapping("/entries")
+//    public ResponseEntity<Integer[]> getEntries(@RequestParam(name = "semesterid") int semesterid,
+//                                                @RequestParam(name = "sessionid") String sessionid)
+//    {
+//        User sessionUser = UserSessionIDHandler.getUserBySessionID(sessionid);
+//        if (sessionUser != null)
+//        {
+//            var entries = db.getAllEntries(semesterid, sessionUser.getId());
+//            var count = 0;
+//            for (int i = 0; i < entries.length; i++) {
+//                count += entries[i].getTimeend()-entries[i].getTimestart();
+//            }
+//            return new ResponseEntity<>(new Integer[]{count}, HttpStatus.OK);
+//        }
+//        return new ResponseEntity<>(HttpStatus.FORBIDDEN);
+//    }
+
     /**
      POST
      A new entry to the database. Every user except of admins is allowed