Commit fcb3554c authored by đinh thị đầm's avatar đinh thị đầm

Merge branch 'dinhdam'

# Conflicts:
#	pom.xml
#	src/main/resources/public/pages/homepage/catagoriManagements.html
#	src/main/resources/public/pages/homepage/homeController.js
#	src/main/resources/public/pages/homepage/homepage.html
#	src/main/resources/public/pages/homepage/newsManagements.html
#	src/main/resources/public/pages/leaveform/leaveForm.html
#	src/main/resources/public/pages/leaveform/leaveFormController.js
#	src/main/resources/public/pages/leaveform/leaveFormDetail.html
#	src/main/resources/public/pages/leaveform/leaveFormDetailController.js
#	src/main/resources/public/pages/project/groupproject/groupProjectAddView.html
#	src/main/resources/public/pages/project/groupproject/groupProjectController.js
#	src/main/resources/public/pages/project/groupproject/groupProjectEditView.html
#	src/main/resources/public/pages/project/groupproject/groupProjectView.html
#	src/main/resources/public/pages/project/project/projectAddViews.html
#	src/main/resources/public/pages/project/project/projectController.js
#	src/main/resources/public/pages/project/project/projectEditViews.html
#	src/main/resources/public/pages/project/project/projectListViews.html
#	src/main/resources/public/pages/timesheet/timeSheetController.js
#	src/main/resources/public/pages/timesheet/timeSheetDetailController.js
#	src/main/resources/public/pages/timesheet/timesheet.html
parents 14cbe76c fcb6432d
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
<description>Quản trị văn phòng sử dụng springboot API</description> <description>Quản trị văn phòng sử dụng springboot API</description>
<properties> <properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -25,48 +25,44 @@ ...@@ -25,48 +25,44 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId> <artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency> </dependency>
<<<<<<< HEAD
=======
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId> <artifactId>spring-boot-starter-mail</artifactId>
</dependency> </dependency>
>>>>>>> ed09ed47f5d092a7753469913def1ab676073023
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>8.0.16</version> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>log4j</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<version>1.2.17</version> <scope>test</scope>
</dependency> </dependency>
<<<<<<< HEAD
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<version>1.2.12</version> <version>1.2.17</version>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.security</groupId>-->
<!-- <artifactId>spring-security-config</artifactId>-->
<!-- <version>${spring-security.version}</version>-->
<!-- <scope>runtime</scope>-->
<!-- </dependency>-->
=======
>>>>>>> ed09ed47f5d092a7753469913def1ab676073023
</dependencies> </dependencies>
<build> <build>
......
...@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
<span>Components</span> <span>Project</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
...@@ -91,7 +91,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -91,7 +91,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>Widgets</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
......
...@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
<span>Components</span> <span>Project</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>Timesheet</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
</li> </li>
......
...@@ -43,7 +43,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -43,7 +43,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!--//Metis Menu --> <!--//Metis Menu -->
</head> </head>
<body class="cbp-spmenu-push"> <body class="cbp-spmenu-push" ng-app="myApp">
<div class="main-content"> <div class="main-content">
<div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1"> <div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1">
<!--left-fixed -navigation--> <!--left-fixed -navigation-->
...@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
<span>Components</span> <span>Project</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
...@@ -91,7 +91,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -91,7 +91,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>Widgets</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
...@@ -111,9 +111,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -111,9 +111,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<i class="fa fa-table"></i> <span>Tables</span> <i class="fa fa-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li> </li>
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
...@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li> <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="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> <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul> </ul>
</li> </li>
...@@ -340,7 +337,9 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -340,7 +337,9 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!-- main content start--> <!-- main content start-->
<div id="page-wrapper"> <div id="page-wrapper">
<div class="main-page compose"> <div class="main-page compose">
<h2 class="title1">Compose Mail Page</h2> <div ui-view="content">
<!-- Content222-->
</div>
<div class="col-md-4 compose-left"> <div class="col-md-4 compose-left">
<div class="folder widget-shadow"> <div class="folder widget-shadow">
<ul> <ul>
...@@ -435,20 +434,15 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -435,20 +434,15 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</div> </div>
</div> </div>
<!--footer--> <!--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--> <!--//footer-->
</div> </div>
<!-- side nav js -->
<script src='js/SidebarNav.min.js' type='text/javascript'></script> <script src='js/SidebarNav.min.js' type='text/javascript'></script>
<script> <script>
$('.sidebar-menu').SidebarNav() $('.sidebar-menu').SidebarNav()
</script> </script>
<!-- //side nav js -->
<!-- Classie --><!-- for toggle left push menu script -->
<script src="js/classie.js"></script> <script src="js/classie.js"></script>
<script> <script>
var menuLeft = document.getElementById( 'cbp-spmenu-s1' ), var menuLeft = document.getElementById( 'cbp-spmenu-s1' ),
...@@ -468,14 +462,9 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -468,14 +462,9 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
} }
} }
</script> </script>
<!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script> <script src="js/scripts.js"></script>
<!--//scrolling js-->
<!-- Bootstrap Core JavaScript -->
<script src="js/bootstrap.js"> </script> <script src="js/bootstrap.js"> </script>
</body> </body>
......
...@@ -70,6 +70,7 @@ span.dashboard_text { ...@@ -70,6 +70,7 @@ span.dashboard_text {
left:0px; left:0px;
width: 100%; width: 100%;
z-index: 100; z-index: 100;
height: 65px;
} }
.header-section { .header-section {
background:#FFF; background:#FFF;
...@@ -835,7 +836,7 @@ ul.dropdown-menu { ...@@ -835,7 +836,7 @@ ul.dropdown-menu {
.profile_details ul li{ .profile_details ul li{
list-style-type:none; list-style-type:none;
position:relative; position:relative;
margin-right: 30px;
} }
.profile_details li a i.fa.lnr { .profile_details li a i.fa.lnr {
position: absolute; position: absolute;
...@@ -8565,4 +8566,29 @@ tr:nth-child(n+3) td:nth-child(odd):not(:first-child){ ...@@ -8565,4 +8566,29 @@ tr:nth-child(n+3) td:nth-child(odd):not(:first-child){
font-family: sans-serif; font-family: sans-serif;
font-size: 16px; font-size: 16px;
text-align: center; text-align: center;
}
.topnav .search-container {
float: right;
}
.topnav input[type=text] {
padding: 6px;
margin-top: 8px;
font-size: 17px;
border: none;
}
.topnav .search-container button {
float: right;
padding: 6px 10px;
margin-top: 8px;
margin-right: 16px;
background: #ddd;
font-size: 17px;
border: none;
cursor: pointer;
}
.topnav .search-container button:hover {
background: #ccc;
} }
\ No newline at end of file
...@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
<span>Components</span> <span>Project</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>Timesheet</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
</li> </li>
...@@ -111,9 +111,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -111,9 +111,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<i class="fa fa-table"></i> <span>Tables</span> <i class="fa fa-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li> </li>
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
...@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li> <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="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> <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul> </ul>
</li> </li>
...@@ -681,7 +678,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -681,7 +678,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!-- //Classie --><!-- //for toggle left push menu script --> <!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js--> <!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script> <script src="js/scripts.js"></script>
<!--//scrolling js--> <!--//scrolling js-->
......
...@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
<span>Components</span> <span>Project</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
...@@ -91,7 +91,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -91,7 +91,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>Widgets</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
...@@ -111,9 +111,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -111,9 +111,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<i class="fa fa-table"></i> <span>Tables</span> <i class="fa fa-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li> </li>
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
...@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li> <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="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> <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul> </ul>
</li> </li>
...@@ -452,7 +449,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -452,7 +449,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="index.html">Project Name</a> <a class="navbar-brand" href="index.html">Project Name</a>
</div> </div>
<div class="collapse navbar-collapse bs-example-js-navbar-scrollspy"> <div class="collapse navbar-collapse bs-example-js-navbar-scrollspy">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
...@@ -633,7 +630,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -633,7 +630,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!-- //Classie --><!-- //for toggle left push menu script --> <!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js--> <!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script> <script src="js/scripts.js"></script>
<!--//scrolling js--> <!--//scrolling js-->
......
...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>Timesheet</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
</li> </li>
......
...@@ -43,7 +43,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -43,7 +43,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!--//Metis Menu --> <!--//Metis Menu -->
</head> </head>
<body class="cbp-spmenu-push"> <body class="cbp-spmenu-push" ng-app="myApp">
<div class="main-content"> <div class="main-content">
<div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1"> <div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1">
<!--left-fixed -navigation--> <!--left-fixed -navigation-->
...@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
<span>Components</span> <span>Project</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
...@@ -91,7 +91,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -91,7 +91,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>Widgets</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
......
...@@ -111,9 +111,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -111,9 +111,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<i class="fa fa-table"></i> <span>Tables</span> <i class="fa fa-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li> </li>
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
...@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li> <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="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> <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul> </ul>
</li> </li>
...@@ -1293,7 +1290,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -1293,7 +1290,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!-- //Classie --><!-- //for toggle left push menu script --> <!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js--> <!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script> <script src="js/scripts.js"></script>
<!--//scrolling js--> <!--//scrolling js-->
......
...@@ -38,13 +38,19 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -38,13 +38,19 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<script src="//angular-ui.github.io/bootstrap/ui-bootstrap-tpls-1.3.3.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="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/leaveform/leaveFormController.js"></script>
<script src="pages/homepage/homeController.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/employee/createEmployeeController.js"></script>
<link data-require="bootstrap-css@2.3.2" data-semver="2.3.2" rel="stylesheet" <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"/> href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css"/>
` `
<!-- end anguarjs app--> <!-- end anguarjs app-->
<link href="css/custom.css" rel="stylesheet"> <link href="css/custom.css" rel="stylesheet">
<!--//Metis Menu -->
<style> <style>
#chartdiv { #chartdiv {
width: 100%; width: 100%;
...@@ -103,542 +109,9 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -103,542 +109,9 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
}); });
}); });
</script> </script>
</head> </head>
<body class="cbp-spmenu-push" ng-app="myApp"> <body class="cbp-spmenu-push" ng-app="myApp">
<div class="main-content"> <div ui-view="layout"></div>
<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>
<li class="treeview">
<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-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>
</nav>
</aside>
</div>
<!-- header-starts -->
<div class="sticky-header header-section ">
<div class="header-left">
<button id="showLeftPush"><i class="fa fa-bars"></i></button>
<div class="profile_details_left">
<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><a href="#">
<div class="user_img"><img src="images/2.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><a href="#">
<div class="user_img"><img src="images/2.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>
</nav>
<!-- /.Navbar-->
<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 ui-view="content">
<!-- Content222-->
</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>
<!--//footer-->
<!-- new added graphs chart js-->
<script src="js/Chart.bundle.js"></script>
<script src="js/utils.js"></script>
<script>
var MONTHS = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
var color = Chart.helpers.color;
var barChartData = {
labels: ["January", "February", "March", "April", "May", "June", "July"],
datasets: [{
label: 'Dataset 1',
backgroundColor: color(window.chartColors.red).alpha(0.5).rgbString(),
borderColor: window.chartColors.red,
borderWidth: 1,
data: [
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor()
]
}, {
label: 'Dataset 2',
backgroundColor: color(window.chartColors.blue).alpha(0.5).rgbString(),
borderColor: window.chartColors.blue,
borderWidth: 1,
data: [
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor()
]
}]
};
$(function () {
window.onload = function () {
var ctx = document.getElementById("canvas")
if (ctx) {
ctx.getContext("2d");
window.myBar = new Chart(ctx, {
type: 'bar',
data: barChartData,
options: {
responsive: true,
legend: {
position: 'top'
},
title: {
display: true,
text: 'Chart.js Bar Chart'
}
}
});
}
}
});
var c = document.getElementById('randomizeData');
if (c) {
c.addEventListener('click', function () {
var zero = Math.random() < 0.2 ? true : false;
barChartData.datasets.forEach(function (dataset) {
dataset.data = dataset.data.map(function () {
return zero ? 0.0 : randomScalingFactor();
});
});
window.myBar.update();
});
}
var colorNames = Object.keys(window.chartColors);
var el = document.getElementById('addDataset');
if (el) {
addEventListener('click', function () {
var colorName = colorNames[barChartData.datasets.length % colorNames.length];
;
var dsColor = window.chartColors[colorName];
var newDataset = {
label: 'Dataset ' + barChartData.datasets.length,
backgroundColor: color(dsColor).alpha(0.5).rgbString(),
borderColor: dsColor,
borderWidth: 1,
data: []
};
for (var index = 0; index < barChartData.labels.length; ++index) {
newDataset.data.push(randomScalingFactor());
}
barChartData.datasets.push(newDataset);
window.myBar.update();
});
}
var els = document.getElementById('addData');
if (els) {
addEventListener('click', function () {
if (barChartData.datasets.length > 0) {
var month = MONTHS[barChartData.labels.length % MONTHS.length];
barChartData.labels.push(month);
for (var index = 0; index < barChartData.datasets.length; ++index) {
//window.myBar.addData(randomScalingFactor(), index);
barChartData.datasets[index].data.push(randomScalingFactor());
}
window.myBar.update();
}
});
}
var rs = document.getElementById('removeDataset');
if (rs) {
addEventListener('click', function () {
barChartData.datasets.splice(0, 1);
window.myBar.update();
});
}
var res = document.getElementById('removeData');
if (res) {
addEventListener('click', function () {
barChartData.labels.splice(-1, 1); // remove the label first
barChartData.datasets.forEach(function (dataset, datasetIndex) {
dataset.data.pop();
});
window.myBar.update();
});
}
</script>
<!-- new added graphs chart 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>
<script src="js/scripts.js"></script>
<script src="js/bootstrap.js"></script>
</footer>
</div>
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -6333,7 +6333,7 @@ defaults._set('bar', { ...@@ -6333,7 +6333,7 @@ defaults._set('bar', {
defaults._set('horizontalBar', { defaults._set('horizontalBar', {
hover: { hover: {
mode: 'index', mode: 'public.index',
axis: 'y' axis: 'y'
}, },
...@@ -6389,7 +6389,7 @@ defaults._set('horizontalBar', { ...@@ -6389,7 +6389,7 @@ defaults._set('horizontalBar', {
return datasetLabel + ': ' + item.xLabel; return datasetLabel + ': ' + item.xLabel;
} }
}, },
mode: 'index', mode: 'public.index',
axis: 'y' axis: 'y'
} }
}); });
......
/** /**
* *
*/ */
angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(function ($stateProvider, $urlRouterProvider, $locationProvider) { angular.module("myApp", ["ngAnimate", "ui.router", "ui.bootstrap"]).config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
$locationProvider.hashPrefix(''); $locationProvider.hashPrefix('');
$urlRouterProvider.otherwise("/employees"); $urlRouterProvider.otherwise("/employees");
$stateProvider $stateProvider
.state("layout1", {
abstract: true,
views: {
"layout": {
templateUrl: "layout/layout1.html"
}
}
})
.state("layout2", {
abstract: true,
views: {
"layout": {
templateUrl: "layout/layout2.html"
}
}
})
.state("employees", { .state("employees", {
parent: 'layout1',
url: "/employees", url: "/employees",
views: { views: {
"content": { "content": {
...@@ -19,6 +36,7 @@ angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(functio ...@@ -19,6 +36,7 @@ angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(functio
} }
}) })
.state("createEmployee", { .state("createEmployee", {
parent: 'layout1',
url: "/createEmployee", url: "/createEmployee",
params: { params: {
emp: null emp: null
...@@ -32,21 +50,101 @@ angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(functio ...@@ -32,21 +50,101 @@ angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(functio
}) })
// .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",
views: {
"content": {
templateUrl: "pages/project/project.html",
controller: "projectController"
}
}
})
.state("news",{
parent:'layout1',
url:"/news",
views:{
"content":{
templateUrl:"pages/homepage/catagoriManagements.html",
controller:"homeController"
}
}
})
}); });
angular angular
.module('myApp') .module('myApp')
.filter('lmto', lmto); .filter('lmto', lmto);
function lmto() { function lmto() {
return function(items,limit,offset){ return function (items, limit, offset) {
if(items.length > 0) { if (items.length > 0) {
return items.slice(offset, offset + limit); return items.slice(offset, offset + limit);
} else { } else {
return []; return [];
} }
}; };
} }
<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">
<i class="fa fa-users" aria-hidden="true"></i>
Human
<span
class="dashboard_text">Resource Management
</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 ui-sref="employees">
<i class="fa fa-user" aria-hidden="true"></i>
<span>Employee</span>
</a>
</li>
<li class="treeview">
<!-- <a ui-sref="project">-->
<i class="fa fa-laptop"></i>
<span>Project</span>
</li>
<li class="treeview">
<li class="treeview">
<a ui-sref="news">
<i class="fa fa-newspaper-o" aria-hidden="true"></i>
<span>News</span>
</a>
</li>
<li>
<a ui-sref="leaveform">
<i class="fa fa-file-text-o" aria-hidden="true"></i>
<span>Leave From</span>
</a>
<a href="/employee/leavefrom.html"></a>
</li>
<li class="treeview">
<a ui-sref="timesheet" >
<i class="fa fa-edit"></i>
<span>Timesheet</span>
</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>
</nav>
</aside>
</div>
<!-- header-starts -->
<div class="sticky-header header-section ">
<div class="header-left">
<button id="showLeftPush">
<i class="fa fa-bars"></i>
</button>
<div class="profile_details_left">
<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>
<a href="#">
<div class="user_img">
<img src="images/2.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>
<a href="#">
<div class="user_img">
<img src="images/2.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>
</nav>
<!-- /.Navbar-->
<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 ui-view="content">
</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>
<!--//footer-->
</footer>
</div>
<div>
<div ui-view="content">
</div>
</div>
...@@ -92,8 +92,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -92,8 +92,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>TimeSheet</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
</li> </li>
...@@ -112,9 +112,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -112,9 +112,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<i class="fa fa-table"></i> <span>Tables</span> <i class="fa fa-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li> </li>
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
...@@ -133,8 +131,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -133,8 +131,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li> <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="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> <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul> </ul>
</li> </li>
...@@ -402,7 +399,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -402,7 +399,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!-- //Classie --><!-- //for toggle left push menu script --> <!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js--> <!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script> <script src="js/scripts.js"></script>
<!--//scrolling js--> <!--//scrolling js-->
......
...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>TimeSheet</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
</li> </li>
...@@ -111,9 +111,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -111,9 +111,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<i class="fa fa-table"></i> <span>Tables</span> <i class="fa fa-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li> </li>
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
...@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li> <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="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> <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul> </ul>
</li> </li>
...@@ -624,7 +621,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -624,7 +621,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!-- //Classie --><!-- //for toggle left push menu script --> <!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js--> <!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script> <script src="js/scripts.js"></script>
<!--//scrolling js--> <!--//scrolling js-->
......
<!--<link rel="stylesheet" href="../../css/bootstrap-combined.min.css">-->
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-8"> <div class="col-md-8">
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
<td>{{$index + 1}}</td> <td>{{$index + 1}}</td>
<td>{{cata.name}}</td> <td>{{cata.name}}</td>
<td>{{cata.news.length}}</td> <td>{{cata.news.length}}</td>
<td><a href="http://localhost:8080/#/management/catagori/{{cata.id}}" ng-click="detailNews(emp);">Detail</a> </td> <td><a href="#/management/catagori/{{cata.id}}">Detail</a> </td>
<td><a href="#" ng-click="update(emp);">Edit</a> </td> <td><a href="#">Edit</a> </td>
</tr> </tr>
</tbody> </tbody>
......
angular.module("myApp").controller('homeController', function ($scope,$http, $state,News, $window,$stateParams,Catagories,LatestNews,NewsByCatagori) { angular.module("myApp").controller('homeController', function ($scope,$http, $state,News, $window,$stateParams,Catagories,LatestNews) {
$scope.catagories = Catagories.query(); $scope.catagories = Catagories.query();
...@@ -35,21 +35,44 @@ angular.module("myApp").controller('homeController', function ($scope,$http, $st ...@@ -35,21 +35,44 @@ angular.module("myApp").controller('homeController', function ($scope,$http, $st
$scope.catagoriById = Catagories.get({}, {myCatagoriesId: $stateParams.myCatagoriId}); $scope.catagoriById = Catagories.get({}, {myCatagoriesId: $stateParams.myCatagoriId});
//Delete News //Delete News
$scope.deleteNews = function(newsId,catagoriId) { $scope.deleteNews = function(newsId) {
if(confirm("Delete?")) { if (confirm("Delete?")) {
$http({ $http({
method: 'DELETE', method: 'DELETE',
url: 'http://localhost:8080/api/HR/catagori/' + catagoriId + '/news/' + newsId, url: 'http://localhost:8080/api/HR/news/' + newsId,
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
} }
}).then(function (response) { }).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) { }, function (data, status) {
console.log(status);
}); });
} }
}; };
}); });
\ No newline at end of file
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
{{catagori.name}} {{catagori.name}}
</h3> </h3>
<a href="http://localhost:8080/index.html#/news/catagori/{{catagori.id}}" class="tab01-link f1-s-1 cl9 hov-cl10 trans-03"> <a href="http://localhost:8080/#/news/catagori/{{catagori.id}}" class="tab01-link f1-s-1 cl9 hov-cl10 trans-03">
View all View all
<i class="fs-12 m-l-5 fa fa-caret-right"></i> <i class="fs-12 m-l-5 fa fa-caret-right"></i>
</a> </a>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<!-- Tab panes --> <!-- Tab panes -->
<div class="tab-content p-t-35"> <div class="tab-content p-t-35" style="overflow: hidden">
<!-- - --> <!-- - -->
<div class="tab-pane fade show active" id="tab1-1" role="tabpanel"> <div class="tab-pane fade show active" id="tab1-1" role="tabpanel">
<div class="row"> <div class="row">
......
<form name="myForm" novalidate ng-submit="editNews(newsEditById)" >
<table border= 1>
<tr>
<td>News Id</td>
<td>{{newsEditById.id}}</td>
</tr>
<tr>
<td>Thumbnail</td>
<td><input type="text" data-ng-model="newsEditById.thumbnail" /></td>
</tr>
<tr>
<td>Title</td>
<td><input type="text" ng-model="newsEditById.title" /></td>
</tr>
<tr>
<td>Content</td>
<td><input type="text" data-ng-model="newsEditById.content" /></td>
</tr>
<tr>
<td>Status</td>
<td><input type="text" data-ng-model="newsEditById.status" /></td>
</tr>
<tr>
<td colspan="2">
<input data-ng-disabled="myForm.$invalid" type="submit" value="Submit" class="blue-button" />
</td>
</tr>
</table>
</form>
<!--<link rel="stylesheet" href="../../css/bootstrap-combined.min.css">-->
<div class="container"> <div class="container">
<div class="row">
<div class="col-md-8">
<div >
<div> <div>
<table class="table"> <table class="table" >
<thead> <thead>
<tr> <tr>
<tr> <tr>
<a ui-sref="CatagoriManagement"><< Back</a>
<td colspan="12"><h1 style="font-size: 30px;text-align: center">{{catagoriById.name}}</h1></td> <td colspan="12"><h1 style="font-size: 30px;text-align: center">{{catagoriById.name}}</h1></td>
</tr> </tr>
<th>STT</th> <th>STT</th>
...@@ -21,17 +20,18 @@ ...@@ -21,17 +20,18 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr class="vide" ng-repeat="new in catagoriById.news"> <tr class="vide" ng-repeat="myNews in catagoriById.news">
<td>{{$index + 1}}</td> <td>{{$index + 1}}</td>
<td>{{new.title}}</td> <td>{{myNews.title}}</td>
<td>{{new.createdAt}}</td> <td>{{myNews.createdAt}}</td>
<td>{{new.content}}</td> <td>{{myNews.content}}</td>
<td><button ng-click="editNews(new,catagoryById.id)">Edit</button> </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 ng-click="deleteNews(new.id,catagoryById.id)">Delete</button> </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> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>Add
</div>
</div> </div>
</div> </div>
<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="">==> Trạng Thái</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>
\ No newline at end of file
angular.module("myApp").controller('IssuesAddController', function ($scope,$state,$http) {
$scope.insertIssues = function (Issues) {
$http({
method: 'POST',
url: 'http://localhost:8081/them-issues',
data: angular.toJson($scope.Issues),
headers: {
'Content-Type': 'application/json'
}
}).then(successCallback, errorCallback);
function successCallback(response) {
$scope.view = response.data;
if ($scope.view.status == 200) {
$state.go('issues');
}
}
function errorCallback(error) {
//error code
console.log("can't insert data!!");
}
}
$http.get("http://localhost:8081/quan-tri/danh-sach-du-an/").then(successCallback, errorCallback);
function successCallback(response) {
console.log(response.data);
{
$scope.listProject = response.data;
}
}
function errorCallback(error) {
//error code
console.log("can't get data!!");
}
});
\ No newline at end of file
angular.module("myApp").controller('IssuesShowController', function ($scope,$stateParams,$http,$state) {
$scope.currentPage = 1
,$scope.numPerPage = 5
,$scope.maxSize = 5;
$http.get('http://localhost:8081/danh-sach-issues').then(successCallback, errorCallback);
function successCallback(response) {
console.log(response.data);
{
$scope.ListIssues = response.data;
$scope.numPages = function () {
return Math.ceil($scope.ListIssues.length / $scope.numPerPage);
};
$scope.$watch('currentPage + numPerPage', function () {
var begin = (($scope.currentPage - 1) * $scope.numPerPage)
, end = begin + $scope.numPerPage;
$scope.pageListIssues = $scope.ListIssues.slice(begin, end);
});
}
}
function errorCallback(error) {
//error code
console.log("can't get data!!");
}
$scope.updateIssues = function (issue) {
if (confirm("Bạn có muốn thay đổi trạng thái không ?")) {
$http({
method: 'PUT',
url: 'http://localhost:8081/sua-issues',
data: angular.toJson(issue),
headers: {
'Content-Type': 'application/json'
}
}).then(successCallback, errorCallback);
function successCallback(response) {
$scope.view = response.data;
if ($scope.view.status == 200) {
$state.reload();
}
}
function errorCallback(error) {
//error code
console.log("can't update data!!");
}
}
};
});
\ No newline at end of file
<div class="col-lg-8">
<hr>
<p style="text-align: center">Tên Dự Án : {{loadIssues.project.name | uppercase}}</p>
<hr>
<p class="lead">Tiêu Đề: {{loadIssues.title | uppercase}}</p>
<blockquote class="blockquote">
<p class="mb-0">NỘI DUNG ISSUES : {{loadIssues.actionCode}}</p>
</blockquote>
<hr>
<!-- Comments Form -->
<div class="card my-4">
<h5 class="card-header">Comment:</h5>
<div class="card-body">
<form ng-submit="saveComment(IssuesComment)">
<div class="form-group">
<textarea ng-model="IssuesComment.contentIssuse" class="form-control" rows="3"></textarea>
</div>
<button type="submit" class="btn btn-primary">Đăng Comments</button>
<input class="btn btn-primary" type="reset" value="Reset">
</form>
</div>
</div>
<!-- Single Comment -->
<div class="media mb-4">
<div class="media-body">
<h5 class="mt-0">UserName</h5><p>Thời gian đăng</p>
-<p>Nội dung comment</p>-
</div>
</div>
</div>
\ No newline at end of file
<div class="card mb-3">
<div class="card-header">
<i class="fas fa-table"></i> Danh Sách Issue
</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">
<thead>
<tr>
<th>Tên Dự Án</th>
<th>Issue</th>
<th>Ngày Tạo</th>
<th>Trạng Thái</th>
<th>Thao Tác</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="issue in pageListIssues|filter:search">
<td>{{ issue.project.name }}</td>
<td>{{ issue.title }}</td>
<td>{{ issue.startDate | date:"dd/MM/yyyy" }}</td>
<td>
<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">
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>
</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>
angular.module("myApp").controller('IssuesDeleteController', function($scope, $window, $http,$state) {
$scope.IssuesDelete = function (issue) {
if (confirm("Bạn có chắc chắn muốn xóa ?")) {
$http({
method: 'DELETE',
url: 'http://localhost:8081/xoa-issues',
data: $scope.issue,
headers: {
'Content-Type': 'application/json'
}
}).then(successCallback, errorCallback);
function successCallback(response) {
$scope.view = response.data;
if ($scope.view.status == 200) {
$state.reload();
}
}
function errorCallback(error) {
console.log("can't delete data!!");
}
}
};
});
\ No newline at end of file
var app = angular.module("myApp").controller('loadIssuesDetail', function ($scope, $stateParams, $http, $state) {
$http.get('http://localhost:8081/chi-tiet-issues/' + $stateParams.IssuesId).then(successCallback, errorCallback);
function successCallback(response) {
console.log(response.data);
{
$scope.loadIssues = response.data
}
}
function errorCallback(error) {
console.log("can't get data!!");
}
$scope.saveComment = function (IssuesComment) {
IssuesComment.issueId = $scope.loadIssues.id;
$http({
method: 'POST',
url: 'http://localhost:8081/tao-comment',
data: angular.toJson(IssuesComment),
headers: {
'Content-Type': 'application/json'
}
}).then(successCallback, errorCallback);
function successCallback(response) {
$scope.view = response.data;
if ($scope.view.status == 200) {
$state.reload();
}
}
function errorCallback(error) {
//error code
console.log("can't insert data!!");
}
}
//hiện thị danh sách comment
});
app.controller('showComment',showComment)
function showComment($scope, $http) {
//trang đang đứng trên font-end
$scope.currentPage = 1
//số item hiển thị trong 1 page
, $scope.numPerPage = 4
//tổng số page hiển thị trên thanh chọn
, $scope.maxSize = 5;
$http.get('http://localhost:8081/Comment/' + $scope.loadIssues.id).then(successCallback, errorCallback);
function successCallback(response) {
console.log(response.data);
{
$scope.CommentIssues = response.data
$scope.numPages = function () {
return Math.ceil($scope.CommentIssues.length / $scope.numPerPage);
};
$scope.$watch('currentPage + numPerPage', function () {
var begin = (($scope.currentPage - 1) * $scope.numPerPage)
, end = begin + $scope.numPerPage;
$scope.pageListCommentIssues = $scope.CommentIssues.slice(begin, end);
});
}
}
function errorCallback(error) {
console.log("can't get data!!");
}
}
\ No newline at end of file
<!--<!DOCTYPE html>--> <script>
<!--<html lang="en" ng-app="myApp" ng-controller="timesheetController">--> function showAddLeaveFormFunction() {
<!--<head>--> var x = document.getElementById("addDivLF");
<!-- <meta charset="UTF-8">--> var n = document.getElementById("addLeaveForm");
<!-- <title>Time Sheet</title>--> if (x.style.display === "none") {
<!-- <meta name="viewport" content="width=device-width, initial-scale=1">--> x.style.display = "block";
<!-- <script src="//unpkg.com/@uirouter/angularjs/release/angular-ui-router.min.js"></script>--> n.value = " Back";
<!-- <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"--> } else {
<!-- integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"--> x.style.display = "none";
<!-- crossorigin="anonymous"></script>--> n.value = "Add Leave Form";
<!-- <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"--> }
<!-- integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">--> }
<!-- <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.9/angular.min.js"></script>--> </script>
<!-- <script src="timeSheetController.js"></script>-->
<!--</head>-->
<!--<body>-->
<!--</body>-->
<!--</html>-->
<div class="container"> <div class="container">
<div class="table-wrapper"> <div class="table-wrapper">
<div class="table-title"> <div class="table-title">
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<h2><b>Leave Form</b></h2> <h2><b>Leave Form</b></h2>
<label>
Search: <input type="text" ng-model="search" placeholder="Search" style="color: black; margin: 10px"/>
</label>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<input id="addLeaveForm" class="btn btn-success" type="submit" name="addTS" value="Add Leave Form" data-toggle="modal" onclick="showAddLeaveFormFunction()"/> <input id="addLeaveForm" class="btn btn-success" type="submit" name="addTS" value="Add Leave Form" data-toggle="modal" onclick="showAddLeaveFormFunction()"/>
...@@ -50,14 +46,18 @@ ...@@ -50,14 +46,18 @@
<tr> <tr>
<td><label>Employee Id</label></td> <td><label>Employee Id</label></td>
<td> <td>
<input type="text" maxlength="10" value="" ng-model="lfdto.employeeId" style="width: 100%;"/> <input type="text" maxlength="10" value="" ng-model="lfdto.employeeId"/>
</td> </td>
</tr> </tr>
<tr> <tr>
<td><label>Leave Type Id</label></td> <td><label>Leave Type Id</label></td>
<td> <td>
<input type="text" maxlength="10" value="" ng-model="lfdto.leaveTypeId" style="width: 100%;"/> <!-- <input type="text" maxlength="10" value="" ng-model="lfdto.leaveTypeId" style="width: 100%;"/>-->
<select ng-model="lfdto.leaveTypeId">
<option value="">Select Leave Type</option>
<option ng-repeat="lf in leaveTypeList" value="{{lf.id}}">{{lf.name}}</option>
</select>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr class="lff" ng-repeat="lf in leaveForms"> <tr class="lff" ng-repeat="lf in leaveForms | filter: search">
<td>{{$index + 1}}</td> <td>{{$index + 1}}</td>
<td>{{lf.title}}</td> <td>{{lf.title}}</td>
<td>{{lf.content}}</td> <td>{{lf.content}}</td>
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<td><a ui-sref="leaveFormDetail({id: lf.id})" data-toggle="modal"><i class="fa fa-eye" data-toggle="tooltip" title="View"></i></a></td> <td><a ui-sref="leaveFormDetail({id: lf.id})" data-toggle="modal"><i class="fa fa-eye" data-toggle="tooltip" title="View"></i></a></td>
<td><a ui-sref="leaveForm" ng-click="getLf(lf);" onclick="document.getElementById('updateDivLF').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="leaveForm" ng-click="getLf(lf);" onclick="document.getElementById('updateDivLF').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="leaveForm" ng-click="delete(lf);" class="delete" data-toggle="modal"><i class="material-icons" data-toggle="tooltip" title="Delete">&#xE872;</i></a></td> <td><a ui-sref="leaveForm" ng-click="delete(lf);" class="delete" data-toggle="modal"><i class="material-icons" data-toggle="tooltip" title="Delete">&#xE872;</i></a></td>
<td><a id="approved" ui-sref="leaveForm" ng-click="updateStatus(lf)" data-toggle="modal"><i class="fa fa-check" data-toggle="tooltip" title="Approved"></i></a></td> <!-- <td><a ui-sref="leaveForm" ng-click="updateStatus(lf)" data-toggle="modal"><i id="approved" class="fa fa-check" data-toggle="tooltip" title="Approved"></i></a></td>-->
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
/* /*
*/ */
angular.module("myApp").controller("leaveFormController", function($scope, $http, $state) {
angular.module("myApp").controller("leaveFormController", function($scope, $http, $route, $state) {
console.log("Leave Form controller"); console.log("Leave Form controller");
$scope.lf = { $scope.lf = {
...@@ -34,6 +33,16 @@ angular.module("myApp").controller("leaveFormController", function($scope, $http ...@@ -34,6 +33,16 @@ angular.module("myApp").controller("leaveFormController", function($scope, $http
console.log(response) console.log(response)
}); });
//get all leave type
$http({
method : 'GET',
url : "http://localhost:8080/employee/leaveType/getAll"
}).then(function successCallback(response) {
console.log(response);
$scope.leaveTypeList=response.data;
}, function errorCallback(response) {
console.log(response)
});
//delete leave form //delete leave form
$scope.delete = function (lf) { $scope.delete = function (lf) {
$http({ $http({
...@@ -53,7 +62,7 @@ angular.module("myApp").controller("leaveFormController", function($scope, $http ...@@ -53,7 +62,7 @@ angular.module("myApp").controller("leaveFormController", function($scope, $http
console.log($scope.lfdto); console.log($scope.lfdto);
$http({ $http({
method : 'POST', method : 'POST',
url : "http://localhost:8080/employee/leaveform/add", url : "http://localhost:8080/timesheet/leaveform/add",
data: $scope.lfdto data: $scope.lfdto
}).then(function successCallback(response) { }).then(function successCallback(response) {
console.log(response); console.log(response);
...@@ -77,7 +86,7 @@ angular.module("myApp").controller("leaveFormController", function($scope, $http ...@@ -77,7 +86,7 @@ angular.module("myApp").controller("leaveFormController", function($scope, $http
function update(){ function update(){
$http({ $http({
method : 'POST', method : 'POST',
url : "http://localhost:8080/employee/leaveform/update", url : "http://localhost:8080/timesheet/leaveform/update",
data: $scope.lfdto data: $scope.lfdto
}).then(function successCallback(response) { }).then(function successCallback(response) {
console.log(response); console.log(response);
...@@ -92,7 +101,7 @@ angular.module("myApp").controller("leaveFormController", function($scope, $http ...@@ -92,7 +101,7 @@ angular.module("myApp").controller("leaveFormController", function($scope, $http
function updateStatus(lf){ function updateStatus(lf){
$http({ $http({
method : 'POST', method : 'POST',
url : "http://localhost:8080/employee/leaveform/"+lf.id+"/status", url : "http://localhost:8080/timesheet/leaveform/"+lf.id+"/status",
// data: $scope.lfdto // data: $scope.lfdto
}).then(function successCallback(response) { }).then(function successCallback(response) {
console.log(response); console.log(response);
...@@ -102,4 +111,5 @@ angular.module("myApp").controller("leaveFormController", function($scope, $http ...@@ -102,4 +111,5 @@ angular.module("myApp").controller("leaveFormController", function($scope, $http
$state.reload(); $state.reload();
}); });
} }
});
\ No newline at end of file });
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<br><br> <br><br>
<div> <div>
<tr> <tr>
<input type="submit" name="submit" value="Duyệt" ui-sref="leaveForm" ng-click="updateStatus(leaveFormDetail.id)"/> <!-- <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> </tr>
</div> </div>
......
/* /*
*/ */
angular.module("myApp").controller("leaveFormDetailController", function($scope, $http, $stateParams, $state) { angular.module("myApp").controller("leaveFormDetailController", function($scope, $http, $stateParams, $state) {
console.log("Leave Form Detail Controller"); console.log("Leave Form Detail Controller");
$http({ $http({
method : 'GET', method : 'GET',
url : "http://localhost:8080/employee/leaveform/" + $stateParams.id url : "http://localhost:8080/timesheet/leaveform/" + $stateParams.id
}).then(function successCallback(response) { }).then(function successCallback(response) {
console.log(response); console.log(response);
$scope.leaveFormDetail=response.data; $scope.leaveFormDetail=response.data;
...@@ -18,7 +17,7 @@ angular.module("myApp").controller("leaveFormDetailController", function($scope, ...@@ -18,7 +17,7 @@ angular.module("myApp").controller("leaveFormDetailController", function($scope,
function updateStatus(id){ function updateStatus(id){
$http({ $http({
method : 'POST', method : 'POST',
url : "http://localhost:8080/employee/leaveform/"+id+"/status", url : "http://localhost:8080/timesheet/leaveform/"+id+"/status",
}).then(function successCallback(response) { }).then(function successCallback(response) {
console.log(response); console.log(response);
$state.reload(); $state.reload();
......
var app = angular.module('myApp');
app.factory('apiService', apiService);
apiService.$inject = ['$http', 'notificationService', 'authenticationService'];
function apiService($http, notificationService, authenticationService) {
return {
get: get,
post: post,
put: put,
del: del
}
function del(url, data, success, failure) {
authenticationService.setHeader();
$http.delete(url, data).then(function (result) {
success(result);
}, function (error) {
console.log(error.status)
if (error.status === 401) {
notificationService.displayError('Authenticate is required.');
} else if (failure != null) {
failure(error);
}
});
}
function post(url, data, success, failure) {
authenticationService.setHeader();
$http.post(url, data).then(function (result) {
success(result);
}, function (error) {
console.log(error.status)
if (error.status === 401) {
notificationService.displayError('Authenticate is required.');
} else if (failure != null) {
failure(error);
}
});
}
function put(url, data, success, failure) {
authenticationService.setHeader();
$http.put(url, data).then(function (result) {
success(result);
}, function (error) {
console.log(error.status)
if (error.status === 401) {
notificationService.displayError('Authenticate is required.');
} else if (failure != null) {
failure(error);
}
});
}
function get(url, params, success, failure) {
authenticationService.setHeader();
$http.get(url, params).then(function (result) {
success(result);
}, function (error) {
failure(error);
});
}
};
\ No newline at end of file
...@@ -3,53 +3,26 @@ ...@@ -3,53 +3,26 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<form ng-controller="insertEmployeeProject" ng-submit="insert_employeeproject(employeeProject)" name="eproject"> <form ng-controller="insertEmployeeProject" ng-submit="insert_employeeproject(employeeProject)" name="eproject">
<div class="form-group"> <label>Tên Dự Án</label>
<div class="form-row"> <select ng-model="employeeProject.projectId" autofocus="autofocus" required="required">
<div class="col-md-6"> <option value=""> ==> Tên Dự Án</option>
<div class="form-label-group"> <option ng-repeat="project in pGroupProject" value="{{project.id}}">{{project.name}}</option>
<select ng-model="employeeProject.projectId" class="form-control" </select><br/>
autofocus="autofocus" required="required"> <label>Tài khoản nhân viên</label>
<option value=""> ==> Tên Dự Án</option> <input type="text" ng-model="employeeProject.userName" id="employee"
<option ng-repeat="project in pGroupProject" value="{{project.id}}">{{project.name}} placeholder="Tài khoản nhân viên" required="required"><br/>
</option> <label>Chức Vụ</label>
</select> <select ng-model="employeeProject.position" autofocus="autofocus"
</div> required="required">
</div> <option value="">==> Chức Vụ</option>
</div> <option value="TeamLead">TeamLead</option>
</div> <option value="Member">Member</option>
<div class="form-group"> </select><br/>
<div class="form-row">
<div class="col-md-6">
<div class="form-label-group">
<select ng-model="employeeProject.userId" class="form-control" autofocus="autofocus" required="required">
<option value=""> ==> Tên Tài Khoản</option>
<option ng-repeat="em in eProject" value="{{em.id}}">{{em.username}}</option>
</select>
</div>
</div>
</div>
</div>
<div class="form-group">
<div class="form-row">
<div class="col-md-6">
<div class="form-label-group">
<select ng-model="employeeProject.position" class="form-control" autofocus="autofocus" required="required">
<option value="">==> Chức Vụ</option>
<option value="TeamLead">TeamLead</option>
<option value="Member">Member</option>
<option value="HR">HR</option>
<option value="Manager">Manager</option>
</select>
</div>
</div>
</div>
</div>
<h3 ng-show="eproject.$valid" style="text-align: center; color: #1c7430">Bạn Có Thể Lưu</h3>
<h1>{{view.message}}</h1> <h1>{{view.message}}</h1>
<div> <div>
<input type="submit" value="Lưu"> <input type="submit" value="Lưu">
<input type="reset" value="Reset"> <input type="reset" value="Reset">
<button type="button" ui-sref="project">Black</button> <button type="button" ui-sref="project">Back</button>
</div> </div>
</form> </form>
</div> </div>
\ No newline at end of file
...@@ -2,6 +2,8 @@ var app = angular.module('myApp'); ...@@ -2,6 +2,8 @@ var app = angular.module('myApp');
app.controller('loadGroupProjectByProjectId', loadGroupProjectByProjectId); app.controller('loadGroupProjectByProjectId', loadGroupProjectByProjectId);
app.controller('insertEmployeeProject', insertEmployeeProject); app.controller('insertEmployeeProject', insertEmployeeProject);
app.controller('deleteEmployeeProject', deleteEmployeeProject); app.controller('deleteEmployeeProject', deleteEmployeeProject);
app.controller('updateGroutpProject', updateGroutpProject);
app.controller('loadEmployeeProjectDetail', loadEmployeeProjectDetail);
// controlers tạo Get API // controlers tạo Get API
function loadGroupProjectByProjectId($scope,$stateParams,$http) { function loadGroupProjectByProjectId($scope,$stateParams,$http) {
$http.get('http://localhost:8081/thong-tin-du-an/'+ $stateParams.ID).then(successCallback, errorCallback); $http.get('http://localhost:8081/thong-tin-du-an/'+ $stateParams.ID).then(successCallback, errorCallback);
...@@ -11,14 +13,12 @@ function loadGroupProjectByProjectId($scope,$stateParams,$http) { ...@@ -11,14 +13,12 @@ function loadGroupProjectByProjectId($scope,$stateParams,$http) {
$scope.listGruopProject = response.data $scope.listGruopProject = response.data
} }
} }
function errorCallback(error) { function errorCallback(error) {
//error code
console.log("can't get data!!"); console.log("can't get data!!");
} }
} }
// tạo controllers insert API // tạo controllers insert API
function insertEmployeeProject($scope, $http, $window) { function insertEmployeeProject($scope, $http, $state) {
$scope.insert_employeeproject = function () { $scope.insert_employeeproject = function () {
$http({ $http({
//khai báo type //khai báo type
...@@ -34,29 +34,16 @@ function insertEmployeeProject($scope, $http, $window) { ...@@ -34,29 +34,16 @@ function insertEmployeeProject($scope, $http, $window) {
} }
// kết quả trả về (THEN) // kết quả trả về (THEN)
}).then(successCallback, errorCallback); }).then(successCallback, errorCallback);
//tạo funtion nếu thành công!
function successCallback(response) { function successCallback(response) {
$scope.view = response.data; $scope.view = response.data;
if($scope.view.status == 200){
$state.go('groupProjectByProjectId', {ID: $scope.employeeProject.projectId});
}
} }
//tạo funtion kiểm tra nếu thất bại
function errorCallback(error) { function errorCallback(error) {
//error code
console.log("can't insert data!!"); console.log("can't insert data!!");
} }
} }
//get Employee
$http({
method : 'GET',
url : "http://localhost:8081/list_employee/"
}).then(function successCallback(response) {
console.log(response);
$scope.eProject=response.data;
}, function errorCallback(response) {
console.log(response)
});
// get Project // get Project
$http.get("http://localhost:8081/quan-tri/danh-sach-du-an").then(successCallback, errorCallback); $http.get("http://localhost:8081/quan-tri/danh-sach-du-an").then(successCallback, errorCallback);
...@@ -72,7 +59,7 @@ function insertEmployeeProject($scope, $http, $window) { ...@@ -72,7 +59,7 @@ function insertEmployeeProject($scope, $http, $window) {
console.log("can't get data!!"); console.log("can't get data!!");
} }
}; };
function deleteEmployeeProject($scope, $window, $http) { function deleteEmployeeProject($scope, $window, $http,$state) {
$scope.deleteEmployeeProject = function (gruopProject) { $scope.deleteEmployeeProject = function (gruopProject) {
if (confirm("Bạn có chắc chắn muốn xóa ?")) { if (confirm("Bạn có chắc chắn muốn xóa ?")) {
$http({ $http({
...@@ -83,17 +70,52 @@ function deleteEmployeeProject($scope, $window, $http) { ...@@ -83,17 +70,52 @@ function deleteEmployeeProject($scope, $window, $http) {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
} }
}).then(successCallback, errorCallback); }).then(successCallback, errorCallback);
//tạo funtion nếu thành công!
function successCallback(response) { function successCallback(response) {
$window.location.reload(); $scope.view = response.data;
if($scope.view.status == 200){
// $window.location.reload();
$state.reload();
}
} }
//tạo funtion kiểm tra nếu thất bại
function errorCallback(error) { function errorCallback(error) {
//error code
console.log("can't delete data!!"); console.log("can't delete data!!");
} }
} }
}; };
}; };
\ No newline at end of file function updateGroutpProject($scope, $http,$state,$window) {
$scope.updatePositionProject = function (gruopProject) {
if (confirm("Bạn có chắc chắn muốn sửa ?")) {
$http({
method: 'PUT',
url: 'http://localhost:8081/cap-nhat-chuc-vu-thanh-vien',
data: $scope.gruopProject,
headers: {
'Content-Type': 'application/json'
}
}).then(successCallback, errorCallback);
function successCallback(response) {
$scope.view = response.data;
if($scope.view.status == 200){
$state.go('groupProjectByProjectId', {ID: $scope.gruopProject.projectDTO.id});
// $window.location.href = 'http://localhost:8081/#/groupProjectByProjectId/'+$scope.gruopProject.projectDTO.id;
}
}
function errorCallback(error) {
console.log("can't delete data!!");
}
}
};
};
function loadEmployeeProjectDetail($scope,$stateParams,$http) {
$http.get('http://localhost:8081/chi-tiet-thanh-vien-du-an/'+ $stateParams.ID).then(successCallback, errorCallback);
function successCallback(response) {
console.log(response.data);
{
$scope.gruopProject = response.data
}
}
function errorCallback(error) {
console.log("can't get data!!");
}
}
\ No newline at end of file
<!DOCTYPE html> <div class="card-header">
<html lang="en"> <i class="fas fa-table"></i> Cập nhật chức vụ của nhân viên trong nhóm
<head> </div>
<meta charset="UTF-8"> <div class="card-body">
<title>Title</title> <form ng-controller="updateGroutpProject" ng-submit="updatePositionProject(gruopProject)" name="formProject">
</head> <input type="hidden" ng-model="gruopProject.id" id="id"><br/>
<body> <input type="hidden" ng-model="gruopProject.projectDTO.id" id="idProject"><br/>
<label>Tài khoản nhân viên</label>
</body> <input type="text" ng-model="gruopProject.employeeDTO.username" id="descriptions"
</html> placeholder="Tài khoản nhân viên"
\ No newline at end of file ng-disabled="true"><br/>
<label>Chức Vụ</label><br/>
<select ng-model="gruopProject.position" autofocus="autofocus"
required="required">
<option value="">==> Chức Vụ</option>
<option value="TeamLead">TeamLead</option>
<option value="Member">Member</option>
</select><br/>
<div>
<h1>{{view.message}}</h1>
<input type="submit" value="Save">
<input type="reset" value="Reset">
<button type="button" ui-sref="groupProjectByProjectId({ID: gruopProject.projectDTO.id})">Back</button>
</div>
</form>
</div>
\ No newline at end of file
<div class="card mb-3"> <div class="card mb-3">
<div class="card-header"> <div class="card-header" ng-controller="loadGroupProjectByProjectId">
<i class="fas fa-table"></i> Danh Sách Dự Án
<i class="fas fa-table" ></i> Thành Viên Trong Nhóm Dự Án <div ng-model="ProjectName.name"></div>
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="table-responsive" ng-controller="loadGroupProjectByProjectId"> <div class="table-responsive" >
<a ui-sref="addEmployeeProject" class="btn btn-primary btn-circle btn-sm" style="margin-bottom: 10px;"> Thêm thành viên</a>
<input type="text" ng-model="search" placeholder="Search" style="margin-bottom: 10px;"> <input type="text" ng-model="search" placeholder="Search" style="margin-bottom: 10px;">
<table class="table table-bordered" id="dataTable" width="100%" <table class="table table-bordered" id="dataTable" width="100%"
cellspacing="0"> cellspacing="0">
...@@ -21,7 +22,7 @@ ...@@ -21,7 +22,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="gruopProject in listGruopProject"> <tr ng-repeat="gruopProject in pageGroupListProject">
<td>{{ gruopProject.employeeDTO.username }}</td> <td>{{ gruopProject.employeeDTO.username }}</td>
<td>{{ gruopProject.employeeDTO.lastName }}</td> <td>{{ gruopProject.employeeDTO.lastName }}</td>
<td>{{ gruopProject.employeeDTO.email}}</td> <td>{{ gruopProject.employeeDTO.email}}</td>
...@@ -29,14 +30,19 @@ ...@@ -29,14 +30,19 @@
<td>{{ gruopProject.joinDate | date:"dd/MM/yyyy" }}</td> <td>{{ gruopProject.joinDate | date:"dd/MM/yyyy" }}</td>
<td>{{ gruopProject.outDate | date:"dd/MM/yyyy" }}</td> <td>{{ gruopProject.outDate | date:"dd/MM/yyyy" }}</td>
<td> <td>
<a ui-sref="editproject({ID: project.id})" class="btn btn-warning btn-circle btn-sm"> <a ui-sref="editEmployeeProject({ID: gruopProject.id})" class="btn btn-warning btn-circle btn-sm">
Sửa </a> Cập Nhật </a>
<a class="btn btn-danger btn-circle btn-sm" ng-controller="deleteEmployeeProject" <a class="btn btn-danger btn-circle btn-sm" ng-controller="deleteEmployeeProject"
data-ng-click="deleteEmployeeProject(gruopProject)">xóa thành viên</a> data-ng-click="deleteEmployeeProject(gruopProject)">Xóa Thành Viên</a>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<a ui-sref="project" class="btn btn-primary btn-circle btn-sm" style="margin-bottom: 10px;"> Trở Về</a> <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> </div>
<div data-pagination="" data-num-pages="numPages()"
data-current-page="currentPage" data-max-size="maxSize"
data-boundary-links="true">
</div>
</div> </div>
\ No newline at end of file
angular.module("myApp").controller('groupProjectShowController', function ($scope,$stateParams,$http) {
$scope.currentPage = 1
,$scope.numPerPage = 2
,$scope.maxSize = 5;
$http.get('http://localhost:8081/thong-tin-du-an/'+ $stateParams.ID).then(successCallback, errorCallback);
function successCallback(response) {
console.log(response.data);
{
$scope.listGruopProject = response.data;
$scope.numPages = function () {
return Math.ceil($scope.listGruopProject.length / $scope.numPerPage);
};
$scope.$watch('currentPage + numPerPage', function () {
var begin = (($scope.currentPage - 1) * $scope.numPerPage)
, end = begin + $scope.numPerPage;
$scope.pageGroupListProject = $scope.listGruopProject.slice(begin, end);
});
}
}
function errorCallback(error) {
//error code
console.log("can't get data!!");
}
});
\ No newline at end of file
...@@ -3,50 +3,21 @@ ...@@ -3,50 +3,21 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<form ng-controller="insertProject" ng-submit="insert_project()"> <form ng-controller="insertProject" ng-submit="insert_project()">
<div class="form-group"> <label>Tên Dự Án</label>
<div class="form-row"> <input type="text" ng-model="project.name" id="name" placeholder="Tên Dự Án"
<div class="col-md-6"> required="required" style="height: 20px;"><br/>
<div class="form-label-group"> <label>Mô tả ngắn</label>
<input type="text" ng-model="project.name" id="name" class="form-control" <input type="text" ng-model="project.descriptions" id="descriptions" placeholder="Mô tả ngắn"
placeholder="Tên Dự Án" required="required"><br/>
required="required" autofocus="autofocus"> <label>Ngày bắt đầu</label>
<label for="name">Tên Dự Án</label> <input type="date" ng-model="project.startDate" id="startDate" placeholder="Ngày Bắt Đầu" required="required"><br/>
</div> <label>Ngày kết thúc</label>
</div> <input type="date" ng-model="project.endDate" id="endDate" placeholder="nick skype" required="required"><br/>
<div class="col-md-6">
<div class="form-label-group">
<input type="text" ng-model="project.descriptions" id="descriptions"
class="form-control"
placeholder="Mô tả ngắn"
required="required">
<label for="descriptions">Mô tả ngắn</label>
</div>
</div>
</div>
</div>
<div class="form-group">
<div class="form-row">
<div class="col-md-6">
<div class="form-label-group">
<input type="date" ng-model="project.startDate" id="startDate" class="form-control"
placeholder="Ngày Bắt Đầu" required="required">
<label for="startDate">Ngày Bắt Đầu</label>
</div>
</div>
<div class="col-md-6">
<div class="form-label-group">
<input type="date" ng-model="project.endDate" id="endDate" class="form-control"
placeholder="nick skype" required="required">
<label for="endDate">Ngày Kết Thuc</label>
</div>
</div>
</div>
</div>
<h3 ng-show="formProject.$valid" style="text-align: center; color: #1c7430">Bạn Có Thể Lưu</h3>
<div> <div>
<h1>{{view.message}}</h1>
<input type="submit" value="Save"> <input type="submit" value="Save">
<input type="reset" value="Reset"> <input type="reset" value="Reset">
<button type="button" ui-sref="project">Black</button> <button type="button" ui-sref="project">Back</button>
</div> </div>
</form> </form>
</div> </div>
\ No newline at end of file
var app = angular.module('myApp'); var app = angular.module('myApp');
app.controller('showProject', showProject); // app.controller('showProject', showProject);
app.controller('insertProject', insertProject); app.controller('insertProject', insertProject);
app.controller('deleteProject', deleteProject); app.controller('deleteProject', deleteProject);
app.controller('updateProject', updateProject); app.controller('updateProject', updateProject);
app.controller('loadProjectDetail', loadProjectDetail); app.controller('loadProjectDetail', loadProjectDetail);
// controlers tạo Get API
function showProject($scope, $http) {
$http.get("http://localhost:8081/quan-tri/danh-sach-du-an").then(successCallback, errorCallback);
function successCallback(response) {
console.log(response.data);
{
$scope.listProject = response.data
}
}
function errorCallback(error) {
//error code
console.log("can't get data!!");
}
};
// 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 // tạo controllers insert API
function insertProject($scope, $http, $window,$state) { function insertProject($scope, $http, $state) {
$scope.insert_project = function () { $scope.insert_project = function () {
$http({ $http({
//khai báo type
method: 'POST', method: 'POST',
//đường dẫn API
url: 'http://localhost:8081/quan-tri/them-du-an', url: 'http://localhost:8081/quan-tri/them-du-an',
//truyền dữ liệu nhập trên cline vào data
data: angular.toJson($scope.project), data: angular.toJson($scope.project),
//kiểu dữ liệu API
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
} }
// kết quả trả về (THEN)
}).then(successCallback, errorCallback); }).then(successCallback, errorCallback);
//tạo funtion nếu thành công!
function successCallback(response) { function successCallback(response) {
// $window.location.href = "http://localhost:8081/#/project"; $scope.view = response.data;
$state.go('project'); if ($scope.view.status == 200) {
$state.go('project');
}
} }
//tạo funtion kiểm tra nếu thất bại
function errorCallback(error) { function errorCallback(error) {
//error code //error code
console.log("can't insert data!!"); console.log("can't insert data!!");
...@@ -66,15 +66,14 @@ function deleteProject($scope, $window, $http,$state) { ...@@ -66,15 +66,14 @@ function deleteProject($scope, $window, $http,$state) {
} }
}).then(successCallback, errorCallback); }).then(successCallback, errorCallback);
//tạo funtion nếu thành công!
function successCallback(response) { function successCallback(response) {
// $state.go('project'); $scope.view = response.data;
$window.location.reload(); if ($scope.view.status == 200) {
$state.reload();
}
} }
//tạo funtion kiểm tra nếu thất bại
function errorCallback(error) { function errorCallback(error) {
//error code
console.log("can't delete data!!"); console.log("can't delete data!!");
} }
} }
...@@ -82,7 +81,7 @@ function deleteProject($scope, $window, $http,$state) { ...@@ -82,7 +81,7 @@ function deleteProject($scope, $window, $http,$state) {
}; };
//tạo controller sửa theo id //tạo controller sửa theo id
function updateProject($scope, $window, $http,$state) { function updateProject($scope, $http, $state) {
$scope.updateProject = function (project) { $scope.updateProject = function (project) {
if (confirm("Bạn có muốn sửa không ?")) { if (confirm("Bạn có muốn sửa không ?")) {
$http({ $http({
...@@ -94,13 +93,13 @@ function updateProject($scope, $window, $http,$state) { ...@@ -94,13 +93,13 @@ function updateProject($scope, $window, $http,$state) {
} }
}).then(successCallback, errorCallback); }).then(successCallback, errorCallback);
//tạo funtion nếu thành công!
function successCallback(response) { function successCallback(response) {
$state.go('project'); $scope.view = response.data;
// $window.location.href = "http://localhost:8081/#/project"; if ($scope.view.status == 200) {
$state.go('project');
}
} }
//tạo funtion kiểm tra nếu thất bại
function errorCallback(error) { function errorCallback(error) {
//error code //error code
console.log("can't update data!!"); console.log("can't update data!!");
...@@ -108,17 +107,18 @@ function updateProject($scope, $window, $http,$state) { ...@@ -108,17 +107,18 @@ function updateProject($scope, $window, $http,$state) {
} }
}; };
}; };
function loadProjectDetail($scope,$stateParams,$http) {
$http.get('http://localhost:8081/quan-tri/chi-tiet-du-an/'+ $stateParams.ID).then(successCallback, errorCallback);
function successCallback(response) {
console.log(response.data);
{
$scope.project = response.data
}
}
function errorCallback(error) { function loadProjectDetail($scope, $stateParams, $http) {
//error code $http.get('http://localhost:8081/quan-tri/chi-tiet-du-an/' + $stateParams.ID).then(successCallback, errorCallback);
console.log("can't get data!!");
function successCallback(response) {
console.log(response.data);
{
$scope.project = response.data
} }
}
function errorCallback(error) {
console.log("can't get data!!");
}
} }
\ No newline at end of file
...@@ -3,69 +3,27 @@ ...@@ -3,69 +3,27 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<form ng-controller="updateProject" ng-submit="updateProject(project)" name="formProject"> <form ng-controller="updateProject" ng-submit="updateProject(project)" name="formProject">
<div class="form-group"> <label>Tên Dự Án</label>
<div class="form-row"> <input type="text" ng-model="project.name" id="name"
<div class="col-md-6"> placeholder="Tên Dự Án"
<div class="form-label-group"> required="required" autofocus="autofocus" name="txtName"><br/>
<input type="text" ng-model="project.name" id="name" class="form-control" <label>Mô tả ngắn</label>
placeholder="Tên Dự Án" <input type="text" ng-model="project.descriptions" id="descriptions"
required="required" autofocus="autofocus" name="txtName"> placeholder="Mô tả ngắn"
<label for="name">Tên Dự Án</label> required="required" name="txtDescriptions"><br/>
</div> <select ng-model="project.status" autofocus="autofocus"
</div> required="required">
<div class="col-md-6"> <option value="">==> Trạng Thái</option>
<div class="form-label-group"> <option value="0">Dự Kiến</option>
<input type="text" ng-model="project.descriptions" id="descriptions" <option value="1">Đang Tiến Hành</option>
class="form-control" <option value="2">Đã Hoàn Thành</option>
placeholder="Mô tả ngắn" </select><br/>
required="required" name="txtDescriptions"> <input type="hidden" ng-model="project.id" id="id"><br/>
<label for="descriptions">Mô tả ngắn</label>
</div>
</div>
</div>
</div>
<div class="form-group">
<div class="form-row">
<div class="col-md-6">
<div class="form-label-group">
<input type="hidden" ng-model="project.id" id="id" class="form-control">
</div>
</div>
<div class="col-md-6">
<div class="form-label-group">
<select ng-model="project.status" class="form-control" autofocus="autofocus" required="required">
<option value="">==> Trạng Thái</option>
<option value="0">Dự Kiến</option>
<option value="1">Đang Tiến Hành</option>
<option value="2">Đã Hoàn Thành</option>
</select>
</div>
</div>
</div>
</div>
<div class="form-group">
<div class="form-row">
<div class="col-md-6">
<div class="form-label-group">
<input type="date" ng-model="project.startDate" id="startDate" class="form-control"
placeholder="Ngày Bắt Đầu" required="required">
<label for="startDate">Ngày Bắt Đầu</label>
</div>
</div>
<div class="col-md-6">
<div class="form-label-group">
<input type="date" ng-model="project.endDate" id="endDate" class="form-control"
placeholder="nick skype" required="required">
<label for="endDate">Ngày Kết Thúc</label>
</div>
</div>
</div>
</div>
<h3 ng-show="formProject.$valid" style="text-align: center; color: #1c7430">Bạn Có Thể Lưu</h3>
<div> <div>
<h1>{{view.message}}</h1>
<input type="submit" value="Save"> <input type="submit" value="Save">
<input type="reset" value="Reset"> <input type="reset" value="Reset">
<button type="button" ui-sref="project">Black</button> <button type="button" ui-sref="project">Back</button>
</div> </div>
</form> </form>
</div> </div>
\ No newline at end of file
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
<i class="fas fa-table"></i> Danh Sách Dự Án <i class="fas fa-table"></i> Danh Sách Dự Án
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="table-responsive" ng-controller="showProject"> <div class="table-responsive" >
<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;"> <input type="text" ng-model="search" placeholder="Search" style="margin-bottom: 10px;">
<table class="table table-bordered" id="dataTable" width="100%" <table class="table table-bordered" id="dataTable" width="100%"
cellspacing="0"> cellspacing="0">
...@@ -20,12 +19,16 @@ ...@@ -20,12 +19,16 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="project in listProject|filter:search"> <tr ng-repeat="project in pageListProject|filter:search">
<td>{{ project.name }}</td> <td>{{ project.name }}</td>
<td>{{ project.descriptions }}</td> <td>{{ project.descriptions }}</td>
<td>{{ project.startDate | date:"dd/MM/yyyy" }}</td> <td>{{ project.startDate | date:"dd/MM/yyyy" }}</td>
<td>{{ project.endDate | date:"dd/MM/yyyy" }}</td> <td>{{ project.endDate | date:"dd/MM/yyyy" }}</td>
<td>{{ project.status}}</td> <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>
</td>
<td><a ui-sref="groupProjectByProjectId({ID: project.id})" class="btn btn-info btn-circle btn-sm"> <td><a ui-sref="groupProjectByProjectId({ID: project.id})" class="btn btn-info btn-circle btn-sm">
Xem </a> Xem </a>
<a ui-sref="editproject({ID: project.id})" class="btn btn-warning btn-circle btn-sm"> <a ui-sref="editproject({ID: project.id})" class="btn btn-warning btn-circle btn-sm">
...@@ -35,6 +38,12 @@ ...@@ -35,6 +38,12 @@
</tr> </tr>
</tbody> </tbody>
</table> </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>
</div> </div>
</div> <!-- <pager-directive page="{{page}}" custom-path="{{customPath}}" pages-count="{{pagesCount}}" total-count="{{totalCount}}" search-func="getProject(page)"></pager-directive>-->
\ No newline at end of file <div data-pagination="" data-num-pages="numPages()"
data-current-page="currentPage" data-max-size="maxSize"
data-boundary-links="true">
</div>
</div>
angular.module("myApp").controller('projectViewsController', function ($scope, $http) {
//trang đang đứng trên font-end
$scope.currentPage = 1
//số item hiển thị trong 1 page
, $scope.numPerPage = 4
//tổng số page hiển thị trên thanh chọn
, $scope.maxSize = 5;
$http.get("http://localhost:8081/quan-tri/danh-sach-du-an").then(successCallback, errorCallback);
function successCallback(response) {
console.log(response.data);
{
$scope.listProject = response.data;
$scope.numPages = function () {
return Math.ceil($scope.listProject.length / $scope.numPerPage);
};
$scope.$watch('currentPage + numPerPage', function () {
var begin = (($scope.currentPage - 1) * $scope.numPerPage)
, end = begin + $scope.numPerPage;
$scope.pageListProject = $scope.listProject.slice(begin, end);
});
}
}
function errorCallback(error) {
console.log("can't get data!!");
}
});
\ No newline at end of file
/* /*
*/ */
angular.module("myApp").controller("timeSheetController", function($scope, $http, $state) { angular.module("myApp").controller("timeSheetController", function($scope, $http,$window) {
console.log("Time Sheet controller"); console.log("Time Sheet controller");
$scope.ts = { $scope.ts = {
"id": "",
"title": "", "title": "",
"content": "", "content": "",
"note": "", "note": ""
"eproject": "",
"updatedAt": ""
}; };
$scope.tsdto = { $scope.tsdto = {
"id": "", "id": "",
"title": "", "title": "",
...@@ -23,21 +19,33 @@ angular.module("myApp").controller("timeSheetController", function($scope, $http ...@@ -23,21 +19,33 @@ angular.module("myApp").controller("timeSheetController", function($scope, $http
}; };
//get all time sheet //get all time sheet
//function getAllTimesheet(){
$http({
method: 'GET',
url: "http://localhost:8080/eproject/timesheet/show"
}).then(function successCallback(response) {
console.log(response);
$scope.myTimeSheets = response.data;
}, function errorCallback(response) {
console.log(response)
});
//}
//get all eproject
$http({ $http({
method : 'GET', method: 'GET',
url : "http://localhost:8080/eproject/timesheet/show" url: "http://localhost:8080/eproject/getAll"
}).then(function successCallback(response) { }).then(function successCallback(response) {
console.log(response); console.log(response);
$scope.myTimeSheets=response.data; $scope.eProjectList = response.data;
}, function errorCallback(response) { }, function errorCallback(response) {
console.log(response) console.log(response)
}); });
//delete time sheet //delete time sheet
$scope.delete = function (ts) { $scope.delete = function (ts) {
$http({ $http({
method : 'DELETE', method: 'DELETE',
url : "http://localhost:8080/eproject/timesheet/delete/" + ts.id url: "http://localhost:8080/eproject/timesheet/delete/" + ts.id
}).then(function successCallback(response) { }).then(function successCallback(response) {
console.log(response); console.log(response);
$state.reload(); $state.reload();
...@@ -49,11 +57,12 @@ angular.module("myApp").controller("timeSheetController", function($scope, $http ...@@ -49,11 +57,12 @@ angular.module("myApp").controller("timeSheetController", function($scope, $http
$scope.save = save; $scope.save = save;
function save(){
function save() {
console.log($scope.tsdto); console.log($scope.tsdto);
$http({ $http({
method : 'POST', method: 'POST',
url : "http://localhost:8080/eproject/timesheet/add", url: "http://localhost:8080/eproject/timesheet/add",
data: $scope.tsdto data: $scope.tsdto
}).then(function successCallback(response) { }).then(function successCallback(response) {
console.log(response); console.log(response);
...@@ -65,6 +74,7 @@ angular.module("myApp").controller("timeSheetController", function($scope, $http ...@@ -65,6 +74,7 @@ angular.module("myApp").controller("timeSheetController", function($scope, $http
} }
$scope.getTs = getTs; $scope.getTs = getTs;
function getTs(ts) { function getTs(ts) {
$scope.tsdto.id = ts.id; $scope.tsdto.id = ts.id;
$scope.tsdto.title = ts.title; $scope.tsdto.title = ts.title;
...@@ -74,11 +84,12 @@ angular.module("myApp").controller("timeSheetController", function($scope, $http ...@@ -74,11 +84,12 @@ angular.module("myApp").controller("timeSheetController", function($scope, $http
} }
$scope.update = update; $scope.update = update;
function update(){
function update() {
$http({ $http({
headers: "content-type: application/json", headers: "content-type: application/json",
method : 'POST', method: 'POST',
url : "http://localhost:8080/eproject/timesheet/update", url: "http://localhost:8080/eproject/timesheet/update",
data: $scope.tsdto data: $scope.tsdto
}).then(function successCallback(response) { }).then(function successCallback(response) {
console.log(response); console.log(response);
...@@ -88,56 +99,84 @@ angular.module("myApp").controller("timeSheetController", function($scope, $http ...@@ -88,56 +99,84 @@ angular.module("myApp").controller("timeSheetController", function($scope, $http
$state.reload(); $state.reload();
}); });
} }
}).directive('pgnTable', ['$compile', function ($compile) {
return { // $scope.myTimeSheets = [];
restrict: 'EA', // $scope.save = save;
templateUrl: 'pages/timesheet/timeSheet.html', // $scope.currentPage = 1;
replace: true, // $scope.timesheetPerPage = 3;
scope: { // $scope.maxSize = 5;
pages: "=pgnTable" // this.myTimeSheets = $scope.myTimeSheets;
}, // $scope.numOfPage = numOfPage;
controller: function ($scope) { // $scope.dataHasLoaded = false;
$scope.currentPage=1; // $scope.makeTimesheet = function () {
$scope.numLimit=5; // $scope.myTimeSheets = [];
$scope.start = 0; // for (let i = 1; i <=50 ; i++) {
$scope.$watch("pages",function(newVal){ // $scope.myTimeSheets.push( {text : 'ts'+ i , done:false});
if(newVal){ // }
$scope.pages=Math.ceil($scope.pages.length/$scope.numLimit); //
} // };
}); // $scope.makeTimesheet();
$scope.hideNext=function(){ // $scope.getAllTimesheet = getAllTimesheet;
if(($scope.start + $scope.numLimit) < $scope.pages.length){ // //$scope.getTotalTimesheet = getTotalTimesheet;
return false; // getAllTimesheet();
} // $scope.pageChangedIndex = pageChangedIndex;
else // function pageChangedIndex() {
return true; // console.log($scope.currentPage);
}; // }
$scope.hidePrev=function(){ // function numOfPage() {
if($scope.start===0){ // return Math.ceil($scope.myTimeSheets.length/ $scope.timesheetPerPage);
return true; //
} // }
else });
return false; // }).directive('pgnTable', ['$compile', function ($compile) {
}; // return {
$scope.nextPage=function(){ // restrict: 'EA',
console.log("next pages"); // templateUrl: 'pages/timesheet/timeSheet.html',
$scope.currentPage++; // replace: true,
$scope.start=$scope.start+ $scope.numLimit; // scope: {
console.log( $scope.start) // pages: "=pgnTable"
}; // },
$scope.PrevPage=function(){ // controller: function ($scope) {
if($scope.currentPage>1){ // $scope.currentPage=1;
$scope.currentPage--; // $scope.numLimit=5;
} // $scope.start = 0;
console.log("next pages"); // $scope.$watch("pages",function(newVal){
$scope.start=$scope.start - $scope.numLimit; // if(newVal){
console.log( $scope.start) // $scope.pages=Math.ceil($scope.pages.length/$scope.numLimit);
}; // }
}, // });
compile: function(elem) { // $scope.hideNext=function(){
return function(ielem, $scope) { // if(($scope.start + $scope.numLimit) < $scope.pages.length){
$compile(ielem)($scope); // return false;
}; // }
} // else
}; // return true;
}]); // };
\ No newline at end of file // $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);
// };
// }
// };
/* /*
*/ */
angular.module("myApp").controller("timeSheetDetailController", function($scope, $http, $stateParams, $state) { angular.module("myApp").controller("timeSheetDetailController", function($scope, $http, $stateParams, $state) {
console.log("Time Sheet Detail Controller"); console.log("Time Sheet Detail Controller");
......
<!--<!DOCTYPE html>--> <script>
<!--<html lang="en" ng-app="myApp" ng-controller="timesheetController">--> function showAddTimeSheetFunction() {
<!--<head>--> var x = document.getElementById("addDivTS");
<!-- <meta charset="UTF-8">--> var n = document.getElementById("addTimeSheet");
<!-- <title>Time Sheet</title>--> if (x.style.display === "none") {
<!-- <meta name="viewport" content="width=device-width, initial-scale=1">--> x.style.display = "block";
<!-- <script src="//unpkg.com/@uirouter/angularjs/release/angular-ui-router.min.js"></script>--> n.value = "Close";
<!-- <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"--> } else {
<!-- integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"--> x.style.display = "none";
<!-- crossorigin="anonymous"></script>--> n.value = "Add TimeSheet";
<!-- <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"--> }
<!-- integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">--> }
<!-- <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.9/angular.min.js"></script>--> </script>
<!-- <script src="timeSheetController.js"></script>-->
<!--</head>-->
<!--<body>-->
<!--</body>-->
<!--</html>-->
<div class="container"> <div class="container">
<div class="table-wrapper"> <div class="table-wrapper">
<div class="table-title"> <div class="table-title">
...@@ -25,11 +18,11 @@ ...@@ -25,11 +18,11 @@
<div class="col-sm-6"> <div class="col-sm-6">
<h2><b>TimeSheet</b></h2> <h2><b>TimeSheet</b></h2>
<label> <label>
<input type="text" ng-model="search" placeholder="Search" style="color: black"/> Search: <input type="text" ng-model="search" placeholder="Search" style="color: black; margin: 10px"/>
</label> </label>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<input id="addTimeSheet" class="btn btn-success" data-toggle="modal" type="submit" name="addTS" value="Add" onclick="showAddTimeSheetFunction()"/> <input id="addTimeSheet" class="btn btn-success" data-toggle="modal" type="submit" name="addTS" value="Add TimeSheet" onclick="showAddTimeSheetFunction()"/>
</div> </div>
</div> </div>
</div> </div>
...@@ -59,15 +52,21 @@ ...@@ -59,15 +52,21 @@
</tr> </tr>
<tr> <tr>
<td><label>Employee Project Id</label></td> <td><label>Employee Project Id</label></td>
<!-- <td>-->
<!-- <input type="text" maxlength="10" value="" ng-model="tsdto.eprojectId" style="width: 100%;"/>-->
<!-- </td>-->
<td> <td>
<input type="text" maxlength="10" value="" ng-model="tsdto.eprojectId" style="width: 100%;"/> <select ng-model="tsdto.eprojectId">
<option value="">Select Project</option>
<option ng-repeat="ep in eProjectList" value="{{ep.id}}">{{ep.project.name}}</option>
</select>
</td> </td>
</tr> </tr>
<tr> <tr>
<td><label>Employee Id</label></td> <td><label>Employee Id</label></td>
<td> <td>
<input type="text" maxlength="10" value="" ng-model="tsdto.employeeId" style="width: 100%;"/> <input type="text" maxlength="10" value="" ng-model="tsdto.employeeId"/>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -126,7 +125,7 @@ ...@@ -126,7 +125,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr class="tss" ng-repeat="ts in myTimeSheets | limitTo:numLimit:start"> <tr class="tss" ng-repeat="ts in myTimeSheets | limitTo:numLimit:start | filter: search">
<td>{{$index + 1}}</td> <td>{{$index + 1}}</td>
<td>{{ts.title}}</td> <td>{{ts.title}}</td>
<td>{{ts.content}}</td> <td>{{ts.content}}</td>
...@@ -138,11 +137,10 @@ ...@@ -138,11 +137,10 @@
<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="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> <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> </tr>
<tr> <!-- <tr>-->
<td colspan="9" style='text-align: center'><span>Page# {{currentPage}} of {{pages}}</span> <!-- <h6><code>rotate</code> defaulted to <code>true</code> and <code>force-ellipses</code> set to <code>true</code>:</h6>-->
<span style="float:left;padding:5px"><a ng-hide="hidePrev()" href="" ng-click="PrevPage()">Prev</a></span> <!-- <ul uib-pagination total-items="getAllTimesheet()" ng-model="currentPage" max-size="maxSize" class="pagination-sm" boundary-link-number="true" ng-change ="pageChangedIndex()" items-per-page = "timesheetPerPage" ></ul>-->
<span style="float:right;padding:5px"><a ng-hide="hideNext()" href="" ng-click="nextPage()">Next</a></span></td> <!-- </tr>-->
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
......
angular.module("MyTimeSheet").controller("timesheetController", function($scope, $http,$window) {
console.log("Time Sheet controller");
$scope.ts = {
"title": "",
"content": "",
"note": ""
};
$http({
header : 'Access-Control-Allow-Origin: http://localhost:63342/MockProject_01/public/pages/timesheet/timesheet.html?_ijt=ee540pqfq7tplkmo9mjj447ne',
method : 'GET',
url : "http://localhost:8080/eproject/timesheet",
}).then(function successCallback(response) {
console.log(response)
$scope.timesheet=response.data;
}, function errorCallback(response) {
console.log(response)
});
});
\ No newline at end of file
...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>TimeSheet</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
</li> </li>
......
<!--
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
...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>TimeSheet</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
</li> </li>
......
...@@ -70,13 +70,13 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -70,13 +70,13 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
<span>Components</span> <span>Project</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu"> <!-- <ul class="treeview-menu">-->
<li><a href="grids.html"><i class="fa fa-angle-right"></i> Grids</a></li> <!-- <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> <!-- <li><a href="media.html"><i class="fa fa-angle-right"></i> Media Css</a></li>-->
</ul> <!-- </ul>-->
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
...@@ -92,8 +92,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -92,8 +92,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>Timesheet</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
</li> </li>
...@@ -112,9 +112,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -112,9 +112,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<i class="fa fa-table"></i> <span>Tables</span> <i class="fa fa-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li> </li>
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
...@@ -133,8 +131,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -133,8 +131,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li> <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="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> <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul> </ul>
</li> </li>
...@@ -493,10 +490,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -493,10 +490,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
} }
} }
</script> </script>
<!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script> <script src="js/scripts.js"></script>
<!--//scrolling js--> <!--//scrolling js-->
......
<!--
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 | Widgets :: 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 -->
<!-- calendar -->
<link rel="stylesheet" href="css/monthly.css">
<!-- //calendar -->
</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><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="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>
</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">Widgets</h2>
<div class="elements">
<!--photoday-section-->
<div class="col-sm-4 wthree-crd widgettable">
<div class="card">
<div class="card-body">
<div class="agileinfo-cdr">
<div class="card-header">
<h3>Report</h3>
</div>
<hr class="widget-separator">
<div class="widget-body">
<table class="table table-bordered">
<thead>
<tr>
<th>ID</th>
<th>Name</th>
<th>Amount</th>
</tr>
</thead>
<tbody>
<tr>
<td>#24436</td>
<td>Maecenas molestie</td>
<td>$2,100.00</td>
</tr>
<tr>
<td>#2118</td>
<td>Vivamus molestie</td>
<td>$4,200.00</td>
</tr>
<tr>
<td>#6668</td>
<td>Donec at auctor</td>
<td>$1,900.00</td>
</tr>
<tr>
<td>#8446</td>
<td>Nullam sollicitudin</td>
<td>$4,300.00</td>
</tr>
<tr>
<td>#3279</td>
<td>Ullamcorper dictum</td>
<td>$3,600.00</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
<div class="col-sm-4 w3-agileits-crd widgettable">
<div class="card card-contact-list">
<div class="agileinfo-cdr">
<div class="card-header">
<h3>Contacts</h3>
</div>
<hr class="widget-separator">
<div class="card-body p-b-20">
<div class="list-group">
<a class="list-group-item media" href="">
<div class="pull-left">
<img class="lg-item-img" src="images/4.jpg" alt="">
</div>
<div class="media-body">
<div class="pull-left">
<div class="lg-item-heading">Alexander</div>
<small class="lg-item-text">example@gmail.com</small>
</div>
<div class="pull-right">
<div class="lg-item-heading">Ceo</div>
</div>
</div>
</a>
<a class="list-group-item media" href="">
<div class="pull-left">
<img class="lg-item-img" src="images/1.jpg" alt="">
</div>
<div class="media-body">
<div class="pull-left">
<div class="lg-item-heading">Jackson Jacob</div>
<small class="lg-item-text">example@hotmail.com</small>
</div>
<div class="pull-right">
<div class="lg-item-heading">Director</div>
</div>
</div>
</a>
<a class="list-group-item media" href="">
<div class="pull-left">
<img class="lg-item-img" src="images/3.jpg" alt="">
</div>
<div class="media-body">
<div class="pull-left">
<div class="lg-item-heading">Merina lisa</div>
<small class="lg-item-text">example1@gmail.com</small>
</div>
<div class="pull-right">
<div class="lg-item-heading">Manager</div>
</div>
</div>
</a>
<a class="list-group-item media" href="">
<div class="pull-left">
<img class="lg-item-img" src="images/1.jpg" alt="">
</div>
<div class="media-body">
<div class="pull-left">
<div class="lg-item-heading">Michael</div>
<small class="lg-item-text">example1@hotmail.com</small>
</div>
<div class="pull-right">
<div class="lg-item-heading">Assistant</div>
</div>
</div>
</a>
</div>
</div>
</div>
</div>
</div>
<div class="col-sm-4 w3-agile-crd widgettable">
<div class="card">
<div class="card-body card-padding">
<div class="">
<header class="widget-header">
<h4 class="widget-title">Activities</h4>
</header>
<hr class="widget-separator">
<div class="widget-body">
<div class="streamline">
<div class="sl-item sl-primary">
<div class="sl-content">
<small class="text-muted">0 mins ago</small>
<p>Alexander has just joined</p>
</div>
</div>
<div class="sl-item sl-danger">
<div class="sl-content">
<small class="text-muted">15 minutes ago</small>
<p>Michael has sent a request for access</p>
</div>
</div>
<div class="sl-item sl-success">
<div class="sl-content">
<small class="text-muted">18 minutes ago</small>
<p>chris added you to his team</p>
</div>
</div>
<div class="sl-item">
<div class="sl-content">
<small class="text-muted">22 minutes ago</small>
<p>jackson has finished his task</p>
</div>
</div>
<div class="sl-item sl-warning">
<div class="sl-content">
<small class="text-muted">30 minutes ago</small>
<p>Jacob shared a folder with you</p>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="clearfix"></div>
<!--//photoday-section-->
<!-- mainpage-chit -->
<div class="chit-chat-layer1">
<div class="col-md-6 chit-chat-layer1-left">
<div class="work-progres">
<header class="widget-header">
<h4 class="widget-title">Recent Followers</h4>
</header>
<hr class="widget-separator">
<div class="table-responsive">
<table class="table table-hover">
<thead>
<tr>
<th>#</th>
<th>Project</th>
<th>Manager</th>
<th>Status</th>
<th>Progress</th>
</tr>
</thead>
<tbody>
<tr>
<td>1</td>
<td>Face book</td>
<td>Alexander</td>
<td><span class="label label-danger">in progress</span></td>
<td><span class="badge badge-info">70%</span></td>
</tr>
<tr>
<td>2</td>
<td>Twitter</td>
<td>Lucika adam</td>
<td><span class="label label-success">completed</span></td>
<td><span class="badge badge-success">80%</span></td>
</tr>
<tr>
<td>3</td>
<td>Google</td>
<td>Michael</td>
<td><span class="label label-warning">in progress</span></td>
<td><span class="badge badge-warning">30%</span></td>
</tr>
<tr>
<td>4</td>
<td>LinkedIn</td>
<td>Chris dany</td>
<td><span class="label label-info">in progress</span></td>
<td><span class="badge badge-info">55%</span></td>
</tr>
<tr>
<td>5</td>
<td>Tumblr</td>
<td>Jacob velly</td>
<td><span class="label label-warning">in progress</span></td>
<td><span class="badge badge-danger">75%</span></td>
</tr>
<tr>
<td>6</td>
<td>Tesla</td>
<td>Donald chris</td>
<td><span class="label label-info">in progress</span></td>
<td><span class="badge badge-success">25%</span></td>
</tr>
<tr>
<td>7</td>
<td>Behance</td>
<td>alexa louis</td>
<td><span class="label label-info">in progress</span></td>
<td><span class="badge badge-success">100%</span></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div class="col-md-6 chit-chat-layer1-rit">
<div class="geo-chart">
<section id="charts1" class="charts">
<div class="wrapper-flex">
<table id="myTable" class="geoChart tableChart data-table col-table myTable chtr-table" style="display: none; position: absolute; top: -99999px; width: 485px;">
<caption>Student Nationalities Table</caption>
<tbody><tr>
<th scope="col" data-type="string">Country</th>
<th scope="col" data-type="number">Number of Students</th>
<th scope="col" data-role="annotation">Annotation</th>
</tr>
<tr>
<td>China</td>
<td align="right">20</td>
<td align="right">20</td>
</tr>
<tr>
<td>Colombia</td>
<td align="right">5</td>
<td align="right">5</td>
</tr>
<tr>
<td>France</td>
<td align="right">3</td>
<td align="right">3</td>
</tr>
<tr>
<td>Italy</td>
<td align="right">1</td>
<td align="right">1</td>
</tr>
<tr>
<td>Japan</td>
<td align="right">18</td>
<td align="right">18</td>
</tr>
<tr>
<td>Kazakhstan</td>
<td align="right">1</td>
<td align="right">1</td>
</tr>
<tr>
<td>Mexico</td>
<td align="right">1</td>
<td align="right">1</td>
</tr>
<tr>
<td>Poland</td>
<td align="right">1</td>
<td align="right">1</td>
</tr>
<tr>
<td>Russia</td>
<td align="right">11</td>
<td align="right">11</td>
</tr>
<tr>
<td>Spain</td>
<td align="right">2</td>
<td align="right">2</td>
</tr>
<tr>
<td>Tanzania</td>
<td align="right">1</td>
<td align="right">1</td>
</tr>
<tr>
<td>Turkey</td>
<td align="right">2</td>
<td align="right">2</td>
</tr>
</tbody></table>
<div class="col geo_main">
<h3 id="geoChartTitle">World Market</h3>
<div id="geoChart" class="chart"> </div>
</div>
</div><!-- .wrapper-flex -->
</section>
</div>
</div>
<div class="clearfix"> </div>
</div>
<!-- //mainpage-chit -->
<div class="agil-info-calendar">
<!-- calendar -->
<div class="col-md-4 agile-calendar">
<div class="calendar-widget">
<header class="widget-header">
<h4 class="widget-title">Calender widget</h4>
</header>
<hr class="widget-separator">
<!-- grids -->
<div class="agile-calendar-grid">
<div class="page">
<div class="w3l-calendar-left">
<div class="calendar-heading">
</div>
<div class="monthly" id="mycalendar"></div>
</div>
<div class="clearfix"> </div>
</div>
</div>
</div>
</div>
<div class="col-md-4 stats-info widget">
<div class="stats-info-agileits">
<header class="widget-header">
<h4 class="widget-title">Browser stats</h4>
</header>
<hr class="widget-separator">
<div class="stats-body">
<ul class="list-unstyled">
<li>GoogleChrome <span class="pull-right">85%</span>
<div class="progress progress-striped active progress-right">
<div class="bar green" style="width:85%;"></div>
</div>
</li>
<li>Firefox <span class="pull-right">35%</span>
<div class="progress progress-striped active progress-right">
<div class="bar yellow" style="width:35%;"></div>
</div>
</li>
<li>Internet Explorer <span class="pull-right">78%</span>
<div class="progress progress-striped active progress-right">
<div class="bar red" style="width:78%;"></div>
</div>
</li>
<li>Safari <span class="pull-right">50%</span>
<div class="progress progress-striped active progress-right">
<div class="bar blue" style="width:50%;"></div>
</div>
</li>
<li>Opera <span class="pull-right">80%</span>
<div class="progress progress-striped active progress-right">
<div class="bar light-blue" style="width:80%;"></div>
</div>
</li>
<li>Microsoft Edge <span class="pull-right">78%</span>
<div class="progress progress-striped active progress-right">
<div class="bar red" style="width:78%;"></div>
</div>
</li>
<li class="last">Others <span class="pull-right">60%</span>
<div class="progress progress-striped active progress-right">
<div class="bar orange" style="width:60%;"></div>
</div>
</li>
</ul>
</div>
</div>
</div>
<div class="col-md-4 chart-layer1-right">
<div class="user-marorm">
<div class="malorum-top">
</div>
<div class="malorm-bottom">
<span class="malorum-pro"> </span>
<h2>Calorine ELiza</h2>
<p>Fusce elit sem, dictum non gravida vitae, pulv
inar ac mi. Proin aliquet ex nunc, sodales efficitur
ris imperdiet et. Vestibulum antei psum primis in faucibus orci luctus et </p>
<ul class="malorum-icons">
<li><a href="#"><i class="fa fa-facebook"> </i>
<div class="tooltip"><span>Facebook</span></div>
</a></li>
<li><a href="#"><i class="fa fa-twitter"> </i>
<div class="tooltip"><span>Twitter</span></div>
</a></li>
<li><a href="#"><i class="fa fa-google-plus"> </i>
<div class="tooltip"><span>Google</span></div>
</a></li>
</ul>
</div>
</div>
</div>
<div class="clearfix"></div>
</div>
<!-- //calendar -->
</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 -->
<!-- geo chart -->
<script src="//cdn.jsdelivr.net/modernizr/2.8.3/modernizr.min.js" type="text/javascript"></script>
<script>window.modernizr || document.write('<script src="lib/modernizr/modernizr-custom.js"><\/script>')</script>
<!--<script src="lib/html5shiv/html5shiv.js"></script>-->
<!-- Chartinator -->
<script src="js/chartinator.js" ></script>
<script type="text/javascript">
jQuery(function ($) {
var chart3 = $('#geoChart').chartinator({
tableSel: '.geoChart',
columns: [{role: 'tooltip', type: 'string'}],
colIndexes: [2],
rows: [
['China - 2015'],
['Colombia - 2015'],
['France - 2015'],
['Italy - 2015'],
['Japan - 2015'],
['Kazakhstan - 2015'],
['Mexico - 2015'],
['Poland - 2015'],
['Russia - 2015'],
['Spain - 2015'],
['Tanzania - 2015'],
['Turkey - 2015']],
ignoreCol: [2],
chartType: 'GeoChart',
chartAspectRatio: 1.5,
chartZoom: 1.75,
chartOffset: [-12,0],
chartOptions: {
width: null,
backgroundColor: '#fff',
datalessRegionColor: '#F5F5F5',
region: 'world',
resolution: 'countries',
legend: 'none',
colorAxis: {
colors: ['#679CCA', '#337AB7']
},
tooltip: {
trigger: 'focus',
isHtml: true
}
}
});
});
</script>
<!--geo chart-->
<!-- calendar -->
<script type="text/javascript" src="js/monthly.js"></script>
<script type="text/javascript">
$(window).load( function() {
$('#mycalendar').monthly({
mode: 'event',
});
$('#mycalendar2').monthly({
mode: 'picker',
target: '#mytarget',
setWidth: '250px',
startHidden: true,
showTrigger: '#mytarget',
stylePast: true,
disablePast: true
});
switch(window.location.protocol) {
case 'http:':
case 'https:':
// running on a server, should be good.
break;
case 'file:':
alert('Just a heads-up, events will not work when run locally.');
}
});
</script>
<!-- //calendar -->
<!-- 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
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