Merge branch 'dinhdam'

# Conflicts:
#	src/main/java/com/itsol/quantrivanphong/access/homepage/business/CatalogiBusiness.java
#	src/main/java/com/itsol/quantrivanphong/access/homepage/business/NewsBusiness.java
#	src/main/java/com/itsol/quantrivanphong/access/homepage/controller/CatalogiController.java
#	src/main/java/com/itsol/quantrivanphong/access/homepage/controller/NewsController.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/project/bussiness/ProjectBussiness.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/project/bussiness/ProjectBussinessImpl.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/project/controller/ProjectController.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/bussiness/ProjectGroupBussiness.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/bussiness/ProjectGroupBussinessImpl.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/common/EmployeeRepositoryImpl.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/controller/ProjectGroupController.java
#	src/main/java/com/itsol/quantrivanphong/model/Catalogi.java
#	src/main/java/com/itsol/quantrivanphong/model/Eproject.java
#	src/main/java/com/itsol/quantrivanphong/model/News.java
#	src/main/java/com/itsol/quantrivanphong/report/issue/common/AbstractEntityManagerDao.java
#	src/main/java/com/itsol/quantrivanphong/report/issue/common/GennericeEntityManagerDao.java
#	src/main/java/com/itsol/quantrivanphong/report/leaveform/business/LeaveFormBusiness.java
#	src/main/java/com/itsol/quantrivanphong/report/leaveform/controller/LeaveFormController.java
#	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/public/layout/layout1.html
#	src/main/resources/public/pages/report/employeeListViews.html
#	src/main/resources/public/pages/report/employeeListViews1.html
#	src/main/resources/public/pages/report/reportController.js
#	src/main/resources/public/pages/report/reportPage.html

src/main/java/com/itsol/quantrivanphong/access/homepage/business/CatalogiBusiness.java

 package com.itsol.quantrivanphong.access.homepage.business;
 
 import com.itsol.quantrivanphong.access.homepage.repository.CatalogiRepository;
+import com.itsol.quantrivanphong.exception.ResourceNotFoundException;
 import com.itsol.quantrivanphong.model.Catalogi;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Optional;
 
 @Service
 public class CatalogiBusiness {
@@ -24,4 +24,13 @@ public class CatalogiBusiness {
     public Catalogi save(Catalogi catalogi){
         return catalogiRepository.save(catalogi);
     }
+    public String deleteCatalogi(int catalogiId){
+        Catalogi catalogi = catalogiRepository.findCatalogiById(catalogiId);
+        if(catalogi == null){
+            throw new ResourceNotFoundException("News" ,"newsId",catalogiId);
+        }
+        catalogiRepository.delete(catalogi);
+        return "ok";
+
+    }
 }

src/main/java/com/itsol/quantrivanphong/access/homepage/business/NewsBusiness.java

@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Optional;
 
 @Service
 public class NewsBusiness {
@@ -62,8 +61,8 @@ public class NewsBusiness {
     }
 
 //
-    public String deleteNews(int newsId,int employeeId){
-        News news = newsRepository.findByIdAndEmployeeId(newsId,employeeId);
+    public String deleteNews(int newsId){
+        News news = newsRepository.findNewsById(newsId);
         if(news == null){
             throw new ResourceNotFoundException("News" ,"newsId",newsId);
         }

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

@@ -30,9 +30,17 @@ public class CatalogiController {
         return catalogi;
     }
 
-    @PostMapping("/catalogi")
+    @PostMapping("HR/catalogi")
     public Catalogi createCatalogi(@Valid@RequestBody Catalogi catalogi) {
         return catalogiBusiness.save(catalogi);
     }
 
+    @DeleteMapping("HR/catalogi/{catalogiId}")
+    public ResponseEntity<?> deleteNews(@PathVariable (value = "catalogiId") int catalogiId) {
+        if(catalogiBusiness.findCatalogiById(catalogiId)== null){
+            throw  new ResourceNotFoundException("News","newsId",catalogiId);
+        }
+        return ResponseEntity.ok(catalogiBusiness.deleteCatalogi(catalogiId));
+    }
+
 }

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

@@ -8,9 +8,8 @@ import com.itsol.quantrivanphong.manager.employee.business.EmployeeBusiness;
 import com.itsol.quantrivanphong.model.Catalogi;
 import com.itsol.quantrivanphong.model.Employee;
 import com.itsol.quantrivanphong.model.News;
+import com.itsol.quantrivanphong.report.leaveform.controller.Notification;
 import org.springframework.beans.factory.annotation.Autowired;
-
-
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -51,6 +50,11 @@ public class NewsController {
         return newsBusiness.findByCatalogiId(catalogiId);
     }
 
+    @GetMapping("/catalogi/{catalogiId}/news/{newsId}")
+    public News getNewsByCatalogiId(@PathVariable(value="catalogiId") int catalogiId,
+                                          @PathVariable(value="newsId") int newsId){
+        return newsBusiness.findNewsByIdAndAndCatalogiId(newsId,catalogiId);
+    }
     // get LatestNews by catalogiId
     @GetMapping("/catalogi/{catalogiId}/latestNews")
     public List<News> getLatestNews(@PathVariable(value="catalogiId") int catalogiId){
@@ -70,8 +74,8 @@ public class NewsController {
     }
 
     // create news by employeesId, categoriId
-    @PostMapping("/employees/{employeeId}/catalogies/{catalogiId}/news")
-    public News createNews(@PathVariable (value = "employeeId") int employeeId,
+    @PostMapping("/HR/{employeeId}/catalogies/{catalogiId}/news")
+    public ResponseEntity createNews(@PathVariable (value = "employeeId") int employeeId,
                            @PathVariable (value = "catalogiId") int catalogiId,
                            @Valid @RequestBody News news) {
         Employee employee =  employeeBusiness.findById(employeeId);
@@ -85,17 +89,15 @@ public class NewsController {
 
         news.setEmployee(employee);
         news.setCatalogi(catalogi);
-        return newsBusiness.save(news);
+        newsBusiness.save(news);
+        return ResponseEntity.ok(new Notification(200, "Success"));
     }
 
     // Edit news by EmployeeId
-    @PutMapping("/employees/{employeeId}/news/{newsId}")
-    public News updateNews(@PathVariable (value = "employeeId") int employeeId,
-                           @PathVariable (value = "newsId") int newsId,
+    @PutMapping("HR/news/{newsId}")
+    public News updateNews(@PathVariable (value = "newsId") int newsId,
                            @Valid @RequestBody News newsRequest) {
-        if(employeeBusiness.findById(employeeId)==null) {
-            throw new ResourceNotFoundException("Employee" ,"employeeId",employeeId);
-        }
+
         if (newsBusiness.findNewsById(newsId)== null) {
             throw  new ResourceNotFoundException("News", "id", newsId);
         }
@@ -103,12 +105,11 @@ public class NewsController {
     }
 
     //delete news by employeeId and newsId
-    @DeleteMapping("/HR/catagori/{catagoriId}/news/{newsId}")
-    public ResponseEntity<?> deleteNews(@PathVariable (value = "catagoriId") int catagoriId,
-                                           @PathVariable (value = "newsId") int newsId) {
-        if(newsBusiness.findNewsByIdAndAndCatalogiId(newsId,catagoriId)== null){
+    @DeleteMapping("HR/news/{newsId}")
+    public ResponseEntity<?> deleteNews(@PathVariable (value = "newsId") int newsId) {
+        if(newsBusiness.findNewsById(newsId)== null){
             throw  new ResourceNotFoundException("News","newsId",newsId);
         }
-        return ResponseEntity.ok(newsBusiness.deleteNews(newsId,catagoriId));
+        return ResponseEntity.ok(newsBusiness.deleteNews(newsId));
     }
 }

src/main/java/com/itsol/quantrivanphong/access/homepage/repository/NewsRepository.java

@@ -6,7 +6,6 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Optional;
 
 @Repository
 public interface NewsRepository extends JpaRepository<News, Integer> {

src/main/java/com/itsol/quantrivanphong/access/login/dto/EmployeeDTO.java

@@ -3,7 +3,6 @@ package com.itsol.quantrivanphong.access.login.dto;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.Length;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/itsol/quantrivanphong/access/register/bussiness/EmailBussiness.java

@@ -23,20 +23,6 @@ public class EmailBussiness {
     public boolean sendEmail(EmailDTO emailDTO)  {
         boolean check;
 
-//        MimeMessage message = sender.createMimeMessage();
-//        MimeMessageHelper helper = new MimeMessageHelper(message);
-//
-//
-//        try {
-//            helper.setTo(emailDTO.getRecipientEmail());
-//            helper.setText(emailDTO.getMessage(),"text/html");
-//            helper.setSubject(emailDTO.getSubject());
-//            sender.send(message);
-//            check = true;
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            check = false;
-//        }
 
         // Recipient's email ID needs to be mentioned.
         String to = emailDTO.getRecipientEmail();

src/main/java/com/itsol/quantrivanphong/access/register/controller/RegisterController.java

 package com.itsol.quantrivanphong.access.register.controller;
 
-import com.itsol.quantrivanphong.exception.InputException;
 import com.itsol.quantrivanphong.access.register.bussiness.RegisterBussiness;
 import com.itsol.quantrivanphong.access.register.dto.RegisterDTO;
+import com.itsol.quantrivanphong.exception.InputException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

src/main/java/com/itsol/quantrivanphong/manager/project/project/bussiness/ProjectBussiness.java

 package com.itsol.quantrivanphong.manager.project.project.bussiness;
 
 import com.itsol.quantrivanphong.manager.project.project.dto.ProjectDTO;
+import com.itsol.quantrivanphong.report.issue.common.AbstractDaoPage;
+import com.itsol.quantrivanphong.report.issue.common.WrapperResult;
 
 import java.util.List;
 
 public interface ProjectBussiness {
-//    Danh sách dự án phân theo trang
-    List<ProjectDTO> findProjectPage(String property, Object value, String sortExperssion, String sortDirection, Integer offset, Integer limit);
-//    Danh sách dự án tất cả các dự án
+    //    Danh sách dự án tất cả các dự án
     List<ProjectDTO> findAllProject();
-//    upload thông tin dự án
-    String updateProject(ProjectDTO dto);
-//    thêm dự án mới
-    String saveProject(ProjectDTO dto);
-//    tìm kiếm dự án theo id
+
+    //    upload thông tin dự án
+    WrapperResult updateProject(ProjectDTO dto);
+
+    //    thêm dự án mới
+    WrapperResult saveProject(ProjectDTO dto);
+
+    //    tìm kiếm dự án theo id
     ProjectDTO findByProjectId(Integer id);
-//    xóa list dự án theo arr ids
-    String deleteProject(Integer[] ids);
+
     //  xóa một project
-    String deleteProjectById(Integer ids);
+    WrapperResult deleteProjectById(Integer ids);
+
+    AbstractDaoPage<ProjectDTO> getPageProject(int page, int pageSize);
+
 }

src/main/java/com/itsol/quantrivanphong/manager/project/project/bussiness/ProjectBussinessImpl.java

@@ -3,8 +3,13 @@ package com.itsol.quantrivanphong.manager.project.project.bussiness;
 import com.itsol.quantrivanphong.manager.project.project.dto.ProjectDTO;
 import com.itsol.quantrivanphong.manager.project.project.repository.ProjectRepository;
 import com.itsol.quantrivanphong.model.Project;
+import com.itsol.quantrivanphong.report.issue.common.AbstractDaoPage;
+import com.itsol.quantrivanphong.report.issue.common.WrapperResult;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -13,22 +18,13 @@ import java.util.List;
 @Service
 public class ProjectBussinessImpl implements ProjectBussiness {
     private Logger logger = Logger.getLogger(ProjectBussinessImpl.class);
-    private String views = "";
     @Autowired
     private ProjectRepository projectRepository;
 
-    @Override
-    public List<ProjectDTO> findProjectPage(String property, Object value, String sortExperssion, String sortDirection, Integer offset, Integer limit) {
-        List<ProjectDTO> projectDTOList = new ArrayList<ProjectDTO>();
-        Object[] objects = projectRepository.getEntityPage(property,value,sortExperssion,sortDirection,offset,limit);
-        projectDTOList = lstDTO((List<Project>) objects[1]);
-        return projectDTOList;
-    }
-
     @Override
     public List<ProjectDTO> findAllProject() {
         try {
-            return lstDTO(projectRepository.finAllEntity());
+            return lstDTO(projectRepository.findAll());
         } catch (Exception e) {
             logger.info("Lỗi findAll " + e.getMessage());
         }
@@ -36,17 +32,22 @@ public class ProjectBussinessImpl implements ProjectBussiness {
     }
 
     @Override
-    public String updateProject(ProjectDTO dto) {
+    public WrapperResult updateProject(ProjectDTO dto) {
+        String views = null;
+        int status = 113;
         try {
             ProjectDTO projectDTO = findByProjectId(dto.getId());
+            dto.setStartDate(projectDTO.getStartDate());
+            dto.setEndDate(projectDTO.getEndDate());
             if (dto.getStartDate() == null) {
                 views = "ngày bắt đầu dự án không được null";
             } else if (dto.getEndDate() == null) {
                 views = "ngày dự kiếm kết thúc dự án không được null";
             } else if (projectDTO != null) {
-                ProjectDTO updateProject = modelparseDto(projectRepository.updateEntity(dtoParseModels(dto)));
+                ProjectDTO updateProject = modelparseDto(projectRepository.save(dtoParseModels(dto)));
                 if (updateProject != null) {
                     views = "sửa thành công project";
+                    status = 200;
                 }
             } else {
                 views = "không tìm thấy project phù hợp";
@@ -55,11 +56,14 @@ public class ProjectBussinessImpl implements ProjectBussiness {
             logger.info("Lỗi update" + e.getMessage());
             views = "lỗi update project";
         }
-        return views;
+        return new WrapperResult(status, views);
     }
 
     @Override
-    public String saveProject(ProjectDTO dto) {
+    public WrapperResult saveProject(ProjectDTO dto) {
+        String views = null;
+        int status = 113;
+        if (projectRepository.findByName(dto.getName()) == null) {
             try {
                 if (dto.getStartDate() == null) {
                     views = "ngày bắt đầu dự án không được null";
@@ -67,20 +71,29 @@ public class ProjectBussinessImpl implements ProjectBussiness {
                     views = "ngày dự kiếm kết thúc dự án không được null";
                 } else {
                     dto.setStatus(0);
-                projectRepository.saveEntity(dtoParseModels(dto));
+//                projectRepository.saveEntity(dtoParseModels(dto));
+                    ProjectDTO saveProject = modelparseDto(projectRepository.save(dtoParseModels(dto)));
+                    if (saveProject != null) {
                         views = "thêm thành công project !";
+                        status = 200;
+                    } else {
+                        views = "thêm project không thành công!";
+                    }
                 }
             } catch (Exception e) {
                 logger.info("Lỗi insert " + e.getMessage());
-            views = "thêm project không thành công!";
+                views = "Lỗi thêm dữ liệu";
+            }
+        } else {
+            views = "Đã tồn tại Dự Án";
         }
-        return views;
+        return new WrapperResult(status, views);
     }
 
     @Override
     public ProjectDTO findByProjectId(Integer id) {
         try {
-            ProjectDTO projectDTO = modelparseDto(projectRepository.findByEmtityId(id));
+            ProjectDTO projectDTO = modelparseDto(projectRepository.findProjectById(id));
             if (projectDTO != null) {
                 return projectDTO;
             }
@@ -90,30 +103,48 @@ public class ProjectBussinessImpl implements ProjectBussiness {
         return null;
     }
 
-
     @Override
-    public String deleteProject(Integer[] ids) {
-        int count = 0;
-        count = projectRepository.deleteEntity(ids);
-        if (count != 0) {
-            views = "xóa thành công " + count + " project";
+    public WrapperResult deleteProjectById(Integer id) {
+        String views = null;
+        int status = 113;
+        logger.info("deleteProjectById");
+        if (findByProjectId(id) != null) {
+            try {
+                projectRepository.deleteById(id);
+                views = "xóa thành công project";
+                status = 200;
+            } catch (Exception e) {
+                logger.info("lỗi :" + e.getMessage());
+                views = "Lỗi xóa";
+            }
         } else {
-            views = "project không tồn tại";
+            views = "dự án không tồn tại không tồn tại";
         }
-        return views;
+        return new WrapperResult(status, views);
     }
 
     @Override
-    public String deleteProjectById(Integer id) {
-        logger.info("deleteProjectById");
-        int count = 0;
-        count = projectRepository.deleteEntityByID(id);
-        if (count != 0) {
-            views = "xóa thành công " + count + " project";
+    public AbstractDaoPage<ProjectDTO> getPageProject(int page, int pageSize) {
+        AbstractDaoPage<ProjectDTO> abstractDaoPage = new AbstractDaoPage<ProjectDTO>();
+        List<Project> lstM = getListPage(page,pageSize);
+        List<ProjectDTO> listDTO = lstDTO(lstM);
+        abstractDaoPage.setLstResult(listDTO);
+        abstractDaoPage.setPage(page);
+        abstractDaoPage.setMaxPageItem(pageSize);
+        abstractDaoPage.setTotalItem(findAllProject().size());
+        abstractDaoPage.setTotalPage((int)Math.ceil((double) abstractDaoPage.getTotalItem()/abstractDaoPage.getMaxPageItem()));
+        return abstractDaoPage;
+    }
+
+    public List<Project> getListPage(int page, int pageSize) {
+        Pageable paging = PageRequest.of(page,pageSize);
+        Page<Project> pagedResult = projectRepository.findAll(paging);
+
+        if(pagedResult.hasContent()) {
+            return pagedResult.getContent();
         } else {
-            views = "project không tồn tại";
+            return new ArrayList<Project>();
         }
-        return views;
     }
 
     public List<ProjectDTO> lstDTO(List<Project> lstModels) {

src/main/java/com/itsol/quantrivanphong/manager/project/project/controller/ProjectController.java

@@ -3,6 +3,7 @@ package com.itsol.quantrivanphong.manager.project.project.controller;
 import com.itsol.quantrivanphong.manager.project.project.bussiness.ProjectBussiness;
 import com.itsol.quantrivanphong.manager.project.project.dto.ProjectDTO;
 import com.itsol.quantrivanphong.report.issue.common.SystemConstants;
+import com.itsol.quantrivanphong.report.issue.common.WrapperResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -17,74 +18,32 @@ public class ProjectController {
     @Autowired
     private ProjectBussiness projectBussiness;
 
-    @GetMapping(value = "/danh-sach-du-an/{offset}/{limit}")
-    public ResponseEntity<List<ProjectDTO>> getProjectPage(@PathVariable("offset") Integer offset,@PathVariable("limit") Integer limit){
-        return ResponseEntity.ok(projectBussiness.findProjectPage(null,null,null,null,offset,limit));
-    }
-
     @GetMapping(value = "/danh-sach-du-an")
     public ResponseEntity<List<ProjectDTO>> getAllProject(){
         return ResponseEntity.ok(projectBussiness.findAllProject());
     }
+    @GetMapping(value = "/danh-sach-du-an/{page}/{pageSize}")
+    public ResponseEntity getPageProject(@PathVariable("page") int page, @PathVariable("pageSize") int pageSize){
+        return ResponseEntity.ok(projectBussiness.getPageProject(page,pageSize));
+    }
     @GetMapping(value = "/chi-tiet-du-an/{id}",produces = SystemConstants.TYPE_JSON)
-    public ResponseEntity<ProjectDTO> findProjectId(@PathVariable Integer id){
+    public ResponseEntity findProjectId(@PathVariable Integer id){
         ProjectDTO projectDTO = projectBussiness.findByProjectId(id);
         return ResponseEntity.ok(projectDTO);
     }
     @PostMapping(value = "/them-du-an",consumes = SystemConstants.TYPE_JSON)
     public ResponseEntity saveProject(@RequestBody ProjectDTO projectDTO){
-        String views = projectBussiness.saveProject(projectDTO);
-        return ResponseEntity.ok(new WrapperResult(200, views));
+        WrapperResult wrapperResult = projectBussiness.saveProject(projectDTO);
+        return ResponseEntity.ok(wrapperResult);
     }
     @PutMapping(value = "/sua-du-an",consumes = SystemConstants.TYPE_JSON)
     public ResponseEntity updateProject(@RequestBody ProjectDTO projectDTO){
-        String views = projectBussiness.updateProject(projectDTO);
-        return ResponseEntity.ok(new WrapperResult(200, views));
-    }
-    @DeleteMapping(value = "/xoa-danh-sach-du-an",consumes = SystemConstants.TYPE_JSON)
-    public ResponseEntity deleteProject(@RequestBody ProjectDTO projectDTO){
-        String views ="";
-        if(projectDTO.getIds()!=null){
-         views = projectBussiness.deleteProject(projectDTO.getIds());
-        }else{
-            views="không tồn tại";
-        }
-        return ResponseEntity.ok(views);
+        WrapperResult wrapperResult = projectBussiness.updateProject(projectDTO);
+        return ResponseEntity.ok(wrapperResult);
     }
     @DeleteMapping(value = "/xoa-du-an",consumes = SystemConstants.TYPE_JSON)
     public ResponseEntity deleteProjectById(@RequestBody ProjectDTO projectDTO){
-        String views ="";
-        if(projectDTO.getId()!=null){
-            views = projectBussiness.deleteProjectById(projectDTO.getId());
-        }else{
-            views="không tồn tại";
-        }
-        return ResponseEntity.ok(new WrapperResult(200, views));
-    }
-
-    static class WrapperResult{
-        private int status;
-        private String message;
-
-        public int getStatus() {
-            return status;
-        }
-
-        public void setStatus(int status) {
-            this.status = status;
-        }
-
-        public String getMessage() {
-            return message;
-        }
-
-        public void setMessage(String message) {
-            this.message = message;
-        }
-
-        public WrapperResult(int status, String message) {
-            this.status = status;
-            this.message = message;
-        }
+            WrapperResult wrapperResult = projectBussiness.deleteProjectById(projectDTO.getId());
+        return ResponseEntity.ok(wrapperResult);
     }
 }

src/main/java/com/itsol/quantrivanphong/manager/project/project/repository/ProjectRepository.java

 package com.itsol.quantrivanphong.manager.project.project.repository;
 
-import com.itsol.quantrivanphong.report.issue.common.GennericeEntityManagerDao;
 import com.itsol.quantrivanphong.model.Project;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ProjectRepository extends JpaRepository<Project,Integer> {
+    Project findProjectById(Integer id);
+    Project findProjectByName(String nameProject);
+    Project findByName(String nameProject);
     
-public interface ProjectRepository extends GennericeEntityManagerDao<Integer, Project> {
 }

src/main/java/com/itsol/quantrivanphong/manager/project/project/repository/ProjectRepositoryImpl.java

-package com.itsol.quantrivanphong.manager.project.project.repository;
-
-import com.itsol.quantrivanphong.report.issue.common.AbstractEntityManagerDao;
-import com.itsol.quantrivanphong.model.Project;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class ProjectRepositoryImpl extends AbstractEntityManagerDao<Integer, Project> implements ProjectRepository{
-}

src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/bussiness/ProjectGroupBussiness.java

 package com.itsol.quantrivanphong.manager.project.projectgroup.bussiness;
 
 import com.itsol.quantrivanphong.manager.project.projectgroup.dto.ProjectGroupDTO;
+import com.itsol.quantrivanphong.report.issue.common.WrapperResult;
 
 import java.util.List;
 
 public interface ProjectGroupBussiness {
-//    chi tiết nhóm dự án
+    //    chi tiết nhóm dự án
     List<ProjectGroupDTO> getGroupByProjectId(Integer projectId);
-//    thêm thành viên vào nhóm dự án
-    String saveEmployeeProject(ProjectGroupDTO dto);
-//    sửa thông tin nhóm dự án, các thành viên out nhóm
-    String updateEmployeeProject(ProjectGroupDTO dto);
-//    Tìm kiếm thành viên trong nhóm theo tên đăng nhập
-    ProjectGroupDTO findEmployeeProject(String username);
-//    thành viên out dự án
-    String outProjectGroup(Integer[]ids);
-// thành viên out dự án
-    String deleteEmployeeProject(Integer id);
+
+    //    thêm thành viên vào nhóm dự án
+    WrapperResult saveEmployeeProject(ProjectGroupDTO dto);
+
+    //    sửa thông tin nhóm dự án, các thành viên out nhóm
+    WrapperResult updateEmployeeProject(ProjectGroupDTO dto);
+
+    // thành viên out dự án
+    WrapperResult deleteEmployeeProject(Integer id);
+
+    WrapperResult updateEmployeeOutGroup(ProjectGroupDTO dto);
+
+    ProjectGroupDTO findEmployeeProjectById(Integer id);
 }

src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/bussiness/ProjectGroupBussinessImpl.java

 package com.itsol.quantrivanphong.manager.project.projectgroup.bussiness;
 
 import com.itsol.quantrivanphong.manager.project.project.repository.ProjectRepository;
-import com.itsol.quantrivanphong.manager.project.projectgroup.common.EmployeeRepositoryImpl;
+import com.itsol.quantrivanphong.manager.project.projectgroup.common.EmployeeProject;
 import com.itsol.quantrivanphong.manager.project.projectgroup.common.ProjectGroupUtils;
 import com.itsol.quantrivanphong.manager.project.projectgroup.dto.ProjectGroupDTO;
 import com.itsol.quantrivanphong.manager.project.projectgroup.repository.ProjectGroupRepository;
+import com.itsol.quantrivanphong.model.Employee;
 import com.itsol.quantrivanphong.model.Eproject;
-import com.itsol.quantrivanphong.model.Project;
+import com.itsol.quantrivanphong.report.issue.common.WrapperResult;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.sql.Timestamp;
 import java.util.List;
 
 @Service
 public class ProjectGroupBussinessImpl implements ProjectGroupBussiness {
-    Logger logger = Logger.getLogger(ProjectGroupBussinessImpl.class);
+    private Logger logger = Logger.getLogger(ProjectGroupBussinessImpl.class);
+
     @Autowired
     private ProjectGroupRepository projectGroupRepository;
 
@@ -23,94 +26,127 @@ public class ProjectGroupBussinessImpl implements ProjectGroupBussiness {
     private ProjectRepository projectRepository;
 
     @Autowired
-    private EmployeeRepositoryImpl employeeRepository;
+    private ProjectGroupUtils utils;
 
     @Autowired
-    private ProjectGroupUtils utils;
+    private EmployeeProject employeeProject;
 
     @Override
     public List<ProjectGroupDTO> getGroupByProjectId(Integer projectId) {
         logger.info("getGroupByProjectId");
-        Project project = projectRepository.findByEmtityId(projectId);
-        if (project != null) {
-            List<Eproject> lstModels = projectGroupRepository.finByProperty("project", project, "joinDate", "DESC");
+        List<Eproject> lstModels = projectGroupRepository.findByProjectId(projectId);
         List<ProjectGroupDTO> lstDTO = utils.getListDTO(lstModels);
         return lstDTO;
     }
-        return null;
-    }
-    public boolean checkEmployeeInGroupProject(ProjectGroupDTO dto){
-        List<Eproject> lst = projectGroupRepository.finByProperty("project",projectRepository.findByEmtityId(dto.getProjectId()),null,null);
-        for (Eproject eproject:lst) {
-            if(eproject.getEmployee().getId()==dto.getUserId()){
+
+    public boolean checkEmployeeInGroupProject(ProjectGroupDTO dto) {
+            if (dto.getProjectId()!=null) {
+                List<Eproject> lst = projectGroupRepository.findByProjectId(dto.getProjectId());
+                for (Eproject eproject : lst) {
+                    if (eproject.getEmployee().getUsername().equals(dto.getUserName())) {
                         return true;
                     }
                 }
+            }
         return false;
     }
+
     @Override
-    public String saveEmployeeProject(ProjectGroupDTO dto) {
-        logger.info("saveEmployeeProject");
+    public WrapperResult saveEmployeeProject(ProjectGroupDTO dto) {
         String views = "";
-        if(!checkEmployeeInGroupProject(dto)) {
+        int status = 113;
+        logger.info("saveEmployeeProject");
+        Employee employee = employeeProject.findByUsername(dto.getUserName());
+        if (employee == null) {
+            views = "Nhân viên không tồn tại !";
+        } else if (!checkEmployeeInGroupProject(dto)) {
             try {
-                projectGroupRepository.saveEntity(utils.Model(dto));
+                dto.setStatus(1);
+                dto.setUserId(employee.getId());
+                dto.setJoinDate(new Timestamp(System.currentTimeMillis()));
+                Eproject eproject = projectGroupRepository.save(utils.Model(dto));
+                if (eproject != null) {
                     views = "thêm thành công nhân viên vào nhóm dự án";
-            } catch (Exception e) {
+                    status = 200;
+                } else {
                     views = "thêm không thành công!";
                 }
-        }else {
+            } catch (Exception e) {
+                logger.info("Lỗi " + e.getMessage());
+            }
+        } else {
+            status = 113;
             views = "thành viên đã tồn tại";
         }
-        return views;
+        return new WrapperResult(status, views);
     }
 
     @Override
-    public String updateEmployeeProject(ProjectGroupDTO dto) {
+    public WrapperResult updateEmployeeProject(ProjectGroupDTO dto) {
+        String views = "";
+        int status = 113;
         logger.info("updateEmployeeProject");
-        String views="";
-        Eproject eproject = projectGroupRepository.findByEmtityId(dto.getId());
-        if(eproject!=null){
-            Eproject updateProjectGroup = projectGroupRepository.updateEntity(utils.Model(dto));
-            if(updateProjectGroup!=null){
-                views = "Sửa thành công";
-            }
-        }else{
+
+        Eproject eproject = projectGroupRepository.findEprojectById(dto.getId());
+        if (eproject != null) {
+            eproject.setPosition(dto.getPosition());
+            Eproject updateProjectGroup = projectGroupRepository.save(eproject);
+            if (updateProjectGroup != null) {
+                views = "cập nhật chức vụ thành viên thành công";
+                status = 200;
+            }
+        } else {
             views = "đối tượng không tồn tại";
         }
-        return null;
+
+        return new WrapperResult(status, views);
     }
 
     @Override
-    public ProjectGroupDTO findEmployeeProject(String username) {
+    public ProjectGroupDTO findEmployeeProjectById(Integer id) {
+        try {
+            ProjectGroupDTO projectGroupDTO = utils.DTO(projectGroupRepository.findEprojectById(id));
+            if (projectGroupDTO != null) {
+                return projectGroupDTO;
+            }
+        } catch (Exception e) {
+            logger.info("Lỗi update EProject " + e.getMessage());
+        }
         return null;
     }
 
     @Override
-    public String outProjectGroup(Integer[] ids) {
-        logger.info("outProjectGroup");
+    public WrapperResult deleteEmployeeProject(Integer id) {
         String views = "";
-        int count=0;
-        count = projectGroupRepository.deleteEntity(ids);
-        if(count!=0){
-            views="Bạn đã cho "+count+" thoát ra khỏi nhóm";
-        }else{
-            views=" thành viên không tồn tại";
+        int status = 113;
+        logger.info("deleteEmployeeProject");
+        if (projectGroupRepository.findEprojectById(id) != null) {
+            projectGroupRepository.deleteById(id);
+            views = "Bạn đã cho thoát ra khỏi nhóm";
+            status = 200;
+        } else {
+            views = "Thành viên không tồn tại trong nhóm";
         }
-        return views;
+        return new WrapperResult(status, views);
     }
 
     @Override
-    public String deleteEmployeeProject(Integer id) {
-        logger.info("deleteEmployeeProject");
+    public WrapperResult updateEmployeeOutGroup(ProjectGroupDTO dto) {
         String views = "";
-        int count=0;
-        count = projectGroupRepository.deleteEntityByID(id);
-        if(count!=0){
-            views="Bạn đã cho "+count+" thoát ra khỏi nhóm";
-        }else{
-            views=" thành viên không tồn tại";
-        }
-        return views;
+        int status = 113;
+        logger.info("updateEmployeeOutGroup");
+        Eproject eproject = projectGroupRepository.findEprojectById(dto.getId());
+        if (eproject != null) {
+            eproject.setStatus(2);
+            eproject.setOutDate(new Timestamp(System.currentTimeMillis()));
+            Eproject updateProjectGroup = projectGroupRepository.save(eproject);
+            if (updateProjectGroup != null) {
+                views = "thành viên đã out nhóm";
+                status = 200;
+            }
+        } else {
+            views = "đối tượng không tồn tại";
+        }
+        return new WrapperResult(status, views);
     }
 }

src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/common/EmployeeProject.java

+package com.itsol.quantrivanphong.manager.project.projectgroup.common;
+
+import com.itsol.quantrivanphong.model.Employee;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface EmployeeProject extends JpaRepository<Employee,Integer> {
+    Employee findEmployeeById(Integer employeeId);
+    Employee findByUsername(String username);
+}

src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/common/EmployeeRepositoryImpl.java

-package com.itsol.quantrivanphong.manager.project.projectgroup.common;
-
-import com.itsol.quantrivanphong.model.Employee;
-import com.itsol.quantrivanphong.report.issue.common.AbstractEntityManagerDao;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Service;
-
-
-
-@Service
-public class EmployeeRepositoryImpl extends AbstractEntityManagerDao<Integer, Employee> {
-    private Logger logger = Logger.getLogger(EmployeeRepositoryImpl.class);
-
-    public Employee getEmployeeById(Integer employeeId) {
-        try {
-            Employee employee = findByEmtityId(employeeId);
-            if (employee != null) {
-                return employee;
-            }
-        } catch (Exception e) {
-            logger.info("( Lỗi tìm employee theo ID: )" + e.getMessage());
-        }
-        return null;
-    }
-}

src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/common/ProjectGroupUtils.java

 package com.itsol.quantrivanphong.manager.project.projectgroup.common;
 
 import com.itsol.quantrivanphong.access.login.dto.EmployeeDTO;
-import com.itsol.quantrivanphong.model.Employee;
 import com.itsol.quantrivanphong.manager.project.project.dto.ProjectDTO;
-import com.itsol.quantrivanphong.model.Project;
 import com.itsol.quantrivanphong.manager.project.project.repository.ProjectRepository;
 import com.itsol.quantrivanphong.manager.project.projectgroup.dto.ProjectGroupDTO;
+import com.itsol.quantrivanphong.model.Employee;
 import com.itsol.quantrivanphong.model.Eproject;
+import com.itsol.quantrivanphong.model.Project;
 import org.apache.log4j.Logger;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +18,7 @@ import java.util.List;
 public class ProjectGroupUtils {
     private static Logger logger = Logger.getLogger(ProjectGroupUtils.class);
     @Autowired
-    private  EmployeeRepositoryImpl employeeRepository;
+    private  EmployeeProject employeeRepository;
     @Autowired
     private ProjectRepository projectRepository;
 
@@ -29,8 +29,9 @@ public class ProjectGroupUtils {
         model.setJoinDate(dto.getJoinDate());
         model.setOutDate(dto.getOutDate());
         model.setPosition(dto.getPosition());
+        model.setStatus(dto.getStatus());
         try{
-            Employee findEmployee = employeeRepository.getEmployeeById(dto.getUserId());
+            Employee findEmployee = employeeRepository.findEmployeeById(dto.getUserId());
             if(findEmployee!=null){
                model.setEmployee(findEmployee);
             }
@@ -38,7 +39,7 @@ public class ProjectGroupUtils {
             logger.info("(Lỗi không tìm thấy Employee) "+e.getMessage());
         }
         try{
-            Project project = projectRepository.findByEmtityId(dto.getProjectId());
+            Project project = projectRepository.findProjectById(dto.getProjectId());
             if(project!=null){
                 model.setProject(project);
             }

src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/controller/ProjectGroupController.java

@@ -2,13 +2,11 @@ package com.itsol.quantrivanphong.manager.project.projectgroup.controller;
 
 import com.itsol.quantrivanphong.manager.project.projectgroup.bussiness.ProjectGroupBussiness;
 import com.itsol.quantrivanphong.manager.project.projectgroup.dto.ProjectGroupDTO;
-import com.itsol.quantrivanphong.report.issue.common.SystemConstants;
+import com.itsol.quantrivanphong.report.issue.common.WrapperResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 @RestController
 public class ProjectGroupController {
 
@@ -17,64 +15,40 @@ public class ProjectGroupController {
 
     //    thông tin của 1 nhóm dư án theo id của dự án
 //    Team lead,Hr
-    @GetMapping(value = "/thong-tin-du-an/{id}", produces = SystemConstants.TYPE_JSON)
-    public ResponseEntity<List<ProjectGroupDTO>> getOneProjectGroup(@PathVariable("id") Integer projectId) {
+    @GetMapping(value = "/thong-tin-du-an/{id}")
+    public ResponseEntity getOneProjectGroup(@PathVariable("id") Integer projectId) {
         return ResponseEntity.ok(projectGroupBussiness.getGroupByProjectId(projectId));
     }
 
+
+    @GetMapping(value = "/chi-tiet-thanh-vien-du-an/{id}")
+    public ResponseEntity getOneEmployeeProject(@PathVariable("id") Integer employeeProjectId) {
+        return ResponseEntity.ok(projectGroupBussiness.findEmployeeProjectById(employeeProjectId));
+    }
+
     //    thêm thành viên vào dự án
 //    hr,manager, teamlead thêm thành viên
-    @PostMapping(value = "/them-thanh-vien", consumes = SystemConstants.TYPE_JSON, produces = SystemConstants.TYPE_JSON)
+    @PostMapping(value = "/them-thanh-vien")
     public ResponseEntity addMemberProject(@RequestBody ProjectGroupDTO projectGroupDTO) {
-        String views = projectGroupBussiness.saveEmployeeProject(projectGroupDTO);
-        return ResponseEntity.ok(new WrapperResult(200, views));
+        WrapperResult wrapperResult = projectGroupBussiness.saveEmployeeProject(projectGroupDTO);
+        return ResponseEntity.ok(wrapperResult);
     }
 
     //    cập nhật thông tin thành viên
 //    manager cập nhật chức vụ cho nhân viên vào xét duyệt vào dự án
-    @PutMapping(value = "/cap-nhat-thong-tin-thanh-vien",consumes = SystemConstants.TYPE_JSON, produces = SystemConstants.TYPE_JSON)
-    public ResponseEntity updateMemberProject(@RequestBody ProjectGroupDTO projectGroupDTO) {
-        String views = projectGroupBussiness.updateEmployeeProject(projectGroupDTO);
-        return ResponseEntity.ok(views);
+    @PutMapping(value = "/cap-nhat-chuc-vu-thanh-vien")
+    public ResponseEntity updatePositionProject(@RequestBody ProjectGroupDTO projectGroupDTO) {
+        WrapperResult wrapperResult = projectGroupBussiness.updateEmployeeProject(projectGroupDTO);
+        return ResponseEntity.ok(wrapperResult);
     }
-
-
-//    xóa thành viên ra khỏi dự án
-    @DeleteMapping(value = "/thanh-vien-out-du-an")
-    public ResponseEntity deleteMembersProject(@RequestBody ProjectGroupDTO projectGroupDTO){
-        String views = projectGroupBussiness.outProjectGroup(projectGroupDTO.getIds());
-        return ResponseEntity.ok(views);
+    @PutMapping(value = "/thanh-vien-out-nhom")
+    public ResponseEntity updateMemberOutProject(@RequestBody ProjectGroupDTO projectGroupDTO) {
+        WrapperResult wrapperResult = projectGroupBussiness.updateEmployeeOutGroup(projectGroupDTO);
+        return ResponseEntity.ok(wrapperResult);
     }
-
     @DeleteMapping(value = "/xoa-thanh-vien-du-an")
     public ResponseEntity deleteMemberProject(@RequestBody ProjectGroupDTO projectGroupDTO){
-        String views = projectGroupBussiness.deleteEmployeeProject(projectGroupDTO.getId());
-        return ResponseEntity.ok(new WrapperResult(200, views));
-    }
-
-    static class WrapperResult{
-        private int status;
-        private String message;
-
-        public int getStatus() {
-            return status;
-        }
-
-        public void setStatus(int status) {
-            this.status = status;
-        }
-
-        public String getMessage() {
-            return message;
-        }
-
-        public void setMessage(String message) {
-            this.message = message;
-        }
-
-        public WrapperResult(int status, String message) {
-            this.status = status;
-            this.message = message;
-        }
+        WrapperResult wrapperResult = projectGroupBussiness.deleteEmployeeProject(projectGroupDTO.getId());
+        return ResponseEntity.ok(wrapperResult);
     }
 }

src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/dto/ProjectGroupDTO.java

@@ -19,11 +19,11 @@ public class ProjectGroupDTO {
     private Timestamp joinDate;
     // ngày ra dự án
     private Timestamp outDate;
-
+    private int status;
     private Integer userId;
     private Integer projectId;
+    private String userName;
+    private String nameProject;
     private EmployeeDTO employeeDTO;
     private ProjectDTO projectDTO;
-
-    private Integer[]ids;
 }

src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/repository/ProjectGroupRepository.java

 package com.itsol.quantrivanphong.manager.project.projectgroup.repository;
 
-import com.itsol.quantrivanphong.report.issue.common.GennericeEntityManagerDao;
 import com.itsol.quantrivanphong.model.Eproject;
+import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface ProjectGroupRepository extends GennericeEntityManagerDao<Integer, Eproject> {
+import java.util.List;
+
+public interface ProjectGroupRepository extends JpaRepository<Eproject,Integer> {
+    List<Eproject> findByProjectId(Integer projectId);
+    Eproject findEprojectById(Integer eProjectId);
 }

src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/repository/ProjectGroupRepositoryImpl.java

-package com.itsol.quantrivanphong.manager.project.projectgroup.repository;
-
-import com.itsol.quantrivanphong.report.issue.common.AbstractEntityManagerDao;
-import com.itsol.quantrivanphong.model.Eproject;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class ProjectGroupRepositoryImpl extends AbstractEntityManagerDao<Integer, Eproject> implements ProjectGroupRepository {
-}

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

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

src/main/java/com/itsol/quantrivanphong/model/Catalogi.java

 package com.itsol.quantrivanphong.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.itsol.quantrivanphong.audit.DateAudit;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 
 @Entity
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@EntityListeners(AuditingEntityListener.class)
-@JsonIgnoreProperties(value = {"createdAt", "updatedAt"},
-        allowGetters = true)
+
 
 @Table(name = "catalogi")
-public class Catalogi extends DateAudit {
+public class Catalogi {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -37,8 +29,10 @@ public class Catalogi extends DateAudit {
     @Column(name = "descriptions")
     private  String descriptions;
 
+
     @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "catalogi")
     private List<News> news = new ArrayList<>();
 
 
+
 }

src/main/java/com/itsol/quantrivanphong/model/Eproject.java

@@ -21,25 +21,27 @@ public class Eproject {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id", nullable = false, unique = true)
     private int id;
-// chức vụ trong project
+    // chức vụ trong project
     @Column(name = "position", nullable = false)
     private String position;
-//ngày vào dự án
+    //ngày vào dự án
     @Column(name = "join_date",nullable =false)
     private Timestamp joinDate;
-// ngày ra dự án
+    // ngày ra dự án
     @Column(name = "out_date",nullable = true)
     private Timestamp outDate;
 
-    @JsonIgnore
+    @Column(name = "status",nullable = false)
+    private int status;
+
     @ManyToOne(fetch = FetchType.EAGER)
     private Employee employee;
 
-    @JsonIgnore
     @ManyToOne(fetch = FetchType.EAGER)
     private Project project;
 
     @JsonIgnore
     @OneToMany(mappedBy = "eproject", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     private List<TimeSheet> timeSheetList  = new ArrayList<>();
+
 }

src/main/java/com/itsol/quantrivanphong/model/Issues.java

 package com.itsol.quantrivanphong.model;
 
-import com.itsol.quantrivanphong.model.Project;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
 @Table(name = "issues")
+
 public class Issues {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id", nullable = false, unique = true)
-    private int id;
-// tiêu đề liên quan
+    private Integer id;
+    // tiêu đề liên quan
     @Column(name = "title")
     private String title;
-//nội dung
+    //nội dung
     @Column(name = "content")
     private String actionCode;
-// trạng thái vấn đề đó trong project
+    // trạng thái vấn đề đó trong project
     @Column(name = "status")
-    private boolean status;
+    private int status;
+
+    @Column(name = "startdate")
+    private Timestamp startDate;
 
     @ManyToOne(fetch = FetchType.EAGER)
     private Project project;
+
+    @JsonIgnore
+    @OneToMany(mappedBy = "issues", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+    private List<IssuesComment> issuesCommentList  = new ArrayList<>();
+
 }

src/main/java/com/itsol/quantrivanphong/model/IssuesComment.java

+package com.itsol.quantrivanphong.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Table(name = "issuescomment")
+public class IssuesComment {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false, unique = true)
+    private Integer id;
+    //nội dung
+    @Column(name = "content")
+    private String contentIssuse;
+
+    @Column(name = "usercreate")
+    private String userCreate;
+
+    @Column(name = "createdate")
+    private Timestamp createDate;
+
+    @ManyToOne(fetch = FetchType.EAGER)
+    private Issues issues;
+
+}

src/main/java/com/itsol/quantrivanphong/model/LeaveType.java

@@ -2,6 +2,7 @@ package com.itsol.quantrivanphong.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -14,6 +15,7 @@ import java.util.List;
 @NoArgsConstructor
 @Entity
 @Table(name = "leave_type")
+@Builder
 public class LeaveType {
 
     @Id

src/main/java/com/itsol/quantrivanphong/model/News.java

@@ -17,7 +17,7 @@ import javax.persistence.*;
 @AllArgsConstructor
 @NoArgsConstructor
 @EntityListeners(AuditingEntityListener.class)
-@JsonIgnoreProperties(value = {"createdAt", "updatedAt"},allowGetters = true)
+@JsonIgnoreProperties(value = {"createdAt", "updatedAt"}, allowGetters = true)
 @Table(name = "news")
 public class News extends DateAudit {
 
@@ -47,12 +47,10 @@ public class News extends DateAudit {
     @JsonIgnore
     private Catalogi catalogi;
 
-    @ManyToOne(fetch = FetchType.LAZY, optional = false)
-    @JoinColumn(name = "user_id", nullable = false)
-    @OnDelete(action = OnDeleteAction.CASCADE)
-    @JsonIgnore
-    private  Employee employee;
 
+    @ManyToOne(fetch = FetchType.EAGER)
+
+    private Employee employee;
 
 
 }

src/main/java/com/itsol/quantrivanphong/model/Project.java

@@ -18,25 +18,26 @@ import java.util.List;
 @Table(name = "project")
 public class Project {
 
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id", nullable = false, unique = true)
     private Integer id;
 
 
-//    tên project
+    //    tên project
     @Column(name = "name", nullable = false)
     private String name;
-//mô tả ngắn
+    //mô tả ngắn
     @Column(name = "descriptions")
     private String descriptions;
-//ngày bắt đầu của dự án
+    //ngày bắt đầu của dự án
     @Column(name = "start_date", nullable = false)
     private Timestamp startDate;
-//ngày kết thúc dự án
+    //ngày kết thúc dự án
     @Column(name = "end_date")
     private Timestamp endDate;
-//trạng thái
+    //trạng thái
     @Column(name = "status",nullable = false)
     private Integer status;
 

src/main/java/com/itsol/quantrivanphong/report/issue/bussiness/IssueBussinesImpl.java

+package com.itsol.quantrivanphong.report.issue.bussiness;
+
+import com.itsol.quantrivanphong.manager.project.project.repository.ProjectRepository;
+import com.itsol.quantrivanphong.model.Issues;
+import com.itsol.quantrivanphong.report.issue.common.WrapperResult;
+import com.itsol.quantrivanphong.report.issue.dto.IssueDTO;
+import com.itsol.quantrivanphong.report.issue.repository.IssueRepository;
+import org.apache.log4j.Logger;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class IssueBussinesImpl implements IssueBussiness {
+
+    Logger logger = Logger.getLogger(IssueBussinesImpl.class);
+
+    @Autowired
+    private IssueRepository issueRepository;
+
+    @Autowired
+    private ProjectRepository projectRepository;
+
+    @Override
+    public List<Issues> getAllIssue() {
+        return issueRepository.findAll();
+    }
+
+    @Override
+    public WrapperResult saveIssue(IssueDTO issueDTO) {
+        String views = null;
+        int status = 113;
+        try {
+
+            issueDTO.setStatus(0);
+            issueDTO.setStartDate(new Timestamp(System.currentTimeMillis()));
+            Issues saveIssues = issueRepository.save(dtoParseModels(issueDTO));
+            if (saveIssues != null) {
+                views = "thêm thành công Issues !";
+                status = 200;
+            } else {
+                views = "thêm Issues không thành công!";
+            }
+        } catch (Exception e) {
+            logger.info("Lỗi insert " + e.getMessage());
+            views = "Lỗi thêm dữ liệu";
+        }
+        return new WrapperResult(status, views);
+    }
+
+    @Override
+    public WrapperResult updateIssue(IssueDTO issueDTO) {
+        String views = null;
+        int status = 113;
+        try {
+            Issues issues = issueRepository.findIssuesById(issueDTO.getId());
+            if (issues != null) {
+                if (issues.getStatus() == 0) {
+                    issues.setStatus(1);
+                }else{
+                    issues.setStatus(0);
+                }
+                Issues saveIssues = issueRepository.save(issues);
+                if (saveIssues != null) {
+                    views = "Cập nhật thành công Issues !";
+                    status = 200;
+                } else {
+                    views = "không thành công!";
+                }
+            } else {
+                views = "Issue không tồn tại!";
+            }
+        } catch (Exception e) {
+            logger.info("Lỗi Cập nhật " + e.getMessage());
+            views = "Lỗi Cập nhật dữ liệu";
+        }
+        return new WrapperResult(status, views);
+    }
+
+    @Override
+    public WrapperResult deleteIssue(IssueDTO issueDTO) {
+        String views = null;
+        int status = 113;
+        try {
+            Issues issues = issueRepository.findIssuesById(issueDTO.getId());
+            if (issues != null) {
+                issueRepository.deleteById(issueDTO.getId());
+                views = "Xóa thành công Issues !";
+                status = 200;
+            } else {
+                views = "Issue không tồn tại!";
+            }
+        } catch (Exception e) {
+            logger.info("Lỗi Delete " + e.getMessage());
+            views = "Lỗi xóa dữ liệu";
+        }
+        return new WrapperResult(status, views);
+    }
+
+    @Override
+    public Issues findIssueById(Integer id) {
+        return issueRepository.findIssuesById(id);
+    }
+
+    public IssueDTO modelsParseDTO(Issues models) {
+        IssueDTO issueDTO = new IssueDTO();
+        BeanUtils.copyProperties(models, issueDTO);
+        return issueDTO;
+    }
+
+    public Issues dtoParseModels(IssueDTO dto) {
+        Issues issues = new Issues();
+        BeanUtils.copyProperties(dto, issues);
+        issues.setProject(projectRepository.findProjectById(dto.getProjectId()));
+        return issues;
+    }
+
+    public List<IssueDTO> lstModel(List<Issues> lstModel) {
+        if (lstModel.size() != 0 && !lstModel.isEmpty()) {
+            List<IssueDTO> lstDTO = new ArrayList<IssueDTO>();
+            for (Issues issues : lstModel) {
+                lstDTO.add(modelsParseDTO(issues));
+            }
+            return lstDTO;
+        }
+        return null;
+    }
+}

src/main/java/com/itsol/quantrivanphong/report/issue/bussiness/IssueBussiness.java

+package com.itsol.quantrivanphong.report.issue.bussiness;
+
+import com.itsol.quantrivanphong.model.Issues;
+import com.itsol.quantrivanphong.report.issue.common.WrapperResult;
+import com.itsol.quantrivanphong.report.issue.dto.IssueDTO;
+
+import java.util.List;
+
+public interface IssueBussiness {
+    List<Issues> getAllIssue();
+    WrapperResult saveIssue(IssueDTO issueDTO);
+    WrapperResult updateIssue(IssueDTO issueDTO);
+    WrapperResult deleteIssue(IssueDTO issueDTO);
+    Issues findIssueById(Integer id);
+}

src/main/java/com/itsol/quantrivanphong/report/issue/common/AbstractDaoPage.java

+package com.itsol.quantrivanphong.report.issue.common;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AbstractDaoPage<T> {
+    private List<T> lstResult = new ArrayList<T>();
+    //    Số page đang đứng
+    private int page;
+    //    Tổng sô page trong 1 item
+    private Integer maxPageItem;
+    //    Tổng số page hiện tại
+    private int totalPage;
+    //    Tổng số item
+    private int totalItem;
+
+    private int Count;
+
+    public List<T> getLstResult() {
+        return lstResult;
+    }
+
+    public void setLstResult(List<T> lstResult) {
+        this.lstResult = lstResult;
+    }
+
+    public int getPage() {
+        return page;
+    }
+
+    public void setPage(int page) {
+        this.page = page;
+    }
+
+    public Integer getMaxPageItem() {
+        return maxPageItem;
+    }
+
+    public void setMaxPageItem(Integer maxPageItem) {
+        this.maxPageItem = maxPageItem;
+    }
+
+    public int getTotalPage() {
+        return totalPage;
+    }
+
+    public void setTotalPage(int totalPage) {
+        this.totalPage = totalPage;
+    }
+
+    public int getTotalItem() {
+        return totalItem;
+    }
+
+    public void setTotalItem(int totalItem) {
+        this.totalItem = totalItem;
+    }
+
+    public int getCount() {
+        return (lstResult!=null)?lstResult.size():0;
+    }
+}

src/main/java/com/itsol/quantrivanphong/report/issue/common/GennericeEntityManagerDao.java

-package com.itsol.quantrivanphong.report.issue.common;
-
-import java.io.Serializable;
-import java.util.List;
-
-public interface GennericeEntityManagerDao<ID extends Serializable,T> {
-    List<T> finAllEntity();
-    void saveEntity(T entity);
-    T updateEntity(T entity);
-    Integer deleteEntity(ID[] ids);
-    Integer deleteEntityByID(Integer id);
-    T findByEmtityId(ID id);
-    List<T> finByProperty(String property, Object value, String sortExperssion, String sortDirection);
-    Object[] getEntityPage(String property, Object value, String sortExperssion, String sortDirection,Integer offset, Integer limit);
-//    Integer getCount();
-}

src/main/java/com/itsol/quantrivanphong/report/issue/common/WrapperResultObject.java

+package com.itsol.quantrivanphong.report.issue.common;
+
+import java.util.List;
+
+public class WrapperResultObject {
+    private int status;
+    private String message;
+    private List<String> lstRole;
+    private String Role;
+
+    public String getRole() {
+        return Role;
+    }
+
+    public void setRole(String role) {
+        Role = role;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public List<String> getLstRole() {
+        return lstRole;
+    }
+
+    public void setLstRole(List<String> lstRole) {
+        this.lstRole = lstRole;
+    }
+
+    public WrapperResultObject(int status, String message, List<String> lstRole) {
+        this.status = status;
+        this.message = message;
+        this.lstRole = lstRole;
+    }
+
+    public WrapperResultObject(int status, String message, List<String> lstRole, String role) {
+        this.status = status;
+        this.message = message;
+        this.lstRole = lstRole;
+        Role = role;
+    }
+}

src/main/java/com/itsol/quantrivanphong/report/issue/controller/IssueController.java

+package com.itsol.quantrivanphong.report.issue.controller;
+
+import com.itsol.quantrivanphong.model.Issues;
+import com.itsol.quantrivanphong.report.issue.bussiness.IssueBussiness;
+import com.itsol.quantrivanphong.report.issue.common.WrapperResult;
+import com.itsol.quantrivanphong.report.issue.dto.IssueDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+public class IssueController {
+    @Autowired
+    private IssueBussiness issueBussiness;
+
+    @GetMapping(value = "/danh-sach-issues")
+    public ResponseEntity getAllIssue(){
+        return ResponseEntity.ok(issueBussiness.getAllIssue());
+    }
+    @GetMapping(value = "/chi-tiet-issues/{id}")
+    public ResponseEntity getIssueById(@PathVariable("id")Integer id){
+        Issues issues = issueBussiness.findIssueById(id);
+        if(issues!=null){
+            return ResponseEntity.ok(issues);
+        }
+        return ResponseEntity.ok("Issues không tồn tại");
+    }
+    @PostMapping(value = "/them-issues")
+    public ResponseEntity saveIssue(@RequestBody IssueDTO issueDTO){
+        WrapperResult wrapperResult = issueBussiness.saveIssue(issueDTO);
+        return ResponseEntity.ok(wrapperResult);
+    }
+    @PutMapping(value = "/sua-issues")
+    public ResponseEntity editIssue(@RequestBody IssueDTO issueDTO){
+        WrapperResult wrapperResult = issueBussiness.updateIssue(issueDTO);
+        return ResponseEntity.ok(wrapperResult);
+    }
+    @DeleteMapping(value = "/xoa-issues")
+    public ResponseEntity deleteIssue(@RequestBody IssueDTO issueDTO){
+        WrapperResult wrapperResult = issueBussiness.deleteIssue(issueDTO);
+        return ResponseEntity.ok(wrapperResult);
+    }
+}

src/main/java/com/itsol/quantrivanphong/report/issue/dto/IssueDTO.java

+package com.itsol.quantrivanphong.report.issue.dto;
+
+import com.itsol.quantrivanphong.manager.project.project.dto.ProjectDTO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.sql.Timestamp;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class IssueDTO {
+    private Integer id;
+    private String title;
+    private String actionCode;
+    private Timestamp startDate;
+    private int status;
+    private Integer projectId;
+    private ProjectDTO projectDTO;
+}

src/main/java/com/itsol/quantrivanphong/report/issue/repository/IssueRepository.java

 package com.itsol.quantrivanphong.report.issue.repository;
 
-import com.itsol.quantrivanphong.report.issue.common.GennericeEntityManagerDao;
 import com.itsol.quantrivanphong.model.Issues;
+import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface IssueRepository extends GennericeEntityManagerDao<Integer, Issues> {
+public interface IssueRepository extends JpaRepository<Issues, Integer> {
+    Issues findIssuesById(Integer id);
 }

src/main/java/com/itsol/quantrivanphong/report/issue/repository/IssueRepositoryImpl.java

-package com.itsol.quantrivanphong.report.issue.repository;
-
-import com.itsol.quantrivanphong.report.issue.common.AbstractEntityManagerDao;
-import com.itsol.quantrivanphong.model.Issues;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class IssueRepositoryImpl extends AbstractEntityManagerDao<Integer, Issues> implements IssueRepository{
-}

src/main/java/com/itsol/quantrivanphong/report/issue/test.java

-package com.itsol.quantrivanphong.report.issue;
-
-public class test {
-}

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

@@ -6,7 +6,7 @@ import com.itsol.quantrivanphong.model.LeaveForm;
 import com.itsol.quantrivanphong.model.LeaveType;
 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.report.leavetype.repository.LeaveTypeRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -135,4 +135,8 @@ public class LeaveFormBusiness {
     public LeaveForm showLeaveFormById(int id) {
         return leaveFormRepository.findLeaveFormById(id);
     }
+
+    public List<LeaveType> getLeaveTypeList() {
+        return leaveTypeRepository.findAll();
+    }
 }

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

 package com.itsol.quantrivanphong.report.leaveform.controller;
 
 import com.itsol.quantrivanphong.exception.InputException;
+import com.itsol.quantrivanphong.model.LeaveForm;
+import com.itsol.quantrivanphong.model.LeaveType;
 import com.itsol.quantrivanphong.report.leaveform.business.LeaveFormBusiness;
 import com.itsol.quantrivanphong.report.leaveform.dto.LeaveFormDTO;
-import com.itsol.quantrivanphong.model.LeaveForm;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -76,4 +76,9 @@ public class LeaveFormController {
     public ResponseEntity<LeaveForm> showLeaveFormById(@PathVariable int id) {
         return ResponseEntity.ok(leaveFormBusiness.showLeaveFormById(id));
     }
+
+    @GetMapping(path = "/leaveType/getAll")
+    public ResponseEntity<List<LeaveType>> getAllLeaveType() {
+        return ResponseEntity.ok(leaveFormBusiness.getLeaveTypeList());
+    }
 }

src/main/java/com/itsol/quantrivanphong/report/leavetype/business/LeaveTypeBusiness.java

+package com.itsol.quantrivanphong.report.leavetype.business;
+import com.itsol.quantrivanphong.model.LeaveType;
+import com.itsol.quantrivanphong.report.leavetype.dto.LeaveTypeDTO;
+import com.itsol.quantrivanphong.report.leavetype.repository.LeaveTypeRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+public class LeaveTypeBusiness {
+    @Autowired
+    LeaveTypeRepository leaveTypeRepository;
+
+    public String addLeaveType(LeaveTypeDTO leaveTypeDTO) {
+        String message;
+        LeaveType leaveType = leaveTypeRepository.save(LeaveType.builder()
+                .name(leaveTypeDTO.getName())
+                .descriptions(leaveTypeDTO.getDescriptions())
+                .status(true)
+                .build());
+        if (leaveType != null) {
+            message = "Insert leave type success";
+        } else {
+            message = "Insert leave type failed";
+        }
+        return message;
+    }
+
+    @Transactional
+    public String deleteLeaveType(int leaveTypeId) {
+        String message;
+        LeaveType leaveType = leaveTypeRepository.findLeaveTypeById(leaveTypeId);
+
+        if (leaveType != null) {
+            leaveTypeRepository.delete(leaveType);
+            if (leaveTypeRepository.findLeaveTypeById(leaveTypeId) != null) {
+                message = "Delete failed!";
+            } else {
+                message = "Delete success!";
+            }
+        } else {
+            message = "Leave Form does not exist";
+        }
+        return message;
+    }
+
+    @Transactional
+    public String updateLeaveType(LeaveTypeDTO leaveTypeDTO) {
+        String message;
+        LeaveType leaveType = leaveTypeRepository.findLeaveTypeById(leaveTypeDTO.getId());
+        if (leaveType != null) {
+                int i = leaveTypeRepository.updateLeaveType(leaveTypeDTO.getName(), leaveTypeDTO.getDescriptions(), leaveTypeDTO.getId());
+                if (i == 1) {
+                    message = "Update success";
+                } else {
+                    message = "Update failed";
+                }
+            } else {
+                message = "Leave Type does not exist";
+            }
+        return message;
+    }
+
+    public List<LeaveType> getLeaveTypeList() {
+        return leaveTypeRepository.findAll();
+    }
+}

src/main/java/com/itsol/quantrivanphong/report/leavetype/controller/LeaveTypeController.java

+package com.itsol.quantrivanphong.report.leavetype.controller;
+
+import com.itsol.quantrivanphong.exception.InputException;
+import com.itsol.quantrivanphong.model.LeaveType;
+import com.itsol.quantrivanphong.report.leaveform.controller.Notification;
+import com.itsol.quantrivanphong.report.leavetype.business.LeaveTypeBusiness;
+import com.itsol.quantrivanphong.report.leavetype.dto.LeaveTypeDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping(path = "/leavetype")
+public class LeaveTypeController {
+    @Autowired
+    LeaveTypeBusiness leaveTypeBusiness;
+
+    @PostMapping(path = "/add", consumes = "application/json", produces = "application/json")
+    public ResponseEntity addLeaveForm(@RequestBody LeaveTypeDTO leaveTypeDTO) {
+        String message;
+        try {
+            if (leaveTypeDTO.getName().trim().equals("")) throw new InputException("Tên không được để trống");
+            if (leaveTypeDTO.getDescriptions().trim().equals("")) throw new InputException("Mô tả không được để trống");
+            message = leaveTypeBusiness.addLeaveType(leaveTypeDTO);
+        } catch (InputException e) {
+            message = e.getMessage();
+        }
+
+        return ResponseEntity.ok(new Notification(200, message));
+    }
+
+    @DeleteMapping("/delete/{leaveTypeId}")
+    public ResponseEntity deleteLeaveForm(@PathVariable int leaveTypeId) {
+        return ResponseEntity.ok(new Notification(200, leaveTypeBusiness.deleteLeaveType(leaveTypeId)));
+    }
+
+    @PostMapping(path = "/update", consumes = "application/json", produces = "application/json")
+    public ResponseEntity updateLeaveForm(@RequestBody LeaveTypeDTO leaveTypeDTO) {
+        String message;
+
+        try {
+            if (leaveTypeDTO.getName().trim().equals("")) throw new InputException("Tiêu đề không được để trống");
+            if (leaveTypeDTO.getDescriptions().trim().equals("")) throw new InputException("Nội dung không được để trống");
+            message = leaveTypeBusiness.updateLeaveType(leaveTypeDTO);
+        } catch (InputException e) {
+            message = e.getMessage();
+        }
+
+        return ResponseEntity.ok(new Notification(200, message));
+    }
+
+    @GetMapping(path = "/getAll")
+    public ResponseEntity<List<LeaveType>> getAllLeaveType() {
+        return ResponseEntity.ok(leaveTypeBusiness.getLeaveTypeList());
+    }
+}

src/main/java/com/itsol/quantrivanphong/report/leavetype/dto/LeaveTypeDTO.java

+package com.itsol.quantrivanphong.report.leavetype.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LeaveTypeDTO {
+    private int id;
+    private String name;
+    private String descriptions;
+    private boolean status;
+}

src/main/java/com/itsol/quantrivanphong/report/leaveform/repository/LeaveTypeRepository.java → src/main/java/com/itsol/quantrivanphong/report/leavetype/repository/LeaveTypeRepository.java

-package com.itsol.quantrivanphong.report.leaveform.repository;
+package com.itsol.quantrivanphong.report.leavetype.repository;
 
 import com.itsol.quantrivanphong.model.LeaveType;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
 public interface LeaveTypeRepository extends JpaRepository<LeaveType, Integer> {
     LeaveType findLeaveTypeById(int id);
+
+    @Modifying
+    @Query("update LeaveType lt set lt.name = ?1, lt.descriptions = ?2 where lt.id = ?3")
+    int updateLeaveType(String name, String descriptions, int id);
 }

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

@@ -137,4 +137,8 @@ public class TimeSheetBusiness {
     public TimeSheet findTimeSheetById(int id) {
         return timeSheetRepository.findTimeSheetById(id);
     }
+
+    public List<Eproject> getEprojectList() {
+        return eProjectRepository.findAll();
+    }
 }

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.Eproject;
 import com.itsol.quantrivanphong.model.TimeSheet;
 import com.itsol.quantrivanphong.report.leaveform.controller.Notification;
 import com.itsol.quantrivanphong.report.timesheet.business.TimeSheetBusiness;
@@ -90,4 +91,10 @@ public class TimeSheetController {
     public ResponseEntity<String> updateCheck(@RequestBody TimeSheetDTO timeSheetDTO) {
         return ResponseEntity.ok(timeSheetBusiness.updateCheck(timeSheetDTO));
     }
+
+
+    @GetMapping(path = "/getAll")
+    public List<Eproject> getAllEproject() {
+        return timeSheetBusiness.getEprojectList();
+    }
 }
\ No newline at end of file

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

@@ -8,13 +8,10 @@ import org.springframework.data.jpa.repository.Query;
 import java.util.List;
 
 public interface EProjectRepository extends JpaRepository<Eproject, Integer> {
-//    Eproject findEprojectById(int id);
+    Eproject findEprojectById(int id);
     Eproject findEprojectByEmployee(Employee employee);
 
-    Eproject findEprojectByIdAndEmployee(int eProject_Id, Employee employee);
-
-
-
+    Eproject findEprojectByIdAndEmployee(int eProjectId, Employee employee);
 
 
 

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

@@ -37,7 +37,7 @@ public interface TimeSheetRepository extends JpaRepository<TimeSheet, Integer> {
     //Timesheet Of Hieunv
 
     @Query(value = "SELECT * FROM timesheet ts JOIN eproject ep ON ep.id = ts.eproject_id WHERE ep.project_id = ?1 AND ts.status = true and ts.created_at like ?2%", nativeQuery = true)
-    List<TimeSheet> findAllTimeSheetStatusTrue(int projectId, String currentDate);
+    List<TimeSheet> findAllTimesheetStatusTrue(int projectId, String currentDate);
 
 
     @Transactional
@@ -48,7 +48,7 @@ public interface TimeSheetRepository extends JpaRepository<TimeSheet, Integer> {
     @Transactional
     @Modifying
     @Query(value = "update TimeSheet ts set ts.checked = ?1 where ts.id = ?2", nativeQuery = true)
-    void updateTimeSheetChecked(String checked, int id);
+    void updateTimesheetChecked(String checked, int id);
 
     @Query(value = "SELECT Count(DISTINCT ts.eproject_id) FROM timesheet ts JOIN eproject ep ON ep.id = ts.eproject_id WHERE ts.status = false AND ep.project_id = ?1 AND created_at >= ?2 AND created_at <= ?3",nativeQuery = true)
     int numberEmployeeLack(int ProjectId, String firstDate, String finalDate);

src/main/resources/public/blank-page.html

-<!--
-Author: W3layouts
-Author URL: http://w3layouts.com
-License: Creative Commons Attribution 3.0 Unported
-License URL: http://creativecommons.org/licenses/by/3.0/
--->
-<!DOCTYPE HTML>
-<html>
-<head>
-<title>Glance Design Dashboard an Admin Panel Category Flat Bootstrap Responsive Website Template | Blank Page :: 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="Glance Design Dashboard Responsive web template, Bootstrap Web Templates, Flat Web Templates, Android Compatible web template, 
-SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, SonyEricsson, Motorola web design" />
-<script type="application/x-javascript"> addEventListener("load", function() { setTimeout(hideURLbar, 0); }, false); function hideURLbar(){ window.scrollTo(0,1); } </script>
-
-<!-- Bootstrap Core CSS -->
-<link href="css/bootstrap.css" rel='stylesheet' type='text/css' />
-
-<!-- Custom CSS -->
-<link href="css/style.css" rel='stylesheet' type='text/css' />
-
-<!-- font-awesome icons CSS -->
-<link href="css/font-awesome.css" rel="stylesheet"> 
-<!-- //font-awesome icons CSS -->
-
- <!-- side nav css file -->
- <link href='css/SidebarNav.min.css' media='all' rel='stylesheet' type='text/css'/>
- <!-- side nav css file -->
- 
- <!-- js-->
-<script src="js/jquery-1.11.1.min.js"></script>
-<script src="js/modernizr.custom.js"></script>
-
-<!--webfonts-->
-<link href="//fonts.googleapis.com/css?family=PT+Sans:400,400i,700,700i&amp;subset=cyrillic,cyrillic-ext,latin-ext" rel="stylesheet">
-<!--//webfonts--> 
-
-<!-- Metis Menu -->
-<script src="js/metisMenu.min.js"></script>
-<script src="js/custom.js"></script>
-<link href="css/custom.css" rel="stylesheet">
-<!--//Metis Menu -->
-
-</head> 
-<body class="cbp-spmenu-push">
-	<div class="main-content">
-	<div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1">
-		<!--left-fixed -navigation-->
-		<aside class="sidebar-left">
-      <nav class="navbar navbar-inverse">
-          <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".collapse" aria-expanded="false">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            </button>
-            <h1><a class="navbar-brand" href="index.html"><span class="fa fa-area-chart"></span> Glance<span class="dashboard_text">Design dashboard</span></a></h1>
-          </div>
-          <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-            <ul class="sidebar-menu">
-              <li class="header">MAIN NAVIGATION</li>
-              <li class="treeview">
-                <a href="index.html">
-					<span class="glyphicon glyphicon-user"></span></i> <span>Employee</span>
-                </a>
-              </li>
-			  <li class="treeview">
-                <a href="#">
-                <i class="fa fa-laptop"></i>
-                <span>Project</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="grids.html"><i class="fa fa-angle-right"></i> Grids</a></li>
-                  <li><a href="media.html"><i class="fa fa-angle-right"></i> Media Css</a></li>
-                </ul>
-
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-laptop"></i>
-                <span>UI Elements</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="general.html"><i class="fa fa-angle-right"></i> General</a></li>
-                  <li><a href="icons.html"><i class="fa fa-angle-right"></i> Icons</a></li>
-                  <li><a href="buttons.html"><i class="fa fa-angle-right"></i> Buttons</a></li>
-                  <li><a href="typography.html"><i class="fa fa-angle-right"></i> Typography</a></li>
-                </ul>
-              </li>
-			  <li>
-                <a href="timesheet.html">
-                <i class="fa fa-th"></i> <span>Widgets</span>
-                <small class="label pull-right label-info">08</small>
-                </a>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-edit"></i> <span>Forms</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="forms.html"><i class="fa fa-angle-right"></i> General Forms</a></li>
-                  <li><a href="validation.html"><i class="fa fa-angle-right"></i> Form Validations</a></li>
-                </ul>
-              </li>
-
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-envelope"></i> <span>Mailbox</span>
-                <i class="fa fa-angle-left pull-right"></i><small class="label pull-right label-info1">08</small><span class="label label-primary1 pull-right">02</span></a>
-                <ul class="treeview-menu">
-                  <li><a href="inbox.html"><i class="fa fa-angle-right"></i> Mail Inbox</a></li>
-                  <li><a href="compose.html"><i class="fa fa-angle-right"></i> Compose Mail </a></li>
-                </ul>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-folder"></i> <span>Examples</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li>
-                  <li><a href="signup.html"><i class="fa fa-angle-right"></i> Register</a></li>
-
-                  <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
-                </ul>
-              </li>
-              <li class="header">LABELS</li>
-              <li><a href="#"><i class="fa fa-angle-right text-red"></i> <span>Important</span></a></li>
-              <li><a href="#"><i class="fa fa-angle-right text-yellow"></i> <span>Warning</span></a></li>
-              <li><a href="#"><i class="fa fa-angle-right text-aqua"></i> <span>Information</span></a></li>
-            </ul>
-          </div>
-          <!-- /.navbar-collapse -->
-      </nav>
-    </aside>
-	</div>
-		<!--left-fixed -navigation-->
-		
-		<!-- header-starts -->
-		<div class="sticky-header header-section ">
-			<div class="header-left">
-				
-				<!--toggle button start-->
-				<button id="showLeftPush"><i class="fa fa-bars"></i></button>
-				<!--toggle button end-->
-				<div class="profile_details_left"><!--notifications of menu start -->
-					<ul class="nofitications-dropdown">
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-envelope"></i><span class="badge">4</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 3 new messages</h3>
-									</div>
-								</li>
-								<li><a href="#">
-								   <div class="user_img"><img src="images/1.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet</p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								</a></li>
-								<li class="odd"><a href="#">
-									<div class="user_img"><img src="images/4.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								  <div class="clearfix"></div>	
-								</a></li>
-								<li><a href="#">
-								   <div class="user_img"><img src="images/3.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								</a></li>
-								<li>
-									<div class="notification_bottom">
-										<a href="#">See all messages</a>
-									</div> 
-								</li>
-							</ul>
-						</li>
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-bell"></i><span class="badge blue">4</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 3 new notification</h3>
-									</div>
-								</li>
-								<li><a href="#">
-									<div class="user_img"><img src="images/4.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet</p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								  <div class="clearfix"></div>	
-								 </a></li>
-								 <li class="odd"><a href="#">
-									<div class="user_img"><img src="images/1.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								 </a></li>
-								 <li><a href="#">
-									<div class="user_img"><img src="images/3.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								 </a></li>
-								 <li>
-									<div class="notification_bottom">
-										<a href="#">See all notifications</a>
-									</div> 
-								</li>
-							</ul>
-						</li>	
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-tasks"></i><span class="badge blue1">8</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 8 pending task</h3>
-									</div>
-								</li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Database update</span><span class="percentage">40%</span>
-										<div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										<div class="bar yellow" style="width:40%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Dashboard done</span><span class="percentage">90%</span>
-									   <div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										 <div class="bar green" style="width:90%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Mobile App</span><span class="percentage">33%</span>
-										<div class="clearfix"></div>	
-									</div>
-								   <div class="progress progress-striped active">
-										 <div class="bar red" style="width: 33%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Issues fixed</span><span class="percentage">80%</span>
-									   <div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										 <div class="bar  blue" style="width: 80%;"></div>
-									</div>
-								</a></li>
-								<li>
-									<div class="notification_bottom">
-										<a href="#">See all pending tasks</a>
-									</div> 
-								</li>
-							</ul>
-						</li>	
-					</ul>
-					<div class="clearfix"> </div>
-				</div>
-				<!--notification menu end -->
-				<div class="clearfix"> </div>
-			</div>
-			<div class="header-right">
-				
-				
-				<!--search-box-->
-				<div class="search-box">
-					<form class="input">
-						<input class="sb-search-input input__field--madoka" placeholder="Search..." type="search" id="input-31" />
-						<label class="input__label" for="input-31">
-							<svg class="graphic" width="100%" height="100%" viewBox="0 0 404 77" preserveAspectRatio="none">
-								<path d="m0,0l404,0l0,77l-404,0l0,-77z"/>
-							</svg>
-						</label>
-					</form>
-				</div><!--//end-search-box-->
-				
-				<div class="profile_details">		
-					<ul>
-						<li class="dropdown profile_details_drop">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-								<div class="profile_img">	
-									<span class="prfil-img"><img src="images/2.jpg" alt=""> </span> 
-									<div class="user-name">
-										<p>Admin Name</p>
-										<span>Administrator</span>
-									</div>
-									<i class="fa fa-angle-down lnr"></i>
-									<i class="fa fa-angle-up lnr"></i>
-									<div class="clearfix"></div>	
-								</div>	
-							</a>
-							<ul class="dropdown-menu drp-mnu">
-								<li> <a href="#"><i class="fa fa-cog"></i> Settings</a> </li> 
-								<li> <a href="#"><i class="fa fa-user"></i> My Account</a> </li>
-								<li> <a href="#"><i class="fa fa-suitcase"></i> Profile</a> </li> 
-								<li> <a href="#"><i class="fa fa-sign-out"></i> Logout</a> </li>
-							</ul>
-						</li>
-					</ul>
-				</div>
-				<div class="clearfix"> </div>				
-			</div>
-			<div class="clearfix"> </div>	
-		</div>
-		<!-- //header-ends -->
-		<!-- main content start-->
-		<div id="page-wrapper">
-			<div class="main-page">
-				<h2 class="title1">Blank Page</h2>
-				<div class="blank-page widget-shadow scroll" id="style-2 div1">
-					<p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic 
-						It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here.
-					</p>
-				</div>
-			</div>
-		</div>
-		<!--footer-->
-		<div class="footer">
-		   <p>&copy; 2018 Glance Design Dashboard. All Rights Reserved | Design by <a href="https://w3layouts.com/" target="_blank">w3layouts</a></p>
-	   </div>
-        <!--//footer-->
-	</div>
-	
-	<!-- side nav js -->
-	<script src='js/SidebarNav.min.js' type='text/javascript'></script>
-	<script>
-      $('.sidebar-menu').SidebarNav()
-    </script>
-	<!-- //side nav js -->
-	
-	<!-- Classie --><!-- for toggle left push menu script -->
-		<script src="js/classie.js"></script>
-		<script>
-			var menuLeft = document.getElementById( 'cbp-spmenu-s1' ),
-				showLeftPush = document.getElementById( 'showLeftPush' ),
-				body = document.body;
-				
-			showLeftPush.onclick = function() {
-				classie.toggle( this, 'active' );
-				classie.toggle( body, 'cbp-spmenu-push-toright' );
-				classie.toggle( menuLeft, 'cbp-spmenu-open' );
-				disableOther( 'showLeftPush' );
-			};
-			
-			function disableOther( button ) {
-				if( button !== 'showLeftPush' ) {
-					classie.toggle( showLeftPush, 'disabled' );
-				}
-			}
-		</script>
-	<!-- //Classie --><!-- //for toggle left push menu script -->
-	
-	<!--scrolling js-->
-	<script src="js/scripts.js"></script>
-	<!--//scrolling js-->
-	
-	<!-- Bootstrap Core JavaScript -->
-   <script src="js/bootstrap.js"> </script>
-   
-</body>
-</html>
\ No newline at end of file

src/main/resources/public/buttons.html

-<!--
-Author: W3layouts
-Author URL: http://w3layouts.com
-License: Creative Commons Attribution 3.0 Unported
-License URL: http://creativecommons.org/licenses/by/3.0/
--->
-<!DOCTYPE HTML>
-<html>
-<head>
-<title>Glance Design Dashboard an Admin Panel Category Flat Bootstrap Responsive Website Template | Buttons :: 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="Glance Design Dashboard Responsive web template, Bootstrap Web Templates, Flat Web Templates, Android Compatible web template, 
-SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, SonyEricsson, Motorola web design" />
-<script type="application/x-javascript"> addEventListener("load", function() { setTimeout(hideURLbar, 0); }, false); function hideURLbar(){ window.scrollTo(0,1); } </script>
-
-<!-- Bootstrap Core CSS -->
-<link href="css/bootstrap.css" rel='stylesheet' type='text/css' />
-
-<!-- Custom CSS -->
-<link href="css/style.css" rel='stylesheet' type='text/css' />
-
-<!-- font-awesome icons CSS -->
-<link href="css/font-awesome.css" rel="stylesheet"> 
-<!-- //font-awesome icons CSS -->
-
- <!-- side nav css file -->
- <link href='css/SidebarNav.min.css' media='all' rel='stylesheet' type='text/css'/>
- <!-- side nav css file -->
- 
- <!-- js-->
-<script src="js/jquery-1.11.1.min.js"></script>
-<script src="js/modernizr.custom.js"></script>
-
-<!--webfonts-->
-<link href="//fonts.googleapis.com/css?family=PT+Sans:400,400i,700,700i&amp;subset=cyrillic,cyrillic-ext,latin-ext" rel="stylesheet">
-<!--//webfonts--> 
-
-<!-- Metis Menu -->
-<script src="js/metisMenu.min.js"></script>
-<script src="js/custom.js"></script>
-<link href="css/custom.css" rel="stylesheet">
-<!--//Metis Menu -->
-
-</head> 
-<body class="cbp-spmenu-push">
-	<div class="main-content">
-	<div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1">
-		<!--left-fixed -navigation-->
-		<aside class="sidebar-left">
-      <nav class="navbar navbar-inverse">
-          <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".collapse" aria-expanded="false">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            </button>
-            <h1><a class="navbar-brand" href="index.html"><span class="fa fa-area-chart"></span> Glance<span class="dashboard_text">Design dashboard</span></a></h1>
-          </div>
-          <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-            <ul class="sidebar-menu">
-              <li class="header">MAIN NAVIGATION</li>
-              <li class="treeview">
-                <a href="index.html">
-					<span class="glyphicon glyphicon-user"></span><span>Employee</span>
-                </a>
-              </li>
-			  <li class="treeview">
-                <a href="#">
-                <i class="fa fa-laptop"></i>
-                <span>Project</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="grids.html"><i class="fa fa-angle-right"></i> Grids</a></li>
-                  <li><a href="media.html"><i class="fa fa-angle-right"></i> Media Css</a></li>
-                </ul>
-
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-laptop"></i>
-                <span>UI Elements</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="general.html"><i class="fa fa-angle-right"></i> General</a></li>
-                  <li><a href="icons.html"><i class="fa fa-angle-right"></i> Icons</a></li>
-                  <li><a href="buttons.html"><i class="fa fa-angle-right"></i> Buttons</a></li>
-                  <li><a href="typography.html"><i class="fa fa-angle-right"></i> Typography</a></li>
-                </ul>
-              </li>
-			  <li>
-                <a href="timesheet.html">
-                <i class="fa fa-th"></i> <span>Timesheet</span>
-                <small class="label pull-right label-info">08</small>
-                </a>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-edit"></i> <span>Forms</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="forms.html"><i class="fa fa-angle-right"></i> General Forms</a></li>
-                  <li><a href="validation.html"><i class="fa fa-angle-right"></i> Form Validations</a></li>
-                </ul>
-              </li>
-
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-envelope"></i> <span>Mailbox</span>
-                <i class="fa fa-angle-left pull-right"></i><small class="label pull-right label-info1">08</small><span class="label label-primary1 pull-right">02</span></a>
-                <ul class="treeview-menu">
-                  <li><a href="inbox.html"><i class="fa fa-angle-right"></i> Mail Inbox</a></li>
-                  <li><a href="compose.html"><i class="fa fa-angle-right"></i> Compose Mail </a></li>
-                </ul>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-folder"></i> <span>Examples</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li>
-                  <li><a href="signup.html"><i class="fa fa-angle-right"></i> Register</a></li>
-
-                  <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
-                </ul>
-              </li>
-              <li class="header">LABELS</li>
-              <li><a href="#"><i class="fa fa-angle-right text-red"></i> <span>Important</span></a></li>
-              <li><a href="#"><i class="fa fa-angle-right text-yellow"></i> <span>Warning</span></a></li>
-              <li><a href="#"><i class="fa fa-angle-right text-aqua"></i> <span>Information</span></a></li>
-            </ul>
-          </div>
-          <!-- /.navbar-collapse -->
-      </nav>
-    </aside>
-	</div>
-		<!--left-fixed -navigation-->
-		
-		<!-- header-starts -->
-		<div class="sticky-header header-section ">
-			<div class="header-left">
-				
-				<!--toggle button start-->
-				<button id="showLeftPush"><i class="fa fa-bars"></i></button>
-				<!--toggle button end-->
-				<div class="profile_details_left"><!--notifications of menu start -->
-					<ul class="nofitications-dropdown">
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-envelope"></i><span class="badge">4</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 3 new messages</h3>
-									</div>
-								</li>
-								<li><a href="#">
-								   <div class="user_img"><img src="images/1.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet</p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								</a></li>
-								<li class="odd"><a href="#">
-									<div class="user_img"><img src="images/4.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								  <div class="clearfix"></div>	
-								</a></li>
-								<li><a href="#">
-								   <div class="user_img"><img src="images/3.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								</a></li>
-								<li>
-									<div class="notification_bottom">
-										<a href="#">See all messages</a>
-									</div> 
-								</li>
-							</ul>
-						</li>
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-bell"></i><span class="badge blue">4</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 3 new notification</h3>
-									</div>
-								</li>
-								<li><a href="#">
-									<div class="user_img"><img src="images/4.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet</p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								  <div class="clearfix"></div>	
-								 </a></li>
-								 <li class="odd"><a href="#">
-									<div class="user_img"><img src="images/1.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								 </a></li>
-								 <li><a href="#">
-									<div class="user_img"><img src="images/3.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								 </a></li>
-								 <li>
-									<div class="notification_bottom">
-										<a href="#">See all notifications</a>
-									</div> 
-								</li>
-							</ul>
-						</li>	
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-tasks"></i><span class="badge blue1">8</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 8 pending task</h3>
-									</div>
-								</li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Database update</span><span class="percentage">40%</span>
-										<div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										<div class="bar yellow" style="width:40%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Dashboard done</span><span class="percentage">90%</span>
-									   <div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										 <div class="bar green" style="width:90%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Mobile App</span><span class="percentage">33%</span>
-										<div class="clearfix"></div>	
-									</div>
-								   <div class="progress progress-striped active">
-										 <div class="bar red" style="width: 33%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Issues fixed</span><span class="percentage">80%</span>
-									   <div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										 <div class="bar  blue" style="width: 80%;"></div>
-									</div>
-								</a></li>
-								<li>
-									<div class="notification_bottom">
-										<a href="#">See all pending tasks</a>
-									</div> 
-								</li>
-							</ul>
-						</li>	
-					</ul>
-					<div class="clearfix"> </div>
-				</div>
-				<!--notification menu end -->
-				<div class="clearfix"> </div>
-			</div>
-			<div class="header-right">
-				
-				
-				<!--search-box-->
-				<div class="search-box">
-					<form class="input">
-						<input class="sb-search-input input__field--madoka" placeholder="Search..." type="search" id="input-31" />
-						<label class="input__label" for="input-31">
-							<svg class="graphic" width="100%" height="100%" viewBox="0 0 404 77" preserveAspectRatio="none">
-								<path d="m0,0l404,0l0,77l-404,0l0,-77z"/>
-							</svg>
-						</label>
-					</form>
-				</div><!--//end-search-box-->
-				
-				<div class="profile_details">		
-					<ul>
-						<li class="dropdown profile_details_drop">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-								<div class="profile_img">	
-									<span class="prfil-img"><img src="images/2.jpg" alt=""> </span> 
-									<div class="user-name">
-										<p>Admin Name</p>
-										<span>Administrator</span>
-									</div>
-									<i class="fa fa-angle-down lnr"></i>
-									<i class="fa fa-angle-up lnr"></i>
-									<div class="clearfix"></div>	
-								</div>	
-							</a>
-							<ul class="dropdown-menu drp-mnu">
-								<li> <a href="#"><i class="fa fa-cog"></i> Settings</a> </li> 
-								<li> <a href="#"><i class="fa fa-user"></i> My Account</a> </li>
-								<li> <a href="#"><i class="fa fa-suitcase"></i> Profile</a> </li> 
-								<li> <a href="#"><i class="fa fa-sign-out"></i> Logout</a> </li>
-							</ul>
-						</li>
-					</ul>
-				</div>
-				<div class="clearfix"> </div>				
-			</div>
-			<div class="clearfix"> </div>	
-		</div>
-		<!-- //header-ends -->
-		<!-- main content start-->
-		<div id="page-wrapper">
-			<div class="main-page">
-				<h2 class="title1">Buttons</h2>
-				<!-- buttons -->
-				<!-- Color-variations -->
-				<div class="panel1 variations-panel">
-					<div class="panel-body mtn">
-						<div class="col-adjust-10">
-							<div class="row">
-								<div class="col-md-3 w3layouts-bnt">
-									<div class="bg-dark light pv20 text-white fw600 text-center">#364155 </div>
-									<div class="bg-dark pv20 text-white fw600 text-center">#2A3342</div>
-									<div class="bg-dark dark pv20 text-white fw600 text-center">#1E252F</div>
-								</div>
-								<div class="col-md-3 agileits-bnt">
-									<div class="bg-primary light pv20 text-white fw600 text-center">#14C1d7</div>
-									<div class="bg-primary pv20 text-white fw600 text-center">#11A8BB</div>
-									<div class="bg-primary dark pv20 text-white fw600 text-center">#0E8F9F</div>
-								</div>
-								<div class="col-md-3 agileinfo-bnt">
-									<div class="bg-success light pv20 text-white fw600 text-center">#5FD78A</div>
-									<div class="bg-success pv20 text-white fw600 text-center">#47D178</div>
-									<div class="bg-success dark pv20 text-white fw600 text-center">#32C867</div>
-								</div>
-								<div class="col-md-3 wthree-bnt">
-									<div class="bg-info light pv20 text-white fw600 text-center">#5FD7BA</div>
-									<div class="bg-info pv20 text-white fw600 text-center">#47D1AF</div>
-									<div class="bg-info dark pv20 text-white fw600 text-center">#32C8A3</div>
-								</div>
-								<div class="col-md-3 w3-agileits-bnt">
-									<div class="bg-warning light pv20 text-white fw600 text-center">#FF8B63</div>
-									<div class="bg-warning pv20 text-white fw600 text-center">#FF7444</div>
-									<div class="bg-warning dark pv20 text-white fw600 text-center">#FF5D25</div>
-								</div>
-								<div class="col-md-3 agileits-w3layouts-bnt">
-									<div class="bg-danger light pv20 text-white fw600 text-center">#F17060</div>
-									<div class="bg-danger pv20 text-white fw600 text-center">#EE5744</div>
-									<div class="bg-danger dark pv20 text-white fw600 text-center">#EB3E28</div>
-								</div>
-								<div class="col-md-3 w3-agile-bnt">
-									<div class="bg-alert light pv20 text-white fw600 text-center">#FDC669</div>
-									<div class="bg-alert pv20 text-white fw600 text-center">#FDBA4B</div>
-									<div class="bg-alert dark pv20 text-white fw600 text-center">#FDAE2D</div>
-								</div>
-								<div class="col-md-3 agile-bnt">
-									<div class="bg-system light pv20 text-white fw600 text-center">#7A67BB</div>
-									<div class="bg-system pv20 text-white fw600 text-center">#6852B2</div>
-									<div class="bg-system dark pv20 text-white fw600 text-center">#5B479F</div>
-								</div>
-								<div class="clearfix"> </div>
-							</div>
-						</div>
-					</div>
-				</div>
-				<!-- //Color-variations -->
-				<!-- /buttons_w3ls_agile -->
-								<div class="buttons_w3ls_agile">
-								
-									<div class="button_set_one agile_info_shadow">
-									 <h3 class="w3_inner_tittle two">Simple Buttons</h3>
-										<!-- Standard button -->
-											<button type = "button" class = "btn btn-default">Default Button</button>
-
-											<!-- Provides extra visual weight and identifies the primary action in a set of buttons -->
-											<button type = "button" class = "btn btn-primary">Primary Button</button>
-
-											<!-- Indicates a successful or positive action -->
-											<button type = "button" class = "btn btn-success">Success Button</button>
-
-											<!-- Contextual button for informational alert messages -->
-											<button type = "button" class = "btn btn-info">Info Button</button>
-
-											<!-- Indicates caution should be taken with this action -->
-											<button type = "button" class = "btn btn-warning">Warning Button</button>
-
-											<!-- Indicates a dangerous or potentially negative action -->
-											<button type = "button" class = "btn btn-danger">Danger Button</button>
-
-											
-									</div>
-									<div class="button_set_one two agile_info_shadow">
-										<!-- Standard button -->
-										 <h3 class="w3_inner_tittle two"> Button With Radius</h3>
-
-											<!-- Provides extra visual weight and identifies the primary action in a set of buttons -->
-											<button type = "button" class = "btn btn-primary">Primary Button</button>
-
-											<!-- Indicates a successful or positive action -->
-											<button type = "button" class = "btn btn-success">Success Button</button>
-
-											<!-- Contextual button for informational alert messages -->
-											<button type = "button" class = "btn btn-info">Info Button</button>
-
-											<!-- Indicates caution should be taken with this action -->
-											<button type = "button" class = "btn btn-warning">Warning Button</button>
-
-											<!-- Indicates a dangerous or potentially negative action -->
-											<button type = "button" class = "btn btn-danger">Danger Button</button>
-
-											
-									</div>
-									<div class="clearfix"></div>
-								</div>
-							<!-- //buttons_w3ls_agile -->
-					        <!-- /buttons_w3ls_agile -->
-								<div class="buttons_w3ls_agile">
-								
-									<div class="col-md-6 button_set_one three agile_info_shadow">
-									 <h3 class="w3_inner_tittle two">Button With Icon</h3>
-										<!-- Standard button -->
-											
-
-										<button type="button" class="btn btn-primary btn-flat btn-pri"><i class="fa fa-plus" aria-hidden="true"></i> Primary</button>
-										<button type="button" class="btn btn-success btn-flat btn-pri"><i class="fa fa-plus" aria-hidden="true"></i> Success</button>
-										
-										<button type="button" class="btn btn-info btn-flat btn-pri"><i class="fa fa-plus" aria-hidden="true"></i>Info</button>
-										<button type="button" class="btn btn-warning btn-flat btn-pri"><i class="fa fa-plus" aria-hidden="true"></i>Warning</button>
-										<button type="button" class="btn btn-danger btn-flat btn-pri"><i class="fa fa-plus" aria-hidden="true"></i>Danger</button>
-											
-									</div>
-									<div class="col-md-6 button_set_one three one agile_info_shadow">
-										<!-- Standard button -->
-										 <h3 class="w3_inner_tittle two"> Button With Icon</h3>
-
-										<button type="button" class="btn btn-primary btn-flat btn-pri btn-lg"><i class="fa fa-plus" aria-hidden="true"></i> Primary</button>
-										<button type="button" class="btn btn-success btn-flat btn-pri btn-md"><i class="fa fa-plus" aria-hidden="true"></i> Success</button>
-										
-										<button type="button" class="btn btn-info btn-flat btn-pri btn-sm"><i class="fa fa-plus" aria-hidden="true"></i>Info</button>
-										<button type="button" class="btn btn-warning btn-flat btn-pri btn-xs"><i class="fa fa-plus" aria-hidden="true"></i>Warning</button>
-										
-											
-									</div>
-									<div class="clearfix"></div>
-								</div>
-							<!-- //buttons_w3ls_agile -->
-
-				
-				
-				<div class="agile-buttons-grids">
-					<!-- button-states -->
-					<div class="col-sm-6 col-md-3 button-states-top-grid">
-						<div class="panel1 button-states-grid">
-							<div class="panel-heading">
-								<div class="panel-title pn">
-									<h3 class="mtn mb10 fw400">Button States</h3>
-								</div>
-							</div>
-							<div class="mtn">
-								<p class="mb15">
-									<code>.disabled</code>
-								</p>
-
-								<div class="bs-component mb20">
-									<button type="button" class="btn disabled btn-dark btn-block">Disabled</button>
-								</div>
-								<p class="mb15">
-									<code>.btn-hover</code>
-								</p>
-
-								<div class="bs-component mb20">
-									<button type="button" class="btn btn-hover btn-dark btn-block">Hover</button>
-								<div id="source-button" class="btn btn-system btn-xs" style="display: none;">&lt; &gt;</div></div>
-								<p class="mb15">
-									<code>.active</code>
-								</p>
-
-								<div class="bs-component mb20">
-									<button type="button" class="btn active btn-dark btn-block">Active</button>
-								</div>
-							</div>
-						</div>
-					</div>
-					<!-- //button-states -->
-					
-					<!-- button-sizes -->
-					<div class="col-sm-6 col-md-3 button-size-grids">
-						<div class="panel1 button-sizes">
-							<div class="panel-heading">
-								<div class="panel-title pn">
-									<h3 class="mtn mb10 fw400">Button Sizes</h3>
-								</div>
-							</div>
-							<div class="mtn">
-								<p class="mb15">
-									<code>.btn-xs</code>
-								</p>
-
-								<div class="bs-component mb20">
-									<button type="button" class="btn btn-xs btn-primary btn-block">Primary</button>
-								</div>
-								<p class="mb15">
-									<code>.btn-sm</code>
-								</p>
-
-								<div class="bs-component mb20">
-									<button type="button" class="btn btn-sm btn-primary btn-block">Primary</button>
-								</div>
-
-								<p class="mb15">
-									<code>Normal button</code>
-								</p>
-
-								<div class="bs-component mb20">
-									<button type="button" class="btn btn-primary btn-block">Primary</button>
-								</div>
-								<p class="mb15">
-									<code>.btn-lg</code>
-								</p>
-
-								<div class="bs-component mb20">
-									<button type="button" class="btn btn-lg btn-primary btn-block">Primary</button>
-								</div>
-							</div>
-						</div>
-					</div>
-					<!-- //button-sizes -->
-					<!-- icon-hover-effects -->
-					<div class="col-sm-6 hover-buttons">
-						<div class="wrap">
-							<div class="bg-effect">
-								<h2>Button with Icons</h2>
-								<ul class="bt-list">
-								
-										<li><a href="#" class="hvr-icon-grow-rotate col-1">Icon Hang</a></li>
-										<li><a href="#" class="hvr-icon-forward col-2">Icon Forward</a></li>
-										<li><a href="#" class="hvr-icon-down col-3">Icon Down</a></li>
-										<li><a href="#" class="hvr-icon-up col-4">Icon Up</a></li>
-								
-										<li><a href="#" class="hvr-icon-spin col-5">Icon Spin</a></li>
-										<li><a href="#" class="hvr-icon-drop col-6">Icon Drop</a></li>
-										<li><a href="#" class="hvr-icon-fade col-7">Icon Fade</a></li>
-										<li><a href="#" class="hvr-icon-float-away col-24">Icon Sink</a></li>
-									
-										<li><a href="#" class="hvr-icon-grow col-9">Icon Grow</a></li>
-										<li><a href="#" class="hvr-icon-sink-away col-8">Icon Away</a></li>
-										<li><a href="#" class="hvr-icon-pulse col-11">Icon Pulse</a></li>
-										<li><a href="#" class="hvr-icon-shrink col-10">Icon Shrink</a></li>
-									
-										<li><a href="#" class="hvr-icon-push col-14">Icon Push</a></li>
-										<li><a href="#" class="hvr-icon-pop col-15">Icon Pop</a></li>
-										<li><a href="#" class="hvr-icon-pulse-grow col-12">Icon Bob</a></li>
-								
-										<li><a href="#" class="hvr-icon-float col-21">Icon Float</a></li>
-										<li><a href="#" class="hvr-icon-bounce col-22">Icon Bounce</a></li>
-										<li><a href="#" class="hvr-icon-rotate col-23">Icon Rotate</a></li>
-									
-									
-								</ul>
-							</div>
-						</div>
-					</div>
-					<!-- //icon-hover-effects -->
-					<div class="clearfix"> </div>
-				</div>
-				<!-- //buttons -->
-			</div>
-		</div>
-		<!-- //main content ends-->
-		
-<!-- script-for sticky-nav -->
-		<script>
-		$(document).ready(function() {
-			 var navoffeset=$(".header-main").offset().top;
-			 $(window).scroll(function(){
-				var scrollpos=$(window).scrollTop(); 
-				if(scrollpos >=navoffeset){
-					$(".header-main").addClass("fixed");
-				}else{
-					$(".header-main").removeClass("fixed");
-				}
-			 });
-			 
-		});
-		</script>
-		<!-- /script-for sticky-nav -->
-		<!--inner block start here-->
-		<div class="inner-block">
-
-		</div>
-		<!--inner block end here-->
-	</div>
-		<!--footer-->
-		<div class="footer">
-		   <p>&copy; 2018 Glance Design Dashboard. All Rights Reserved | Design by <a href="https://w3layouts.com/" target="_blank">w3layouts</a></p>
-	   </div>
-        <!--//footer-->
-	
-	<!-- side nav js -->
-	<script src='js/SidebarNav.min.js' type='text/javascript'></script>
-	<script>
-      $('.sidebar-menu').SidebarNav()
-    </script>
-	<!-- //side nav js -->
-	
-	<!-- Classie --><!-- for toggle left push menu script -->
-		<script src="js/classie.js"></script>
-		<script>
-			var menuLeft = document.getElementById( 'cbp-spmenu-s1' ),
-				showLeftPush = document.getElementById( 'showLeftPush' ),
-				body = document.body;
-				
-			showLeftPush.onclick = function() {
-				classie.toggle( this, 'active' );
-				classie.toggle( body, 'cbp-spmenu-push-toright' );
-				classie.toggle( menuLeft, 'cbp-spmenu-open' );
-				disableOther( 'showLeftPush' );
-			};
-			
-			function disableOther( button ) {
-				if( button !== 'showLeftPush' ) {
-					classie.toggle( showLeftPush, 'disabled' );
-				}
-			}
-		</script>
-	<!-- //Classie --><!-- //for toggle left push menu script -->
-		
-	<!--scrolling js-->
-	<script src="js/jquery.nicescroll.js"></script>
-	<script src="js/scripts.js"></script>
-	<!--//scrolling js-->
-	
-	<!-- Bootstrap Core JavaScript -->
-	<script src="js/bootstrap.js"> </script>
-	
-</body>
-</html>
\ No newline at end of file

src/main/resources/public/compose.html

-<!--
-Author: W3layouts
-Author URL: http://w3layouts.com
-License: Creative Commons Attribution 3.0 Unported
-License URL: http://creativecommons.org/licenses/by/3.0/
--->
-<!DOCTYPE HTML>
-<html>
-<head>
-<title>Glance Design Dashboard an Admin Panel Category Flat Bootstrap Responsive Website Template | Compose mail :: 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="Glance Design Dashboard Responsive web template, Bootstrap Web Templates, Flat Web Templates, Android Compatible web template, 
-SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, SonyEricsson, Motorola web design" />
-<script type="application/x-javascript"> addEventListener("load", function() { setTimeout(hideURLbar, 0); }, false); function hideURLbar(){ window.scrollTo(0,1); } </script>
-
-<!-- Bootstrap Core CSS -->
-<link href="css/bootstrap.css" rel='stylesheet' type='text/css' />
-
-<!-- Custom CSS -->
-<link href="css/style.css" rel='stylesheet' type='text/css' />
-
-<!-- font-awesome icons CSS -->
-<link href="css/font-awesome.css" rel="stylesheet"> 
-<!-- //font-awesome icons CSS -->
-
- <!-- side nav css file -->
- <link href='css/SidebarNav.min.css' media='all' rel='stylesheet' type='text/css'/>
- <!-- side nav css file -->
- 
- <!-- js-->
-<script src="js/jquery-1.11.1.min.js"></script>
-<script src="js/modernizr.custom.js"></script>
-
-<!--webfonts-->
-<link href="//fonts.googleapis.com/css?family=PT+Sans:400,400i,700,700i&amp;subset=cyrillic,cyrillic-ext,latin-ext" rel="stylesheet">
-<!--//webfonts--> 
-
-<!-- Metis Menu -->
-<script src="js/metisMenu.min.js"></script>
-<script src="js/custom.js"></script>
-<link href="css/custom.css" rel="stylesheet">
-<!--//Metis Menu -->
-
-</head> 
-<body class="cbp-spmenu-push" ng-app="myApp">
-	<div class="main-content">
-	<div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1">
-		<!--left-fixed -navigation-->
-		<aside class="sidebar-left">
-      <nav class="navbar navbar-inverse">
-          <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".collapse" aria-expanded="false">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            </button>
-            <h1><a class="navbar-brand" href="index.html"><span class="fa fa-area-chart"></span> Glance<span class="dashboard_text">Design dashboard</span></a></h1>
-          </div>
-          <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-            <ul class="sidebar-menu">
-              <li class="header">MAIN NAVIGATION</li>
-              <li class="treeview">
-                <a href="index.html">
-					<span class="glyphicon glyphicon-user"></span> <span>Employee</span>
-                </a>
-              </li>
-			  <li class="treeview">
-                <a href="#">
-                <i class="fa fa-laptop"></i>
-                <span>Project</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="grids.html"><i class="fa fa-angle-right"></i> Grids</a></li>
-                  <li><a href="media.html"><i class="fa fa-angle-right"></i> Media Css</a></li>
-                </ul>
-
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-laptop"></i>
-                <span>UI Elements</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="general.html"><i class="fa fa-angle-right"></i> General</a></li>
-                  <li><a href="icons.html"><i class="fa fa-angle-right"></i> Icons</a></li>
-                  <li><a href="buttons.html"><i class="fa fa-angle-right"></i> Buttons</a></li>
-                  <li><a href="typography.html"><i class="fa fa-angle-right"></i> Typography</a></li>
-                </ul>
-              </li>
-			  <li>
-                <a href="timesheet.html">
-                <i class="fa fa-th"></i> <span>Widgets</span>
-                <small class="label pull-right label-info">08</small>
-                </a>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-edit"></i> <span>Forms</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="forms.html"><i class="fa fa-angle-right"></i> General Forms</a></li>
-                  <li><a href="validation.html"><i class="fa fa-angle-right"></i> Form Validations</a></li>
-                </ul>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-table"></i> <span>Tables</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-envelope"></i> <span>Mailbox</span>
-                <i class="fa fa-angle-left pull-right"></i><small class="label pull-right label-info1">08</small><span class="label label-primary1 pull-right">02</span></a>
-                <ul class="treeview-menu">
-                  <li><a href="inbox.html"><i class="fa fa-angle-right"></i> Mail Inbox</a></li>
-                  <li><a href="compose.html"><i class="fa fa-angle-right"></i> Compose Mail </a></li>
-                </ul>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-folder"></i> <span>Examples</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li>
-                  <li><a href="signup.html"><i class="fa fa-angle-right"></i> Register</a></li>
-
-                  <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
-                </ul>
-              </li>
-              <li class="header">LABELS</li>
-              <li><a href="#"><i class="fa fa-angle-right text-red"></i> <span>Important</span></a></li>
-              <li><a href="#"><i class="fa fa-angle-right text-yellow"></i> <span>Warning</span></a></li>
-              <li><a href="#"><i class="fa fa-angle-right text-aqua"></i> <span>Information</span></a></li>
-            </ul>
-          </div>
-          <!-- /.navbar-collapse -->
-      </nav>
-    </aside>
-	</div>
-		<!--left-fixed -navigation-->
-		
-		<!-- header-starts -->
-		<div class="sticky-header header-section ">
-			<div class="header-left">
-				
-				<!--toggle button start-->
-				<button id="showLeftPush"><i class="fa fa-bars"></i></button>
-				<!--toggle button end-->
-				<div class="profile_details_left"><!--notifications of menu start -->
-					<ul class="nofitications-dropdown">
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-envelope"></i><span class="badge">4</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 3 new messages</h3>
-									</div>
-								</li>
-								<li><a href="#">
-								   <div class="user_img"><img src="images/1.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet</p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								</a></li>
-								<li class="odd"><a href="#">
-									<div class="user_img"><img src="images/4.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								  <div class="clearfix"></div>	
-								</a></li>
-								<li><a href="#">
-								   <div class="user_img"><img src="images/3.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								</a></li>
-								<li>
-									<div class="notification_bottom">
-										<a href="#">See all messages</a>
-									</div> 
-								</li>
-							</ul>
-						</li>
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-bell"></i><span class="badge blue">4</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 3 new notification</h3>
-									</div>
-								</li>
-								<li><a href="#">
-									<div class="user_img"><img src="images/4.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet</p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								  <div class="clearfix"></div>	
-								 </a></li>
-								 <li class="odd"><a href="#">
-									<div class="user_img"><img src="images/1.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								 </a></li>
-								 <li><a href="#">
-									<div class="user_img"><img src="images/3.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								 </a></li>
-								 <li>
-									<div class="notification_bottom">
-										<a href="#">See all notifications</a>
-									</div> 
-								</li>
-							</ul>
-						</li>	
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-tasks"></i><span class="badge blue1">8</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 8 pending task</h3>
-									</div>
-								</li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Database update</span><span class="percentage">40%</span>
-										<div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										<div class="bar yellow" style="width:40%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Dashboard done</span><span class="percentage">90%</span>
-									   <div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										 <div class="bar green" style="width:90%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Mobile App</span><span class="percentage">33%</span>
-										<div class="clearfix"></div>	
-									</div>
-								   <div class="progress progress-striped active">
-										 <div class="bar red" style="width: 33%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Issues fixed</span><span class="percentage">80%</span>
-									   <div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										 <div class="bar  blue" style="width: 80%;"></div>
-									</div>
-								</a></li>
-								<li>
-									<div class="notification_bottom">
-										<a href="#">See all pending tasks</a>
-									</div> 
-								</li>
-							</ul>
-						</li>	
-					</ul>
-					<div class="clearfix"> </div>
-				</div>
-				<!--notification menu end -->
-				<div class="clearfix"> </div>
-			</div>
-			<div class="header-right">
-				
-				
-				<!--search-box-->
-				<div class="search-box">
-					<form class="input">
-						<input class="sb-search-input input__field--madoka" placeholder="Search..." type="search" id="input-31" />
-						<label class="input__label" for="input-31">
-							<svg class="graphic" width="100%" height="100%" viewBox="0 0 404 77" preserveAspectRatio="none">
-								<path d="m0,0l404,0l0,77l-404,0l0,-77z"/>
-							</svg>
-						</label>
-					</form>
-				</div><!--//end-search-box-->
-				
-				<div class="profile_details">		
-					<ul>
-						<li class="dropdown profile_details_drop">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-								<div class="profile_img">	
-									<span class="prfil-img"><img src="images/2.jpg" alt=""> </span> 
-									<div class="user-name">
-										<p>Admin Name</p>
-										<span>Administrator</span>
-									</div>
-									<i class="fa fa-angle-down lnr"></i>
-									<i class="fa fa-angle-up lnr"></i>
-									<div class="clearfix"></div>	
-								</div>	
-							</a>
-							<ul class="dropdown-menu drp-mnu">
-								<li> <a href="#"><i class="fa fa-cog"></i> Settings</a> </li> 
-								<li> <a href="#"><i class="fa fa-user"></i> My Account</a> </li>
-								<li> <a href="#"><i class="fa fa-suitcase"></i> Profile</a> </li> 
-								<li> <a href="#"><i class="fa fa-sign-out"></i> Logout</a> </li>
-							</ul>
-						</li>
-					</ul>
-				</div>
-				<div class="clearfix"> </div>				
-			</div>
-			<div class="clearfix"> </div>	
-		</div>
-		<!-- //header-ends -->
-		<!-- main content start-->
-		<div id="page-wrapper">
-			<div class="main-page compose">
-				<div ui-view="content">
-					<!--					Content222-->
-				</div>
-				<div class="col-md-4 compose-left">
-					<div class="folder widget-shadow">
-						<ul>
-							<li class="head">Folders</li>
-							<li><a href="inbox.html"><i class="fa fa-inbox"></i>Inbox <span>52</span></a></li>
-							<li><a href="#"><i class="fa fa fa-envelope-o"></i>Sent </a></li>
-							<li><a href="#"><i class="fa fa-file-text-o"></i>Drafts <span>03</span></a> </li>
-							<li><a href="#"><i class="fa fa-flag-o"></i>Spam </a></li>
-							<li><a href="#"><i class="fa fa-trash-o"></i>Trash</a></li>
-						</ul>
-					</div>
-					<div class="chat-grid widget-shadow">
-						<ul>
-							<li class="head">Friends (Online) </li>
-							<li><a href="#">
-									<div class="chat-left">
-										<img class="img-circle" src="images/i1.png" alt="">
-										<label class="small-badge"></label>
-									</div>
-									<div class="chat-right">
-										<p>Andrew Josifn</p>
-										<h6>Nullam quis risus eget </h6>
-									</div>
-									<div class="clearfix"> </div>	
-								</a>
-							</li>
-							<li><a href="#">
-									<div class="chat-left">
-										<img class="img-circle" src="images/i4.png" alt="">
-										<label class="small-badge bg-green"></label>
-									</div>
-									<div class="chat-right">
-										<p>Justen Ferry</p>
-										<h6>Urna mollis ornare vel</h6>
-									</div>
-									<div class="clearfix"> </div>	
-								</a>
-							</li>
-							<li><a href="#">
-									<div class="chat-left">
-										<img class="img-circle" src="images/i3.png" alt="">
-										<label class="small-badge bg-green"></label>
-									</div>
-									<div class="chat-right">
-										<p>Brown Andy </p>
-										<h6>Quis risus ullam neget </h6>
-									</div>
-									<div class="clearfix"> </div>	
-								</a>
-							</li>
-							<li><a href="#">
-									<div class="chat-left">
-										<img class="img-circle" src="images/i4.png" alt="">
-										<label class="small-badge"></label>
-									</div>
-									<div class="chat-right">
-										<p>Deos Jhon</p>
-										<h6>Mollis ornare Urna vel</h6>
-									</div>
-									<div class="clearfix"> </div>	
-								</a>
-							</li>
-						</ul>
-					</div>
-				</div>
-				<div class="col-md-8 compose-right widget-shadow">
-					<div class="panel-default">
-						<div class="panel-heading">
-							Compose New Message 
-						</div>
-						<div class="panel-body">
-							<div class="alert alert-info">
-								Please fill details to send a new message
-							</div>
-							<form class="com-mail">
-								<input type="text" class="form-control1 control3" placeholder="To :">
-								<input type="text" class="form-control1 control3" placeholder="Subject :">
-								<textarea rows="6" class="form-control1 control2" placeholder="Message :" ></textarea>
-								<div class="form-group">
-									<div class="btn btn-default btn-file">
-										<i class="fa fa-paperclip"></i> Attachment
-										<input type="file" name="attachment">
-									</div>
-									<p class="help-block">Max. 32MB</p>
-								</div>
-								<input type="submit" value="Send Message"> 
-							</form>
-						</div>
-					</div>
-				</div>
-				<div class="clearfix"> </div>	
-			</div>
-		</div>
-		<!--footer-->
-
-        <!--//footer-->
-	</div>
-
-	<script src='js/SidebarNav.min.js' type='text/javascript'></script>
-	<script>
-      $('.sidebar-menu').SidebarNav()
-    </script>
-
-		<script src="js/classie.js"></script>
-		<script>
-			var menuLeft = document.getElementById( 'cbp-spmenu-s1' ),
-				showLeftPush = document.getElementById( 'showLeftPush' ),
-				body = document.body;
-				
-			showLeftPush.onclick = function() {
-				classie.toggle( this, 'active' );
-				classie.toggle( body, 'cbp-spmenu-push-toright' );
-				classie.toggle( menuLeft, 'cbp-spmenu-open' );
-				disableOther( 'showLeftPush' );
-			};
-			
-			function disableOther( button ) {
-				if( button !== 'showLeftPush' ) {
-					classie.toggle( showLeftPush, 'disabled' );
-				}
-			}
-		</script>
-
-	<script src="js/scripts.js"></script>
-
-   <script src="js/bootstrap.js"> </script>
-   
-</body>
-</html>
\ No newline at end of file

src/main/resources/public/forms.html

-<!--
-Author: W3layouts
-Author URL: http://w3layouts.com
-License: Creative Commons Attribution 3.0 Unported
-License URL: http://creativecommons.org/licenses/by/3.0/
--->
-<!DOCTYPE HTML>
-<html>
-<head>
-<title>Glance Design Dashboard an Admin Panel Category Flat Bootstrap Responsive Website Template | Forms :: 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="Glance Design Dashboard Responsive web template, Bootstrap Web Templates, Flat Web Templates, Android Compatible web template, 
-SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, SonyEricsson, Motorola web design" />
-<script type="application/x-javascript"> addEventListener("load", function() { setTimeout(hideURLbar, 0); }, false); function hideURLbar(){ window.scrollTo(0,1); } </script>
-
-<!-- Bootstrap Core CSS -->
-<link href="css/bootstrap.css" rel='stylesheet' type='text/css' />
-
-<!-- Custom CSS -->
-<link href="css/style.css" rel='stylesheet' type='text/css' />
-
-<!-- font-awesome icons CSS -->
-<link href="css/font-awesome.css" rel="stylesheet"> 
-<!-- //font-awesome icons CSS -->
-
- <!-- side nav css file -->
- <link href='css/SidebarNav.min.css' media='all' rel='stylesheet' type='text/css'/>
- <!-- side nav css file -->
- 
- <!-- js-->
-<script src="js/jquery-1.11.1.min.js"></script>
-<script src="js/modernizr.custom.js"></script>
-
-<!--webfonts-->
-<link href="//fonts.googleapis.com/css?family=PT+Sans:400,400i,700,700i&amp;subset=cyrillic,cyrillic-ext,latin-ext" rel="stylesheet">
-<!--//webfonts--> 
-
-<!-- Metis Menu -->
-<script src="js/metisMenu.min.js"></script>
-<script src="js/custom.js"></script>
-<link href="css/custom.css" rel="stylesheet">
-<!--//Metis Menu -->
-
-</head> 
-<body class="cbp-spmenu-push">
-	<div class="main-content">
-	<div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1">
-		<!--left-fixed -navigation-->
-		<aside class="sidebar-left">
-      <nav class="navbar navbar-inverse">
-          <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".collapse" aria-expanded="false">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="index.html"><span class="fa fa-area-chart"></span> Glance<span class="dashboard_text">Design Dashboard</span></a>
-          </div>
-          <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-            <ul class="sidebar-menu">
-              <li class="header">MAIN NAVIGATION</li>
-              <li class="treeview">
-                <a href="index.html">
-					<span class="glyphicon glyphicon-user"></span> <span>Employee</span>
-                </a>
-              </li>
-			  <li class="treeview">
-                <a href="#">
-                <i class="fa fa-laptop"></i>
-                <span>Project</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="grids.html"><i class="fa fa-angle-right"></i> Grids</a></li>
-                  <li><a href="media.html"><i class="fa fa-angle-right"></i> Media Css</a></li>
-                </ul>
-
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-laptop"></i>
-                <span>UI Elements</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="general.html"><i class="fa fa-angle-right"></i> General</a></li>
-                  <li><a href="icons.html"><i class="fa fa-angle-right"></i> Icons</a></li>
-                  <li><a href="buttons.html"><i class="fa fa-angle-right"></i> Buttons</a></li>
-                  <li><a href="typography.html"><i class="fa fa-angle-right"></i> Typography</a></li>
-                </ul>
-              </li>
-			  <li>
-                <a href="timesheet.html">
-                <i class="fa fa-th"></i> <span>Timesheet</span>
-                <small class="label pull-right label-info">08</small>
-                </a>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-edit"></i> <span>Forms</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="forms.html"><i class="fa fa-angle-right"></i> General Forms</a></li>
-                  <li><a href="validation.html"><i class="fa fa-angle-right"></i> Form Validations</a></li>
-                </ul>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-table"></i> <span>Tables</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-envelope"></i> <span>Mailbox</span>
-                <i class="fa fa-angle-left pull-right"></i><small class="label pull-right label-info1">08</small><span class="label label-primary1 pull-right">02</span></a>
-                <ul class="treeview-menu">
-                  <li><a href="inbox.html"><i class="fa fa-angle-right"></i> Mail Inbox</a></li>
-                  <li><a href="compose.html"><i class="fa fa-angle-right"></i> Compose Mail </a></li>
-                </ul>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-folder"></i> <span>Examples</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li>
-                  <li><a href="signup.html"><i class="fa fa-angle-right"></i> Register</a></li>
-
-                  <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
-                </ul>
-              </li>
-              <li class="header">LABELS</li>
-              <li><a href="#"><i class="fa fa-angle-right text-red"></i> <span>Important</span></a></li>
-              <li><a href="#"><i class="fa fa-angle-right text-yellow"></i> <span>Warning</span></a></li>
-              <li><a href="#"><i class="fa fa-angle-right text-aqua"></i> <span>Information</span></a></li>
-            </ul>
-          </div>
-          <!-- /.navbar-collapse -->
-      </nav>
-    </aside>
-	</div>
-		<!--left-fixed -navigation-->
-		
-		<!-- header-starts -->
-		<div class="sticky-header header-section ">
-			<div class="header-left">
-				
-				<!--toggle button start-->
-				<button id="showLeftPush"><i class="fa fa-bars"></i></button>
-				<!--toggle button end-->
-				<div class="profile_details_left"><!--notifications of menu start -->
-					<ul class="nofitications-dropdown">
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-envelope"></i><span class="badge">4</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 3 new messages</h3>
-									</div>
-								</li>
-								<li><a href="#">
-								   <div class="user_img"><img src="images/1.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet</p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								</a></li>
-								<li class="odd"><a href="#">
-									<div class="user_img"><img src="images/4.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								  <div class="clearfix"></div>	
-								</a></li>
-								<li><a href="#">
-								   <div class="user_img"><img src="images/3.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								</a></li>
-								<li>
-									<div class="notification_bottom">
-										<a href="#">See all messages</a>
-									</div> 
-								</li>
-							</ul>
-						</li>
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-bell"></i><span class="badge blue">4</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 3 new notification</h3>
-									</div>
-								</li>
-								<li><a href="#">
-									<div class="user_img"><img src="images/4.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet</p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								  <div class="clearfix"></div>	
-								 </a></li>
-								 <li class="odd"><a href="#">
-									<div class="user_img"><img src="images/1.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								 </a></li>
-								 <li><a href="#">
-									<div class="user_img"><img src="images/3.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								 </a></li>
-								 <li>
-									<div class="notification_bottom">
-										<a href="#">See all notifications</a>
-									</div> 
-								</li>
-							</ul>
-						</li>	
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-tasks"></i><span class="badge blue1">8</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 8 pending task</h3>
-									</div>
-								</li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Database update</span><span class="percentage">40%</span>
-										<div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										<div class="bar yellow" style="width:40%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Dashboard done</span><span class="percentage">90%</span>
-									   <div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										 <div class="bar green" style="width:90%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Mobile App</span><span class="percentage">33%</span>
-										<div class="clearfix"></div>	
-									</div>
-								   <div class="progress progress-striped active">
-										 <div class="bar red" style="width: 33%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Issues fixed</span><span class="percentage">80%</span>
-									   <div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										 <div class="bar  blue" style="width: 80%;"></div>
-									</div>
-								</a></li>
-								<li>
-									<div class="notification_bottom">
-										<a href="#">See all pending tasks</a>
-									</div> 
-								</li>
-							</ul>
-						</li>	
-					</ul>
-					<div class="clearfix"> </div>
-				</div>
-				<!--notification menu end -->
-				<div class="clearfix"> </div>
-			</div>
-			<div class="header-right">
-				
-				
-				<!--search-box-->
-				<div class="search-box">
-					<form class="input">
-						<input class="sb-search-input input__field--madoka" placeholder="Search..." type="search" id="input-31" />
-						<label class="input__label" for="input-31">
-							<svg class="graphic" width="100%" height="100%" viewBox="0 0 404 77" preserveAspectRatio="none">
-								<path d="m0,0l404,0l0,77l-404,0l0,-77z"/>
-							</svg>
-						</label>
-					</form>
-				</div><!--//end-search-box-->
-				
-				<div class="profile_details">		
-					<ul>
-						<li class="dropdown profile_details_drop">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-								<div class="profile_img">	
-									<span class="prfil-img"><img src="images/2.jpg" alt=""> </span> 
-									<div class="user-name">
-										<p>Admin Name</p>
-										<span>Administrator</span>
-									</div>
-									<i class="fa fa-angle-down lnr"></i>
-									<i class="fa fa-angle-up lnr"></i>
-									<div class="clearfix"></div>	
-								</div>	
-							</a>
-							<ul class="dropdown-menu drp-mnu">
-								<li> <a href="#"><i class="fa fa-cog"></i> Settings</a> </li> 
-								<li> <a href="#"><i class="fa fa-user"></i> My Account</a> </li>
-								<li> <a href="#"><i class="fa fa-suitcase"></i> Profile</a> </li> 
-								<li> <a href="#"><i class="fa fa-sign-out"></i> Logout</a> </li>
-							</ul>
-						</li>
-					</ul>
-				</div>
-				<div class="clearfix"> </div>				
-			</div>
-			<div class="clearfix"> </div>	
-		</div>
-		<!-- //header-ends -->
-		<!-- main content start-->
-		<div id="page-wrapper">
-			<div class="main-page">
-				<div class="forms">
-					<h2 class="title1">Forms</h2>
-					<div class="form-grids row widget-shadow" data-example-id="basic-forms"> 
-						<div class="form-title">
-							<h4>Basic Form :</h4>
-						</div>
-						<div class="form-body">
-							<form> <div class="form-group"> <label for="exampleInputEmail1">Email address</label> <input type="email" class="form-control" id="exampleInputEmail1" placeholder="Email"> </div> <div class="form-group"> <label for="exampleInputPassword1">Password</label> <input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password"> </div> <div class="form-group"> <label for="exampleInputFile">File input</label> <input type="file" id="exampleInputFile"> <p class="help-block">Example block-level help text here.</p> </div> <div class="checkbox"> <label> <input type="checkbox"> Check me out </label> </div> <button type="submit" class="btn btn-default">Submit</button> </form> 
-						</div>
-					</div>
-					<div class=" form-grids row form-grids-right">
-						<div class="widget-shadow " data-example-id="basic-forms"> 
-							<div class="form-title">
-								<h4>Horizontal form :</h4>
-							</div>
-							<div class="form-body">
-								<form class="form-horizontal"> <div class="form-group"> <label for="inputEmail3" class="col-sm-2 control-label">Email</label> <div class="col-sm-9"> <input type="email" class="form-control" id="inputEmail3" placeholder="Email"> </div> </div> <div class="form-group"> <label for="inputPassword3" class="col-sm-2 control-label">Password</label> <div class="col-sm-9"> <input type="password" class="form-control" id="inputPassword3" placeholder="Password"> </div> </div> <div class="form-group"> <div class="col-sm-offset-2 col-sm-10"> <div class="checkbox"> <label> <input type="checkbox"> Remember me </label> </div> </div> </div> <div class="col-sm-offset-2"> <button type="submit" class="btn btn-default">Sign in</button> </div> </form> 
-							</div>
-						</div>
-					</div>
-					<div class="inline-form widget-shadow">
-						<div class="form-title">
-							<h4>Inline form Example 1 :</h4>
-						</div>
-						<div class="form-body">
-							<div data-example-id="simple-form-inline"> <form class="form-inline"> <div class="form-group"> <input type="email" class="form-control" id="exampleInputEmail3" placeholder="Email"> </div> <div class="form-group"> <input type="password" class="form-control" id="exampleInputPassword3" placeholder="Password"> </div> <div class="checkbox"> <label> <input type="checkbox"> Remember me </label> </div> <button type="submit" class="btn btn-default">Sign in</button> </form> </div>
-						</div>
-					</div>
-					<div class="form-two widget-shadow">
-						<div class="form-title">
-							<h4>Inline form Example 2 :</h4>
-						</div>
-						<div class="form-body" data-example-id="simple-form-inline">
-							<form class="form-inline"> <div class="form-group"> <label for="exampleInputName2">Name</label> <input type="text" class="form-control" id="exampleInputName2" placeholder="Your name"> </div> <div class="form-group"> <label for="exampleInputEmail2">Email</label> <input type="email" class="form-control" id="exampleInputEmail2" placeholder="mail.abc@example.com"> </div> <button type="submit" class="btn btn-default">Send invitation</button> </form> 
-						</div>
-					</div>
-					<div class="row">
-						<h3 class="title1">General Form :</h3>
-						<div class="form-three widget-shadow">
-							<form class="form-horizontal">
-								<div class="form-group">
-									<label for="focusedinput" class="col-sm-2 control-label">Focused Input</label>
-									<div class="col-sm-8">
-										<input type="text" class="form-control1" id="focusedinput" placeholder="Default Input">
-									</div>
-									<div class="col-sm-2">
-										<p class="help-block">Your help text!</p>
-									</div>
-								</div>
-								<div class="form-group">
-									<label for="disabledinput" class="col-sm-2 control-label">Disabled Input</label>
-									<div class="col-sm-8">
-										<input disabled="" type="text" class="form-control1" id="disabledinput" placeholder="Disabled Input">
-									</div>
-								</div>
-								<div class="form-group">
-									<label for="inputPassword" class="col-sm-2 control-label">Password</label>
-									<div class="col-sm-8">
-										<input type="password" class="form-control1" id="inputPassword" placeholder="Password">
-									</div>
-								</div>
-								<div class="form-group">
-									<label for="checkbox" class="col-sm-2 control-label">Checkbox</label>
-									<div class="col-sm-8">
-										<div class="checkbox-inline1"><label><input type="checkbox"> Unchecked</label></div>
-										<div class="checkbox-inline1"><label><input type="checkbox" checked=""> Checked</label></div>
-										<div class="checkbox-inline1"><label><input type="checkbox" disabled=""> Disabled Unchecked</label></div>
-										<div class="checkbox-inline1"><label><input type="checkbox" disabled="" checked=""> Disabled Checked</label></div>
-									</div>
-								</div>
-								<div class="form-group">
-									<label for="checkbox" class="col-sm-2 control-label">Checkbox Inline</label>
-									<div class="col-sm-8">
-										<div class="checkbox-inline"><label><input type="checkbox"> Unchecked</label></div>
-										<div class="checkbox-inline"><label><input type="checkbox" checked=""> Checked</label></div>
-										<div class="checkbox-inline"><label><input type="checkbox" disabled=""> Disabled Unchecked</label></div>
-										<div class="checkbox-inline"><label><input type="checkbox" disabled="" checked=""> Disabled Checked</label></div>
-									</div>
-								</div>
-								<div class="form-group">
-									<label for="selector1" class="col-sm-2 control-label">Dropdown Select</label>
-									<div class="col-sm-8"><select name="selector1" id="selector1" class="form-control1">
-										<option>Lorem ipsum dolor sit amet.</option>
-										<option>Dolore, ab unde modi est!</option>
-										<option>Illum, fuga minus sit eaque.</option>
-										<option>Consequatur ducimus maiores voluptatum minima.</option>
-									</select></div>
-								</div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label">Multiple Select</label>
-									<div class="col-sm-8">
-										<select multiple="" class="form-control1">
-											<option>Option 1</option>
-											<option>Option 2</option>
-											<option>Option 3</option>
-											<option>Option 4</option>
-											<option>Option 5</option>
-										</select>
-									</div>
-								</div>
-								<div class="form-group">
-									<label for="txtarea1" class="col-sm-2 control-label">Textarea</label>
-									<div class="col-sm-8"><textarea name="txtarea1" id="txtarea1" cols="50" rows="4" class="form-control1"></textarea></div>
-								</div>
-								<div class="form-group">
-									<label for="radio" class="col-sm-2 control-label">Radio</label>
-									<div class="col-sm-8">
-										<div class="radio block"><label><input type="radio"> Unchecked</label></div>
-										<div class="radio block"><label><input type="radio" checked=""> Checked</label></div>
-										<div class="radio block"><label><input type="radio" disabled=""> Disabled Unchecked</label></div>
-										<div class="radio block"><label><input type="radio" disabled="" checked=""> Disabled Checked</label></div>
-									</div>
-								</div>
-								<div class="form-group">
-									<label for="radio" class="col-sm-2 control-label">Radio Inline</label>
-									<div class="col-sm-8">
-										<div class="radio-inline"><label><input type="radio"> Unchecked</label></div>
-										<div class="radio-inline"><label><input type="radio" checked=""> Checked</label></div>
-										<div class="radio-inline"><label><input type="radio" disabled=""> Disabled Unchecked</label></div>
-										<div class="radio-inline"><label><input type="radio" disabled="" checked=""> Disabled Checked</label></div>
-									</div>
-								</div>
-								<div class="form-group">
-									<label for="smallinput" class="col-sm-2 control-label label-input-sm">Small Input</label>
-									<div class="col-sm-8">
-										<input type="text" class="form-control1 input-sm" id="smallinput" placeholder="Small Input">
-									</div>
-								</div>
-								<div class="form-group">
-									<label for="mediuminput" class="col-sm-2 control-label">Medium Input</label>
-									<div class="col-sm-8">
-										<input type="text" class="form-control1" id="mediuminput" placeholder="Medium Input">
-									</div>
-								</div>
-								<div class="form-group mb-n">
-									<label for="largeinput" class="col-sm-2 control-label label-input-lg">Large Input</label>
-									<div class="col-sm-8">
-										<input type="text" class="form-control1 input-lg" id="largeinput" placeholder="Large Input">
-									</div>
-								</div>
-							</form>
-						</div>
-					</div>
-					<div class="row">
-						<h3 class="title1">Variable Forms :</h3>
-						<div class="form-three widget-shadow">
-							<div data-example-id="form-validation-states-with-icons"> <form> <div class="form-group has-success has-feedback"> <label class="control-label" for="inputSuccess2">Input with success</label> <input type="text" class="form-control" id="inputSuccess2" aria-describedby="inputSuccess2Status"> <span class="glyphicon glyphicon-ok form-control-feedback" aria-hidden="true"></span> <span id="inputSuccess2Status" class="sr-only">(success)</span> </div> <div class="form-group has-warning has-feedback"> <label class="control-label" for="inputWarning2">Input with warning</label> <input type="text" class="form-control" id="inputWarning2" aria-describedby="inputWarning2Status"> <span class="glyphicon glyphicon-warning-sign form-control-feedback" aria-hidden="true"></span> <span id="inputWarning2Status" class="sr-only">(warning)</span> </div> <div class="form-group has-error has-feedback"> <label class="control-label" for="inputError2">Input with error</label> <input type="text" class="form-control" id="inputError2" aria-describedby="inputError2Status"> <span class="glyphicon glyphicon-remove form-control-feedback" aria-hidden="true"></span> <span id="inputError2Status" class="sr-only">(error)</span> </div> <div class="form-group has-success has-feedback"> <label class="control-label" for="inputGroupSuccess1">Input group with success</label> <div class="input-group"> <span class="input-group-addon">@</span> <input type="text" class="form-control" id="inputGroupSuccess1" aria-describedby="inputGroupSuccess1Status"> </div> <span class="glyphicon glyphicon-ok form-control-feedback" aria-hidden="true"></span> <span id="inputGroupSuccess1Status" class="sr-only">(success)</span> </div> </form> </div>
-						</div>
-						<div class="form-three widget-shadow">
-							<div class=" panel-body-inputin">
-								<form class="form-horizontal">
-									<div class="form-group">
-										<label class="col-md-2 control-label">Email Address</label>
-										<div class="col-md-8">
-											<div class="input-group">							
-												<span class="input-group-addon">
-													<i class="fa fa-envelope-o"></i>
-												</span>
-												<input type="text" class="form-control1" placeholder="Email Address">
-											</div>
-										</div>
-									</div>
-									<div class="form-group">
-										<label class="col-md-2 control-label">Password</label>
-										<div class="col-md-8">
-											<div class="input-group">
-												<span class="input-group-addon">
-													<i class="fa fa-key"></i>
-												</span>
-												<input type="password" class="form-control1" id="exampleInputPassword1" placeholder="Password">
-											</div>
-										</div>
-									</div>
-									<div class="form-group">
-										<label class="col-md-2 control-label">Email Address</label>
-										<div class="col-md-8">
-											<div class="input-group input-icon right">
-												<span class="input-group-addon">
-													<i class="fa fa-envelope-o"></i>
-												</span>
-												<input id="email" class="form-control1" type="text" placeholder="Email Address">
-											</div>
-										</div>
-										<div class="col-sm-2">
-											<p class="help-block">With tooltip</p>
-										</div>
-									</div>
-									<div class="form-group">
-										<label class="col-md-2 control-label">Password</label>
-										<div class="col-md-8">
-											<div class="input-group input-icon right">
-												<span class="input-group-addon">
-													<i class="fa fa-key"></i>
-												</span>
-												<input type="password" class="form-control1" placeholder="Password">
-											</div>
-										</div>
-										<div class="col-sm-2">
-											<p class="help-block">With tooltip</p>
-										</div>
-									</div>
-									<div class="form-group has-success">
-										<label class="col-md-2 control-label">Input Addon Success</label>
-										<div class="col-md-8">
-											<div class="input-group input-icon right">
-												<span class="input-group-addon">
-													<i class="fa fa-envelope-o"></i>
-												</span>
-												<input id="email" class="form-control1" type="text" placeholder="Email Address">
-											</div>
-										</div>
-										<div class="col-sm-2">
-											<p class="help-block">Email is valid!</p>
-										</div>
-									</div>
-									<div class="form-group has-error">
-										<label class="col-md-2 control-label">Input Addon Error</label>
-										<div class="col-md-8">
-											<div class="input-group input-icon right">
-												<span class="input-group-addon">
-													<i class="fa fa-key"></i>
-												</span>
-												<input type="password" class="form-control1" placeholder="Password">
-											</div>
-										</div>
-										<div class="col-sm-2">
-											<p class="help-block">Error!</p>
-										</div>
-									</div>
-									<div class="form-group">
-										<label class="col-md-2 control-label">Checkbox Addon</label>
-										<div class="col-md-8">
-											<div class="input-group">
-												<div class="input-group-addon"><input type="checkbox"></div>
-												<input type="text" class="form-control1">
-											</div>
-										</div>
-									</div>
-									<div class="form-group">
-										<label class="col-md-2 control-label">Checkbox Addon</label>
-										<div class="col-md-8">
-											<div class="input-group">
-												<input type="text" class="form-control1">
-												<div class="input-group-addon"><input type="checkbox"></div>
-												
-											</div>
-										</div>
-										<div class="col-sm-2">
-											<p class="help-block">Checkbox on right</p>
-										</div>
-									</div>
-									<div class="form-group">
-										<label class="col-md-2 control-label">Radio Addon</label>
-										<div class="col-md-8">
-											<div class="input-group">
-												<div class="input-group-addon"><input type="radio"></div>
-												<input type="text" class="form-control1">
-											</div>
-										</div>
-									</div>
-									<div class="form-group">
-										<label class="col-md-2 control-label">Radio Addon</label>
-										<div class="col-md-8">
-											<div class="input-group">
-												<input type="text" class="form-control1">
-												<div class="input-group-addon"><input type="radio"></div>
-												
-											</div>
-										</div>
-										<div class="col-sm-2">
-											<p class="help-block">Radio on right</p>
-										</div>
-									</div>
-									<div class="form-group">
-										<label class="col-md-2 control-label">Input Processing</label>
-										<div class="col-md-8">
-											<div class="input-icon right spinner">
-												<i class="fa fa-fw fa-spin fa-spinner"></i>
-												<input id="email" class="form-control1" type="text" placeholder="Processing...">
-											</div>
-										</div>
-										<div class="col-sm-2">
-											<p class="help-block">Processing right</p>
-										</div>
-									</div>
-									<div class="form-group">
-										<label class="col-md-2 control-label">Static Paragraph</label>
-										<div class="col-md-8">
-											<p class="form-control1 m-n">email@example.com</p>
-										</div>
-									</div>
-									<div class="form-group mb-n">
-										<label class="col-md-2 control-label">Readonly</label>
-										<div class="col-md-8">
-											<input type="text" class="form-control1" placeholder="Readonly" readonly="">
-										</div>
-									</div>
-								</form>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<!--footer-->
-		<div class="footer">
-		   <p>&copy; 2018 Glance Design Dashboard. All Rights Reserved | Design by <a href="https://w3layouts.com/" target="_blank">w3layouts</a></p>
-	   </div>
-        <!--//footer-->
-	</div>
-	
-	<!-- side nav js -->
-	<script src='js/SidebarNav.min.js' type='text/javascript'></script>
-	<script>
-      $('.sidebar-menu').SidebarNav()
-    </script>
-	<!-- //side nav js -->
-	
-	<!-- Classie --><!-- for toggle left push menu script -->
-		<script src="js/classie.js"></script>
-		<script>
-			var menuLeft = document.getElementById( 'cbp-spmenu-s1' ),
-				showLeftPush = document.getElementById( 'showLeftPush' ),
-				body = document.body;
-				
-			showLeftPush.onclick = function() {
-				classie.toggle( this, 'active' );
-				classie.toggle( body, 'cbp-spmenu-push-toright' );
-				classie.toggle( menuLeft, 'cbp-spmenu-open' );
-				disableOther( 'showLeftPush' );
-			};
-			
-			function disableOther( button ) {
-				if( button !== 'showLeftPush' ) {
-					classie.toggle( showLeftPush, 'disabled' );
-				}
-			}
-		</script>
-	<!-- //Classie --><!-- //for toggle left push menu script -->
-	
-	<!--scrolling js-->
-
-	<script src="js/scripts.js"></script>
-	<!--//scrolling js-->
-	
-	<!-- Bootstrap Core JavaScript -->
-   <script src="js/bootstrap.js"> </script>
-   
-</body>
-</html>
\ No newline at end of file

src/main/resources/public/general.html

-<!--
-Author: W3layouts
-Author URL: http://w3layouts.com
-License: Creative Commons Attribution 3.0 Unported
-License URL: http://creativecommons.org/licenses/by/3.0/
--->
-<!DOCTYPE HTML>
-<html>
-<head>
-<title>Glance Design Dashboard an Admin Panel Category Flat Bootstrap Responsive Website Template | General Elements :: 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="Glance Design Dashboard Responsive web template, Bootstrap Web Templates, Flat Web Templates, Android Compatible web template, 
-SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, SonyEricsson, Motorola web design" />
-<script type="application/x-javascript"> addEventListener("load", function() { setTimeout(hideURLbar, 0); }, false); function hideURLbar(){ window.scrollTo(0,1); } </script>
-
-<!-- Bootstrap Core CSS -->
-<link href="css/bootstrap.css" rel='stylesheet' type='text/css' />
-
-<!-- Custom CSS -->
-<link href="css/style.css" rel='stylesheet' type='text/css' />
-
-<!-- font-awesome icons CSS -->
-<link href="css/font-awesome.css" rel="stylesheet"> 
-<!-- //font-awesome icons CSS -->
-
- <!-- side nav css file -->
- <link href='css/SidebarNav.min.css' media='all' rel='stylesheet' type='text/css'/>
- <!-- side nav css file -->
- 
- <!-- js-->
-<script src="js/jquery-1.11.1.min.js"></script>
-<script src="js/modernizr.custom.js"></script>
-
-<!--webfonts-->
-<link href="//fonts.googleapis.com/css?family=PT+Sans:400,400i,700,700i&amp;subset=cyrillic,cyrillic-ext,latin-ext" rel="stylesheet">
-<!--//webfonts--> 
-
-<!-- Metis Menu -->
-<script src="js/metisMenu.min.js"></script>
-<script src="js/custom.js"></script>
-<link href="css/custom.css" rel="stylesheet">
-<!--//Metis Menu -->
-
-</head> 
-<body class="cbp-spmenu-push">
-	<div class="main-content">
-	<div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1">
-		<!--left-fixed -navigation-->
-		<aside class="sidebar-left">
-      <nav class="navbar navbar-inverse">
-          <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".collapse" aria-expanded="false">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            </button>
-            <h1><a class="navbar-brand" href="index.html"><span class="fa fa-area-chart"></span> Glance<span class="dashboard_text">Design dashboard</span></a></h1>
-          </div>
-          <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-            <ul class="sidebar-menu">
-              <li class="header">MAIN NAVIGATION</li>
-              <li class="treeview">
-                <a href="index.html">
-					<span class="glyphicon glyphicon-user"></span> <span>Employee</span>
-                </a>
-              </li>
-			  <li class="treeview">
-                <a href="#">
-                <i class="fa fa-laptop"></i>
-                <span>Project</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="grids.html"><i class="fa fa-angle-right"></i> Grids</a></li>
-                  <li><a href="media.html"><i class="fa fa-angle-right"></i> Media Css</a></li>
-                </ul>
-
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-laptop"></i>
-                <span>UI Elements</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="general.html"><i class="fa fa-angle-right"></i> General</a></li>
-                  <li><a href="icons.html"><i class="fa fa-angle-right"></i> Icons</a></li>
-                  <li><a href="buttons.html"><i class="fa fa-angle-right"></i> Buttons</a></li>
-                  <li><a href="typography.html"><i class="fa fa-angle-right"></i> Typography</a></li>
-                </ul>
-              </li>
-			  <li>
-                <a href="timesheet.html">
-                <i class="fa fa-th"></i> <span>Widgets</span>
-                <small class="label pull-right label-info">08</small>
-                </a>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-edit"></i> <span>Forms</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="forms.html"><i class="fa fa-angle-right"></i> General Forms</a></li>
-                  <li><a href="validation.html"><i class="fa fa-angle-right"></i> Form Validations</a></li>
-                </ul>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-table"></i> <span>Tables</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-envelope"></i> <span>Mailbox</span>
-                <i class="fa fa-angle-left pull-right"></i><small class="label pull-right label-info1">08</small><span class="label label-primary1 pull-right">02</span></a>
-                <ul class="treeview-menu">
-                  <li><a href="inbox.html"><i class="fa fa-angle-right"></i> Mail Inbox</a></li>
-                  <li><a href="compose.html"><i class="fa fa-angle-right"></i> Compose Mail </a></li>
-                </ul>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-folder"></i> <span>Examples</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li>
-                  <li><a href="signup.html"><i class="fa fa-angle-right"></i> Register</a></li>
-
-                  <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
-                </ul>
-              </li>
-              <li class="header">LABELS</li>
-              <li><a href="#"><i class="fa fa-angle-right text-red"></i> <span>Important</span></a></li>
-              <li><a href="#"><i class="fa fa-angle-right text-yellow"></i> <span>Warning</span></a></li>
-              <li><a href="#"><i class="fa fa-angle-right text-aqua"></i> <span>Information</span></a></li>
-            </ul>
-          </div>
-          <!-- /.navbar-collapse -->
-      </nav>
-    </aside>
-	</div>
-		<!--left-fixed -navigation-->
-		
-		<!-- header-starts -->
-		<div class="sticky-header header-section ">
-			<div class="header-left">
-				
-				<!--toggle button start-->
-				<button id="showLeftPush"><i class="fa fa-bars"></i></button>
-				<!--toggle button end-->
-				<div class="profile_details_left"><!--notifications of menu start -->
-					<ul class="nofitications-dropdown">
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-envelope"></i><span class="badge">4</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 3 new messages</h3>
-									</div>
-								</li>
-								<li><a href="#">
-								   <div class="user_img"><img src="images/1.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet</p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								</a></li>
-								<li class="odd"><a href="#">
-									<div class="user_img"><img src="images/4.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								  <div class="clearfix"></div>	
-								</a></li>
-								<li><a href="#">
-								   <div class="user_img"><img src="images/3.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								</a></li>
-								<li>
-									<div class="notification_bottom">
-										<a href="#">See all messages</a>
-									</div> 
-								</li>
-							</ul>
-						</li>
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-bell"></i><span class="badge blue">4</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 3 new notification</h3>
-									</div>
-								</li>
-								<li><a href="#">
-									<div class="user_img"><img src="images/4.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet</p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								  <div class="clearfix"></div>	
-								 </a></li>
-								 <li class="odd"><a href="#">
-									<div class="user_img"><img src="images/1.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								 </a></li>
-								 <li><a href="#">
-									<div class="user_img"><img src="images/3.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								 </a></li>
-								 <li>
-									<div class="notification_bottom">
-										<a href="#">See all notifications</a>
-									</div> 
-								</li>
-							</ul>
-						</li>	
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-tasks"></i><span class="badge blue1">8</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 8 pending task</h3>
-									</div>
-								</li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Database update</span><span class="percentage">40%</span>
-										<div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										<div class="bar yellow" style="width:40%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Dashboard done</span><span class="percentage">90%</span>
-									   <div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										 <div class="bar green" style="width:90%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Mobile App</span><span class="percentage">33%</span>
-										<div class="clearfix"></div>	
-									</div>
-								   <div class="progress progress-striped active">
-										 <div class="bar red" style="width: 33%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Issues fixed</span><span class="percentage">80%</span>
-									   <div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										 <div class="bar  blue" style="width: 80%;"></div>
-									</div>
-								</a></li>
-								<li>
-									<div class="notification_bottom">
-										<a href="#">See all pending tasks</a>
-									</div> 
-								</li>
-							</ul>
-						</li>	
-					</ul>
-					<div class="clearfix"> </div>
-				</div>
-				<!--notification menu end -->
-				<div class="clearfix"> </div>
-			</div>
-			<div class="header-right">
-				
-				
-				<!--search-box-->
-				<div class="search-box">
-					<form class="input">
-						<input class="sb-search-input input__field--madoka" placeholder="Search..." type="search" id="input-31" />
-						<label class="input__label" for="input-31">
-							<svg class="graphic" width="100%" height="100%" viewBox="0 0 404 77" preserveAspectRatio="none">
-								<path d="m0,0l404,0l0,77l-404,0l0,-77z"/>
-							</svg>
-						</label>
-					</form>
-				</div><!--//end-search-box-->
-				
-				<div class="profile_details">		
-					<ul>
-						<li class="dropdown profile_details_drop">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-								<div class="profile_img">	
-									<span class="prfil-img"><img src="images/2.jpg" alt=""> </span> 
-									<div class="user-name">
-										<p>Admin Name</p>
-										<span>Administrator</span>
-									</div>
-									<i class="fa fa-angle-down lnr"></i>
-									<i class="fa fa-angle-up lnr"></i>
-									<div class="clearfix"></div>	
-								</div>	
-							</a>
-							<ul class="dropdown-menu drp-mnu">
-								<li> <a href="#"><i class="fa fa-cog"></i> Settings</a> </li> 
-								<li> <a href="#"><i class="fa fa-user"></i> My Account</a> </li>
-								<li> <a href="#"><i class="fa fa-suitcase"></i> Profile</a> </li> 
-								<li> <a href="#"><i class="fa fa-sign-out"></i> Logout</a> </li>
-							</ul>
-						</li>
-					</ul>
-				</div>
-				<div class="clearfix"> </div>				
-			</div>
-			<div class="clearfix"> </div>	
-		</div>
-		<!-- //header-ends -->
-		<!-- main content start-->
-		<div id="page-wrapper">
-			<div class="main-page general">
-				<h2 class="title1">General Elements</h2>
-				<div class="panel-info widget-shadow">
-					<h4 class="title2">Contextual alternatives :</h4>
-					<div class="col-md-6 panel-grids">
-						<div class="panel panel-default"> <div class="panel-heading"> <h3 class="panel-title">Panel Default</h3> </div> <div class="panel-body">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin iaculis quam sit amet nisi dictum, in iaculis dolor lobortis. Aenean placerat purus non faucibus.</div> </div>
-					</div>
-					<div class="col-md-6 panel-grids">
-						<div class="panel panel-primary"> <div class="panel-heading"> <h3 class="panel-title">Panel Primary</h3> </div> <div class="panel-body"> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin iaculis quam sit amet nisi dictum, in iaculis dolor lobortis. Aenean placerat purus non faucibus. </div> </div>
-					</div>
-					<div class="col-md-6 panel-grids">
-						<div class="panel panel-success"> <div class="panel-heading"> <h3 class="panel-title">Panel Success</h3> </div> <div class="panel-body"> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin iaculis quam sit amet nisi dictum, in iaculis dolor lobortis. Aenean placerat purus non faucibus. </div> </div>
-					</div>
-					<div class="col-md-6 panel-grids">
-						<div class="panel panel-info"> <div class="panel-heading"> <h3 class="panel-title"> Panel Info</h3> </div> <div class="panel-body"> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin iaculis quam sit amet nisi dictum, in iaculis dolor lobortis. Aenean placerat purus non faucibus. </div> </div>
-					</div>
-					<div class="col-md-6 panel-grids">
-						<div class="panel panel-warning"> <div class="panel-heading"> <h3 class="panel-title">Panel Warning</h3> </div> <div class="panel-body"> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin iaculis quam sit amet nisi dictum, in iaculis dolor lobortis. Aenean placerat purus non faucibus.</div> </div>
-					</div>
-					<div class="col-md-6 panel-grids">
-						<div class="panel panel-danger"> <div class="panel-heading"> <h3 class="panel-title">Panel Danger</h3> </div> <div class="panel-body"> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin iaculis quam sit amet nisi dictum, in iaculis dolor lobortis. Aenean placerat purus non faucibus. </div> </div>
-					</div>
-					<div class="clearfix"> </div>
-				</div>
-				<div class="modals widget-shadow">
-					<h4 class="title2">Modals :</h4>
-					<div class="col-md-4 modal-grids">
-						<button type="button" class="btn btn-primary btn-lg" data-toggle="modal" data-target="#gridSystemModal">Demo modal </button>
-						<div class="modal fade" id="gridSystemModal" tabindex="-1" role="dialog" aria-labelledby="gridSystemModalLabel">
-							<div class="modal-dialog" role="document">
-								<div class="modal-content">
-									<div class="modal-header">
-										<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-										<h4 class="modal-title" id="gridSystemModalLabel">Modal title</h4>
-									</div>
-									<div class="modal-body">
-										<div class="row-info"> 
-											<div class="col-md-4">.col-md-4</div> 
-											<div class="col-md-4 col-md-offset-4">.col-md-4 .col-md-offset-4</div> 
-										</div>  
-										<div class="row"> 
-											<div class="col-md-6 col-md-offset-3">.col-md-6 .col-md-offset-3</div> 
-										</div> 
-										<div class="row">
-											<div class="col-sm-9"> Level 1: .col-sm-9 
-										<div class="row"> <div class="col-xs-8 col-sm-6"> Level 2: .col-xs-8 .col-sm-6 </div> 
-										<div class="col-xs-4 col-sm-6"> Level 2: .col-xs-4 .col-sm-6 </div> </div> </div> </div> </div>
-									<div class="modal-footer">
-										<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-										<button type="button" class="btn btn-primary">Save changes</button>
-									</div>
-								</div><!-- /.modal-content -->
-							</div><!-- /.modal-dialog -->
-						</div><!-- /.modal -->
-					</div>
-					<div class="col-md-4 modal-grids">
-						<button type="button" class="btn btn-primary btn-lg" data-toggle="modal" data-target="#exampleModal" data-whatever="@mdo">Open modal for @mdo</button>
-						<div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
-							<div class="modal-dialog" role="document">
-								<div class="modal-content">
-									<div class="modal-header">
-										<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-										<h4 class="modal-title" id="exampleModalLabel">New message</h4>
-									</div>
-									<div class="modal-body">
-										<form>
-											<div class="form-group">
-												<label for="recipient-name" class="control-label">Recipient:</label>
-												<input type="text" class="form-control" id="recipient-name">
-											</div>
-											<div class="form-group">
-												<label for="message-text" class="control-label">Message:</label>
-												<textarea class="form-control" id="message-text"></textarea>
-											</div>
-										</form>
-									</div>
-									<div class="modal-footer">
-										<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-										<button type="button" class="btn btn-primary">Send message</button>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div class="col-md-4 modal-grids">
-						<button type="button" class="btn btn-primary" data-toggle="modal" data-target=".bs-example-modal-sm">Small modal</button>
-						<div class="modal fade bs-example-modal-sm" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel">
-							<div class="modal-dialog modal-sm">
-								<div class="modal-content"> 
-									<div class="modal-header">
-										<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
-										<h4 class="modal-title" id="mySmallModalLabel">Small modal</h4> 
-									</div> 
-									<div class="modal-body"> Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div class="clearfix"> </div>
-				</div>
-				<div class="row">
-					<div class="col-md-6 general-grids widget-shadow">
-						<h4 class="title2">ScrollSpy example :</h4>
-						<div class="bs-example1" data-example-id="embedded-scrollspy"> 
-							<nav id="navbar-example2" class="navbar navbar-default navbar-static"> 
-								<div class="container-fluid"> 
-									<div class="navbar-header"> 
-										<button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target=".bs-example-js-navbar-scrollspy"> <span class="sr-only">Toggle navigation</span> 
-											<span class="icon-bar"></span> 
-											<span class="icon-bar"></span> 
-											<span class="icon-bar"></span> 
-										</button> 
-										<a class="navbar-brand" href="index.html">Project Name</a>
-									</div> 
-									<div class="collapse navbar-collapse bs-example-js-navbar-scrollspy"> 
-										<ul class="nav navbar-nav"> 
-											<li class="active"><a href="#fat">Item 1</a></li> 
-											<li class=""><a href="#three">Item 2</a></li> 
-											<li class=""><a href="#four">Item 3</a></li> 
-											<li class="dropdown"> <a href="#" id="navbarDrop1" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">New Items<span class="caret"></span></a> 
-												<ul class="dropdown-menu" aria-labelledby="navbarDrop1"> <li class=""><a href="#one">product 1</a></li> 
-													<li class=""><a href="#two">product 2</a></li> 
-												</ul> 
-											</li> 
-										</ul> 
-									</div> 
-								</div> 
-							</nav> 
-							<div data-spy="scroll" data-target="#navbar-example2" class="scrollspy-example scroll scrollbar1"> 
-								<h4 id="fat">Item 1</h4><p>Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamust.</p> 
-								<h4 id="three">Item 2</h4> <p>Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatevthundercats you probably haven't heard of them consequat hoodie gluten-free lo-fi fap aliquip. Labore elit placeat before they sold out, terry richardson proident brunch nesciunt quis cosby sweater pariatur keffiyeh ut helvetica artisan. </p> <p>Cardigan craft beer seitan readymade velit. VHS chambray laboris tempor veniam. Anim mollit minim commodo ullamco thundercats. </p> 							
-								<h4 id="four">Item 3</h4> <p>Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatevthundercats you probably haven't heard of them consequat hoodie gluten-free lo-fi fap aliquip. Labore elit placeat before they sold out, terry richardson proident brunch nesciunt quis cosby sweater pariatur keffiyeh ut helvetica artisan. </p> <p>Cardigan craft beer seitan readymade velit. VHS chambray laboris tempor veniam. Anim mollit minim commodo ullamco thundercats. </p> 							
-								<h4 id="one">New Product 1</h4> <p>Occaecat commodo aliqua delectus. Fap craft beer deserunt skateboard ea. Lomo bicycle rights adipisicing banh mi, velit ea sunt next level locavore single-origin coffee in magna veniam. High life id vinyl, echo park consequat quis aliquip banh mi pitchfork. Vero VHS est adipisicing. Consectetur nisi DIY minim messenger bag. Cred ex in, sustainable delectus consectetur fanny pack iphone.</p> 
-								<h4 id="two">New Product 2</h4> <p>In incididunt echo park, officia deserunt mcsweeney's proident master cleanse thundercats sapiente veniam. Excepteur VHS elit, proident shoreditch +1 biodiesel laborum craft beer. Single-origin coffee wayfarers irure four loko, cupidatat terry richardson master cleanse. Assumenda you probably haven't heard of them art party fanny pack, tattooed nulla cardigan tempor ad. Proident wolf nesciunt sartorial keffiyeh eu banh mi sustainable. Elit wolf voluptate, lo-fi ea portland before they sold out four loko. Locavore enim nostrud mlkshk brooklyn nesciunt.</p> 
-							</div> 
-						</div>
-					</div>
-					<div class="col-md-6 general-grids grids-right widget-shadow">
-						<h4 class="title2">Horizontal Tabs:</h4>
-						<ul id="myTabs" class="nav nav-tabs" role="tablist"> <li role="presentation" class=""><a href="#home" id="home-tab" role="tab" data-toggle="tab" aria-controls="home" aria-expanded="false">Home</a></li> <li role="presentation" class="active"><a href="#profile" role="tab" id="profile-tab" data-toggle="tab" aria-controls="profile" aria-expanded="true">Profile</a></li> <li role="presentation" class="dropdown"> <a href="#" id="myTabDrop1" class="dropdown-toggle" data-toggle="dropdown" aria-controls="myTabDrop1-contents" aria-expanded="false">Dropdown <span class="caret"></span></a> <ul class="dropdown-menu" aria-labelledby="myTabDrop1" id="myTabDrop1-contents"> <li class=""><a href="#dropdown1" role="tab" id="dropdown1-tab" data-toggle="tab" aria-controls="dropdown1" aria-expanded="false">@fat</a></li> <li class=""><a href="#dropdown2" role="tab" id="dropdown2-tab" data-toggle="tab" aria-controls="dropdown2" aria-expanded="false">@mdo</a></li> </ul> </li> </ul>
-						<div id="myTabContent" class="tab-content scrollbar1"> <div role="tabpanel" class="tab-pane fade" id="home" aria-labelledby="home-tab"> <p>Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.</p> </div> <div role="tabpanel" class="tab-pane fade active in" id="profile" aria-labelledby="profile-tab"> <p>Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.</p> </div> <div role="tabpanel" class="tab-pane fade" id="dropdown1" aria-labelledby="dropdown1-tab"> <p>Etsy mixtape wayfarers, ethical wes anderson tofu before they sold out mcsweeney's organic lomo retro fanny pack lo-fi farm-to-table readymade. Messenger bag gentrify pitchfork tattooed craft beer, iphone skateboard locavore carles etsy salvia banksy hoodie helvetica. DIY synth PBR banksy irony. Leggings gentrify squid 8-bit cred pitchfork. Williamsburg banh mi whatever gluten-free, carles pitchfork biodiesel fixie etsy retro mlkshk vice blog. Scenester cred you probably haven't heard of them, vinyl craft beer blog stumptown. Pitchfork sustainable tofu synth chambray yr.</p> </div> <div role="tabpanel" class="tab-pane fade" id="dropdown2" aria-labelledby="dropdown2-tab"> <p>Trust fund seitan letterpress, keytar raw denim keffiyeh etsy art party before they sold out master cleanse gluten-free squid scenester freegan cosby sweater. Fanny pack portland seitan DIY, art party locavore wolf cliche high life echo park Austin. Cred vinyl keffiyeh DIY salvia PBR, banh mi before they sold out farm-to-table VHS viral locavore cosby sweater. Lomo wolf viral, mustache readymade thundercats keffiyeh craft beer marfa ethical. Wolf salvia freegan, sartorial keffiyeh echo park vegan.</p> </div> </div>
-					</div>
-					<div class="clearfix"> </div>
-				</div>
-				<div class="tool-tips widget-shadow">
-					<h4 class="title2">Tooltips :</h4>
-					<div class="bs-example-tooltips"> 
-						<button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="" data-original-title="Tooltip on left">Tooltip on left</button> 
-						<button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="top" title="" data-original-title="Tooltip on top">Tooltip on top</button> 
-						<button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="Tooltip on bottom">Tooltip on bottom</button>
-						<button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="right" title="" data-original-title="Tooltip on right">Tooltip on right</button> 
-						<script>$(function () {
-						  $('[data-toggle="tooltip"]').tooltip()
-						})</script>
-					</div>
-				</div>
-				<div class="tool-tips widget-shadow">
-					<h4 class="title2">Popovers :</h4>
-					<div class="bs-example-tooltips"> 
-						<button type="button" class="btn btn-default" data-container="body" data-toggle="popover" data-placement="left" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
-						  Popover on left
-						</button>
-
-						<button type="button" class="btn btn-default" data-container="body" data-toggle="popover" data-placement="top" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
-						  Popover on top
-						</button>
-
-						<button type="button" class="btn btn-default" data-container="body" data-toggle="popover" data-placement="bottom" data-content="Vivamus
-						sagittis lacus vel augue laoreet rutrum faucibus.">
-						  Popover on bottom
-						</button>
-
-						<button type="button" class="btn btn-default" data-container="body" data-toggle="popover" data-placement="right" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
-						  Popover on right
-						</button>
-						<script>
-							$(function () {
-								$('[data-toggle="popover"]').popover()
-							})
-						</script>
-					</div>
-				</div>
-				<div class="panel-group tool-tips widget-shadow" id="accordion" role="tablist" aria-multiselectable="true">
-					<h4 class="title2"> Accordion example :</h4>
-				  <div class="panel panel-default">
-					<div class="panel-heading" role="tab" id="headingOne">
-					  <h4 class="panel-title">
-						<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-						  Product 1
-						</a>
-					  </h4>
-					</div>
-					<div id="collapseOne" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
-					  <div class="panel-body">
-						Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. apiente ea proident. Ad vegan excepteur butcher vice lomo.  labore sustainable VHS.
-					  </div>
-					</div>
-				  </div>
-				  <div class="panel panel-default">
-					<div class="panel-heading" role="tab" id="headingTwo">
-					  <h4 class="panel-title">
-						<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
-							Product 2
-						</a>
-					  </h4>
-					</div>
-					<div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwo">
-					  <div class="panel-body">
-						Eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Anim pariatur cliche reprehenderit, enim  Food truck quinoa nesciunt laborum eiusmod. apiente ea proident. Ad vegan excepteur butcher vice lomo.  labore sustainable VHS.
-					  </div>
-					</div>
-				  </div>
-				  <div class="panel panel-default">
-					<div class="panel-heading" role="tab" id="headingThree">
-					  <h4 class="panel-title">
-						<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
-							Product 3
-						</a>
-					  </h4>
-					</div>
-					<div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree">
-					  <div class="panel-body">
-						3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid.  apiente ea proident. Ad vegan excepteur butcher vice lomo.  labore sustainable VHS.
-					  </div>
-					</div>
-				  </div>
-				  <div class="panel panel-default">
-					<div class="panel-heading" role="tab" id="headingFour">
-					  <h4 class="panel-title">
-						<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFour" aria-expanded="false" aria-controls="collapseFour">
-							Product 4
-						</a>
-					  </h4>
-					</div>
-					<div id="collapseFour" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingFour">
-					  <div class="panel-body">
-						Cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. apiente ea proident. Ad vegan excepteur butcher vice lomo.  labore sustainable VHS.
-					  </div>
-					</div>
-				  </div>
-				  <div class="panel panel-default">
-					<div class="panel-heading" role="tab" id="headingFive">
-					  <h4 class="panel-title">
-						<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFive" aria-expanded="false" aria-controls="collapseFive">
-							Product 5
-						</a>
-					  </h4>
-					</div>
-					<div id="collapseFive" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingFive">
-					  <div class="panel-body">
-						Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. apiente ea proident. Ad vegan excepteur butcher vice lomo.  labore sustainable VHS.
-					  </div>
-					</div>
-				  </div>
-				</div>
-			</div>
-		</div>
-		<!--footer-->
-		<div class="footer">
-		   <p>&copy; 2018 Glance Design Dashboard. All Rights Reserved | Design by <a href="https://w3layouts.com/" target="_blank">w3layouts</a></p>		</div>
-        <!--//footer-->
-	</div>
-	
-	<!-- side nav js -->
-	<script src='js/SidebarNav.min.js' type='text/javascript'></script>
-	<script>
-      $('.sidebar-menu').SidebarNav()
-    </script>
-	<!-- //side nav js -->
-	
-	<!-- Classie --><!-- for toggle left push menu script -->
-		<script src="js/classie.js"></script>
-		<script>
-			var menuLeft = document.getElementById( 'cbp-spmenu-s1' ),
-				showLeftPush = document.getElementById( 'showLeftPush' ),
-				body = document.body;
-				
-			showLeftPush.onclick = function() {
-				classie.toggle( this, 'active' );
-				classie.toggle( body, 'cbp-spmenu-push-toright' );
-				classie.toggle( menuLeft, 'cbp-spmenu-open' );
-				disableOther( 'showLeftPush' );
-			};
-			
-			function disableOther( button ) {
-				if( button !== 'showLeftPush' ) {
-					classie.toggle( showLeftPush, 'disabled' );
-				}
-			}
-		</script>
-	<!-- //Classie --><!-- //for toggle left push menu script -->
-		
-	<!--scrolling js-->
-
-	<script src="js/scripts.js"></script>
-	<!--//scrolling js-->
-	
-	<!-- Bootstrap Core JavaScript -->
-   <script src="js/bootstrap.js"> </script>
-</body>
-</html>
\ No newline at end of file

src/main/resources/public/grids.html

-<!--
-Author: W3layouts
-Author URL: http://w3layouts.com
-License: Creative Commons Attribution 3.0 Unported
-License URL: http://creativecommons.org/licenses/by/3.0/
--->
-<!DOCTYPE HTML>
-<html>
-<head>
-<title>Glance Design Dashboard an Admin Panel Category Flat Bootstrap Responsive Website Template | Grids :: 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="Glance Design Dashboard Responsive web template, Bootstrap Web Templates, Flat Web Templates, Android Compatible web template, 
-SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, SonyEricsson, Motorola web design" />
-<script type="application/x-javascript"> addEventListener("load", function() { setTimeout(hideURLbar, 0); }, false); function hideURLbar(){ window.scrollTo(0,1); } </script>
-
-<!-- Bootstrap Core CSS -->
-<link href="css/bootstrap.css" rel='stylesheet' type='text/css' />
-
-<!-- Custom CSS -->
-<link href="css/style.css" rel='stylesheet' type='text/css' />
-
-<!-- font-awesome icons CSS -->
-<link href="css/font-awesome.css" rel="stylesheet"> 
-<!-- //font-awesome icons CSS -->
-
- <!-- side nav css file -->
- <link href='css/SidebarNav.min.css' media='all' rel='stylesheet' type='text/css'/>
- <!-- side nav css file -->
- 
- <!-- js-->
-<script src="js/jquery-1.11.1.min.js"></script>
-<script src="js/modernizr.custom.js"></script>
-
-<!--webfonts-->
-<link href="//fonts.googleapis.com/css?family=PT+Sans:400,400i,700,700i&amp;subset=cyrillic,cyrillic-ext,latin-ext" rel="stylesheet">
-<!--//webfonts--> 
-
-<!-- Metis Menu -->
-<script src="js/metisMenu.min.js"></script>
-<script src="js/custom.js"></script>
-<link href="css/custom.css" rel="stylesheet">
-<!--//Metis Menu -->
-
-</head> 
-<body class="cbp-spmenu-push">
-	<div class="main-content">
-	<div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1">
-		<!--left-fixed -navigation-->
-		<aside class="sidebar-left">
-      <nav class="navbar navbar-inverse">
-          <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".collapse" aria-expanded="false">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            </button>
-            <h1><a class="navbar-brand" href="index.html"><span class="fa fa-area-chart"></span> Glance<span class="dashboard_text">Design dashboard</span></a></h1>
-          </div>
-          <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-            <ul class="sidebar-menu">
-              <li class="header">MAIN NAVIGATION</li>
-             <li class="treeview">
-                <a href="index.html">
-					<span class="glyphicon glyphicon-user"></span><span>Employee</span>
-                </a>
-              </li>
-			  <li class="treeview">
-                <a href="#">
-                <i class="fa fa-laptop"></i>
-                <span>Components</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="grids.html"><i class="fa fa-angle-right"></i> Grids</a></li>
-                  <li><a href="media.html"><i class="fa fa-angle-right"></i> Media Css</a></li>
-                </ul>
-
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-laptop"></i>
-                <span>UI Elements</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="general.html"><i class="fa fa-angle-right"></i> General</a></li>
-                  <li><a href="icons.html"><i class="fa fa-angle-right"></i> Icons</a></li>
-                  <li><a href="buttons.html"><i class="fa fa-angle-right"></i> Buttons</a></li>
-                  <li><a href="typography.html"><i class="fa fa-angle-right"></i> Typography</a></li>
-                </ul>
-              </li>
-			  <li>
-                <a href="timesheet.html">
-                <i class="fa fa-th"></i> <span>Timesheet</span>
-                <small class="label pull-right label-info">08</small>
-                </a>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-edit"></i> <span>Forms</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="forms.html"><i class="fa fa-angle-right"></i> General Forms</a></li>
-                  <li><a href="validation.html"><i class="fa fa-angle-right"></i> Form Validations</a></li>
-                </ul>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-table"></i> <span>Tables</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
-                </ul>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-envelope"></i> <span>Mailbox</span>
-                <i class="fa fa-angle-left pull-right"></i><small class="label pull-right label-info1">08</small><span class="label label-primary1 pull-right">02</span></a>
-                <ul class="treeview-menu">
-                  <li><a href="inbox.html"><i class="fa fa-angle-right"></i> Mail Inbox</a></li>
-                  <li><a href="compose.html"><i class="fa fa-angle-right"></i> Compose Mail </a></li>
-                </ul>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-folder"></i> <span>Examples</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li>
-                  <li><a href="signup.html"><i class="fa fa-angle-right"></i> Register</a></li>
-                  <li><a href="404.html"><i class="fa fa-angle-right"></i> 404 Error</a></li>
-                  <li><a href="500.html"><i class="fa fa-angle-right"></i> 500 Error</a></li>
-                  <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
-                </ul>
-              </li>
-              <li class="header">LABELS</li>
-              <li><a href="#"><i class="fa fa-angle-right text-red"></i> <span>Important</span></a></li>
-              <li><a href="#"><i class="fa fa-angle-right text-yellow"></i> <span>Warning</span></a></li>
-              <li><a href="#"><i class="fa fa-angle-right text-aqua"></i> <span>Information</span></a></li>
-            </ul>
-          </div>
-          <!-- /.navbar-collapse -->
-      </nav>
-    </aside>
-	</div>
-		<!--left-fixed -navigation-->
-		
-		<!-- header-starts -->
-		<div class="sticky-header header-section ">
-			<div class="header-left">
-				
-				<!--toggle button start-->
-				<button id="showLeftPush"><i class="fa fa-bars"></i></button>
-				<!--toggle button end-->
-				<div class="profile_details_left"><!--notifications of menu start -->
-					<ul class="nofitications-dropdown">
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-envelope"></i><span class="badge">4</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 3 new messages</h3>
-									</div>
-								</li>
-								<li><a href="#">
-								   <div class="user_img"><img src="images/1.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet</p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								</a></li>
-								<li class="odd"><a href="#">
-									<div class="user_img"><img src="images/4.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								  <div class="clearfix"></div>	
-								</a></li>
-								<li><a href="#">
-								   <div class="user_img"><img src="images/3.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								</a></li>
-								<li>
-									<div class="notification_bottom">
-										<a href="#">See all messages</a>
-									</div> 
-								</li>
-							</ul>
-						</li>
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-bell"></i><span class="badge blue">4</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 3 new notification</h3>
-									</div>
-								</li>
-								<li><a href="#">
-									<div class="user_img"><img src="images/4.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet</p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								  <div class="clearfix"></div>	
-								 </a></li>
-								 <li class="odd"><a href="#">
-									<div class="user_img"><img src="images/1.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								 </a></li>
-								 <li><a href="#">
-									<div class="user_img"><img src="images/3.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								 </a></li>
-								 <li>
-									<div class="notification_bottom">
-										<a href="#">See all notifications</a>
-									</div> 
-								</li>
-							</ul>
-						</li>	
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-tasks"></i><span class="badge blue1">8</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 8 pending task</h3>
-									</div>
-								</li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Database update</span><span class="percentage">40%</span>
-										<div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										<div class="bar yellow" style="width:40%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Dashboard done</span><span class="percentage">90%</span>
-									   <div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										 <div class="bar green" style="width:90%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Mobile App</span><span class="percentage">33%</span>
-										<div class="clearfix"></div>	
-									</div>
-								   <div class="progress progress-striped active">
-										 <div class="bar red" style="width: 33%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Issues fixed</span><span class="percentage">80%</span>
-									   <div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										 <div class="bar  blue" style="width: 80%;"></div>
-									</div>
-								</a></li>
-								<li>
-									<div class="notification_bottom">
-										<a href="#">See all pending tasks</a>
-									</div> 
-								</li>
-							</ul>
-						</li>	
-					</ul>
-					<div class="clearfix"> </div>
-				</div>
-				<!--notification menu end -->
-				<div class="clearfix"> </div>
-			</div>
-			<div class="header-right">
-				
-				
-				<!--search-box-->
-				<div class="search-box">
-					<form class="input">
-						<input class="sb-search-input input__field--madoka" placeholder="Search..." type="search" id="input-31" />
-						<label class="input__label" for="input-31">
-							<svg class="graphic" width="100%" height="100%" viewBox="0 0 404 77" preserveAspectRatio="none">
-								<path d="m0,0l404,0l0,77l-404,0l0,-77z"/>
-							</svg>
-						</label>
-					</form>
-				</div><!--//end-search-box-->
-				
-				<div class="profile_details">		
-					<ul>
-						<li class="dropdown profile_details_drop">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-								<div class="profile_img">	
-									<span class="prfil-img"><img src="images/2.jpg" alt=""> </span> 
-									<div class="user-name">
-										<p>Admin Name</p>
-										<span>Administrator</span>
-									</div>
-									<i class="fa fa-angle-down lnr"></i>
-									<i class="fa fa-angle-up lnr"></i>
-									<div class="clearfix"></div>	
-								</div>	
-							</a>
-							<ul class="dropdown-menu drp-mnu">
-								<li> <a href="#"><i class="fa fa-cog"></i> Settings</a> </li> 
-								<li> <a href="#"><i class="fa fa-user"></i> My Account</a> </li>
-								<li> <a href="#"><i class="fa fa-suitcase"></i> Profile</a> </li> 
-								<li> <a href="#"><i class="fa fa-sign-out"></i> Logout</a> </li>
-							</ul>
-						</li>
-					</ul>
-				</div>
-				<div class="clearfix"> </div>				
-			</div>
-			<div class="clearfix"> </div>	
-		</div>
-		<!-- //header-ends -->
-		<!-- main content start-->
-		<div id="page-wrapper">
-			<div class="main-page">
-				<h2 class="title1">Grid system</h2>
-				<div class="grids widget-shadow">
-					<div class="form-group">
-						<div class="row">
-							<div class="col-md-12">
-								<input type="text" class="form-control1" placeholder=".col-md-12">
-							</div>
-							<div class="clearfix"> </div>
-						</div>
-					</div>
-					<div class="form-group">
-						<div class="row">
-							<div class="col-md-2 grid_box1">
-								<input type="text" class="form-control1" placeholder=".col-md-2">
-							</div>
-							<div class="col-md-10">
-								<input type="text" class="form-control1" placeholder=".col-md-10">
-							</div>
-							<div class="clearfix"> </div>
-						</div>
-					</div>
-					<div class="form-group">
-						<div class="row">
-							<div class="col-md-3 grid_box1">
-								<input type="text" class="form-control1" placeholder=".col-md-3">
-							</div>
-							<div class="col-md-9">
-								<input type="text" class="form-control1" placeholder=".col-md-9">
-							</div>
-							<div class="clearfix"> </div>
-						</div>
-					</div>
-					<div class="form-group">
-						<div class="row">
-							<div class="col-md-4 grid_box1">
-								<input type="text" class="form-control1" placeholder=".col-md-4">
-							</div>
-							<div class="col-md-8">
-								<input type="text" class="form-control1" placeholder=".col-md-8">
-							</div>
-							<div class="clearfix"> </div>
-						</div>
-					</div>	
-					<div class="form-group">
-						<div class="row">
-							<div class="col-md-5 grid_box1">
-								<input type="text" class="form-control1" placeholder=".col-md-5">
-							</div>
-							<div class="col-md-7">
-								<input type="text" class="form-control1" placeholder=".col-md-7">
-							</div>
-							<div class="clearfix"> </div>
-						</div>
-					</div>
-					<div class="form-group">
-						<div class="row">
-							<div class="col-md-6 grid_box1">
-								<input type="text" class="form-control1" placeholder=".col-md-6">
-							</div>
-							<div class="col-md-6">
-								<input type="text" class="form-control1" placeholder=".col-md-6">
-							</div>
-							<div class="clearfix"> </div>
-						</div>
-					</div>	
-					<div class="form-group">
-						<div class="row">
-							<div class="col-md-4 grid_box1">
-								<input type="text" class="form-control1" placeholder=".col-md-4">
-							</div>
-							<div class="col-md-4 grid_box1">
-								<input type="text" class="form-control1" placeholder=".col-md-4">
-							</div>
-							<div class="col-md-4">
-								<input type="text" class="form-control1" placeholder=".col-md-4">
-							</div>
-							<div class="clearfix"> </div>
-						</div>
-					</div>	
-					<div class="form-group">
-						<div class="row">
-							<div class="col-md-2 grid_box1">
-								<input type="text" class="form-control1" placeholder=".col-md-2">
-							</div>
-							<div class="col-md-8 grid_box1">
-								<input type="text" class="form-control1" placeholder=".col-md-8">
-							</div>
-							<div class="col-md-2">
-								<input type="text" class="form-control1" placeholder=".col-md-2">
-							</div>
-							<div class="clearfix"> </div>
-						</div>
-					</div>	
-					<div class="form-group">
-						<div class="row">
-							<div class="col-md-3 grid_box1">
-								<input type="text" class="form-control1" placeholder=".col-md-3">
-							</div>
-							<div class="col-md-3 grid_box1">
-								<input type="text" class="form-control1" placeholder=".col-md-3">
-							</div>
-							<div class="col-md-3 grid_box1">
-								<input type="text" class="form-control1" placeholder=".col-md-3">
-							</div>
-							<div class="col-md-3">
-								<input type="text" class="form-control1" placeholder=".col-md-3">
-							</div>
-							<div class="clearfix"> </div>
-						</div>
-					</div>	
-					<div class="form-group mb-n">
-						<div class="row">
-							<div class="col-md-2 grid_box1">
-								<input type="text" class="form-control1" placeholder=".col-md-2">
-							</div>
-							<div class="col-md-2 grid_box1">
-								<input type="text" class="form-control1" placeholder=".col-md-2">
-							</div>
-							<div class="col-md-2 grid_box1">
-								<input type="text" class="form-control1" placeholder=".col-md-2">
-							</div>
-							<div class="col-md-2 grid_box1">
-								<input type="text" class="form-control1" placeholder=".col-md-2">
-							</div>
-							<div class="col-md-2 grid_box1">
-								<input type="text" class="form-control1" placeholder=".col-md-2">
-							</div>
-							<div class="col-md-2">
-								<input type="text" class="form-control1" placeholder=".col-md-2">
-							</div>
-							<div class="clearfix"> </div>
-						</div>
-					</div>	
-				</div>
-				<h3 class="title1">Bootstrap Grid Details</h3>
-				<div class="grid-bottom widget-shadow">
-					<table class="table table-bordered table-striped no-margin grd_tble">
-						<thead>
-							<tr>
-								<th></th>
-								<th>
-									Extra small devices
-									<small>Phones (&lt;768px)</small>
-								</th>
-								<th>
-									Small devices
-									<small>Tablets (≥768px)</small>
-								</th>
-								<th>
-									Medium devices
-									<small>Desktops (≥992px)</small>
-								</th>
-								<th>
-									Large devices
-									<small>Desktops (≥1200px)</small>
-								</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr>
-								<th>Suitable for</th>
-								<td>Phones</td>
-								<td>Tablets</td>
-								<td>Small Laptops</td>
-								<td>Laptops & Desktops</td>
-							</tr>
-							<tr>
-								<th>Grid behaviour</th>
-								<td>Horizontal at all times</td>
-								<td>Collapsed to start, horizontal above breakpoints</td>
-								<td>Collapsed to start, horizontal above breakpoints</td>
-								<td>Collapsed to start, horizontal above breakpoints</td>
-							</tr>
-							<tr>
-								<th>Max container width</th>
-								<td>None (auto)</td>
-								<td>750px</td>
-								<td>970px</td>
-								<td>1170px</td>
-							</tr>
-							<tr>
-								<th>Class prefix</th>
-								<td><code>.col-xs-</code></td>
-								<td><code>.col-sm-</code></td>
-								<td><code>.col-md-</code></td>
-								<td><code>.col-lg-</code></td>
-							</tr>
-							<tr>
-								<th># of columns</th>
-								<td >12</td>
-								<td >12</td>
-								<td >12</td>
-								<td >12</td>
-							</tr>
-							<tr>
-								<th>Column Width</th>
-								<td>Auto</td>
-								<td>~62px</td>
-								<td>~81px</td>
-								<td>~97px</td>
-							</tr>
-							<tr>
-								<th>Gutter width</th>
-								<td>30px (15px on each side of a column)</td>
-								<td>30px (15px on each side of a column)</td>
-								<td>30px (15px on each side of a column)</td>
-								<td>30px (15px on each side of a column)</td>
-							</tr>
-							<tr>
-								<th>Nestable</th>
-								<td>Yes</td>
-								<td>Yes</td>
-								<td>Yes</td>
-								<td>Yes</td>
-							</tr>
-							<tr>
-								<th>Offests</th>
-								<td>Yes</td>
-								<td>Yes</td>
-								<td>Yes</td>
-								<td>Yes</td>
-							</tr>
-							<tr>
-								<th>Column Ordering</th>
-								<td>Yes</td>
-								<td>Yes</td>
-								<td>Yes</td>
-								<td>Yes</td>
-							</tr>
-						</tbody>
-					</table>
-				</div>
-			</div>
-		</div>
-		<!--footer-->
-		<div class="footer">
-		   <p>&copy; 2018 Glance Design Dashboard. All Rights Reserved | Design by <a href="https://w3layouts.com/" target="_blank">w3layouts</a></p>		</div>
-        <!--//footer-->
-	</div>
-	
-	<!-- side nav js -->
-	<script src='js/SidebarNav.min.js' type='text/javascript'></script>
-	<script>
-      $('.sidebar-menu').SidebarNav()
-    </script>
-	<!-- //side nav js -->
-	
-	<!-- Classie --><!-- for toggle left push menu script -->
-		<script src="js/classie.js"></script>
-		<script>
-			var menuLeft = document.getElementById( 'cbp-spmenu-s1' ),
-				showLeftPush = document.getElementById( 'showLeftPush' ),
-				body = document.body;
-				
-			showLeftPush.onclick = function() {
-				classie.toggle( this, 'active' );
-				classie.toggle( body, 'cbp-spmenu-push-toright' );
-				classie.toggle( menuLeft, 'cbp-spmenu-open' );
-				disableOther( 'showLeftPush' );
-			};
-			
-			function disableOther( button ) {
-				if( button !== 'showLeftPush' ) {
-					classie.toggle( showLeftPush, 'disabled' );
-				}
-			}
-		</script>
-	<!-- //Classie --><!-- //for toggle left push menu script -->
-		
-	<!--scrolling js-->
-	<script src="js/jquery.nicescroll.js"></script>
-	<script src="js/scripts.js"></script>
-	<!--//scrolling js-->
-	
-	<!-- Bootstrap Core JavaScript -->
-   <script src="js/bootstrap.js"> </script>
-   
-</body>
-</html>
\ No newline at end of file

src/main/resources/public/inbox.html

-<!--
-Author: W3layouts
-Author URL: http://w3layouts.com
-License: Creative Commons Attribution 3.0 Unported
-License URL: http://creativecommons.org/licenses/by/3.0/
--->
-<!DOCTYPE HTML>
-<html>
-<head>
-<title>Glance Design Dashboard an Admin Panel Category Flat Bootstrap Responsive Website Template | Inbox :: 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="Glance Design Dashboard Responsive web template, Bootstrap Web Templates, Flat Web Templates, Android Compatible web template, 
-SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, SonyEricsson, Motorola web design" />
-<script type="application/x-javascript"> addEventListener("load", function() { setTimeout(hideURLbar, 0); }, false); function hideURLbar(){ window.scrollTo(0,1); } </script>
-
-<!-- Bootstrap Core CSS -->
-<link href="css/bootstrap.css" rel='stylesheet' type='text/css' />
-
-<!-- Custom CSS -->
-<link href="css/style.css" rel='stylesheet' type='text/css' />
-
-<!-- font-awesome icons CSS -->
-<link href="css/font-awesome.css" rel="stylesheet"> 
-<!-- //font-awesome icons CSS -->
-
- <!-- side nav css file -->
- <link href='css/SidebarNav.min.css' media='all' rel='stylesheet' type='text/css'/>
- <!-- side nav css file -->
- 
- <!-- js-->
-<script src="js/jquery-1.11.1.min.js"></script>
-<script src="js/modernizr.custom.js"></script>
-
-<!--webfonts-->
-<link href="//fonts.googleapis.com/css?family=PT+Sans:400,400i,700,700i&amp;subset=cyrillic,cyrillic-ext,latin-ext" rel="stylesheet">
-<!--//webfonts--> 
-
-<!-- Metis Menu -->
-<script src="js/metisMenu.min.js"></script>
-<script src="js/custom.js"></script>
-<link href="css/custom.css" rel="stylesheet">
-<!--//Metis Menu -->
-
-</head> 
-<body class="cbp-spmenu-push">
-	<div class="main-content">
-	<div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1">
-		<!--left-fixed -navigation-->
-		<aside class="sidebar-left">
-      <nav class="navbar navbar-inverse">
-          <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".collapse" aria-expanded="false">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            </button>
-            <h1><a class="navbar-brand" href="index.html"><span class="fa fa-area-chart"></span> Glance<span class="dashboard_text">Design dashboard</span></a></h1>
-          </div>
-          <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-            <ul class="sidebar-menu">
-              <li class="header">MAIN NAVIGATION</li>
-              <li class="treeview">
-                <a href="index.html">
-					<span class="glyphicon glyphicon-user"></span><span>Employee</span>
-                </a>
-              </li>
-			  <li class="treeview">
-                <a href="#">
-                <i class="fa fa-laptop"></i>
-                <span>Components</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="grids.html"><i class="fa fa-angle-right"></i> Grids</a></li>
-                  <li><a href="media.html"><i class="fa fa-angle-right"></i> Media Css</a></li>
-                </ul>
-
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-laptop"></i>
-                <span>UI Elements</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="general.html"><i class="fa fa-angle-right"></i> General</a></li>
-                  <li><a href="icons.html"><i class="fa fa-angle-right"></i> Icons</a></li>
-                  <li><a href="buttons.html"><i class="fa fa-angle-right"></i> Buttons</a></li>
-                  <li><a href="typography.html"><i class="fa fa-angle-right"></i> Typography</a></li>
-                </ul>
-              </li>
-			  <li>
-                <a href="widgets.html">
-                <i class="fa fa-th"></i> <span>Widgets</span>
-                <small class="label pull-right label-info">08</small>
-                </a>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-edit"></i> <span>Forms</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="forms.html"><i class="fa fa-angle-right"></i> General Forms</a></li>
-                  <li><a href="validation.html"><i class="fa fa-angle-right"></i> Form Validations</a></li>
-                </ul>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-table"></i> <span>Tables</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-envelope"></i> <span>Mailbox</span>
-                <i class="fa fa-angle-left pull-right"></i><small class="label pull-right label-info1">08</small><span class="label label-primary1 pull-right">02</span></a>
-               <ul class="treeview-menu">
-                  <li><a href="inbox.html"><i class="fa fa-angle-right"></i> Mail Inbox</a></li>
-                  <li><a href="compose.html"><i class="fa fa-angle-right"></i> Compose Mail </a></li>
-                </ul>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-folder"></i> <span>Examples</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li>
-                  <li><a href="signup.html"><i class="fa fa-angle-right"></i> Register</a></li>
-
-                  <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
-                </ul>
-              </li>
-              <li class="header">LABELS</li>
-              <li><a href="#"><i class="fa fa-angle-right text-red"></i> <span>Important</span></a></li>
-              <li><a href="#"><i class="fa fa-angle-right text-yellow"></i> <span>Warning</span></a></li>
-              <li><a href="#"><i class="fa fa-angle-right text-aqua"></i> <span>Information</span></a></li>
-            </ul>
-          </div>
-          <!-- /.navbar-collapse -->
-      </nav>
-    </aside>
-	</div>
-		<!--left-fixed -navigation-->
-		
-		<!-- header-starts -->
-		<div class="sticky-header header-section ">
-			<div class="header-left">
-				
-				<!--toggle button start-->
-				<button id="showLeftPush"><i class="fa fa-bars"></i></button>
-				<!--toggle button end-->
-				<div class="profile_details_left"><!--notifications of menu start -->
-					<ul class="nofitications-dropdown">
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-envelope"></i><span class="badge">4</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 3 new messages</h3>
-									</div>
-								</li>
-								<li><a href="#">
-								   <div class="user_img"><img src="images/1.png" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet</p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								</a></li>
-								<li class="odd"><a href="#">
-									<div class="user_img"><img src="images/2.png" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								  <div class="clearfix"></div>	
-								</a></li>
-								<li><a href="#">
-								   <div class="user_img"><img src="images/3.png" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								</a></li>
-								<li>
-									<div class="notification_bottom">
-										<a href="#">See all messages</a>
-									</div> 
-								</li>
-							</ul>
-						</li>
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-bell"></i><span class="badge blue">4</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 3 new notification</h3>
-									</div>
-								</li>
-								<li><a href="#">
-									<div class="user_img"><img src="images/2.png" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet</p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								  <div class="clearfix"></div>	
-								 </a></li>
-								 <li class="odd"><a href="#">
-									<div class="user_img"><img src="images/1.png" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								 </a></li>
-								 <li><a href="#">
-									<div class="user_img"><img src="images/3.png" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								 </a></li>
-								 <li>
-									<div class="notification_bottom">
-										<a href="#">See all notifications</a>
-									</div> 
-								</li>
-							</ul>
-						</li>	
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-tasks"></i><span class="badge blue1">8</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 8 pending task</h3>
-									</div>
-								</li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Database update</span><span class="percentage">40%</span>
-										<div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										<div class="bar yellow" style="width:40%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Dashboard done</span><span class="percentage">90%</span>
-									   <div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										 <div class="bar green" style="width:90%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Mobile App</span><span class="percentage">33%</span>
-										<div class="clearfix"></div>	
-									</div>
-								   <div class="progress progress-striped active">
-										 <div class="bar red" style="width: 33%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Issues fixed</span><span class="percentage">80%</span>
-									   <div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										 <div class="bar  blue" style="width: 80%;"></div>
-									</div>
-								</a></li>
-								<li>
-									<div class="notification_bottom">
-										<a href="#">See all pending tasks</a>
-									</div> 
-								</li>
-							</ul>
-						</li>	
-					</ul>
-					<div class="clearfix"> </div>
-				</div>
-				<!--notification menu end -->
-				<div class="clearfix"> </div>
-			</div>
-			<div class="header-right">
-				
-				
-				<!--search-box-->
-				<div class="search-box">
-					<form class="input">
-						<input class="sb-search-input input__field--madoka" placeholder="Search..." type="search" id="input-31" />
-						<label class="input__label" for="input-31">
-							<svg class="graphic" width="100%" height="100%" viewBox="0 0 404 77" preserveAspectRatio="none">
-								<path d="m0,0l404,0l0,77l-404,0l0,-77z"/>
-							</svg>
-						</label>
-					</form>
-				</div><!--//end-search-box-->
-				
-				<div class="profile_details">		
-					<ul>
-						<li class="dropdown profile_details_drop">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-								<div class="profile_img">	
-									<span class="prfil-img"><img src="images/2.jpg" alt=""> </span> 
-									<div class="user-name">
-										<p>Admin Name</p>
-										<span>Administrator</span>
-									</div>
-									<i class="fa fa-angle-down lnr"></i>
-									<i class="fa fa-angle-up lnr"></i>
-									<div class="clearfix"></div>	
-								</div>	
-							</a>
-							<ul class="dropdown-menu drp-mnu">
-								<li> <a href="#"><i class="fa fa-cog"></i> Settings</a> </li> 
-								<li> <a href="#"><i class="fa fa-user"></i> My Account</a> </li>
-								<li> <a href="#"><i class="fa fa-suitcase"></i> Profile</a> </li> 
-								<li> <a href="#"><i class="fa fa-sign-out"></i> Logout</a> </li>
-							</ul>
-						</li>
-					</ul>
-				</div>
-				<div class="clearfix"> </div>				
-			</div>
-			<div class="clearfix"> </div>	
-		</div>
-		<!-- //header-ends -->
-		<!-- main content start-->
-		<div id="page-wrapper">
-			<div class="main-page">
-				<h2 class="title1">Mail Page</h2>
-				<div class="col-md-4 compose-left">
-					<div class="folder widget-shadow">
-						<ul>
-							<li class="head"><i class="fa fa-folder" aria-hidden="true"></i>Folders</li>
-							<li><a href="inbox.html"><i class="fa fa-inbox"></i>Inbox <span>52</span></a></li>
-							<li><a href="#"><i class="fa fa fa-envelope-o"></i>Sent </a></li>
-							<li><a href="#"><i class="fa fa-file-text-o"></i>Drafts <span>03</span></a> </li>
-							<li><a href="#"><i class="fa fa-flag-o"></i>Spam </a></li>
-							<li><a href="#"><i class="fa fa-trash-o"></i>Trash</a></li>
-						</ul>
-					</div>
-					<div class="chat-grid widget-shadow">
-						<ul>
-							<li class="head"><i class="fa fa-user" aria-hidden="true"></i>Friends (Online) </li>
-							<li><a href="#">
-									<div class="chat-left">
-										<img class="img-circle" src="images/i1.png" alt="">
-										<label class="small-badge"></label>
-									</div>
-									<div class="chat-right">
-										<p>Alexander</p>
-										<h6>Nullam quis risus eget </h6>
-									</div>
-									<div class="clearfix"> </div>	
-								</a>
-							</li>
-							<li><a href="#">
-									<div class="chat-left">
-										<img class="img-circle" src="images/i2.png" alt="">
-										<label class="small-badge bg-green"></label>
-									</div>
-									<div class="chat-right">
-										<p>Jackson jacob</p>
-										<h6>Urna mollis ornare vel</h6>
-									</div>
-									<div class="clearfix"> </div>	
-								</a>
-							</li>
-							<li><a href="#">
-									<div class="chat-left">
-										<img class="img-circle" src="images/i3.png" alt="">
-										<label class="small-badge bg-green"></label>
-									</div>
-									<div class="chat-right">
-										<p>Elisa liden </p>
-										<h6>Quis risus ullam neget </h6>
-									</div>
-									<div class="clearfix"> </div>	
-								</a>
-							</li>
-							<li><a href="#">
-									<div class="chat-left">
-										<img class="img-circle" src="images/i4.png" alt="">
-										<label class="small-badge"></label>
-									</div>
-									<div class="chat-right">
-										<p>Michael John</p>
-										<h6>Mollis ornare Urna vel</h6>
-									</div>
-									<div class="clearfix"> </div>	
-								</a>
-							</li>
-						</ul>
-					</div>
-				</div>
-				<div class="col-md-8 compose-right widget-shadow">
-					<div class="panel-default">
-						<div class="panel-heading">
-							Inbox 
-						</div>
-						<div class="inbox-page">
-					<h4>Today</h4>
-					<div class="inbox-row widget-shadow" id="accordion" role="tablist" aria-multiselectable="true">
-						<div class="mail "> <input type="checkbox" class="checkbox"> </div>
-						<div class="mail"><img src="images/i1.png" alt=""/></div>
-						<div class="mail mail-name"> <h6>Alexander</h6> </div>
-						<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-							<div class="mail"><p>Nullam quis risus eget urna mollis ornare accusamus terry </p></div>
-						</a>
-						<div class="mail-right dots_drop">
-							<div class="dropdown">
-								<a href="#"  data-toggle="dropdown" aria-expanded="false">
-									<p><i class="fa fa-ellipsis-v mail-icon"></i></p>
-								</a>
-								<ul class="dropdown-menu float-right">
-									<li>
-										<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-											<i class="fa fa-reply mail-icon"></i>
-											Reply
-										</a>
-									</li>
-									<li>
-										<a href="#" title="">
-											<i class="fa fa-download mail-icon"></i>
-											Archive
-										</a>
-									</li>
-									<li>
-										<a href="#" class="font-red" title="">
-											<i class="fa fa-trash-o mail-icon"></i>
-											Delete
-										</a>
-									</li>
-								</ul>
-							</div> 
-						</div>
-						<div class="mail-right"><p>30th Nov</p></div>
-						<div class="clearfix"> </div>
-						<div id="collapseOne" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
-							<div class="mail-body">
-								<p>Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor.</p>
-								<form>
-									<input type="text" placeholder="Reply to sender" required="">
-									<input type="submit" value="Send">
-								</form>
-							</div>
-						</div>
-					</div>
-					<div class="inbox-row widget-shadow" id="accordion1" role="tablist" aria-multiselectable="true">
-						<div class="mail "> <input type="checkbox" class="checkbox"> </div>
-						<div class="mail"><img src="images/i2.png" alt=""/></div>
-						<div class="mail mail-name"><h6>Michael</h6></div>
-						<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="true" aria-controls="collapseTwo">
-							<div class="mail"><p>Mollis nullam quis risus eget ornare accusamus terry </p></div>
-						</a>
-						<div class="mail-right dots_drop">
-							<div class="dropdown">
-								<a href="#"  data-toggle="dropdown" aria-expanded="false">
-									<p><i class="fa fa-ellipsis-v mail-icon"></i></p>
-								</a>
-								<ul class="dropdown-menu float-right">
-									<li>
-										<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="true" aria-controls="collapseTwo">
-											<i class="fa fa-reply mail-icon"></i>
-											Reply
-										</a>
-									</li>
-									<li>
-										<a href="#" title="">
-											<i class="fa fa-download mail-icon"></i>
-											Archive
-										</a>
-									</li>
-									<li>
-										<a href="#" class="font-red" title="">
-											<i class="fa fa-trash-o mail-icon"></i>
-											Delete
-										</a>
-									</li>
-								</ul>
-							</div> 
-						</div>
-						<div class="mail-right"><p>30th Nov</p></div>
-						<div class="clearfix"> </div>	
-						<div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwo">
-							<div class="mail-body">
-								<p>Quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident.</p>
-								<form>
-									<input type="text" placeholder="Reply to sender" required="">
-									<input type="submit" value="Send">
-								</form>
-							</div>
-						</div>
-					</div>
-					<div class="inbox-row widget-shadow">
-						<div class="mail "> <input type="checkbox" class="checkbox"> </div>
-						<div class="mail"><img src="images/i3.png" alt=""/></div>
-						<div class="mail mail-name"><h6>Davidson</h6></div>
-						<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="true" aria-controls="collapsethree">
-							<div class="mail"><p>Ornare vel eu leo nullam quis urna mollis accusamus terry </p></div>
-						</a>
-						<div class="mail-right dots_drop">
-							<div class="dropdown">
-								<a href="#"  data-toggle="dropdown" aria-expanded="false">
-									<p><i class="fa fa-ellipsis-v mail-icon"></i></p>
-								</a>
-								<ul class="dropdown-menu float-right">
-									<li>
-										<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="true" aria-controls="collapseThree">
-											<i class="fa fa-reply mail-icon"></i>
-											Reply
-										</a>
-									</li>
-									<li>
-										<a href="#" title="">
-											<i class="fa fa-download mail-icon"></i>
-											Archive
-										</a>
-									</li>
-									<li>
-										<a href="#" class="font-red" title="">
-											<i class="fa fa-trash-o mail-icon"></i>
-											Delete
-										</a>
-									</li>
-								</ul>
-							</div> 
-						</div>
-						<div class="mail-right"><p>30th Nov</p></div>
-						<div class="clearfix"> </div>
-						<div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree">
-							<div class="mail-body">
-								<p>Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident.</p>
-								<form>
-									<input type="text" placeholder="Reply to sender" required="">
-									<input type="submit" value="Send">
-								</form>
-							</div>
-						</div>
-					</div>
-					<div class="inbox-row widget-shadow">
-						<div class="mail "> <input type="checkbox" class="checkbox"> </div>
-						<div class="mail"><img src="images/i4.png" alt=""/></div>
-						<div class="mail mail-name"><h6>Charley</h6></div>
-						<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFour" aria-expanded="true" aria-controls="collapseFour">
-							<div class="mail"><p>Vely Ornare  leo nullam quis risus mollis lorem ipsum</p></div>
-						</a>
-						<div class="mail-right dots_drop">
-							<div class="dropdown">
-								<a href="#"  data-toggle="dropdown" aria-expanded="false">
-									<p><i class="fa fa-ellipsis-v mail-icon"></i></p>
-								</a>
-								<ul class="dropdown-menu float-right">
-									<li>
-										<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFour" aria-expanded="true" aria-controls="collapsefour">
-											<i class="fa fa-reply mail-icon"></i>
-											Reply
-										</a>
-									</li>
-									<li>
-										<a href="#" title="">
-											<i class="fa fa-download mail-icon"></i>
-											Archive
-										</a>
-									</li>
-									<li>
-										<a href="#" class="font-red" title="">
-											<i class="fa fa-trash-o mail-icon"></i>
-											Delete
-										</a>
-									</li>
-								</ul>
-							</div> 
-						</div>
-						<div class="mail-right"><p>30th Nov</p></div>
-						<div class="clearfix"> </div>
-						<div id="collapseFour" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingFour">
-							<div class="mail-body">
-								<p> Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident.</p>
-								<form>
-									<input type="text" placeholder="Reply to sender" required="">
-									<input type="submit" value="Send">
-								</form>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="inbox-page row">
-					<h4>Yesterday Messages</h4>
-					<div class="inbox-row widget-shadow">
-						<div class="mail "> <input type="checkbox" class="checkbox"> </div>
-						<div class="mail"><img src="images/i2.png" alt=""/></div>
-						<div class="mail mail-name"><h6> Michael </h6></div>
-						<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFive" aria-expanded="true" aria-controls="collapseFive">
-							<div class="mail"><p>Mollis nullam quis risus eget urna  ornare dolor sit amet</p></div>
-						</a>
-						<div class="mail-right dots_drop">
-							<div class="dropdown">
-								<a href="#"  data-toggle="dropdown" aria-expanded="false">
-									<p><i class="fa fa-ellipsis-v mail-icon"></i></p>
-								</a>
-								<ul class="dropdown-menu float-right">
-									<li>
-										<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFive" aria-expanded="true" aria-controls="collapseFive">
-											<i class="fa fa-reply mail-icon"></i>
-											Reply
-										</a>
-									</li>
-									<li>
-										<a href="#" title="">
-											<i class="fa fa-download mail-icon"></i>
-											Archive
-										</a>
-									</li>
-									<li>
-										<a href="#" class="font-red" title="">
-											<i class="fa fa-trash-o mail-icon"></i>
-											Delete
-										</a>
-									</li>
-								</ul>
-							</div> 
-						</div>
-						<div class="mail-right"><p>29th Nov</p></div>
-						<div class="clearfix"> </div>
-						<div id="collapseFive" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingFive">
-							<div class="mail-body">
-								<p>Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch Nihil.</p>
-								<form>
-									<input type="text" placeholder="Reply to sender" required="">
-									<input type="submit" value="Send">
-								</form>
-							</div>
-						</div>
-					</div>
-					<div class="inbox-row widget-shadow">
-						<div class="mail "> <input type="checkbox" class="checkbox"> </div>
-						<div class="mail"><img src="images/i1.png" alt=""/></div>
-						<div class="mail mail-name"><h6>Janiya</h6></div>
-						<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseSix" aria-expanded="true" aria-controls="collapsesix">
-							<div class="mail"><p>Nullam quis risus eget urna mollis ornare eiusmod accusamus</p></div>
-						</a>
-						<div class="mail-right dots_drop">
-							<div class="dropdown">
-								<a href="#"  data-toggle="dropdown" aria-expanded="false">
-									<p><i class="fa fa-ellipsis-v mail-icon"></i></p>
-								</a>
-								<ul class="dropdown-menu float-right">
-									<li>
-										<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseSix" aria-expanded="true" aria-controls="collapseSix">
-											<i class="fa fa-reply mail-icon"></i>
-											Reply
-										</a>
-									</li>
-									<li>
-										<a href="#" title="">
-											<i class="fa fa-download mail-icon"></i>
-											Archive
-										</a>
-									</li>
-									<li>
-										<a href="#" class="font-red" title="">
-											<i class="fa fa-trash-o mail-icon"></i>
-											Delete
-										</a>
-									</li>
-								</ul>
-							</div> 
-						</div>
-						<div class="mail-right"><p>29th Nov</p></div>
-						<div class="clearfix"> </div>
-						<div id="collapseSix" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingsix">
-							<div class="mail-body">
-								<p>Officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident.</p>
-								<form>
-									<input type="text" placeholder="Reply to sender" required="">
-									<input type="submit" value="Send">
-								</form>
-							</div>
-						</div>
-					</div>
-					<div class="inbox-row widget-shadow">
-						<div class="mail "> <input type="checkbox" class="checkbox"> </div>
-						<div class="mail"><img src="images/i3.png" alt=""/></div>
-						<div class="mail mail-name"><h6>Skolski</h6></div>
-						<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseSev" aria-expanded="true" aria-controls="collapsesev">
-							<div class="mail"><p>Ornare vel eu leo nullam quis urna mollis eiusmod high life</p></div>
-						</a>
-						<div class="mail-right dots_drop">
-							<div class="dropdown">
-								<a href="#"  data-toggle="dropdown" aria-expanded="false">
-									<p><i class="fa fa-ellipsis-v mail-icon"></i></p>
-								</a>
-								<ul class="dropdown-menu float-right">
-									<li>
-										<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseSev" aria-expanded="true" aria-controls="collapseSev">
-											<i class="fa fa-reply mail-icon"></i>
-											Reply
-										</a>
-									</li>
-									<li>
-										<a href="#" title="">
-											<i class="fa fa-download mail-icon"></i>
-											Archive
-										</a>
-									</li>
-									<li>
-										<a href="#" class="font-red" title="">
-											<i class="fa fa-trash-o mail-icon"></i>
-											Delete
-										</a>
-									</li>
-								</ul>
-							</div> 
-						</div>
-						<div class="mail-right"><p>29th Nov</p></div>
-						<div class="clearfix"> </div>	
-						<div id="collapseSev" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingsev">
-							<div class="mail-body">
-								<p>wolf moon officia aute, non cupidatat skateboard dolor brunch aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident.</p>
-								<form>
-									<input type="text" placeholder="Reply to sender" required="">
-									<input type="submit" value="Send">
-								</form>
-							</div>
-						</div>
-					</div>
-					<div class="inbox-row widget-shadow">
-						<div class="mail "> <input type="checkbox" class="checkbox"> </div>
-						<div class="mail"><img src="images/i4.png" alt=""/></div>
-						<div class="mail mail-name"><h6>Emoori</h6></div>
-						<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseEight" aria-expanded="true" aria-controls="collapseEight">
-							<div class="mail"><p>Vely Ornare  leo nullam eget urna mollis lorem ipsum</p></div>
-						</a>
-						<div class="mail-right dots_drop">
-							<div class="dropdown">
-								<a href="#"  data-toggle="dropdown" aria-expanded="false">
-									<p><i class="fa fa-ellipsis-v mail-icon"></i></p>
-								</a>
-								<ul class="dropdown-menu float-right">
-									<li>
-										<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseEight" aria-expanded="true" aria-controls="collapseEight">
-											<i class="fa fa-reply mail-icon"></i>
-											Reply
-										</a>
-									</li>
-									<li>
-										<a href="#" title="">
-											<i class="fa fa-download mail-icon"></i>
-											Archive
-										</a>
-									</li>
-									<li>
-										<a href="#" class="font-red" title="">
-											<i class="fa fa-trash-o mail-icon"></i>
-											Delete
-										</a>
-									</li>
-								</ul>
-							</div> 
-						</div>
-						<div class="mail-right"><p>29th Nov</p></div>
-						<div class="clearfix"> </div>
-						<div id="collapseEight" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingeight">
-							<div class="mail-body">
-								<p>Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor.</p>
-								<form>
-									<input type="text" placeholder="Reply to sender" required="">
-									<input type="submit" value="Send">
-								</form>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="inbox-page row">
-					<h4>Older Messages</h4>
-					<div class="inbox-row widget-shadow">
-						<div class="mail "> <input type="checkbox" class="checkbox"> </div>
-						<div class="mail"><img src="images/i2.png" alt=""/></div>
-						<div class="mail mail-name"><h6> Michael</h6></div>
-						<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseNine" aria-expanded="true" aria-controls="collapsenine">
-							<div class="mail"><p>Mollis nullam quis risus ornare vel leo dolor sit amet</p></div>
-						</a>
-						<div class="mail-right dots_drop">
-							<div class="dropdown">
-								<a href="#"  data-toggle="dropdown" aria-expanded="false">
-									<p><i class="fa fa-ellipsis-v mail-icon"></i></p>
-								</a>
-								<ul class="dropdown-menu float-right">
-									<li>
-										<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseNine" aria-expanded="true" aria-controls="collapseNine">
-											<i class="fa fa-reply mail-icon"></i>
-											Reply
-										</a>
-									</li>
-									<li>
-										<a href="#" title="">
-											<i class="fa fa-download mail-icon"></i>
-											Archive
-										</a>
-									</li>
-									<li>
-										<a href="#" class="font-red" title="">
-											<i class="fa fa-trash-o mail-icon"></i>
-											Delete
-										</a>
-									</li>
-								</ul>
-							</div> 
-						</div>
-						<div class="mail-right"><p>29th Nov</p></div>
-						<div class="clearfix"> </div>
-						<div id="collapseNine" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingnine">
-							<div class="mail-body">
-								<p>Skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident.</p>
-								<form>
-									<input type="text" placeholder="Reply to sender" required="">
-									<input type="submit" value="Send">
-								</form>
-							</div>
-						</div>
-					</div>
-					<div class="inbox-row widget-shadow">
-						<div class="mail "> <input type="checkbox" class="checkbox"> </div>
-						<div class="mail"><img src="images/i1.png" alt=""/></div>
-						<div class="mail mail-name"><h6>Janiya</h6></div>
-						<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTen" aria-expanded="true" aria-controls="collapseTen">
-							<div class="mail"><p>Nullam quis risus mollis ornare leo ollis nullam quis</p></div>
-						</a>
-						<div class="mail-right dots_drop">
-							<div class="dropdown">
-								<a href="#"  data-toggle="dropdown" aria-expanded="false">
-									<p><i class="fa fa-ellipsis-v mail-icon"></i></p>
-								</a>
-								<ul class="dropdown-menu float-right">
-									<li>
-										<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTen" aria-expanded="true" aria-controls="collapseTen">
-											<i class="fa fa-reply mail-icon"></i>
-											Reply
-										</a>
-									</li>
-									<li>
-										<a href="#" title="">
-											<i class="fa fa-download mail-icon"></i>
-											Archive
-										</a>
-									</li>
-									<li>
-										<a href="#" class="font-red" title="">
-											<i class="fa fa-trash-o mail-icon"></i>
-											Delete
-										</a>
-									</li>
-								</ul>
-							</div> 
-						</div>
-						<div class="mail-right"><p>28th Nov</p></div>
-						<div class="clearfix"> </div>
-						<div id="collapseTen" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingten">
-							<div class="mail-body">
-								<p>Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident.</p>
-								<form>
-									<input type="text" placeholder="Reply to sender" required="">
-									<input type="submit" value="Send">
-								</form>
-							</div>
-						</div>
-					</div>
-					<div class="inbox-row widget-shadow">
-						<div class="mail "> <input type="checkbox" class="checkbox"> </div>
-						<div class="mail"><img src="images/i3.png" alt=""/></div>
-						<div class="mail mail-name"><h6>Skolski</h6></div>
-						<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse11" aria-expanded="true" aria-controls="collapse11">
-							<div class="mail"><p>Ornare vel quis risus ollis nullam quis eget urna mollis </p></div>
-						</a>
-						<div class="mail-right dots_drop">
-							<div class="dropdown">
-								<a href="#"  data-toggle="dropdown" aria-expanded="false">
-									<p><i class="fa fa-ellipsis-v mail-icon"></i></p>
-								</a>
-								<ul class="dropdown-menu float-right">
-									<li>
-										<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse11" aria-expanded="true" aria-controls="collapse11">
-											<i class="fa fa-reply mail-icon"></i>
-											Reply
-										</a>
-									</li>
-									<li>
-										<a href="#" title="">
-											<i class="fa fa-download mail-icon"></i>
-											Archive
-										</a>
-									</li>
-									<li>
-										<a href="#" class="font-red" title="">
-											<i class="fa fa-trash-o mail-icon"></i>
-											Delete
-										</a>
-									</li>
-								</ul>
-							</div> 
-						</div>
-						<div class="mail-right"><p>28th Nov</p></div>
-						<div class="clearfix"> </div>
-						<div id="collapse11" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading11">
-							<div class="mail-body">
-								<p>Nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident.</p>
-								<form>
-									<input type="text" placeholder="Reply to sender" required="">
-									<input type="submit" value="Send">
-								</form>
-							</div>
-						</div>
-					</div>
-					<div class="inbox-row widget-shadow">
-						<div class="mail "> <input type="checkbox" class="checkbox"> </div>
-						<div class="mail"><img src="images/i4.png" alt=""/></div>
-						<div class="mail mail-name"><h6>Emoori</h6></div>
-						<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse12" aria-expanded="true" aria-controls="collapse12">
-							<div class="mail"><p>Vely Ornare  leo nullam quis risus eget ollis nullam quis</p></div>
-						</a>
-						<div class="mail-right dots_drop">
-							<div class="dropdown">
-								<a href="#"  data-toggle="dropdown" aria-expanded="false">
-									<p><i class="fa fa-ellipsis-v mail-icon"></i></p>
-								</a>
-								<ul class="dropdown-menu float-right">
-									<li>
-										<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse12" aria-expanded="true" aria-controls="collapse12">
-											<i class="fa fa-reply mail-icon"></i>
-											Reply
-										</a>
-									</li>
-									<li>
-										<a href="#" title="">
-											<i class="fa fa-download mail-icon"></i>
-											Archive
-										</a>
-									</li>
-									<li>
-										<a href="#" class="font-red" title="">
-											<i class="fa fa-trash-o mail-icon"></i>
-											Delete
-										</a>
-									</li>
-								</ul>
-							</div> 
-						</div>
-						<div class="mail-right"><p>27th Nov</p></div>
-						<div class="clearfix"> </div>
-						<div id="collapse12" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading12">
-							<div class="mail-body">
-								<p>Anim pariatur cliche repreh enderit brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident.</p>
-								<form>
-									<input type="text" placeholder="Reply to sender" required="">
-									<input type="submit" value="Send">
-								</form>
-							</div>
-						</div>
-					</div>
-					<div class="inbox-row widget-shadow">
-						<div class="mail "> <input type="checkbox" class="checkbox"> </div>
-						<div class="mail"><img src="images/i1.png" alt=""/></div>
-						<div class="mail mail-name"><h6>Janiya</h6></div>
-						<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse13" aria-expanded="true" aria-controls="collapse13">
-							<div class="mail"><p>Vely Ornare quis risus ollis nullam quis eget urna mollis </p></div>
-						</a>
-						<div class="mail-right dots_drop">
-							<div class="dropdown">
-								<a href="#"  data-toggle="dropdown" aria-expanded="false">
-									<p><i class="fa fa-ellipsis-v mail-icon"></i></p>
-								</a>
-								<ul class="dropdown-menu float-right">
-									<li>
-										<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse13" aria-expanded="true" aria-controls="collapse13">
-											<i class="fa fa-reply mail-icon"></i>
-											Reply
-										</a>
-									</li>
-									<li>
-										<a href="#" title="">
-											<i class="fa fa-download mail-icon"></i>
-											Archive
-										</a>
-									</li>
-									<li>
-										<a href="#" class="font-red" title="">
-											<i class="fa fa-trash-o mail-icon"></i>
-											Delete
-										</a>
-									</li>
-								</ul>
-							</div> 
-						</div>
-						<div class="mail-right"><p>26th Nov</p></div>
-						<div class="clearfix"> </div>
-						<div id="collapse13" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading13">
-							<div class="mail-body">
-								<p>Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon temsunt </p>
-								<form>
-									<input type="text" placeholder="Reply to sender" required="">
-									<input type="submit" value="Send">
-								</form>
-							</div>
-						</div>
-					</div>
-					<div class="inbox-row widget-shadow">
-						<div class="mail "> <input type="checkbox" class="checkbox"> </div>
-						<div class="mail"><img src="images/i3.png" alt=""/></div>
-						<div class="mail mail-name"><h6>Skolski</h6></div>
-						<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse14" aria-expanded="true" aria-controls="collapse14">
-							<div class="mail"><p>Vely Ornare  leo nullam quis ollis nullam quis risus eget </p></div>
-						</a>
-						<div class="mail-right dots_drop">
-							<div class="dropdown">
-								<a href="#"  data-toggle="dropdown" aria-expanded="false">
-									<p><i class="fa fa-ellipsis-v mail-icon"></i></p>
-								</a>
-								<ul class="dropdown-menu float-right">
-									<li>
-										<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse15" aria-expanded="true" aria-controls="collapse15">
-											<i class="fa fa-reply mail-icon"></i>
-											Reply
-										</a>
-									</li>
-									<li>
-										<a href="#" title="">
-											<i class="fa fa-download mail-icon"></i>
-											Archive
-										</a>
-									</li>
-									<li>
-										<a href="#" class="font-red" title="">
-											<i class="fa fa-trash-o mail-icon"></i>
-											Delete
-										</a>
-									</li>
-								</ul>
-							</div> 
-						</div>
-						<div class="mail-right"><p>26th Nov</p></div>
-						<div class="clearfix"> </div>
-						<div id="collapse14" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading14">
-							<div class="mail-body">
-								<p>Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident.</p>
-								<form>
-									<input type="text" placeholder="Reply to sender" required="">
-									<input type="submit" value="Send">
-								</form>
-							</div>
-						</div>
-					</div>
-					<div class="inbox-row widget-shadow">
-						<div class="mail "> <input type="checkbox" class="checkbox"> </div>
-						<div class="mail"><img src="images/i1.png" alt=""/></div>
-						<div class="mail mail-name"><h6>Janiya</h6></div>
-						<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse15" aria-expanded="true" aria-controls="collapse15">
-							<div class="mail"><p>Nullam quis risus mollis ornare vel eu leo ollis nullam quis</p></div>
-						</a>
-						<div class="mail-right dots_drop">
-							<div class="dropdown">
-								<a href="#"  data-toggle="dropdown" aria-expanded="false">
-									<p><i class="fa fa-ellipsis-v mail-icon"></i></p>
-								</a>
-								<ul class="dropdown-menu float-right">
-									<li>
-										<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse15" aria-expanded="true" aria-controls="collapse15">
-											<i class="fa fa-reply mail-icon"></i>
-											Reply
-										</a>
-									</li>
-									<li>
-										<a href="#" title="">
-											<i class="fa fa-download mail-icon"></i>
-											Archive
-										</a>
-									</li>
-									<li>
-										<a href="#" class="font-red" title="">
-											<i class="fa fa-trash-o mail-icon"></i>
-											Delete
-										</a>
-									</li>
-								</ul>
-							</div> 
-						</div>
-						<div class="mail-right"><p>26th Nov</p></div>
-						<div class="clearfix"> </div>
-						<div id="collapse15" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading15">
-							<div class="mail-body">
-								<p>Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident.</p>
-								<form>
-									<input type="text" placeholder="Reply to sender" required="">
-									<input type="submit" value="Send">
-								</form>
-							</div>
-						</div>
-					</div>
-					<div class="inbox-row widget-shadow">
-						<div class="mail "> <input type="checkbox" class="checkbox"> </div>
-						<div class="mail"><img src="images/i2.png" alt=""/></div>
-						<div class="mail mail-name"><h6> Michael</h6></div>
-						<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse16" aria-expanded="true" aria-controls="collapse16">
-							<div class="mail"><p>Mollis nullam quis risus eget ollis nullam quis urna</p></div>
-						</a>
-						<div class="mail-right dots_drop">
-							<div class="dropdown">
-								<a href="#"  data-toggle="dropdown" aria-expanded="false">
-									<p><i class="fa fa-ellipsis-v mail-icon"></i></p>
-								</a>
-								<ul class="dropdown-menu float-right">
-									<li>
-										<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse16" aria-expanded="true" aria-controls="collapse16">
-											<i class="fa fa-reply mail-icon"></i>
-											Reply
-										</a>
-									</li>
-									<li>
-										<a href="#" title="">
-											<i class="fa fa-download mail-icon"></i>
-											Archive
-										</a>
-									</li>
-									<li>
-										<a href="#" class="font-red" title="">
-											<i class="fa fa-trash-o mail-icon"></i>
-											Delete
-										</a>
-									</li>
-								</ul>
-							</div> 
-						</div>
-						<div class="mail-right"><p>25th Nov</p></div>
-						<div class="clearfix"> </div>
-						<div id="collapse16" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading16">
-							<div class="mail-body">
-								<p>Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua putica sapiente ea proident.</p>
-								<form>
-									<input type="text" placeholder="Reply to sender" required="">
-									<input type="submit" value="Send">
-								</form>
-							</div>
-						</div>
-					</div>
-					<div class="inbox-row widget-shadow">
-						<div class="mail "> <input type="checkbox" class="checkbox"> </div>
-						<div class="mail"><img src="images/i3.png" alt=""/></div>
-						<div class="mail mail-name"><h6>Skolski</h6></div>
-						<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse17" aria-expanded="true" aria-controls="collapse17">
-							<div class="mail"><p>Ornare vel eu leo nullam quis urna mollis ollis nullam quis</p></div>
-						</a>
-						<div class="mail-right  dots_drop">
-							<div class="dropdown">
-								<a href="#"  data-toggle="dropdown" aria-expanded="false">
-									<p><i class="fa fa-ellipsis-v mail-icon"></i></p>
-								</a>
-								<ul class="dropdown-menu float-right">
-									<li>
-										<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse17" aria-expanded="true" aria-controls="collapse17">
-											<i class="fa fa-reply mail-icon"></i>
-											Reply
-										</a>
-									</li>
-									<li>
-										<a href="#" title="">
-											<i class="fa fa-download mail-icon"></i>
-											Archive
-										</a>
-									</li>
-									<li>
-										<a href="#" class="font-red" title="">
-											<i class="fa fa-trash-o mail-icon"></i>
-											Delete
-										</a>
-									</li>
-								</ul>
-							</div> 
-						</div>
-						<div class="mail-right"><p>25th Nov</p></div>
-						<div class="clearfix"> </div>
-						<div id="collapse17" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading17">
-							<div class="mail-body">
-								<p>Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident.</p>
-								<form>
-									<input type="text" placeholder="Reply to sender" required="">
-									<input type="submit" value="Send">
-								</form>
-							</div>
-						</div>
-					</div>
-					<div class="inbox-row widget-shadow">
-						<div class="mail "> <input type="checkbox" class="checkbox"> </div>
-						<div class="mail"><img src="images/i4.png" alt=""/></div>
-						<div class="mail mail-name"><h6>Emoori</h6></div>
-						<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse18" aria-expanded="true" aria-controls="collapse18">
-							<div class="mail"><p>Vely Ornare  leo nullam quis ollis nullam quis risus mollis </p></div>
-						</a>
-						<div class="mail-right dots_drop">
-							<div class="dropdown">
-								<a href="#"  data-toggle="dropdown" aria-expanded="false">
-									<p><i class="fa fa-ellipsis-v mail-icon"></i></p>
-								</a>
-								<ul class="dropdown-menu float-right">
-									<li>
-										<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse18" aria-expanded="true" aria-controls="collapse18">
-											<i class="fa fa-reply mail-icon"></i>
-											Reply
-										</a>
-									</li>
-									<li>
-										<a href="#" title="">
-											<i class="fa fa-download mail-icon"></i>
-											Archive
-										</a>
-									</li>
-									<li>
-										<a href="#" class="font-red" title="">
-											<i class="fa fa-trash-o mail-icon"></i>
-											Delete
-										</a>
-									</li>
-								</ul>
-							</div> 
-						</div>
-						<div class="mail-right"><p>10th Nov</p></div>
-						<div class="clearfix"> </div>
-						<div id="collapse18" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading18">
-							<div class="mail-body">
-								<p>Laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident.</p>
-								<form>
-									<input type="text" placeholder="Reply to sender" required="">
-									<input type="submit" value="Send">
-								</form>
-							</div>
-						</div>
-					</div>
-				</div>
-						
-			</div>
-				</div>
-				<div class="clearfix"> </div>	
-			</div>
-				
-			</div>
-		</div>
-		<!--footer-->
-		<div class="footer">
-		   <p>&copy; 2018 Glance Design Dashboard. All Rights Reserved | Design by <a href="https://w3layouts.com/" target="_blank">w3layouts</a></p>
-	   </div>
-        <!--//footer-->
-	</div>
-	
-	<!-- side nav js -->
-	<script src='js/SidebarNav.min.js' type='text/javascript'></script>
-	<script>
-      $('.sidebar-menu').SidebarNav()
-    </script>
-	<!-- //side nav js -->
-	
-	<!-- Classie --><!-- for toggle left push menu script -->
-		<script src="js/classie.js"></script>
-		<script>
-			var menuLeft = document.getElementById( 'cbp-spmenu-s1' ),
-				showLeftPush = document.getElementById( 'showLeftPush' ),
-				body = document.body;
-				
-			showLeftPush.onclick = function() {
-				classie.toggle( this, 'active' );
-				classie.toggle( body, 'cbp-spmenu-push-toright' );
-				classie.toggle( menuLeft, 'cbp-spmenu-open' );
-				disableOther( 'showLeftPush' );
-			};
-			
-			function disableOther( button ) {
-				if( button !== 'showLeftPush' ) {
-					classie.toggle( showLeftPush, 'disabled' );
-				}
-			}
-		</script>
-	<!-- //Classie --><!-- //for toggle left push menu script -->
-		
-	<!--scrolling js-->
-
-	<script src="js/scripts.js"></script>
-	<!--//scrolling js-->
-	
-	<!-- Bootstrap Core JavaScript -->
-   <script src="js/bootstrap.js"> </script>
-   
-</body>
-</html>
\ No newline at end of file

src/main/resources/public/index.html

@@ -33,22 +33,31 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
     <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
     <script src="js/angular-route.js"></script>
     <script src="js/angular-ui-router.min.js"></script>
+    <script src="js/angular-resource.js"></script>
     <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular-animate.js"></script>
     <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular-sanitize.js"></script>
     <script src="//angular-ui.github.io/bootstrap/ui-bootstrap-tpls-1.3.3.js"></script>
     <script src="js/app.js"></script>
     <script src="pages/report/reportController.js"></script>
     <script src="pages/employee/employeeController.js"></script>
-<!--    <script src="pages/project/projectController.js"></script>-->
+    <script src="pages/project/project/projectController.js"></script>
+    <script src="pages/project/groupproject/groupProjectController.js"></script>
+    <script src="pages/project/groupproject/groupProjectViewController.js"></script>
+    <script src="pages/issue/IssueAddControlelr.js"></script>
+    <script src="pages/issue/IssueController.js"></script>
+    <script src="pages/issue/IssuesDetailController.js"></script>
+    <script src="pages/issue/IssuesDeleteController.js"></script>
     <script src="pages/leaveform/leaveFormController.js"></script>
-    <script src="pages/homepage/homeController.js"></script>
+    <script src="pages/homepage/MyHomeController.js"></script>
+    <script src="pages/homepage/HomeService.js"></script>
     <script src="pages/timesheet/timeSheetController.js"></script>
     <script src="pages/timesheet/timeSheetDetailController.js"></script>
     <script src="pages/leaveform/leaveFormDetailController.js"></script>
     <script src="pages/employee/createEmployeeController.js"></script>
+    <script src="pages/project/project/projectViewController.js"></script>
     <link data-require="bootstrap-css@2.3.2" data-semver="2.3.2" rel="stylesheet"
           href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css"/>
-    `
+
     <!--	end anguarjs app-->
     <link href="css/custom.css" rel="stylesheet">
 
@@ -111,6 +120,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
         });
     </script>
 
+
+
 </head>
 <body class="cbp-spmenu-push" ng-app="myApp">
 <div ui-view="layout"></div>

src/main/resources/public/js/angular-resource.js

+/**
+ * @license AngularJS v1.3.14
+ * (c) 2010-2014 Google, Inc. http://angularjs.org
+ * License: MIT
+ */
+(function(window, angular, undefined) {'use strict';
+
+var $resourceMinErr = angular.$$minErr('$resource');
+
+// Helper functions and regex to lookup a dotted path on an object
+// stopping at undefined/null.  The path must be composed of ASCII
+// identifiers (just like $parse)
+var MEMBER_NAME_REGEX = /^(\.[a-zA-Z_$][0-9a-zA-Z_$]*)+$/;
+
+function isValidDottedPath(path) {
+  return (path != null && path !== '' && path !== 'hasOwnProperty' &&
+      MEMBER_NAME_REGEX.test('.' + path));
+}
+
+function lookupDottedPath(obj, path) {
+  if (!isValidDottedPath(path)) {
+    throw $resourceMinErr('badmember', 'Dotted member path "@{0}" is invalid.', path);
+  }
+  var keys = path.split('.');
+  for (var i = 0, ii = keys.length; i < ii && obj !== undefined; i++) {
+    var key = keys[i];
+    obj = (obj !== null) ? obj[key] : undefined;
+  }
+  return obj;
+}
+
+/**
+ * Create a shallow copy of an object and clear other fields from the destination
+ */
+function shallowClearAndCopy(src, dst) {
+  dst = dst || {};
+
+  angular.forEach(dst, function(value, key) {
+    delete dst[key];
+  });
+
+  for (var key in src) {
+    if (src.hasOwnProperty(key) && !(key.charAt(0) === '$' && key.charAt(1) === '$')) {
+      dst[key] = src[key];
+    }
+  }
+
+  return dst;
+}
+
+/**
+ * @ngdoc module
+ * @name ngResource
+ * @description
+ *
+ * # ngResource
+ *
+ * The `ngResource` module provides interaction support with RESTful services
+ * via the $resource service.
+ *
+ *
+ * <div doc-module-components="ngResource"></div>
+ *
+ * See {@link ngResource.$resource `$resource`} for usage.
+ */
+
+/**
+ * @ngdoc service
+ * @name $resource
+ * @requires $http
+ *
+ * @description
+ * A factory which creates a resource object that lets you interact with
+ * [RESTful](http://en.wikipedia.org/wiki/Representational_State_Transfer) server-side data sources.
+ *
+ * The returned resource object has action methods which provide high-level behaviors without
+ * the need to interact with the low level {@link ng.$http $http} service.
+ *
+ * Requires the {@link ngResource `ngResource`} module to be installed.
+ *
+ * By default, trailing slashes will be stripped from the calculated URLs,
+ * which can pose problems with server backends that do not expect that
+ * behavior.  This can be disabled by configuring the `$resourceProvider` like
+ * this:
+ *
+ * ```js
+     app.config(['$resourceProvider', function($resourceProvider) {
+       // Don't strip trailing slashes from calculated URLs
+       $resourceProvider.defaults.stripTrailingSlashes = false;
+     }]);
+ * ```
+ *
+ * @param {string} url A parametrized URL template with parameters prefixed by `:` as in
+ *   `/user/:username`. If you are using a URL with a port number (e.g.
+ *   `http://example.com:8080/api`), it will be respected.
+ *
+ *   If you are using a url with a suffix, just add the suffix, like this:
+ *   `$resource('http://example.com/resource.json')` or `$resource('http://example.com/:id.json')`
+ *   or even `$resource('http://example.com/resource/:resource_id.:format')`
+ *   If the parameter before the suffix is empty, :resource_id in this case, then the `/.` will be
+ *   collapsed down to a single `.`.  If you need this sequence to appear and not collapse then you
+ *   can escape it with `/\.`.
+ *
+ * @param {Object=} paramDefaults Default values for `url` parameters. These can be overridden in
+ *   `actions` methods. If any of the parameter value is a function, it will be executed every time
+ *   when a param value needs to be obtained for a request (unless the param was overridden).
+ *
+ *   Each key value in the parameter object is first bound to url template if present and then any
+ *   excess keys are appended to the url search query after the `?`.
+ *
+ *   Given a template `/path/:verb` and parameter `{verb:'greet', salutation:'Hello'}` results in
+ *   URL `/path/greet?salutation=Hello`.
+ *
+ *   If the parameter value is prefixed with `@` then the value for that parameter will be extracted
+ *   from the corresponding property on the `data` object (provided when calling an action method).  For
+ *   example, if the `defaultParam` object is `{someParam: '@someProp'}` then the value of `someParam`
+ *   will be `data.someProp`.
+ *
+ * @param {Object.<Object>=} actions Hash with declaration of custom actions that should extend
+ *   the default set of resource actions. The declaration should be created in the format of {@link
+ *   ng.$http#usage $http.config}:
+ *
+ *       {action1: {method:?, params:?, isArray:?, headers:?, ...},
+ *        action2: {method:?, params:?, isArray:?, headers:?, ...},
+ *        ...}
+ *
+ *   Where:
+ *
+ *   - **`action`** – {string} – The name of action. This name becomes the name of the method on
+ *     your resource object.
+ *   - **`method`** – {string} – Case insensitive HTTP method (e.g. `GET`, `POST`, `PUT`,
+ *     `DELETE`, `JSONP`, etc).
+ *   - **`params`** – {Object=} – Optional set of pre-bound parameters for this action. If any of
+ *     the parameter value is a function, it will be executed every time when a param value needs to
+ *     be obtained for a request (unless the param was overridden).
+ *   - **`url`** – {string} – action specific `url` override. The url templating is supported just
+ *     like for the resource-level urls.
+ *   - **`isArray`** – {boolean=} – If true then the returned object for this action is an array,
+ *     see `returns` section.
+ *   - **`transformRequest`** –
+ *     `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` –
+ *     transform function or an array of such functions. The transform function takes the http
+ *     request body and headers and returns its transformed (typically serialized) version.
+ *     By default, transformRequest will contain one function that checks if the request data is
+ *     an object and serializes to using `angular.toJson`. To prevent this behavior, set
+ *     `transformRequest` to an empty array: `transformRequest: []`
+ *   - **`transformResponse`** –
+ *     `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` –
+ *     transform function or an array of such functions. The transform function takes the http
+ *     response body and headers and returns its transformed (typically deserialized) version.
+ *     By default, transformResponse will contain one function that checks if the response looks like
+ *     a JSON string and deserializes it using `angular.fromJson`. To prevent this behavior, set
+ *     `transformResponse` to an empty array: `transformResponse: []`
+ *   - **`cache`** – `{boolean|Cache}` – If true, a default $http cache will be used to cache the
+ *     GET request, otherwise if a cache instance built with
+ *     {@link ng.$cacheFactory $cacheFactory}, this cache will be used for
+ *     caching.
+ *   - **`timeout`** – `{number|Promise}` – timeout in milliseconds, or {@link ng.$q promise} that
+ *     should abort the request when resolved.
+ *   - **`withCredentials`** - `{boolean}` - whether to set the `withCredentials` flag on the
+ *     XHR object. See
+ *     [requests with credentials](https://developer.mozilla.org/en/http_access_control#section_5)
+ *     for more information.
+ *   - **`responseType`** - `{string}` - see
+ *     [requestType](https://developer.mozilla.org/en-US/docs/DOM/XMLHttpRequest#responseType).
+ *   - **`interceptor`** - `{Object=}` - The interceptor object has two optional methods -
+ *     `response` and `responseError`. Both `response` and `responseError` interceptors get called
+ *     with `http response` object. See {@link ng.$http $http interceptors}.
+ *
+ * @param {Object} options Hash with custom settings that should extend the
+ *   default `$resourceProvider` behavior.  The only supported option is
+ *
+ *   Where:
+ *
+ *   - **`stripTrailingSlashes`** – {boolean} – If true then the trailing
+ *   slashes from any calculated URL will be stripped. (Defaults to true.)
+ *
+ * @returns {Object} A resource "class" object with methods for the default set of resource actions
+ *   optionally extended with custom `actions`. The default set contains these actions:
+ *   ```js
+ *   { 'get':    {method:'GET'},
+ *     'save':   {method:'POST'},
+ *     'query':  {method:'GET', isArray:true},
+ *     'remove': {method:'DELETE'},
+ *     'delete': {method:'DELETE'} };
+ *   ```
+ *
+ *   Calling these methods invoke an {@link ng.$http} with the specified http method,
+ *   destination and parameters. When the data is returned from the server then the object is an
+ *   instance of the resource class. The actions `save`, `remove` and `delete` are available on it
+ *   as  methods with the `$` prefix. This allows you to easily perform CRUD operations (create,
+ *   read, update, delete) on server-side data like this:
+ *   ```js
+ *   var User = $resource('/user/:userId', {userId:'@id'});
+ *   var user = User.get({userId:123}, function() {
+ *     user.abc = true;
+ *     user.$save();
+ *   });
+ *   ```
+ *
+ *   It is important to realize that invoking a $resource object method immediately returns an
+ *   empty reference (object or array depending on `isArray`). Once the data is returned from the
+ *   server the existing reference is populated with the actual data. This is a useful trick since
+ *   usually the resource is assigned to a model which is then rendered by the view. Having an empty
+ *   object results in no rendering, once the data arrives from the server then the object is
+ *   populated with the data and the view automatically re-renders itself showing the new data. This
+ *   means that in most cases one never has to write a callback function for the action methods.
+ *
+ *   The action methods on the class object or instance object can be invoked with the following
+ *   parameters:
+ *
+ *   - HTTP GET "class" actions: `Resource.action([parameters], [success], [error])`
+ *   - non-GET "class" actions: `Resource.action([parameters], postData, [success], [error])`
+ *   - non-GET instance actions:  `instance.$action([parameters], [success], [error])`
+ *
+ *
+ *   Success callback is called with (value, responseHeaders) arguments. Error callback is called
+ *   with (httpResponse) argument.
+ *
+ *   Class actions return empty instance (with additional properties below).
+ *   Instance actions return promise of the action.
+ *
+ *   The Resource instances and collection have these additional properties:
+ *
+ *   - `$promise`: the {@link ng.$q promise} of the original server interaction that created this
+ *     instance or collection.
+ *
+ *     On success, the promise is resolved with the same resource instance or collection object,
+ *     updated with data from server. This makes it easy to use in
+ *     {@link ngRoute.$routeProvider resolve section of $routeProvider.when()} to defer view
+ *     rendering until the resource(s) are loaded.
+ *
+ *     On failure, the promise is resolved with the {@link ng.$http http response} object, without
+ *     the `resource` property.
+ *
+ *     If an interceptor object was provided, the promise will instead be resolved with the value
+ *     returned by the interceptor.
+ *
+ *   - `$resolved`: `true` after first server interaction is completed (either with success or
+ *      rejection), `false` before that. Knowing if the Resource has been resolved is useful in
+ *      data-binding.
+ *
+ * @example
+ *
+ * # Credit card resource
+ *
+ * ```js
+     // Define CreditCard class
+     var CreditCard = $resource('/user/:userId/card/:cardId',
+      {userId:123, cardId:'@id'}, {
+       charge: {method:'POST', params:{charge:true}}
+      });
+
+     // We can retrieve a collection from the server
+     var cards = CreditCard.query(function() {
+       // GET: /user/123/card
+       // server returns: [ {id:456, number:'1234', name:'Smith'} ];
+
+       var card = cards[0];
+       // each item is an instance of CreditCard
+       expect(card instanceof CreditCard).toEqual(true);
+       card.name = "J. Smith";
+       // non GET methods are mapped onto the instances
+       card.$save();
+       // POST: /user/123/card/456 {id:456, number:'1234', name:'J. Smith'}
+       // server returns: {id:456, number:'1234', name: 'J. Smith'};
+
+       // our custom method is mapped as well.
+       card.$charge({amount:9.99});
+       // POST: /user/123/card/456?amount=9.99&charge=true {id:456, number:'1234', name:'J. Smith'}
+     });
+
+     // we can create an instance as well
+     var newCard = new CreditCard({number:'0123'});
+     newCard.name = "Mike Smith";
+     newCard.$save();
+     // POST: /user/123/card {number:'0123', name:'Mike Smith'}
+     // server returns: {id:789, number:'0123', name: 'Mike Smith'};
+     expect(newCard.id).toEqual(789);
+ * ```
+ *
+ * The object returned from this function execution is a resource "class" which has "static" method
+ * for each action in the definition.
+ *
+ * Calling these methods invoke `$http` on the `url` template with the given `method`, `params` and
+ * `headers`.
+ * When the data is returned from the server then the object is an instance of the resource type and
+ * all of the non-GET methods are available with `$` prefix. This allows you to easily support CRUD
+ * operations (create, read, update, delete) on server-side data.
+
+   ```js
+     var User = $resource('/user/:userId', {userId:'@id'});
+     User.get({userId:123}, function(user) {
+       user.abc = true;
+       user.$save();
+     });
+   ```
+ *
+ * It's worth noting that the success callback for `get`, `query` and other methods gets passed
+ * in the response that came from the server as well as $http header getter function, so one
+ * could rewrite the above example and get access to http headers as:
+ *
+   ```js
+     var User = $resource('/user/:userId', {userId:'@id'});
+     User.get({userId:123}, function(u, getResponseHeaders){
+       u.abc = true;
+       u.$save(function(u, putResponseHeaders) {
+         //u => saved user object
+         //putResponseHeaders => $http header getter
+       });
+     });
+   ```
+ *
+ * You can also access the raw `$http` promise via the `$promise` property on the object returned
+ *
+   ```
+     var User = $resource('/user/:userId', {userId:'@id'});
+     User.get({userId:123})
+         .$promise.then(function(user) {
+           $scope.user = user;
+         });
+   ```
+
+ * # Creating a custom 'PUT' request
+ * In this example we create a custom method on our resource to make a PUT request
+ * ```js
+ *    var app = angular.module('app', ['ngResource', 'ngRoute']);
+ *
+ *    // Some APIs expect a PUT request in the format URL/object/ID
+ *    // Here we are creating an 'update' method
+ *    app.factory('Notes', ['$resource', function($resource) {
+ *    return $resource('/notes/:id', null,
+ *        {
+ *            'update': { method:'PUT' }
+ *        });
+ *    }]);
+ *
+ *    // In our controller we get the ID from the URL using ngRoute and $routeParams
+ *    // We pass in $routeParams and our Notes factory along with $scope
+ *    app.controller('NotesCtrl', ['$scope', '$routeParams', 'Notes',
+                                      function($scope, $routeParams, Notes) {
+ *    // First get a note object from the factory
+ *    var note = Notes.get({ id:$routeParams.id });
+ *    $id = note.id;
+ *
+ *    // Now call update passing in the ID first then the object you are updating
+ *    Notes.update({ id:$id }, note);
+ *
+ *    // This will PUT /notes/ID with the note object in the request payload
+ *    }]);
+ * ```
+ */
+angular.module('ngResource', ['ng']).
+  provider('$resource', function() {
+    var provider = this;
+
+    this.defaults = {
+      // Strip slashes by default
+      stripTrailingSlashes: true,
+
+      // Default actions configuration
+      actions: {
+        'get': {method: 'GET'},
+        'save': {method: 'POST'},
+        'query': {method: 'GET', isArray: true},
+        'remove': {method: 'DELETE'},
+        'delete': {method: 'DELETE'}
+      }
+    };
+
+    this.$get = ['$http', '$q', function($http, $q) {
+
+      var noop = angular.noop,
+        forEach = angular.forEach,
+        extend = angular.extend,
+        copy = angular.copy,
+        isFunction = angular.isFunction;
+
+      /**
+       * We need our custom method because encodeURIComponent is too aggressive and doesn't follow
+       * http://www.ietf.org/rfc/rfc3986.txt with regards to the character set
+       * (pchar) allowed in path segments:
+       *    segment       = *pchar
+       *    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
+       *    pct-encoded   = "%" HEXDIG HEXDIG
+       *    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
+       *    sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
+       *                     / "*" / "+" / "," / ";" / "="
+       */
+      function encodeUriSegment(val) {
+        return encodeUriQuery(val, true).
+          replace(/%26/gi, '&').
+          replace(/%3D/gi, '=').
+          replace(/%2B/gi, '+');
+      }
+
+
+      /**
+       * This method is intended for encoding *key* or *value* parts of query component. We need a
+       * custom method because encodeURIComponent is too aggressive and encodes stuff that doesn't
+       * have to be encoded per http://tools.ietf.org/html/rfc3986:
+       *    query       = *( pchar / "/" / "?" )
+       *    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
+       *    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
+       *    pct-encoded   = "%" HEXDIG HEXDIG
+       *    sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
+       *                     / "*" / "+" / "," / ";" / "="
+       */
+      function encodeUriQuery(val, pctEncodeSpaces) {
+        return encodeURIComponent(val).
+          replace(/%40/gi, '@').
+          replace(/%3A/gi, ':').
+          replace(/%24/g, '$').
+          replace(/%2C/gi, ',').
+          replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
+      }
+
+      function Route(template, defaults) {
+        this.template = template;
+        this.defaults = extend({}, provider.defaults, defaults);
+        this.urlParams = {};
+      }
+
+      Route.prototype = {
+        setUrlParams: function(config, params, actionUrl) {
+          var self = this,
+            url = actionUrl || self.template,
+            val,
+            encodedVal;
+
+          var urlParams = self.urlParams = {};
+          forEach(url.split(/\W/), function(param) {
+            if (param === 'hasOwnProperty') {
+              throw $resourceMinErr('badname', "hasOwnProperty is not a valid parameter name.");
+            }
+            if (!(new RegExp("^\\d+$").test(param)) && param &&
+              (new RegExp("(^|[^\\\\]):" + param + "(\\W|$)").test(url))) {
+              urlParams[param] = true;
+            }
+          });
+          url = url.replace(/\\:/g, ':');
+
+          params = params || {};
+          forEach(self.urlParams, function(_, urlParam) {
+            val = params.hasOwnProperty(urlParam) ? params[urlParam] : self.defaults[urlParam];
+            if (angular.isDefined(val) && val !== null) {
+              encodedVal = encodeUriSegment(val);
+              url = url.replace(new RegExp(":" + urlParam + "(\\W|$)", "g"), function(match, p1) {
+                return encodedVal + p1;
+              });
+            } else {
+              url = url.replace(new RegExp("(\/?):" + urlParam + "(\\W|$)", "g"), function(match,
+                  leadingSlashes, tail) {
+                if (tail.charAt(0) == '/') {
+                  return tail;
+                } else {
+                  return leadingSlashes + tail;
+                }
+              });
+            }
+          });
+
+          // strip trailing slashes and set the url (unless this behavior is specifically disabled)
+          if (self.defaults.stripTrailingSlashes) {
+            url = url.replace(/\/+$/, '') || '/';
+          }
+
+          // then replace collapse `/.` if found in the last URL path segment before the query
+          // E.g. `http://url.com/id./format?q=x` becomes `http://url.com/id.format?q=x`
+          url = url.replace(/\/\.(?=\w+($|\?))/, '.');
+          // replace escaped `/\.` with `/.`
+          config.url = url.replace(/\/\\\./, '/.');
+
+
+          // set params - delegate param encoding to $http
+          forEach(params, function(value, key) {
+            if (!self.urlParams[key]) {
+              config.params = config.params || {};
+              config.params[key] = value;
+            }
+          });
+        }
+      };
+
+
+      function resourceFactory(url, paramDefaults, actions, options) {
+        var route = new Route(url, options);
+
+        actions = extend({}, provider.defaults.actions, actions);
+
+        function extractParams(data, actionParams) {
+          var ids = {};
+          actionParams = extend({}, paramDefaults, actionParams);
+          forEach(actionParams, function(value, key) {
+            if (isFunction(value)) { value = value(); }
+            ids[key] = value && value.charAt && value.charAt(0) == '@' ?
+              lookupDottedPath(data, value.substr(1)) : value;
+          });
+          return ids;
+        }
+
+        function defaultResponseInterceptor(response) {
+          return response.resource;
+        }
+
+        function Resource(value) {
+          shallowClearAndCopy(value || {}, this);
+        }
+
+        Resource.prototype.toJSON = function() {
+          var data = extend({}, this);
+          delete data.$promise;
+          delete data.$resolved;
+          return data;
+        };
+
+        forEach(actions, function(action, name) {
+          var hasBody = /^(POST|PUT|PATCH)$/i.test(action.method);
+
+          Resource[name] = function(a1, a2, a3, a4) {
+            var params = {}, data, success, error;
+
+            /* jshint -W086 */ /* (purposefully fall through case statements) */
+            switch (arguments.length) {
+              case 4:
+                error = a4;
+                success = a3;
+              //fallthrough
+              case 3:
+              case 2:
+                if (isFunction(a2)) {
+                  if (isFunction(a1)) {
+                    success = a1;
+                    error = a2;
+                    break;
+                  }
+
+                  success = a2;
+                  error = a3;
+                  //fallthrough
+                } else {
+                  params = a1;
+                  data = a2;
+                  success = a3;
+                  break;
+                }
+              case 1:
+                if (isFunction(a1)) success = a1;
+                else if (hasBody) data = a1;
+                else params = a1;
+                break;
+              case 0: break;
+              default:
+                throw $resourceMinErr('badargs',
+                  "Expected up to 4 arguments [params, data, success, error], got {0} arguments",
+                  arguments.length);
+            }
+            /* jshint +W086 */ /* (purposefully fall through case statements) */
+
+            var isInstanceCall = this instanceof Resource;
+            var value = isInstanceCall ? data : (action.isArray ? [] : new Resource(data));
+            var httpConfig = {};
+            var responseInterceptor = action.interceptor && action.interceptor.response ||
+              defaultResponseInterceptor;
+            var responseErrorInterceptor = action.interceptor && action.interceptor.responseError ||
+              undefined;
+
+            forEach(action, function(value, key) {
+              if (key != 'params' && key != 'isArray' && key != 'interceptor') {
+                httpConfig[key] = copy(value);
+              }
+            });
+
+            if (hasBody) httpConfig.data = data;
+            route.setUrlParams(httpConfig,
+              extend({}, extractParams(data, action.params || {}), params),
+              action.url);
+
+            var promise = $http(httpConfig).then(function(response) {
+              var data = response.data,
+                promise = value.$promise;
+
+              if (data) {
+                // Need to convert action.isArray to boolean in case it is undefined
+                // jshint -W018
+                if (angular.isArray(data) !== (!!action.isArray)) {
+                  throw $resourceMinErr('badcfg',
+                      'Error in resource configuration for action `{0}`. Expected response to ' +
+                      'contain an {1} but got an {2}', name, action.isArray ? 'array' : 'object',
+                    angular.isArray(data) ? 'array' : 'object');
+                }
+                // jshint +W018
+                if (action.isArray) {
+                  value.length = 0;
+                  forEach(data, function(item) {
+                    if (typeof item === "object") {
+                      value.push(new Resource(item));
+                    } else {
+                      // Valid JSON values may be string literals, and these should not be converted
+                      // into objects. These items will not have access to the Resource prototype
+                      // methods, but unfortunately there
+                      value.push(item);
+                    }
+                  });
+                } else {
+                  shallowClearAndCopy(data, value);
+                  value.$promise = promise;
+                }
+              }
+
+              value.$resolved = true;
+
+              response.resource = value;
+
+              return response;
+            }, function(response) {
+              value.$resolved = true;
+
+              (error || noop)(response);
+
+              return $q.reject(response);
+            });
+
+            promise = promise.then(
+              function(response) {
+                var value = responseInterceptor(response);
+                (success || noop)(value, response.headers);
+                return value;
+              },
+              responseErrorInterceptor);
+
+            if (!isInstanceCall) {
+              // we are creating instance / collection
+              // - set the initial promise
+              // - return the instance / collection
+              value.$promise = promise;
+              value.$resolved = false;
+
+              return value;
+            }
+
+            // instance call
+            return promise;
+          };
+
+
+          Resource.prototype['$' + name] = function(params, success, error) {
+            if (isFunction(params)) {
+              error = success; success = params; params = {};
+            }
+            var result = Resource[name].call(this, params, this, success, error);
+            return result.$promise || result;
+          };
+        });
+
+        Resource.bind = function(additionalParamDefaults) {
+          return resourceFactory(url, extend({}, paramDefaults, additionalParamDefaults), actions);
+        };
+
+        return Resource;
+      }
+
+      return resourceFactory;
+    }];
+  });
+
+
+})(window, window.angular);

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

 /**
  *
  */
-angular.module("myApp", ["ngAnimate", "ui.router", "ui.bootstrap"]).config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
+angular.module("myApp", ["ngAnimate","ngResource", "ui.router", "ui.bootstrap"]).config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
 
     $locationProvider.hashPrefix('');
     $urlRouterProvider.otherwise("/employees");
@@ -15,6 +15,14 @@ angular.module("myApp", ["ngAnimate", "ui.router", "ui.bootstrap"]).config(funct
                 }
             }
         })
+        .state("layout3", {
+            abstract: true,
+            views: {
+                "layout": {
+                    templateUrl: "layout/layout3.html"
+                }
+            }
+        })
         .state("layout2", {
             abstract: true,
             views: {
@@ -23,6 +31,14 @@ angular.module("myApp", ["ngAnimate", "ui.router", "ui.bootstrap"]).config(funct
                 }
             }
         })
+        .state("layout4", {
+            abstract: true,
+            views: {
+                "layout": {
+                    templateUrl: "layout/layout4.html"
+                }
+            }
+        })
 
 
         .state("employees", {
@@ -49,27 +65,6 @@ angular.module("myApp", ["ngAnimate", "ui.router", "ui.bootstrap"]).config(funct
             }
         })
 
-
-        // .state("timeSheet", {
-        //     parent: 'layout1',
-        //     url: "/timesheet",
-        //     views: {
-        //         "content": {
-        //             templateUrl: "pages/timesheet/leaveFromeaveFromDetail.html",
-        //             controller: "leaveFormController"
-        //         }
-        //     }
-        // })
-        // .state("timeSheetDetail", {
-        //     parent: 'layout1',
-        //     url: "/timesheetdetail/:id",
-        //     views: {
-        //         "content": {
-        //             templateUrl: "pages/timesheet/l",
-        //             controller: "timeSheetDetailController"
-        //         }
-        //     }
-        // })
         .state("leaveform", {
             parent: 'layout1',
             url: "/leaveform",
@@ -106,29 +101,178 @@ angular.module("myApp", ["ngAnimate", "ui.router", "ui.bootstrap"]).config(funct
             url:"/timesheetDetail/:id",
             views:{
                 "content":{
-                    templateUrl:"page/timesheet/timeSheetDetail.html",
+                    templateUrl:"pages/timesheet/timeSheetDetail.html",
                     controller:"timeSheetDetailController"
                 }
             }
 
         })
+        .state("CatagoriManagement",{
+            parent:'layout1',
+            url:"/management/catagori",
+            views:{
+                "content":{
+                    templateUrl: "pages/homepage/catagoriManagements.html",
+                    controller: "MyHomeController"
+
+                }
+            }
+        })
+        .state("newsManagement",{
+            parent:'layout1',
+            url:"/management/catagori/:myCatagoriId",
+            params:{
+                myCatagoriId : null
+            },
+            views:{
+                "content":{
+                    templateUrl: "pages/homepage/newsManagements.html",
+                    controller: "MyHomeController"
+
+                }
+            }
+        })
+        .state("newsEditManagement",{
+            parent:'layout1',
+            url:"/management/catagori/:myCatagoriEditId/news/:myNewsEditId",
+            views:{
+                "content":{
+                    templateUrl: "pages/homepage/newsEditManagement.html",
+                    controller: "MyHomeController"
+
+                }
+            }
+        })
+        .state("newsAddManagement",{
+            parent:'layout1',
+            url:"/management/HR/:employeeId/catagori/:myCatagoriAddId/createNews",
+            views:{
+                "content":{
+                    templateUrl: "pages/homepage/newsAddManagement.html",
+                    controller: "MyHomeController"
+
+                }
+            }
+        })
+        //report
+        .state("reportProject", {
+            parent: 'layout1',
+            url: "/report/project",
+            views: {
+                "content": {
+                    templateUrl: "pages/report/timeSheetReport.html",
+                    controller: "reportController"
+                }
+            }
+        })
+
+        .state("reportTimeSheet", {
+            parent: 'layout1',
+            url: "/report/project/:ID/timeSheet",
+            views: {
+                "content": {
+                    templateUrl: "pages/report/timeSheetListViews.html",
+                    controller: "timeSheetListController"
+                }
+            }
+        })
+
+        .state("reportEmployee", {
+            parent: 'layout1',
+            url: "/report/project/:ID/employee",
+            views: {
+                "content": {
+                    templateUrl: "pages/report/employeeListViews.html",
+                    controller: "listLackOfReportController"
+                }
+            }
+        })
+     //
+        .state("report2", {
+            parent: 'layout1',
+            url: "/report/project2",
+            views: {
+                "content": {
+                    templateUrl: "pages/report/reportPage.html",
+                    controller: "reportController"
+                }
+            }
+        })
+
+        .state("allReport", {
+            parent: 'layout1',
+            url: "/report/project/:ID/allReport",
+            views: {
+                "content": {
+                    templateUrl: "pages/report/reportListPage.html",
+                    controller: "allProjectReportController"
+                }
+            }
+        })
+
+        .state("reportDetail", {
+            parent: 'layout1',
+            url: "/report/reportDetail/:ID",
+            views: {
+                "content": {
+                    templateUrl: "pages/report/reportDetailPage.html",
+                    controller: "projectReportDetailController"
+                }
+            }
+        })
+
+        .state("reportEmployeeLack", {
+            parent: 'layout1',
+            url: "/report/project/:ID/employeeReport",
+            views: {
+                "content": {
+                    templateUrl: "pages/report/employeeListViews1.html",
+                    controller: "listEmployeeLackController"
+                }
+            }
+        })
+
         .state("project", {
             parent: 'layout1',
             url: "/project",
             views: {
                 "content": {
-                    templateUrl: "pages/project/project.html",
-                    controller: "projectController"
+                    templateUrl: "pages/project/project/projectListViews.html",
+                    controller: "projectViewsController"
                 }
             }
         })
-        .state("news",{
-            parent:'layout1',
-            url:"/news",
-            views:{
-                "content":{
-                    templateUrl:"pages/homepage/catagoriManagements.html",
-                    controller:"homeController"
+
+        .state("addproject", {
+            parent: 'layout1',
+            url: "/addproject",
+            views: {
+                "content": {
+                    templateUrl: "pages/project/project/projectAddViews.html",
+                    controller: "insertProject"
+                }
+            }
+        })
+
+        .state("editproject", {
+            parent: 'layout1',
+            url: "/editproject/:ID",
+            views: {
+                "content": {
+                    templateUrl: "pages/project/project/projectEditViews.html",
+                    controller: "loadProjectDetail"
+                }
+            }
+        })
+
+        .state("groupProjectByProjectId", {
+            parent: 'layout1',
+            url: "/groupProjectByProjectId/:ID",
+            params: {ID: null},
+            views: {
+                "content": {
+                    templateUrl: "pages/project/groupproject/groupProjectView.html",
+                    controller: "groupProjectShowController"
                 }
             }
         })
@@ -212,6 +356,102 @@ angular.module("myApp", ["ngAnimate", "ui.router", "ui.bootstrap"]).config(funct
     //end report=======================================================================================================
 
 
+        .state("addEmployeeProject", {
+            parent: 'layout1',
+            url: "/addEmployeeProject",
+            views: {
+                "content": {
+                    templateUrl: "pages/project/groupproject/groupProjectAddView.html",
+                    controller: "insertEmployeeProject"
+                }
+            }
+        })
+
+        .state("editEmployeeProject", {
+            parent: 'layout1',
+            url: "/editEmployeeProject/:ID",
+            views: {
+                "content": {
+                    templateUrl: "pages/project/groupproject/groupProjectEditView.html",
+                    controller: "loadEmployeeProjectDetail"
+                }
+            }
+        })
+
+        .state("issues", {
+            parent: 'layout1',
+            url: "/issues",
+            views: {
+                "content": {
+                    templateUrl: "pages/issue/IssueView.html",
+                    controller: "IssuesShowController"
+                }
+            }
+        })
+
+        .state("addIssues", {
+            parent: 'layout1',
+            url: "/addIssues",
+            views: {
+                "content": {
+                    templateUrl: "pages/issue/IssueAdd.html",
+                    controller: "IssuesAddController"
+                }
+            }
+        })
+
+        .state("IssuesComment", {
+            parent: 'layout1',
+            url: "/issuescomment/:IssuesId",
+            views: {
+                "content": {
+                    templateUrl: "pages/issue/IssueDetailViews.html",
+                    controller: "loadIssuesDetail"
+                }
+            }
+        })
+        .state("login", {
+            parent: 'layout2',
+            url: "/login",
+            views: {
+                "content": {
+                    templateUrl: "pages/login/login.html",
+                    controller: "loginController"
+                }
+            }
+        })
+        .state("register", {
+            parent: 'layout2',
+            url: "/register",
+            views: {
+                "content": {
+                    templateUrl: "pages/login/register.html",
+                    controller: "loginController"
+                }
+            }
+        })
+        .state("forgot-password", {
+            parent: 'layout2',
+            url: "/forgot-password",
+            views: {
+                "content": {
+                    templateUrl: "pages/login/forgot-password.html",
+                    controller: "loginController"
+                }
+            }
+        })
+        .state("gioithieu", {
+            parent: 'app',
+            url: "/gioithieu",
+            views: {
+                "content": {
+                    templateUrl: "pages/gioithieu/gioithieu.htm",
+                    controller: "gioithieuController"
+                }
+            }
+        })
+
+
 });
 
 angular

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

@@ -30,16 +30,27 @@
                                 <span>Employee</span>
                             </a>
                         </li>
+
+<!--                        PhungDung-->
                         <li class="treeview">
-                            <!--                            <a ui-sref="project">-->
+                            <a ui-sref="project">
                             <i class="fa fa-laptop"></i>
                             <span>Project</span>
+                            </a>
+
+                        </li>
+                        <li class="treeview">
+                            <a ui-sref="issues">
+                                <i class="fa fa-laptop"></i>
+                                <span>Quản Lý Issues</span>
+                            </a>
 
                         </li>
 
+<!--                        END DUng-->
                         <li class="treeview">
                         <li class="treeview">
-                            <a ui-sref="news">
+                            <a ui-sref="CatagoriManagement">
                                 <i class="fa fa-newspaper-o" aria-hidden="true"></i>
                                 <span>News</span>
                             </a>
@@ -60,86 +71,18 @@
                             </a>
                         </li>
 
-                        <li class="treeview">
-                            <a ui-sref="reportProject" >
-                                <i class="fa fa-edit"></i>
-                                <span>Report TimeSheet</span>
-
-                            </a>
-                        </li>
-
                         <li class="treeview">
                             <a ui-sref="report2">
                                 <i class="fa fa-envelope"></i>
                                 <span>Report</span>
                             </a>
-                            <ul class="treeview-menu">
-                                <li>
-                                    <a href="inbox.html">
-                                        <i class="fa fa-angle-right"></i>
-                                        Mail Inbox
-                                    </a>
-                                </li>
-                                <li>
-                                    <a href="compose.html">
-                                        <i class="fa fa-angle-right"></i>
-                                        Compose Mail
-                                    </a>
-                                </li>
-                            </ul>
-                        </li>
-                        <li class="treeview">
-                            <a href="#">
-                                <i class="fa fa-folder"></i>
-                                <span>Examples</span>
-                                <i class="fa fa-angle-left pull-right"></i>
-                            </a>
-                            <ul class="treeview-menu">
-                                <li>
-                                    <a href="login.html">
-                                        <i class="fa fa-angle-right"></i>
-                                        Login
-                                    </a>
-                                </li>
-                                <li>
-                                    <a href="signup.html">
-                                        <i class="fa fa-angle-right"></i>
-                                        Register
-                                    </a>
-                                </li>
-                                <li>
-                                    <a href="blank-page.html">
-                                        <i class="fa fa-angle-right"></i>
-                                        Blank Page
-                                    </a>
-                                </li>
-                            </ul>
-                        </li>
-                        <li class="header">LABELS</li>
-                        <li>
-                            <a href="#">
-                                <i class="fa fa-angle-right text-red"></i>
-                                <span>Important</span>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="#">
-                                <i class="fa fa-angle-right text-yellow"></i>
-                                <span>Warning</span>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="#">
-                                <i class="fa fa-angle-right text-aqua"></i>
-                                <span>Information</span>
-                            </a>
                         </li>
                     </ul>
                 </div>
             </nav>
         </aside>
     </div>
-    <!-- header-starts -->
+
     <div class="sticky-header header-section ">
         <div class="header-left">
             <button id="showLeftPush">

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

-<div>
+<link rel="stylesheet" href="../css/bootstrap-combined.min.css">
 
+<body class="animsition">
 
-    <div ui-view="content">
+    <!-- Header -->
+    <header>
+        <!-- Header Mobile -->
+        <div class="wrap-header-mobile">
+            <!-- Logo moblie -->
+            <div class="logo-mobile">
+                <a href="index.html"><img src="images/logo_1.png" alt="IMG-LOGO"></a>
+            </div>
+
+            <!-- Button show menu -->
+            <div class="btn-show-menu-mobile hamburger hamburger--squeeze m-r--8">
+                <span class="hamburger-box">
+                    <span class="hamburger-inner"></span>
+                </span>
+            </div>
+        </div>
+
+        <!-- Menu Mobile -->
+        <div class="menu-mobile">
+            <ul class="topbar-mobile">
+                <li class="right-topbar">
+                    <a href="#">
+                        <span class="fab fa-facebook-f"></span>
+                    </a>
+
+                    <a href="#">
+                        <span class="fab fa-twitter"></span>
+                    </a>
+
+                    <a href="#">
+                        <span class="fab fa-pinterest-p"></span>
+                    </a>
+
+                    <a href="#">
+                        <span class="fab fa-vimeo-v"></span>
+                    </a>
+
+                    <a href="#">
+                        <span class="fab fa-youtube"></span>
+                    </a>
+                </li>
+            </ul>
+
+            <ul class="main-menu-m">
+                <li>
+                    <a href="index.html">Home</a>
+
+                </li>
+
+                <li>
+                    <a href="category-01.html">Categories</a>
+                </li>
+
+                <li>
+                    <a href="category-02.html">Entertainment </a>
+                </li>
+
+                <li>
+                    <a href="category-01.html">Business</a>
+                </li>
+
+                <li>
+                    <a href="category-02.html">Travel</a>
+                </li>
+
+                <li>
+                    <a href="category-01.html">Life Style</a>
+                </li>
+
+                <li>
+                    <a href="category-02.html">Video</a>
+                </li>
+
+
+            </ul>
+        </div>
+
+        <!--  -->
+        <div class="wrap-logo container">
+            <!-- Logo desktop -->
+            <div class="logo">
+                <a href="index.html"><img src="images/logo_1.png" alt="LOGO"></a>
+            </div>
+        </div>
+
+        <!--  -->
+        <div class="wrap-main-nav">
+            <div class="main-nav">
+                <!-- Menu desktop -->
+                <nav class="menu-desktop">
+                    <a class="logo-stick" href="index.html">
+                        <img src="images/icons/logo-01.png" alt="LOGO">
+                    </a>
+
+                    <ul class="main-menu">
+                        <li>
+                            <a href="index.html">Home</a>
+                        </li>
+
+                        <li class="mega-menu-item category">
+                            <a href="#">Categories</a>
+                            <div class="sub-mega-menu">
+
+                                <div class="nav flex-column nav-pills" role="tablist">
+                                    <div data-ng-repeat="catagori in catagories">
+                                        <a ng-click="show(catagori.id)" class="nav-link " data-toggle="pill" href="#{{catagori.id}}" role="tab">{{catagori.name}}</a>
+                                    </div>
+                                </div>
+
+                                <div class="tab-content">
+                                    <span data-ng-repeat="catagori in catagories">
+                                        <span class="tab-pane" id="{{catagori.id}}" role="tabpanel"></span>
+                                    </span>
+                                    <div class="row">
+                                        <div class="col-3" data-ng-repeat="news in newestNews">
+                                            <!-- Item post -->
+                                            <div >
+                                                <a href="http://localhost:8080/index.html#/news/{{news.id}}" class="wrap-pic-w hov1 trans-03">
+                                                    <img src="{{news.thumbnail}}" alt="IMG">
+                                                </a>
+
+                                                <div class="p-t-10">
+                                                    <h5 class="p-b-5">
+                                                        <a href="http://localhost:8080/index.html#/news/{{news.id}}" class="f1-s-5 cl3 hov-cl10 trans-03">
+                                                            {{news.content}}
+                                                        </a>
+                                                    </h5>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </div>
+
+                        </li>
+
+                        <li>
+                            <a href="index.html">About Us</a>
+                        </li>
+                        <li>
+                            <a href="#">Login</a>
+                        </li>
+                        <li>
+                            <a href="#s">Sign up</a>
+                        </li>
+
+                    </ul>
+                </nav>
+            </div>
+        </div>
+        </div>
+    </header>
+
+    <!-- Headline -->
+    <div class="container">
+        <div class="bg0 flex-wr-sb-c p-rl-20 p-tb-8">
+            <div class="f2-s-1 p-r-30 size-w-0 m-tb-6 flex-wr-s-c">
+                <span class="text-uppercase cl2 p-r-8">
+                    Welcome :
+                </span>
+
+                <span class="dis-inline-block cl6 slide100-txt pos-relative size-w-0" data-in="fadeInDown" data-out="fadeOutDown">
+                    <span class="dis-inline-block slide100-txt-item animated visible-false">
+                        Have a nice day!
+                    </span>
+
+                    <span class="dis-inline-block slide100-txt-item animated visible-false">
+                        Discover our page with amazing news!!
+                    </span>
+
+                    <span class="dis-inline-block slide100-txt-item animated visible-false">
+                        You are awesome!
+                    </span>
+                </span>
+            </div>
+
+            <div class="pos-relative size-a-2 bo-1-rad-22 of-hidden bocl11 m-tb-6">
+                <input class="f1-s-1 cl6 plh9 s-full p-l-25 p-r-45" type="text" name="search" placeholder="Search">
+                <button class="flex-c-c size-a-1 ab-t-r fs-20 cl2 hov-cl10 trans-03">
+                    <i class="zmdi zmdi-search"></i>
+                </button>
+            </div>
+        </div>
+    </div>
+
+    <!--body-->
+    <div>
+        <div ui-view="content"></div>
+    </div>
+
+    <footer>
+        <div class="bg2 p-t-40 p-b-25">
+            <div class="container">
+                <div class="row">
+                    <div class="col-lg-4 p-b-20">
+                        <div class="size-h-3 flex-s-c">
+                            <a href="index.html">
+                                <img class="max-s-full" src="images/icons/logo-02.png" alt="LOGO">
+                            </a>
+                        </div>
+
+                        <div>
+                            <p class="f1-s-1 cl11 p-b-16">
+                                Thanks for visiting our page!
+                            </p>
+
+                            <p class="f1-s-1 cl11 p-b-16">
+                                Any questions? Call us on 0968099149
+                            </p>
+
+                            <div class="p-t-15">
+                                <a href="#" class="fs-18 cl11 hov-cl10 trans-03 m-r-8">
+                                    <span class="fab fa-facebook-f"></span>
+                                </a>
+
+                                <a href="#" class="fs-18 cl11 hov-cl10 trans-03 m-r-8">
+                                    <span class="fab fa-twitter"></span>
+                                </a>
+
+                                <a href="#" class="fs-18 cl11 hov-cl10 trans-03 m-r-8">
+                                    <span class="fab fa-pinterest-p"></span>
+                                </a>
+
+                                <a href="#" class="fs-18 cl11 hov-cl10 trans-03 m-r-8">
+                                    <span class="fab fa-vimeo-v"></span>
+                                </a>
+
+                                <a href="#" class="fs-18 cl11 hov-cl10 trans-03 m-r-8">
+                                    <span class="fab fa-youtube"></span>
+                                </a>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="col-sm-6 col-lg-4 p-b-20">
+                        <div class="size-h-3 flex-s-c">
+                            <h5 class="f1-m-7 cl0">
+                                Popular Posts
+                            </h5>
+                        </div>
+
+                        <ul>
+                            <li class="flex-wr-sb-s p-b-20">
+                                <a href="#" class="size-w-4 wrap-pic-w hov1 trans-03">
+                                    <img src="images/popular-post-01.jpg" alt="IMG">
+                                </a>
+
+                                <div class="size-w-5">
+                                    <h6 class="p-b-5">
+                                        <a href="#" class="f1-s-5 cl11 hov-cl10 trans-03">
+                                            Donec metus orci, malesuada et lectus vitae
+                                        </a>
+                                    </h6>
+
+                                    <span class="f1-s-3 cl6">
+                                        Feb 17
+                                    </span>
+                                </div>
+                            </li>
+
+                            <li class="flex-wr-sb-s p-b-20">
+                                <a href="#" class="size-w-4 wrap-pic-w hov1 trans-03">
+                                    <img src="images/popular-post-02.jpg" alt="IMG">
+                                </a>
+
+                                <div class="size-w-5">
+                                    <h6 class="p-b-5">
+                                        <a href="#" class="f1-s-5 cl11 hov-cl10 trans-03">
+                                            Lorem ipsum dolor sit amet, consectetur
+                                        </a>
+                                    </h6>
 
+                                    <span class="f1-s-3 cl6">
+                                        Feb 16
+                                    </span>
                                 </div>
-</div>
+                            </li>
+
+                            <li class="flex-wr-sb-s p-b-20">
+                                <a href="#" class="size-w-4 wrap-pic-w hov1 trans-03">
+                                    <img src="images/popular-post-03.jpg" alt="IMG">
+                                </a>
+
+                                <div class="size-w-5">
+                                    <h6 class="p-b-5">
+                                        <a href="#" class="f1-s-5 cl11 hov-cl10 trans-03">
+                                            Suspendisse dictum enim quis imperdiet auctor
+                                        </a>
+                                    </h6>
+
+                                    <span class="f1-s-3 cl6">
+                                        Feb 15
+                                    </span>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
+
+                    <div class="col-sm-6 col-lg-4 p-b-20">
+                        <div class="size-h-3 flex-s-c">
+                            <h5 class="f1-m-7 cl0">
+                                Category
+                            </h5>
+                        </div>
+
+                        <ul class="m-t--12">
+                            <li class="how-bor1 p-rl-5 p-tb-10" data-ng-repeat="catagori in catagories">
+                                <a href="#" class="f1-s-5 cl11 hov-cl10 trans-03 p-tb-8">
+                                    {{catagori.name}}
+                                </a>
+                            </li>
+
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </footer>
+
+    <!-- Back to top -->
+    <div class="btn-back-to-top" id="myBtn">
+        <span class="symbol-btn-back-to-top">
+            <span class="fas fa-angle-up"></span>
+        </span>
+    </div>
+
+    <!-- Modal Video 01-->
+    <div class="modal fade" id="modal-video-01" tabindex="-1" role="dialog" aria-hidden="true">
+        <div class="modal-dialog" role="document" data-dismiss="modal">
+            <div class="close-mo-video-01 trans-0-4" data-dismiss="modal" aria-label="Close">&times;</div>
+
+            <div class="wrap-video-mo-01">
+                <div class="video-mo-01">
+                    <iframe src="https://www.youtube.com/embed/wJnBTPUQS5A?rel=0" allowfullscreen></iframe>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <script src="../js/main.js"></script>
+    <!--    <script src="../js/ui-bootstrap-tpls-0.3.0.min.js"></script>-->
+</body>
+
+

src/main/resources/public/media.html

-<!--
-Author: W3layouts
-Author URL: http://w3layouts.com
-License: Creative Commons Attribution 3.0 Unported
-License URL: http://creativecommons.org/licenses/by/3.0/
--->
-<!DOCTYPE HTML>
-<html>
-<head>
-<title>Glance Design Dashboard an Admin Panel Category Flat Bootstrap Responsive Website Template | Media :: 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="Glance Design Dashboard Responsive web template, Bootstrap Web Templates, Flat Web Templates, Android Compatible web template, 
-SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, SonyEricsson, Motorola web design" />
-<script type="application/x-javascript"> addEventListener("load", function() { setTimeout(hideURLbar, 0); }, false); function hideURLbar(){ window.scrollTo(0,1); } </script>
-
-<!-- Bootstrap Core CSS -->
-<link href="css/bootstrap.css" rel='stylesheet' type='text/css' />
-
-<!-- Custom CSS -->
-<link href="css/style.css" rel='stylesheet' type='text/css' />
-
-<!-- font-awesome icons CSS -->
-<link href="css/font-awesome.css" rel="stylesheet"> 
-<!-- //font-awesome icons CSS -->
-
- <!-- side nav css file -->
- <link href='css/SidebarNav.min.css' media='all' rel='stylesheet' type='text/css'/>
- <!-- side nav css file -->
- 
- <!-- js-->
-<script src="js/jquery-1.11.1.min.js"></script>
-<script src="js/modernizr.custom.js"></script>
-
-<!--webfonts-->
-<link href="//fonts.googleapis.com/css?family=PT+Sans:400,400i,700,700i&amp;subset=cyrillic,cyrillic-ext,latin-ext" rel="stylesheet">
-<!--//webfonts--> 
-
-<!-- Metis Menu -->
-<script src="js/metisMenu.min.js"></script>
-<script src="js/custom.js"></script>
-<link href="css/custom.css" rel="stylesheet">
-<!--//Metis Menu -->
-
-</head> 
-<body class="cbp-spmenu-push">
-	<div class="main-content">
-	<div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1">
-		<!--left-fixed -navigation-->
-		<aside class="sidebar-left">
-      <nav class="navbar navbar-inverse">
-          <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".collapse" aria-expanded="false">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            </button>
-            <h1><a class="navbar-brand" href="index.html"><span class="fa fa-area-chart"></span> Glance<span class="dashboard_text">Design dashboard</span></a></h1>
-          </div>
-          <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-            <ul class="sidebar-menu">
-              <li class="header">MAIN NAVIGATION</li>
-             <li class="treeview">
-                <a href="index.html">
-					<span class="glyphicon glyphicon-user"></span> <span>Employee</span>
-                </a>
-              </li>
-			  <li class="treeview">
-                <a href="#">
-                <i class="fa fa-laptop"></i>
-                <span>Components</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="grids.html"><i class="fa fa-angle-right"></i> Grids</a></li>
-                  <li><a href="media.html"><i class="fa fa-angle-right"></i> Media Css</a></li>
-                </ul>
-
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-laptop"></i>
-                <span>UI Elements</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="general.html"><i class="fa fa-angle-right"></i> General</a></li>
-                  <li><a href="icons.html"><i class="fa fa-angle-right"></i> Icons</a></li>
-                  <li><a href="buttons.html"><i class="fa fa-angle-right"></i> Buttons</a></li>
-                  <li><a href="typography.html"><i class="fa fa-angle-right"></i> Typography</a></li>
-                </ul>
-              </li>
-			  <li>
-                <a href="timesheet.html">
-                <i class="fa fa-th"></i> <span>TimeSheet</span>
-                <small class="label pull-right label-info">08</small>
-                </a>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-edit"></i> <span>Forms</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="forms.html"><i class="fa fa-angle-right"></i> General Forms</a></li>
-                  <li><a href="validation.html"><i class="fa fa-angle-right"></i> Form Validations</a></li>
-                </ul>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-table"></i> <span>Tables</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-envelope"></i> <span>Mailbox</span>
-                <i class="fa fa-angle-left pull-right"></i><small class="label pull-right label-info1">08</small><span class="label label-primary1 pull-right">02</span></a>
-                <ul class="treeview-menu">
-                  <li><a href="inbox.html"><i class="fa fa-angle-right"></i> Mail Inbox</a></li>
-                  <li><a href="compose.html"><i class="fa fa-angle-right"></i> Compose Mail </a></li>
-                </ul>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-folder"></i> <span>Examples</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li>
-                  <li><a href="signup.html"><i class="fa fa-angle-right"></i> Register</a></li>
-
-                  <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
-                </ul>
-              </li>
-              <li class="header">LABELS</li>
-              <li><a href="#"><i class="fa fa-angle-right text-red"></i> <span>Important</span></a></li>
-              <li><a href="#"><i class="fa fa-angle-right text-yellow"></i> <span>Warning</span></a></li>
-              <li><a href="#"><i class="fa fa-angle-right text-aqua"></i> <span>Information</span></a></li>
-            </ul>
-          </div>
-          <!-- /.navbar-collapse -->
-      </nav>
-    </aside>
-	</div>
-		<!--left-fixed -navigation-->
-		
-		<!-- header-starts -->
-		<div class="sticky-header header-section ">
-			<div class="header-left">
-				
-				<!--toggle button start-->
-				<button id="showLeftPush"><i class="fa fa-bars"></i></button>
-				<!--toggle button end-->
-				<div class="profile_details_left"><!--notifications of menu start -->
-					<ul class="nofitications-dropdown">
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-envelope"></i><span class="badge">4</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 3 new messages</h3>
-									</div>
-								</li>
-								<li><a href="#">
-								   <div class="user_img"><img src="images/1.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet</p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								</a></li>
-								<li class="odd"><a href="#">
-									<div class="user_img"><img src="images/4.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								  <div class="clearfix"></div>	
-								</a></li>
-								<li><a href="#">
-								   <div class="user_img"><img src="images/3.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								</a></li>
-								<li>
-									<div class="notification_bottom">
-										<a href="#">See all messages</a>
-									</div> 
-								</li>
-							</ul>
-						</li>
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-bell"></i><span class="badge blue">4</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 3 new notification</h3>
-									</div>
-								</li>
-								<li><a href="#">
-									<div class="user_img"><img src="images/4.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet</p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								  <div class="clearfix"></div>	
-								 </a></li>
-								 <li class="odd"><a href="#">
-									<div class="user_img"><img src="images/1.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								 </a></li>
-								 <li><a href="#">
-									<div class="user_img"><img src="images/3.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								 </a></li>
-								 <li>
-									<div class="notification_bottom">
-										<a href="#">See all notifications</a>
-									</div> 
-								</li>
-							</ul>
-						</li>	
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-tasks"></i><span class="badge blue1">8</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 8 pending task</h3>
-									</div>
-								</li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Database update</span><span class="percentage">40%</span>
-										<div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										<div class="bar yellow" style="width:40%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Dashboard done</span><span class="percentage">90%</span>
-									   <div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										 <div class="bar green" style="width:90%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Mobile App</span><span class="percentage">33%</span>
-										<div class="clearfix"></div>	
-									</div>
-								   <div class="progress progress-striped active">
-										 <div class="bar red" style="width: 33%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Issues fixed</span><span class="percentage">80%</span>
-									   <div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										 <div class="bar  blue" style="width: 80%;"></div>
-									</div>
-								</a></li>
-								<li>
-									<div class="notification_bottom">
-										<a href="#">See all pending tasks</a>
-									</div> 
-								</li>
-							</ul>
-						</li>	
-					</ul>
-					<div class="clearfix"> </div>
-				</div>
-				<!--notification menu end -->
-				<div class="clearfix"> </div>
-			</div>
-			<div class="header-right">
-				
-				
-				<!--search-box-->
-				<div class="search-box">
-					<form class="input">
-						<input class="sb-search-input input__field--madoka" placeholder="Search..." type="search" id="input-31" />
-						<label class="input__label" for="input-31">
-							<svg class="graphic" width="100%" height="100%" viewBox="0 0 404 77" preserveAspectRatio="none">
-								<path d="m0,0l404,0l0,77l-404,0l0,-77z"/>
-							</svg>
-						</label>
-					</form>
-				</div><!--//end-search-box-->
-				
-				<div class="profile_details">		
-					<ul>
-						<li class="dropdown profile_details_drop">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-								<div class="profile_img">	
-									<span class="prfil-img"><img src="images/2.jpg" alt=""> </span> 
-									<div class="user-name">
-										<p>Admin Name</p>
-										<span>Administrator</span>
-									</div>
-									<i class="fa fa-angle-down lnr"></i>
-									<i class="fa fa-angle-up lnr"></i>
-									<div class="clearfix"></div>	
-								</div>	
-							</a>
-							<ul class="dropdown-menu drp-mnu">
-								<li> <a href="#"><i class="fa fa-cog"></i> Settings</a> </li> 
-								<li> <a href="#"><i class="fa fa-user"></i> My Account</a> </li>
-								<li> <a href="#"><i class="fa fa-suitcase"></i> Profile</a> </li> 
-								<li> <a href="#"><i class="fa fa-sign-out"></i> Logout</a> </li>
-							</ul>
-						</li>
-					</ul>
-				</div>
-				<div class="clearfix"> </div>				
-			</div>
-			<div class="clearfix"> </div>	
-		</div>
-		<!-- //header-ends -->
-		<!-- main content start-->
-		<div id="page-wrapper">
-			<div class="main-page">
-				<div class="media">
-					<h2 class="title1">Media Objects</h2>
-					<div class="bs-example5 widget-shadow" data-example-id="default-media">
-						<div class="media">
-							<div class="media-left">
-								<a href="#">
-								  <img class="media-object" data-src="holder.js/64x64" alt="64x64" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+PCEtLQpTb3VyY2UgVVJMOiBob2xkZXIuanMvNjR4NjQKQ3JlYXRlZCB3aXRoIEhvbGRlci5qcyAyLjYuMC4KTGVhcm4gbW9yZSBhdCBodHRwOi8vaG9sZGVyanMuY29tCihjKSAyMDEyLTIwMTUgSXZhbiBNYWxvcGluc2t5IC0gaHR0cDovL2ltc2t5LmNvCi0tPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbI2hvbGRlcl8xNGUwMDNiM2U3NSB0ZXh0IHsgZmlsbDojQUFBQUFBO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1mYW1pbHk6QXJpYWwsIEhlbHZldGljYSwgT3BlbiBTYW5zLCBzYW5zLXNlcmlmLCBtb25vc3BhY2U7Zm9udC1zaXplOjEwcHQgfSBdXT48L3N0eWxlPjwvZGVmcz48ZyBpZD0iaG9sZGVyXzE0ZTAwM2IzZTc1Ij48cmVjdCB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSIxNC41IiB5PSIzNi41Ij42NHg2NDwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true" style="width: 64px; height: 64px;">
-								</a>
-							</div>
-							<div class="media-body">
-								<h4 class="media-heading">Media heading</h4>
-								Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.
-							</div>
-							<div class="clearfix"> </div>
-						</div>
-						<div class="media">
-							<div class="media-left">
-								<a href="#">
-								  <img class="media-object" data-src="holder.js/64x64" alt="64x64" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+PCEtLQpTb3VyY2UgVVJMOiBob2xkZXIuanMvNjR4NjQKQ3JlYXRlZCB3aXRoIEhvbGRlci5qcyAyLjYuMC4KTGVhcm4gbW9yZSBhdCBodHRwOi8vaG9sZGVyanMuY29tCihjKSAyMDEyLTIwMTUgSXZhbiBNYWxvcGluc2t5IC0gaHR0cDovL2ltc2t5LmNvCi0tPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbI2hvbGRlcl8xNGUwMDNiM2ZhNyB0ZXh0IHsgZmlsbDojQUFBQUFBO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1mYW1pbHk6QXJpYWwsIEhlbHZldGljYSwgT3BlbiBTYW5zLCBzYW5zLXNlcmlmLCBtb25vc3BhY2U7Zm9udC1zaXplOjEwcHQgfSBdXT48L3N0eWxlPjwvZGVmcz48ZyBpZD0iaG9sZGVyXzE0ZTAwM2IzZmE3Ij48cmVjdCB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSIxNC41IiB5PSIzNi41Ij42NHg2NDwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true" style="width: 64px; height: 64px;">
-								</a>
-							</div>
-							<div class="media-body">
-								<h4 class="media-heading">Media heading</h4>
-								Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.
-								<div class="media">
-									<div class="media-left">
-										<a href="#">
-										  <img class="media-object" data-src="holder.js/64x64" alt="64x64" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+PCEtLQpTb3VyY2UgVVJMOiBob2xkZXIuanMvNjR4NjQKQ3JlYXRlZCB3aXRoIEhvbGRlci5qcyAyLjYuMC4KTGVhcm4gbW9yZSBhdCBodHRwOi8vaG9sZGVyanMuY29tCihjKSAyMDEyLTIwMTUgSXZhbiBNYWxvcGluc2t5IC0gaHR0cDovL2ltc2t5LmNvCi0tPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbI2hvbGRlcl8xNGUwMDNiMzIxNSB0ZXh0IHsgZmlsbDojQUFBQUFBO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1mYW1pbHk6QXJpYWwsIEhlbHZldGljYSwgT3BlbiBTYW5zLCBzYW5zLXNlcmlmLCBtb25vc3BhY2U7Zm9udC1zaXplOjEwcHQgfSBdXT48L3N0eWxlPjwvZGVmcz48ZyBpZD0iaG9sZGVyXzE0ZTAwM2IzMjE1Ij48cmVjdCB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSIxNC41IiB5PSIzNi41Ij42NHg2NDwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true" style="width: 64px; height: 64px;">
-										</a>
-									</div>
-									<div class="media-body">
-										<h4 class="media-heading">Nested media heading</h4>
-										Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.
-									</div>
-								</div>
-							</div>
-						</div>
-						<div class="media">
-							<div class="media-body">
-								<h4 class="media-heading">Media heading</h4>
-								Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
-							</div>
-							<div class="media-right">
-								<a href="#">
-									<img class="media-object" data-src="holder.js/64x64" alt="64x64" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+PCEtLQpTb3VyY2UgVVJMOiBob2xkZXIuanMvNjR4NjQKQ3JlYXRlZCB3aXRoIEhvbGRlci5qcyAyLjYuMC4KTGVhcm4gbW9yZSBhdCBodHRwOi8vaG9sZGVyanMuY29tCihjKSAyMDEyLTIwMTUgSXZhbiBNYWxvcGluc2t5IC0gaHR0cDovL2ltc2t5LmNvCi0tPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbI2hvbGRlcl8xNGUwMDNiMTE4OSB0ZXh0IHsgZmlsbDojQUFBQUFBO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1mYW1pbHk6QXJpYWwsIEhlbHZldGljYSwgT3BlbiBTYW5zLCBzYW5zLXNlcmlmLCBtb25vc3BhY2U7Zm9udC1zaXplOjEwcHQgfSBdXT48L3N0eWxlPjwvZGVmcz48ZyBpZD0iaG9sZGVyXzE0ZTAwM2IxMTg5Ij48cmVjdCB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSIxNC41IiB5PSIzNi41Ij42NHg2NDwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true" style="width: 64px; height: 64px;">
-								</a>
-							</div>
-							<div class="clearfix"> </div>
-						</div>
-						<div class="media">
-							<div class="media-left">
-								<a href="#">
-									<img class="media-object" data-src="holder.js/64x64" alt="64x64" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+PCEtLQpTb3VyY2UgVVJMOiBob2xkZXIuanMvNjR4NjQKQ3JlYXRlZCB3aXRoIEhvbGRlci5qcyAyLjYuMC4KTGVhcm4gbW9yZSBhdCBodHRwOi8vaG9sZGVyanMuY29tCihjKSAyMDEyLTIwMTUgSXZhbiBNYWxvcGluc2t5IC0gaHR0cDovL2ltc2t5LmNvCi0tPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbI2hvbGRlcl8xNGUwMDNiNDY0ZCB0ZXh0IHsgZmlsbDojQUFBQUFBO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1mYW1pbHk6QXJpYWwsIEhlbHZldGljYSwgT3BlbiBTYW5zLCBzYW5zLXNlcmlmLCBtb25vc3BhY2U7Zm9udC1zaXplOjEwcHQgfSBdXT48L3N0eWxlPjwvZGVmcz48ZyBpZD0iaG9sZGVyXzE0ZTAwM2I0NjRkIj48cmVjdCB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSIxNC41IiB5PSIzNi41Ij42NHg2NDwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true" style="width: 64px; height: 64px;">
-								</a>
-							</div>
-							<div class="media-body">
-								<h4 class="media-heading">Media heading</h4>
-								Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
-							</div>
-							<div class="media-right">
-								<a href="#">
-								  <img class="media-object" data-src="holder.js/64x64" alt="64x64" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+PCEtLQpTb3VyY2UgVVJMOiBob2xkZXIuanMvNjR4NjQKQ3JlYXRlZCB3aXRoIEhvbGRlci5qcyAyLjYuMC4KTGVhcm4gbW9yZSBhdCBodHRwOi8vaG9sZGVyanMuY29tCihjKSAyMDEyLTIwMTUgSXZhbiBNYWxvcGluc2t5IC0gaHR0cDovL2ltc2t5LmNvCi0tPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbI2hvbGRlcl8xNGUwMDNhZGIwMSB0ZXh0IHsgZmlsbDojQUFBQUFBO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1mYW1pbHk6QXJpYWwsIEhlbHZldGljYSwgT3BlbiBTYW5zLCBzYW5zLXNlcmlmLCBtb25vc3BhY2U7Zm9udC1zaXplOjEwcHQgfSBdXT48L3N0eWxlPjwvZGVmcz48ZyBpZD0iaG9sZGVyXzE0ZTAwM2FkYjAxIj48cmVjdCB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSIxNC41IiB5PSIzNi41Ij42NHg2NDwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true" style="width: 64px; height: 64px;">
-								</a>
-							</div>
-						</div>
-					</div>
-					<div class="bs-example5 example_6 widget-shadow" data-example-id="media-list">
-						<ul class="media-list">
-							<li class="media">
-								<div class="media-left">
-									<a href="#">
-										<img class="media-object" data-src="holder.js/64x64" alt="64x64" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+PCEtLQpTb3VyY2UgVVJMOiBob2xkZXIuanMvNjR4NjQKQ3JlYXRlZCB3aXRoIEhvbGRlci5qcyAyLjYuMC4KTGVhcm4gbW9yZSBhdCBodHRwOi8vaG9sZGVyanMuY29tCihjKSAyMDEyLTIwMTUgSXZhbiBNYWxvcGluc2t5IC0gaHR0cDovL2ltc2t5LmNvCi0tPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbI2hvbGRlcl8xNGUwMDNiMzg3YyB0ZXh0IHsgZmlsbDojQUFBQUFBO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1mYW1pbHk6QXJpYWwsIEhlbHZldGljYSwgT3BlbiBTYW5zLCBzYW5zLXNlcmlmLCBtb25vc3BhY2U7Zm9udC1zaXplOjEwcHQgfSBdXT48L3N0eWxlPjwvZGVmcz48ZyBpZD0iaG9sZGVyXzE0ZTAwM2IzODdjIj48cmVjdCB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSIxNC41IiB5PSIzNi41Ij42NHg2NDwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true" style="width: 64px; height: 64px;">
-									</a>
-								</div>
-								<div class="media-body">
-									<h4 class="media-heading">Media heading</h4>
-									<p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.</p>
-									<!-- Nested media object -->
-									<div class="media">
-										<div class="media-left">
-											<a href="#">
-												<img class="media-object" data-src="holder.js/64x64" alt="64x64" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+PCEtLQpTb3VyY2UgVVJMOiBob2xkZXIuanMvNjR4NjQKQ3JlYXRlZCB3aXRoIEhvbGRlci5qcyAyLjYuMC4KTGVhcm4gbW9yZSBhdCBodHRwOi8vaG9sZGVyanMuY29tCihjKSAyMDEyLTIwMTUgSXZhbiBNYWxvcGluc2t5IC0gaHR0cDovL2ltc2t5LmNvCi0tPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbI2hvbGRlcl8xNGUwMDNiM2EzNCB0ZXh0IHsgZmlsbDojQUFBQUFBO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1mYW1pbHk6QXJpYWwsIEhlbHZldGljYSwgT3BlbiBTYW5zLCBzYW5zLXNlcmlmLCBtb25vc3BhY2U7Zm9udC1zaXplOjEwcHQgfSBdXT48L3N0eWxlPjwvZGVmcz48ZyBpZD0iaG9sZGVyXzE0ZTAwM2IzYTM0Ij48cmVjdCB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSIxNC41IiB5PSIzNi41Ij42NHg2NDwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true" style="width: 64px; height: 64px;">
-											</a>
-										</div>
-										<div class="media-body">
-											<h4 class="media-heading">Nested media heading</h4>
-												Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
-											<!-- Nested media object -->
-											<div class="media">
-												<div class="media-left">
-													<a href="#">
-														<img class="media-object" data-src="holder.js/64x64" alt="64x64" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+PCEtLQpTb3VyY2UgVVJMOiBob2xkZXIuanMvNjR4NjQKQ3JlYXRlZCB3aXRoIEhvbGRlci5qcyAyLjYuMC4KTGVhcm4gbW9yZSBhdCBodHRwOi8vaG9sZGVyanMuY29tCihjKSAyMDEyLTIwMTUgSXZhbiBNYWxvcGluc2t5IC0gaHR0cDovL2ltc2t5LmNvCi0tPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbI2hvbGRlcl8xNGUwMDNiMmYzMCB0ZXh0IHsgZmlsbDojQUFBQUFBO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1mYW1pbHk6QXJpYWwsIEhlbHZldGljYSwgT3BlbiBTYW5zLCBzYW5zLXNlcmlmLCBtb25vc3BhY2U7Zm9udC1zaXplOjEwcHQgfSBdXT48L3N0eWxlPjwvZGVmcz48ZyBpZD0iaG9sZGVyXzE0ZTAwM2IyZjMwIj48cmVjdCB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSIxNC41IiB5PSIzNi41Ij42NHg2NDwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true" style="width: 64px; height: 64px;">
-													</a>
-												</div>
-												<div class="media-body">
-													<h4 class="media-heading">Nested media heading</h4>
-													Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
-												</div>
-											</div>
-										</div>
-									</div>
-									<!-- Nested media object -->
-									<div class="media">
-										<div class="media-left">
-											<a href="#">
-												<img class="media-object" data-src="holder.js/64x64" alt="64x64" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+PCEtLQpTb3VyY2UgVVJMOiBob2xkZXIuanMvNjR4NjQKQ3JlYXRlZCB3aXRoIEhvbGRlci5qcyAyLjYuMC4KTGVhcm4gbW9yZSBhdCBodHRwOi8vaG9sZGVyanMuY29tCihjKSAyMDEyLTIwMTUgSXZhbiBNYWxvcGluc2t5IC0gaHR0cDovL2ltc2t5LmNvCi0tPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbI2hvbGRlcl8xNGUwMDNhZWVmMyB0ZXh0IHsgZmlsbDojQUFBQUFBO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1mYW1pbHk6QXJpYWwsIEhlbHZldGljYSwgT3BlbiBTYW5zLCBzYW5zLXNlcmlmLCBtb25vc3BhY2U7Zm9udC1zaXplOjEwcHQgfSBdXT48L3N0eWxlPjwvZGVmcz48ZyBpZD0iaG9sZGVyXzE0ZTAwM2FlZWYzIj48cmVjdCB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSIxNC41IiB5PSIzNi41Ij42NHg2NDwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true" style="width: 64px; height: 64px;">
-											</a>
-										</div>
-										<div class="media-body">
-											<h4 class="media-heading">Nested media heading</h4>
-											Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
-										</div>
-									</div>
-								</div>
-							</li>
-						</ul>
-					</div>
-					<div class="media_1">
-						<div class="col-md-6 media_1-left widget-shadow">
-							<div class="panel_2">
-								<h3 class="title1">Padding</h3>
-								<p>All size: 0,5,10,15,20,25,30,35,40,45,50px</p>
-								<table class="table table-hover">
-									<thead>
-									  <tr>
-										<td class="head">Class</td>
-										<td class="head">Preview</td>
-										<td class="head">Description</td>
-									  </tr>
-									</thead>
-									<tbody>
-									  <tr>
-										<td><code>.padding-5</code></td>
-										<td>
-										  <div class="demolayout padding-5">
-											<div class="demobox">Demo</div>
-										  </div>
-										</td>
-										<td>padding: 5px</td>
-									  </tr>
-									  <tr>
-										<td><code>.padding-l-5</code></td>
-										<td>
-										  <div class="demolayout padding-l-5">
-											<div class="demobox">Demo</div>
-										  </div>
-										</td>
-										<td>padding-left: 5px</td>
-									  </tr>
-									  <tr>
-										<td><code>.padding-r-5</code></td>
-										<td>
-										  <div class="demolayout padding-r-5">
-											<div class="demobox">Demo</div>
-										  </div>
-										</td>
-										<td>padding-right: 5px</td>
-									  </tr>
-									  <tr>
-										<td><code>.padding-t-5</code></td>
-										<td>
-										  <div class="demolayout padding-t-5">
-											<div class="demobox">Demo</div>
-										  </div>
-										</td>
-										<td>padding-top: 5px</td>
-									  </tr>
-									  <tr>
-										<td><code>.padding-b-5</code></td>
-										<td>
-										  <div class="demolayout padding-b-5">
-											<div class="demobox">Demo</div>
-										  </div>
-										</td>
-										<td>padding-bottom: 5px</td>
-									  </tr>
-									</tbody>
-								</table>
-							</div>
-						</div>
-						<div class="col-md-6 media_1-right widget-shadow">
-							<div class="panel_2 panel_3">
-								<h3 class="title1">Margin</h3>
-								<p>All size: 0,5,10,15,20,25,30,35,40,45,50px</p>
-								<table class="table table-hover">
-									<thead>
-									  <tr>
-										<td class="head">Class</td>
-										<td class="head">Preview</td>
-										<td class="head">Description</td>
-									  </tr>
-									</thead>
-									<tbody>
-									  <tr>
-										<td><code>.margin-5</code></td>
-										<td>
-										  <div class="demolayout padding-5">
-											<div class="demobox">Demo</div>
-										  </div>
-										</td>
-										<td>margin: 5px</td>
-									  </tr>
-									  <tr>
-										<td><code>.margin-l-5</code></td>
-										<td>
-										  <div class="demolayout padding-l-5">
-											<div class="demobox">Demo</div>
-										  </div>
-										</td>
-										<td>margin-left: 5px</td>
-									  </tr>
-									  <tr>
-										<td><code>.margin-r-5</code></td>
-										<td>
-										  <div class="demolayout padding-r-5">
-											<div class="demobox">Demo</div>
-										  </div>
-										</td>
-										<td>margin-right: 5px</td>
-									  </tr>
-									  <tr>
-										<td><code>.margin-t-5</code></td>
-										<td>
-										  <div class="demolayout padding-t-5">
-											<div class="demobox">Demo</div>
-										  </div>
-										</td>
-										<td>margin-top: 5px</td>
-									  </tr>
-									  <tr>
-										<td><code>.margin-b-5</code></td>
-										<td>
-										  <div class="demolayout padding-b-5">
-											<div class="demobox">Demo</div>
-										  </div>
-										</td>
-										<td>margin-bottom: 5px</td>
-									  </tr>
-									</tbody>
-								</table>
-							</div>
-						</div>
-						<div class="clearfix"> </div>
-					</div> 
-				</div>
-			</div>
-		</div>
-		<!--footer-->
-		<div class="footer">
-		   <p>&copy; 2018 Glance Design Dashboard. All Rights Reserved | Design by <a href="https://w3layouts.com/" target="_blank">w3layouts</a></p>
-	   </div>
-        <!--//footer-->
-	</div>
-	
-	<!-- side nav js -->
-	<script src='js/SidebarNav.min.js' type='text/javascript'></script>
-	<script>
-      $('.sidebar-menu').SidebarNav()
-    </script>
-	<!-- //side nav js -->
-	
-	<!-- Classie --><!-- for toggle left push menu script -->
-		<script src="js/classie.js"></script>
-		<script>
-			var menuLeft = document.getElementById( 'cbp-spmenu-s1' ),
-				showLeftPush = document.getElementById( 'showLeftPush' ),
-				body = document.body;
-				
-			showLeftPush.onclick = function() {
-				classie.toggle( this, 'active' );
-				classie.toggle( body, 'cbp-spmenu-push-toright' );
-				classie.toggle( menuLeft, 'cbp-spmenu-open' );
-				disableOther( 'showLeftPush' );
-			};
-			
-			function disableOther( button ) {
-				if( button !== 'showLeftPush' ) {
-					classie.toggle( showLeftPush, 'disabled' );
-				}
-			}
-		</script>
-	<!-- //Classie --><!-- //for toggle left push menu script -->
-	
-	<!--scrolling js-->
-
-	<script src="js/scripts.js"></script>
-	<!--//scrolling js-->
-	
-	<!-- Bootstrap Core JavaScript -->
-   <script src="js/bootstrap.js"> </script>
-   
-</body>
-</html>
\ No newline at end of file

src/main/resources/public/pages/adminhome/admin-home.html

+<div class="container" style="text-align: center">
+    <h1>Chào Mừng bạn đến với trang ADMIN</h1>
+</div>
\ No newline at end of file

src/main/resources/public/pages/adminhome/admin.js

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

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

-
 <div class="container">
 
     <table class="table">
@@ -9,6 +8,10 @@
                         <td><label>User Name</label></td>
                         <td>
                             <input type="text" maxlength="29" ng-model="emp.username"/>
+                            <span style="color:red" ng-show="myForm.emp.username.$dirty && myForm.emp.username.$invalid">
+                                <span ng-show="myForm.emp.username.$error.required">Username is required.</span>
+                                </span>
+
                         </td>
                     </tr>
                     <tr>

src/main/resources/public/pages/homepage/HomeService.js

 
 angular.module("myApp").factory('News', function ($resource) {
-       return $resource('http://localhost:8080/api/news/:id', {id: '@myNewsId'},{
+       return $resource('http://localhost:8081/api/news/:id', {id: '@myNewsId'},{
            'get': {
                method: 'GET',
                isArray: false
@@ -9,11 +9,11 @@ angular.module("myApp").factory('News', function ($resource) {
     });
 
 angular.module('myApp').factory('Catagories', function ($resource) {
-        return $resource('http://localhost:8080/api/catalogies/:id', {id: '@myCatagoriesId'});
+            return $resource('http://localhost:8081/api/catalogies/:id', {id: '@myCatagoriesId'});
     });
 
 angular.module('myApp').factory('LatestNews', function ($resource) {
-    return $resource('http://localhost:8080/api/catalogi/:id/latestNews', {id: '@CatagoriesId'},{
+    return $resource('http://localhost:8081/api/catalogi/:id/latestNews', {id: '@CatagoriesId'},{
         'get': {
             method: 'GET',
             isArray: true
@@ -22,7 +22,7 @@ angular.module('myApp').factory('LatestNews', function ($resource) {
 });
 
 angular.module('myApp').factory('NewsByCatagori', function ($resource) {
-    return $resource('http://localhost:8080/api/catalogi/:id/news', {id: '@catagoriesId'},{
+    return $resource('http://localhost:8081/api/catalogi/:id/news', {id: '@catagoriesId'},{
         'get': {
             method: 'GET',
             isArray: true

src/main/resources/public/pages/homepage/MyHomeController.js

+
+angular.module("myApp").controller('MyHomeController', function ($scope,$http, $state,News, $window,$stateParams,Catagories,LatestNews) {
+
+    $scope.catagories = Catagories.query();
+
+    $scope.currentPage = 1
+    ,$scope.numPerPage = 6
+    ,$scope.maxSize = 5;
+    $scope.catagoriDetail = Catagories.get({}, {myCatagoriesId: $stateParams.catagoriId}).$promise.then(
+        function (value) {
+            $scope.todos = value.news;
+            $scope.catagori = value;
+            $scope.numPages = function () {
+                return Math.ceil($scope.todos.length / $scope.numPerPage);
+            };
+            console.log( $scope.todos.length);
+            $scope.$watch('currentPage + numPerPage', function () {
+                var begin = (($scope.currentPage - 1) * $scope.numPerPage)
+                    , end = begin + $scope.numPerPage;
+                $scope.myNews = $scope.todos.slice(begin, end);
+
+            });
+        },
+        function (error) {
+            console.log()
+        }
+    );
+
+    $scope.newsById = News.get({}, {myNewsId: $stateParams.Id1});
+
+    $scope.show = function(id){
+        $scope.newestNews = LatestNews.get({}, {CatagoriesId: id});
+    };
+
+    $scope.catagoriById = Catagories.get({}, {myCatagoriesId: $stateParams.myCatagoriId});
+
+    //Delete News
+    $scope.deleteNews = function(newsId) {
+        if (confirm("Delete?")) {
+            $http({
+                method: 'DELETE',
+                url: 'http://localhost:8080/api/HR/news/' + newsId,
+                headers: {
+                    'Content-Type': 'application/json'
+                }
+            }).then(function (response) {
+                console.log("delete OK");
+                $state.reload();
+            }, function (data, status) {
+                $state.reload();
+            });
+        }
+    };
+
+    //Edit news
+    $scope.newsEditById = News.get({}, {myNewsId: $stateParams.myNewsEditId});
+    $scope.editNews = function(newsEditById) {
+        if(confirm("Update?")) {
+            $http({
+                method: 'PUT',
+                url: 'http://localhost:8081/api/HR/news/' + newsEditById.id,
+                data: angular.toJson(newsEditById),
+                headers: {
+                    'Content-Type': 'application/json'
+                }
+            }).then(function (response) {
+                console.log("update OK");
+                $state.go('newsManagement',{myCatagoriId:$stateParams.myCatagoriEditId});
+            }, function (data, status) {
+                console.log(status);
+            });
+        }
+    };
+    //Add News
+    $scope.createNews = function(newsAdd) {
+        if(confirm("Add?")) {
+            $http({
+                method: 'POST',
+                url: 'http://localhost:8081/api/HR/'+ $stateParams.employeeId+'/catalogies/' + $stateParams.myCatagoriAddId+'/news',
+                data: angular.toJson(newsAdd),
+                headers: {
+                    'Content-Type': 'application/json'
+                }
+            }).then(function (response) {
+                console.log("update OK");
+                $state.go('newsManagement',{myCatagoriId:$stateParams.myCatagoriAddId});
+            }, function (data, status) {
+                console.log(status);
+            });
+        }
+    };
+
+
+
+});
\ No newline at end of file

src/main/resources/public/pages/homepage/homeController.js

-
-angular.module("myApp").controller('homeController', function ($scope,$http, $state,News, $window,$stateParams,Catagories,LatestNews) {
-
-        $scope.catagories = Catagories.query();
-
-        $scope.currentPage = 1
-        ,$scope.numPerPage = 6
-        ,$scope.maxSize = 5;
-        $scope.catagoriDetail = Catagories.get({}, {myCatagoriesId: $stateParams.catagoriId}).$promise.then(
-                    function (value) {
-                        $scope.todos = value.news;
-                        $scope.catagori = value;
-                        $scope.numPages = function () {
-                            return Math.ceil($scope.todos.length / $scope.numPerPage);
-                        };
-                        console.log( $scope.todos.length);
-                        $scope.$watch('currentPage + numPerPage', function () {
-                            var begin = (($scope.currentPage - 1) * $scope.numPerPage)
-                                , end = begin + $scope.numPerPage;
-                            $scope.myNews = $scope.todos.slice(begin, end);
-
-                        });
-                    },
-                    function (error) {
-                        console.log()
-                    }
-                );
-
-        $scope.newsById = News.get({}, {myNewsId: $stateParams.Id1});
-
-        $scope.show = function(id){
-            $scope.newestNews = LatestNews.get({}, {CatagoriesId: id});
-        };
-
-        $scope.catagoriById = Catagories.get({}, {myCatagoriesId: $stateParams.myCatagoriId});
-
-        //Delete News
-        $scope.deleteNews = function(newsId) {
-            if (confirm("Delete?")) {
-                $http({
-                    method: 'DELETE',
-                    url: 'http://localhost:8080/api/HR/news/' + newsId,
-                    headers: {
-                        'Content-Type': 'application/json'
-                    }
-                }).then(function (response) {
-                    console.log("delete OK");
-                    $state.reload();
-                }, function (data, status) {
-                    $state.reload();
-                });
-            }
-        };
-
-        //Edit news
-        $scope.newsEditById = News.get({}, {myNewsId: $stateParams.myNewsEditId});
-        $scope.editNews = function(newsEditById) {
-            if(confirm("Update?")) {
-                $http({
-                    method: 'PUT',
-                    url: 'http://localhost:8080/api/HR/news/' + newsEditById.id,
-                    data: angular.toJson(newsEditById),
-                    headers: {
-                        'Content-Type': 'application/json'
-                    }
-                }).then(function (response) {
-                    console.log("update OK");
-                    $state.go('newsManagement',{myCatagoriId:$stateParams.myCatagoriEditId});
-                }, function (data, status) {
-                    console.log(status);
-                });
-            }
-        };
-
-
-
-
-});
\ No newline at end of file

src/main/resources/public/pages/homepage/newsAddManagement.html

+
+<form name="myForm" novalidate ng-submit="createNews(newsAdd)" >
+    <table border= 1>
+
+        <tr>
+            <td>Thumbnail</td>
+            <td><input type="text" data-ng-model="newsAdd.thumbnail" /></td>
+        </tr>
+        <tr>
+            <td>Title</td>
+            <td><input type="text" ng-model="newsAdd.title"  /></td>
+        </tr>
+
+        <tr>
+            <td>Content</td>
+            <td><input type="text" data-ng-model="newsAdd.content"  /></td>
+        </tr>
+        <tr>
+            <td>Status</td>
+            <td><input type="text" data-ng-model="newsAdd.status"  /></td>
+        </tr>
+        <tr>
+            <td colspan="2">
+                <input  data-ng-disabled="myForm.$invalid" type="submit" value="Submit" class="blue-button" />
+            </td>
+        </tr>
+    </table>
+</form>

src/main/resources/public/pages/homepage/newsManagements.html

 
 <div class="container">
-
+    <div><a ui-sref="CatagoriManagement" style="padding:20px">Home</a></div>
     <div >
-            <div>
+            <a href="#/management/HR/1/catagori/{{catagoriById.id}}/createNews"> Add News</a>
+            <div style="margin-top: 25px;">
+
                 <table class="table" >
                     <thead>
+
                     <tr>
                         <tr>
-                        <a ui-sref="CatagoriManagement"><< Back</a>
+
+                            <div ng-if="catagoriById.name == 'Office'">
+                                <a href="#/management/catagori/5" style="float:left"><< Back </a>
+                            </div>
+                            <div ng-if="catagoriById.name == 'Outdoor Activity'">
+                                <a href="#/management/catagori/1" style="float:left"><< Back </a>
+                            </div>
+                            <div ng-if="catagoriById.name == 'Projects'">
+                                <a href="#/management/catagori/2" style="float:left"><< Back</a>
+                            </div>
+                            <div ng-if="catagoriById.name == 'Recruitments'">
+                                <a href="#/management/catagori/4" style="float:left"><< Back </a>
+                            </div>
+                            <div ng-if="catagoriById.name == 'Office'">
+                                <a href="#/management/catagori/2" style="float:right">Next >> </a>
+                            </div>
+                            <div ng-if="catagoriById.name == 'Outdoor Activity'">
+                                <a href="#/management/catagori/4" style="float:right">Next >></a>
+                            </div>
+                            <div ng-if="catagoriById.name == 'Projects'">
+                                <a href="#/management/catagori/5" style="float:right">Next >></a>
+                            </div>
+                            <div ng-if="catagoriById.name == 'Recruitments'">
+                                <a href="#/management/catagori/1" style="float:right">Next >></a>
+                            </div>
                             <td colspan="12"><h1 style="font-size: 30px;text-align: center">{{catagoriById.name}}</h1></td>
                         </tr>
                     <th>STT</th>
@@ -27,11 +54,10 @@
                         <td>{{myNews.content}}</td>
                         <td><a href="#/management/catagori/{{catagoriById.id}}/news/{{myNews.id}}" style="color:green;border: 1px solid black;padding: 10px;" >Edit</a> </td>
                         <td><button type="button"  style="color:red;border: 1px solid black;padding: 10px;" ng-click="deleteNews(myNews.id)">Delete</button> </td>
-                        <td><button type="button" ng-click=""></button>Add</td>
                     </tr>
                     </tbody>
                 </table>
-            </div>Add
+            </div>
     </div>
 
 </div>

src/main/resources/public/pages/issue/IssueAdd.html

-<div class="card-header">
-    <i class="fas fa-table"></i> Thêm mới dự án
-</div>
-<div class="card-body">
+<!--<div class="card-header">-->
+<!--    <i class="fas fa-table"></i> Thêm mới dự án-->
+<!--</div>-->
+<!--<div class="card-body">-->
+<!--    <form ng-submit="insertIssues(Issues)">-->
+<!--        <label>Tên Dự Án</label>-->
+<!--        <select ng-model="Issues.projectId" autofocus="autofocus"-->
+<!--                required="required">-->
+<!--            <option value="">==> Tên Dự Án</option>-->
+<!--            <option ng-repeat="project in listProject" value="{{project.id}}">{{project.name}}</option>-->
+<!--        </select><br/>-->
+<!--        <label>Tiêu đề</label>-->
+<!--        <input type="text" ng-model="Issues.title" id="title" placeholder="Tiêu Đề"-->
+<!--               required="required"><br/>-->
+<!--        <label>Nội Dung</label>-->
+<!--        <input type="text" ng-model="Issues.actionCode" id="actionCode" placeholder="Nội dung issues"-->
+<!--               required="required"><br/>-->
+<!--        <div>-->
+<!--            <h1>{{view.message}}</h1>-->
+<!--            <input type="submit" value="Save">-->
+<!--            <input type="reset" value="Reset">-->
+<!--            <button type="button" ui-sref="issues">Back</button>-->
+<!--        </div>-->
+<!--    </form>-->
+<!--</div>-->
+<div class="container">
     <form ng-submit="insertIssues(Issues)">
         <label>Tên Dự Án</label>
         <select ng-model="Issues.projectId" autofocus="autofocus"
                 required="required">
-            <option value="">==> Trạng Thái</option>
+            <option value="">==> Tên Dự Án</option>
             <option ng-repeat="project in listProject" value="{{project.id}}">{{project.name}}</option>
         </select><br/>
         <label>Tiêu đề</label>
@@ -22,4 +44,5 @@
             <button type="button" ui-sref="issues">Back</button>
         </div>
     </form>
+
 </div>
\ No newline at end of file

src/main/resources/public/pages/issue/IssueView.html

-<div class="card mb-3">
+<div class="container">
+    <div class="row">
+        <div class="col-md-8">
 
-    <div class="card-header">
-        <i class="fas fa-table"></i> Danh Sách Issue
-    </div>
-    <div class="card-body">
-        <div class="table-responsive">
+            <tr>
+                <td><a ui-sref="addIssues" class="btn btn-success" data-toggle="modal">
+                    <i class="fa fa-file-pdf-o" aria-hidden="true"></i> <span>Thêm Dự Án Mới</span></a></a></td>
+            </tr>
+            <h4></h4>
+            <tr></tr>
             <input type="text" ng-model="search" placeholder="Search" style="margin-bottom: 10px;">
-            <table class="table table-bordered" id="dataTable" width="100%"
-                   cellspacing="0">
+            <tr></tr>
+            <h2>Danh Sách Issue</h2>
+
+            <table class="table">
+
                 <thead>
+
                 <tr>
                     <th>Tên Dự Án</th>
                     <th>Issue</th>
@@ -26,20 +33,35 @@
                         <span ng-if="issue.status == 0" style="color: #34ce57">Đang fix</span>
                         <span ng-if="issue.status == 1" style="color: #0e90d2">Đã fix xong</span>
                     </td>
-                    <td><a ui-sref="IssuesComment({IssuesId : issue.id})" class="btn btn-info btn-circle btn-sm">
+                    <td style="width: 200px">
+
+                        <a ui-sref="IssuesComment({IssuesId : issue.id})" class="btn btn-info btn-circle btn-sm">
                             Chi Tiết </a>
-                        <a ng-click="updateIssues(issue)" class="btn btn-warning btn-circle btn-sm">
-                            Cập nhật Trạng Thái </a>
-                        <a class="btn btn-danger btn-circle btn-sm" ng-controller="IssuesDeleteController"
-                           data-ng-click="IssuesDelete(issue)">Xóa</a>
+
+                        <a ng-click="updateIssues(issue)">
+                            <button class="btn btn-primary btn-xs" data-title="Edit" data-toggle="modal"
+                                    data-target="#edit"><span class="glyphicon glyphicon-pencil"></span></button>
+                        </a>
+                        <a ng-controller="IssuesDeleteController"
+                           data-ng-click="IssuesDelete(issue)">
+                            <button class="btn btn-danger btn-xs" data-title="Delete" data-toggle="modal"
+                                    data-target="#delete">
+                                <span class="glyphicon glyphicon-trash"></span></button>
+                        </a>
+                    </td>
+
                 </tr>
+
+
                 </tbody>
             </table>
-            <a ui-sref="addIssues" class="btn btn-primary btn-circle btn-sm" style="margin-bottom: 10px;"> Thêm Issue Mới</a>
-        </div>
-    </div>
+
             <div data-pagination="" data-num-pages="numPages()"
                  data-current-page="currentPage" data-max-size="maxSize"
                  data-boundary-links="true">
             </div>
+        </div>
+    </div>
+
 </div>
+

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

@@ -25,7 +25,7 @@ angular.module("myApp").controller("leaveFormController", function($scope, $http
     //get all leave form
     $http({
         method : 'GET',
-        url : "http://localhost:8080/employee/leaveform/show"
+        url : "http://localhost:8081/employee/leaveform/show"
     }).then(function successCallback(response) {
         console.log(response);
         $scope.leaveForms=response.data;
@@ -36,7 +36,7 @@ angular.module("myApp").controller("leaveFormController", function($scope, $http
     //get all leave type
     $http({
         method : 'GET',
-        url : "http://localhost:8080/employee/leaveType/getAll"
+        url : "http://localhost:8081/employee/leaveType/getAll"
     }).then(function successCallback(response) {
         console.log(response);
         $scope.leaveTypeList=response.data;
@@ -47,7 +47,7 @@ angular.module("myApp").controller("leaveFormController", function($scope, $http
     $scope.delete = function (lf) {
         $http({
             method : 'DELETE',
-            url : "http://localhost:8080/employee/leaveform/delete/" + lf.id
+            url : "http://localhost:8081/employee/leaveform/delete/" + lf.id
         }).then(function successCallback(response) {
             console.log(response);
             $state.reload();
@@ -62,7 +62,7 @@ angular.module("myApp").controller("leaveFormController", function($scope, $http
         console.log($scope.lfdto);
         $http({
             method : 'POST',
-            url : "http://localhost:8080/timesheet/leaveform/add",
+            url : "http://localhost:8081/employee/leaveform/add",
             data: $scope.lfdto
         }).then(function successCallback(response) {
             console.log(response);
@@ -86,7 +86,7 @@ angular.module("myApp").controller("leaveFormController", function($scope, $http
     function update(){
         $http({
             method : 'POST',
-            url : "http://localhost:8080/timesheet/leaveform/update",
+            url : "http://localhost:8081/employee/leaveform/update",
             data: $scope.lfdto
         }).then(function successCallback(response) {
             console.log(response);
@@ -101,7 +101,7 @@ angular.module("myApp").controller("leaveFormController", function($scope, $http
     function updateStatus(lf){
         $http({
             method : 'POST',
-            url : "http://localhost:8080/timesheet/leaveform/"+lf.id+"/status",
+            url : "http://localhost:8081/employee/leaveform/"+lf.id+"/status",
             // data: $scope.lfdto
         }).then(function successCallback(response) {
             console.log(response);

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

@@ -14,7 +14,7 @@
                 <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"/>
+                        <input type="submit" name="submit" value="Quay lại" ui-sref="leaveform"/>
                     </tr>
                 </div>
                 <br><br>

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

@@ -5,7 +5,7 @@ angular.module("myApp").controller("leaveFormDetailController", function($scope,
     console.log("Leave Form Detail Controller");
     $http({
         method : 'GET',
-        url : "http://localhost:8080/timesheet/leaveform/" + $stateParams.id
+        url : "http://localhost:8081/employee/leaveform/" + $stateParams.id
     }).then(function successCallback(response) {
         console.log(response);
         $scope.leaveFormDetail=response.data;
@@ -17,7 +17,7 @@ angular.module("myApp").controller("leaveFormDetailController", function($scope,
     function updateStatus(id){
         $http({
             method : 'POST',
-            url : "http://localhost:8080/timesheet/leaveform/"+id+"/status",
+            url : "http://localhost:8081/employee/leaveform/"+id+"/status",
         }).then(function successCallback(response) {
             console.log(response);
             $state.reload();

src/main/resources/public/pages/login/forgot-password.html

+<div class="card card-login mx-auto mt-5">
+    <div class="card-header">Reset Password</div>
+    <div class="card-body">
+        <div class="text-center mb-4">
+            <h4>Lấy lại mật khẩu bằng Email đăng ký?</h4>
+        </div>
+        <form>
+            <div class="form-group">
+                <div class="form-label-group">
+                    <input type="email" id="inputEmail" class="form-control" placeholder="Enter email address"
+                           required="required" autofocus="autofocus">
+                    <label for="inputEmail">Enter email address</label>
+                </div>
+            </div>
+            <a class="btn btn-primary btn-block" href="login.html">Reset Password</a>
+        </form>
+        <div class="text-center">
+            <a class="d-block small mt-3" ui-sref="register">Đăng ký tài khoản</a>
+            <a class="d-block small" ui-sref="login">Đăng Nhập</a>
+        </div>
+    </div>
+</div>
\ No newline at end of file

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

+<div class="card card-login mx-auto mt-5">
+    <div class="card-header" style="text-align: center">Đăng Nhập Hệ Thống</div>
+    <div class="card-body">
+        <form>
+            <div class="form-group">
+                <div class="form-label-group">
+                    <input type="text" id="username" class="form-control" placeholder="Tên Đăng Nhập"
+                           autofocus="autofocus" required>
+                    <label for="username">Tên Đăng Nhập</label>
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="form-label-group">
+                    <input type="password" id="inputPassword" class="form-control" placeholder="Mật Khẩu"
+                           required="required">
+                    <label for="inputPassword">Mật Khẩu</label>
+                </div>
+            </div>
+            <input class="btn btn-primary btn-block" type="submit" value="Đăng Nhập"/>
+        </form>
+        <div class="text-center">
+            <a class="d-block small mt-3" ui-sref="register">Đăng Ký</a>
+            <a class="d-block small" ui-sref="forgot-password">Lấy Lại Mật Khẩu?</a>
+        </div>
+    </div>
+</div>
\ No newline at end of file

src/main/resources/public/pages/login/loginsController.js

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

src/main/resources/public/pages/login/register.html

+<div class="card card-register mx-auto mt-5">
+    <div class="card-header" style="text-align: center">ĐĂNG KÝ TÀI KHOẢN</div>
+    <div class="card-body">
+        <form>
+            <div class="form-group">
+                <div class="form-row">
+                    <div class="col-md-6">
+                        <div class="form-label-group">
+                            <input type="text" ng-model="username" id="username" class="form-control" placeholder="Tên truy cập"
+                                   required="required" autofocus="autofocus">
+                            <label for="username">Tên Đăng Nhập</label>
+                        </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="form-label-group">
+                            <input type="text" ng-model="name" id="name" class="form-control" placeholder="Họ và Tên"
+                                   required="required">
+                            <label for="name">Họ và Tê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="email" ng-model="email" id="email" class="form-control"
+                                   placeholder="Email đăng ký" required="required">
+                            <label for="Email">Email đăng ký</label>
+                        </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="form-label-group">
+                            <input type="tel" ng-model="phonenumber" id="phonenumber" class="form-control"
+                                   placeholder="SDT" required="required">
+                            <label for="phonenumber">SDT</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="Object" id="Object" class="form-control"
+                                   placeholder="Đối tượng" required="required">
+                            <label for="Object">Đối Tượng</label>
+                        </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="form-label-group">
+                            <input type="text" ng-model="skype" id="skype" class="form-control"
+                                   placeholder="nick skype" required="required">
+                            <label for="skype">Nick Skype</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="facebook" id="facebook" class="form-control"
+                                   placeholder="facebook" required="required">
+                            <label for="facebook">facebook</label>
+                        </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="form-label-group">
+                            <input type="text" ng-model="HocVan" id="HocVan" class="form-control"
+                                   placeholder="Học Vấn" required="required">
+                            <label for="HocVan">Học Vấ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="QueQuan" id="QueQuan" class="form-control"
+                                   placeholder="Quê Quán" required="required">
+                            <label for="QueQuan">Quê Quán</label>
+                        </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="form-label-group">
+                            <input type="text" ng-model="Truong" id="Truong" class="form-control"
+                                   placeholder="Trường" required="required">
+                            <label for="Truong">Trường</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="Khoa" id="Khoa" class="form-control"
+                                   placeholder="Khoa" required="required">
+                            <label for="Khoa">Khoa</label>
+                        </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="form-label-group">
+                            <input type="text" ng-model="NamTotNghiep" id="NamTotNghiep" class="form-control"
+                                   placeholder="Năm tốt nghiệp" required="required">
+                            <label for="NamTotNghiep">Năm tốt nghiệp</label>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <a class="btn btn-primary btn-block" href="#">Register</a>
+        </form>
+        <div class="text-center">
+            <a class="d-block small mt-3" ui-sref="login">Dăng Nhập</a>
+            <a class="d-block small" ui-sref="forgot-password">Lấy lại mật khẩu?</a>
+        </div>
+    </div>
+</div>
\ No newline at end of file

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

-<div class="card-header">
-    <i class="fas fa-table"></i> Thành thành viên mới của dự án
-</div>
-<div class="card-body">
+
+<div class="container">
     <form ng-controller="insertEmployeeProject" ng-submit="insert_employeeproject(employeeProject)" name="eproject">
+        <h1 style="text-align: center">Thành thành viên mới của dự án</h1>
+        <div class="form-row">
+            <div class="col">
                 <label>Tên Dự Án</label>
                 <select ng-model="employeeProject.projectId" autofocus="autofocus" required="required">
                     <option value=""> ==> Tên Dự Án</option>
                     <option ng-repeat="project in pGroupProject" value="{{project.id}}">{{project.name}}</option>
-        </select><br/>
+                </select>
+
                 <label>Tài khoản nhân viên</label>
                 <input type="text" ng-model="employeeProject.userName" id="employee"
-               placeholder="Tài khoản nhân viên" required="required"><br/>
+                       placeholder="Tài khoản nhân viên" required="required">
+
                 <label>Chức Vụ</label>
                 <select ng-model="employeeProject.position" autofocus="autofocus"
                         required="required">
                     <option value="">==> Chức Vụ</option>
                     <option value="TeamLead">TeamLead</option>
                     <option value="Member">Member</option>
-        </select><br/>
-        <h1>{{view.message}}</h1>
+                </select>
+            </div>
+        </div>
         <div>
-            <input type="submit" value="Lưu">
+            <h1>{{view.message}}</h1>
+            <input type="submit" value="Save">
             <input type="reset" value="Reset">
             <button type="button" ui-sref="project">Back</button>
         </div>
     </form>
+
 </div>
\ No newline at end of file

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

-<div class="card-header">
-    <i class="fas fa-table"></i> Cập nhật chức vụ của nhân viên trong nhóm
-</div>
-<div class="card-body">
+<div class="container">
     <form ng-controller="updateGroutpProject" ng-submit="updatePositionProject(gruopProject)" name="formProject">
         <input type="hidden" ng-model="gruopProject.id" id="id"><br/>
         <input type="hidden" ng-model="gruopProject.projectDTO.id" id="idProject"><br/>
         <label>Tài khoản nhân viên</label>
         <input type="text" ng-model="gruopProject.employeeDTO.username" id="descriptions"
                placeholder="Tài khoản nhân viên"
-               ng-disabled="true"><br/>
-        <label>Chức Vụ</label><br/>
+               ng-disabled="true">
+        <label>Chức Vụ</label>
         <select ng-model="gruopProject.position" autofocus="autofocus"
                 required="required">
             <option value="">==> Chức Vụ</option>
@@ -23,4 +20,5 @@
             <button type="button" ui-sref="groupProjectByProjectId({ID: gruopProject.projectDTO.id})">Back</button>
         </div>
     </form>
+
 </div>
\ No newline at end of file

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

-<div class="card mb-3">
 
-    <div class="card-header" ng-controller="loadGroupProjectByProjectId">
+<div class="container">
+    <div class="row">
+        <div class="col-md-8">
 
-        <i class="fas fa-table" ></i> Thành Viên Trong Nhóm Dự Án <div ng-model="ProjectName.name"></div>
-    </div>
-    <div class="card-body">
-        <div class="table-responsive" >
+            <tr>
+                <td><a ui-sref="addEmployeeProject" class="btn btn-success" data-toggle="modal"><i
+                        class="fa fa-user-plus"></i> <span>Thêm Dự Án Mới</span></a></a></td>
+            </tr>
+            <h2 style="text-align: center">Thành Viên Trong Nhóm Dự Án</h2>
+
+            <table class="table">
 
-            <input type="text" ng-model="search" placeholder="Search" style="margin-bottom: 10px;">
-            <table class="table table-bordered" id="dataTable" width="100%"
-                   cellspacing="0">
                 <thead>
+
                 <tr>
                     <th>Tài khoản</th>
                     <th>Tên</th>
@@ -29,20 +31,30 @@
                     <td>{{ gruopProject.position}}</td>
                     <td>{{ gruopProject.joinDate | date:"dd/MM/yyyy" }}</td>
                     <td>{{ gruopProject.outDate | date:"dd/MM/yyyy" }}</td>
-                    <td>
-                        <a ui-sref="editEmployeeProject({ID: gruopProject.id})" class="btn btn-warning btn-circle btn-sm">
-                            Cập Nhật </a>
-                        <a class="btn btn-danger btn-circle btn-sm" ng-controller="deleteEmployeeProject"
-                           data-ng-click="deleteEmployeeProject(gruopProject)">Xóa Thành Viên</a>
+                    <td style="width: 200px">
+
+                        <a ui-sref="editEmployeeProject({ID: gruopProject.id})">
+                            <button class="btn btn-primary btn-xs" data-title="Cập Nhật" data-toggle="modal"
+                                    data-target="#edit"><span class="glyphicon glyphicon-pencil"></span></button>
+                        </a>
+                        <a ng-controller="deleteEmployeeProject"
+                           data-ng-click="deleteEmployeeProject(gruopProject)">
+                            <button class="btn btn-danger btn-xs" data-title="Delete" data-toggle="modal"
+                                    data-target="#delete">
+                                <span class="glyphicon glyphicon-trash"></span></button>
+                        </a>
+                    </td>
+
                 </tr>
+
+
                 </tbody>
             </table>
-            <a ui-sref="addEmployeeProject" class="btn btn-primary btn-circle btn-sm" style="margin-bottom: 10px;"> Thêm thành viên</a>
-            <a ui-sref="project" class="btn btn-primary btn-circle btn-sm" style="margin-bottom: 10px;"> Back</a>
-        </div>
-    </div>
             <div data-pagination="" data-num-pages="numPages()"
                  data-current-page="currentPage" data-max-size="maxSize"
                  data-boundary-links="true">
             </div>
+        </div>
+    </div>
+
 </div>
\ No newline at end of file

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

-<div class="card-header">
-    <i class="fas fa-table"></i> Thêm mới dự án
-</div>
-<div class="card-body">
+<div class="container">
     <form ng-controller="insertProject" ng-submit="insert_project()">
+        <h1 style=" text-align: center">Thêm mới dự án</h1>
+        <div class="form-row">
+            <div class="col">
                 <label>Tên Dự Án</label>
-        <input type="text" ng-model="project.name" id="name" placeholder="Tên Dự Án"
-               required="required" style="height: 20px;"><br/>
+
+                <input type="text" maxlength="29" ng-model="project.name" required="required"/>
+
                 <label>Mô tả ngắn</label>
-        <input type="text" ng-model="project.descriptions" id="descriptions" placeholder="Mô tả ngắn"
-               required="required"><br/>
+
+                <input type="text" maxlength="29" ng-model="project.descriptions" required="required"/>
                 <label>Ngày bắt đầu</label>
-        <input type="date" ng-model="project.startDate" id="startDate" placeholder="Ngày Bắt Đầu" required="required"><br/>
+
+                <input type="date" maxlength="29" ng-model="project.startDate" required="required"/>
                 <label>Ngày kết thúc</label>
-        <input type="date" ng-model="project.endDate" id="endDate" placeholder="nick skype" required="required"><br/>
+                <input type="date" maxlength="29" ng-model="project.endDate" required="required"/>
+
+            </div>
+        </div>
         <div>
             <h1>{{view.message}}</h1>
             <input type="submit" value="Save">
@@ -20,4 +25,5 @@
             <button type="button" ui-sref="project">Back</button>
         </div>
     </form>
+
 </div>

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

@@ -4,30 +4,6 @@ app.controller('insertProject', insertProject);
 app.controller('deleteProject', deleteProject);
 app.controller('updateProject', updateProject);
 app.controller('loadProjectDetail', loadProjectDetail);
-
-//	controlers tạo Get API
-// function showProject($scope, $http) {
-//     $scope.lstProject = [];
-//     $scope.page = 0;
-//     $scope.pagesCount = 0;
-//     $http.get("http://localhost:8081/quan-tri/danh-sach-du-an/" +  $scope.page + "/2").then(successCallback, errorCallback);
-//
-//     function successCallback(response) {
-//         console.log(response.data);
-//         {
-//             $scope.listProject = response.data.lstResult;
-//             $scope.page = response.data.page;
-//             $scope.pagesCount = response.data.totalPage;
-//             $scope.totalCount = response.data.totalItem;
-//         }
-//     }
-//
-//     function errorCallback(error) {
-//         //error code
-//         console.log("can't get data!!");
-//     }
-// };
-// tạo controllers insert API
 function insertProject($scope, $http, $state) {
     $scope.insert_project = function () {
         $http({

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

-<div class="card-header">
-    <i class="fas fa-table"></i> Sửa Dự Án
-</div>
-<div class="card-body">
+<div class="container">
     <form ng-controller="updateProject" ng-submit="updateProject(project)" name="formProject">
+        <H1 style="text-align: center">Cập nhật dự án dự án<h1>
+        <div class="form-row">
+            <div class="col">
                 <label>Tên Dự Án</label>
-        <input type="text" ng-model="project.name" id="name"
-               placeholder="Tên Dự Án"
-               required="required" autofocus="autofocus" name="txtName"><br/>
+
+                <input type="text" maxlength="29" ng-model="project.name" required="required"/>
+
                 <label>Mô tả ngắn</label>
-        <input type="text" ng-model="project.descriptions" id="descriptions"
-               placeholder="Mô tả ngắn"
-               required="required" name="txtDescriptions"><br/>
+
+                <input type="text" maxlength="29" ng-model="project.descriptions" required="required"/>
+                <label>Trạng Thái</label>
                 <select ng-model="project.status" autofocus="autofocus"
                     required="required">
                     <option value="">==> Trạng Thái</option>
@@ -19,6 +19,8 @@
                     <option value="2">Đã Hoàn Thành</option>
                 </select><br/>
                 <input type="hidden" ng-model="project.id" id="id"><br/>
+            </div>
+        </div>
         <div>
             <h1>{{view.message}}</h1>
             <input type="submit" value="Save">
@@ -26,4 +28,5 @@
             <button type="button" ui-sref="project">Back</button>
         </div>
     </form>
+
 </div>

src/main/resources/public/pages/project/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">
-        <div class="table-responsive" >
-            <input type="text" ng-model="search" placeholder="Search" style="margin-bottom: 10px;">
-            <table class="table table-bordered" id="dataTable" width="100%"
-                   cellspacing="0">
+<div class="container">
+    <div class="row">
+        <div class="col-md-8">
+
+            <tr>
+                <td><a ui-sref="addproject" class="btn btn-success" data-toggle="modal">
+                    <i class="fa fa-file-pdf-o" aria-hidden="true"></i><span>Thêm Dự Án Mới</span></a></a></td>
+            </tr>
+            <h4></h4>
+            <tr></tr>
+            <input type="text" ng-model="search" placeholder="Search">
+            <tr></tr>
+            <h2>Thông tin dự án</h2>
+
+            <table class="table">
+
                 <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>
+                    <th style="width: 200px">Thao Tác</th>
                 </tr>
                 </thead>
                 <tbody>
-                <tr ng-repeat="project in pageListProject|filter:search">
+                <tr class="vide"
+                    ng-repeat="project in pageListProject|filter:search">
                     <td>{{ project.name }}</td>
                     <td>{{ project.descriptions }}</td>
                     <td>{{ project.startDate | date:"dd/MM/yyyy" }}</td>
@@ -27,23 +36,36 @@
                     <td>
                         <span ng-if="project.status == 0" style="color: #34ce57">Dự Kiến</span>
                         <span ng-if="project.status == 1" style="color: #0e90d2">Đang Tiến Hành</span>
-                        <span ng-if="project.status == 2" style="color: #b21f2d" >Hoàn Thành</span>
+                        <span ng-if="project.status == 2" style="color: #b21f2d">Hoàn Thành</span>
                     </td>
-                    <td><a ui-sref="groupProjectByProjectId({ID: project.id})" class="btn btn-info btn-circle btn-sm">
+                    <!--                    thao tác-->
+                    <td style="width: 200px">
+                        <a ui-sref="groupProjectByProjectId({ID: project.id})" class="btn btn-info btn-circle btn-sm">
                             Xem </a>
-                        <a ui-sref="editproject({ID: project.id})" class="btn btn-warning btn-circle btn-sm">
-                        Sửa </a>
-                        <a class="btn btn-danger btn-circle btn-sm" ng-controller="deleteProject"
-                           data-ng-click="deleteProject(project.id)">Xóa</a>
+
+                        <a ui-sref="editproject({ID: project.id})">
+                                <button class="btn btn-primary btn-xs" data-title="Edit" data-toggle="modal"
+                                        data-target="#edit"><span class="glyphicon glyphicon-pencil"></span></button>
+                        </a>
+                        <a ng-controller="deleteProject" data-ng-click="deleteProject(project.id)">
+                                <button class="btn btn-danger btn-xs" data-title="Delete" data-toggle="modal"
+                                        data-target="#delete">
+                                    <span class="glyphicon glyphicon-trash"></span></button>
+                        </a>
+                    </td>
+
                 </tr>
+
+
                 </tbody>
             </table>
-            <a ui-sref="addproject" class="btn btn-primary btn-circle btn-sm" style="margin-bottom: 10px;"> Thêm Dự Án Mới</a>
-        </div>
-    </div>
-<!--    <pager-directive page="{{page}}" custom-path="{{customPath}}" pages-count="{{pagesCount}}" total-count="{{totalCount}}" search-func="getProject(page)"></pager-directive>-->
+
             <div data-pagination="" data-num-pages="numPages()"
                  data-current-page="currentPage" data-max-size="maxSize"
                  data-boundary-links="true">
             </div>
+        </div>
+    </div>
+
 </div>
+

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

+<div class="card mb-3">
 
-<div class="container">
-    <div class="row">
-        <div class="col-md-8">
-            <div>
-            <input class="search" ng-model="search" type="text" placeholder="Search" ng-change="currentPage =1">
-            <h3>Danh Sách Thành viên thiếu TimeSheet</h3>
-
-            <table class="table">
+    <div class="card-header">
+        <i class="fas fa-table"></i> Danh Sách Thành viên thiếu TimeSheet
+    </div>
+    <div class="card-body">
+        <div class="table-responsive">
+            <div ng-controller="updateTimeSheetCheckedController">
+<!--                <a ui-sref="addproject" class="btn btn-primary btn-circle btn-sm" style="margin-bottom: 10px;"> Thêm </a>-->
+                <input type="text" ng-model="search" placeholder="Search" style="margin-bottom: 10px;">
+                {{timeSheetsMessages.view}}
+                <table class="table table-bordered" id="dataTable" width="100%"
+                       cellspacing="0">
                     <thead>
                     <tr>
                         <th>STT</th>
@@ -16,27 +20,24 @@
                         <th>Địa chỉ email</th>
                         <th>SDT</th>
                         <th>Menu</th>
+
                     </tr>
                     </thead>
                     <tbody>
-                    <tr class="vide" data-ng-repeat="emp in employeesList|filter:search">
+                    <tr  data-ng-repeat="emp in employeesList|filter:search">
                         <td>{{$index+1}}</td>
                         <td>{{emp.picture}}</td>
-                        <td>{{emp.username}}</td>
                         <td>{{emp.firstName+" "+emp.lastName}}</td>
                         <td>{{emp.emailAddress}}</td>
+                        <td>{{emp.emailAddress}}</td>
                         <td>{{emp.phoneNumber}}</td>
                         <td><a ui-sref="" class="btn btn-info btn-circle btn-sm">Xem </a></td>
+
+
                     </tr>
                     </tbody>
                 </table>
-
-
-            <uib-pagination total-items="getTotalItems()" boundary-link-numbers="true" ng-model="currentPage"
-                            ng-change="pageChangedIndex()" rotate="true"
-                            items-per-page="employeePerPage"></uib-pagination>
             </div>
         </div>
     </div>
-
 </div>
\ No newline at end of file

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

+<div class="card mb-3">
 
-<div class="container">
-    <div class="row">
-        <div class="col-md-8">
+    <div class="card-header">
+        <i class="fas fa-table"></i> Danh Sách Thành viên thiếu TimeSheet
+
+    </div>
+    <div class="card-body">
+        <div class="table-responsive">
             <div ng-controller="listEmployeeLackController">
-                <input class="search" ng-model="search" type="text" placeholder="Search" ng-change="currentPage =1">
-                <h3>Danh Sách Thành viên thiếu TimeSheet</h3>
+
                 <form>
                     <input type="text" ng-model="search" placeholder="Search" style="margin-bottom: 10px;"> <br>
                     <div ng-show="detail">
@@ -36,7 +39,9 @@
                         <a ng-click="cancelView()" class="btn btn-primary btn-circle btn-sm" style="margin-bottom: 10px;" ng-show="cancel"> Đóng </a>
                     </div>
                 </form>
-                <table class="table">
+
+                <table class="table table-bordered" id="dataTable" width="100%"
+                       cellspacing="0">
                     <thead>
                     <tr>
                         <th>STT</th>
@@ -46,6 +51,7 @@
                         <th>Địa chỉ email</th>
                         <th>SDT</th>
                         <th>Menu</th>
+
                     </tr>
                     </thead>
                     <tbody>
@@ -57,16 +63,12 @@
                         <td>{{emp.emailAddress}}</td>
                         <td>{{emp.phoneNumber}}</td>
                         <td><a ng-click="listEmployeeLackDetail(emp.id)" class="btn btn-info btn-circle btn-sm">Xem </a></td>
+
                     </tr>
                     </tbody>
                 </table>
                 <div><a ng-click="history.go(-1);" class="btn btn-primary btn-circle btn-sm" style="margin-bottom: 10px;" > Trở Về</a></div>
-
-                <uib-pagination total-items="getTotalItems()" boundary-link-numbers="true" ng-model="currentPage"
-                                ng-change="pageChangedIndex()" rotate="true"
-                                items-per-page="employeePerPage"></uib-pagination>
             </div>
         </div>
     </div>
-
 </div>
\ No newline at end of file

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

@@ -9,6 +9,7 @@ app.controller('allProjectReportController',allProjectReport);
 app.controller('projectReportDetailController', projectReportDetail);
 app.controller('deleteReportController',deleteReport);
 app.controller('listEmployeeLackController',listEmployeeLack);
+// app.controller('listEmployeeLackDetailController',listEmployeeLackDetail);
 
 
 

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

-<div class="card mb-3">
+<!--<div class="card mb-3">-->
+
+<!--    <div class="card-header">-->
+<!--        <i class="fas fa-table"></i>Danh Sách Dự án (Đang được triển khai)-->
+<!--    </div>-->
+<!--    <div class="card-body">-->
+<!--        <div class="table-responsive" ng-controller="reportController">-->
+<!--            <div  ng-controller="insertProjectReportController">-->
+<!--&lt;!&ndash;                <a ui-sref="addproject" class="btn btn-primary btn-circle btn-sm" style="margin-bottom: 10px;">&ndash;&gt;-->
+<!--&lt;!&ndash;                    Thêm </a>&ndash;&gt;-->
+<!--                <input type="text" ng-model="search" placeholder="Search" style="margin-bottom: 10px;">-->
+<!--                {{messages.view}}-->
+
+<!--                <table class="table table-bordered" id="dataTable" width="100%"-->
+<!--                       cellspacing="0">-->
+<!--                    <thead>-->
+<!--                    <tr>-->
+<!--                        <th>STT</th>-->
+<!--                        <th>Tên dự án</th>-->
+<!--                        <th>Mô tả</th>-->
+<!--                        <th>Thời gian </th>-->
+<!--                        <th>Trạng thái</th>-->
+<!--                        <th>Chọn khoảng thời gian</th>-->
+<!--                        <th>Menu</th>-->
+
+<!--                    </tr>-->
+<!--                    </thead>-->
+<!--                    <tbody>-->
+<!--                        <form>-->
+<!--                            <tr data-ng-repeat="pro in projects|filter:search">-->
+<!--                            <td>{{$index+1}}</td>-->
+<!--                            <td>{{pro.name}}</td>-->
+<!--                            <td>{{pro.descriptions}}</td>-->
+<!--                            <td>{{pro.startDate | date:"dd/MM/yyyy"}} <br>&ndash;&gt; {{pro.endDate | date:"dd/MM/yyyy"}}</td>-->
+<!--                            <td>{{pro.status}}</td>-->
+<!--                            <td class="form-label-group" >-->
+<!--&lt;!&ndash;                                    <label for="startDate">Ngày Bắt Đầu</label>&ndash;&gt;-->
+<!--                                    <input type="date" ng-model="request.firstDate" id="startDate" class="form-control"-->
+<!--                                           placeholder="điểm đầu" required="required">-->
+
+<!--&lt;!&ndash;                                    <label for="endDate">Ngày Kết Thúc</label>&ndash;&gt;-->
+<!--                                    <input type="date" ng-model="request.finalDate" id="endDate" class="form-control"-->
+<!--                                           placeholder="điểm cuối" required="required">-->
+<!--                            </td>-->
+<!--                                <td>-->
+<!--                                <a ng-click="insertReport(pro.id, request.firstDate, request.finalDate)" class="btn btn-info btn-circle btn-sm">Thêm mới báo cáo></a><br>-->
+<!--                                <a ui-sref="allReport({ID: pro.id})" class="btn btn-warning btn-circle btn-sm">Danh sách báo cáo</a> <br>-->
+<!--                                <a ui-sref="reportEmployeeLack({ID: pro.id})" class="btn btn-danger btn-circle btn-sm" data-ng-click="">Ds thành viên thiếu báo cáo</a>-->
+<!--                                </td>-->
+<!--                        </tr>-->
+<!--                        </form>-->
+<!--                    </tbody>-->
+<!--                </table>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--</div>-->
+
+
+
+
+
+<div class="container">
+    <div class="row" ng-controller="reportController" >
+        <div class="col-md-8"  ng-controller="insertProjectReportController">
+
+
+            <h4>{{messages.view}}</h4>
+            <tr></tr>
+            <input class="search" ng-model="search" type="text" placeholder="Search" ng-change="currentPage =1">
+            <tr></tr>
+            <h2>Danh Sách Dự án (Đang được triển khai)</h2>
+
+            <table class="table">
 
-    <div class="card-header">
-        <i class="fas fa-table"></i>Danh Sách Dự án (Đang được triển khai)
-    </div>
-    <div class="card-body">
-        <div class="table-responsive" ng-controller="reportController">
-            <div  ng-controller="insertProjectReportController">
-<!--                <a ui-sref="addproject" class="btn btn-primary btn-circle btn-sm" style="margin-bottom: 10px;">-->
-<!--                    Thêm </a>-->
-                <input type="text" ng-model="search" placeholder="Search" style="margin-bottom: 10px;">
-                {{messages.view}}
-
-                <table class="table table-bordered" id="dataTable" width="100%"
-                       cellspacing="0">
                 <thead>
+
                 <tr>
                     <th>STT</th>
                     <th>Tên dự án</th>
@@ -22,23 +83,22 @@
                     <th>Trạng thái</th>
                     <th>Chọn khoảng thời gian</th>
                     <th>Menu</th>
-
                 </tr>
                 </thead>
                 <tbody>
-                        <form>
-                            <tr data-ng-repeat="pro in projects|filter:search">
+                <tr class="vide"
+                    data-ng-repeat="pro in projects|filter:search">
                     <td>{{$index+1}}</td>
                     <td>{{pro.name}}</td>
                     <td>{{pro.descriptions}}</td>
                     <td>{{pro.startDate | date:"dd/MM/yyyy"}} <br>--> {{pro.endDate | date:"dd/MM/yyyy"}}</td>
                     <td>{{pro.status}}</td>
                     <td class="form-label-group" >
-<!--                                    <label for="startDate">Ngày Bắt Đầu</label>-->
+                        <!--                                    <label for="startDate">Ngày Bắt Đầu</label>-->
                         <input type="date" ng-model="request.firstDate" id="startDate" class="form-control"
                                placeholder="điểm đầu" required="required">
 
-<!--                                    <label for="endDate">Ngày Kết Thúc</label>-->
+                        <!--                                    <label for="endDate">Ngày Kết Thúc</label>-->
                         <input type="date" ng-model="request.finalDate" id="endDate" class="form-control"
                                placeholder="điểm cuối" required="required">
                     </td>
@@ -47,11 +107,20 @@
                         <a ui-sref="allReport({ID: pro.id})" class="btn btn-warning btn-circle btn-sm">Danh sách báo cáo</a> <br>
                         <a ui-sref="reportEmployeeLack({ID: pro.id})" class="btn btn-danger btn-circle btn-sm" data-ng-click="">Ds thành viên thiếu báo cáo</a>
                     </td>
+
                 </tr>
-                        </form>
+
+
                 </tbody>
             </table>
+
+
+            <uib-pagination total-items="getTotalItems()" boundary-link-numbers="true" ng-model="currentPage"
+                            ng-change="pageChangedIndex()" rotate="true"
+                            items-per-page="employeePerPage"></uib-pagination>
+
+
         </div>
     </div>
-    </div>
+
 </div>

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

 /*
 
 */
-angular.module("myApp").controller("timeSheetController", function($scope, $http,$window) {
+angular.module("myApp").controller("timeSheetController", function($scope, $http, $state) {
     console.log("Time Sheet controller");
 
     $scope.ts = {
@@ -22,7 +22,7 @@ angular.module("myApp").controller("timeSheetController", function($scope, $http
     //function getAllTimesheet(){
         $http({
             method: 'GET',
-            url: "http://localhost:8080/eproject/timesheet/show"
+            url: "http://localhost:8081/eproject/timesheet/show"
         }).then(function successCallback(response) {
             console.log(response);
             $scope.myTimeSheets = response.data;
@@ -34,7 +34,7 @@ angular.module("myApp").controller("timeSheetController", function($scope, $http
     //get all eproject
     $http({
         method: 'GET',
-        url: "http://localhost:8080/eproject/getAll"
+        url: "http://localhost:8081/eproject/getAll"
     }).then(function successCallback(response) {
         console.log(response);
         $scope.eProjectList = response.data;
@@ -45,7 +45,7 @@ angular.module("myApp").controller("timeSheetController", function($scope, $http
     $scope.delete = function (ts) {
         $http({
             method: 'DELETE',
-            url: "http://localhost:8080/eproject/timesheet/delete/" + ts.id
+            url: "http://localhost:8081/eproject/timesheet/delete/" + ts.id
         }).then(function successCallback(response) {
             console.log(response);
             $state.reload();
@@ -62,7 +62,7 @@ angular.module("myApp").controller("timeSheetController", function($scope, $http
         console.log($scope.tsdto);
         $http({
             method: 'POST',
-            url: "http://localhost:8080/eproject/timesheet/add",
+            url: "http://localhost:8081/eproject/timesheet/add",
             data: $scope.tsdto
         }).then(function successCallback(response) {
             console.log(response);
@@ -89,7 +89,7 @@ angular.module("myApp").controller("timeSheetController", function($scope, $http
         $http({
             headers: "content-type: application/json",
             method: 'POST',
-            url: "http://localhost:8080/eproject/timesheet/update",
+            url: "http://localhost:8081/eproject/timesheet/update",
             data: $scope.tsdto
         }).then(function successCallback(response) {
             console.log(response);
@@ -99,84 +99,4 @@ angular.module("myApp").controller("timeSheetController", function($scope, $http
             $state.reload();
         });
     }
-
-    // $scope.myTimeSheets = [];
-    // $scope.save = save;
-    // $scope.currentPage = 1;
-    // $scope.timesheetPerPage = 3;
-    // $scope.maxSize = 5;
-    // this.myTimeSheets = $scope.myTimeSheets;
-    // $scope.numOfPage = numOfPage;
-    // $scope.dataHasLoaded = false;
-    // $scope.makeTimesheet = function () {
-    //     $scope.myTimeSheets = [];
-    //     for (let i = 1; i <=50 ; i++) {
-    //         $scope.myTimeSheets.push( {text : 'ts'+ i , done:false});
-    //     }
-    //
-    // };
-    // $scope.makeTimesheet();
-    // $scope.getAllTimesheet = getAllTimesheet;
-    // //$scope.getTotalTimesheet = getTotalTimesheet;
-    // getAllTimesheet();
-    // $scope.pageChangedIndex = pageChangedIndex;
-    // function pageChangedIndex() {
-    //     console.log($scope.currentPage);
-    // }
-    // function numOfPage() {
-    //     return Math.ceil($scope.myTimeSheets.length/ $scope.timesheetPerPage);
-    //
-    // }
 });
-// }).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);
-//             };
-//         }
-//     };

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

@@ -29,7 +29,7 @@
                     <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"/>
+                        <input type="submit" name="submit" value="Quay lại" ui-sref="timesheet"/>
                     </tr>
                 </div>
                 <br><br>

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

@@ -11,7 +11,7 @@ angular.module("myApp").controller("timeSheetDetailController", function($scope,
 
     $http({
         method : 'GET',
-        url : "http://localhost:8080/eproject/timesheet/" + $stateParams.id
+        url : "http://localhost:8081/eproject/timesheet/" + $stateParams.id
     }).then(function successCallback(response) {
         console.log(response);
         $scope.timeSheetDetail=response.data;
@@ -25,7 +25,7 @@ angular.module("myApp").controller("timeSheetDetailController", function($scope,
         $http({
             headers: {"Content-Type": "application/json"},
             method : 'POST',
-            url : "http://localhost:8080/eproject/timesheet/update/check",
+            url : "http://localhost:8081/eproject/timesheet/update/check",
             data: $scope.tsd
         }).then(function successCallback(response) {
             console.log(response);

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

@@ -119,7 +119,7 @@
                             <th>Title</th>
                             <th>Content</th>
                             <th>Note</th>
-                            <th>Employee</th>
+                            <th>Project</th>
                             <th>Create at</th>
                             <th colspan="3"></th>
                         </tr>
@@ -133,7 +133,7 @@
                             <td>{{ts.eproject.project.name}}</td>
                             <td>{{ts.updatedAt}}</td>
 
-                            <td><a ui-sref="timeSheetDetail({id: ts.id})"data-toggle="modal"><i class="fa fa-eye" data-toggle="tooltip" title="View"></i></a></td>
+                            <td><a ui-sref="timesheetDetail({id: ts.id})"data-toggle="modal"><i class="fa fa-eye" data-toggle="tooltip" title="View"></i></a></td>
                             <td><a ui-sref="timeSheet" ng-click="getTs(ts);" onclick="document.getElementById('updateDivTS').style.display = 'block'"class="edit" data-toggle="modal"><i class="material-icons" data-toggle="tooltip" title="Edit">&#xE254;</i></a></td>
                             <td><a ui-sref="timeSheet" ng-click="delete(ts);"class="delete" data-toggle="modal"><i class="material-icons" data-toggle="tooltip" title="Delete">&#xE872;</i></a></td>
                         </tr>

src/main/resources/public/timesheet.html

-<!--
-Author: W3layouts
-Author URL: http://w3layouts.com
-License: Creative Commons Attribution 3.0 Unported
-License URL: http://creativecommons.org/licenses/by/3.0/
--->
-<!DOCTYPE HTML>
-<html>
-<head>
-    <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="Glance Design Dashboard Responsive web template, Bootstrap Web Templates, Flat Web Templates, Android Compatible web template,
-SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, SonyEricsson, Motorola web design"/>
-    <script type="application/x-javascript"> addEventListener("load", function () {
-        setTimeout(hideURLbar, 0);
-    }, false);
-
-    function hideURLbar() {
-        window.scrollTo(0, 1);
-    } </script>
-
-    <!-- Bootstrap Core CSS -->
-    <link href="css/bootstrap.css" rel='stylesheet' type='text/css'/>
-
-    <!-- Custom CSS -->
-    <link href="css/style.css" rel='stylesheet' type='text/css'/>
-
-    <!-- font-awesome icons CSS -->
-    <link href="css/font-awesome.css" rel="stylesheet">
-    <link rel="stylesheet" href="css/Footer-with-social-icons.css">
-    <link href='css/SidebarNav.min.css' media='all' rel='stylesheet' type='text/css'/>
-    <script src="js/jquery-1.11.1.min.js"></script>
-    <script src="js/modernizr.custom.js"></script>
-    <link href="//fonts.googleapis.com/css?family=PT+Sans:400,400i,700,700i&amp;subset=cyrillic,cyrillic-ext,latin-ext"
-          rel="stylesheet">
-    <script src="js/Chart.js"></script>
-    <script src="js/metisMenu.min.js"></script>
-    <script src="js/custom.js"></script>
-    <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
-    <script src="js/angular-route.js"></script>
-    <script src="js/angular-ui-router.min.js"></script>
-    <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular-animate.js"></script>
-    <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular-sanitize.js"></script>
-    <script src="//angular-ui.github.io/bootstrap/ui-bootstrap-tpls-1.3.3.js"></script>
-    <script src="js/app.js"></script>
-    <script src="pages/employee/employeeController.js"></script>
-    <script src="pages/employee/createEmployeeController.js"></script>
-    <link data-require="bootstrap-css@2.3.2" data-semver="2.3.2" rel="stylesheet"
-          href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css"/>
-    `
-    <!--	end anguarjs app-->
-    <link href="css/custom.css" rel="stylesheet">
-<!-- //calendar -->
-
-</head> 
-<body class="cbp-spmenu-push" ng-app="myApp">
-	<div class="main-content">
-	<div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1">
-		<!--left-fixed -navigation-->
-		<aside class="sidebar-left">
-      <nav class="navbar navbar-inverse">
-          <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".collapse" aria-expanded="false">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            </button>
-            <h1><a class="navbar-brand" href="index.html"><span class="fa fa-area-chart"></span> Glance<span class="dashboard_text">Design dashboard</span></a></h1>
-          </div>
-          <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-            <ul class="sidebar-menu">
-              <li class="header">MAIN NAVIGATION</li>
-              <li class="treeview">
-                <a href="index.html">
-                    <span class="glyphicon glyphicon-user"></span> <span>Employee</span>
-                </a>
-              </li>
-			  <li class="treeview">
-                <a href="#">
-                <i class="fa fa-laptop"></i>
-                <span>Components</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="grids.html"><i class="fa fa-angle-right"></i> Grids</a></li>
-                  <li><a href="media.html"><i class="fa fa-angle-right"></i> Media Css</a></li>
-                </ul>
-
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-laptop"></i>
-                <span>UI Elements</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="general.html"><i class="fa fa-angle-right"></i> General</a></li>
-                  <li><a href="icons.html"><i class="fa fa-angle-right"></i> Icons</a></li>
-                  <li><a href="buttons.html"><i class="fa fa-angle-right"></i> Buttons</a></li>
-                  <li><a href="typography.html"><i class="fa fa-angle-right"></i> Typography</a></li>
-                </ul>
-              </li>
-			  <li>
-                <a href="timesheet.html">
-                <i class="fa fa-th"></i> <span>TimeSheet</span>
-                </a>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-edit"></i> <span>Forms</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="forms.html"><i class="fa fa-angle-right"></i> General Forms</a></li>
-                  <li><a href="validation.html"><i class="fa fa-angle-right"></i> Form Validations</a></li>
-                </ul>
-              </li>
-
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-envelope"></i> <span>Mailbox</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="inbox.html"><i class="fa fa-angle-right"></i> Mail Inbox</a></li>
-                  <li><a href="compose.html"><i class="fa fa-angle-right"></i> Compose Mail </a></li>
-                </ul>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-folder"></i> <span>Examples</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li>
-                  <li><a href="signup.html"><i class="fa fa-angle-right"></i> Register</a></li>
-
-                  <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
-                </ul>
-              </li>
-              <li class="header">LABELS</li>
-              <li><a href="#"><i class="fa fa-angle-right text-red"></i> <span>Important</span></a></li>
-              <li><a href="#"><i class="fa fa-angle-right text-yellow"></i> <span>Warning</span></a></li>
-              <li><a href="#"><i class="fa fa-angle-right text-aqua"></i> <span>Information</span></a></li>
-            </ul>
-          </div>
-          <!-- /.navbar-collapse -->
-      </nav>
-    </aside>
-	</div>
-		<!--left-fixed -navigation-->
-		
-		<!-- header-starts -->
-		<div class="sticky-header header-section ">
-			<div class="header-left">
-				
-				<!--toggle button start-->
-				<button id="showLeftPush"><i class="fa fa-bars"></i></button>
-				<!--toggle button end-->
-				<div class="profile_details_left"><!--notifications of menu start -->
-					<ul class="nofitications-dropdown">
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-envelope"></i><span class="badge">4</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 3 new messages</h3>
-									</div>
-								</li>
-								<li><a href="#">
-								   <div class="user_img"><img src="images/1.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet</p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								</a></li>
-								<li class="odd"><a href="#">
-									<div class="user_img"><img src="images/4.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								  <div class="clearfix"></div>	
-								</a></li>
-								<li><a href="#">
-								   <div class="user_img"><img src="images/3.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								</a></li>
-								<li>
-									<div class="notification_bottom">
-										<a href="#">See all messages</a>
-									</div> 
-								</li>
-							</ul>
-						</li>
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-bell"></i><span class="badge blue">4</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 3 new notification</h3>
-									</div>
-								</li>
-								<li><a href="#">
-									<div class="user_img"><img src="images/4.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet</p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								  <div class="clearfix"></div>	
-								 </a></li>
-								 <li class="odd"><a href="#">
-									<div class="user_img"><img src="images/1.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								 </a></li>
-								 <li><a href="#">
-									<div class="user_img"><img src="images/3.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								 </a></li>
-								 <li>
-									<div class="notification_bottom">
-										<a href="#">See all notifications</a>
-									</div> 
-								</li>
-							</ul>
-						</li>	
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-tasks"></i><span class="badge blue1">8</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-
-									</div>
-								</li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Database update</span><span class="percentage">40%</span>
-										<div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										<div class="bar yellow" style="width:40%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Dashboard done</span><span class="percentage">90%</span>
-									   <div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										 <div class="bar green" style="width:90%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Mobile App</span><span class="percentage">33%</span>
-										<div class="clearfix"></div>	
-									</div>
-								   <div class="progress progress-striped active">
-										 <div class="bar red" style="width: 33%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Issues fixed</span><span class="percentage">80%</span>
-									   <div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										 <div class="bar  blue" style="width: 80%;"></div>
-									</div>
-								</a></li>
-								<li>
-									<div class="notification_bottom">
-										<a href="#">See all pending tasks</a>
-									</div> 
-								</li>
-							</ul>
-						</li>	
-					</ul>
-					<div class="clearfix"> </div>
-				</div>
-
-				<div class="clearfix"> </div>
-			</div>
-			<div class="header-right">
-				
-				
-				<!--search-box-->
-				<div class="search-box">
-					<form class="input">
-						<input class="sb-search-input input__field--madoka" placeholder="Search..." type="search" id="input-31" />
-						<label class="input__label" for="input-31">
-							<svg class="graphic" width="100%" height="100%" viewBox="0 0 404 77" preserveAspectRatio="none">
-
-							</svg>
-						</label>
-					</form>
-				</div><!--//end-search-box-->
-
-				<div class="profile_details">
-					<ul>
-						<li class="dropdown profile_details_drop">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-								<div class="profile_img">	
-									<span class="prfil-img"><img src="images/2.jpg" alt=""> </span> 
-									<div class="user-name">
-										<p>Admin Name</p>
-										<span>Administrator</span>
-									</div>
-									<i class="fa fa-angle-down lnr"></i>
-									<i class="fa fa-angle-up lnr"></i>
-									<div class="clearfix"></div>	
-								</div>	
-							</a>
-							<ul class="dropdown-menu drp-mnu">
-								<li> <a href="#"><i class="fa fa-cog"></i> Settings</a> </li> 
-								<li> <a href="#"><i class="fa fa-user"></i> My Account</a> </li>
-								<li> <a href="#"><i class="fa fa-suitcase"></i> Profile</a> </li> 
-								<li> <a href="#"><i class="fa fa-sign-out"></i> Logout</a> </li>
-							</ul>
-						</li>
-					</ul>
-				</div>
-				<div class="clearfix"> </div>				
-			</div>
-			<div class="clearfix"> </div>	
-		</div>
-		<!-- //header-ends -->
-		<!-- main content start-->
-		<div id="page-wrapper">
-			<div class="main-page">
-                <div ui-view="layout1">
-
-                </div>
-
-
-				<div class="elements">
-					<!--photoday-section-->	
-
-	<script src="js/scripts.js"></script>
-
-   <script src="js/bootstrap.js"> </script>
-                </div>
-            </div>
-        </div>
-    </div>
-<!-- footer-->
-    <div class="content">
-    </div>
-    <footer id="myFooter">
-        <div class="container">
-            <div class="row">
-                <div class="col-sm-3 myCols">
-                    <h5>Get started</h5>
-                    <ul>
-                        <li><a href="#">Home</a></li>
-                        <li><a href="#">Sign up</a></li>
-                        <li><a href="#">Downloads</a></li>
-                    </ul>
-                </div>
-                <div class="col-sm-3 myCols">
-                    <h5>About us</h5>
-                    <ul>
-                        <li><a href="#">Company Information</a></li>
-                        <li><a href="#">Contact us</a></li>
-                        <li><a href="#">Reviews</a></li>
-                    </ul>
-                </div>
-                <div class="col-sm-3 myCols">
-                    <h5>Support</h5>
-                    <ul>
-                        <li><a href="#">FAQ</a></li>
-                        <li><a href="#">Help desk</a></li>
-                        <li><a href="#">Forums</a></li>
-                    </ul>
-                </div>
-                <div class="col-sm-3 myCols">
-                    <h5>Legal</h5>
-                    <ul>
-                        <li><a href="#">Terms of Service</a></li>
-                        <li><a href="#">Terms of Use</a></li>
-                        <li><a href="#">Privacy Policy</a></li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-        <div class="social-networks">
-            <a href="#" class="twitter"><i class="fa fa-twitter"></i></a>
-            <a href="#" class="facebook"><i class="fa fa-facebook-official"></i></a>
-            <a href="#" class="google"><i class="fa fa-google-plus"></i></a>
-        </div>
-<!--end footer-->
-   
-</body>
-</html>
\ No newline at end of file

src/main/resources/public/typography.html

-<!--
-Author: W3layouts
-Author URL: http://w3layouts.com
-License: Creative Commons Attribution 3.0 Unported
-License URL: http://creativecommons.org/licenses/by/3.0/
--->
-<!DOCTYPE HTML>
-<html>
-<head>
-<title>Glance Design Dashboard an Admin Panel Category Flat Bootstrap Responsive Website Template | Typography :: 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="Glance Design Dashboard Responsive web template, Bootstrap Web Templates, Flat Web Templates, Android Compatible web template, 
-SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, SonyEricsson, Motorola web design" />
-<script type="application/x-javascript"> addEventListener("load", function() { setTimeout(hideURLbar, 0); }, false); function hideURLbar(){ window.scrollTo(0,1); } </script>
-
-<!-- Bootstrap Core CSS -->
-<link href="css/bootstrap.css" rel='stylesheet' type='text/css' />
-
-<!-- Custom CSS -->
-<link href="css/style.css" rel='stylesheet' type='text/css' />
-
-<!-- font-awesome icons CSS -->
-<link href="css/font-awesome.css" rel="stylesheet"> 
-<!-- //font-awesome icons CSS -->
-
- <!-- side nav css file -->
- <link href='css/SidebarNav.min.css' media='all' rel='stylesheet' type='text/css'/>
- <!-- side nav css file -->
- 
- <!-- js-->
-<script src="js/jquery-1.11.1.min.js"></script>
-<script src="js/modernizr.custom.js"></script>
-
-<!--webfonts-->
-<link href="//fonts.googleapis.com/css?family=PT+Sans:400,400i,700,700i&amp;subset=cyrillic,cyrillic-ext,latin-ext" rel="stylesheet">
-<!--//webfonts--> 
-
-<!-- Metis Menu -->
-<script src="js/metisMenu.min.js"></script>
-<script src="js/custom.js"></script>
-<link href="css/custom.css" rel="stylesheet">
-<!--//Metis Menu -->
-
-</head> 
-<body class="cbp-spmenu-push">
-	<div class="main-content">
-	<div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1">
-		<!--left-fixed -navigation-->
-		<aside class="sidebar-left">
-      <nav class="navbar navbar-inverse">
-          <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".collapse" aria-expanded="false">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            </button>
-            <h1><a class="navbar-brand" href="index.html"><span class="fa fa-area-chart"></span> Glance<span class="dashboard_text">Design dashboard</span></a></h1>
-          </div>
-          <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-            <ul class="sidebar-menu">
-              <li class="header">MAIN NAVIGATION</li>
-              <li class="treeview">
-                <a href="index.html">
-					<span class="glyphicon glyphicon-user"></span> <span>Employee</span>
-                </a>
-              </li>
-			  <li class="treeview">
-                <a href="#">
-                <i class="fa fa-laptop"></i>
-                <span>Components</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="grids.html"><i class="fa fa-angle-right"></i> Grids</a></li>
-                  <li><a href="media.html"><i class="fa fa-angle-right"></i> Media Css</a></li>
-                </ul>
-
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-laptop"></i>
-                <span>UI Elements</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="general.html"><i class="fa fa-angle-right"></i> General</a></li>
-                  <li><a href="icons.html"><i class="fa fa-angle-right"></i> Icons</a></li>
-                  <li><a href="buttons.html"><i class="fa fa-angle-right"></i> Buttons</a></li>
-                  <li><a href="typography.html"><i class="fa fa-angle-right"></i> Typography</a></li>
-                </ul>
-              </li>
-			  <li>
-                <a href="timesheet.html">
-                <i class="fa fa-th"></i> <span>TimeSheet</span>
-                <small class="label pull-right label-info">08</small>
-                </a>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-edit"></i> <span>Forms</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="forms.html"><i class="fa fa-angle-right"></i> General Forms</a></li>
-                  <li><a href="validation.html"><i class="fa fa-angle-right"></i> Form Validations</a></li>
-                </ul>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-table"></i> <span>Tables</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
-                </ul>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-envelope"></i> <span>Mailbox</span>
-                <i class="fa fa-angle-left pull-right"></i><small class="label pull-right label-info1">08</small><span class="label label-primary1 pull-right">02</span></a>
-                <ul class="treeview-menu">
-                  <li><a href="inbox.html"><i class="fa fa-angle-right"></i> Mail Inbox</a></li>
-                  <li><a href="compose.html"><i class="fa fa-angle-right"></i> Compose Mail </a></li>
-                </ul>
-              </li>
-              <li class="treeview">
-                <a href="#">
-                <i class="fa fa-folder"></i> <span>Examples</span>
-                <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                  <li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li>
-                  <li><a href="signup.html"><i class="fa fa-angle-right"></i> Register</a></li>
-                  <li><a href="404.html"><i class="fa fa-angle-right"></i> 404 Error</a></li>
-                  <li><a href="500.html"><i class="fa fa-angle-right"></i> 500 Error</a></li>
-                  <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
-                </ul>
-              </li>
-              <li class="header">LABELS</li>
-              <li><a href="#"><i class="fa fa-angle-right text-red"></i> <span>Important</span></a></li>
-              <li><a href="#"><i class="fa fa-angle-right text-yellow"></i> <span>Warning</span></a></li>
-              <li><a href="#"><i class="fa fa-angle-right text-aqua"></i> <span>Information</span></a></li>
-            </ul>
-          </div>
-          <!-- /.navbar-collapse -->
-      </nav>
-    </aside>
-	</div>
-		<!--left-fixed -navigation-->
-		
-		<!-- header-starts -->
-		<div class="sticky-header header-section ">
-			<div class="header-left">
-				
-				<!--toggle button start-->
-				<button id="showLeftPush"><i class="fa fa-bars"></i></button>
-				<!--toggle button end-->
-				<div class="profile_details_left"><!--notifications of menu start -->
-					<ul class="nofitications-dropdown">
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-envelope"></i><span class="badge">4</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 3 new messages</h3>
-									</div>
-								</li>
-								<li><a href="#">
-								   <div class="user_img"><img src="images/1.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet</p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								</a></li>
-								<li class="odd"><a href="#">
-									<div class="user_img"><img src="images/4.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								  <div class="clearfix"></div>	
-								</a></li>
-								<li><a href="#">
-								   <div class="user_img"><img src="images/3.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								</a></li>
-								<li>
-									<div class="notification_bottom">
-										<a href="#">See all messages</a>
-									</div> 
-								</li>
-							</ul>
-						</li>
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-bell"></i><span class="badge blue">4</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 3 new notification</h3>
-									</div>
-								</li>
-								<li><a href="#">
-									<div class="user_img"><img src="images/4.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet</p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								  <div class="clearfix"></div>	
-								 </a></li>
-								 <li class="odd"><a href="#">
-									<div class="user_img"><img src="images/1.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								 </a></li>
-								 <li><a href="#">
-									<div class="user_img"><img src="images/3.jpg" alt=""></div>
-								   <div class="notification_desc">
-									<p>Lorem ipsum dolor amet </p>
-									<p><span>1 hour ago</span></p>
-									</div>
-								   <div class="clearfix"></div>	
-								 </a></li>
-								 <li>
-									<div class="notification_bottom">
-										<a href="#">See all notifications</a>
-									</div> 
-								</li>
-							</ul>
-						</li>	
-						<li class="dropdown head-dpdn">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-tasks"></i><span class="badge blue1">8</span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div class="notification_header">
-										<h3>You have 8 pending task</h3>
-									</div>
-								</li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Database update</span><span class="percentage">40%</span>
-										<div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										<div class="bar yellow" style="width:40%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Dashboard done</span><span class="percentage">90%</span>
-									   <div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										 <div class="bar green" style="width:90%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Mobile App</span><span class="percentage">33%</span>
-										<div class="clearfix"></div>	
-									</div>
-								   <div class="progress progress-striped active">
-										 <div class="bar red" style="width: 33%;"></div>
-									</div>
-								</a></li>
-								<li><a href="#">
-									<div class="task-info">
-										<span class="task-desc">Issues fixed</span><span class="percentage">80%</span>
-									   <div class="clearfix"></div>	
-									</div>
-									<div class="progress progress-striped active">
-										 <div class="bar  blue" style="width: 80%;"></div>
-									</div>
-								</a></li>
-								<li>
-									<div class="notification_bottom">
-										<a href="#">See all pending tasks</a>
-									</div> 
-								</li>
-							</ul>
-						</li>	
-					</ul>
-					<div class="clearfix"> </div>
-				</div>
-				<!--notification menu end -->
-				<div class="clearfix"> </div>
-			</div>
-			<div class="header-right">
-				
-				<!--search-box-->
-				<div class="search-box">
-					<form class="input">
-						<input class="sb-search-input input__field--madoka" placeholder="Search..." type="search" id="input-31" />
-						<label class="input__label" for="input-31">
-							<svg class="graphic" width="100%" height="100%" viewBox="0 0 404 77" preserveAspectRatio="none">
-								<path d="m0,0l404,0l0,77l-404,0l0,-77z"/>
-							</svg>
-						</label>
-					</form>
-				</div><!--//end-search-box-->
-				
-				<div class="profile_details">		
-					<ul>
-						<li class="dropdown profile_details_drop">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-								<div class="profile_img">	
-									<span class="prfil-img"><img src="images/2.jpg" alt=""> </span> 
-									<div class="user-name">
-										<p>Admin Name</p>
-										<span>Administrator</span>
-									</div>
-									<i class="fa fa-angle-down lnr"></i>
-									<i class="fa fa-angle-up lnr"></i>
-									<div class="clearfix"></div>	
-								</div>	
-							</a>
-							<ul class="dropdown-menu drp-mnu">
-								<li> <a href="#"><i class="fa fa-cog"></i> Settings</a> </li> 
-								<li> <a href="#"><i class="fa fa-user"></i> My Account</a> </li>
-								<li> <a href="#"><i class="fa fa-suitcase"></i> Profile</a> </li> 
-								<li> <a href="#"><i class="fa fa-sign-out"></i> Logout</a> </li>
-							</ul>
-						</li>
-					</ul>
-				</div>
-				<div class="clearfix"> </div>				
-			</div>
-			<div class="clearfix"> </div>	
-		</div>
-		<!-- //header-ends -->
-		<!-- main content start-->
-		<div id="page-wrapper">
-			<div class="main-page">
-			<div class="typography">
-				<h2 class="title1">Typography</h2>
-				<div class="grid_3 grid_4 widget-shadow">
-					<h3 class="hdg">Headings</h3>
-					<div class="bs-example">
-						<table class="table">
-							<tbody>
-								<tr>
-									<td><h1 id="h1.-bootstrap-heading">h1. Bootstrap heading<a class="anchorjs-link" href="#h1.-bootstrap-heading"><span class="anchorjs-icon"></span></a></h1></td>
-									<td class="type-info">Semibold 36px</td>
-								</tr>
-								<tr>
-									<td><h2 id="h2.-bootstrap-heading">h2. Bootstrap heading<a class="anchorjs-link" href="#h2.-bootstrap-heading"><span class="anchorjs-icon"></span></a></h2></td>
-									<td class="type-info">Semibold 30px</td>
-								</tr>
-								<tr>
-									<td><h3 id="h3.-bootstrap-heading">h3. Bootstrap heading<a class="anchorjs-link" href="#h3.-bootstrap-heading"><span class="anchorjs-icon"></span></a></h3></td>
-									<td class="type-info">Semibold 24px</td>
-								</tr>
-								<tr>
-									<td><h4 id="h4.-bootstrap-heading">h4. Bootstrap heading<a class="anchorjs-link" href="#h4.-bootstrap-heading"><span class="anchorjs-icon"></span></a></h4></td>
-									<td class="type-info">Semibold 18px</td>
-								</tr>
-								<tr>
-									<td><h5 id="h5.-bootstrap-heading">h5. Bootstrap heading<a class="anchorjs-link" href="#h5.-bootstrap-heading"><span class="anchorjs-icon"></span></a></h5></td>
-									<td class="type-info">Semibold 14px</td>
-								</tr>
-								<tr>
-									<td><h6>h6. Bootstrap heading</h6></td>
-									<td class="type-info">Semibold 12px</td>
-								</tr>
-							</tbody>
-						</table>
-					</div>
-				</div>
-				<div class="grid_3 grid_5 widget-shadow">
-					<h3 class="hdg" >Buttons</h3>
-					<h1>
-						<a href="#"><span class="label label-default">Default</span></a>
-						<a href="#"><span class="label label-primary">Primary</span></a>
-						<a href="#"><span class="label label-success">Success</span></a>
-						<a href="#"><span class="label label-info">Info</span></a>
-						<a href="#"><span class="label label-warning">Warning</span></a>
-						<a href="#"><span class="label label-danger">Danger</span></a>
-					</h1>
-					<h2>
-						<a href="#"><span class="label label-default">Default</span></a>
-						<a href="#"><span class="label label-primary">Primary</span></a>
-						<a href="#"><span class="label label-success">Success</span></a>
-						<a href="#"><span class="label label-info">Info</span></a>
-						<a href="#"><span class="label label-warning">Warning</span></a>
-						<a href="#"><span class="label label-danger">Danger</span></a>
-					</h2>
-					<h3>
-						<a href="#"><span class="label label-default">Default</span></a>
-						<a href="#"><span class="label label-primary">Primary</span></a>
-						<a href="#"><span class="label label-success">Success</span></a>
-						<a href="#"><span class="label label-info">Info</span></a>
-						<a href="#"><span class="label label-warning">Warning</span></a>
-						<a href="#"><span class="label label-danger">Danger</span></a>
-					</h3>
-					<h4>
-						<a href="#"><span class="label label-default">Default</span></a>
-						<a href="#"><span class="label label-primary">Primary</span></a>
-						<a href="#"><span class="label label-success">Success</span></a>
-						<a href="#"><span class="label label-info">Info</span></a>
-						<a href="#"><span class="label label-warning">Warning</span></a>
-						<a href="#"><span class="label label-danger">Danger</span></a>
-					</h4>
-					<h5>
-						<a href="#"><span class="label label-default">Default</span></a>
-						<a href="#"><span class="label label-primary">Primary</span></a>
-						<a href="#"><span class="label label-success">Success</span></a>
-						<a href="#"><span class="label label-info">Info</span></a>
-						<a href="#"><span class="label label-warning">Warning</span></a>
-						<a href="#"><span class="label label-danger">Danger</span></a>
-					</h5>
-					<h6>
-						<a href="#"><span class="label label-default">Default</span></a>
-						<a href="#"><span class="label label-primary">Primary</span></a>
-						<a href="#"><span class="label label-success">Success</span></a>
-						<a href="#"><span class="label label-info">Info</span></a>
-						<a href="#"><span class="label label-warning">Warning</span></a>
-						<a href="#"><span class="label label-danger">Danger</span></a>
-					</h6>
-				</div>			   
-				<div class="grid_3 grid_5 widget-shadow">
-					<h3 class="hdg" >Progress Bars</h3>
-					<div class="tab-content">
-						<div class="tab-pane active" id="domprogress">
-							<div class="progress">    
-								<div class="progress-bar progress-bar-primary" style="width: 20%"></div>
-							</div>
-							<p>Info with <code>progress-bar-info</code> class.</p>
-							<div class="progress">    
-								<div class="progress-bar progress-bar-info" style="width: 60%"></div>
-							</div>
-							<p>Success with <code>progress-bar-success</code> class.</p>
-							<div class="progress">
-								<div class="progress-bar progress-bar-success" style="width: 30%"></div>
-							</div>
-							<p>Warning with <code>progress-bar-warning</code> class.</p>
-							<div class="progress">
-								<div class="progress-bar progress-bar-warning" style="width: 70%"></div>
-							</div>
-							<p>Danger with <code>progress-bar-danger</code> class.</p>
-							<div class="progress">
-								<div class="progress-bar progress-bar-danger" style="width: 50%"></div>
-							</div>
-							<p>Inverse with <code>progress-bar-inverse</code> class.</p>
-							<div class="progress">
-								<div class="progress-bar progress-bar-inverse" style="width: 40%"></div>
-							</div>
-							<p>Inverse with <code>progress-bar-inverse</code> class.</p>
-							<div class="progress">
-								<div class="progress-bar progress-bar-success" style="width: 35%"><span class="sr-only">35% Complete (success)</span></div>
-								<div class="progress-bar progress-bar-warning" style="width: 20%"><span class="sr-only">20% Complete (warning)</span></div>
-								<div class="progress-bar progress-bar-danger" style="width: 10%"><span class="sr-only">10% Complete (danger)</span></div>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="grid_3 grid_5 widget-shadow">
-					<h3 class="hdg">Alerts</h3>
-					<div class="alert alert-success" role="alert">
-						<strong>Well done!</strong> You successfully read this important alert message.
-					</div>
-					<div class="alert alert-info" role="alert">
-						<strong>Heads up!</strong> This alert needs your attention, but it's not super important.
-					</div>
-					<div class="alert alert-warning" role="alert">
-						<strong>Warning!</strong> Best check yo self, you're not looking too good.
-					</div>
-					<div class="alert alert-danger" role="alert">
-						<strong>Oh snap!</strong> Change a few things up and try submitting again.
-					</div>
-				</div>
-				<div class="grid_3 grid_5 widget-shadow">
-					<h3 class="hdg">Pagination</h3>
-					<div class="col-md-6">
-						<nav>
-							<ul class="pagination pagination-lg">
-								<li><a href="#" aria-label="Previous"><span aria-hidden="true">«</span></a></li>
-								<li><a href="#">1</a></li>
-								<li><a href="#">2</a></li>
-								<li><a href="#">3</a></li>
-								<li><a href="#">4</a></li>
-								<li><a href="#">5</a></li>
-								<li><a href="#" aria-label="Next"><span aria-hidden="true">»</span></a></li>
-							</ul>
-						</nav>
-						<nav>
-							<ul class="pagination">
-								<li><a href="#" aria-label="Previous"><span aria-hidden="true">«</span></a></li>
-								<li><a href="#">1</a></li>
-								<li><a href="#">2</a></li>
-								<li><a href="#">3</a></li>
-								<li><a href="#">4</a></li>
-								<li><a href="#">5</a></li>
-								<li><a href="#" aria-label="Next"><span aria-hidden="true">»</span></a></li>
-							</ul>
-						</nav>
-						<nav>
-							<ul class="pagination pagination-sm">
-								<li><a href="#" aria-label="Previous"><span aria-hidden="true">«</span></a></li>
-								<li><a href="#">1</a></li>
-								<li><a href="#">2</a></li>
-								<li><a href="#">3</a></li>
-								<li><a href="#">4</a></li>
-								<li><a href="#">5</a></li>
-								<li><a href="#" aria-label="Next"><span aria-hidden="true">»</span></a></li>
-							</ul>
-						</nav>
-					</div>
-					<div class="col-md-6">
-						<ul class="pagination pagination-lg">
-							<li class="disabled"><a href="#">«</a></li>
-							<li class="active"><a href="#">1</a></li>
-							<li><a href="#">2</a></li>
-							<li><a href="#">3</a></li>
-							<li><a href="#">4</a></li>
-							<li><a href="#">5</a></li>
-							<li><a href="#">»</a></li>
-						</ul>
-						<nav>
-							<ul class="pagination">
-								<li class="disabled"><a href="#" aria-label="Previous"><span aria-hidden="true">«</span></a></li>
-								<li class="active"><a href="#">1 <span class="sr-only">(current)</span></a></li>
-								<li><a href="#">2</a></li>
-								<li><a href="#">3</a></li>
-								<li><a href="#">4</a></li>
-								<li><a href="#">5</a></li>
-								<li><a href="#" aria-label="Next"><span aria-hidden="true">»</span></a></li>
-							</ul>
-						</nav>
-						<ul class="pagination pagination-sm">
-							<li class="disabled"><a href="#">«</a></li>
-							<li class="active"><a href="#">1</a></li>
-							<li><a href="#">2</a></li>
-							<li><a href="#">3</a></li>
-							<li><a href="#">4</a></li>
-							<li><a href="#">5</a></li>
-							<li><a href="#">»</a></li>
-						</ul>
-					</div>
-					<div class="clearfix"> </div>
-				</div>
-				<div class="grid_3 grid_5 widget-shadow">
-					<h3 class="hdg">Breadcrumbs</h3>
-					<ol class="breadcrumb">
-						<li class="active">Home</li>
-					</ol>
-					<ol class="breadcrumb">
-						<li><a href="#">Home</a></li>
-						<li class="active">Library</li>
-					</ol>
-					<ol class="breadcrumb">
-						<li><a href="#">Home</a></li>
-						<li><a href="#">Library</a></li>
-						<li class="active">Data</li>
-					</ol>
-				</div>
-				<div class="grid_3 grid_5 widget-shadow">
-					<h3 class="hdg">Badges</h3>
-					<div class="col-md-6">
-						<p>Add modifier classes to change the appearance of a badge.</p>
-						<table class="table table-bordered">
-							<thead>
-								<tr>
-									<th>Classes</th>
-									<th>Badges</th>
-								</tr>
-							</thead>
-							<tbody>
-								<tr>
-									<td>No modifiers</td>
-									<td><span class="badge">42</span></td>
-								</tr>
-								<tr>
-									<td><code>.badge-primary</code></td>
-									<td><span class="badge badge-primary">1</span></td>
-								</tr>
-								<tr>
-									<td><code>.badge-success</code></td>
-									<td><span class="badge badge-success">22</span></td>
-								</tr>
-								<tr>
-									<td><code>.badge-info</code></td>
-									<td><span class="badge badge-info">30</span></td>
-								</tr>
-								<tr>
-									<td><code>.badge-warning</code></td>
-									<td><span class="badge badge-warning">412</span></td>
-								</tr>
-								<tr>
-									<td><code>.badge-danger</code></td>
-									<td><span class="badge badge-danger">999</span></td>
-								</tr>
-							</tbody>
-						</table>                    
-					</div>
-					<div class="col-md-6">
-						<p>Easily highlight new or unread items with the <code>.badge</code> class</p>
-						<div class="list-group list-group-alternate"> 
-							<a href="#" class="list-group-item"><span class="badge">201</span> <i class="ti ti-email"></i> Inbox </a> 
-							<a href="#" class="list-group-item"><span class="badge badge-primary">5021</span> <i class="ti ti-eye"></i> Profile visits </a> 
-							<a href="#" class="list-group-item"><span class="badge">14</span> <i class="ti ti-headphone-alt"></i> Call </a> 
-							<a href="#" class="list-group-item"><span class="badge">20</span> <i class="ti ti-comments"></i> Messages </a> 
-							<a href="#" class="list-group-item"><span class="badge badge-warning">14</span> <i class="ti ti-bookmark"></i> Bookmarks </a> 
-							<a href="#" class="list-group-item"><span class="badge badge-danger">30</span> <i class="ti ti-bell"></i> Notifications </a> 
-						</div>
-					</div>
-				   <div class="clearfix"> </div>
-				</div>	 
-				<div class="grid_3 grid_5 widget-shadow">
-					<h3 class="hdg">Wells</h3>
-					<div class="well">
-						There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration
-					</div>
-					<div class="well">
-						It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here
-					</div>
-					<div class="well">
-							Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic
-					</div>
-				</div>
-			</div>
-			</div>
-		</div>
-		<!--footer-->
-		<div class="footer">
-		   <p>&copy; 2018 Glance Design Dashboard. All Rights Reserved | Design by <a href="https://w3layouts.com/" target="_blank">w3layouts</a></p>
-	   </div>
-        <!--//footer-->
-	</div>
-	
-	<!-- side nav js -->
-	<script src='js/SidebarNav.min.js' type='text/javascript'></script>
-	<script>
-      $('.sidebar-menu').SidebarNav()
-    </script>
-	<!-- //side nav js -->
-	
-	<!-- Classie --><!-- for toggle left push menu script -->
-		<script src="js/classie.js"></script>
-		<script>
-			var menuLeft = document.getElementById( 'cbp-spmenu-s1' ),
-				showLeftPush = document.getElementById( 'showLeftPush' ),
-				body = document.body;
-				
-			showLeftPush.onclick = function() {
-				classie.toggle( this, 'active' );
-				classie.toggle( body, 'cbp-spmenu-push-toright' );
-				classie.toggle( menuLeft, 'cbp-spmenu-open' );
-				disableOther( 'showLeftPush' );
-			};
-			
-			function disableOther( button ) {
-				if( button !== 'showLeftPush' ) {
-					classie.toggle( showLeftPush, 'disabled' );
-				}
-			}
-		</script>
-	<!-- //Classie --><!-- //for toggle left push menu script -->
-	
-	<!--scrolling js-->
-	<script src="js/jquery.nicescroll.js"></script>
-	<script src="js/scripts.js"></script>
-	<!--//scrolling js-->
-	
-	<!-- Bootstrap Core JavaScript -->
-	<script src="js/bootstrap.js"> </script>
-	
-</body>
-</html>
\ No newline at end of file