diff --git a/build.gradle b/build.gradle index cb56679..b6b034e 100644 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,14 @@ dependencies { implementation 'com.h2database:h2:2.1.210' testImplementation 'org.springframework.boot:spring-boot-starter-test' implementation 'io.springfox:springfox-swagger-ui:3.0.0' + + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.springframework.boot:spring-boot-devtools' + implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect' + + implementation 'org.webjars:bootstrap:5.1.3' + implementation 'org.webjars:jquery:3.6.0' + implementation 'org.webjars:font-awesome:6.1.0' } jar { manifest { diff --git a/data.mv.db b/data.mv.db index 0eb1899..f41c818 100644 Binary files a/data.mv.db and b/data.mv.db differ diff --git a/src/main/java/com/example/demo/WebConfiguration.java b/src/main/java/com/example/demo/WebConfiguration.java index a1bf9ed..77980d0 100644 --- a/src/main/java/com/example/demo/WebConfiguration.java +++ b/src/main/java/com/example/demo/WebConfiguration.java @@ -2,21 +2,20 @@ package com.example.demo; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpStatus; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.ViewControllerRegistration; -import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import org.springframework.web.servlet.config.annotation.*; @Configuration -class WebConfiguration implements WebMvcConfigurer { - @Override - public void addCorsMappings(CorsRegistry registry){ - registry.addMapping("/**").allowedMethods("*"); - } +public class WebConfiguration implements WebMvcConfigurer { + public static final String REST_API = "/api"; + @Override public void addViewControllers(ViewControllerRegistry registry) { - ViewControllerRegistration registration = registry.addViewController("/notFound"); - registration.setViewName("forward:/index.html"); - registration.setStatusCode(HttpStatus.OK); + WebMvcConfigurer.super.addViewControllers(registry); + registry.addViewController("appointment"); + } + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**").allowedMethods("*"); } } diff --git a/src/main/java/com/example/demo/speaker/controller/AppointmentController.java b/src/main/java/com/example/demo/speaker/controller/AppointmentController.java index 59a7f32..e8ca6d4 100644 --- a/src/main/java/com/example/demo/speaker/controller/AppointmentController.java +++ b/src/main/java/com/example/demo/speaker/controller/AppointmentController.java @@ -1,9 +1,8 @@ package com.example.demo.speaker.controller; +import com.example.demo.speaker.controller.DTO.AppointmentDTO; import com.example.demo.speaker.model.Appointment; import com.example.demo.speaker.service.AppointmentService; -import com.example.demo.speaker.service.RequestForCooperationService; -import org.springframework.dao.DataIntegrityViolationException; import org.springframework.web.bind.annotation.*; //import javax.validation.Valid; diff --git a/src/main/java/com/example/demo/speaker/controller/CompanyController.java b/src/main/java/com/example/demo/speaker/controller/CompanyController.java index 59c65d8..a3f217d 100644 --- a/src/main/java/com/example/demo/speaker/controller/CompanyController.java +++ b/src/main/java/com/example/demo/speaker/controller/CompanyController.java @@ -1,16 +1,10 @@ package com.example.demo.speaker.controller; -import com.example.demo.speaker.model.Appointment; +import com.example.demo.speaker.controller.DTO.CompanyDTO; import com.example.demo.speaker.model.Company; -import com.example.demo.speaker.model.Employee; -import com.example.demo.speaker.model.RequestForCooperation; -import com.example.demo.speaker.service.AppointmentService; import com.example.demo.speaker.service.CompanyService; -import com.example.demo.speaker.service.EmployeeService; -import com.example.demo.speaker.service.RequestForCooperationService; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; import java.util.List; @RestController @@ -39,7 +33,7 @@ public class CompanyController { return new CompanyDTO(companyService.deleteCompany(id)); } - @DeleteMapping + @DeleteMapping("/remove") public void removeAllCompanies() { companyService.deleteAllCompanies(); } diff --git a/src/main/java/com/example/demo/speaker/controller/AppointmentDTO.java b/src/main/java/com/example/demo/speaker/controller/DTO/AppointmentDTO.java similarity index 89% rename from src/main/java/com/example/demo/speaker/controller/AppointmentDTO.java rename to src/main/java/com/example/demo/speaker/controller/DTO/AppointmentDTO.java index 6c46ffc..14c16da 100644 --- a/src/main/java/com/example/demo/speaker/controller/AppointmentDTO.java +++ b/src/main/java/com/example/demo/speaker/controller/DTO/AppointmentDTO.java @@ -1,4 +1,4 @@ -package com.example.demo.speaker.controller; +package com.example.demo.speaker.controller.DTO; import com.example.demo.speaker.model.Appointment; diff --git a/src/main/java/com/example/demo/speaker/controller/CompanyDTO.java b/src/main/java/com/example/demo/speaker/controller/DTO/CompanyDTO.java similarity index 95% rename from src/main/java/com/example/demo/speaker/controller/CompanyDTO.java rename to src/main/java/com/example/demo/speaker/controller/DTO/CompanyDTO.java index 46db78d..3706861 100644 --- a/src/main/java/com/example/demo/speaker/controller/CompanyDTO.java +++ b/src/main/java/com/example/demo/speaker/controller/DTO/CompanyDTO.java @@ -1,4 +1,4 @@ -package com.example.demo.speaker.controller; +package com.example.demo.speaker.controller.DTO; import com.example.demo.speaker.model.Company; import com.example.demo.speaker.model.RequestForCooperation; diff --git a/src/main/java/com/example/demo/speaker/controller/EmployeeDTO.java b/src/main/java/com/example/demo/speaker/controller/DTO/EmployeeDTO.java similarity index 71% rename from src/main/java/com/example/demo/speaker/controller/EmployeeDTO.java rename to src/main/java/com/example/demo/speaker/controller/DTO/EmployeeDTO.java index b5388c5..90e7b86 100644 --- a/src/main/java/com/example/demo/speaker/controller/EmployeeDTO.java +++ b/src/main/java/com/example/demo/speaker/controller/DTO/EmployeeDTO.java @@ -1,10 +1,6 @@ -package com.example.demo.speaker.controller; +package com.example.demo.speaker.controller.DTO; -import com.example.demo.speaker.model.Appointment; import com.example.demo.speaker.model.Employee; -import jakarta.persistence.Column; -import jakarta.persistence.FetchType; -import jakarta.persistence.OneToOne; public class EmployeeDTO { private Long id; diff --git a/src/main/java/com/example/demo/speaker/controller/RequestForCooperationDTO.java b/src/main/java/com/example/demo/speaker/controller/DTO/RequestForCooperationDTO.java similarity index 86% rename from src/main/java/com/example/demo/speaker/controller/RequestForCooperationDTO.java rename to src/main/java/com/example/demo/speaker/controller/DTO/RequestForCooperationDTO.java index b982e80..f24b534 100644 --- a/src/main/java/com/example/demo/speaker/controller/RequestForCooperationDTO.java +++ b/src/main/java/com/example/demo/speaker/controller/DTO/RequestForCooperationDTO.java @@ -1,12 +1,8 @@ -package com.example.demo.speaker.controller; +package com.example.demo.speaker.controller.DTO; import com.example.demo.speaker.model.Company; -import com.example.demo.speaker.model.Employee; import com.example.demo.speaker.model.RequestForCooperation; import com.example.demo.speaker.model.TypeOfRequestEnum; -import jakarta.persistence.Column; -import jakarta.persistence.FetchType; -import jakarta.persistence.OneToOne; import java.util.Date; diff --git a/src/main/java/com/example/demo/speaker/controller/EmployeeController.java b/src/main/java/com/example/demo/speaker/controller/EmployeeController.java index ddb30f8..f41e4c4 100644 --- a/src/main/java/com/example/demo/speaker/controller/EmployeeController.java +++ b/src/main/java/com/example/demo/speaker/controller/EmployeeController.java @@ -1,5 +1,6 @@ package com.example.demo.speaker.controller; +import com.example.demo.speaker.controller.DTO.EmployeeDTO; import com.example.demo.speaker.model.Appointment; import com.example.demo.speaker.model.RequestForCooperation; import com.example.demo.speaker.model.Employee; @@ -8,7 +9,6 @@ import com.example.demo.speaker.service.RequestForCooperationService; import com.example.demo.speaker.service.EmployeeService; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; import java.util.List; @RestController @RequestMapping("/employee") diff --git a/src/main/java/com/example/demo/speaker/controller/MVCController/AppointmentMVCController.java b/src/main/java/com/example/demo/speaker/controller/MVCController/AppointmentMVCController.java new file mode 100644 index 0000000..f3e3fca --- /dev/null +++ b/src/main/java/com/example/demo/speaker/controller/MVCController/AppointmentMVCController.java @@ -0,0 +1,59 @@ +package com.example.demo.speaker.controller.MVCController; + +import com.example.demo.speaker.controller.DTO.AppointmentDTO; +import com.example.demo.speaker.model.Appointment; +import com.example.demo.speaker.service.AppointmentService; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import java.util.Random; + +@Controller +@RequestMapping("/appointment") +public class AppointmentMVCController +{ + private final AppointmentService appointmentService; + + public AppointmentMVCController(AppointmentService appointmentService) { + this.appointmentService = appointmentService; + } + + @GetMapping + public String getAppointments(Model model) { + model.addAttribute("appointments", + appointmentService.findAllAppointments().stream() + .map(AppointmentDTO::new) + .toList()); + return "appointment"; + } + + @PostMapping("/create") + public String createAppointment(String name, Model model){ + + Random r = new Random(); + var app = new Appointment(r.nextLong(), name); + appointmentService.addAppointment(new AppointmentDTO(app)); + model.addAttribute("appointmentName", name); + model.addAttribute("appointmentDTO", new AppointmentDTO(appointmentService.addAppointment(new AppointmentDTO(app)))); + return "redirect:/appointment"; + + } + + @PostMapping("edit/{id}") + public String updateMVCAppointment(@PathVariable Long id, @ModelAttribute("appointment") AppointmentDTO appointment, + Model model) { + //appointmentService.updateAppointment(id, appointment); + model.addAttribute("appointmentId", id); + model.addAttribute("appointmentDTO", new AppointmentDTO(appointmentService.updateAppointment(id,appointment))); + return "redirect:/appointment"; + } + + @PostMapping("delete/{id}") + public String deleteAppointment(@PathVariable Long id) { + appointmentService.deleteAppointment(id); + return "redirect:/appointment"; + } +} + diff --git a/src/main/java/com/example/demo/speaker/controller/MVCController/CompanyMVCController.java b/src/main/java/com/example/demo/speaker/controller/MVCController/CompanyMVCController.java new file mode 100644 index 0000000..26f2eb7 --- /dev/null +++ b/src/main/java/com/example/demo/speaker/controller/MVCController/CompanyMVCController.java @@ -0,0 +1,48 @@ +package com.example.demo.speaker.controller.MVCController; + +import com.example.demo.speaker.controller.DTO.CompanyDTO; +import com.example.demo.speaker.model.Company; +import com.example.demo.speaker.service.CompanyService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; +import org.springframework.ui.Model; + +import java.util.List; + +@Controller +@RequestMapping("/company") +public class CompanyMVCController { + private final CompanyService companyService; + + public CompanyMVCController(CompanyService _companyService) { + this.companyService = _companyService; + } + @PostMapping("/create") + public CompanyDTO addCompany(@RequestParam("name") String name, @RequestParam("legalAdressCompany") String legalAdressCompany, + @RequestParam("adressCompany") String adressCompany, + @RequestParam("contactEmail") String contactEmail) { + var company = new Company(name, legalAdressCompany, adressCompany, contactEmail); + return new CompanyDTO(companyService.addCompany(new CompanyDTO(company))); + } + + @PutMapping("/edit/{id}") + public String updateCompany(@PathVariable Long id, @ModelAttribute CompanyDTO companyDTO) { + companyService.updateCompany(id,companyDTO); + return "redirect:company"; + } + + @PostMapping("delete/{id}") + public String removeCompany(@PathVariable Long id) { + companyService.deleteCompany(id); + return "company"; + } + + @GetMapping + public String findAllCompanies(Model model) { + model.addAttribute("companies", companyService.findAllCompanies() + .stream() + .map(CompanyDTO::new) + .toList()); + return "company"; + } +} 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 new file mode 100644 index 0000000..d655cd9 --- /dev/null +++ b/src/main/java/com/example/demo/speaker/controller/MVCController/EmployeeMVCController.java @@ -0,0 +1,62 @@ +package com.example.demo.speaker.controller.MVCController; + +import com.example.demo.speaker.controller.DTO.AppointmentDTO; +import com.example.demo.speaker.controller.DTO.EmployeeDTO; +import com.example.demo.speaker.model.Appointment; +import com.example.demo.speaker.model.Employee; +import com.example.demo.speaker.service.AppointmentService; +import com.example.demo.speaker.service.EmployeeService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; +import org.springframework.ui.Model; + +import java.util.List; +import java.util.stream.Collectors; + +@Controller +@RequestMapping("/employee") +public class EmployeeMVCController { + private final EmployeeService employeeService; + private final AppointmentService appointmentService; + + public List appointments; + + + public EmployeeMVCController(EmployeeService employeeService, AppointmentService appointmentService) { + this.employeeService = employeeService; + this.appointmentService = appointmentService; + this.appointments = appointmentService.findAllAppointments(); + } + + @GetMapping + public String getWorkers(Model model) { + model.addAttribute("employees", + employeeService.findAllWorkers().stream() + .map(EmployeeDTO::new) + .toList()); + model.addAttribute("appointments", + appointmentService.findAllAppointments().stream().map(AppointmentDTO::new).toList()); + 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)))); + 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()); + return "redirect:employee"; + } + + @PostMapping("/delete/{id}") + public String deleteWorker(@PathVariable Long id) { + employeeService.deleteWorker(id); + return "redirect:/employee"; + } +} diff --git a/src/main/java/com/example/demo/speaker/controller/MVCController/RequestMVCController.java b/src/main/java/com/example/demo/speaker/controller/MVCController/RequestMVCController.java new file mode 100644 index 0000000..6d98f01 --- /dev/null +++ b/src/main/java/com/example/demo/speaker/controller/MVCController/RequestMVCController.java @@ -0,0 +1,83 @@ +package com.example.demo.speaker.controller.MVCController; + +import com.example.demo.speaker.controller.DTO.CompanyDTO; +import com.example.demo.speaker.controller.DTO.EmployeeDTO; +import com.example.demo.speaker.controller.DTO.RequestForCooperationDTO; +import com.example.demo.speaker.model.Company; +import com.example.demo.speaker.model.Employee; +import com.example.demo.speaker.model.RequestForCooperation; +import com.example.demo.speaker.model.TypeOfRequestEnum; +import com.example.demo.speaker.service.CompanyService; +import com.example.demo.speaker.service.EmployeeService; +import com.example.demo.speaker.service.RequestForCooperationService; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +@Controller +@RequestMapping("/request") +public class RequestMVCController { + private final RequestForCooperationService requestForCooperationService; + private final CompanyService companyService; + private final EmployeeService employeeService; + List types; + List employees; + List companies; + + public RequestMVCController(RequestForCooperationService requestForCooperationService, CompanyService companyService, EmployeeService employeeService) { + this.requestForCooperationService = requestForCooperationService; + this.companyService = companyService; + this.employeeService = employeeService; + this.types = List.of(TypeOfRequestEnum.TRACKING, TypeOfRequestEnum.DEVELOP); + employees = employeeService.findAllWorkers(); + companies = companyService.findAllCompanies(); + } + + + @GetMapping + public String getRequests(Model model) { + model.addAttribute("requests", requestForCooperationService.findAllRequests() + .stream().map(RequestForCooperationDTO::new).toList()); + model.addAttribute("types", types); + model.addAttribute("employees", employees.stream() + .map(EmployeeDTO::new).toList()); + model.addAttribute("companies", companies.stream() + .map(CompanyDTO::new).toList()); + return "request"; + } + + @PostMapping("/add") + public String createRequest(@PathVariable Long nameCompany, + @PathVariable String comment, + @PathVariable Integer isActive, + @PathVariable Long sort, + @PathVariable Long type, + Model model + ){ + + //@RequestBody RequestForCooperationDTO requestDTO) { + var company = companyService.findCompany(nameCompany); + var emp = employeeService.findWorker(sort); + var request = new RequestForCooperation(company, new Date(), type == 0 ? TypeOfRequestEnum.DEVELOP : TypeOfRequestEnum.TRACKING, comment); + requestForCooperationService.addRequest(new RequestForCooperationDTO(request)); + return "redirect:request"; + } + + @PutMapping("/{id}") + public String updateRequest(@PathVariable Long id, + @ModelAttribute RequestForCooperationDTO request, + Model model) { + requestForCooperationService.updateRequest(request); + return "redirect:request"; + } + + @PostMapping("/delete/{id}") + public String deleteRequest(@PathVariable Long id, Model model) { + requestForCooperationService.deleteRequest(id); + return "redirect:request"; + } + +} diff --git a/src/main/java/com/example/demo/speaker/controller/RequestForCooperationController.java b/src/main/java/com/example/demo/speaker/controller/RequestForCooperationController.java index 2ff3e50..552bbda 100644 --- a/src/main/java/com/example/demo/speaker/controller/RequestForCooperationController.java +++ b/src/main/java/com/example/demo/speaker/controller/RequestForCooperationController.java @@ -1,5 +1,6 @@ package com.example.demo.speaker.controller; +import com.example.demo.speaker.controller.DTO.RequestForCooperationDTO; import com.example.demo.speaker.model.RequestForCooperation; import com.example.demo.speaker.model.TypeOfRequestEnum; import com.example.demo.speaker.service.CompanyService; diff --git a/src/main/java/com/example/demo/speaker/service/AppointmentService.java b/src/main/java/com/example/demo/speaker/service/AppointmentService.java index 67b37f6..068379a 100644 --- a/src/main/java/com/example/demo/speaker/service/AppointmentService.java +++ b/src/main/java/com/example/demo/speaker/service/AppointmentService.java @@ -1,6 +1,6 @@ package com.example.demo.speaker.service; -import com.example.demo.speaker.controller.AppointmentDTO; +import com.example.demo.speaker.controller.DTO.AppointmentDTO; import com.example.demo.speaker.model.Appointment; import com.example.demo.speaker.repository.IAppointmentRepository; import org.springframework.stereotype.Service; @@ -8,7 +8,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Optional; -import java.util.Random; @Service public class AppointmentService { diff --git a/src/main/java/com/example/demo/speaker/service/CompanyService.java b/src/main/java/com/example/demo/speaker/service/CompanyService.java index f6f75ff..0269fea 100644 --- a/src/main/java/com/example/demo/speaker/service/CompanyService.java +++ b/src/main/java/com/example/demo/speaker/service/CompanyService.java @@ -1,14 +1,11 @@ package com.example.demo.speaker.service; -import com.example.demo.speaker.controller.CompanyDTO; +import com.example.demo.speaker.controller.DTO.CompanyDTO; import com.example.demo.speaker.model.Company; import com.example.demo.speaker.model.RequestForCooperation; -import com.example.demo.speaker.model.TypeOfRequestEnum; import com.example.demo.speaker.repository.ICompanyRepository; -import jakarta.persistence.EntityNotFoundException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; import java.util.List; import java.util.Optional; 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 7f72201..a8efd39 100644 --- a/src/main/java/com/example/demo/speaker/service/EmployeeService.java +++ b/src/main/java/com/example/demo/speaker/service/EmployeeService.java @@ -1,6 +1,6 @@ package com.example.demo.speaker.service; -import com.example.demo.speaker.controller.EmployeeDTO; +import com.example.demo.speaker.controller.DTO.EmployeeDTO; import com.example.demo.speaker.model.Appointment; import com.example.demo.speaker.model.Employee; import com.example.demo.speaker.model.RequestForCooperation; diff --git a/src/main/java/com/example/demo/speaker/service/RequestForCooperationService.java b/src/main/java/com/example/demo/speaker/service/RequestForCooperationService.java index 309cfc4..0b5e217 100644 --- a/src/main/java/com/example/demo/speaker/service/RequestForCooperationService.java +++ b/src/main/java/com/example/demo/speaker/service/RequestForCooperationService.java @@ -1,7 +1,6 @@ package com.example.demo.speaker.service; -import com.example.demo.speaker.controller.CompanyDTO; -import com.example.demo.speaker.controller.RequestForCooperationDTO; +import com.example.demo.speaker.controller.DTO.RequestForCooperationDTO; import com.example.demo.speaker.model.Company; import com.example.demo.speaker.model.Employee; import com.example.demo.speaker.model.RequestForCooperation; diff --git a/src/main/resources/templates/appointment.html b/src/main/resources/templates/appointment.html new file mode 100644 index 0000000..212a7f3 --- /dev/null +++ b/src/main/resources/templates/appointment.html @@ -0,0 +1,47 @@ + + + + + +
+
+ + + + + + + + + + + + + + + +
IDИмя
+ +
+ + + +
+ +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/company.html b/src/main/resources/templates/company.html new file mode 100644 index 0000000..ccd969a --- /dev/null +++ b/src/main/resources/templates/company.html @@ -0,0 +1,50 @@ + + + + + +
+
+ + + + + + + + + + + + + + + +
IDКомпания
+ +
+ + + + + + +
+ +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html new file mode 100644 index 0000000..6627988 --- /dev/null +++ b/src/main/resources/templates/default.html @@ -0,0 +1,50 @@ + + + + + Site of Company + + + + + + + + + +
+
+
+
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/employee.html b/src/main/resources/templates/employee.html new file mode 100644 index 0000000..7efba38 --- /dev/null +++ b/src/main/resources/templates/employee.html @@ -0,0 +1,54 @@ + + + + + +
+
+ + + + + + + + + + + + + + + +
IDИмя
+ +
+ + + + + + +
+ +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html new file mode 100644 index 0000000..ba36613 --- /dev/null +++ b/src/main/resources/templates/index.html @@ -0,0 +1,12 @@ + + + + + +
+

It's works!

+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/request.html b/src/main/resources/templates/request.html new file mode 100644 index 0000000..4d542d2 --- /dev/null +++ b/src/main/resources/templates/request.html @@ -0,0 +1,67 @@ + + + + + +
+
+ + + + + + + + + + + + + + + +
IDЗаявка
+ +
+ + + + + + + + + + + +
+ +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/src/test/java/com/example/demo/JPATests.java b/src/test/java/com/example/demo/JPATests.java index 765771a..116587c 100644 --- a/src/test/java/com/example/demo/JPATests.java +++ b/src/test/java/com/example/demo/JPATests.java @@ -1,27 +1,8 @@ package com.example.demo; -import com.example.demo.speaker.controller.AppointmentDTO; -import com.example.demo.speaker.model.*; -import com.example.demo.speaker.service.CompanyService; -import com.example.demo.speaker.service.RequestForCooperationService; -import com.example.demo.speaker.service.AppointmentService; -import com.example.demo.speaker.service.EmployeeService; -import jakarta.persistence.EntityNotFoundException; -import jakarta.transaction.Transactional; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.List; -import java.util.Locale; -import java.util.stream.Stream; - @SpringBootTest public class JPATests {