Skip to content

Q
QLNS_N01
Commit ee2fc955 authored by Phạm Duy Phi's avatar Phạm Duy Phi
Browse files
Options

no message

parent cbdc67ce
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 104 deletions
src/main/resources/public/index.html
View file @ ee2fc955
<!doctype html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<<<<<<< HEAD
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<title>News</title> <title>News</title>
<link href="common/css/all.min.css" rel="stylesheet" <link href="common/css/all.min.css" rel="stylesheet"
...@@ -44,12 +41,8 @@ ...@@ -44,12 +41,8 @@
<script src="js/angular-resource.js"></script> <script src="js/angular-resource.js"></script>
<script data-require="angular-ui-bootstrap@0.3.0" data-semver="0.3.0" src="js/ui-bootstrap-tpls-0.3.0.min.js"></script> <script data-require="angular-ui-bootstrap@0.3.0" data-semver="0.3.0" src="js/ui-bootstrap-tpls-0.3.0.min.js"></script>
=======
<meta name="viewport" <meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<!-- <meta http-equiv="X-UA-Compatible" content="ie=edge">-->
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Document</title> <title>Document</title>
<link href="css/bootstrap.css" rel='stylesheet' type='text/css'/> <link href="css/bootstrap.css" rel='stylesheet' type='text/css'/>
...@@ -60,10 +53,7 @@ ...@@ -60,10 +53,7 @@
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"> <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
<!-- Custom Theme files --> <!-- Custom Theme files -->
<!-- <link href="https://fonts.googleapis.com/css?family=Roboto+Condensed:400,700" rel='stylesheet' type='text/css'>-->
<!-- <link href="https://fonts.googleapis.com/css?family=Open+Sans" type='text/css'>-->
<link href="css/style.css" rel='stylesheet' type='text/css'/> <link href="css/style.css" rel='stylesheet' type='text/css'/>
<!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">-->
<link data-require="bootstrap-css@*" data-semver="4.3.1" rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" /> <link data-require="bootstrap-css@*" data-semver="4.3.1" rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" />
<script src="js/jquery-3.2.1.min.js"></script> <script src="js/jquery-3.2.1.min.js"></script>
...@@ -95,7 +85,6 @@ ...@@ -95,7 +85,6 @@
<script src="pages/leaveform/leaveFormController.js"></script> <script src="pages/leaveform/leaveFormController.js"></script>
<script src="pages/leaveform/leaveFormDetailController.js"></script> <script src="pages/leaveform/leaveFormDetailController.js"></script>
<script src="pages/timesheet/timeSheetDetailController.js"></script> <script src="pages/timesheet/timeSheetDetailController.js"></script>
<!-- <script src="js/angular-resource.js"></script>-->
<script> <script>
function showAddTimeSheetFunction() { function showAddTimeSheetFunction() {
const x = document.getElementById("addDivTS"); const x = document.getElementById("addDivTS");
...@@ -141,7 +130,6 @@ ...@@ -141,7 +130,6 @@
<!-- Core plugin JavaScript--> <!-- Core plugin JavaScript-->
<script src="common/js/jquery.easing.min.js"></script> <script src="common/js/jquery.easing.min.js"></script>
>>>>>>> ed09ed47f5d092a7753469913def1ab676073023
<!-- Page level plugin JavaScript--> <!-- Page level plugin JavaScript-->
<script src="common/js/Chart.min.js"></script> <script src="common/js/Chart.min.js"></script>
...@@ -155,13 +143,12 @@ ...@@ -155,13 +143,12 @@
<body ng-app="myApp"> <body ng-app="myApp">
<div ui-view="layout"> <div ui-view="layout">
<<<<<<< HEAD
<script src="js/main.js"></script> <script src="js/main.js"></script>
<script src="js/app.js"></script> <script src="js/app.js"></script>
<script src="pages/employee/employeeController.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/homepage/homeController.js"></script> <script src="pages/homepage/homeController.js"></script>
<script src="pages/homepage/HomeService.js"></script> <script src="pages/homepage/HomeService.js"></script>
...@@ -176,15 +163,6 @@ ...@@ -176,15 +163,6 @@
<!-- Custom scripts for all pages--> <!-- Custom scripts for all pages-->
<script src="common/js/sb-admin.min.js"></script> <script src="common/js/sb-admin.min.js"></script>
</div>
=======
<!-- <div style="margin-left:5px;margin-top:10px" ng-controller="timeSheetController">-->
<!-- <span pgn-table="myTimeSheets"></span>-->
<!-- </div>-->
</div> </div>
>>>>>>> ed09ed47f5d092a7753469913def1ab676073023
</body> </body>
</html> </html>
\ No newline at end of file
src/main/resources/public/js/app.js
View file @ ee2fc955
<<<<<<< HEAD
=======
/** /**
* *
*/ */
angular.module("myApp", ["ui.router", 'ngRoute']).config(function ($stateProvider, $urlRouterProvider, $locationProvider) { // angular.module("myApp", ["ui.router", 'ngRoute']).config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
>>>>>>> ed09ed47f5d092a7753469913def1ab676073023
angular.module("myApp", ["ui.router","ngResource","ui.bootstrap"]).config(function ($stateProvider, $urlRouterProvider, $locationProvider) { angular.module("myApp", ["ui.router","ngResource","ui.bootstrap"]).config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
$locationProvider.hashPrefix(''); $locationProvider.hashPrefix('');
<<<<<<< HEAD // $urlRouterProvider.otherwise("/news");
$urlRouterProvider.otherwise("/news");
$stateProvider
.state("layout1", {
=======
//trở về trang mặc định //trở về trang mặc định
$urlRouterProvider.otherwise("/admin"); $urlRouterProvider.otherwise("/admin");
$stateProvider $stateProvider
.state("layout3", { .state("layout3", {
>>>>>>> ed09ed47f5d092a7753469913def1ab676073023
abstract: true, abstract: true,
views: { views: {
"layout": { "layout": {
...@@ -26,23 +18,10 @@ angular.module("myApp", ["ui.router","ngResource","ui.bootstrap"]).config(functi ...@@ -26,23 +18,10 @@ angular.module("myApp", ["ui.router","ngResource","ui.bootstrap"]).config(functi
} }
} }
}) })
// .state("layout4", {
// abstract: true,
// views: {
// "layout": {
// templateUrl: "layout/layout4.html"
// }
// }
// })
.state("admin", { .state("admin", {
parent: 'layout3', parent: 'layout3',
url: "/admin", url: "/admin",
views: { views: {
<<<<<<< HEAD
"layout": {
templateUrl: "layout/layout2.html",
controller: "homeController"
=======
"content": { "content": {
templateUrl: "pages/adminhome/admin-home.html", templateUrl: "pages/adminhome/admin-home.html",
controller: "adminController" controller: "adminController"
...@@ -76,7 +55,6 @@ angular.module("myApp", ["ui.router","ngResource","ui.bootstrap"]).config(functi ...@@ -76,7 +55,6 @@ angular.module("myApp", ["ui.router","ngResource","ui.bootstrap"]).config(functi
"content": { "content": {
templateUrl: "pages/login/forgot-password.html", templateUrl: "pages/login/forgot-password.html",
controller: "loginController" controller: "loginController"
>>>>>>> ed09ed47f5d092a7753469913def1ab676073023
} }
} }
}) })
...@@ -125,8 +103,6 @@ angular.module("myApp", ["ui.router","ngResource","ui.bootstrap"]).config(functi ...@@ -125,8 +103,6 @@ angular.module("myApp", ["ui.router","ngResource","ui.bootstrap"]).config(functi
"content":{ "content":{
templateUrl: "pages/homepage/catagoriManagements.html", templateUrl: "pages/homepage/catagoriManagements.html",
controller: "homeController" controller: "homeController"
<<<<<<< HEAD
} }
} }
}) })
...@@ -141,17 +117,6 @@ angular.module("myApp", ["ui.router","ngResource","ui.bootstrap"]).config(functi ...@@ -141,17 +117,6 @@ angular.module("myApp", ["ui.router","ngResource","ui.bootstrap"]).config(functi
} }
} }
}) })
=======
// .state('app', {
// abstract: true,
// views: {
// 'main_layout': {
// templateUrl: 'main_layout.html',
// }
// }
// })
>>>>>>> ed09ed47f5d092a7753469913def1ab676073023
.state("employees", { .state("employees", {
parent: 'layout3', parent: 'layout3',
url: "/employees", url: "/employees",
...@@ -212,11 +177,6 @@ angular.module("myApp", ["ui.router","ngResource","ui.bootstrap"]).config(functi ...@@ -212,11 +177,6 @@ angular.module("myApp", ["ui.router","ngResource","ui.bootstrap"]).config(functi
} }
} }
}) })
<<<<<<< HEAD
});
=======
.state("leaveFormDetail", { .state("leaveFormDetail", {
parent: 'layout3', parent: 'layout3',
url: "/leaveformdetail/:id", url: "/leaveformdetail/:id",
...@@ -227,17 +187,6 @@ angular.module("myApp", ["ui.router","ngResource","ui.bootstrap"]).config(functi ...@@ -227,17 +187,6 @@ angular.module("myApp", ["ui.router","ngResource","ui.bootstrap"]).config(functi
} }
} }
}) })
// .state("testlayout2", {
// parent: 'layout2',
// url: "/testttt",
// views: {
// "content": {
// templateUrl: "/pages/testlayout/testlayout.html",
// controller: "testlayoutController"
// }
// }
// })
.state("gioithieu", { .state("gioithieu", {
parent: 'app', parent: 'app',
url: "/gioithieu", url: "/gioithieu",
...@@ -279,31 +228,4 @@ angular.module("myApp", ["ui.router","ngResource","ui.bootstrap"]).config(functi ...@@ -279,31 +228,4 @@ angular.module("myApp", ["ui.router","ngResource","ui.bootstrap"]).config(functi
} }
} }
}) })
}); });
\ No newline at end of file
// .state("lienhe", {
// parent: 'app',
// url: "/lienhe",
// views:{
// "content":{
// templateUrl: "pages/lienhe/lienhe.htm",
// controller: "lienheController"
// }
// }
// })
// myApp.directive('ngConfirmClick', [ function() {
// return {
// link : function(scope, element, attr) {
// var msg = attr.ngConfirmClick || "Are you sure?";
// var clickAction = attr.confirmedClick;
// element.bind('click', function(event) {
// if (window.confirm(msg)) {
// scope.$eval(clickAction)
// }
// });
// }
// };
// } ])
>>>>>>> ed09ed47f5d092a7753469913def1ab676073023
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment