Edit Function Finished (Semester and Modules)

Man kann bis jetzt eine dozenten noch nicht "abwählen"
This commit is contained in:
brausjonas
2023-05-25 13:22:22 +02:00
parent 00d57da32d
commit ac9fa44b99
7 changed files with 3446 additions and 32 deletions
Binary file not shown.
File diff suppressed because it is too large Load Diff
@@ -10,7 +10,6 @@ import com.example.backend.anwprj.Module.Module;
import java.sql.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class DataBaseHandler
@@ -44,7 +43,6 @@ public class DataBaseHandler
} catch (SQLException e)
{
e.printStackTrace();
System.out.println("No Connection!");
}
}
/**
@@ -358,11 +356,11 @@ public class DataBaseHandler
}
}
public Module getModule(int userid, int semesterid, String name)
public Module getModule(int userid, int semesterid)
{
try
{
ResultSet rs = st.executeQuery("select * from modules where userid=" + userid + " and semesterid=" + semesterid + " and name='" + name + "'");
ResultSet rs = st.executeQuery("select * from modules where userid=" + userid + " and semesterid=" + semesterid);
return resultSetToModule(rs);
}
@@ -395,8 +393,8 @@ public class DataBaseHandler
{
try {
st.executeUpdate("insert into modules (userid, semesterid, name, activated) " +
"Values (" + m.getUserid() + ", " + m.getSemesterId() + ", '" + m.getName() + "', " + m.getActivated() + ")");
return getModule(m.getUserid(), m.getSemesterId(), m.getName());
"Values (" + m.getUserid() + ", " + m.getsemesterid() + ", '" + m.getName() + "', " + m.getActivated() + ")");
return getModule(m.getUserid(), m.getsemesterid());
}
catch (Exception e) {
@@ -441,19 +439,19 @@ public class DataBaseHandler
{
try {
System.out.println(m.getId());
Module module = getModule(m.getUserid(), m.getSemesterId(), m.getName());
Module module = getModule(m.getUserid(), m.getsemesterid());
if(module == null)
{
addModule(m);
}
else
{
System.out.println("test");
st.executeUpdate("update modules set activated=" + m.getActivated() + " where userid=" + m.getUserid() + " and semesterid=" + m.getSemesterId() + " and name='" + m.getName() + "'");
st.executeUpdate("update modules set activated=" + m.getActivated() + ", semesterid=" + m.getsemesterid() + ", name='" + m.getName() + "' where id=" + module.getid());
}
return getModule(m.getUserid(), m.getSemesterId(), m.getName());
Module test = getModule(m.getUserid(), m.getsemesterid());
System.out.println(test.getActivated());
return test;
}
catch (SQLException ex) {
ex.printStackTrace();
@@ -18,11 +18,11 @@ public class Module {
this.activated = activated;
}
public int getId() { return id; }
public int getid() { return id; }
public int getUserid() { return userid; }
public int getSemesterId() { return semesterid; }
public int getsemesterid() { return semesterid; }
public String getName() { return name; }
@@ -111,6 +111,8 @@ public class ModuleController
@PostMapping("/module")
public ResponseEntity<Module> addModule(@RequestBody Module module, @RequestParam(name = "sessionid") String sessionID)
{
System.out.println("test1");
User user = UserSessionIDHandler.getUserBySessionID(sessionID);
if (user.getPermissions() == UserPermissions.admin.getValue())
@@ -132,6 +134,7 @@ public class ModuleController
@PutMapping("/module")
public ResponseEntity<Module> updateModule(@RequestBody Module module, @RequestParam(name = "sessionid") String sessionID)
{
User u = UserSessionIDHandler.getUserBySessionID(sessionID);
if (u != null && u.getPermissions() == UserPermissions.admin.getValue())
{
@@ -33,7 +33,7 @@ public class SemesterController
Semester s = db.addSemester(semester);
if(s != null)
{
System.out.println(s.getStartday());
return new ResponseEntity<>(s, HttpStatus.OK);
}
@@ -109,7 +109,6 @@ public class SemesterController
User u = UserSessionIDHandler.getUserBySessionID(sessionID);
if(u != null && u.getPermissions() == UserPermissions.admin.getValue())
{
System.out.println(semester.getId());
Semester s = db.updateSemester(semester);
if(s != null)