Merge branch 'master' into phipham

# Conflicts:
#	src/main/java/com/itsol/quantrivanphong/report/timesheet/business/TimeSheetBusiness.java
#	src/main/java/com/itsol/quantrivanphong/report/timesheet/controller/TimeSheetController.java
#	src/main/java/com/itsol/quantrivanphong/report/timesheet/repository/TimeSheetRepository.java
#	src/main/resources/application.properties
#	src/main/resources/public/index.html
#	src/main/resources/public/js/app.js
#	src/main/resources/public/pages/timesheet/timesheet.html
#	src/main/resources/public/pages/timesheet/timesheetController.js

pom.xml

@@ -16,6 +16,7 @@
 
     <properties>
         <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <dependencies>
@@ -65,7 +66,8 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
         </plugins>
-        <finalName>Spring4MVCCRUDRestService</finalName>
+
     </build>
 
+
 </project>

src/main/java/com/itsol/quantrivanphong/access/homepage/controller/NewsController.java

@@ -3,14 +3,11 @@ package com.itsol.quantrivanphong.access.homepage.controller;
 
 import com.itsol.quantrivanphong.access.homepage.business.CatalogiBusiness;
 import com.itsol.quantrivanphong.access.homepage.business.NewsBusiness;
-
-import com.itsol.quantrivanphong.business.EmployeeBusiness;
 import com.itsol.quantrivanphong.exception.ResourceNotFoundException;
-
+import com.itsol.quantrivanphong.manager.employee.business.EmployeeBusiness;
 import com.itsol.quantrivanphong.model.Employee;
 import com.itsol.quantrivanphong.model.News;
 import org.springframework.beans.factory.annotation.Autowired;
-
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/itsol/quantrivanphong/employee/bussiness/EmployeeBussiness.java

-package com.itsol.quantrivanphong.employee.bussiness;
-
-import com.itsol.quantrivanphong.model.Employee;
-import com.itsol.quantrivanphong.repository.EmployeeRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Optional;
-
-@Service
-public class EmployeeBussiness {
-    @Autowired
-    EmployeeRepository employeeRepository;
-//    public List<Employee> findAll(){
-//        return employeeRepository.findAll();
-//    }
-//
-    public Optional<Employee> findById(int newsId){
-        return  employeeRepository.findById(newsId);
-    }
-//    public User save(User user){
-//        return userRepository.save(user);
-//    }
-//    public User updateUser(Long newsId, User signUpDTO){
-//        User user = userRepository.findUserById(newsId);
-//        user.setUsername(signUpDTO.getUsername());
-//        user.setPassword(signUpDTO.getPassword());
-//        user.setEmail(signUpDTO.getEmail());
-//        user.setFullname(signUpDTO.getFullname());
-//        user.setImage(signUpDTO.getImage());
-//        user.setKnowledge(signUpDTO.getKnowledge());
-//        user.setUniversity(signUpDTO.getUniversity());
-//        user.setPhonenumber(signUpDTO.getPhonenumber());
-//        user.setPosition(signUpDTO.getPosition());
-//        user.setVillage(signUpDTO.getVillage());
-//        user.setYearOfGraduation(signUpDTO.getYearOfGraduation());
-//        user.setRole(signUpDTO.getRole());
-//        return userRepository.save(user);
-//    }
-//
-//    public void deleteUser(Long newsId){
-//        userRepository.deleteById(newsId);
-//    }
-}

src/main/java/com/itsol/quantrivanphong/business/EmployeeBusiness.java → src/main/java/com/itsol/quantrivanphong/manager/employee/business/EmployeeBusiness.java

-package com.itsol.quantrivanphong.business;
+package com.itsol.quantrivanphong.manager.employee.business;
 
 import com.itsol.quantrivanphong.model.Employee;
 import org.springframework.validation.Validator;

src/main/java/com/itsol/quantrivanphong/business/impl/EmployeeBusinessImpl.java → src/main/java/com/itsol/quantrivanphong/manager/employee/business/impl/EmployeeBusinessImpl.java

-package com.itsol.quantrivanphong.business.impl;
+package com.itsol.quantrivanphong.manager.employee.business.impl;
 
+import com.itsol.quantrivanphong.manager.employee.business.EmployeeBusiness;
+import com.itsol.quantrivanphong.manager.employee.repository.EmployeeRepository;
 import com.itsol.quantrivanphong.model.Employee;
-
-import com.itsol.quantrivanphong.repository.EmployeeRepository;
-import com.itsol.quantrivanphong.business.EmployeeBusiness;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.Errors;

src/main/java/com/itsol/quantrivanphong/controller/EmployeeController.java → src/main/java/com/itsol/quantrivanphong/manager/employee/controller/EmployeeController.java

-package com.itsol.quantrivanphong.controller;
+package com.itsol.quantrivanphong.manager.employee.controller;
 
+import com.itsol.quantrivanphong.manager.employee.business.EmployeeBusiness;
 import com.itsol.quantrivanphong.model.Employee;
-import com.itsol.quantrivanphong.business.EmployeeBusiness;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -12,6 +12,7 @@ import org.springframework.web.util.UriComponentsBuilder;
 import java.util.List;
 
 @RestController
+
 public class EmployeeController {
     @Autowired
     //Retrieve Employee by id

src/main/java/com/itsol/quantrivanphong/repository/EmployeeRepository.java → src/main/java/com/itsol/quantrivanphong/manager/employee/repository/EmployeeRepository.java

-package com.itsol.quantrivanphong.repository;
+package com.itsol.quantrivanphong.manager.employee.repository;
 
 import com.itsol.quantrivanphong.model.Employee;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/itsol/quantrivanphong/manager/employee/test.java

-package com.itsol.quantrivanphong.manager.employee;
-
-public class test {
-}

src/main/java/com/itsol/quantrivanphong/manager/reportdetail/bussiness/ReportProjectBussiness.java

 package com.itsol.quantrivanphong.manager.reportdetail.bussiness;
 
 
+import com.itsol.quantrivanphong.manager.employee.repository.EmployeeRepository;
+import com.itsol.quantrivanphong.manager.project.project.repository.ProjectRRepository;
 import com.itsol.quantrivanphong.manager.reportdetail.dto.request.ReportDTO;
 import com.itsol.quantrivanphong.manager.reportdetail.dto.request.TimesheetRequestDTO;
 import com.itsol.quantrivanphong.manager.reportdetail.repository.ProjectReportRepository;
-import com.itsol.quantrivanphong.manager.project.project.repository.ProjectRRepository;
 import com.itsol.quantrivanphong.model.*;
-import com.itsol.quantrivanphong.report.timesheet.business.TimeSheetBusiness;
-import com.itsol.quantrivanphong.report.timesheet.dto.TimeSheetDTO;
 import com.itsol.quantrivanphong.report.timesheet.repository.EProjectRepository;
 import com.itsol.quantrivanphong.report.timesheet.repository.TimeSheetRepository;
-import com.itsol.quantrivanphong.repository.EmployeeRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,6 +32,7 @@ public class ReportProjectBussiness {
     @Autowired
     private TimeSheetRepository timeSheetRepository;
 
+
     //======================================================================================================================
 
     public List<Project> listProjectWorking(){
@@ -105,6 +104,14 @@ public class ReportProjectBussiness {
         return employeeList;
     }
 
-
+//    public String insertProjectReport(ReportDTO reportDTO){
+//        ProjectReport projectReport = new ProjectReport();
+//        projectReport.setProjectName(projectRepository.ProjectName(reportDTO.getProjectId()));
+//        projectReport.setTeamLeader(employeeRepository.findTeamLeader(reportDTO.getProjectId()));
+//        projectReport.setNumberOfMember(employeeRepository.numberOfMember(reportDTO.getProjectId()));
+//        projectReport.setCalendarEffort(10);
+//        projectReport.set
+//    }
+//
 
 }

src/main/java/com/itsol/quantrivanphong/manager/reportdetail/controller/ReportProjectController.java

@@ -67,6 +67,17 @@ public class ReportProjectController {
     //=================================================================================================================
 
 
+//    //Tạo một báo cáo mới
+//    @PostMapping(path = "/project/newReport", consumes = "application/json", produces = "application/json")
+//    public ResponseEntity<String> updateTimesheetChecked(@RequestBody TimesheetRequestDTO timesheetRequestDTO){
+//        String mess = reportProjectBussiness.updateTimesheetChecked(timesheetRequestDTO);
+//        return ResponseEntity.ok(mess);
+//    }
+
+
+
+
+
     //Báo cáo gần nhất của dự án
     @GetMapping(path = "/project/latest",consumes = "application/json", produces = "application/json")
     public ResponseEntity<ProjectReport> latestReport(@RequestBody ReportDTO reportDTO){

src/main/java/com/itsol/quantrivanphong/manager/reportdetail/repository/ProjectReportRepository.java

@@ -2,7 +2,9 @@ package com.itsol.quantrivanphong.manager.reportdetail.repository;
 
 import com.itsol.quantrivanphong.model.ProjectReport;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -15,5 +17,8 @@ public interface ProjectReportRepository extends JpaRepository<ProjectReport, In
     @Query(value = "SELECT * FROM project_report pr WHERE pr.project_id = ?1 ORDER BY pr.created_at DESC", nativeQuery = true)
     List<ProjectReport> allProjectReport(int projectId);
 
-
+    @Transactional
+    @Modifying
+    @Query(value = "INSERT INTO project_report(project_name, team_leader, number_of_members, calendar_effort, lack_of_reports, created_at, updated_at, status, project_id) VALUES (?1, ?2, ?3, ?4, ?5, CURRENT_DATE(), CURRENT_DATE() ,?6, ?7)",nativeQuery = true)
+    void insertProjectReport(String projectName, String teamLeader, int NumberOfMember, int CalendarEffort, int LackOfReport, boolean status, int projectId);
 }

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

 package com.itsol.quantrivanphong.report.leaveform.business;
 
-import com.itsol.quantrivanphong.report.leaveform.dto.LeaveFormDTO;
-import com.itsol.quantrivanphong.report.leaveform.repository.LeaveFormRepository;
-import com.itsol.quantrivanphong.report.leaveform.repository.LeaveTypeRepository;
+import com.itsol.quantrivanphong.manager.employee.repository.EmployeeRepository;
 import com.itsol.quantrivanphong.model.Employee;
 import com.itsol.quantrivanphong.model.LeaveForm;
 import com.itsol.quantrivanphong.model.LeaveType;
-import com.itsol.quantrivanphong.repository.EmployeeRepository;
+import com.itsol.quantrivanphong.report.leaveform.dto.LeaveFormDTO;
+import com.itsol.quantrivanphong.report.leaveform.repository.LeaveFormRepository;
+import com.itsol.quantrivanphong.report.leaveform.repository.LeaveTypeRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -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,18 +98,20 @@ 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);
+            if (leaveForm.isStatus()) {
+                message = "Status can not change";
+            } else {
+                int i = leaveFormRepository.updateLeaveFormStatus(leaveformId);
                 if (i == 1) {
                     message = "Update status success";
                 } else {
                     message = "Update status failed";
                 }
+            }
         } else {
             message = "Leave Form does not exist";
         }
@@ -121,8 +119,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);
@@ -133,4 +131,8 @@ public class LeaveFormBusiness {
             return null;
         }
     }
+
+    public LeaveForm showLeaveFormById(int id) {
+        return leaveFormRepository.findLeaveFormById(id);
+    }
 }

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,19 +56,24 @@ 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")
+    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>> showLeaveFormByEmployeeId(@PathVariable int employeeId) {
+        if (leaveFormBusiness.showLeaveFormByEmployeeId(employeeId) != null) {
+            return ResponseEntity.ok(leaveFormBusiness.showLeaveFormByEmployeeId(employeeId));
         } else {
             return null;
         }
     }
+
+    @GetMapping("/leaveform/{id}")
+    public ResponseEntity<LeaveForm> showLeaveFormById(@PathVariable int id) {
+        return ResponseEntity.ok(leaveFormBusiness.showLeaveFormById(id));
+    }
 }

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

 package com.itsol.quantrivanphong.report.timesheet.business;
 
-import com.itsol.quantrivanphong.report.timesheet.dto.TimeSheetDTO;
-import com.itsol.quantrivanphong.report.timesheet.repository.EProjectRepository;
-import com.itsol.quantrivanphong.report.timesheet.repository.TimeSheetRepository;
+import com.itsol.quantrivanphong.manager.employee.repository.EmployeeRepository;
 import com.itsol.quantrivanphong.model.Employee;
 import com.itsol.quantrivanphong.model.Eproject;
 import com.itsol.quantrivanphong.model.TimeSheet;
-import com.itsol.quantrivanphong.repository.EmployeeRepository;
+import com.itsol.quantrivanphong.report.timesheet.dto.TimeSheetDTO;
+import com.itsol.quantrivanphong.report.timesheet.repository.EProjectRepository;
+import com.itsol.quantrivanphong.report.timesheet.repository.TimeSheetRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,7 +21,11 @@ public class TimeSheetBusiness {
     EProjectRepository eProjectRepository;
     @Autowired
     EmployeeRepository employeeRepository;
+<<<<<<< HEAD
     public String insertTimeSheet(TimeSheetDTO timeSheetDTO) {
+=======
+    public String addTimeSheet(TimeSheetDTO timeSheetDTO) {
+>>>>>>> master
         String message;
         Employee employee = employeeRepository.findEmployeeById(timeSheetDTO.getEmployeeId());
         Eproject eproject = eProjectRepository.findEprojectByIdAndEmployee(timeSheetDTO.getEprojectId(), employee);
@@ -49,6 +53,7 @@ public class TimeSheetBusiness {
         return message;
     }
 
+<<<<<<< HEAD
     public String deleteTimeSheet(int timesheetId) {
         String message;
 //        Employee employee = employeeRepository.findEmployeeById(timeSheetDTO.getEmployeeId());
@@ -58,6 +63,16 @@ public class TimeSheetBusiness {
         if (timeSheet != null) {
             timeSheetRepository.delete(timeSheet);
             if (timeSheetRepository.findTimeSheetById(timesheetId) == null) {
+=======
+    public String deleteTimeSheet(int timeSheetId) {
+        String message;
+//        Employee employee = employeeRepository.findEmployeeById(employee_Id);
+//        Eproject eproject = eProjectRepository.findEprojectByEmployee(employee);
+        TimeSheet timeSheet = timeSheetRepository.findTimeSheetById(timeSheetId);
+        if (timeSheet != null) {
+            timeSheetRepository.delete(timeSheet);
+            if (timeSheetRepository.findTimeSheetById(timeSheetId) == null) {
+>>>>>>> master
                 message = "Delete success";
             } else {
                 message = "Delete failed";
@@ -96,10 +111,22 @@ public class TimeSheetBusiness {
         return message;
     }
 
+    @Transactional
+    public String updateCheck(TimeSheetDTO timeSheetDTO) {
+        String message;
+        int i = timeSheetRepository.updateCheck(timeSheetDTO.getChecked(), timeSheetDTO.getId());
+        if (i == 1) {
+            message = "Success";
+        } else {
+            message = "Failed";
+        }
+        return message;
+    }
+
 //    @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) {
@@ -114,8 +141,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);
@@ -123,4 +150,7 @@ public class TimeSheetBusiness {
             return null;
         }
     }
+    public TimeSheet findTimeSheetById(int id) {
+        return timeSheetRepository.findTimeSheetById(id);
+    }
 }

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

 package com.itsol.quantrivanphong.report.timesheet.controller;
 
 import com.itsol.quantrivanphong.exception.InputException;
+import com.itsol.quantrivanphong.model.TimeSheet;
 import com.itsol.quantrivanphong.report.timesheet.business.TimeSheetBusiness;
 import com.itsol.quantrivanphong.report.timesheet.dto.TimeSheetDTO;
-import com.itsol.quantrivanphong.model.TimeSheet;
 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,19 +15,40 @@ import java.util.List;
 public class TimeSheetController {
     @Autowired
     TimeSheetBusiness timeSheetBusiness;
+<<<<<<< HEAD
     @PostMapping(path = "/timesheet", consumes = "application/json", produces = "application/json")
+=======
+    @PostMapping(path = "/timesheet/add", consumes = "application/json", produces = "application/json")
+>>>>>>> master
     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");
+<<<<<<< HEAD
             message = timeSheetBusiness.insertTimeSheet(timeSheetDTO);
+=======
+            message = timeSheetBusiness.addTimeSheet(timeSheetDTO);
+>>>>>>> master
         } catch (InputException e) {
             message = e.getMessage();
         }
 
         return ResponseEntity.ok(message);
     }
+//    @PostMapping(path = "/timesheet", consumes = "application/json", produces = "application/json")
+//    public ResponseEntity<String> insertTimeSheet(@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(timeSheetDTO);
+//        } catch (InputException e) {
+//            message = e.getMessage();
+//        }
+//
+//        return ResponseEntity.ok(message);
+//    }
 
     @DeleteMapping("/timesheet/delete/{timesheetId}")
     public ResponseEntity<String> deleteTimeSheet(@PathVariable int timesheetId) {
@@ -62,8 +82,25 @@ public class TimeSheetController {
 //        return ResponseEntity.ok(message);
 //    }
 
+<<<<<<< HEAD
     @GetMapping("/timesheet/show/{employee_Id}")
     public ResponseEntity<List<TimeSheet>> showTimeSheetById(@PathVariable int employee_Id) {
         return ResponseEntity.ok(timeSheetBusiness.findTimeSheetById(employee_Id));
+=======
+    @GetMapping("/timesheet/show/{employeeId}")
+    public ResponseEntity<List<TimeSheet>> showTimeSheetByEmployeeId(@PathVariable int employeeId) {
+        return ResponseEntity.ok(timeSheetBusiness.findTimeSheetByEmployeeId(employeeId));
+    }
+
+    @GetMapping("/timesheet/{id}")
+    public ResponseEntity<TimeSheet> showTimeSheetById(@PathVariable int id) {
+        return ResponseEntity.ok(timeSheetBusiness.findTimeSheetById(id));
+    }
+
+
+    @PostMapping(path = "/timesheet/update/check", consumes = "application/json", produces = "application/json")
+    public ResponseEntity<String> updateCheck(@RequestBody TimeSheetDTO timeSheetDTO) {
+        return ResponseEntity.ok(timeSheetBusiness.updateCheck(timeSheetDTO));
+>>>>>>> master
     }
 }
\ No newline at end of file

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

@@ -11,7 +11,10 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 
 public interface TimeSheetRepository extends JpaRepository<TimeSheet, Integer> {
+<<<<<<< HEAD
     //------------------------------------ Phi ---------------------------------//
+=======
+>>>>>>> master
     TimeSheet findTimeSheetById(int id);
 
 //    @Query("select ts from TimeSheet ts order by ts.createdAt desc")
@@ -19,7 +22,11 @@ public interface TimeSheetRepository extends JpaRepository<TimeSheet, Integer> {
 
     @Modifying
     @Query("update TimeSheet ts set ts.title = ?1, ts.content = ?2, ts.note = ?3 where ts.id = ?4")
-    int updateTimeSheet(String title, String content, String note, int timesheet_Id);
+    int updateTimeSheet(String title, String content, String note, int timeSheetId);
+
+    @Modifying
+    @Query("update TimeSheet ts set ts.checked = ?1 where ts.id = ?2")
+    int updateCheck(String check, int timeSheetId);
 
 //    @Modifying
 //    @Query("update TimeSheet ts set ts.status = ?1 where ts.id = ?2")
@@ -28,8 +35,12 @@ public interface TimeSheetRepository extends JpaRepository<TimeSheet, Integer> {
     @Query("select ts from TimeSheet ts where ts.eproject = ?1")
     List<TimeSheet> showTimeSheetByEproject(Eproject eproject);
 
+<<<<<<< HEAD
     TimeSheet findTimeSheetByEprojectAndId(Eproject eproject, int timeSheet_Id);
     //------------------------------------ Phi ---------------------------------//
+=======
+    TimeSheet findTimeSheetByEprojectAndId(Eproject eproject, int timeSheetId);
+>>>>>>> master
 
 
     //==================================================================================================================

src/main/resources/application.properties

@@ -5,8 +5,12 @@
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://localhost:3306/quantrivanphong
 spring.datasource.username=root
+<<<<<<< HEAD
 spring.datasource.password=ahihi123
 
+=======
+spring.datasource.password= ahihi123
+>>>>>>> master
 
 # ===============================
 # JPA / HIBERNATE
@@ -16,7 +20,9 @@ spring.jpa.hibernate.ddl-auto=update
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL57Dialect
 #spring.jpa.properties.hibernate.default_schema=qlns_itsol
 
-
+## Fix Postgres JPA Error:
+## Method org.postgresql.jdbc.PgConnection.createClob() is not yet implemented.
+#spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults=false
 
 # ===============================
 # SEND EMAIL

src/main/resources/public/css/bootstrap.css

+html {
+    font-family: sans-serif;
+    -webkit-text-size-adjust: 100%;
+    -ms-text-size-adjust: 100%;
+}
+body {
+    margin: 0;
+}
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+menu,
+nav,
+section,
+summary {
+    display: block;
+}
+audio,
+canvas,
+progress,
+video {
+    display: inline-block;
+    vertical-align: baseline;
+}
+audio:not([controls]) {
+    display: none;
+    height: 0;
+}
+[hidden],
+template {
+    display: none;
+}
+a {
+    background-color: transparent;
+}
+a:active,
+a:hover {
+    outline: 0;
+}
+abbr[title] {
+    border-bottom: 1px dotted;
+}
+b,
+strong {
+    font-weight: bold;
+}
+dfn {
+    font-style: italic;
+}
+h1 {
+    margin: .67em 0;
+    font-size: 2em;
+}
+mark {
+    color: #000;
+    background: #ff0;
+}
+small {
+    font-size: 80%;
+}
+sub,
+sup {
+    position: relative;
+    font-size: 75%;
+    line-height: 0;
+    vertical-align: baseline;
+}
+sup {
+    top: -.5em;
+}
+sub {
+    bottom: -.25em;
+}
+img {
+    border: 0;
+}
+svg:not(:root) {
+    overflow: hidden;
+}
+figure {
+    margin: 1em 40px;
+}
+hr {
+    height: 0;
+    -webkit-box-sizing: content-box;
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+}
+pre {
+    overflow: auto;
+}
+code,
+kbd,
+pre,
+samp {
+    font-family: monospace, monospace;
+    font-size: 1em;
+}
+button,
+input,
+optgroup,
+select,
+textarea {
+    margin: 0;
+    font: inherit;
+    color: inherit;
+}
+button {
+    overflow: visible;
+}
+button,
+select {
+    text-transform: none;
+}
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+    -webkit-appearance: button;
+    cursor: pointer;
+}
+button[disabled],
+html input[disabled] {
+    cursor: default;
+}
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+    padding: 0;
+    border: 0;
+}
+input {
+    line-height: normal;
+}
+input[type="checkbox"],
+input[type="radio"] {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    padding: 0;
+}
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+    height: auto;
+}
+input[type="search"] {
+    -webkit-box-sizing: content-box;
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+    -webkit-appearance: textfield;
+}
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+    -webkit-appearance: none;
+}
+fieldset {
+    padding: .35em .625em .75em;
+    margin: 0 2px;
+    border: 1px solid #c0c0c0;
+}
+legend {
+    padding: 0;
+    border: 0;
+}
+textarea {
+    overflow: auto;
+}
+optgroup {
+    font-weight: bold;
+}
+table {
+    border-spacing: 0;
+    border-collapse: collapse;
+}
+td,
+th {
+    padding: 0;
+}
+/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
+@media print {
+    *,
+    *:before,
+    *:after {
+        color: #000 !important;
+        text-shadow: none !important;
+        background: transparent !important;
+        -webkit-box-shadow: none !important;
+        box-shadow: none !important;
+    }
+    a,
+    a:visited {
+        text-decoration: underline;
+    }
+    a[href]:after {
+        content: " (" attr(href) ")";
+    }
+    abbr[title]:after {
+        content: " (" attr(title) ")";
+    }
+    a[href^="#"]:after,
+    a[href^="javascript:"]:after {
+        content: "";
+    }
+    pre,
+    blockquote {
+        border: 1px solid #999;
+
+        page-break-inside: avoid;
+    }
+    thead {
+        display: table-header-group;
+    }
+    tr,
+    img {
+        page-break-inside: avoid;
+    }
+    img {
+        max-width: 100% !important;
+    }
+    p,
+    h2,
+    h3 {
+        orphans: 3;
+        widows: 3;
+    }
+    h2,
+    h3 {
+        page-break-after: avoid;
+    }
+    select {
+        background: #fff !important;
+    }
+    .navbar {
+        display: none;
+    }
+    .btn > .caret,
+    .dropup > .btn > .caret {
+        border-top-color: #000 !important;
+    }
+    .label {
+        border: 1px solid #000;
+    }
+    .table {
+        border-collapse: collapse !important;
+    }
+    .table td,
+    .table th {
+        background-color: #fff !important;
+    }
+    .table-bordered th,
+    .table-bordered td {
+        border: 1px solid #ddd !important;
+    }
+}

src/main/resources/public/css/style.css

+.blue-button {
+    background: #25A6E1;
+    padding: 3px 5px;
+    color: #fff;
+    font-family: 'Helvetica Neue', sans-serif;
+    font-size: 12px;
+    border-radius: 2px;
+    -moz-border-radius: 2px;
+    -webkit-border-radius: 4px;
+    border: 1px solid #1A87B9
+}
+
+.red-button {
+    background: #CD5C5C;
+    padding: 3px 5px;
+    color: #fff;
+    font-family: 'Helvetica Neue', sans-serif;
+    font-size: 12px;
+    border-radius: 2px;
+    -moz-border-radius: 2px;
+    -webkit-border-radius: 4px;
+    border: 1px solid #CD5C5C
+}
+
+table {
+    font-family: "Helvetica Neue", Helvetica, sans-serif;
+    width: 70%;
+}
+
+caption {
+    text-align: left;
+    color: silver;
+    font-weight: bold;
+    text-transform: uppercase;
+    padding: 5px;
+}
+
+th {
+    background: SteelBlue;
+    color: white;
+}
+
+tbody tr:nth-child(even) {
+    background: WhiteSmoke;
+}
+
+tbody tr td:nth-child(2) {
+    text-align: center;
+}
+
+tbody tr td:nth-child(3), tbody tr td:nth-child(4) {
+    text-align: center;
+    font-family: monospace;
+}
+
+tfoot {
+    background: SeaGreen;
+    color: white;
+    text-align: right;
+}
+
+tfoot tr th:last-child {
+    font-family: monospace;
+}
+
+td, th {
+    border: 1px solid gray;
+    width: 25%;
+    text-align: left;
+    padding: 5px 10px;
+}
+table  {
+    border-collapse: collapse;
+    padding-bottom: 20%;
+    text-align: center;
+}
+
+table td, th  {
+    padding: 5px;
+}
+table>thead>tr>th{
+    text-align: center;
+}
+.table>thead>tr>td{
+    text-align: center;
+    padding-bottom: 50px;
+}
+.container{
+    background-color: #f1f1f1;
+
+}
\ No newline at end of file

src/main/resources/public/index.html

-
-<!DOCTYPE HTML>
-<html>
+<!doctype html>
+<html lang="en">
 <head>
-<title>Business_Blog a Blogging Category Flat Bootstrap Responsive Website Template | World :: w3layouts</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="keywords" content="Business_Blog Responsive web template, Bootstrap Web Templates, Flat Web Templates, Android Compatible web template, 
-Smartphone Compatible web template, free webdesigns for Nokia, Samsung, LG, SonyErricsson, Motorola web design" />
-<script type="applijewelleryion/x-javascript"> addEventListener("load", function() { setTimeout(hideURLbar, 0); }, false); function hideURLbar(){ window.scrollTo(0,1); } </script>
-<link href="css/bootstrap.css" rel='stylesheet' type='text/css' />
-<!-- Custom Theme files -->
-<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed:400,700" rel='stylesheet' type='text/css'>
-<link href="https://fonts.googleapis.com/css?family=Open+Sans" type='text/css'>
-<link href="css/style.css" rel='stylesheet' type='text/css' />
-
-<!--Khai báo các thư viện-->
-<script src="js/jquery-3.2.1.min.js"></script>
-<script src="js/bootstrap.min.js"></script>
-<script src="js/angular.js"></script>
-<script src="js/angular-ui-router.min.js"></script>
-<!--End khai báo thư viện-->
-
-<!--Khai báo các file js-->
-<script src="js/app.js"></script>
-<!--End khai báo các file js-->
-
-<!-- khai báo các controllers -->
+    <meta charset="UTF-8">
+    <meta name="viewport"
+          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+<!--    <meta http-equiv="X-UA-Compatible" content="ie=edge">-->
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Document</title>
+    <link href="css/bootstrap.css" rel='stylesheet' type='text/css'/>
+    <!-- Custom Theme files -->
+<!--    <link href="https://fonts.googleapis.com/css?family=Roboto+Condensed:400,700" rel='stylesheet' type='text/css'>-->
+<!--    <link href="https://fonts.googleapis.com/css?family=Open+Sans" type='text/css'>-->
+    <link href="css/style.css" rel='stylesheet' type='text/css'/>
+<!--    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">-->
+    <link data-require="bootstrap-css@*" data-semver="4.3.1" rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" />
+
+    <script src="js/jquery-3.2.1.min.js"></script>
+    <script src="js/bootstrap.min.js"></script>
+    <script src="js/angular.js"></script>
+    <script src="js/angular-ui-router.min.js"></script>
+
+    <script src="js/app.js"></script>
     <script src="pages/employee/employeeController.js"></script>
+    <script src="pages/project/projectController.js"></script>
+    <script src="pages/testlayout/testlayoutController.js"></script>
+
+    <script src="pages/timesheet/timeSheetController.js"></script>
+    <script src="pages/leaveform/leaveFormController.js"></script>
+    <script src="pages/leaveform/leaveFormDetailController.js"></script>
+    <script src="pages/timesheet/timeSheetDetailController.js"></script>
+<!--    <script src="js/angular-resource.js"></script>-->
+
+    <script>
+        function showAddTimeSheetFunction() {
+            const x = document.getElementById("addDivTS");
+            const n = document.getElementById("addTimeSheet");
+            if (x.style.display === "none") {
+                x.style.display = "block";
+                n.value = "Close";
+            } else {
+                x.style.display = "none";
+                n.value = "Add";
+            }
+        }
+    </script>
 
+    <script>
+        function showAddLeaveFormFunction() {
+            const x = document.getElementById("addDivLF");
+            const n = document.getElementById("addLeaveForm");
+            if (x.style.display === "none") {
+                x.style.display = "block";
+                n.value = "Close";
+            } else {
+                x.style.display = "none";
+                n.value = "Add";
+            }
+        }
+    </script>
 
-<!--End khai báo controllers-->
 </head>
 <body ng-app="myApp">
+<<<<<<< HEAD
 
 	<div class="container">
+=======
+>>>>>>> master
 
+<div ui-view="layout">
+    <div style="margin-left:5px;margin-top:10px" ng-controller="timeSheetController">
+        <span pgn-table="myTimeSheets"></span>
     </div>
+</div>
 
 
 </body>

src/main/resources/public/js/angular.min.js

 /*
-<<<<<<< HEAD
  AngularJS v1.7.8
  (c) 2010-2018 Google, Inc. http://angularjs.org
  License: MIT
@@ -684,4 +683,3 @@ link:function(a,b,d,c){if(c){var e=-1;d.$observe("maxlength",function(a){a=Z(a);
 STANDALONEMONTH:"January February March April May June July August September October November December".split(" "),WEEKENDRANGE:[5,6],fullDate:"EEEE, MMMM d, y",longDate:"MMMM d, y",medium:"MMM d, y h:mm:ss a",mediumDate:"MMM d, y",mediumTime:"h:mm:ss a","short":"M/d/yy h:mm a",shortDate:"M/d/yy",shortTime:"h:mm a"},NUMBER_FORMATS:{CURRENCY_SYM:"$",DECIMAL_SEP:".",GROUP_SEP:",",PATTERNS:[{gSize:3,lgSize:3,maxFrac:3,minFrac:0,minInt:1,negPre:"-",negSuf:"",posPre:"",posSuf:""},{gSize:3,lgSize:3,maxFrac:2,
 minFrac:2,minInt:1,negPre:"-\u00a4",negSuf:"",posPre:"\u00a4",posSuf:""}]},id:"en-us",localeID:"en_US",pluralCat:function(a,c){var e=a|0,f=c;void 0===f&&(f=Math.min(b(a),3));Math.pow(10,f);return 1==e&&0==f?"one":"other"}})}]),B(function(){we(u.document,Uc)}))})(window);!window.angular.$$csp().noInlineStyle&&window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
 //# sourceMappingURL=angular.min.js.map
->>>>>>> master

src/main/resources/public/js/app.js

 /**
  *
  */
-angular.module("myApp", ["ui.router"]).config(function($stateProvider, $urlRouterProvider,$locationProvider) {
+angular.module("myApp", ["ui.router"]).config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
 
     $locationProvider.hashPrefix('');
-	$urlRouterProvider.otherwise("/index"); 
+    $urlRouterProvider.otherwise("/employees");
 
     $stateProvider
+        .state("layout1", {
+            abstract: true,
+            views: {
+                "layout": {
+                    templateUrl: "layout/layout1.html"
+                }
+            }
+        })
 
-	//index layout riêng
-	 .state("index", {
-	        url: "/index",
-	        views:{
-	        	"index":{
-	            	templateUrl: "pages/index/index.htm",
-					controller: "indexController"
-	            },
-	        	"banner":{
-	        		templateUrl: "pages/index/banner.htm"
+        .state("layout2", {
+            abstract: true,
+            views: {
+                "layout": {
+                    templateUrl: "layout/layout2.html"
                 }
             }
         })
 
-	// State chứa layout chung cho các trang
-	.state('app', {
+        .state("layout5", {
             abstract: true,
             views: {
-            'main_layout': {
-                templateUrl: 'main_layout.html',
+                "layout": {
+                    templateUrl: "layout/layout5.html"
                 }
             }
         })
 
-	// Các state bên dưới kế thừa state app
+        // .state('app', {
+        //     abstract: true,
+        //     views: {
+        //         'main_layout': {
+        //             templateUrl: 'main_layout.html',
+        //         }
+        //     }
+        // })
 
-    .state("tintuc", { // Khai báo một state
-    	parent: 'app',
-        url: "/tintuc", // URL hiển thị
-        views:{
-        	"content":{
-        		templateUrl: "pages/tintuc/tintuc.htm",
-                controller: "tintucController" // khai báo controller
+
+        .state("employees", {
+            parent: 'layout1',
+            url: "/employees",
+            views: {
+                "content": {
+                    templateUrl: "pages/employee/employee.html",
+                    controller: "employeeController"
+                }
+            }
+        })
+        .state("project", {
+            parent: 'layout1',
+            url: "/project",
+            views: {
+                "content": {
+                    templateUrl: "pages/project/project.html",
+                    controller: "projectController"
+                }
+            }
+        })
+        .state("report", {
+            parent: 'layout1',
+            url: "/report",
+            views: {
+                "content": {
+                    templateUrl: "pages/employee/project.html",
+                    controller: "employeeController"
+                }
+            }
+        })
+        .state("timeSheet", {
+            parent: 'layout5',
+            url: "/timesheet",
+            views: {
+                "content": {
+                    templateUrl: "/pages/timesheet/timeSheet.html",
+                    controller: "timeSheetController"
+                }
+            }
+        })
+        .state("timeSheetDetail", {
+            parent: 'layout5',
+            url: "/timesheetdetail/:id",
+            views: {
+                "content": {
+                    templateUrl: "/pages/timesheet/timeSheetDetail.html",
+                    controller: "timeSheetDetailController"
+                }
+            }
+        })
+        .state("leaveForm", {
+            parent: 'layout5',
+            url: "/leaveform",
+            views: {
+                "content": {
+                    templateUrl: "/pages/leaveform/leaveForm.html",
+                    controller: "leaveFormController"
                 }
             }
         })
 
-    .state("tuyendung", {
-    	parent: 'app',
-        url: "/tuyendung",
-        views:{
-        	"content":{
-        		 templateUrl: "pages/tuyendung/tuyendung.htm",
-        	     controller: "tuyendungController" 
+        .state("leaveFormDetail", {
+            parent: 'layout5',
+            url: "/leaveformdetail/:id",
+            views: {
+                "content": {
+                    templateUrl: "/pages/leaveform/leaveFormDetail.html",
+                    controller: "leaveFormDetailController"
                 }
             }
         })
 
+        // .state("testlayout2", {
+        //     parent: 'layout2',
+        //     url: "/testttt",
+        //     views: {
+        //         "content": {
+        //             templateUrl: "/pages/testlayout/testlayout.html",
+        //             controller: "testlayoutController"
+        //         }
+        //     }
+        // })
+
+});
+
+
+<<<<<<< HEAD
     // .state("lienhe", {
     // 	parent: 'app',
     //     url: "/lienhe",
@@ -79,3 +154,18 @@ angular.module("myApp", ["ui.router"]).config(function($stateProvider, $urlRoute
     })
     
 });
+=======
+// myApp.directive('ngConfirmClick', [ function() {
+//     return {
+//         link : function(scope, element, attr) {
+//             var msg = attr.ngConfirmClick || "Are you sure?";
+//             var clickAction = attr.confirmedClick;
+//             element.bind('click', function(event) {
+//                 if (window.confirm(msg)) {
+//                     scope.$eval(clickAction)
+//                 }
+//             });
+//         }
+//     };
+// } ])
+>>>>>>> master

src/main/resources/public/layout/layout1.html

+<div>
+    layout1
+    <a ui-sref="employees">Employee</a>
+    <a ui-sref="report">Report</a>
+    <a ui-sref="project">Project</a>
+    <div ui-view="content">
+
+    </div>
+</div>
\ No newline at end of file

src/main/resources/public/layout/layout2.html

+<div>
+    layout2
+    Không có menu
+    <div ui-view="content"></div>
+</div>
\ No newline at end of file

src/main/resources/public/layout/layout5.html

+<div>
+    layout5
+    <a ui-sref="timeSheet">Time Sheet</a>
+    <a ui-sref="leaveForm">Leave Form</a>
+    <div ui-view="content">
+
+    </div>
+</div>
\ No newline at end of file

src/main/resources/public/main_layout.html

-<!-- technology -->
-<div class="technology-1">
-	<div class="container">
-		<div class="col-md-9 technology-left">
-			<div ui-view="content">
-			  <!-- nội dung các trang -->
-			</div>
-		</div>
-		<!-- technology-right -->
-		<div class="col-md-3 technology-right-1">
-				<div class="blo-top">
-					<div class="tech-btm">
-					<img src="images/banner1.jpg" class="img-responsive" alt=""/>
-					</div>
-				</div>
-				<div class="blo-top">
-					<div class="tech-btm">
-					<h4>Sign up to our newsletter</h4>
-					<p>Pellentesque dui, non felis. Maecenas male</p>
-						<div class="name">
-							<form>
-								<input type="text" placeholder="Email" required="">
-							</form>
-						</div>
-						<div class="button">
-							<form>
-								<input type="submit" value="Subscribe">
-							</form>
-						</div>
-							<div class="clearfix"> </div>
-					</div>
-				</div>
-				<div class="blo-top1">
-					<div class="tech-btm">
-					<h4>Tin tức nổi bật </h4>
-						<div class="blog-grids">
-							<div class="blog-grid-left">
-								<a href="singlepage.html"><img src="images/6.jpg" class="img-responsive" alt=""/></a>
-							</div>
-							<div class="blog-grid-right">
-
-								<h5><a href="singlepage.html">Pellentesque dui, non felis. Maecenas male</a> </h5>
-							</div>
-							<div class="clearfix"> </div>
-						</div>
-						<div class="blog-grids">
-							<div class="blog-grid-left">
-								<a href="singlepage.html"><img src="images/7.jpg" class="img-responsive" alt=""/></a>
-							</div>
-							<div class="blog-grid-right">
-
-								<h5><a href="singlepage.html">Pellentesque dui, non felis. Maecenas male</a> </h5>
-							</div>
-							<div class="clearfix"> </div>
-						</div>
-						<div class="blog-grids">
-							<div class="blog-grid-left">
-								<a href="singlepage.html"><img src="images/11.jpg" class="img-responsive" alt=""/></a>
-							</div>
-							<div class="blog-grid-right">
-
-								<h5><a href="singlepage.html">Pellentesque dui, non felis. Maecenas male</a> </h5>
-							</div>
-							<div class="clearfix"> </div>
-						</div>
-						<div class="blog-grids">
-							<div class="blog-grid-left">
-								<a href="singlepage.html"><img src="images/9.jpg" class="img-responsive" alt=""/></a>
-							</div>
-							<div class="blog-grid-right">
-
-								<h5><a href="singlepage.html">Pellentesque dui, non felis. Maecenas male</a> </h5>
-							</div>
-							<div class="clearfix"> </div>
-						</div>
-						<div class="blog-grids">
-							<div class="blog-grid-left">
-								<a href="singlepage.html"><img src="images/10.jpg" class="img-responsive" alt=""/></a>
-							</div>
-							<div class="blog-grid-right">
-
-								<h5><a href="singlepage.html">Pellentesque dui, non felis. Maecenas male</a> </h5>
-							</div>
-							<div class="clearfix"> </div>
-						</div>
-					</div>
-				</div>
-
-		</div>
-		<div class="clearfix"></div>
-		<!-- technology-right -->
-	</div>
-</div>
-<!-- technology -->
\ No newline at end of file

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

-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
 <div class="container">
     <div class="row">
         <div class="col-md-8">
             <div>
                 <legend>Employee Details</legend>
                 <table>
+
                     <tr>
                         <td><label>User Name</label></td>
                         <td>
@@ -30,7 +24,7 @@
                         </td>
                     </tr>
                     <tr>
-                        <td><label id="email"  for="email">Email</label> </td>
+                        <td><label id="email" for="email">Email</label></td>
                         <td>
                             <input type="email" maxlength="150" ng-model="emp.emailAddress"/>
                         </td>
@@ -49,23 +43,28 @@
                         </td>
                     </tr>
                     <tr>
-                        <td><label >home town:</label></td>
-                        <td> <input type="text" ng-model="emp.homeTown"/></td>
+                        <td><label>home town:</label></td>
+                        <td><input type="text" ng-model="emp.homeTown"/></td>
                     </tr>
                     <tr>
                         <td></td>
-                        <td>
+                        <td >
+
                             <input type="submit" name="submit" value="submit" ng-click="save();"/>
                             <input type="submit" name="clear" value="clear" ng-click=" emp = null"/>
                         </td>
                     </tr>
                 </table>
             </div>
-
+            <br><br>
             <div>
                 <table class="table">
                     <thead>
                     <tr>
+                    <tr>
+
+                        <td colspan="12">Thông tin nhân viên</td>
+                    </tr>
                     <th>ID</th>
                     <th>User Name</th>
                     <th>First Name</th>
@@ -74,6 +73,10 @@
                     <th>Phone</th>
                     <th>Education</th>
                     <th>Home Town</th>
+                    <th>Department</th>
+                    <th>Position</th>
+                    <th colspan="2">Menu</th>
+
                     </tr>
                     </thead>
                     <tbody>
@@ -86,11 +89,12 @@
                         <td>{{emp.phoneNumber}}</td>
                         <td>{{emp.education}}</td>
                         <td>{{emp.homeTown}}</td>
+                        <td>{{emp.department}}</td>
+                        <td>{{emp.position}}</td>
+                        <td><a href="#" ng-click="update(emp);">Edit</a>
+                        <td><a href="#" ng-confirm-click=" Do you want to delete this user?" ng-click="delete(emp);">Delete</a>
+                        </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>
                     </tr>
                     </tbody>
                 </table>
@@ -98,5 +102,3 @@
         </div>
     </div>
 </div>
-</body>
-</html>
\ No newline at end of file

src/main/resources/public/pages/employee/employeeController.js

 /**
  * 
  */
-angular.module("myApp",[]).controller("tintucController", function($scope, $http,$window) {
-	console.log("Tin tức controller");
+angular.module("myApp").controller("employeeController", function($scope, $http,$window) {
+	console.log("Employee controller");
 
 	$scope.emp=   {
 		"username": "",
@@ -12,7 +12,10 @@ angular.module("myApp",[]).controller("tintucController", function($scope, $http
 		"emailAddress": "",
 		"phoneNumber": "",
 		"homeTown": "",
-		"education": ""
+		"education": "",
+		"department": "",
+		"position" : "",
+
 	};
 
 
@@ -23,33 +26,63 @@ angular.module("myApp",[]).controller("tintucController", function($scope, $http
 		console.log($scope.emp);
 		$http({
 			method : 'POST',
-			url : "http://localhost:8081/list_employee/",
+			url : "http://localhost:8080/list_employee/",
 			data: $scope.emp
 		}).then(function successCallback(response) {
 			console.log(response);
-			// $window.location.href ='http://localhost:8081/#/tintuc';
+
 		}, function errorCallback(response) {
 			console.log(response)
 		});
 	}
 	$scope.update = update;
-	 function update(employee){
-      $scope.employee = employee;
-       list_employee();
+	 function update(emp){
+      $scope.emp = emp;
+		 $http({
+			 method : 'PUT',
+			 url : "/employee/" + emp.id,
+			 data: $scope.emp
+		 }).then(function successCallback(response) {
+			 console.log(response);
+
+		 }, function errorCallback(response) {
+			 console.log(response)
+		 });
      }
-    $scope.deleteEmployee = function (employee) {
+	// HTTP DELETE- delete employee by Id
+	// Call: http://localhost:8080/employee/{id}
+    $scope.delete = function (emp) {
 		$http({
 			method : 'DELETE',
-			url : 'http://localhost:8081/deleteEmployee/' + employee.id
-		}).then(_success, _error);
-	}
+			url : '/employee/' + emp.id
+		}).then(function successCallback(response) {
+			console.log(response);
+			$scope.employess=response.data;
+		}, function errorCallback(response) {
+			console.log(response)
+		});
+	};
+	// In case of edit
+	$scope.edit = function(emp){
+	 	$scope.emp.username = emp.username;
+	 	$scope.emp.password = emp.password;
+	 	$scope.emp.firstName = emp.firstName;
+	 	$scope.emp.lastName = emp.lastName;
+	 	$scope.emp.emailAddress = emp.emailAddress;
+	 	$scope.emp.phoneNumber = emp.phoneNumber;
+	 	$scope.emp.homeTown  = emp.homeTown;
+	 	$scope.emp.education = emp.education;
+	 	$scope.emp.department = emp.department;
+		$scope.emp.position = emp.position;
+	};
 
 
 	$http({
 		method : 'GET',
-		url : "http://localhost:8081/list_employee/",
+		url : "http://localhost:8080/list_employee/"
 	}).then(function successCallback(response) {
-		console.log(response)
+		console.log(response);
+
 		$scope.employess=response.data;
 	}, function errorCallback(response) {
 		console.log(response)

src/main/resources/public/pages/leaveform/leaveForm.html

+<!--<!DOCTYPE html>-->
+<!--<html lang="en" ng-app="myApp" ng-controller="timesheetController">-->
+<!--<head>-->
+<!--    <meta charset="UTF-8">-->
+<!--    <title>Time Sheet</title>-->
+<!--    <meta name="viewport" content="width=device-width, initial-scale=1">-->
+<!--    <script src="//unpkg.com/@uirouter/angularjs/release/angular-ui-router.min.js"></script>-->
+<!--    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"-->
+<!--            integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"-->
+<!--            crossorigin="anonymous"></script>-->
+<!--    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"-->
+<!--          integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">-->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.9/angular.min.js"></script>-->
+<!--    <script src="timeSheetController.js"></script>-->
+
+<!--</head>-->
+<!--<body>-->
+
+<!--</body>-->
+<!--</html>-->
+<div class="container">
+    <div class="row">
+        <div class="col-sm-12">
+            <br><br>
+            <input id="addLeaveForm" type="submit" name="addTS" value="Add" onclick="showAddLeaveFormFunction()"/>
+            <div id="addDivLF" style="display: none">
+                <legend>Leave Form</legend>
+                <table>
+
+                    <tr>
+                        <td><label>Title</label></td>
+                        <td>
+                            <input type="text" maxlength="300" ng-model="lfdto.title"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><label>Content</label></td>
+                        <td>
+                            <input type="text" maxlength="10000" ng-model="lfdto.content"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><label>Employee Id</label></td>
+                        <td>
+                            <input type="text" maxlength="10" value="" ng-model="lfdto.employeeId"/>
+                        </td>
+                    </tr>
+
+                    <tr>
+                        <td><label>Leave Type Id</label></td>
+                        <td>
+                            <input type="text" maxlength="10" value="" ng-model="lfdto.leaveTypeId"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td></td>
+                        <td >
+
+                            <input type="submit" name="submit" value="Confirm" ng-click="save();"/>
+                            <input type="submit" name="clear" value="Clear" ng-click="lfdto = null"/>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+            <br><br>
+            <div id="updateDivLF" style="display: none">
+<!--                <legend>Leave Form</legend>-->
+                <table>
+
+                    <tr>
+                        <td><label>Title</label></td>
+                        <td>
+                            <input type="text" maxlength="300" ng-model="lfdto.title"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><label>Content</label></td>
+                        <td>
+                            <input type="text" maxlength="10000" ng-model="lfdto.content"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td></td>
+                        <td >
+
+                            <input type="submit" name="submit" value="Confirm" ng-click="update();"/>
+                            <input type="submit" name="clear" value="Clear" ng-click="lfdto = null"/>
+                            <input type="submit" name="close" value="Close" onclick="document.getElementById('updateDivLF').style.display = 'none'"/>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+            <br><br>
+            <div>
+                <table class="table">
+                    <thead>
+                    <tr>
+                        <th>ID</th>
+                        <th>Title</th>
+                        <th>Content</th>
+                        <th>Employee</th>
+                        <th>Leave Type</th>
+                        <th>Create At</th>
+                        <th>Status</th>
+                        <th colspan="4"></th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                        <tr class="lff" ng-repeat="lf in leaveForms">
+                            <td>{{$index + 1}}</td>
+                            <td>{{lf.title}}</td>
+                            <td>{{lf.content}}</td>
+                            <td>{{lf.employee.lastName}}</td>
+                            <td>{{lf.leaveType.name}}</td>
+                            <td>{{lf.createdAt}}</td>
+                            <td>{{lf.status}}</td>
+
+                            <td><a ui-sref="leaveFormDetail({id: lf.id})">Xem</a></td>
+                            <td><a href="/#/leaveform" ng-click="getLf(lf);" onclick="document.getElementById('updateDivLF').style.display = 'block'">Sửa</a></td>
+                            <td><a href="/#/leaveform" ng-click="delete(lf);">Xoá</a></td>
+                            <td><a href="/#/leaveform" ng-click="updateStatus(lf)">Duyệt</a></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file

src/main/resources/public/pages/leaveform/leaveFormController.js

+/*
+
+ */
+
+angular.module("myApp").controller("leaveFormController", function($scope, $http, $state) {
+    console.log("Leave Form controller");
+
+    $scope.lf = {
+        "id": "",
+        "title": "",
+        "content": "",
+        "employee": "",
+        "leaveType": "",
+        "createdAt": "",
+        "status": ""
+    };
+
+    $scope.lfdto = {
+        "id": "",
+        "title": "",
+        "content": "",
+        "employeeId": "",
+        "leaveTypeId": ""
+    };
+
+    //get all leave form
+    $http({
+        method : 'GET',
+        url : "http://localhost:8080/employee/leaveform/show"
+    }).then(function successCallback(response) {
+        console.log(response);
+        $scope.leaveForms=response.data;
+    }, function errorCallback(response) {
+        console.log(response)
+    });
+
+    //delete leave form
+    $scope.delete = function (lf) {
+        $http({
+            method : 'DELETE',
+            url : "http://localhost:8080/employee/leaveform/delete/" + lf.id
+        }).then(function successCallback(response) {
+            console.log(response);
+        }, function errorCallback(response) {
+            console.log(response)
+        });
+    };
+
+    $scope.save = save;
+    function save(){
+        console.log($scope.lfdto);
+        $http({
+            method : 'POST',
+            url : "http://localhost:8080/employee/leaveform/add",
+            data: $scope.lfdto
+        }).then(function successCallback(response) {
+            console.log(response);
+            $state.reload();
+            // $window.location.reload();
+        }, function errorCallback(response) {
+            console.log(response)
+        });
+    }
+
+    $scope.getLf = getLf;
+    function getLf(lf) {
+        $scope.lfdto.id = lf.id;
+        $scope.lfdto.title = lf.title;
+        $scope.lfdto.content = lf.content;
+        $scope.lfdto.employeeId = lf.employee.id;
+        $scope.lfdto.leaveTypeId = lf.leaveType.id;
+    }
+
+    $scope.update = update;
+    function update(){
+        $http({
+            method : 'POST',
+            url : "http://localhost:8080/employee/leaveform/update",
+            data: $scope.lfdto
+        }).then(function successCallback(response) {
+            console.log(response);
+        }, function errorCallback(response) {
+            console.log(response)
+        });
+    }
+
+    $scope.updateStatus = updateStatus;
+    function updateStatus(lf){
+        $http({
+            method : 'POST',
+            url : "http://localhost:8080/employee/leaveform/"+lf.id+"/status",
+            // data: $scope.lfdto
+        }).then(function successCallback(response) {
+            console.log(response);
+        }, function errorCallback(response) {
+            console.log(response)
+        });
+    }
+});
\ No newline at end of file

src/main/resources/public/pages/leaveform/leaveFormDetail.html

+<div class="container">
+    <div class="row">
+        <div class="col-sm-12">
+            <div>
+                <br><br>
+                <div>
+                    <tr>
+                        <legend><p>Tiêu đề</p>{{leaveFormDetail.title}}</legend>
+                        <h3>Nội dung</h3>
+                        <td>{{leaveFormDetail.content}}</td>
+                    </tr>
+                </div>
+                <br><br>
+                <div>
+                    <tr>
+                        <input type="submit" name="submit" value="Duyệt" ui-sref="leaveForm" ng-click="updateStatus(leaveFormDetail.id)"/>
+                        <input type="submit" name="submit" value="Quay lại" ui-sref="leaveForm"/>
+                    </tr>
+                </div>
+                <br><br>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file

src/main/resources/public/pages/leaveform/leaveFormDetailController.js

+/*
+
+ */
+
+angular.module("myApp").controller("leaveFormDetailController", function($scope, $http, $stateParams) {
+    console.log("Leave Form Detail Controller");
+    $http({
+        method : 'GET',
+        url : "http://localhost:8080/employee/leaveform/" + $stateParams.id
+    }).then(function successCallback(response) {
+        console.log(response);
+        $scope.leaveFormDetail=response.data;
+    }, function errorCallback(response) {
+        console.log(response)
+    });
+
+    $scope.updateStatus = updateStatus;
+    function updateStatus(id){
+        $http({
+            method : 'POST',
+            url : "http://localhost:8080/employee/leaveform/"+id+"/status",
+        }).then(function successCallback(response) {
+            console.log(response);
+        }, function errorCallback(response) {
+            console.log(response)
+        });
+    }
+});
\ No newline at end of file

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

+
+<div class="container">
+    Project works
+</div>

src/main/resources/public/pages/project/projectController.js

+/**
+ * 
+ */
+angular.module("myApp").controller("projectController", function($scope, $http,$window) {
+	console.log("projectController ");
+});
\ No newline at end of file

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

+
+<!--<div class="container">-->
+<!--    <div class="row">-->
+<!--        <div class="col-md-8">-->
+<!--            <div>-->
+<!--                <legend>Employee Details</legend>-->
+<!--                <table>-->
+<!--                    <tr>-->
+<!--                        <td><label>User Name</label></td>-->
+<!--                        <td>-->
+<!--                            <input type="text"  maxlength="29" ng-model="emp.username"/>-->
+<!--                        </td>-->
+<!--                    </tr>-->
+<!--                    <tr>-->
+<!--                        <td><label>First Name</label></td>-->
+<!--                        <td>-->
+<!--                            <input type="text"  maxlength="29" ng-model="emp.firstName"/>-->
+<!--                        </td>-->
+<!--                    </tr>-->
+<!--                    <tr>-->
+<!--                        <td><label>Last Name</label></td>-->
+<!--                        <td>-->
+<!--                            <input type="text"  maxlength="29" ng-model="emp.lastName"/>-->
+<!--                        </td>-->
+<!--                    </tr>-->
+<!--                    <tr>-->
+<!--                        <td><label id="email"  for="email">Email</label> </td>-->
+<!--                        <td>-->
+<!--                            <input type="email" maxlength="150" ng-model="emp.emailAddress"/>-->
+<!--                        </td>-->
+<!--                    </tr>-->
+<!--                    <tr>-->
+<!--                        <td><label>Phone</label></td>-->
+<!--                        <td>-->
+<!--                            <input type="text" maxlength="10" value="" ng-model="emp.phoneNumber"/>-->
+<!--                        </td>-->
+<!--                    </tr>-->
+
+<!--                    <tr>-->
+<!--                        <td><label>education:</label></td>-->
+<!--                        <td>-->
+<!--                            <input ng-model="emp.education"/>-->
+<!--                        </td>-->
+<!--                    </tr>-->
+<!--                    <tr>-->
+<!--                        <td><label >home town:</label></td>-->
+<!--                        <td> <input type="text" ng-model="emp.homeTown"/></td>-->
+<!--                    </tr>-->
+<!--                    <tr>-->
+<!--                        <td></td>-->
+<!--                        <td>-->
+<!--                            <input type="submit" name="submit" value="submit" ng-click="save();"/>-->
+<!--                            <input type="submit" name="clear" value="clear" ng-click=" emp = null"/>-->
+<!--                        </td>-->
+<!--                    </tr>-->
+<!--                </table>-->
+<!--            </div>-->
+
+<!--            <div>-->
+<!--                <table class="table">-->
+<!--                    <thead>-->
+<!--                    <tr>-->
+<!--                        <th>ID</th>-->
+<!--                        <th>User Name</th>-->
+<!--                        <th>First Name</th>-->
+<!--                        <th>Last Name</th>-->
+<!--                        <th>EmailAddress</th>-->
+<!--                        <th>Phone</th>-->
+<!--                        <th>Education</th>-->
+<!--                        <th>Home Town</th>-->
+<!--                    </tr>-->
+<!--                    </thead>-->
+<!--                    <tbody>-->
+<!--                    <tr class="vide" ng-repeat="emp in employess">-->
+<!--                        <td>{{$index + 1}}</td>-->
+<!--                        <td>{{emp.username}}</td>-->
+<!--                        <td>{{emp.firstName}}</td>-->
+<!--                        <td>{{emp.lastName}}</td>-->
+<!--                        <td>{{emp.emailAddress}}</td>-->
+<!--                        <td>{{emp.phoneNumber}}</td>-->
+<!--                        <td>{{emp.education}}</td>-->
+<!--                        <td>{{emp.homeTown}}</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>-->
+<!--                    </tr>-->
+<!--                    </tbody>-->
+<!--                </table>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--</div>-->

src/main/resources/public/pages/report/reportController.js

+// /**
+//  *
+//  */
+// angular.module("myApp").controller("employeeController", function($scope, $http,$window) {
+// 	console.log("Employee controller");
+//
+// 	$scope.emp=   {
+// 		"username": "",
+// 		"password": "",
+// 		"firstName": "",
+// 		"lastName": "",
+// 		"emailAddress": "",
+// 		"phoneNumber": "",
+// 		"homeTown": "",
+// 		"education": ""
+// 	};
+//
+//
+//
+// 	$scope.save = save;
+//
+// 	function save(){
+// 		console.log($scope.emp);
+// 		$http({
+// 			method : 'POST',
+// 			url : "http://localhost:8080/list_employee/",
+// 			data: $scope.emp
+// 		}).then(function successCallback(response) {
+// 			console.log(response);
+// 			$window.location.href ='http://localhost:8080/#/tintuc';
+// 		}, function errorCallback(response) {
+// 			console.log(response)
+// 		});
+// 	}
+// 	$scope.update = update;
+// 	 function update(employee){
+//       $scope.employee = employee;
+//        list_employee();
+//      }
+//     $scope.deleteEmployee = function (employee) {
+// 		$http({
+// 			method : 'DELETE',
+// 			url : 'http://localhost:8080/employee/' + employee.id
+// 		}).then(_success, _error);
+// 	}
+//
+//
+// 	$http({
+// 		method : 'GET',
+// 		url : "http://localhost:8080/list_employee/",
+// 	}).then(function successCallback(response) {
+// 		console.log(response)
+// 		$scope.employess=response.data;
+// 	}, function errorCallback(response) {
+// 		console.log(response)
+// 	});
+// });
\ No newline at end of file

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

+
+<div class="container">
+    state con của layout2
+</div>

src/main/resources/public/pages/testlayout/testlayoutController.js

+/**
+ * 
+ */
+angular.module("myApp").controller("testlayoutController", function($scope, $http,$window) {
+	console.log("testlayoutController");
+
+
+});
\ No newline at end of file

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

+<!--<!DOCTYPE html>-->
+<!--<html lang="en" ng-app="myApp" ng-controller="timesheetController">-->
+<!--<head>-->
+<!--    <meta charset="UTF-8">-->
+<!--    <title>Time Sheet</title>-->
+<!--    <meta name="viewport" content="width=device-width, initial-scale=1">-->
+<!--    <script src="//unpkg.com/@uirouter/angularjs/release/angular-ui-router.min.js"></script>-->
+<!--    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"-->
+<!--            integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"-->
+<!--            crossorigin="anonymous"></script>-->
+<!--    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"-->
+<!--          integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">-->
+<!--    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.9/angular.min.js"></script>-->
+<!--    <script src="timeSheetController.js"></script>-->
+
+<!--</head>-->
+<!--<body>-->
+
+<!--</body>-->
+<!--</html>-->
+<div class="container">
+    <div class="row">
+        <div class="col-md-12">
+            <br><br>
+            <input id="addTimeSheet" type="submit" name="addTS" value="Add" onclick="showAddTimeSheetFunction()"/>
+            <div id="addDivTS" style="display: none">
+                <legend>Time Sheet</legend>
+                <table>
+
+                    <tr>
+                        <td><label>Title</label></td>
+                        <td>
+                            <input type="text" maxlength="300" ng-model="tsdto.title"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><label>Content</label></td>
+                        <td>
+                            <input type="text" maxlength="10000" ng-model="tsdto.content"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><label>Note</label></td>
+                        <td>
+                            <input type="text" maxlength="10000" ng-model="tsdto.note"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><label>Employee Project Id</label></td>
+                        <td>
+                            <input type="text" maxlength="10" value="" ng-model="tsdto.eprojectId"/>
+                        </td>
+                    </tr>
+
+                    <tr>
+                        <td><label>Employee Id</label></td>
+                        <td>
+                            <input type="text" maxlength="10" value="" ng-model="tsdto.employeeId"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td></td>
+                        <td >
+
+                            <input type="submit" name="submit" value="Confirm" ng-click="save();"/>
+                            <input type="submit" name="clear" value="Clear" ng-click="tsdto = null"/>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+
+            <br><br>
+            <div id="updateDivTS" style="display: none">
+<!--                <legend>Time Sheet</legend>-->
+                <table>
+
+                    <tr>
+                        <td><label>Title</label></td>
+                        <td>
+                            <input type="text" maxlength="300" ng-model="tsdto.title"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><label>Content</label></td>
+                        <td>
+                            <input type="text" maxlength="10000" ng-model="tsdto.content"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><label>Note</label></td>
+                        <td>
+                            <input type="text" maxlength="10000" ng-model="tsdto.note"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td></td>
+                        <td >
+                            <input type="submit" name="submit" value="Confirm" ng-click="update();"/>
+                            <input type="submit" name="clear" value="Clear" ng-click="tsdto = null"/>
+                            <input type="submit" name="close" value="Close" onclick="document.getElementById('updateDivTS').style.display = 'none'"/>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+            <br><br>
+            <div>
+                <table class="table">
+                    <thead>
+                    <tr>
+                        <th>ID</th>
+                        <th>Title</th>
+                        <th>Content</th>
+                        <th>Note</th>
+                        <th>Employee</th>
+                        <th>Create at</th>
+                        <th colspan="3"></th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                        <tr class="tss" ng-repeat="ts in myTimeSheets | limitTo:numLimit:start">
+                            <td>{{$index + 1}}</td>
+                            <td>{{ts.title}}</td>
+                            <td>{{ts.content}}</td>
+                            <td>{{ts.note}}</td>
+                            <td>{{ts.eproject.project.name}}</td>
+                            <td>{{ts.createdAt}}</td>
+
+                            <td><a ui-sref="timeSheetDetail({id: ts.id})">Xem</a></td>
+                            <td><a href="#timesheet" ng-click="getTs(ts);" onclick="document.getElementById('updateDivTS').style.display = 'block'">Sửa</a></td>
+                            <td><a href="#timesheet" ng-click="delete(ts);">Xoá</a></td>
+                        </tr>
+                        <tr>
+                            <td colspan="9" style='text-align: center'><span>Page# {{currentPage}} of {{pages}}</span>
+                                <span style="float:left;padding:5px"><a ng-hide="hidePrev()" href="" ng-click="PrevPage()">Prev</a></span>
+                                <span style="float:right;padding:5px"><a ng-hide="hideNext()" href="" ng-click="nextPage()">Next</a></span></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file

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

+/*
+
+ */
+angular.module("myApp").controller("timeSheetController", function($scope, $http) {
+    console.log("Time Sheet controller");
+
+    $scope.ts = {
+        "id": "",
+        "title": "",
+        "content": "",
+        "note": "",
+        "eproject": "",
+        "createdAt": ""
+    };
+
+    $scope.tsdto = {
+        "id": "",
+        "title": "",
+        "content": "",
+        "note": "",
+        "eprojectId": "",
+        "employeeId": ""
+    };
+
+    //get all time sheet
+    $http({
+        method : 'GET',
+        url : "http://localhost:8080/eproject/timesheet/show"
+    }).then(function successCallback(response) {
+        console.log(response);
+        $scope.myTimeSheets=response.data;
+    }, function errorCallback(response) {
+        console.log(response)
+    });
+
+    //delete time sheet
+    $scope.delete = function (ts) {
+        $http({
+            method : 'DELETE',
+            url : "http://localhost:8080/eproject/timesheet/delete/" + ts.id
+        }).then(function successCallback(response) {
+            console.log(response);
+            $scope.config.timeSheets=response.data;
+        }, function errorCallback(response) {
+            console.log(response)
+        });
+    };
+
+
+    $scope.save = save;
+    function save(){
+        console.log($scope.tsdto);
+        $http({
+            method : 'POST',
+            url : "http://localhost:8080/eproject/timesheet/add",
+            data: $scope.tsdto
+        }).then(function successCallback(response) {
+            console.log(response);
+        }, function errorCallback(response) {
+            console.log(response)
+        });
+    }
+
+    $scope.getTs = getTs;
+    function getTs(ts) {
+        $scope.tsdto.id = ts.id;
+        $scope.tsdto.title = ts.title;
+        $scope.tsdto.content = ts.content;
+        $scope.tsdto.note = ts.note;
+        $scope.tsdto.employeeId = ts.eproject.employee.id;
+    }
+
+    $scope.update = update;
+    function update(){
+        $http({
+            headers: "content-type: application/json",
+            method : 'POST',
+            url : "http://localhost:8080/eproject/timesheet/update",
+            data: $scope.tsdto
+        }).then(function successCallback(response) {
+            console.log(response);
+        }, function errorCallback(response) {
+            console.log(response)
+        });
+    }
+}).directive('pgnTable', ['$compile', function ($compile) {
+    return {
+        restrict: 'EA',
+        templateUrl: 'pages/timesheet/timeSheet.html',
+        replace: true,
+        scope: {
+            pages: "=pgnTable"
+        },
+        controller: function ($scope) {
+            $scope.currentPage=1;
+            $scope.numLimit=5;
+            $scope.start = 0;
+            $scope.$watch("pages",function(newVal){
+                if(newVal){
+                    $scope.pages=Math.ceil($scope.pages.length/$scope.numLimit);
+                }
+            });
+            $scope.hideNext=function(){
+                if(($scope.start + $scope.numLimit) < $scope.pages.length){
+                    return false;
+                }
+                else
+                    return true;
+            };
+            $scope.hidePrev=function(){
+                if($scope.start===0){
+                    return true;
+                }
+                else
+                    return false;
+            };
+            $scope.nextPage=function(){
+                console.log("next pages");
+                $scope.currentPage++;
+                $scope.start=$scope.start+ $scope.numLimit;
+                console.log( $scope.start)
+            };
+            $scope.PrevPage=function(){
+                if($scope.currentPage>1){
+                    $scope.currentPage--;
+                }
+                console.log("next pages");
+                $scope.start=$scope.start - $scope.numLimit;
+                console.log( $scope.start)
+            };
+        },
+        compile: function(elem) {
+            return function(ielem, $scope) {
+                $compile(ielem)($scope);
+            };
+        }
+    };
+}]);
\ No newline at end of file

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

+<div class="container">
+    <div class="row">
+        <div class="col-sm-12">
+            <div>
+                <br><br>
+                <div>
+                    <tr>
+                        <legend><p>Tiêu đề</p>{{timeSheetDetail.title}}</legend>
+                        <h3>Nội dung</h3>
+                        <td>{{timeSheetDetail.content}}</td>
+                    </tr>
+                </div>
+                <br><br>
+                <div>
+                    <tr>
+                        <h3>Ghi chú</h3>
+                        <td>{{timeSheetDetail.note}}</td>
+                    </tr>
+                </div>
+                <br><br>
+                <div>
+                    <tr>
+                        <h3>Nhận xét</h3>
+                        <td>{{timeSheetDetail.checked}}</td>
+                    </tr>
+                </div>
+                <br><br>
+                <div>
+                    <tr>
+                        <input type="text" name="check" placeholder="Nhận xét" ng-model="check"/>
+                        <input type="submit" name="submit" value="Xác nhận" ng-click="updateCheck(timeSheetDetail.id, check);" ui-sref="leaveFormDetail"/>
+                        <input type="submit" name="submit" value="Quay lại" ui-sref="timeSheet"/>
+                    </tr>
+                </div>
+                <br><br>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file

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

+/*
+
+ */
+
+angular.module("myApp").controller("timeSheetDetailController", function($scope, $http, $stateParams) {
+    console.log("Time Sheet Detail Controller");
+
+    $scope.tsd = {
+        "id": "",
+        "checked": ""
+    };
+
+    $http({
+        method : 'GET',
+        url : "http://localhost:8080/eproject/timesheet/" + $stateParams.id
+    }).then(function successCallback(response) {
+        console.log(response);
+        $scope.timeSheetDetail=response.data;
+    }, function errorCallback(response) {
+        console.log(response)
+    });
+
+    $scope.updateCheck = function updateCheck(id, check){
+        $scope.tsd.id = id;
+        $scope.tsd.checked = check;
+        $http({
+            headers: {"Content-Type": "application/json"},
+            method : 'POST',
+            url : "http://localhost:8080/eproject/timesheet/update/check",
+            data: $scope.tsd
+        }).then(function successCallback(response) {
+            console.log(response);
+        }, function errorCallback(response) {
+            console.log(response)
+        });
+    }
+});
\ No newline at end of file

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

-//
-//
-//
-// angular.module("MyTimeSheet",[]).controller("timesheetController", function($scope, $http, $window) {
-//     console.log("Time Sheet controller");
-//
-//     $scope.ts = {
-//         "id": "",
-//         "title": "",
-//         "content": "",
-//         "note": "",
-//         "eproject": "",
-//         "createdAt": ""
-//     };
-//
-//     $scope.tsdto = {
-//         "title": "",
-//         "content": "",
-//         "note": "",
-//         "employeeId": "",
-//         "eprojectId": ""
-//     };
-//
-//     $scope.tsdtou = {
-//         "id": "",
-//         "title": "",
-//         "content": "",
-//         "note": "",
-//         "employeeId": ""
-//     };
-//
-//     $http({
-//         method : 'GET',
-//         url : "http://localhost:8080/eproject/timesheet/show",
-//     }).then(function successCallback(response) {
-//         console.log(response);
-//         $scope.timesheet = response.data;
-//     }, function errorCallback(response) {
-//         console.log(response)
-//     });
-//
-//
-//     $scope.save = save;
-//     function save(){
-//         console.log($scope.tsdto);
-//         $http({
-//             method : 'POST',
-//             url : "http://localhost:8080/eproject/timesheet",
-//             data: $scope.tsdto
-//         }).then(function successCallback(response) {
-//             console.log(response);
-//             $window.location.href ='http://localhost:8080/#/eproject/timesheet';
-//         }, function errorCallback(response) {
-//             console.log(response)
-//         });
-//     }
-//
-//
-//     $scope.update = function (ts) {
-//         $scope.tsdtou.id = ts.id;
-//         $scope.tsdtou.title = ts.title;
-//         $scope.tsdtou.content = ts.content;
-//         $scope.tsdtou.note = ts.note;
-//     };
-//
-//     $scope.updatedto = function () {
-//         console.log($scope.tsdtou);
-//         $http({
-//             method : 'POST',
-//             url : 'http://localhost:8080/eproject/timesheet/update',
-//             data: $scope.tsdtou
-//         }).then(function successCallback(response) {
-//             console.log(response);
-//             $window.location.href ='http://localhost:8080/eproject/timesheet#!';
-//         }, function errorCallback(response) {
-//             console.log(response)
-//         });
-//     };
-//
-//
-//     $scope.delete = function (ts) {
-//         $http({
-//             method : 'DELETE',
-//             url : 'http://localhost:8080/eproject/timesheet/delete/'+ts.id,
-//         }).then(function successCallback(response) {
-//             console.log(response);
-//             $window.location.href ='http://localhost:8080/#/eproject/timesheet#!';
-//         }, function errorCallback(response) {
-//             console.log(response)
-//         });
-//     }
-// });
+/*
+
+ */
+angular.module("myApp").controller("timeSheetController", function($scope, $http) {
+    console.log("Time Sheet controller");
+
+    $scope.ts = {
+        "id": "",
+        "title": "",
+        "content": "",
+        "note": "",
+        "eproject": "",
+        "createdAt": ""
+    };
+
+    $scope.tsdto = {
+        "id": "",
+        "title": "",
+        "content": "",
+        "note": "",
+        "eprojectId": "",
+        "employeeId": ""
+    };
+
+    //get all time sheet
+    $http({
+        method : 'GET',
+        url : "http://localhost:8080/eproject/timesheet/show"
+    }).then(function successCallback(response) {
+        console.log(response);
+        $scope.myTimeSheets=response.data;
+    }, function errorCallback(response) {
+        console.log(response)
+    });
+
+    //delete time sheet
+    $scope.delete = function (ts) {
+        $http({
+            method : 'DELETE',
+            url : "http://localhost:8080/eproject/timesheet/delete/" + ts.id
+        }).then(function successCallback(response) {
+            console.log(response);
+            $scope.config.timeSheets=response.data;
+        }, function errorCallback(response) {
+            console.log(response)
+        });
+    };
+
+
+    $scope.save = save;
+    function save(){
+        console.log($scope.tsdto);
+        $http({
+            method : 'POST',
+            url : "http://localhost:8080/eproject/timesheet/add",
+            data: $scope.tsdto
+        }).then(function successCallback(response) {
+            console.log(response);
+        }, function errorCallback(response) {
+            console.log(response)
+        });
+    }
+
+    $scope.getTs = getTs;
+    function getTs(ts) {
+        $scope.tsdto.id = ts.id;
+        $scope.tsdto.title = ts.title;
+        $scope.tsdto.content = ts.content;
+        $scope.tsdto.note = ts.note;
+        $scope.tsdto.employeeId = ts.eproject.employee.id;
+    }
+
+    $scope.update = update;
+    function update(){
+        $http({
+            headers: "content-type: application/json",
+            method : 'POST',
+            url : "http://localhost:8080/eproject/timesheet/update",
+            data: $scope.tsdto
+        }).then(function successCallback(response) {
+            console.log(response);
+        }, function errorCallback(response) {
+            console.log(response)
+        });
+    }
+}).directive('pgnTable', ['$compile', function ($compile) {
+    return {
+        restrict: 'EA',
+        templateUrl: 'pages/timesheet/timeSheet.html',
+        replace: true,
+        scope: {
+            pages: "=pgnTable"
\ No newline at end of file
+        },
+        controller: function ($scope) {
+            $scope.currentPage=1;
+            $scope.numLimit=5;
+            $scope.start = 0;
+            $scope.$watch("pages",function(newVal){
+                if(newVal){
+                    $scope.pages=Math.ceil($scope.pages.length/$scope.numLimit);
+                }
+            });
+            $scope.hideNext=function(){
+                if(($scope.start + $scope.numLimit) < $scope.pages.length){
+                    return false;
+                }
+                else
+                    return true;
+            };
+            $scope.hidePrev=function(){
+                if($scope.start===0){
+                    return true;
+                }
+                else
+                    return false;
+            };
+            $scope.nextPage=function(){
+                console.log("next pages");
+                $scope.currentPage++;
+                $scope.start=$scope.start+ $scope.numLimit;
+                console.log( $scope.start)
+            };
+            $scope.PrevPage=function(){
+                if($scope.currentPage>1){
+                    $scope.currentPage--;
+                }
+                console.log("next pages");
+                $scope.start=$scope.start - $scope.numLimit;
+                console.log( $scope.start)
+            };
+        },
+        compile: function(elem) {
+            return function(ielem, $scope) {
+                $compile(ielem)($scope);
+            };
+        }
+    };
+}]);
\ No newline at end of file

src/main/resources/public/project/chi-tiet-nhom-project.html

-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Nhóm Dự Án</title>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file

src/main/resources/public/project/projectAddViews.html

-<div class="card-header">
-    <i class="fas fa-table"></i> Thêm mới dự án
-</div>
-<div class="card-body" ng-app="insertProjectModule">
-    <form ng-controller="insertProject">
-        <div class="form-group">
-            <div class="form-row">
-                <div class="col-md-6">
-                    <div class="form-label-group">
-                        <input type="text" ng-model="lstProject.name" id="name" class="form-control"
-                               placeholder="Tên Dự Án"
-                               required="required" autofocus="autofocus">
-                        <label for="name">Tên Dự Án</label>
-                        <span>{{lstProject.name}}</span>
-                    </div>
-                </div>
-                <div class="col-md-6">
-                    <div class="form-label-group">
-                        <input type="text" ng-model="lstProject.descriptions" id="descriptions"
-                               class="form-control"
-                               placeholder="Mô tả ngắn"
-                               required="required">
-                        <label for="descriptions">Mô tả ngắn</label>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="form-group">
-            <div class="form-row">
-                <div class="col-md-6">
-                    <div class="form-label-group">
-                        <input type="text" ng-model="lstProject.startDate" id="startDate" class="form-control"
-                               placeholder="Ngày Bắt Đầu" required="required">
-                        <label for="startDate">Ngày Bắt Đầu</label>
-                    </div>
-                </div>
-                <div class="col-md-6">
-                    <div class="form-label-group">
-                        <input type="text" ng-model="lstProject.endDate" id="endDate" class="form-control"
-                               placeholder="nick skype" required="required">
-                        <label for="endDate">Ngày Kết Thuc</label>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div>
-            <input ng-click="insert_project()" type="submit" value="Lưu">
-            <input type="reset" value="Reset">
-        </div>
-    </form>
-</div>
-<script src="components/project/projectAddController.js"></script>
\ No newline at end of file

src/main/resources/public/project/projectListViews.html

-<div class="card mb-3">
-
-    <div class="card-header">
-        <i class="fas fa-table"></i> Danh Sách Dự Án
-    </div>
-    <div class="card-body" ng-app="GetAPI">
-        <div class="table-responsive" ng-controller="showProject">
-            <a href="#" class="btn btn-primary btn-circle btn-sm" style="margin-bottom: 10px;"> Thêm </a>
-            <table class="table table-bordered" id="dataTable" width="100%"
-                   cellspacing="0">
-                <thead>
-                <tr>
-                    <th>Tên Dự Án</th>
-                    <th>Mô tả ngắn</th>
-                    <th>Ngày bắt đầu</th>
-                    <th>Hạn giao</th>
-                    <th>Trạng Thái</th>
-                    <th>Thao Tác</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr ng-repeat="project in listProject">
-                    <td>{{ project.name }}</td>
-                    <td>{{ project.descriptions }}</td>
-                    <td>{{ project.startDate | date:"dd/MM/yyyy" }}</td>
-                    <td>{{ project.endDate | date:"dd/MM/yyyy" }}</td>
-                    <td>{{ project.statusGet }}</td>
-                    <td><a data-ng-href="#" class="btn btn-info btn-circle btn-sm">
-                        Xem </a> <a data-ng-href="#" class="btn btn-warning btn-circle btn-sm">
-                        Sửa </a> <a data-ng-href="#" class="btn btn-danger btn-circle btn-sm">Xóa</a>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-</div>
-
-<!--angular js-->
-<script src="components/project/projectController.js"></script>
\ No newline at end of file