no message

src/main/java/com/itsol/quantrivanphong/report/leaveform/business/LeaveFormBusiness.java

@@ -26,11 +26,11 @@ public class LeaveFormBusiness {
         return leaveFormRepository.findAll();
     }
 
-    public String insertLeaveForm(int employee_Id, LeaveFormDTO leaveFormDTO, int leavetype_Id) {
+    public String addLeaveForm(LeaveFormDTO leaveFormDTO) {
         String message;
 
-        Employee employee = employeeRepository.findEmployeeById(employee_Id);
-        LeaveType leaveType = leaveTypeRepository.findLeaveTypeById(leavetype_Id);
+        Employee employee = employeeRepository.findEmployeeById(leaveFormDTO.getEmployeeId());
+        LeaveType leaveType = leaveTypeRepository.findLeaveTypeById(leaveFormDTO.getLeaveTypeId());
 
         if (employee != null) {
             if (leaveType != null) {
@@ -56,14 +56,13 @@ public class LeaveFormBusiness {
     }
 
     @Transactional
-    public String deleteLeaveForm(int emloyee_Id, int leaveform_Id) {
+    public String deleteLeaveForm(int leaveFormId) {
         String message;
-        Employee employee = employeeRepository.findEmployeeById(emloyee_Id);
-        LeaveForm leaveForm = leaveFormRepository.findLeaveFormByEmployeeAndId(employee, leaveform_Id);
-        if (employee != null) {
+        LeaveForm leaveForm = leaveFormRepository.findLeaveFormById(leaveFormId);
+
         if (leaveForm != null) {
             leaveFormRepository.delete(leaveForm);
-                if (leaveFormRepository.findLeaveFormByEmployeeAndId(employee, leaveform_Id) != null) {
+            if (leaveFormRepository.findLeaveFormById(leaveFormId) != null) {
                 message = "Delete failed!";
             } else {
                 message = "Delete success!";
@@ -71,21 +70,18 @@ public class LeaveFormBusiness {
         } else {
             message = "Leave Form does not exist";
         }
-        } else {
-            message = "Employee does not exist";
-        }
         return message;
     }
 
     @Transactional
-    public String updateLeaveForm(int employee_Id, int leavetype_Id, int leaveform_Id, LeaveFormDTO leaveFormDTO) {
+    public String updateLeaveForm(LeaveFormDTO leaveFormDTO) {
         String message;
-        Employee employee = employeeRepository.findEmployeeById(employee_Id);
-        LeaveType leaveType = leaveTypeRepository.findLeaveTypeById(leavetype_Id);
-        LeaveForm leaveForm = leaveFormRepository.findLeaveFormByEmployeeAndLeaveTypeAndId(employee, leaveType, leaveform_Id);
+        Employee employee = employeeRepository.findEmployeeById(leaveFormDTO.getEmployeeId());
+        LeaveType leaveType = leaveTypeRepository.findLeaveTypeById(leaveFormDTO.getLeaveTypeId());
+        LeaveForm leaveForm = leaveFormRepository.findLeaveFormByEmployeeAndLeaveTypeAndId(employee, leaveType, leaveFormDTO.getId());
         if (leaveType != null) {
             if (leaveForm != null) {
-                int i = leaveFormRepository.updateLeaveForm(leaveFormDTO.getTitle(), leaveFormDTO.getContent(), leaveform_Id);
+                int i = leaveFormRepository.updateLeaveForm(leaveFormDTO.getTitle(), leaveFormDTO.getContent(), leaveFormDTO.getId());
                 if (i == 1) {
                     message = "Update success";
                 } else {
@@ -102,13 +98,11 @@ public class LeaveFormBusiness {
     }
 
     @Transactional
-    public String updateLeaveFormStatus(int employee_Id, int leavetype_Id, int leaveform_Id) {
+    public String updateLeaveFormStatus(int leaveformId) {
         String message;
-        Employee employee = employeeRepository.findEmployeeById(employee_Id);
-        LeaveType leaveType = leaveTypeRepository.findLeaveTypeById(leavetype_Id);
-        LeaveForm leaveForm = leaveFormRepository.findLeaveFormByEmployeeAndLeaveTypeAndId(employee, leaveType, leaveform_Id);
+        LeaveForm leaveForm = leaveFormRepository.findLeaveFormById(leaveformId);
         if (leaveForm != null) {
-            int i = leaveFormRepository.updateLeaveFormStatus(leaveform_Id);
+            int i = leaveFormRepository.updateLeaveFormStatus(leaveformId);
             if (i == 1) {
                 message = "Update status success";
             } else {
@@ -121,8 +115,8 @@ public class LeaveFormBusiness {
         return message;
     }
 
-    public List<LeaveForm> leaveFormById(int employee_Id) {
-        Employee employee = employeeRepository.findEmployeeById(employee_Id);
+    public List<LeaveForm> showLeaveFormByEmployeeId(int employeeId) {
+        Employee employee = employeeRepository.findEmployeeById(employeeId);
         if (employee != null) {
             if (leaveFormRepository.showLeaveFormById(employee) != null) {
                 return leaveFormRepository.showLeaveFormById(employee);

src/main/java/com/itsol/quantrivanphong/report/leaveform/controller/LeaveFormController.java

@@ -8,7 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.List;
 
 @RestController
@@ -17,19 +16,19 @@ public class LeaveFormController {
     @Autowired
     LeaveFormBusiness leaveFormBusiness;
 
-    @GetMapping(path = "/leaveform")
+    @GetMapping(path = "/leaveform/show")
     public ResponseEntity<List<LeaveForm>> showAllLeaveForm() {
         return ResponseEntity.ok(leaveFormBusiness.findAll());
     }
 
-    @PostMapping(path = "/{employee_Id}/leavetype/{leavetype_Id}/leaveform", consumes = "application/json", produces = "application/json")
-    public ResponseEntity<String> insertLeaveForm(@PathVariable int employee_Id, @Valid @RequestBody LeaveFormDTO leaveFormDTO, @PathVariable int leavetype_Id) {
+    @PostMapping(path = "/leaveform/add", consumes = "application/json", produces = "application/json")
+    public ResponseEntity<String> addLeaveForm(@RequestBody LeaveFormDTO leaveFormDTO) {
         String message;
 
         try {
             if (leaveFormDTO.getTitle().trim().equals("")) throw new InputException("Tiêu đề không được để trống");
             if (leaveFormDTO.getContent().trim().equals("")) throw new InputException("Nội dung không được để trống");
-            message = leaveFormBusiness.insertLeaveForm(employee_Id, leaveFormDTO, leavetype_Id);
+            message = leaveFormBusiness.addLeaveForm(leaveFormDTO);
         } catch (InputException e) {
             message = e.getMessage();
         }
@@ -37,19 +36,19 @@ public class LeaveFormController {
         return ResponseEntity.ok(message);
     }
 
-    @DeleteMapping("/{employee_Id}/leaveform/{leaveform_Id}")
-    public ResponseEntity<String> deleteLeaveForm(@PathVariable int employee_Id, @Valid @PathVariable int leaveform_Id) {
-        return ResponseEntity.ok(leaveFormBusiness.deleteLeaveForm(employee_Id, leaveform_Id));
+    @DeleteMapping("/leaveform/delete/{leaveformId}")
+    public ResponseEntity<String> deleteLeaveForm(@PathVariable int leaveformId) {
+        return ResponseEntity.ok(leaveFormBusiness.deleteLeaveForm(leaveformId));
     }
 
-    @PostMapping(path = "/{employee_Id}/leavetype/{leavetype_Id}/leaveform/{leaveform_Id}", consumes = "application/json", produces = "application/json")
-    public ResponseEntity<String> updateLeaveForm(@PathVariable int employee_Id, @PathVariable int leavetype_Id, @PathVariable int leaveform_Id, @Valid @RequestBody LeaveFormDTO leaveFormDTO) {
+    @PostMapping(path = "/leaveform/update", consumes = "application/json", produces = "application/json")
+    public ResponseEntity<String> updateLeaveForm(@RequestBody LeaveFormDTO leaveFormDTO) {
         String message;
 
         try {
             if (leaveFormDTO.getTitle().trim().equals("")) throw new InputException("Tiêu đề không được để trống");
             if (leaveFormDTO.getContent().trim().equals("")) throw new InputException("Nội dung không được để trống");
-            message = leaveFormBusiness.updateLeaveForm(employee_Id, leavetype_Id, leaveform_Id, leaveFormDTO);
+            message = leaveFormBusiness.updateLeaveForm(leaveFormDTO);
         } catch (InputException e) {
             message = e.getMessage();
         }
@@ -57,17 +56,17 @@ public class LeaveFormController {
         return ResponseEntity.ok(message);
     }
 
-    @PostMapping(path = "/{employee_Id}/leavetype/{leavetype_Id}/leaveform/{leaveform_Id}/status", consumes = "application/json", produces = "application/json")
-    public ResponseEntity<String> updateLeaveFormStatus(@PathVariable int employee_Id, @PathVariable int leavetype_Id, @PathVariable int leaveform_Id) {
+    @PostMapping(path = "/leaveform/{leaveformId}/status", consumes = "application/json", produces = "application/json")
+    public ResponseEntity<String> updateLeaveFormStatus(@PathVariable int leaveformId) {
         String message;
-        message = leaveFormBusiness.updateLeaveFormStatus(employee_Id, leavetype_Id, leaveform_Id);
+        message = leaveFormBusiness.updateLeaveFormStatus(leaveformId);
         return ResponseEntity.ok(message);
     }
 
-    @GetMapping("/{employee_Id}/leaveform")
-    public ResponseEntity<List<LeaveForm>> showLeaveFormById(@PathVariable int employee_Id) {
-        if (leaveFormBusiness.leaveFormById(employee_Id) != null) {
-            return ResponseEntity.ok(leaveFormBusiness.leaveFormById(employee_Id));
+    @GetMapping("/leaveform/show/{employeeId}")
+    public ResponseEntity<List<LeaveForm>> showLeaveFormById(@PathVariable int employeeId) {
+        if (leaveFormBusiness.showLeaveFormByEmployeeId(employeeId) != null) {
+            return ResponseEntity.ok(leaveFormBusiness.showLeaveFormByEmployeeId(employeeId));
         } else {
             return null;
         }

src/main/java/com/itsol/quantrivanphong/report/leaveform/dto/LeaveFormDTO.java

@@ -12,6 +12,6 @@ public class LeaveFormDTO {
     private String title;
     private String content;
     private boolean status;
-    private int employee_id;
-    private int leave_type_id;
+    private int employeeId;
+    private int leaveTypeId;
 }

src/main/java/com/itsol/quantrivanphong/report/leaveform/repository/LeaveFormRepository.java

@@ -15,7 +15,7 @@ public interface LeaveFormRepository extends JpaRepository<LeaveForm, Integer> {
 
     LeaveForm findLeaveFormByEmployeeAndId(Employee employee, int id);
 
-//    LeaveForm findLeaveFormById(int i);
+    LeaveForm findLeaveFormById(int i);
 
     LeaveForm findLeaveFormByEmployeeAndLeaveTypeAndId(Employee employee, LeaveType leaveType, int id);
 

src/main/java/com/itsol/quantrivanphong/report/timesheet/business/TimeSheetBusiness.java

@@ -21,10 +21,10 @@ public class TimeSheetBusiness {
     EProjectRepository eProjectRepository;
     @Autowired
     EmployeeRepository employeeRepository;
-    public String insertTimeSheet(int employee_Id, TimeSheetDTO timeSheetDTO) {
+    public String addTimeSheet(TimeSheetDTO timeSheetDTO) {
         String message;
-        Employee employee = employeeRepository.findEmployeeById(employee_Id);
-        Eproject eproject = eProjectRepository.findEprojectByIdAndEmployee(timeSheetDTO.getEproject_id(), employee);
+        Employee employee = employeeRepository.findEmployeeById(timeSheetDTO.getEmployeeId());
+        Eproject eproject = eProjectRepository.findEprojectByIdAndEmployee(timeSheetDTO.getEprojectId(), employee);
         if (eproject != null) {
 //            SimpleDateFormat formatter= new SimpleDateFormat("dd-MM-yyyy HH:mm");
 //            Date date = new Date(System.currentTimeMillis());
@@ -49,14 +49,14 @@ public class TimeSheetBusiness {
         return message;
     }
 
-    public String deleteTimeSheet(int employee_Id, int timeSheet_Id) {
+    public String deleteTimeSheet(int timeSheetId) {
         String message;
-        Employee employee = employeeRepository.findEmployeeById(employee_Id);
-        Eproject eproject = eProjectRepository.findEprojectByEmployee(employee);
-        TimeSheet timeSheet = timeSheetRepository.findTimeSheetByEprojectAndId(eproject, timeSheet_Id);
+//        Employee employee = employeeRepository.findEmployeeById(employee_Id);
+//        Eproject eproject = eProjectRepository.findEprojectByEmployee(employee);
+        TimeSheet timeSheet = timeSheetRepository.findTimeSheetById(timeSheetId);
         if (timeSheet != null) {
             timeSheetRepository.delete(timeSheet);
-            if (timeSheetRepository.findTimeSheetByEprojectAndId(eproject, timeSheet_Id) == null) {
+            if (timeSheetRepository.findTimeSheetById(timeSheetId) == null) {
                 message = "Delete success";
             } else {
                 message = "Delete failed";
@@ -72,15 +72,15 @@ public class TimeSheetBusiness {
     }
 
     @Transactional
-    public String updateTimeSheet(int employee_Id, TimeSheetDTO timeSheetDTO, int timesheet_Id) {
+    public String updateTimeSheet(TimeSheetDTO timeSheetDTO) {
         String message;
-        Employee employee = employeeRepository.findEmployeeById(employee_Id);
+        Employee employee = employeeRepository.findEmployeeById(timeSheetDTO.getEmployeeId());
         Eproject eproject = eProjectRepository.findEprojectByEmployee(employee);
-        TimeSheet timeSheet = timeSheetRepository.findTimeSheetByEprojectAndId(eproject, timesheet_Id);
+        TimeSheet timeSheet = timeSheetRepository.findTimeSheetByEprojectAndId(eproject, timeSheetDTO.getId());
         if (eproject != null) {
             if (timeSheet != null) {
                 int i = timeSheetRepository.updateTimeSheet(timeSheetDTO.getTitle(), timeSheetDTO.getContent()
-                        , timeSheetDTO.getNote(), timesheet_Id);
+                        , timeSheetDTO.getNote(), timeSheetDTO.getId());
                 if (i == 1) {
                     message = "Update success";
                 } else {
@@ -98,7 +98,7 @@ public class TimeSheetBusiness {
 //    @Transactional
 //    public String updateLeaveFormStatus(TimeSheetDTO timeSheetDTO) {
 //        String message;
-//        TimeSheet timeSheet = timeSheetRepository.findTimeSheetById(timeSheetDTO.getId());
+//        TimeSheet timeSheet = timeSheetRepository.findTimeSheetByEmployeeId(timeSheetDTO.getId());
 //        if (timeSheet != null) {
 //            int i = timeSheetRepository.updateTimeSheetStatus(timeSheetDTO.isStatus(), timeSheetDTO.getId());
 //            if (i == 1) {
@@ -113,8 +113,8 @@ public class TimeSheetBusiness {
 //        return message;
 //    }
 
-    public List<TimeSheet> findTimeSheetById(int employee_Id) {
-        Employee employee = employeeRepository.findEmployeeById(employee_Id);
+    public List<TimeSheet> findTimeSheetByEmployeeId(int employeeId) {
+        Employee employee = employeeRepository.findEmployeeById(employeeId);
         Eproject eproject = eProjectRepository.findEprojectByEmployee(employee);
         if (employee != null && eproject != null && timeSheetRepository.showTimeSheetByEproject(eproject) != null) {
             return timeSheetRepository.showTimeSheetByEproject(eproject);

src/main/java/com/itsol/quantrivanphong/report/timesheet/controller/TimeSheetController.java

@@ -8,7 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.List;
 
 @RestController
@@ -16,13 +15,13 @@ import java.util.List;
 public class TimeSheetController {
     @Autowired
     TimeSheetBusiness timeSheetBusiness;
-    @PostMapping(path = "/{employee_Id}/timesheet", consumes = "application/json", produces = "application/json")
-    public ResponseEntity<String> insertTimeSheet(@PathVariable int employee_Id, @Valid @RequestBody TimeSheetDTO timeSheetDTO) {
+    @PostMapping(path = "/timesheet/add", consumes = "application/json", produces = "application/json")
+    public ResponseEntity<String> addTimeSheet(@RequestBody TimeSheetDTO timeSheetDTO) {
         String message;
         try {
             if (timeSheetDTO.getTitle().trim().equals("")) throw new InputException("Tiêu đề không được để trống");
             if (timeSheetDTO.getContent().trim().equals("")) throw new InputException("Nội dung không được để trống");
-            message = timeSheetBusiness.insertTimeSheet(employee_Id, timeSheetDTO);
+            message = timeSheetBusiness.addTimeSheet(timeSheetDTO);
         } catch (InputException e) {
             message = e.getMessage();
         }
@@ -30,24 +29,24 @@ public class TimeSheetController {
         return ResponseEntity.ok(message);
     }
 
-    @DeleteMapping("/{employee_Id}/timesheet/{timesheet_Id}")
-    public ResponseEntity<String> deleteTimeSheet(@PathVariable int employee_Id, @Valid @PathVariable int timesheet_Id) {
-        return ResponseEntity.ok(timeSheetBusiness.deleteTimeSheet(employee_Id, timesheet_Id));
+    @DeleteMapping("/timesheet/delete/{timesheetId}")
+    public ResponseEntity<String> deleteTimeSheet(@PathVariable int timesheetId) {
+        return ResponseEntity.ok(timeSheetBusiness.deleteTimeSheet(timesheetId));
     }
 
-    @GetMapping(path = "/timesheet")
+    @GetMapping(path = "/timesheet/show")
     public List<TimeSheet> showAllTimeSheet() {
         return timeSheetBusiness.findAll();
     }
 
-    @PostMapping(path = "/{employee_Id}/timesheet/{timesheet_Id}", consumes = "application/json", produces = "application/json")
-    public ResponseEntity<String> updateTimeSheet(@PathVariable int employee_Id, @PathVariable int timesheet_Id, @Valid @RequestBody TimeSheetDTO timeSheetDTO) {
+    @PostMapping(path = "/timesheet/update", consumes = "application/json", produces = "application/json")
+    public ResponseEntity<String> updateTimeSheet(@RequestBody TimeSheetDTO timeSheetDTO) {
         String message;
 
         try {
             if (timeSheetDTO.getTitle().trim().equals("")) throw new InputException("Tiêu đề không được để trống");
             if (timeSheetDTO.getContent().trim().equals("")) throw new InputException("Nội dung không được để trống");
-            message = timeSheetBusiness.updateTimeSheet(employee_Id, timeSheetDTO, timesheet_Id);
+            message = timeSheetBusiness.updateTimeSheet(timeSheetDTO);
         } catch (InputException e) {
             message = e.getMessage();
         }
@@ -62,8 +61,8 @@ public class TimeSheetController {
 //        return ResponseEntity.ok(message);
 //    }
 
-    @GetMapping("/{employee_Id}/timesheet")
-    public ResponseEntity<List<TimeSheet>> showTimeSheetById(@PathVariable int employee_Id) {
-        return ResponseEntity.ok(timeSheetBusiness.findTimeSheetById(employee_Id));
+    @GetMapping("/timesheet/show/{employeeId}")
+    public ResponseEntity<List<TimeSheet>> showTimeSheetById(@PathVariable int employeeId) {
+        return ResponseEntity.ok(timeSheetBusiness.findTimeSheetByEmployeeId(employeeId));
     }
 }
\ No newline at end of file

src/main/java/com/itsol/quantrivanphong/report/timesheet/dto/TimeSheetDTO.java

@@ -9,10 +9,11 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class TimeSheetDTO {
     private int id;
+    private int employeeId;
     private String title;
     private String content;
     private String note;
     private String checked;
     private boolean status;
-    private int eproject_id;
+    private int eprojectId;
 }

src/main/java/com/itsol/quantrivanphong/report/timesheet/repository/TimeSheetRepository.java

@@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 
 public interface TimeSheetRepository extends JpaRepository<TimeSheet, Integer> {
-//    TimeSheet findTimeSheetById(int id);
+    TimeSheet findTimeSheetById(int id);
 
 //    @Query("select ts from TimeSheet ts order by ts.createdAt desc")
 //    List<TimeSheet> getAllTimeSheet();

src/main/resources/application.properties

-server.port=8081
+#server.port=8081
 # ===============================
 # DATABASE CONNECTION
 # ===============================
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://localhost:3306/quantrivanphong
 spring.datasource.username=root
-spring.datasource.password=
+spring.datasource.password=ahihi123
 
 
 # ===============================
@@ -13,7 +13,7 @@ spring.datasource.password=
 # ===============================
 spring.jpa.show-sql=true
 spring.jpa.hibernate.ddl-auto=update
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL57Dialect
 #spring.jpa.properties.hibernate.default_schema=qlns_itsol
 
 

src/main/resources/public/pages/timesheet/timesheet.html

@@ -48,14 +48,18 @@
                         <th>Title</th>
                         <th>Content</th>
                         <th>Note</th>
+                        <th>Employee</th>
+                        <th>Create at</th>
                     </tr>
                     </thead>
                     <tbody>
-                    <tr class="vide" ng-repeat="ts in timesheet">
+                    <tr class="vide" ng-repeat="timesheet in timesheets">
                         <td>{{$index + 1}}</td>
-                        <td>{{ts.title}}</td>
-                        <td>{{ts.content}}</td>
-                        <td>{{ts.note}}</td>
+                        <td>{{timesheet.title}}</td>
+                        <td>{{timesheet.content}}</td>
+                        <td>{{timesheet.note}}</td>
+                        <td>{{timesheet.eproject.name}}</td>
+                        <td>{{timesheet.createAt}}</td>
 
 <!--                        <td><a href="#" ng-click="update(emp);">Update</a>-->
 <!--                        <td><a href="#" confirmed-click="delete(employee);" ng-confirm-click=" Do you want to delete this user?">Delete</a></td>-->

src/main/resources/public/pages/timesheet/timesheetController.js

@@ -4,19 +4,20 @@
 angular.module("MyTimeSheet",[]).controller("timesheetController", function($scope, $http,$window) {
     console.log("Time Sheet controller");
 
-    $scope.ts = {
+    $scope.timesheet = {
         "title": "",
         "content": "",
-        "note": ""
+        "note": "",
+        "eproject": "",
+        "createdAt": ""
     };
 
     $http({
-        header : 'Access-Control-Allow-Origin: http://localhost:63342/MockProject_01/public/pages/timesheet/timesheet.html?_ijt=ee540pqfq7tplkmo9mjj447ne',
         method : 'GET',
-        url : "http://localhost:8080/eproject/timesheet",
+        url : "http://localhost:8080/eproject/timesheet/show",
     }).then(function successCallback(response) {
-        console.log(response)
-        $scope.timesheet=response.data;
+        console.log(response);
+        $scope.timesheets=response.data;
     }, function errorCallback(response) {
         console.log(response)
     });