new

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/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;

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;

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

@@ -24,7 +24,7 @@
 
 table {
     font-family: "Helvetica Neue", Helvetica, sans-serif;
-    width: 50%;
+    width: 70%;
 }
 
 caption {

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