Merge pull request #89 from nisum-inc/MyTeamMate_Defects

myteam mate changes

src/main/java/com/nisum/mytime/service/ProjectServiceImpl.java

@@ -369,14 +369,19 @@ public class ProjectServiceImpl implements ProjectService {
             billings.setProjectName(projectTeamMate.getProjectName());
             billings.setBillableStatus(projectTeamMate.getBillableStatus());
             billings.setActive(true);
+            //TODO
+            Date d = projectTeamMate.getNewBillingStartDate();
+            d.setDate(d.getDate() + 1);
             billings.setBillingStartDate(DateUtils.truncate(
-                    projectTeamMate.getNewBillingStartDate(), Calendar.DATE));
+                    d, Calendar.DATE));
+            existingTeammate.setNewBillingStartDate(DateUtils.truncate(d, Calendar.DATE));
             billings.setBillingEndDate(DateUtils
                     .truncate(projectTeamMate.getEndDate(), Calendar.DATE));
             billings.setCreateDate(new Date());
             addEmployeeBillingDetails(billings);
             // TODO
         }
+
         existingTeammate.setBillableStatus(projectTeamMate.getBillableStatus());
         existingTeammate.setStartDate(projectTeamMate.getStartDate());
         existingTeammate.setEndDate(projectTeamMate.getEndDate());

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

@@ -682,7 +682,7 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog,
 				else {
 					
 					$scope.alertMsg = "";
-					var record = {"employeeId":employeeModel.employeeId, "employeeName":employeeModel.employeeName, "emailId": employeeModel.emailId, "role": employeeModel.role, "designation":employeeModel.designation,"shift": employeeModel.shift,"projectId":projectModel.projectId,"projectName":projectModel.projectName,"account":$scope.projectModel.account,"managerId":myFactory.getEmpId(),"managerName":myFactory.getEmpName(),"mobileNumber":employeeModel.mobileNumber,"active":true,"billableStatus":$scope.empBillableStatus,"startDate":$scope.startDate,"endDate":$scope.endDate,"newBillingStartDate":$scope.newBillingStartDate};
+					var record = {"employeeId":employeeModel.employeeId, "employeeName":employeeModel.employeeName, "emailId": employeeModel.emailId, "role": employeeModel.role, "designation":employeeModel.designation,"shift": employeeModel.shift,"projectId":projectModel.projectId,"projectName":projectModel.projectName,"account":$scope.projectModel.account,"managerId":myFactory.getEmpId(),"managerName":myFactory.getEmpName(),"mobileNumber":employeeModel.mobileNumber,"active":true,"billableStatus":$scope.empBillableStatus,"startDate":$scope.startDate,"endDate":$scope.endDate,"newBillingStartDate":$scope.newBillingStartDate,"accountId":$scope.projectModel.accountId,"domainId":$scope.projectModel.domainId};
 					addOrUpdateRole(record, $scope.templateTitle);
 					$timeout(function(){updateGrid($scope.templateTitle, record)},500);
 				}

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

@@ -35,6 +35,13 @@
 			<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"
+						md-min-date="minDate" md-max-date="maxDate"
+						onkeydown="return false"
+						></md-datepicker></br></output>			
+			</div>
 			<md-datepicker ng-model="startDate" md-placeholder="Start Date"
 						md-min-date="minDate" md-max-date="maxDate"
 						onkeydown="return false"