Merge branch 'FEATURE/NEW_ENHANCEMENT_MYTEAM' of...

Merge branch 'FEATURE/NEW_ENHANCEMENT_MYTEAM' of https://gitlab.mynisum.com/hr/mytime into FEATURE/NEW_ENHANCEMENT_MYTEAM

src/main/webapp/WEB-INF/controllers/ExportDataController.js

@@ -37,7 +37,7 @@ myApp
 							showProgressDialog('Please wait while data is imported from file...!!!');
 							var formData = new FormData();
 							formData.append('file', file);
-							$http.post(appConfig.appUri+ "/employee/fileUpload?empId="+empId,
+							$http.post(appConfig.appUri+ "employee/fileUpload?empId="+empId,
 								formData,{
 										transformRequest : angular.identity,
 										headers : {'Content-Type' : undefined },

src/main/webapp/WEB-INF/controllers/LeftMenuController.js

@@ -25,7 +25,7 @@ myApp.controller("leftmenuController",function($scope, myFactory, $compile){
 					if($scope.menuItems[i].menu.indexOf('Manage') !== -1) {
 						$scope.manageGroup.push($scope.menuItems[i]);
 					}
-					else if($scope.menuItems[i].menu.indexOf('Report') !== -1) {
+					else if($scope.menuItems[i].menu.indexOf('Report') !== -1 || $scope.menuItems[i].menu.indexOf('Efforts') !== -1 ) {
 						$scope.reportsGroup.push($scope.menuItems[i]);
 					}
 					else{

src/main/webapp/WEB-INF/css/custom-theme.css

@@ -181,7 +181,7 @@ i.fa.fa-refresh:hover {
 	background: transparent;
 }
 #sidebar-wrapper .sidebar-nav li ul.reportsGroup {
-    height: 125px; 
+    height: 165px; 
 	overflow: hidden;
 	padding: 0;
     transition: height 0.5s ease-out;
@@ -252,6 +252,7 @@ i.fa.fa-refresh:hover {
 	display: flex;
 	/* height: calc(100% - 105px); need to test and enable*/
 	overflow: hidden;
+	height:100%;
 }
 /* .main-container #sidebar-left, .main-container #main {
 	flex: 1;
@@ -329,7 +330,7 @@ i.fa.fa-refresh:hover {
 #footer .navbar-inverse, #footer .navbar-inverse {
 	background: #eeeef6;
 	border-top: 2px solid #00b4e5;
-	position: relative;
+	position: fixed;
 }
 #footer .navbar-inverse .copyrights {
     /* background: #fff;
@@ -573,9 +574,9 @@ top: 22px;
     color:white;
     font-weight:bold;
 }
-.manage-accounts .ui-grid-viewport {
+/* .manage-accounts .ui-grid-viewport {
     height: 400px !important;
-}
+} */
 .autoComplete-dropdown {
 border-color: #ececec;
 border-width: 1px;
@@ -647,4 +648,7 @@ cursor: pointer;
 }
 .manage-attendance-report {
 	height: calc(85vh - 183px) !important;
+}
+.manage-employee-efforts {
+	height: calc(100vh - 260px) !important;
 }
\ No newline at end of file

src/main/webapp/WEB-INF/templates/employeeEfforts.html

@@ -40,7 +40,7 @@
 		<div class="form-group">
 			<div class="form-inline col-lg-12">
 				<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination ui-grid-exporter
-					class="mygrid grid-full-view">
+					class="mygrid manage-employee-efforts">
 					<div class="watermark" ng-show="!gridOptions.data.length">No
 						data available</div>
 				</div>

src/main/webapp/WEB-INF/templates/leftmenu.html

@@ -21,7 +21,7 @@
 						 
 			</ul>
 				</li>
-						<li> <a href="#" ng-click="toggleReport()" ng-show="reportsGroup.length > 0"> <i class="fa fa-file" aria-hidden="true"></i> <span>Manage Reports</span> <i class="fa fa-angle-down right"></i></a> 
+						<li> <a href="#" ng-click="toggleReport()" ng-show="reportsGroup.length > 0"> <i class="fa fa-file" aria-hidden="true"></i> <span>Reports</span> <i class="fa fa-angle-down right"></i></a> 
 			<ul ng-hide="customReport" class="reportsGroup">
 					
 				<li ng-repeat="reportItem in reportsGroup">