Skip to content

M
mytime
Commit 055fb8dc authored by Prayas Jain's avatar Prayas Jain
Browse files
Options

Updated Employee sub status fields

parent 7f3bd5e9
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 7 deletions
src/main/webapp/WEB-INF/controllers/AssignRolesController.js
View file @ 055fb8dc
......@@ -466,11 +466,16 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $
var subStatusStartDate = $scope.subStatusStartDate;
var subStatusEndDate = $scope.subStatusEndDate;
var empSubStatusObj = {
id:null,
employeeID: $scope.empId,
subStatus : empSubStatus,
fromDate: subStatusStartDate,
toDate: subStatusEndDate
subStatus : $scope.empSubStatus,
fromDate: $scope.subStatusStartDate,
toDate: $scope.subStatusEndDate
};
var prevEmpSubStatusObj = {
employeeID: dataToPass.employeeId,
subStatus : dataToPass.empSubStatus,
fromDate: dataToPass.subStatusStartDate,
toDate: dataToPass.subStatusEndDate
};
if(searchId == ""){
$scope.alertMsg = "Employee Id is mandatory";
......@@ -581,7 +586,7 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $
"role": dataToPass.role, "empLocation": dataToPass.empLocation,"designation": dataToPass.designation,"functionalGroup": dataToPass.functionalGroup,
"empStatus": dataToPass.empStatus,"empSubStatus":dataToPass.empSubStatus, "employmentType": dataToPass.employmentType,"dateOfJoining":new Date(dataToPass.dateOfJoining),
"dateOfBirth":new Date(dataToPass.dateOfBirth),"hasPassort":dataToPass.hasPassort,"hasB1":dataToPass.hasB1,"passportExpiryDate":new Date(dataToPass.passportExpiryDate),
"b1ExpiryDate":new Date(dataToPass.b1ExpiryDate), "endDate":new Date(dataToPass.endDate) , "subStatusStartDate": new Date(dataToPass.subStatusStartDate) ,"subStatusEndDate": new Date(dataToPass.subStatusEndDate)
"b1ExpiryDate":new Date(dataToPass.b1ExpiryDate), "endDate":new Date(dataToPass.endDate) ,"empSubStatus": prevEmpSubStatusObj
};
objectConstructionBasedOnParameters(recordFromDb);
objectConstructionBasedOnParameters(record);
......@@ -633,19 +638,31 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $
}
$scope.cancel = function() {
var empSubStatusObj = {
employeeID: $scope.empId,
subStatus : $scope.empSubStatus,
fromDate: $scope.subStatusStartDate,
toDate: $scope.subStatusEndDate
};
var prevEmpSubStatusObj = {
employeeID: dataToPass.employeeId,
subStatus : dataToPass.empSubStatus,
fromDate: dataToPass.subStatusStartDate,
toDate: dataToPass.subStatusEndDate
};
var record = {
"employeeId":$scope.empId, "employeeName": $scope.empName, "gender": $scope.gender,"emailId": $scope.empEmail,
"role": $scope.empRole, "empLocation": $scope.empLocation,"designation": $scope.designation,"functionalGroup": $scope.functionalGroup,
"empStatus": $scope.empStatus, "empSubStatus":$scope.empSubStatus, "employmentType": $scope.employmentType,"dateOfJoining":$scope.dateOfJoining,
"dateOfBirth":$scope.dateOfBirth,"hasPassort":$scope.hasPassort,"hasB1":$scope.hasB1,"passportExpiryDate":$scope.passportExpiryDate,
"b1ExpiryDate":$scope.b1ExpiryDate, "endDate":$scope.exitDate , "subStatusStartDate":$scope.subStatusStartDate,"subStatusEndDate":$scope.subStatusEndDate
"b1ExpiryDate":$scope.b1ExpiryDate, "endDate":$scope.exitDate ,"empSubStatus":empSubStatusObj
};
var recordFromDb = {
"employeeId":dataToPass.employeeId, "employeeName": dataToPass.employeeName, "gender": dataToPass.gender,"emailId": dataToPass.emailId,
"role": dataToPass.role, "empLocation": dataToPass.empLocation,"designation": dataToPass.designation,"functionalGroup": dataToPass.functionalGroup,
"empStatus": dataToPass.empStatus, "empSubStatus":dataToPass.empSubStatus, "employmentType": dataToPass.employmentType,"dateOfJoining":new Date(dataToPass.dateOfJoining),
"dateOfBirth":new Date(dataToPass.dateOfBirth),"hasPassort":dataToPass.hasPassort,"hasB1":dataToPass.hasB1,"passportExpiryDate":new Date(dataToPass.passportExpiryDate),
"b1ExpiryDate":new Date(dataToPass.b1ExpiryDate), "endDate":new Date(dataToPass.endDate) ,"subStatusStartDate": new Date(dataToPass.subStatusStartDate) ,"subStatusEndDate": new Date(dataToPass.subStatusEndDate)
"b1ExpiryDate":new Date(dataToPass.b1ExpiryDate), "endDate":new Date(dataToPass.endDate) , "empSubStatus":prevEmpSubStatusObj
};
objectConstructionBasedOnParameters(recordFromDb);
objectConstructionBasedOnParameters(record);
......
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