Skip to content

M
mytime
Commit 88f9effd authored by dgoud-nisum-com's avatar dgoud-nisum-com Committed by rbonthala-nisum-com
Browse files
Options

NewChanges_done (#105)

parent 8a8b4903
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 15 deletions
src/main/java/com/nisum/mytime/service/ProjectServiceImpl.java
View file @ 88f9effd
...@@ -342,6 +342,7 @@ public class ProjectServiceImpl implements ProjectService { ...@@ -342,6 +342,7 @@ public class ProjectServiceImpl implements ProjectService {
projectTeamMate.getProjectId()); projectTeamMate.getProjectId());
existingTeammate.setProjectId(projectTeamMate.getProjectId()); existingTeammate.setProjectId(projectTeamMate.getProjectId());
existingTeammate.setProjectName(projectTeamMate.getProjectName()); existingTeammate.setProjectName(projectTeamMate.getProjectName());
existingTeammate.setRole(projectTeamMate.getRole());
if (existingTeammate.getBillableStatus() == null if (existingTeammate.getBillableStatus() == null
|| projectTeamMate.getBillableStatus() != null || projectTeamMate.getBillableStatus() != null
&& existingTeammate.getBillableStatus() != null && existingTeammate.getBillableStatus() != null
......
src/main/webapp/WEB-INF/controllers/AttendanceReportController.js
View file @ 88f9effd
...@@ -14,9 +14,9 @@ myApp.controller("attendanceReportController", function($scope, $http, myFactory ...@@ -14,9 +14,9 @@ myApp.controller("attendanceReportController", function($scope, $http, myFactory
pageNumber: 1, pageNumber: 1,
pageSize:10, pageSize:10,
columnDefs : [ columnDefs : [
{field : 'employeeId',displayName: 'Employee Id', enableColumnMenu: false, enableSorting: true}, {field : 'employeeId',displayName: 'Employee Id', enableColumnMenu: false, enableSorting: true,enableFiltering: true},
{field : 'employeeName',displayName: 'Employee Name', enableColumnMenu: false, enableSorting: false}, {field : 'employeeName',displayName: 'Employee Name', enableColumnMenu: false, enableSorting: false, enableFiltering: true},
{field : 'ifPresent',displayName: 'Status', enableColumnMenu: false, enableSorting: false} {field : 'ifPresent',displayName: 'Status', enableColumnMenu: false, enableSorting: false, enableFiltering: true}
], ],
enableGridMenu: true, enableGridMenu: true,
enableSelectAll: true, enableSelectAll: true,
......
src/main/webapp/WEB-INF/controllers/LoginController.js
View file @ 88f9effd
...@@ -263,7 +263,7 @@ myApp.controller("loginController",function($scope, myFactory, $compile, $window ...@@ -263,7 +263,7 @@ myApp.controller("loginController",function($scope, myFactory, $compile, $window
menuItems.push({"menu" : "Import Data","icon" : "fa fa-upload fa-2x","path" : "templates/exportData.html"}); menuItems.push({"menu" : "Import Data","icon" : "fa fa-upload fa-2x","path" : "templates/exportData.html"});
}else if(role == "Delivery Lead"){ }else if(role == "Delivery Lead"){
//menuItems.push({"menu" : "Manage Employees","icon" : "fa fa-user-plus fa-2x","path" : "templates/roles.html"}); //menuItems.push({"menu" : "Manage Employees","icon" : "fa fa-user-plus fa-2x","path" : "templates/roles.html"});
menuItems.push({"menu" : "Manage Team","icon" : "fa fa-sitemap fa-2x","path" : "templates/projectDetails.html"}); //menuItems.push({"menu" : "Manage Team","icon" : "fa fa-sitemap fa-2x","path" : "templates/projectDetails.html"});
menuItems.push({"menu" : "Manage Projects","icon" : "fa fa-tasks fa-2x","path" : "templates/projects.html"}); menuItems.push({"menu" : "Manage Projects","icon" : "fa fa-tasks fa-2x","path" : "templates/projects.html"});
menuItems.push({"menu" : "Employee Login Details","icon" : "fa fa-users fa-2x","path" : "templates/employees.html"}); menuItems.push({"menu" : "Employee Login Details","icon" : "fa fa-users fa-2x","path" : "templates/employees.html"});
//menuItems.push({"menu" : "Login Reports","icon" : "fa fa-pie-chart fa-2x","path" : "templates/reports.html"}); //menuItems.push({"menu" : "Login Reports","icon" : "fa fa-pie-chart fa-2x","path" : "templates/reports.html"});
...@@ -308,7 +308,7 @@ myApp.controller("loginController",function($scope, myFactory, $compile, $window ...@@ -308,7 +308,7 @@ myApp.controller("loginController",function($scope, myFactory, $compile, $window
menuItems.push({"menu" : "Manage Accounts","icon" : "fa fa fa-money fa-2x","path" : "templates/accounts.html"}); menuItems.push({"menu" : "Manage Accounts","icon" : "fa fa fa-money fa-2x","path" : "templates/accounts.html"});
menuItems.push({"menu" : "Manage Domains","icon" : "fa fa fa-cubes fa-2x","path" : "templates/domains.html"}); menuItems.push({"menu" : "Manage Domains","icon" : "fa fa fa-cubes fa-2x","path" : "templates/domains.html"});
menuItems.push({"menu" : "Manage Projects","icon" : "fa fa-tasks fa-2x","path" : "templates/projects.html"}); menuItems.push({"menu" : "Manage Projects","icon" : "fa fa-tasks fa-2x","path" : "templates/projects.html"});
menuItems.push({"menu" : "Manage Team","icon" : "fa fa-sitemap fa-2x","path" : "templates/projectDetails.html"}); //menuItems.push({"menu" : "Manage Team","icon" : "fa fa-sitemap fa-2x","path" : "templates/projectDetails.html"});
menuItems.push({"menu" : "Manage Visa","icon" : "fa fa-empire fa-2x","path" : "templates/visaList.html"}); menuItems.push({"menu" : "Manage Visa","icon" : "fa fa-empire fa-2x","path" : "templates/visaList.html"});
menuItems.push({"menu" : "Manage Travels","icon" : "fa fa-tasks fa-2x","path" : "templates/onsiteTravelsList.html"}); menuItems.push({"menu" : "Manage Travels","icon" : "fa fa-tasks fa-2x","path" : "templates/onsiteTravelsList.html"});
menuItems.push({"menu" : "Employee Login Details","icon" : "fa fa-users fa-2x","path" : "templates/employees.html"}); menuItems.push({"menu" : "Employee Login Details","icon" : "fa fa-users fa-2x","path" : "templates/employees.html"});
......
src/main/webapp/WEB-INF/controllers/ProjectController.js
View file @ 88f9effd
...@@ -502,8 +502,9 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -502,8 +502,9 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
columnDefs: [ columnDefs: [
{ field: 'employeeId', displayName: 'Emp ID', enableColumnMenu: true, enableSorting: true, width: 100 }, { field: 'employeeId', displayName: 'Emp ID', enableColumnMenu: true, enableSorting: true, width: 100 },
{ field: 'employeeName', displayName: 'Empl Name ', enableColumnMenu: false, enableSorting: false }, { field: 'employeeName', displayName: 'Empl Name ', enableColumnMenu: false, enableSorting: false },
{ field: 'emailId', displayName: 'Email Id ', enableColumnMenu: false, enableSorting: false }, // { field: 'emailId', displayName: 'Email Id ', enableColumnMenu: false, enableSorting: false },
{ field: 'experience', displayName: 'Exp', enableColumnMenu: true, enableSorting: true, width: 80 }, // { field: 'experience', displayName: 'Exp', enableColumnMenu: true, enableSorting: true, width: 80 },
{field: 'role', displayName:'Role', enableColumnMenu: true, enableSorting: false,enableFiltering:true},
{ field: 'designation', displayName: 'Designation ', enableColumnMenu: false, enableSorting: false }, { field: 'designation', displayName: 'Designation ', enableColumnMenu: false, enableSorting: false },
{ field: 'active', displayName: 'Status ', enableColumnMenu: false, enableSorting: false, cellTemplate: getCellActiveTemplate }, { field: 'active', displayName: 'Status ', enableColumnMenu: false, enableSorting: false, cellTemplate: getCellActiveTemplate },
{ field: 'billableStatus', displayName: 'Billability ', enableColumnMenu: false, enableSorting: false }, { field: 'billableStatus', displayName: 'Billability ', enableColumnMenu: false, enableSorting: false },
...@@ -516,6 +517,13 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -516,6 +517,13 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
url: appConfig.appUri + "/projectTeam/getProjectDetails?projectId=" + $scope.projectId url: appConfig.appUri + "/projectTeam/getProjectDetails?projectId=" + $scope.projectId
}).then(function mySuccess(response) { }).then(function mySuccess(response) {
$scope.gridOptions.data = response.data; $scope.gridOptions.data = response.data;
for(i=0;i<response.data.length;i++){
if(response.data[i].role == 'Employee'){
$scope.gridOptions.data[i].role = "Individual Contributor";
}else{
$scope.gridOptions.data[i].role = "Lead";
}
}
}, function myError(response) { }, function myError(response) {
showAlert("Something went wrong while fetching data!!!"); showAlert("Something went wrong while fetching data!!!");
$scope.gridOptions.data = []; $scope.gridOptions.data = [];
...@@ -622,7 +630,12 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -622,7 +630,12 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
// $scope.employeeModel.employeeName = userData.employeeName; // $scope.employeeModel.employeeName = userData.employeeName;
// $scope.employeeModel.emailId = userData.emailId; // $scope.employeeModel.emailId = userData.emailId;
$scope.empBillableStatus = userData.billableStatus; $scope.empBillableStatus = userData.billableStatus;
$scope.employeeRole = userData.role; if(userData.role == "Individual Contributor"){
$scope.employeeRole = "Employee";
}else{
$scope.employeeRole = "Lead";
}
//$scope.employeeRole = userData.role;
$scope.employeeShift = userData.shift; $scope.employeeShift = userData.shift;
$scope.newBillingStartDate = new Date(userData.newBillingStartDate); $scope.newBillingStartDate = new Date(userData.newBillingStartDate);
$scope.startDate = new Date(userData.startDate); $scope.startDate = new Date(userData.startDate);
...@@ -1253,6 +1266,14 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -1253,6 +1266,14 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
} }
else if(action == "Add"){ else if(action == "Add"){
$scope.gridOptions.data.push(record); $scope.gridOptions.data.push(record);
console.log($scope.gridOptions.data);
for(i=0;i<$scope.gridOptions.data.length;i++){
if($scope.gridOptions.data[i].role == 'Employee'){
$scope.gridOptions.data[i].role = "Individual Contributor";
}else{
$scope.gridOptions.data[i].role = "Lead";
}
}
} }
} else { } else {
$mdDialog.hide("Error"); $mdDialog.hide("Error");
...@@ -1286,6 +1307,13 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -1286,6 +1307,13 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
url: appConfig.appUri + "/projectTeam/getProjectDetails?projectId=" + projectId url: appConfig.appUri + "/projectTeam/getProjectDetails?projectId=" + projectId
}).then(function mySuccess(response) { }).then(function mySuccess(response) {
$scope.gridOptions.data = response.data; $scope.gridOptions.data = response.data;
for(i=0;i<$scope.gridOptions.data.length;i++){
if($scope.gridOptions.data[i].role == 'Employee'){
$scope.gridOptions.data[i].role = "Individual Contributor";
}else{
$scope.gridOptions.data[i].role = "Lead";
}
}
}, function myError(response) { }, function myError(response) {
showAlert("Something went wrong while fetching data!!!"); showAlert("Something went wrong while fetching data!!!");
$scope.gridOptions.data = []; $scope.gridOptions.data = [];
......
src/main/webapp/WEB-INF/controllers/ReporteesController.js
View file @ 88f9effd
...@@ -23,8 +23,8 @@ myApp.controller("employeesController", function($scope, $http, myFactory, $mdDi ...@@ -23,8 +23,8 @@ myApp.controller("employeesController", function($scope, $http, myFactory, $mdDi
pageNumber: 1, pageNumber: 1,
pageSize:10, pageSize:10,
columnDefs : [ columnDefs : [
{field : 'employeeId',displayName: 'Employee ID', enableColumnMenu: true, enableSorting: true}, {field : 'employeeId',displayName: 'Employee ID', enableColumnMenu: true, enableSorting: true, enableFiltering: true},
{field : 'employeeName',displayName: 'Name', enableColumnMenu: false, enableSorting: false}, {field : 'employeeName',displayName: 'Employee Name', enableColumnMenu: false, enableSorting: false, enableFiltering: true},
{field : 'dateOfLogin',displayName: 'Date', enableColumnMenu: true, enableSorting: true}, {field : 'dateOfLogin',displayName: 'Date', enableColumnMenu: true, enableSorting: true},
{field : 'firstLogin',displayName: 'Login Time', enableColumnMenu: false,enableSorting: false}, {field : 'firstLogin',displayName: 'Login Time', enableColumnMenu: false,enableSorting: false},
{field : 'lastLogout',displayName: 'Logout Time', enableColumnMenu: false, enableSorting: false}, {field : 'lastLogout',displayName: 'Logout Time', enableColumnMenu: false, enableSorting: false},
......
src/main/webapp/WEB-INF/controllers/TravelController.js
View file @ 88f9effd
...@@ -34,8 +34,8 @@ myApp.controller("travelController",function($scope, myFactory, $mdDialog, $http ...@@ -34,8 +34,8 @@ myApp.controller("travelController",function($scope, myFactory, $mdDialog, $http
//enableCellEditOnFocus: true, //enableCellEditOnFocus: true,
enableFiltering: true, enableFiltering: true,
columnDefs : [ columnDefs : [
{field : 'employeeId',displayName: 'ID', enableColumnMenu: true, enableSorting: true, width:100,enableFiltering: false}, {field : 'employeeId',displayName: 'Emp ID', enableColumnMenu: true, enableSorting: true, width:100,enableFiltering: true},
{field : 'employeeName',displayName: 'Name', enableColumnMenu: false, enableSorting: false, enableCellEdit: false,enableFiltering: false,width:200}, {field : 'employeeName',displayName: 'Emp Name', enableColumnMenu: false, enableSorting: true, enableCellEdit: false,enableFiltering: true,width:200},
{field : 'visaName',displayName: 'Visa', enableColumnMenu: false, enableSorting: false, enableFiltering: true,width:100}, {field : 'visaName',displayName: 'Visa', enableColumnMenu: false, enableSorting: false, enableFiltering: true,width:100},
//{field : 'visaCountry',displayName: 'Country', enableColumnMenu: false, enableSorting: true,enableFiltering: false}, //{field : 'visaCountry',displayName: 'Country', enableColumnMenu: false, enableSorting: true,enableFiltering: false},
//{field : 'visaNo',displayName: 'Visa No', enableColumnMenu: false,enableFiltering: false, enableSorting: true}, //{field : 'visaNo',displayName: 'Visa No', enableColumnMenu: false,enableFiltering: false, enableSorting: true},
......
src/main/webapp/WEB-INF/controllers/VisaController.js
View file @ 88f9effd
...@@ -33,11 +33,11 @@ myApp.controller("visaController",function($scope, myFactory, $mdDialog, $http, ...@@ -33,11 +33,11 @@ myApp.controller("visaController",function($scope, myFactory, $mdDialog, $http,
//enableCellEditOnFocus: true, //enableCellEditOnFocus: true,
enableFiltering: true, enableFiltering: true,
columnDefs : [ columnDefs : [
{field : 'employeeId',displayName: 'Emp ID', enableColumnMenu: true, enableSorting: true, width:100,enableFiltering: false}, {field : 'employeeId',displayName: 'Emp ID', enableColumnMenu: true, enableSorting: true, width:100,enableFiltering: true},
{field : 'employeeName',displayName: 'Name', enableColumnMenu: false, enableSorting: false, enableCellEdit: false,enableFiltering: false, width:300}, {field : 'employeeName',displayName: 'Emp Name', enableColumnMenu: false, enableSorting: false, enableCellEdit: false,enableFiltering: true, width:300},
{field : 'visaName',displayName: 'Visa Name', enableColumnMenu: false, enableSorting: false, enableFiltering: true}, {field : 'visaName',displayName: 'Visa Name', enableColumnMenu: false, enableSorting: false, enableFiltering: true},
//{field : 'visaCountry',displayName: 'Country', enableColumnMenu: false, enableSorting: true,enableFiltering: false}, //{field : 'visaCountry',displayName: 'Country', enableColumnMenu: false, enableSorting: true,enableFiltering: false},
{field : 'visaNo',displayName: 'Visa No', enableColumnMenu: false,enableFiltering: false, enableSorting: true}, {field : 'visaNo',displayName: 'Visa No', enableColumnMenu: false,enableFiltering: true, enableSorting: true},
//{field : 'visaIntiatedDate',displayName: 'Intiated Date', enableColumnMenu: false, enableSorting: false,enableFiltering: false, cellFilter: 'date:"dd-MMM-yyyy"'}, //{field : 'visaIntiatedDate',displayName: 'Intiated Date', enableColumnMenu: false, enableSorting: false,enableFiltering: false, cellFilter: 'date:"dd-MMM-yyyy"'},
//{field : 'approvedDate',displayName: 'Approved Date', enableColumnMenu: false, enableSorting: false,enableFiltering: false, cellFilter: 'date:"dd-MMM-yyyy"'}, //{field : 'approvedDate',displayName: 'Approved Date', enableColumnMenu: false, enableSorting: false,enableFiltering: false, cellFilter: 'date:"dd-MMM-yyyy"'},
{field : 'visaExpiryDate',displayName: 'Expired Date', enableColumnMenu: false, enableSorting: false,enableFiltering: false, cellFilter: 'date:"dd-MMM-yyyy"'}, {field : 'visaExpiryDate',displayName: 'Expired Date', enableColumnMenu: false, enableSorting: false,enableFiltering: false, cellFilter: 'date:"dd-MMM-yyyy"'},
......
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