From d00660090f1bab6224ce37c06cd1240896d6a837 Mon Sep 17 00:00:00 2001
From: "DozorovaA.A" <a.bestugeva2003@gmail.com>
Date: Tue, 13 Jun 2023 15:05:57 +0400
Subject: [PATCH] it working

---
 data.mv.db                                    | Bin 77824 -> 73728 bytes
 .../speaker/controller/DTO/EmployeeDTO.java   |   4 +-
 .../DTO/RequestForCooperationDTO.java         |  18 +++---
 .../MVCController/EmployeeMVCController.java  |   4 +-
 .../MVCController/RequestMVCController.java   |  23 ++++----
 .../RequestForCooperationController.java      |   2 +-
 .../speaker/model/RequestForCooperation.java  |   7 ++-
 .../service/RequestForCooperationService.java |   9 ++-
 src/main/resources/templates/appointment.html |   8 +--
 src/main/resources/templates/company.html     |   8 +--
 src/main/resources/templates/employee.html    |   6 +-
 src/main/resources/templates/request.html     |  52 +++++++++++++-----
 12 files changed, 84 insertions(+), 57 deletions(-)

diff --git a/data.mv.db b/data.mv.db
index 62d57256ce3311c7a0fccc4cfd8766c6a014631c..f3f921633561aca441d9e3d32a558c24eb42f855 100644
GIT binary patch
literal 73728
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

literal 77824
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
F{{y+MekuR}

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 8e06742..13e8a1b 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
@@ -21,9 +21,7 @@ public class EmployeeDTO {
 
     public String getFio() { return fio; }
 
-    public void setAppointment(Long appointment) {
-        this.appointmentId = appointment;
-    }
+    public void setAppointmentId(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 273bd29..c0f83b3 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
@@ -8,39 +8,39 @@ import java.util.Date;
 
 public class RequestForCooperationDTO {
     private Long id;
-    private Company nameCompany;
+    private Long nameCompany;
     private String comment;
     private Date createDate;
     private Date approveDate;
     private Boolean isActive;
-    private EmployeeDTO sotr;
+    private Long sotr;
     private TypeOfRequestEnum type;
 
     public RequestForCooperationDTO(RequestForCooperation request)
     {
         this.id = request.getId();
-        this.nameCompany = request.getName();
+        this.nameCompany = request.getName().getId();
         this.comment = request.getComment();
         this.approveDate = request.getApproveDate();
-        this.sotr = new EmployeeDTO(request.getWorker());
+        this.sotr = request.getWorker().getId();
         this.createDate = request.getCreateDate();
         this.isActive = request.getActive();
         this.type = request.getType();
     }
-
+public RequestForCooperationDTO(){}
     public long getId() { return this.id; }
 
     public String getComment() { return comment; }
 
     public Boolean getActive() { return isActive; }
 
-    public Company getNameCompany() { return nameCompany; }
+    public Long getNameCompany() { return nameCompany; }
 
     public Date getApproveDate() { return approveDate; }
 
     public Date getCreateDate() { return createDate; }
 
-    public EmployeeDTO getSotr() { return sotr; }
+    public Long getSotr() { return sotr; }
 
     public TypeOfRequestEnum getType() {return type; }
 
@@ -60,11 +60,11 @@ public class RequestForCooperationDTO {
         this.createDate = createDate;
     }
 
-    public void setNameCompany(Company nameCompany) {
+    public void setNameCompany(Long nameCompany) {
         this.nameCompany = nameCompany;
     }
 
-    public void setSotr(EmployeeDTO sotr) {
+    public void setSotr(Long sotr) {
         this.sotr = sotr;
     }
 
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 353f8f6..c3c690c 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
@@ -44,7 +44,7 @@ public class EmployeeMVCController {
     @PostMapping("/create")
     public String createWorker(@ModelAttribute EmployeeDTO employeeDTO, Model model) {
         employeeService.addWorker(employeeDTO);
-        return "redirect:employee";
+        return "employee";
     }
 
     @PostMapping("/edit/{id}")
@@ -52,7 +52,7 @@ public class EmployeeMVCController {
         employeeService.updateReportWorker(id, employeeDTO);
 //        model.addAttribute("employees", employeeService.findAllWorkers());
 //        model.addAttribute("appointments", appointmentService.findAllAppointments());
-        return "redirect:employee";
+        return "/employee";
     }
 
     @PostMapping("/delete/{id}")
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
index 6d98f01..feaf369 100644
--- a/src/main/java/com/example/demo/speaker/controller/MVCController/RequestMVCController.java
+++ b/src/main/java/com/example/demo/speaker/controller/MVCController/RequestMVCController.java
@@ -10,10 +10,12 @@ 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.h2.store.Data;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -39,6 +41,7 @@ public class RequestMVCController {
 
     @GetMapping
     public String getRequests(Model model) {
+        model.addAttribute("requestDTO", new RequestForCooperationDTO());
          model.addAttribute("requests", requestForCooperationService.findAllRequests()
                  .stream().map(RequestForCooperationDTO::new).toList());
          model.addAttribute("types", types);
@@ -49,27 +52,23 @@ public class RequestMVCController {
          return "request";
     }
 
-    @PostMapping("/add")
-    public String createRequest(@PathVariable Long nameCompany,
-                                               @PathVariable String comment,
-                                               @PathVariable Integer isActive,
-                                               @PathVariable Long sort,
-                                               @PathVariable Long type,
+    @PostMapping("/create")
+    public String createRequest(@ModelAttribute("requestDTO") RequestForCooperationDTO requestDTO,
                                 Model model
     ){
-
+        requestDTO.setCreateDate(new Date());
+        requestDTO.setApproveDate(new Date());
         //@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";
+        requestForCooperationService.addRequest(requestDTO);
+        return "request";
     }
 
     @PutMapping("/{id}")
     public String updateRequest(@PathVariable Long id,
                                                   @ModelAttribute RequestForCooperationDTO request,
                                                   Model model) {
+        request.setApproveDate(new Date());
+        request.setCreateDate(requestForCooperationService.findRequest(id).getCreateDate());
         requestForCooperationService.updateRequest(request);
         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 552bbda..7645856 100644
--- a/src/main/java/com/example/demo/speaker/controller/RequestForCooperationController.java
+++ b/src/main/java/com/example/demo/speaker/controller/RequestForCooperationController.java
@@ -45,7 +45,7 @@ public class RequestForCooperationController {
                                                //@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);
+    var request = new RequestForCooperation(company, new Date(), type == 0 ? TypeOfRequestEnum.DEVELOP : TypeOfRequestEnum.TRACKING, comment, emp);
         return requestForCooperationService.addRequest(new RequestForCooperationDTO(request));
     }
 
diff --git a/src/main/java/com/example/demo/speaker/model/RequestForCooperation.java b/src/main/java/com/example/demo/speaker/model/RequestForCooperation.java
index e57d82a..fed093f 100644
--- a/src/main/java/com/example/demo/speaker/model/RequestForCooperation.java
+++ b/src/main/java/com/example/demo/speaker/model/RequestForCooperation.java
@@ -27,19 +27,20 @@ public class RequestForCooperation {
     public RequestForCooperation() {
     }
     Random r = new Random();
-    public RequestForCooperation(Company name, Date createDate, TypeOfRequestEnum type, String text) {
+    public RequestForCooperation(Company name, Date createDate, TypeOfRequestEnum type, String text, Employee employee) {
         this.nameCompany = name;
         this.createDate = createDate;
         this.comment = text;
         this.typeSotr = type;
         this.id = r.nextLong();
+        this.sotr = employee;
     }
-    public RequestForCooperation(Long id, Company name, Date createDate, TypeOfRequestEnum type, String text) {
+    public RequestForCooperation(Long id, Company name, Date createDate,
+                                 TypeOfRequestEnum type, String text) {
         this.nameCompany = name;
         this.createDate = createDate;
         this.comment = text;
         this.typeSotr = type;
-        this.id = id;
     }
 
     public Company getName()
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 0b5e217..7ea80b3 100644
--- a/src/main/java/com/example/demo/speaker/service/RequestForCooperationService.java
+++ b/src/main/java/com/example/demo/speaker/service/RequestForCooperationService.java
@@ -25,10 +25,13 @@ public class RequestForCooperationService {
 
     @Transactional
     public RequestForCooperation addRequest(RequestForCooperationDTO requestDTO) {
-        final RequestForCooperation request = new RequestForCooperation(requestDTO.getNameCompany(),
+        var company = companyService.findCompany(requestDTO.getNameCompany());
+        var empl = employeeService.findWorker(requestDTO.getSotr());
+        final RequestForCooperation request = new RequestForCooperation(company,
                                                                         requestDTO.getCreateDate(),
                                                                         requestDTO.getType(),
-                                                                        requestDTO.getComment());
+                                                                        requestDTO.getComment(),
+                                                                        empl);
         requestForCooperationRepository.save(request);
         return request;
     }
@@ -49,7 +52,7 @@ public class RequestForCooperationService {
         final RequestForCooperation currentReport = findRequest(requestDTO.getId());
         currentReport.setApproveDate(requestDTO.getApproveDate());
         currentReport.setActive(requestDTO.getActive());
-        currentReport.setUser(employeeService.findWorker(requestDTO.getSotr().getId()));
+        currentReport.setUser(employeeService.findWorker(requestDTO.getSotr()));
         requestForCooperationRepository.save(currentReport);
         return currentReport;
     }
diff --git a/src/main/resources/templates/appointment.html b/src/main/resources/templates/appointment.html
index 99bada8..5c357c9 100644
--- a/src/main/resources/templates/appointment.html
+++ b/src/main/resources/templates/appointment.html
@@ -13,7 +13,7 @@
           <input type="text" class="form-control" id="name" th:field="${appointmentDTO.name}" required="true">
         </div>
         <div class="mb-3">
-          <button type="submit" class="btn btn-primary button-fixed">
+          <button type="submit" class="btn btn-info">
             <span >Добавить</span>
           </button>
         </div>
@@ -34,12 +34,12 @@
           <td ><!--<td th:text="${appointment.name}"/>-->
           <form th:action="@{/appointment/edit/{id}(id=${appointment.id})}" th:object="${appointmentDTO}"  th:method="post">
             <input type="text" class="form-control" id="nameAppointment" th:field="${appointmentDTO.name}" th:placeholder="${appointment.name}" style="width: 60%; display: inline-block" >
-            <button class="btn btn-warning button-fixed button-sm"
+            <button class="btn btn-info"
                     type="submit" style="display: inline-block"> Изменить
             </button>
-            <button type="button" class="btn btn-danger button-fixed button-sm" style="display: inline-block"
+            <button type="button" class="btn btn-info" style="display: inline-block"
                     th:attr="onclick=|confirm('Удалить запись?') && document.getElementById('remove-${appointment.id}').click()|">
-              <i class="fa fa-trash" aria-hidden="true"></i> Удалить
+             Удалить
             </button>
           </form></td>
           <!--<td th:text="${appointment.name}" style="width: 60%"/>-->
diff --git a/src/main/resources/templates/company.html b/src/main/resources/templates/company.html
index b209ab0..316b329 100644
--- a/src/main/resources/templates/company.html
+++ b/src/main/resources/templates/company.html
@@ -12,7 +12,7 @@
             <input type="text" class="form-control" id="legalAdressCompanyNew" th:field="*{legalAdressCompany}" style="width: 15%; display: inline-block" >
             <input type="text" class="form-control" id="adressCompanyNew" th:field="*{adressCompany}" style="width: 15%; display: inline-block" >
             <input type="text" class="form-control" id="contactEmailNew" th:field="*{contactEmail}" style="width: 15%; display: inline-block" >
-            <button class="btn btn-warning button-fixed button-sm"
+            <button class="btn btn-info"
                     type="submit" style="display: inline-block"> Создать
             </button>
         </form>
@@ -35,12 +35,12 @@
                         <input type="text" class="form-control" id="legalAdressCompany" th:placeholder="${company.legalAdressCompany}" th:field="*{legalAdressCompany}" style="width: 15%; display: inline-block" >
                         <input type="text" class="form-control" id="adressCompany" th:placeholder="${company.adressCompany}" th:field="*{adressCompany}" style="width: 15%; display: inline-block" >
                         <input type="text" class="form-control" id="contactEmail" th:placeholder="${company.contactEmail}" th:field="*{contactEmail}" style="width: 15%; display: inline-block" >
-                        <button class="btn btn-warning button-fixed button-sm"
+                        <button class="btn btn-info"
                                 type="submit" style="display: inline-block"> Изменить
                         </button>
-                        <button type="button" class="btn btn-danger button-fixed button-sm" style="display: inline-block"
+                        <button type="button" class="btn btn-info" style="display: inline-block"
                                 th:attr="onclick=|confirm('Удалить запись?') && document.getElementById('remove-${company.id}').click()|">
-                            <i class="fa fa-trash" aria-hidden="true"></i> Удалить
+                            Удалить
                         </button>
                     </form></td>
                 <!--<td th:text="${appointment.name}" style="width: 60%"/>-->
diff --git a/src/main/resources/templates/employee.html b/src/main/resources/templates/employee.html
index 98fdcd2..c67a6a3 100644
--- a/src/main/resources/templates/employee.html
+++ b/src/main/resources/templates/employee.html
@@ -12,7 +12,7 @@
         <label for="name" class="form-label">Название</label>
         <input type="text" class="form-control" id="name" th:field="${employeeDTO.fio}" required="true">
       </div>
-      <select id="appointmentId" class="form-select" th:name="${employeeDTO.appointmentId}" style="width: 30%; display: inline-block">
+      <select id="appointmentId" class="form-select" th:field="${employeeDTO.appointmentId}" style="width: 30%; display: inline-block">
         <option th:each="app: ${appointments}" th:value="${app.id}">
           <span th:text="${app.name}"></span>
         </option>
@@ -41,7 +41,7 @@
           <form th:action="@{/employee/edit/{id}(id=${employee.id})}" th:object="${employeeDTO}"  th:method="post">
             <input type="text" class="form-control" id="fio" th:field="${employeeDTO.fio}" th:placeholder="${employee.fio}" style="width: 30%; display: inline-block" >
 
-            <select id="appointment" class="form-select" th:name="${employeeDTO.appointmentId}" style="width: 30%; display: inline-block">
+            <select id="appointment" class="form-select" th:field="${employeeDTO.appointmentId}" style="width: 30%; display: inline-block">
               <option th:each="app: ${appointments}" th:value="${app.id}" th:selected="${employee.appointmentId} == ${app.id}">
                 <span th:text="${app.name}"></span>
               </option>
@@ -52,7 +52,7 @@
             </button>
             <button type="button" class="btn btn-danger button-fixed button-sm" style="display: inline-block"
                     th:attr="onclick=|confirm('Удалить запись?') && document.getElementById('remove-${employee.id}').click()|">
-              <i class="fa fa-trash" aria-hidden="true"></i> Удалить
+              </i> Удалить
             </button>
           </form></td>
         <!--<td th:text="${appointment.name}" style="width: 60%"/>-->
diff --git a/src/main/resources/templates/request.html b/src/main/resources/templates/request.html
index 4d542d2..fbed4a5 100644
--- a/src/main/resources/templates/request.html
+++ b/src/main/resources/templates/request.html
@@ -6,6 +6,32 @@
 </head>
 <body>
 <div layout:fragment="content">
+    <form th:action="@{/request/create}" th:object="${requestDTO}"  th:method="post">
+        <select id="companyNew" class="form-select" th:name="company" th:field="${requestDTO.nameCompany}" style="width: 15%; display: inline-block">
+            <option th:each="value: ${companies}" th:value="${value.id}">
+                <span th:text="${value.getNameCompany()}"></span>
+            </option>
+        </select>
+<!--        <input type="date" class="form-control" id="createDateNew" th:field="${requestDTO.createDate}" style="width: 15%; display: inline-block" >-->
+<!--        <input type="date" class="form-control" id="approveDateNew" th:field="${requestDTO.approveDate}" style="width: 15%; display: inline-block" >-->
+        <input type="text" class="form-control" id="commentNew" th:field="${requestDTO.comment}" style="width: 15%; display: inline-block" >
+
+        <select id="employeeNew" class="form-select" th:field="${requestDTO.sotr}" th:name="employee" style="width: 30%; display: inline-block">
+            <option th:each="value: ${employees}" th:value="${value.id}">
+                <span th:text="${value.getFio()}"></span>
+            </option>
+        </select>
+
+        <select id="typesNew" class="form-select" th:name="type" th:field="${requestDTO.type}" style="width: 30%; display: inline-block">
+            <option th:each="value: ${types}" th:value="${value}">
+                <span th:text="${value}"></span>
+            </option>
+        </select>
+
+        <button class="btn btn-warning button-fixed button-sm"
+                type="submit" style="display: inline-block"> Изменить
+        </button>
+    </form>
     <div class="table-responsive">
         <table class="table">
             <thead>
@@ -19,24 +45,24 @@
             <tr th:each="request, iterator: ${requests}">
                 <td th:text="${request.id}"/>
                 <td ><!--<td th:text="${appointment.name}"/>-->
-                    <form th:action="@{/request/edit/{id}(id=*{id})}" th:object="${request}"  th:method="post">
-                        <select id="company" class="form-select" th:name="company" style="width: 15%; display: inline-block">
-                            <option th:each="value: ${companies}" th:selected="${request.getNameCompany().getNameCompany()} == ${value.nameCompany}">
+                    <form th:action="@{/request/edit/{id}(id=${request.id})}" th:object="${requestDTO}"  th:method="post">
+                        <select id="company" class="form-select" th:name="company" th:field="*{nameCompany}" style="width: 15%; display: inline-block">
+                            <option th:each="value: ${companies}" th:value="${value.id}" th:selected="${request.getNameCompany()} == ${value.id}">
                                 <span th:text="${value.getNameCompany()}"></span>
                             </option>
                         </select>
-                        <input type="date" class="form-control" id="createDate" th:value="${request.getCreateDate()}" style="width: 15%; display: inline-block" >
-                        <input type="date" class="form-control" id="approveDate" th:value="${request.getApproveDate()}" style="width: 15%; display: inline-block" >
-                        <input type="text" class="form-control" id="comment" th:value="${request.getComment()}" style="width: 15%; display: inline-block" >
+<!--                        <input type="date" class="form-control" id="createDate" th:value="${request.createDate}" style="width: 15%; display: inline-block" readonly>-->
+<!--                        <input type="date" class="form-control" id="approveDate" th:value="${request.approveDate}" style="width: 15%; display: inline-block" readonly>-->
+                        <input type="text" class="form-control" id="comment" th:placeholder="${request.comment}" th:field="${requestDTO.comment}" style="width: 15%; display: inline-block" >
 
-                        <select id="employee" class="form-select" th:name="employee" style="width: 30%; display: inline-block">
-                            <option th:each="value: ${employees}" th:selected="${request.getSotr().getFio()} == ${value.getFio()}">
+                        <select id="employee" class="form-select" th:field="${requestDTO.sotr}" th:name="employee" style="width: 30%; display: inline-block">
+                            <option th:each="value: ${employees}" th:value="${value.id}" th:selected="${request.getSotr()} == ${value.id}">
                                 <span th:text="${value.getFio()}"></span>
                             </option>
                         </select>
 
-                        <select id="types" class="form-select" th:name="type" style="width: 30%; display: inline-block">
-                            <option th:each="value: ${types}" th:selected="${request.getType()} == ${value}">
+                        <select id="types" class="form-select" th:field="${requestDTO.type}" th:name="type" style="width: 30%; display: inline-block">
+                            <option th:each="value: ${types}" th:value="${value}" th:selected="${request.getType()} == ${value}">
                                 <span th:text="${value}"></span>
                             </option>
                         </select>
@@ -45,15 +71,15 @@
                                 type="submit" style="display: inline-block"> Изменить
                         </button>
                         <button type="button" class="btn btn-danger button-fixed button-sm" style="display: inline-block"
-                                th:attr="onclick=|confirm('Удалить запись?') && document.getElementById('remove-${employee.id}').click()|">
+                                th:attr="onclick=|confirm('Удалить запись?') && document.getElementById('remove-${request.id}').click()|">
                             <i class="fa fa-trash" aria-hidden="true"></i> Удалить
                         </button>
                     </form></td>
                 <!--<td th:text="${appointment.name}" style="width: 60%"/>-->
                 <td style="width: 10%">
 
-                    <form th:action="@{/employee/delete/{id}(id=${employee.id})}" method="post">
-                        <button th:id="'remove-' + ${employee.id}" type="submit" style="display: none">
+                    <form th:action="@{/request/delete/{id}(id=${request.id})}" method="post">
+                        <button th:id="'remove-' + ${request.id}" type="submit" style="display: none">
                             Удалить
                         </button>
                     </form>