Defects fixed (#100)

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

@@ -247,7 +247,7 @@ myApp.controller("domainController",
 					if($scope.employeeModel.length <= 0){
 						return "Please select a Delivery Lead";
 					}
-					return "Employees selected ---> " + $scope.employeeModel.length;
+					return "Delivery Leads selected : " + $scope.employeeModel.length;
 				} else {
 					return "Please select a Delivery Lead";
 				}

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

@@ -311,6 +311,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 		$scope.isSecondTab = false;
 		$scope.prjctStses=["Active","Completed","On Hold","Proposed"];	
 		$scope.billableStatuses = ["Billable","Shadow","Non-Billable","Reserved"];
+		$scope.employeeShifts = myFactory.getShifts();
 		var allAccounts = myFactory.getAccounts();
 		function getActiveAccounts(){
 			var activeAccounts = [];
@@ -351,6 +352,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 				$scope.newBillingStartDate = undefined;
 				$scope.startDate = undefined;
 				$scope.endDate = undefined;
+				$scope.employeeShift = undefined;
 				$scope.employeeModel = {};
 				$('.md-datepicker-input')[0].value = null;
 				$('.md-datepicker-input')[1].value = null;
@@ -368,6 +370,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-datepicker-input')[0].value = null;
 					$('.md-datepicker-input')[1].value = null;
 					$('.md-datepicker-input')[2].value = null;
@@ -559,6 +562,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 				$scope.parentData.experience = row.entity.experience;
 				$scope.parentData.designation = row.entity.designation;
 				$scope.parentData.billableStatus = row.entity.billableStatus;
+				$scope.parentData.shift = row.entity.shift;
 				$scope.parentData.mobileNumber = row.entity.mobileNumber;
 				$scope.parentData.employeeModel = {}
 				$scope.parentData.newBillingStartDate = row.entity.newBillingStartDate;
@@ -582,9 +586,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 //			    	 
 //			    	 $scope.ViewBillability(action, $scope.parentData);
 //			    		
-//			     }
-			
-			
+//			     }	
 		} 
 			document.addEventListener("DOMSubtreeModified", function(e) {
 				if(document.getElementsByClassName("md-tab")[1] && (document.getElementsByClassName("md-tab")[1].style.visibility === "")){
@@ -603,6 +605,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 					document.getElementsByClassName("md-tab")[2].style.visibility = "visible" ;
 					$scope.selectedTab = 2; 
 					$scope.searchTerm = "";
+					$scope.alertMsg = "";
 //				}	
 			};
 			$scope.updateTeamMate = function(action, userData){
@@ -621,6 +624,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 //				$scope.employeeModel.emailId = userData.emailId;
 				$scope.empBillableStatus = userData.billableStatus;
 				$scope.employeeRole = userData.role;
+				$scope.employeeShift = userData.shift;
 				$scope.newBillingStartDate = new Date(userData.newBillingStartDate);
 				$scope.startDate = new Date(userData.startDate);
 				$scope.endDate = new Date(userData.endDate);
@@ -977,6 +981,9 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 				}else if($scope.employeeRole == undefined){
 					 $scope.alertMsg = "Please select a employee role";
 					 angular.element(document.getElementById('empRole')).focus();
+				}else if($scope.employeeShift == undefined){
+					$scope.alertMsg = "Please select a employee shift";
+					 angular.element(document.getElementById('empShift')).focus();
 				}
 			else if($scope.empBillableStatus == undefined){
 				    $scope.alertMsg = "Please select a billable status";
@@ -991,9 +998,12 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 	            	 $scope.alertMsg = "Please select new Billing StartDate";
 	            	 angular.element(document.getElementById('newBillingStartDate')).focus();
 	            }
-	            else if($scope.newBillingStartDate > $scope.endDate){
-	          		 $scope.alertMsg = "Assignment End Date should be less than Current Billability Start Date ";
+	            else if(action =="Add" && ($scope.newBillingStartDate > $scope.endDate)){
+	          		 $scope.alertMsg = "Assignment End Date should be less than New Billability Start Date ";
 	           		}
+	            else if(action == "Update" && ($scope.endDate < $scope.startDate < $scope.newBillingStartDate)){
+	            	$scope.alertMsg  = "EndDate should be greater than StartDate and new BillingStartDate ";
+	            }
 				else if(employeeModel != undefined && projectModel != undefined && action == "Add"
 						&& getExistingRecordProjectStatus(employeeModel.employeeId, projectModel.projectName)){
 					$scope.alertMsg = "Employee is already assigned to the selected project";
@@ -1001,7 +1011,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 				}
 				else {
 					$scope.alertMsg = "";
-					var record = {"employeeId":employeeModel.employeeId, "employeeName":employeeModel.employeeName, "emailId": employeeModel.emailId, "designation":employeeModel.designation,"projectId":project,"projectName":projectName,"managerId":managerId,"managerName":managerName,"mobileNumber":employeeModel.mobileNumber,"active":true,"billableStatus":$scope.empBillableStatus,"startDate":$scope.startDate,"endDate":$scope.endDate,"account":account,"role":$scope.employeeRole,"newBillingStartDate":newBillingStartDate,"accountId":$scope.accountId,"domainId":$scope.domainId};
+					var record = {"employeeId":employeeModel.employeeId, "employeeName":employeeModel.employeeName, "emailId": employeeModel.emailId, "designation":employeeModel.designation,"projectId":project,"projectName":projectName,"managerId":managerId,"managerName":managerName,"mobileNumber":employeeModel.mobileNumber,"active":true,"billableStatus":$scope.empBillableStatus,"startDate":$scope.startDate,"endDate":$scope.endDate,"account":account,"role":$scope.employeeRole,"newBillingStartDate":newBillingStartDate,"accountId":$scope.accountId,"domainId":$scope.domainId,"shift":$scope.employeeShift};
 					if(action == "Add"){
 						addRecord(record,action);
 						$timeout(function(){
@@ -1189,6 +1199,14 @@ 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.getProjectSelected = function(){
 //			if ($scope.projectModel !== undefined) {
 //				$scope.project=$scope.projectModel;

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

@@ -295,7 +295,7 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog,
 	function AddProjectTeamController($scope, $mdDialog, dataToPass, gridOptionsData,employees) {
 		
 		$scope.searchTerm = "";
-		$scope.roles = [{"roleName":"Employee"},{"roleName":"Lead"}];
+		$scope.roles = ["Employee","Lead"];
 		$scope.updateSearch =function(e){
 			e.stopPropagation();			
 		}
@@ -632,7 +632,7 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog,
 		};
 		$scope.getSelectedRole = function(){
 			if($scope.role != undefined){
-				return $scope.role.roleName;
+				return $scope.role;
 			}
 			else {
 				return "Please select the role";

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

@@ -275,17 +275,26 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
             $scope.managersSelectedList.splice(index,1);
         }
         $scope.getSelectedLead = function(){
-            $scope.managersSelectedList.forEach(function(manager){
-				 $scope.selectedEmployeeNames.push(manager.employeeName);
-				 removeDuplicates($scope.selectedEmployeeNames);							
-                if(!$scope.employeeInTeam.includes(manager.employeeId)){
-					$scope.employeeInTeam.push(manager.employeeId) ;									
+        	if ($scope.managersSelectedList != undefined ) {
+				if($scope.managersSelectedList.length <= 0){
+					return "Please select Delivery Manager";
 				}
-			})
-			            
+				return "Delivery Managers selected : " + $scope.managersSelectedList.length;
+			} else {
+				return "Please select Delivery Manager";
+			}		            
+        }
+        $scope.persistSelections = function(){
+        	$scope.managersSelectedList.forEach(function(manager){
+			 $scope.selectedEmployeeNames.push(manager.employeeName);
+			 removeDuplicates($scope.selectedEmployeeNames);							
+           if(!$scope.employeeInTeam.includes(manager.employeeId)){
+				$scope.employeeInTeam.push(manager.employeeId) ;									
+			}
+		})
         }
 		$scope.getIndustryTypeSelected = function(){
-			if ($scope.industryType !== undefined) {
+			if ($scope.industryType != "") {
 				$scope.industryType = $scope.industryType;
 				return $scope.industryType;
 			} else {

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

@@ -26,6 +26,10 @@
 			<md-optgroup label="Project"> <md-option
 				ng-value="project" ng-repeat="project in projectList">{{project.projectName}}</md-option>
 			</md-optgroup> </md-select>
+			<md-select ng-model="role" md-selected-text="getSelectedRole()" id="role">
+				<md-optgroup label="roles"> <md-option ng-value="role"
+				ng-repeat="role in roles">{{role}}</md-option> </md-optgroup> 
+			</md-select>
 			<md-select ng-model="shift" md-selected-text="getSelectedShift()" id="empShift">
 			<md-optgroup label="shifts"> <md-option ng-value="shift"
 				ng-repeat="shift in shifts">{{shift}}</md-option> </md-optgroup> </md-select>
@@ -35,21 +39,26 @@
 			<md-select ng-model="empBillableStatus" md-selected-text="getSelectedBillableStatus()" id="empBillableStatus">
 			<md-optgroup label="billable statuses"> <md-option ng-value="billableStatus"
 				ng-repeat="billableStatus in billableStatuses">{{billableStatus}}</md-option> </md-optgroup> </md-select>
+				
 			<div ng-show="empBillableStatus">
-			
-			<output>Current Billability Start Date : <md-datepicker ng-model="newBillingStartDate"  md-placeholder="Please Select Date" id ="newBillingStartDate"
+			<output>Current Billability Start Date : 
+			<md-datepicker ng-model="newBillingStartDate"  md-placeholder="Please Select Date" id ="newBillingStartDate"
 						md-min-date="minDate" md-max-date="maxDate"
 						onkeydown="return false"
-						></md-datepicker></br></output>			
+						></md-datepicker>
+						</output>			
 			</div>
+			<output>Assignment StartDate : 
 			<md-datepicker ng-model="startDate" md-placeholder="Start Date"
 						md-min-date="minDate" md-max-date="maxDate"
 						onkeydown="return false"
-						></md-datepicker>
-			<md-datepicker ng-model="endDate" md-placeholder="Projected End Date"
+						></md-datepicker></output>
+						
+			<output>Assignment EndDate : 			
+			<md-datepicker ng-model="endDate" md-placeholder="Project End Date"
 						md-min-date="minDate" md-max-date="maxDate"
 						onkeydown="return false"
-						></md-datepicker>
+						></md-datepicker></output>
 			<!-- <input type="text" class="form-control" id="experience"
 				name="experience" ng-model="experience" placeholder="Experience" /><br> 
 			<input type="text" class="form-control" id="mobileNumber"

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

@@ -48,7 +48,7 @@
 			<b >Client Address</b></td>
 			<td colspan="8">
 			<!-- <md-input-container class="md-block"> -->
-            <textarea ng-model="clientAddress" id="clientAddress" style="width:100%" md-select-on-focus></textarea>
+            <textarea ng-model="clientAddress" id="clientAddress" placeholder = "Please enter the client address" style="width:100%" md-select-on-focus></textarea>
             <!-- </md-input-container> -->
 			</td>
 			</tr>
@@ -62,7 +62,7 @@
                      </div>     
                 </div>
                 <div style="display: block; float: left; width: 100%;">
-                	<md-select ng-model="managersSelectedList" data-md-container-class="selectHeader" id="selectManager" multiple="" md-selected-text="getSelectedLead()">                                           
+                	<md-select ng-model="managersSelectedList" data-md-container-class="selectHeader" id="selectManager" multiple="" md-selected-text="getSelectedLead()" ng-change="persistSelections()">                                           
                     	<md-select-header class="selectHeaderChild header-spacing" layout="column">
                         	<input ng-model="searchTerm" type="search" id="search" ng-keydown="updateSearch($event)" ng-model-options="{debounce: {'default': 500, 'blur': 0}}"  placeholder="Please Search for a manager"  class="searchBoxHeader demo-header-searchbox md-text search-spacingleft" />
                         	  <span class="glyphicon glyphicon-remove close-mdselect" ng-click="closeSelectBox()"></span>

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

@@ -59,7 +59,7 @@
 				id="shift"> <md-optgroup
 				label="role"> <md-option
 				ng-value="role"
-				ng-repeat="role in roles">{{role.roleName}}</md-option>
+				ng-repeat="role in roles">{{role}}</md-option>
 			</md-optgroup> </md-select>
 			
 			<md-select ng-model="shift"

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

@@ -95,22 +95,43 @@
 											ng-value="empRole"
 											ng-repeat="empRole in employeeRoles">{{empRole}}</md-option>
 											</md-optgroup> </md-select>
+											 <md-select ng-model="employeeShift"
+											md-selected-text="getSelectedEmpShift()"
+											id="empShift"> <md-optgroup
+											label="employee shift"> <md-option
+											ng-value="empShift"
+											ng-repeat="empShift in employeeShifts">{{empShift}}</md-option>
+											</md-optgroup> </md-select>
                                         <md-select ng-model="empBillableStatus " md-selected-text="getSelectedBillableStatus() " id="empBillableStatus"  name="empBillableStatus">
                                             <md-optgroup label="billable statuses ">
                                                 <md-option ng-value="billableStatus " ng-repeat="billableStatus in billableStatuses ">{{billableStatus}}</md-option>
                                             </md-optgroup>
                                         </md-select>
-                                        <div ng-show="empBillableStatus">
-                                         <md-datepicker ng-model="newBillingStartDate" md-placeholder="newBillingStartDate " id="newBillingStartDate " md-min-date="minDate " md-max-date="maxDate "
+                                        <table>
+                                        <tr ng-show="empBillableStatus">
+                                        <td>Current Billability Start Date  </td>
+                                        <td>
+                                         <md-datepicker ng-model="newBillingStartDate" md-placeholder="Plase select Date " id="newBillingStartDate " md-min-date="minDate " md-max-date="maxDate "
                                             onkeydown="return false " ng-change="currentBillabilityDateChange()"name="newBillingStartDate"></md-datepicker>
-                                        </div>
+                                         </td>
+                                        </tr>
                                         
-                                        <md-datepicker ng-model="startDate " md-placeholder="Start Date " id="startDate " md-min-date="minDate " md-max-date="maxDate "
+                                        <tr>
+                                       <td>Start Date</td>
+                                       <td>
+                                        <md-datepicker ng-model="startDate " md-placeholder="Please select Date " id="startDate " md-min-date="minDate " md-max-date="maxDate "
                                             onkeydown="return false " ng-disabled="newBillingStartDate" name="startDate"></md-datepicker>
-                                        </br>
-                                        <md-datepicker ng-model="endDate " md-placeholder="Projected End Date " id="endDate " md-min-date="minDate " md-max-date="maxDate "
+                                        </td>
+                                        </tr>
+                                        
+                                        <tr>
+                                        <td>End Date &nbsp</td>
+                                        <td>
+                                        <md-datepicker ng-model="endDate " md-placeholder="Please select Date " id="endDate " md-min-date="minDate " md-max-date="maxDate "
                                             onkeydown="return false " name="endDate"></md-datepicker>
- 										
+                                            </td>
+                                            </tr>
+ 										</table>
 
                                         <div role="alert ">
                                             <span class="error " style="color: red; ">{{alertMsg}}</span>
@@ -175,23 +196,47 @@
 											ng-value="empRole"
 											ng-repeat="empRole in employeeRoles">{{empRole}}</md-option>
 											</md-optgroup> </md-select>
-
+											
+											
+                                         <md-select ng-model="employeeShift"
+											md-selected-text="getSelectedEmpShift()"
+											id="empShift"> <md-optgroup
+											label="employee shift"> <md-option
+											ng-value="empShift"
+											ng-repeat="empShift in employeeShifts">{{empShift}}</md-option>
+											</md-optgroup> </md-select>
+											
                                         <md-select ng-model="empBillableStatus " md-selected-text="getSelectedBillableStatus() " id="empBillableStatus"  name="empBillableStatus">
                                             <md-optgroup label="billable statuses ">
                                                 <md-option ng-value="billableStatus " ng-repeat="billableStatus in billableStatuses ">{{billableStatus}}</md-option>
                                             </md-optgroup>
                                         </md-select>
-                                        <div ng-show="empBillableStatus">
-                                         <md-datepicker ng-model="newBillingStartDate" md-placeholder="newBillingStartDate " id="newBillingStartDate " md-min-date="minDate " md-max-date="maxDate "
-                                            onkeydown="return false " ng-change="currentBillabilityDateChange()"name="newBillingStartDate"></md-datepicker>
-                                        </div>
                                         
-                                        <md-datepicker ng-model="startDate " md-placeholder="Start Date " id="startDate " md-min-date="minDate " md-max-date="maxDate "
-                                            onkeydown="return false " ng-disabled="newBillingStartDate" name="startDate"></md-datepicker>
-                                        </br>
-                                        <md-datepicker ng-model="endDate " md-placeholder="Projected End Date " id="endDate " md-min-date="minDate " md-max-date="maxDate "
-                                            onkeydown="return false " name="endDate"></md-datepicker>
- 										
+                                        <table>
+                                        	<tr ng-show="empBillableStatus">
+                                       			<td>Current Billability Start Date  </td>
+                                       			<td>
+                                         			<md-datepicker ng-model="newBillingStartDate" md-placeholder="Please select Date " id="newBillingStartDate " md-min-date="minDate " md-max-date="maxDate "
+                                           			onkeydown="return false" name="newBillingStartDate"></md-datepicker>
+                                            	</td>
+                                        	</tr>
+                                        	
+                                        	<tr>
+                                        		<td>Start Date</td>
+												<td>
+                                       			 	<md-datepicker ng-model="startDate " md-placeholder="Please select Date" id="startDate " md-min-date="minDate " md-max-date="maxDate "
+                                            		onkeydown="return false " name="startDate"></md-datepicker>
+                                            	</td>
+                                         	</tr>
+                                         	
+                                        	<tr>
+                                        		<td>End Date &nbsp</td>
+                                        		<td>
+                                        			<md-datepicker ng-model="endDate " md-placeholder="Please select Date" id="endDate " md-min-date="minDate " md-max-date="maxDate "
+                                            		onkeydown="return false " name="endDate"></md-datepicker>
+                                            	</td>
+                                            </tr>
+ 										</table>
 
                                         <div role="alert ">
                                             <span class="error " style="color: red; ">{{alertMsg}}</span>