Commit fd47236e authored by BH04921's avatar BH04921

MT-72_Commited_changes_on_review_comments.

parent aa1fb2a5
...@@ -190,9 +190,8 @@ public class ProjectServiceImpl implements ProjectService { ...@@ -190,9 +190,8 @@ public class ProjectServiceImpl implements ProjectService {
for (ProjectTeamMate pteamMate : activeBenchProject) { for (ProjectTeamMate pteamMate : activeBenchProject) {
Date d = pT.getStartDate() != null ? pT.getStartDate() Date d = pT.getStartDate() != null ? pT.getStartDate()
: new Date(); : new Date();
d.setDate(d.getDate() - 1);
pteamMate.setActive(false); pteamMate.setActive(false);
pteamMate.setEndDate(d); pteamMate.setEndDate(DateUtils.truncate(DateUtils.addDays(d, -1), Calendar.DATE));
projectTeamMatesRepo.save(pteamMate); projectTeamMatesRepo.save(pteamMate);
} }
} }
......
...@@ -254,9 +254,6 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog, ...@@ -254,9 +254,6 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog,
}; };
function deleteUserRole(empId, projectId,id){ function deleteUserRole(empId, projectId,id){
var record = {"id":id,"employeeId":empId,"projectId":projectId}; var record = {"id":id,"employeeId":empId,"projectId":projectId};
var req = { var req = {
method : 'POST', method : 'POST',
...@@ -297,7 +294,6 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog, ...@@ -297,7 +294,6 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog,
} }
function AddProjectTeamController($scope, $mdDialog, dataToPass, gridOptionsData,employees) { function AddProjectTeamController($scope, $mdDialog, dataToPass, gridOptionsData,employees) {
console.log("data",dataToPass, gridOptionsData,employees);
$scope.templateTitle = dataToPass.action; $scope.templateTitle = dataToPass.action;
$scope.alertMsg = ""; $scope.alertMsg = "";
$scope.isDisabled = false; $scope.isDisabled = false;
...@@ -731,7 +727,6 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog, ...@@ -731,7 +727,6 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog,
} }
function addOrUpdateRole(record, action){ function addOrUpdateRole(record, action){
console.log("record",record);
var urlRequest = ""; var urlRequest = "";
if(action == "Add"){ if(action == "Add"){
urlRequest = appConfig.appUri+ "projectTeam/addEmployeeToTeam"; urlRequest = appConfig.appUri+ "projectTeam/addEmployeeToTeam";
...@@ -751,7 +746,6 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog, ...@@ -751,7 +746,6 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog,
$scope.objectId = response.data.id; $scope.objectId = response.data.id;
}, function myError(response){ }, function myError(response){
$scope.result = "Error"; $scope.result = "Error";
console.log("error in 748")
}); });
} }
......
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