no message

pom.xml

@@ -55,47 +55,12 @@
             <artifactId>log4j</artifactId>
             <version>1.2.17</version>
         </dependency>
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
->>>>>>> ed09ed47f5d092a7753469913def1ab676073023
-=======
-=======
->>>>>>> fcb3554c9480d927d3ff072584217224ddd37db6
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.security</groupId>-->
-<!--            <artifactId>spring-security-config</artifactId>-->
-<!--            <version>${spring-security.version}</version>-->
-<!--            <scope>runtime</scope>-->
-<!--        </dependency>-->
-
-<<<<<<< HEAD
->>>>>>> 049511c3b37f668c637022150c53bd25d9b8e61d
-=======
->>>>>>> fcb3554c9480d927d3ff072584217224ddd37db6
-=======
         <!-- https://mvnrepository.com/artifact/com.zaxxer/HikariCP -->
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
             <version>3.2.0</version>
         </dependency>
-
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-security</artifactId>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>io.jsonwebtoken</groupId>-->
-<!--            <artifactId>jjwt</artifactId>-->
-<!--            <version>0.9.1</version>-->
-<!--        </dependency>-->
->>>>>>> 592a9cde2e9976aeb47352e092e8505023fae2e2
->>>>>>> master
     </dependencies>
 
     <build>

src/main/java/com/itsol/quantrivanphong/QuantrivanphongApplication.java

@@ -13,12 +13,8 @@ public class QuantrivanphongApplication {
     public static void main(String[] args) {
         SpringApplication.run(QuantrivanphongApplication.class, args);
     }
-<<<<<<< HEAD
     @Bean
     public ShallowEtagHeaderFilter shallowEtagHeaderFilter() {
         return new ShallowEtagHeaderFilter();
     }
-
-=======
->>>>>>> 592a9cde2e9976aeb47352e092e8505023fae2e2
 }

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/resources/application.properties

-<<<<<<< HEAD
 #server.port=8081
-=======
-server.port=8081
-<<<<<<< HEAD
->>>>>>> master
 # ===============================
 # DATABASE CONNECTION
 # ===============================
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-<<<<<<< HEAD
-spring.datasource.url=jdbc:mysql://localhost:3306/quantrivanphong
-=======
-spring.datasource.url=jdbc:mysql://localhost:3308/quantrivanphong
-=======
-
 spring.datasource.driver-class-name= com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://localhost:3306/qtvp_01
->>>>>>> 592a9cde2e9976aeb47352e092e8505023fae2e2
->>>>>>> master
+spring.datasource.url=jdbc:mysql://localhost:3306/quantrivanphong
 spring.datasource.username=root
 spring.datasource.password=ahihi123
 
@@ -27,19 +13,10 @@ spring.datasource.password=ahihi123
 # ===============================
 spring.jpa.show-sql=true
 spring.jpa.hibernate.ddl-auto=update
-<<<<<<< HEAD
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL57Dialect
-=======
-<<<<<<< HEAD
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
->>>>>>> master
 #spring.jpa.properties.hibernate.default_schema=qlns_itsol
-
-=======
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL57Dialect
 spring.jpa.properties.hibernate.current_session_context_class=org.springframework.orm.hibernate5.SpringSessionContext
 server.servlet.session.timeout=30s
->>>>>>> 592a9cde2e9976aeb47352e092e8505023fae2e2
 
 # ===============================
 # SEND EMAIL

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

-/**
- *
- */
-<<<<<<< HEAD
-angular.module("myApp", ["ngAnimate", "ui.router", "ui.bootstrap"]).config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-// angular.module("myApp", ["ui.router", 'ngRoute']).config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
-=======
-angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
->>>>>>> 14cbe76ccc34395abe463875cb178d2c872e3f85
-=======
-angular.module("myApp", ["ngAnimate", "ui.router", "ui.bootstrap"]).config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
->>>>>>> 049511c3b37f668c637022150c53bd25d9b8e61d
-=======
-angular.module("myApp", ["ui.router","ui.bootstrap"]).config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
->>>>>>> 592a9cde2e9976aeb47352e092e8505023fae2e2
-
->>>>>>> master
-    $locationProvider.hashPrefix('');
-    //trở về trang mặc định
-<<<<<<< HEAD
-    $urlRouterProvider.otherwise("/leaveform");
-=======
-    $urlRouterProvider.otherwise("/admin-home");
->>>>>>> master
-
-    $stateProvider
-        .state("layout2", {
-            abstract: true,
-            views: {
-                "layout": {
-                    templateUrl: "layout/layout2.html"
-                }
-            }
-        })
-<<<<<<< HEAD
-        .state("admin", {
-<<<<<<< HEAD
-            parent: 'layout2',
-            url: "/admin",
-=======
-=======
-        .state("layout4", {
-            abstract: true,
-            views: {
-                "layout": {
-                    templateUrl: "layout/layout4.html"
-                }
-            }
-        })
-        .state("admin-home", {
->>>>>>> 592a9cde2e9976aeb47352e092e8505023fae2e2
-            parent: 'layout3',
-            url: "/admin-home",
->>>>>>> master
-            views: {
-                "content": {
-                    templateUrl: "pages/adminhome/admin-home.html",
-<<<<<<< HEAD
-                    controller: "adminController"
-=======
->>>>>>> 592a9cde2e9976aeb47352e092e8505023fae2e2
-                }
-            }
-        })
-        .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("news", {
-            parent: 'layout2',
-            url: "/news",
-            views: {
-                "content": {
-                    templateUrl: "pages/homepage/homepage.html",
-                    controller: "homeController"
-                }
-            }
-        })
-        .state("newsDetail",{
-            parent:'layout2',
-            url:"/news/:Id1",
-            views:{
-                "content":{
-                    templateUrl: "pages/homepage/newsDetail.html",
-                    controller: "homeController"
-                }
-            }
-        })
-        .state("NewsByCatalogi",{
-            parent:'layout2',
-            url:"/news/catagori/:catagoriId",
-            views:{
-                "content":{
-                    templateUrl: "pages/homepage/newsDetailByCatalogi.html",
-                    controller: "homeController"
-                }
-            }
-        })
-        .state("CatagoriManagement",{
-            parent:'layout2',
-            url:"/management/catagori",
-            views:{
-                "content":{
-                    templateUrl: "pages/homepage/catagoriManagements.html",
-                    controller: "homeController"
-                }
-            }
-        })
-        .state("newsManagement",{
-            parent:'layout2',
-            url:"/management/catagori/:myCatagoriId",
-            views:{
-                "content":{
-                    templateUrl: "pages/homepage/newsManagements.html",
-                    controller: "homeController"
-
-                }
-            }
-        })
-        .state("employees", {
-            parent: 'layout2',
-            url: "/employees",
-            views: {
-                "content": {
-                    templateUrl: "pages/employee/employee.html",
-                    controller: "employeeController"
-                }
-            }
-        })
-<<<<<<< HEAD
-        .state("createEmployee", {
-            parent: 'layout2',
-            url: "/createEmployee",
-            params: {
-                emp: null
-            },
-            views: {
-                "content": {
-                    templateUrl: "pages/employee/createEmployee.html",
-                    controller: "createEmployeeController"
-                }
-            }
-        })
-<<<<<<< HEAD
-        .state("timeSheet", {
-            parent: 'layout2',
-            url: "/timesheet",
-=======
-<<<<<<< HEAD
-        .state("leaveFormDetail", {
-=======
-        //danh sách các dự án
-        .state("project", {
+.state("project", {
             parent: 'layout3',
             url: "/project",
             views: {
@@ -192,55 +10,7 @@ angular.module("myApp", ["ui.router","ui.bootstrap"]).config(function ($statePro
         })
         //thêm mới dự án
         .state("addproject", {
->>>>>>> 592a9cde2e9976aeb47352e092e8505023fae2e2
-            parent: 'layout3',
-            url: "/leaveformdetail/:id",
->>>>>>> master
-            views: {
-                "content": {
-                    templateUrl: "pages/timesheet/timeSheet.html",
-                    controller: "timeSheetController"
-                }
-            }
-        })
-        .state("timeSheetDetail", {
-            parent: 'layout2',
-            url: "/timesheetdetail/:id",
-            views: {
-                "content": {
-                    templateUrl: "pages/timesheet/timeSheetDetail.html",
-                    controller: "timeSheetDetailController"
-                }
-            }
-        })
-        .state("leaveForm", {
-            parent: 'layout2',
-            url: "/leaveform",
-            views: {
-                "content": {
-                    templateUrl: "pages/leaveform/leaveForm.html",
-                    controller: "leaveFormController"
-                }
-            }
-        })
-        .state("leaveFormDetail", {
-            parent: 'layout2',
-            url: "/leaveformdetail/:id",
-            views: {
-                "content": {
-                    templateUrl: "pages/leaveform/leaveFormDetail.html",
-                    controller: "leaveFormDetailController"
-                }
-            }
-        })
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-
-=======
         //sửa thông tin dự án
->>>>>>> 592a9cde2e9976aeb47352e092e8505023fae2e2
->>>>>>> master
         .state("editproject", {
             parent: 'layout2',
             url: "/editproject/:ID",
@@ -321,72 +91,6 @@ angular.module("myApp", ["ui.router","ui.bootstrap"]).config(function ($statePro
             }
         })
 });
-=======
->>>>>>> master
-
-
-        // .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",
-            views: {
-                "content": {
-                    templateUrl: "pages/leaveform/leaveForm.html",
-                    controller: "leaveFormController"
-                }
-            }
-        })
-
-        .state("leaveFormDetail", {
-            parent: 'layout1',
-            url: "/leaveformdetail/:id",
-            views: {
-                "content": {
-                    templateUrl: "pages/leaveform/leaveFormDetail.html",
-                    controller: "leaveFormDetailController"
-                }
-            }
-        })
-        .state("timesheet",{
-            parent:'layout1',
-            url:"/timesheet",
-            views:{
-                "content":{
-                    templateUrl:"pages/timesheet/timesheet.html",
-                    controller:"timeSheetController"
-                }
-            }
-        })
-        .state("timesheetDetail",{
-            parent:'layout1',
-            url:"/timesheetDetail/:id",
-            views:{
-                "content":{
-                    templateUrl:"page/timesheet/timeSheetDetail.html",
-                    controller:"timeSheetDetailController"
-                }
-            }
-
-        })
         .state("project", {
             parent: 'layout1',
             url: "/project",