diff --git a/src/main/java/catering/staff/Staff.java b/src/main/java/catering/staff/Staff.java index b8a2638..c077328 100644 --- a/src/main/java/catering/staff/Staff.java +++ b/src/main/java/catering/staff/Staff.java @@ -7,16 +7,15 @@ import jakarta.persistence.Id; @Entity public class Staff { - private String surname, name, job; + private String name, job; private @Id @GeneratedValue Long id; protected Staff() { // No-argument constructor for JPA } - public Staff(String name, String surname, String job) { + public Staff(String name, String job) { this.name = name; - this.surname = surname; this.job = job; } @@ -24,10 +23,6 @@ public class Staff { return id; } - public String getSurname() { - return surname; - } - public String getName() { return name; } @@ -36,9 +31,6 @@ public class Staff { return job; } - public void setSurname(String surname) { - this.surname = surname; - } public void setName(String name) { this.name = name; diff --git a/src/main/java/catering/staff/StaffController.java b/src/main/java/catering/staff/StaffController.java index e39a653..f780fd6 100644 --- a/src/main/java/catering/staff/StaffController.java +++ b/src/main/java/catering/staff/StaffController.java @@ -37,11 +37,10 @@ public class StaffController { @PreAuthorize("hasRole('ADMIN')") public String addStaff( @RequestParam String name, - @RequestParam String surname, @RequestParam String job, Model model ) { - Staff newStaff = new Staff(name, surname, job); + Staff newStaff = new Staff(name, job); staffManagement.save(newStaff); return "redirect:/staff"; } @@ -58,12 +57,10 @@ public class StaffController { public String updateStaff( @PathVariable("id") Staff staff, @RequestParam String name, - @RequestParam String surname, @RequestParam String job ) { staff.setJob(job); staff.setName(name); - staff.setSurname(surname); staffManagement.save(staff); return "redirect:/staff"; } diff --git a/src/main/resources/templates/edit-staff.html b/src/main/resources/templates/edit-staff.html index 95af45f..9521680 100644 --- a/src/main/resources/templates/edit-staff.html +++ b/src/main/resources/templates/edit-staff.html @@ -13,10 +13,6 @@ -
- - -
diff --git a/src/main/resources/templates/staff.html b/src/main/resources/templates/staff.html index 651487c..49fb7ba 100644 --- a/src/main/resources/templates/staff.html +++ b/src/main/resources/templates/staff.html @@ -13,7 +13,6 @@ - @@ -21,7 +20,6 @@ -
NameNachname Beruf
MaxMusterkoch Koch Name -
- - -