Updated_ACCOUNTS_PAGE

src/main/resources/application.properties

@@ -11,7 +11,7 @@ server.context-path=/myTeam/
 #Local Database configuration
 spring.data.mongodb.host=localhost
 spring.data.mongodb.port=27017
-spring.data.mongodb.database=myTeamDB
+spring.data.mongodb.database=mytime
 
 quartz.enabled=true
 cron.expression=0 45 10/3 1/1 * ? *

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

@@ -204,7 +204,7 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export
 			columnDefs : [ 
 				{field : 'projectName',displayName: 'Project', enableColumnMenu: true, enableSorting: true,minWidth : 100,width: 150},
 				{field : 'accountName',displayName: 'Account', enableColumnMenu: false, enableSorting: false,minWidth : 100,width: 150},
-				{field : 'managerName',displayName: 'Manager Name', enableColumnMenu: false, enableSorting: false,minWidth : 100,width: 150},
+				{field : 'deliveryLeadIds[0].employeeName',displayName: 'Delivery Lead',minWidth : 100,width: 150},
 				{field : 'billableStatus',displayName: 'Billability', enableColumnMenu: false, enableSorting: false,minWidth : 100,width: 150},
 				{field : 'projectStartDate',displayName: 'Start Date', enableColumnMenu: false, enableSorting: false, cellFilter: 'date:"dd-MMM-yyyy"',minWidth : 100,width: 150},
 				{field : 'projectEndDate',displayName: 'End Date', enableColumnMenu: false, enableSorting: false, cellFilter: 'date:"dd-MMM-yyyy"' ,minWidth : 100,width: 150},
@@ -248,7 +248,7 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export
 				]
 			};
 
-		 var getCellActiveTemplateBilling='<div ng-show="COL_FIELD==true"><p class="col-lg-12">Y</P></div><div ng-show="COL_FIELD==false"><p class="col-lg-12">N</p></div>';
+		// var getCellActiveTemplateBilling='<div ng-show="COL_FIELD==true"><p class="col-lg-12">Y</P></div><div ng-show="COL_FIELD==false"><p class="col-lg-12">N</p></div>';
 			
 			$scope.gridOptionsEmpBillability= {
 				paginationPageSizes : [ 10, 20, 30, 40, 50, 100],
@@ -268,7 +268,7 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export
 				        cellFilter: 'date:"dd-MMM-yyyy"',minWidth : 100,width: 150
 				         },
 					{field : 'comments',displayName: 'Comments',  enableColumnMenu: false, enableSorting: false,minWidth : 100,width: 150},
-					{field : 'resourceStatus',displayName: 'Status',enableColumnMenu: false, enableSorting: false,cellTemplate:getCellActiveTemplateBilling,enableCellEdit: false,minWidth : 100,width: 150}
+					{field : 'resourceStatus',displayName: 'Status',enableColumnMenu: false, enableSorting: false,enableCellEdit: false,minWidth : 100,width: 150}
 					
 				]
 			};

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

@@ -476,7 +476,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 					$('.md-select-value')[0].childNodes[0].innerHTML = null
 					$('.md-select-value')[1].childNodes[0].innerHTML = null
 					$('.md-select-value')[2].childNodes[0].innerHTML = null
-					$('.md-select-value')[3].childNodes[0].innerHTML = null
+//					$('.md-select-value')[3].childNodes[0].innerHTML = null
 					$('.md-datepicker-input')[0].value = null;
 					$('.md-datepicker-input')[1].value = null;
 					$('.md-datepicker-input')[2].value = null;
@@ -764,6 +764,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 				}else{
 					$scope.employeeRole = "Lead";
 				}
+				console.log($scope.employeeRole)
 				//$scope.employeeRole = userData.role;
 				//$scope.employeeShift = userData.shift;
 				$scope.newBillingStartDate = new Date(userData.newBillingStartDate);
@@ -921,12 +922,14 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 			}
 		};
 		$scope.changeEmpBillableStatus = function(){
-			$scope.newBillingStartDate = null;
+			//$scope.newBillingStartDate = null;
+			
 			if($scope.templateTitle == "Add"){
 				$('.md-datepicker-input')[0].value = null;
 			}
   		  else{
-				$('.md-datepicker-input')[3].value = new Date($scope.projectEndDate).toISOString().slice(0,10);
+  			  $scope.endDate =  new Date(dataToPass.projectEndDate);
+				$('.md-datepicker-input')[3].value = new Date(dataToPass.projectEndDate);
 			}
 		}
 		
@@ -1170,8 +1173,6 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 
 		}
 		$scope.validateFields = function (action) {
-			console.log(new Date($scope.parentData.newBillingStartDate));
-			console.log($scope.newBillingStartDate);
 			var project = $scope.projectId;
 			var projectName = $scope.projectName;
 			var account = $scope.account;
@@ -1448,13 +1449,13 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
                 return "Please select a employee role";
             }
         }
-		$scope.getSelectedEmpShift = function(){
-            if ($scope.employeeShift != undefined ) {
-                return $scope.employeeShift;
-            } else {
-                return "Please select a employee shift";
-            }
-        }
+//		$scope.getSelectedEmpShift = function(){
+//            if ($scope.employeeShift != undefined ) {
+//                return $scope.employeeShift;
+//            } else {
+//                return "Please select a employee shift";
+//            }
+//        }
 		
 //		$scope.getProjectSelected = function(){
 //			if ($scope.projectModel !== undefined) {

src/main/webapp/WEB-INF/js/app.js

@@ -18,6 +18,8 @@ myApp.constant('appConfig', {
 			appName: "MyTime", 
 
 			//appUri: "http://10.3.45.11:8080/myTeam/",
+
+
 			appUri: "http://localhost:8080/myTeam/",
 			version:"1.0", 
 			empStartId:16001, 

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

@@ -19,7 +19,7 @@
 	<div class="row col-lg-12">
 
 		<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination
-			class="myGrid manage-accounts">
+			class="myGrid grid-full-view">
 			<div class="watermark" ng-show="!gridOptions.data.length">No
 				data available</div>
 		</div>

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

@@ -171,7 +171,7 @@
                                         </table>
                                         
                                         <div role="alert">
-                                            <span class="alert alert alert-danger" style="color: red; ">{{alertMsg}}</span>
+                                            <span style="color: red; ">{{alertMsg}}</span>
                                         </div>
                                         </div>
                                         </div>