diff --git a/src/main/java/catering/staff/JobType.java b/src/main/java/catering/staff/JobType.java new file mode 100644 index 0000000..0ea1d3f --- /dev/null +++ b/src/main/java/catering/staff/JobType.java @@ -0,0 +1,6 @@ +package catering.staff; + +public enum JobType { + COOK, + SERVICE +} diff --git a/src/main/java/catering/staff/Staff.java b/src/main/java/catering/staff/Staff.java index c077328..93a4b0c 100644 --- a/src/main/java/catering/staff/Staff.java +++ b/src/main/java/catering/staff/Staff.java @@ -7,14 +7,15 @@ import jakarta.persistence.Id; @Entity public class Staff { - private String name, job; + private String name; + private JobType job; private @Id @GeneratedValue Long id; protected Staff() { // No-argument constructor for JPA } - public Staff(String name, String job) { + public Staff(String name, JobType job) { this.name = name; this.job = job; } @@ -27,7 +28,7 @@ public class Staff { return name; } - public String getJob() { + public JobType getJob() { return job; } @@ -36,7 +37,7 @@ public class Staff { this.name = name; } - public void setJob(String job) { + public void setJob(JobType job) { this.job = job; } } diff --git a/src/main/java/catering/staff/StaffController.java b/src/main/java/catering/staff/StaffController.java index f780fd6..638dd87 100644 --- a/src/main/java/catering/staff/StaffController.java +++ b/src/main/java/catering/staff/StaffController.java @@ -37,7 +37,7 @@ public class StaffController { @PreAuthorize("hasRole('ADMIN')") public String addStaff( @RequestParam String name, - @RequestParam String job, + @RequestParam JobType job, Model model ) { Staff newStaff = new Staff(name, job); @@ -57,7 +57,7 @@ public class StaffController { public String updateStaff( @PathVariable("id") Staff staff, @RequestParam String name, - @RequestParam String job + @RequestParam JobType job ) { staff.setJob(job); staff.setName(name); diff --git a/src/main/resources/templates/edit-staff.html b/src/main/resources/templates/edit-staff.html index 9521680..a284501 100644 --- a/src/main/resources/templates/edit-staff.html +++ b/src/main/resources/templates/edit-staff.html @@ -15,7 +15,9 @@
- +
diff --git a/src/main/resources/templates/staff.html b/src/main/resources/templates/staff.html index 49fb7ba..5a0db34 100644 --- a/src/main/resources/templates/staff.html +++ b/src/main/resources/templates/staff.html @@ -43,8 +43,10 @@
- - + +