Added Move to bench Icon

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

@@ -604,11 +604,12 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
 		    };
 			$scope.status = "Active";
 			//$scope.isSecondTab = ($scope.projectId == 'Nisum0000');
-			
+			//grid.appScope.compareDates(row.entity.billingEndDate)
 			var employeeModel = $scope.employeeModel;
 			var getCellTemplate1 = '<p class="col-lg-12"><i ng-show="!row.entity.editrow" 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.edit(row)"></i>'+
 			'<i ng-show="row.entity.editrow" class="fa fa-save fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.saveRow(row.entity,\'Update\')"></i>'
-			+'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i ng-show="row.entity.editrow" id="cancelEdit" class="fa fa-times fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.cancelEdit(row.entity)"></i></p>'
+			+'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i ng-show="row.entity.editrow" id="cancelEdit" class="fa fa-times fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.cancelEdit(row.entity)"></i>'
+			+'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i ng-show="grid.appScope.status == \'InActive\'" id="moveEdit" class="fa fa-arrow-circle-right fa-2x" aria-hidden="true" style="font-size:1.8em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.cancelEdit(row.entity)"></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;" ng-click="grid.appScope.getRowData(row,\'Delete\')"></i></p>';
 			
 			var getCellActiveTemplate = '<div ng-show="COL_FIELD==true"><p class="col-lg-12">Y</P></div><div ng-show="COL_FIELD==false"><p class="col-lg-12">N</p></div>';
@@ -624,15 +625,15 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
 				enableRowSelection: true,
 				rowEditWaitInterval: 0,
 				columnDefs: [
-					{ name: 'employeeId', displayName: 'Emp ID', enableColumnMenu: true, enableSorting: true, width:80, enableFiltering:true  },
-					{ field: 'employeeName', displayName: 'Emp Name', enableColumnMenu: false, enableSorting: false,enableFiltering:true,sort: {
+					{ name: 'employeeId', displayName: 'Emp ID', enableColumnMenu: true, enableSorting: true, enableFiltering:true,width:80  },
+					{ field: 'employeeName', displayName: 'Emp Name', enableColumnMenu: false,width:"*", enableSorting: false,enableFiltering:true,sort: {
 				          direction: uiGridConstants.ASC,
 				          priority: 0,
 				        } },
 //					{ field: 'emailId', displayName: 'Email Id ', enableColumnMenu: false, enableSorting: false },
 //					{ field: 'experience', displayName: 'Exp', enableColumnMenu: true, enableSorting: true, width: 80 },
 					{
-						field: 'resourceRole', displayName:'Role', enableColumnMenu: true, enableSorting: false,enableFiltering:false,
+						field: 'resourceRole', displayName:'Role', enableColumnMenu: true,width:"*", enableSorting: false,enableFiltering:false,
 						cellTemplate:'<div  ng-if="!row.entity.editrow">{{COL_FIELD}}</div><div ng-if="row.entity.editrow" class="grid-Dropdown"><md-select ng-model="MODEL_COL_FIELD" id="empRole">'
                             +'<md-optgroup label="employee role"><md-option ng-value="empRole" ng-repeat="empRole in col.colDef.editDropdownOptionsArray">{{empRole}}</md-option>'
                     +'</md-optgroup></md-select></div>',
@@ -641,7 +642,7 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
                          'Lead' ]
 					
 					},
-					{ field: 'designation', displayName: 'Designation', enableColumnMenu: false, enableSorting: false,enableFiltering:false },
+					{ field: 'designation',width:"*", displayName: 'Designation', enableColumnMenu: false, enableSorting: false,enableFiltering:false },
     					{
                         	name: 'billableStatus', displayName: 'Billability ', enableColumnMenu: false, enableSorting: false ,enableFiltering:false,
                         	cellTemplate: '<div  ng-if="!row.entity.editrow">{{COL_FIELD}}</div><div ng-if="row.entity.editrow" class="grid-Dropdown"><md-select ng-model="MODEL_COL_FIELD" name="empBillableStatus" append-to-body="true">'
@@ -653,11 +654,11 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
                                   'Reserved' ,
                                    'Trainee' ]
                         	},
-					{ name: 'billingStartDate', displayName: 'Start Date', enableColumnMenu: false, enableSorting: false , cellFilter:'date:"dd-MMM-yyyy"',enableFiltering:false, width:160,
+					{ name: 'billingStartDate',width:"*", displayName: 'Start Date', enableColumnMenu: false, enableSorting: false , cellFilter:'date:"dd-MMM-yyyy"',enableFiltering:false,width:160,
                        cellTemplate: '<div  ng-if="!row.entity.editrow">{{COL_FIELD | date:"dd-MMM-yyyy"}}</div><div ng-if="row.entity.editrow"><md-datepicker ng-model="MODEL_COL_FIELD" md-placeholder="Select Date" id="newBillingStartDate " name="newBillingStartDate"></md-datepicker></div>'},
-					{ field: 'billingEndDate', displayName: 'End Date', enableColumnMenu: false, enableSorting: false , cellFilter:'date:"dd-MMM-yyyy"',enableFiltering:false, width:160,
+					{ field: 'billingEndDate',width:"*", displayName: 'End Date', enableColumnMenu: false, enableSorting: false , cellFilter:'date:"dd-MMM-yyyy"',enableFiltering:false,width:160,
                        cellTemplate: '<div  ng-if="!row.entity.editrow">{{COL_FIELD | date:"dd-MMM-yyyy"}}</div><div ng-if="row.entity.editrow"><md-datepicker ng-model="MODEL_COL_FIELD" md-placeholder="Select Date" id="endDate " name="endDate"></md-datepicker></div>'},
-					{name : 'Actions', displayName: 'Actions',cellTemplate: getCellTemplate1, enableColumnMenu: false, enableSorting: false, width:100,enableFiltering: false} 
+					{name : 'Actions',width:"*", displayName: 'Actions',cellTemplate: getCellTemplate1, enableColumnMenu: false, enableSorting: false,enableFiltering: false,width:"*"} 
 				]
 			};
 			if($scope.isSecondTab){

src/main/webapp/WEB-INF/css/custom-theme.css

@@ -670,3 +670,6 @@ cursor: pointer;
 	height: 205px;
 	overflow-y: scroll;
 }
+.viewTeamDetails{
+	width:100%;
+}

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

-<md-dialog aria-label="Team Details" style="width:950px;height:auto;" class="md-dialog-custom-height" ng-init="getEmployeeDetails()" id="projectTeamDetails" >
+<md-dialog aria-label="Team Details" style="height:auto;" class="md-dialog-custom-height viewTeamDetails" ng-init="getEmployeeDetails()" id="projectTeamDetails" >
     <form ng-cloak name="myForm ">
         <md-toolbar>
             <div class="md-toolbar-tools " style="background: cadetblue; ">