jonas/TIF22A_AnwProjekt_B
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Function Status Bar and Time Validation

Browse Source
This commit is contained in:
brausjonas
2023-06-18 11:29:06 +02:00
parent b3fb3b1b8f
commit dd6f08880a
88 changed files with 515367 additions and 2922 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/main/java/com/example/backend/anwprj/Database/DataBaseHandler.java
+37 -35
View File
@@ -88,21 +88,6 @@ public class DataBaseHandler {
}
}
public Entry[] getEntries(int userid, int moduleid){
try{
ResultSet rs = st.executeQuery("select * from entries where moduleid=" + moduleid);
List<Entry> entryList = new ArrayList<>();
Entry current = null;
while ((current = resultSetToEntry(rs)) != null){
entryList.add(current);
}
return entryList.toArray(new Entry[0]);
}
catch (Exception e){
return null;
}
}
public Entry[][] getAllEntrys(int semesterid, int daynumber, int yearnumber, int userid) {
try {
@@ -133,40 +118,44 @@ public class DataBaseHandler {
}
}
public Entry[] getAllEntries(int semesterid, int userid) {
try {
ResultSet rs = st.executeQuery("select * from entries where " +
"semesterid=" + semesterid);
List<Entry> entriestate = new ArrayList<>();
Entry current = null;
while ((current = resultSetToEntry(rs)) != null) {
entriestate.add(current);
}
return entriestate.toArray(new Entry[0]);
} catch (Exception e) {
return null;
}
}
public Entry[] getAllEntries(int userid)
public Entry[] getAllEntries()
{
try {
ResultSet rs = st.executeQuery("select * from entries where " +
"usercreatedbyid=" + userid);
ResultSet rs = st.executeQuery("select * from entries");
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);
return entriestate.toArray(new Entry[0]);
}catch (Exception e){
System.out.println(e.getMessage());
return null;
}
}
public Entry[] getAllEntriesModule(int moduleid)
{
try {
ResultSet rs = st.executeQuery("select * from entries where moduleid=" + moduleid);
List<Entry> result = new ArrayList<>();
Entry current = null;
while((current = resultSetToEntry(rs)) != null)
{
result.add(current);
}
return result.toArray(new Entry[0]);
}
catch(Exception e)
{
return new Entry[]{};
}
}
public void deleteEntry(int id) {
try {
st.executeUpdate("delete from entries where id=" + id);
@@ -274,8 +263,8 @@ public class DataBaseHandler {
public void deleteSemester(int id) {
try {
st.executeUpdate("DELETE FROM modules WHERE semesterid=" + id);
st.executeUpdate("delete from semester where id=" + id);
st.executeUpdate("delete from entries where semesterid=" + id);
} catch (Exception e) {
}
@@ -381,9 +370,22 @@ public class DataBaseHandler {
}
}
public void submitModule(int id)
{
try
{
st.executeUpdate("update modules set activated=0 where id=" + id);
}
catch(Exception e)
{
}
}
public boolean deleteModule(int id) {
try {
st.executeUpdate("delete from modules where id=" + id);
st.executeUpdate("delete from entries where moduleid=" + id);
return true;
} catch (Exception ex) {
return false;
backend/src/main/java/com/example/backend/anwprj/controller/EntriesController.java
+8 -22
View File
@@ -59,13 +59,13 @@ public class EntriesController
}
@CrossOrigin
@GetMapping("/entries/planned")
@GetMapping("/entries/all")
public ResponseEntity<Entry[]> getAllEntries(@RequestParam(name = "sessionid") String sessionid)
{
User sessionUser = UserSessionIDHandler.getUserBySessionID(sessionid);
if (sessionUser != null)
{
var entries = db.getAllEntries(sessionUser.getId());
var entries = db.getAllEntries();
return new ResponseEntity<>(entries, HttpStatus.OK);
}
@@ -73,27 +73,13 @@ public class EntriesController
}
@CrossOrigin
@GetMapping("/entries/semester")
public ResponseEntity<Entry[]> getEntriesInSemester(@RequestParam(name = "semesterid") int semesterid,
@RequestParam(name = "sessionid") String sessionid){
@GetMapping("/entries/all/module")
public ResponseEntity<Entry[]> getAllEntriesModule(@RequestParam(name="sessionid") String sessionid, @RequestParam(name="moduleid") int moduleid)
{
User sessionUser = UserSessionIDHandler.getUserBySessionID(sessionid);
if (sessionUser != null){
Entry[] entries = db.getAllEntries(semesterid, sessionUser.getId());
return new ResponseEntity<>(entries, HttpStatus.OK);
}
return new ResponseEntity<>(HttpStatus.FORBIDDEN);
}
@CrossOrigin
@GetMapping("/entries/module")
public ResponseEntity<Entry[]> getEntries(@RequestParam(name = "moduleid") int moduleid,
@RequestParam(name = "sessionid") String sessionid){
User sessionUser = UserSessionIDHandler.getUserBySessionID(sessionid);
if (sessionUser != null){
Entry[] entries = db.getEntries(sessionUser.getId(), moduleid);
return new ResponseEntity<>(entries, HttpStatus.OK);
if (sessionUser != null)
{
return new ResponseEntity<>(db.getAllEntriesModule(moduleid), HttpStatus.OK);
}
return new ResponseEntity<>(HttpStatus.FORBIDDEN);
}
backend/src/main/java/com/example/backend/anwprj/controller/ModuleController.java
+16
View File
@@ -99,6 +99,7 @@ public class ModuleController
return null;
}
/**
POST
a new module entry. (When a user is selected in a semester.)
@@ -149,6 +150,21 @@ public class ModuleController
return new ResponseEntity<>(HttpStatus.FORBIDDEN);
}
@CrossOrigin
@PutMapping("/module/submit")
public ResponseEntity<Module> submitModule(@RequestParam(name="sessionid") String sessionID, @RequestParam(name="id") int id)
{
User u = UserSessionIDHandler.getUserBySessionID(sessionID);
if (u != null)
{
db.submitModule(id);
return new ResponseEntity<>(null, HttpStatus.OK);
}
return new ResponseEntity<>(HttpStatus.FORBIDDEN);
}
/**
DELETE
Delete A Module
backend/src/main/java/com/example/backend/anwprj/controller/UserController.java
-12
View File
@@ -33,18 +33,6 @@ public class UserController {
return new ResponseEntity<>(HttpStatus.FORBIDDEN);
}
@CrossOrigin
@GetMapping("/user")
public ResponseEntity<User> getUser(@RequestParam(name = "sessionid") String sessionid){
User u = UserSessionIDHandler.getUserBySessionID(sessionid);
if (u != null){
return new ResponseEntity<>(u, HttpStatus.OK);
}
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
}
//a user wants to login
@CrossOrigin