Added Status Bar for Admins
There are still some minor Bugs to fix, but it works
This commit is contained in:
@@ -88,6 +88,21 @@ 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 {
|
||||
@@ -121,8 +136,7 @@ public class DataBaseHandler {
|
||||
public Entry[] getAllEntries(int semesterid, int userid) {
|
||||
try {
|
||||
ResultSet rs = st.executeQuery("select * from entries where " +
|
||||
"semesterid=" + semesterid +
|
||||
" and usercreatedbyid=" + userid);
|
||||
"semesterid=" + semesterid);
|
||||
List<Entry> entriestate = new ArrayList<>();
|
||||
Entry current = null;
|
||||
while ((current = resultSetToEntry(rs)) != null) {
|
||||
|
||||
@@ -72,6 +72,32 @@ public class EntriesController
|
||||
return new ResponseEntity<>(HttpStatus.FORBIDDEN);
|
||||
}
|
||||
|
||||
@CrossOrigin
|
||||
@GetMapping("/entries/semester")
|
||||
public ResponseEntity<Entry[]> getEntriesInSemester(@RequestParam(name = "semesterid") int semesterid,
|
||||
@RequestParam(name = "sessionid") String sessionid){
|
||||
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);
|
||||
}
|
||||
return new ResponseEntity<>(HttpStatus.FORBIDDEN);
|
||||
}
|
||||
|
||||
// @CrossOrigin
|
||||
// @GetMapping("/entries")
|
||||
// public ResponseEntity<Integer[]> getEntries(@RequestParam(name = "semesterid") int semesterid,
|
||||
|
||||
@@ -33,6 +33,18 @@ 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
|
||||
|
||||
Reference in New Issue
Block a user