Skip to content

M
mytime
Commit c2d1fe39 authored by mshaik-nisum-com's avatar mshaik-nisum-com Committed by rbonthala-nisum-com
Browse files
Options

Given edit option for Bench project , Nisum India Account, Nisum India Domain... 

Given edit option for Bench project , Nisum India Account, Nisum India Domain and some validation (#166)
parent 260287c4
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
src/main/java/com/nisum/mytime/controller/UserController.java
View file @ c2d1fe39
...@@ -190,7 +190,7 @@ public class UserController { ...@@ -190,7 +190,7 @@ public class UserController {
public ResponseEntity<List<Account>> getAccounts() throws MyTimeException { public ResponseEntity<List<Account>> getAccounts() throws MyTimeException {
List<Account> technologies = userService.getAccounts().stream() List<Account> technologies = userService.getAccounts().stream()
.filter(e -> "Y".equalsIgnoreCase(e.getStatus())) .filter(e -> "Y".equalsIgnoreCase(e.getStatus()))
.filter(a -> !("Nisum India".equalsIgnoreCase(a.getAccountName()))) //.filter(a -> !("Nisum India".equalsIgnoreCase(a.getAccountName())))
// .map(Account::getAccountName).sorted() // .map(Account::getAccountName).sorted()
.collect(Collectors.toList()); .collect(Collectors.toList());
return new ResponseEntity<>(technologies, HttpStatus.OK); return new ResponseEntity<>(technologies, HttpStatus.OK);
......
src/main/webapp/WEB-INF/controllers/DomainController.js
View file @ c2d1fe39
...@@ -12,7 +12,7 @@ myApp.controller("domainController", ...@@ -12,7 +12,7 @@ myApp.controller("domainController",
}); });
var getCellTemplate = '<p class="col-lg-12"><i class="fa fa-pencil-square-o fa-2x" ng-show="row.entity.domainName != \'Nisum India\'" aria-hidden="true" id="UpdateBtnVisible" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="center" title="Edit" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Update\')"></i></p>' var getCellTemplate = '<p class="col-lg-12"><i class="fa fa-pencil-square-o fa-2x" aria-hidden="true" id="UpdateBtnVisible" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="center" title="Edit" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Update\')"></i></p>'
// + // +
// '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i ng-show="row.entity.status == \'InActive\'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</i><i class="fa fa-minus-circle fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="left" title="Delete" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Delete\')"></i></p>'; // '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i ng-show="row.entity.status == \'InActive\'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</i><i class="fa fa-minus-circle fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="left" title="Delete" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Delete\')"></i></p>';
......
src/main/webapp/WEB-INF/controllers/LeftMenuController.js
View file @ c2d1fe39
...@@ -11,7 +11,7 @@ myApp.controller("leftmenuController",function($scope, myFactory, $compile){ ...@@ -11,7 +11,7 @@ myApp.controller("leftmenuController",function($scope, myFactory, $compile){
path = "'"+path+"'"; path = "'"+path+"'";
var currentEle = event.currentTarget; var currentEle = event.currentTarget;
$('.navbarMenu').removeClass('activeMenu'); $('.navbarMenu').removeClass('activeMenu');
$(currentEle).addClass('activeMenu');   $(currentEle).addClass('activeMenu');
element.setAttribute("ng-include", path); element.setAttribute("ng-include", path);
var newTemplate = angular.element(element); var newTemplate = angular.element(element);
$('#main').html(newTemplate); $('#main').html(newTemplate);
......
src/main/webapp/WEB-INF/controllers/ProjectController.js
View file @ c2d1fe39
...@@ -34,7 +34,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -34,7 +34,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
var getCellTemplate = '<p class="col-lg-12"><i class="fa fa-users fa-2x" aria-hidden="true" style="font-size:1.4em;margin-top:3px;cursor:pointer;" ng-class="{ \'my-css-class\': grid.appScope.rowFormatter( row ) }" data-placement="center" title="View" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'View\')" ></i>' + var getCellTemplate = '<p class="col-lg-12"><i class="fa fa-users fa-2x" aria-hidden="true" style="font-size:1.4em;margin-top:3px;cursor:pointer;" ng-class="{ \'my-css-class\': grid.appScope.rowFormatter( row ) }" data-placement="center" title="View" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'View\')" ></i>' +
'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i ng-show="row.entity.projectName != \'Bench\' && row.entity.status == \'Active\'" class="fa fa-pencil-square-o fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="center" title="Edit" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Update\')"></i></p>' ; '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i ng-show="row.entity.status == \'Active\'" class="fa fa-pencil-square-o fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="center" title="Edit" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Update\')"></i></p>' ;
// '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i class="fa fa-minus-circle fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="left" title="Delete" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Delete\')"></i></p>' // '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i class="fa fa-minus-circle fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="left" title="Delete" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Delete\')"></i></p>'
...@@ -58,7 +58,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -58,7 +58,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
$scope.gridOptions.data = $scope.records; $scope.gridOptions.data = $scope.records;
$scope.rowFormatter = function( row ) { $scope.rowFormatter = function( row ) {
return (row.entity.status == 'Active' && row.entity.projectName != "Bench"); return (row.entity.status == 'Active');
}; };
$scope.getRowData = function (row, action) { $scope.getRowData = function (row, action) {
...@@ -326,7 +326,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -326,7 +326,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
$scope.projectModel; $scope.projectModel;
$scope.isSecondTab = false; $scope.isSecondTab = false;
$scope.prjctStses=["Active","Completed","On Hold","Proposed"]; $scope.prjctStses=["Active","Completed","On Hold","Proposed"];
$scope.billableStatuses = ["Billable","Shadow","Non-Billable","Reserved"]; $scope.billableStatuses = ["Billable", "Shadow", "Non-Billable", "Reserved", "Trainee"];
$scope.employeeShifts = myFactory.getShifts(); $scope.employeeShifts = myFactory.getShifts();
$scope.deliveryLeadIds = dataToPass.deliveryLeadIds; $scope.deliveryLeadIds = dataToPass.deliveryLeadIds;
var allAccounts = myFactory.getAccounts(); var allAccounts = myFactory.getAccounts();
...@@ -522,7 +522,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -522,7 +522,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
'projectId': dataToPass.projectId 'projectId': dataToPass.projectId
}; };
$scope.status = "Active"; $scope.status = "Active";
$scope.isSecondTab = ($scope.projectId == 'Nisum0000'); //$scope.isSecondTab = ($scope.projectId == 'Nisum0000');
var employeeModel = $scope.employeeModel; var employeeModel = $scope.employeeModel;
var getCellTemplate1 = '<p class="col-md-6 col-md-offset-3"><i class="fa fa-pencil-square-o fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.getRowData(row,\'UpdateTeam\')"></i><p>' var getCellTemplate1 = '<p class="col-md-6 col-md-offset-3"><i class="fa fa-pencil-square-o fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.getRowData(row,\'UpdateTeam\')"></i><p>'
......
src/main/webapp/WEB-INF/controllers/assignAccountsController.js
View file @ c2d1fe39
...@@ -9,7 +9,7 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo ...@@ -9,7 +9,7 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
"action":"", "action":"",
"clientAddress":"" "clientAddress":""
}; };
var getCellTemplate = '<p class="col-lg-12"><i class="fa fa-pencil-square-o fa-2x" ng-show="row.entity.accountName != \'Nisum India\'" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="center" title="Edit" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Update\')"></i></p>'; var getCellTemplate = '<p class="col-lg-12"><i class="fa fa-pencil-square-o fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="center" title="Edit" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Update\')"></i></p>';
// +'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i ng-show="row.entity.status == \'InActive\'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</i><i class="fa fa-minus-circle fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="left" title="Delete" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Delete\')"></i></p>'; // +'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i ng-show="row.entity.status == \'InActive\'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</i><i class="fa fa-minus-circle fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="left" title="Delete" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Delete\')"></i></p>';
......
src/main/webapp/WEB-INF/web.xml
View file @ c2d1fe39
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" id="WebApp_ID"> <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" id="WebApp_ID">
<display-name>mytime</display-name> <display-name>mytime</display-name>
<welcome-file-list> <welcome-file-list>
<welcome-file>index.html</welcome-file> <welcome-file>index.html</welcome-file>
......
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