diff --git a/data.mv.db b/data.mv.db index 8f3d407..8c185a1 100644 Binary files a/data.mv.db and b/data.mv.db differ diff --git a/src/main/java/com/example/demo/speaker/controller/DTO/AppointmentDTO.java b/src/main/java/com/example/demo/speaker/controller/DTO/AppointmentDTO.java index 14c16da..3cbd1ce 100644 --- a/src/main/java/com/example/demo/speaker/controller/DTO/AppointmentDTO.java +++ b/src/main/java/com/example/demo/speaker/controller/DTO/AppointmentDTO.java @@ -19,4 +19,8 @@ public class AppointmentDTO { public String getName() { return name; } + + public void setName(String nameAppointment){ + this.name = nameAppointment; + } } diff --git a/src/main/java/com/example/demo/speaker/controller/DTO/CompanyDTO.java b/src/main/java/com/example/demo/speaker/controller/DTO/CompanyDTO.java index 3706861..f3aa38a 100644 --- a/src/main/java/com/example/demo/speaker/controller/DTO/CompanyDTO.java +++ b/src/main/java/com/example/demo/speaker/controller/DTO/CompanyDTO.java @@ -39,4 +39,21 @@ public class CompanyDTO { public String getLegalAdressCompany() { return legalAdressCompany; } + public void setNameCompany(String name) + { + this.nameCompany = name; + } + + public void setAdressCompany(String adressCompany) { + this.adressCompany = adressCompany; + } + + public void setContactEmail(String contactEmail) { + this.contactEmail = contactEmail; + } + + public void setLegalAdressCompany(String legalAdressCompany) { + this.legalAdressCompany = legalAdressCompany; + } + } diff --git a/src/main/java/com/example/demo/speaker/controller/DTO/EmployeeDTO.java b/src/main/java/com/example/demo/speaker/controller/DTO/EmployeeDTO.java index 90e7b86..8e06742 100644 --- a/src/main/java/com/example/demo/speaker/controller/DTO/EmployeeDTO.java +++ b/src/main/java/com/example/demo/speaker/controller/DTO/EmployeeDTO.java @@ -5,18 +5,27 @@ import com.example.demo.speaker.model.Employee; public class EmployeeDTO { private Long id; private String fio; - private AppointmentDTO appointment; + private Long appointmentId; public EmployeeDTO(Employee employee) { this.id = employee.getId(); this.fio = employee.getFio(); - this.appointment = new AppointmentDTO(employee.getPost()); + this.appointmentId = employee.getPost().getId(); } + public EmployeeDTO(){} public Long getId() { return id; } - public AppointmentDTO getAppointment() { return appointment; } + public Long getAppointmentId() { return appointmentId; } public String getFio() { return fio; } + + public void setAppointment(Long appointment) { + this.appointmentId = appointment; + } + + public void setFio(String fio) { + this.fio = fio; + } } diff --git a/src/main/java/com/example/demo/speaker/controller/DTO/RequestForCooperationDTO.java b/src/main/java/com/example/demo/speaker/controller/DTO/RequestForCooperationDTO.java index f24b534..273bd29 100644 --- a/src/main/java/com/example/demo/speaker/controller/DTO/RequestForCooperationDTO.java +++ b/src/main/java/com/example/demo/speaker/controller/DTO/RequestForCooperationDTO.java @@ -43,4 +43,32 @@ public class RequestForCooperationDTO { public EmployeeDTO getSotr() { return sotr; } public TypeOfRequestEnum getType() {return type; } + + public void setActive(Boolean active) { + isActive = active; + } + + public void setApproveDate(Date approveDate) { + this.approveDate = approveDate; + } + + public void setComment(String comment) { + this.comment = comment; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + public void setNameCompany(Company nameCompany) { + this.nameCompany = nameCompany; + } + + public void setSotr(EmployeeDTO sotr) { + this.sotr = sotr; + } + + public void setType(TypeOfRequestEnum type) { + this.type = type; + } } diff --git a/src/main/java/com/example/demo/speaker/controller/MVCController/EmployeeMVCController.java b/src/main/java/com/example/demo/speaker/controller/MVCController/EmployeeMVCController.java index d655cd9..353f8f6 100644 --- a/src/main/java/com/example/demo/speaker/controller/MVCController/EmployeeMVCController.java +++ b/src/main/java/com/example/demo/speaker/controller/MVCController/EmployeeMVCController.java @@ -36,21 +36,22 @@ public class EmployeeMVCController { .toList()); model.addAttribute("appointments", appointmentService.findAllAppointments().stream().map(AppointmentDTO::new).toList()); + model.addAttribute("employeeDTO", new EmployeeDTO()); + return "employee"; } @PostMapping("/create") - public String createWorker(@RequestParam("name") String name, @RequestParam("appointmentId") Long appointmentId, Model model) { - var Employee = new Employee(name, appointmentService.findAppointment(appointmentId)); - model.addAttribute("employee",new EmployeeDTO(employeeService.addWorker(new EmployeeDTO(Employee)))); + public String createWorker(@ModelAttribute EmployeeDTO employeeDTO, Model model) { + employeeService.addWorker(employeeDTO); return "redirect:employee"; } @PostMapping("/edit/{id}") - public String updateWorker(@PathVariable Long id,@ModelAttribute("employee") EmployeeDTO employee, Model model) { - employeeService.updateReportWorker(id, employee); - model.addAttribute("employees", employeeService.findAllWorkers()); - model.addAttribute("appointments", appointmentService.findAllAppointments()); + public String updateWorker(@PathVariable Long id,@ModelAttribute("employeeDTO") EmployeeDTO employeeDTO, Model model) { + employeeService.updateReportWorker(id, employeeDTO); +// model.addAttribute("employees", employeeService.findAllWorkers()); +// model.addAttribute("appointments", appointmentService.findAllAppointments()); return "redirect:employee"; } diff --git a/src/main/java/com/example/demo/speaker/model/Employee.java b/src/main/java/com/example/demo/speaker/model/Employee.java index 93b82ba..ba8bd84 100644 --- a/src/main/java/com/example/demo/speaker/model/Employee.java +++ b/src/main/java/com/example/demo/speaker/model/Employee.java @@ -10,7 +10,7 @@ import java.util.Random; public class Employee { @Id - @GeneratedValue + @GeneratedValue(strategy = GenerationType.AUTO) private Long id; @Column(nullable = false) private String fio; diff --git a/src/main/java/com/example/demo/speaker/service/EmployeeService.java b/src/main/java/com/example/demo/speaker/service/EmployeeService.java index a8efd39..6f170f4 100644 --- a/src/main/java/com/example/demo/speaker/service/EmployeeService.java +++ b/src/main/java/com/example/demo/speaker/service/EmployeeService.java @@ -23,7 +23,7 @@ private final AppointmentService appointmentService; @Transactional public Employee addWorker(EmployeeDTO employee) { - var appontment = appointmentService.findAppointment(employee.getAppointment().getId()); + var appontment = appointmentService.findAppointment(employee.getAppointmentId()); Employee employeeNew = new Employee(employee.getFio(), appontment); employeeRepository.save(employeeNew); return employeeNew; diff --git a/src/main/resources/templates/appointment.html b/src/main/resources/templates/appointment.html index f5c3762..99bada8 100644 --- a/src/main/resources/templates/appointment.html +++ b/src/main/resources/templates/appointment.html @@ -32,8 +32,8 @@