UI Changes to myProjectAllocations

src/main/java/com/nisum/myteam/model/vo/MyProjectAllocationVO.java

@@ -14,6 +14,7 @@ import java.util.List;
 @NoArgsConstructor
 public class MyProjectAllocationVO {
 
+    private String projectId;
     private String projectName;
     private String accountName;
 
@@ -28,6 +29,6 @@ public class MyProjectAllocationVO {
     private String shift;
     private String resourceStatus;
 
-    private List<HashMap<String, String>> deliverLeadIds;
+    private List<HashMap<String, String>> deliveryLeadIds;
 
 }

src/main/java/com/nisum/myteam/service/impl/ResourceAllocationService.java

@@ -288,6 +288,7 @@ public class ResourceAllocationService implements IResourceAllocationService {
                 employee = employeeService.getEmployeeById(resourceAlloc.getEmployeeId());
 
                 MyProjectAllocationVO myProject = new MyProjectAllocationVO();
+                myProject.setProjectId(project.getProjectId());
                 myProject.setProjectName(project.getProjectName());
                 myProject.setAccountName(account.getAccountName());
 
@@ -302,7 +303,7 @@ public class ResourceAllocationService implements IResourceAllocationService {
                 }
 
                 if (project.getDeliveryLeadIds() != null) {
-                    myProject.setDeliverLeadIds(employeeService.getDeliveryManagerMap(project.getDeliveryLeadIds()));
+                    myProject.setDeliveryLeadIds(employeeService.getDeliveryManagerMap(project.getDeliveryLeadIds()));
                 }
                 myProjectList.add(myProject);
             }

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

@@ -14,7 +14,7 @@ myApp.controller("myProjectAllocationsController",function($scope, myFactory, $m
 	$scope.employees = [];
 	$scope.projects = [];
 	var getCellTemplate = '<div class="ui-grid-cell-contents"><a href="#" ng-click="grid.appScope.getRowData(row,\'View\')">{{COL_FIELD}}</a></div>';
-	var getCellActiveTemplate='<div ng-show="COL_FIELD==true"><p class="col-lg-12">Active</P></div><div ng-show="COL_FIELD==false"><p class="col-lg-12">In Active</p></div>';
+	//var getCellActiveTemplate='<div ng-show="COL_FIELD==true"><p class="col-lg-12">Active</P></div><div ng-show="COL_FIELD==false"><p class="col-lg-12">In Active</p></div>';
 	//var getCellTemplate = '<p class="col-lg-12"><i class="fa  fa-2x" aria-hidden="true" style="font-size:1.5em;colormargin-top:3px;cursor:pointer;" ng-click="grid.appScope.getRowData(row,\'Update\')">{{COL_FIELD}}</i></i></p>';
     //	var getCellActiveTemplate='<div >COL_FIELD<p class="col-lg-12">Y</P></div><div ng-show="COL_FIELD==false"><p class="col-lg-12">N</p></div>';
 	
@@ -26,13 +26,13 @@ myApp.controller("myProjectAllocationsController",function($scope, myFactory, $m
 		enableFiltering:true,
 		columnDefs : [ 
 			{field : 'projectName',displayName: 'Project',cellTemplate:getCellTemplate, enableColumnMenu: true, enableSorting: true,enableFiltering:true},
-			{field : 'account',displayName: 'Account', enableColumnMenu: false, enableSorting: false,enableFiltering:true},
+			{field : 'accountName',displayName: 'Account', enableColumnMenu: false, enableSorting: false,enableFiltering:true},
 			{field : 'deliveryLeadIds',displayName: 'Delivery Lead',cellTemplate:'<div ng-repeat= "item in row.entity[col.field]">{{item.employeeName}}<span ng-hide="$last">,</span></div>', enableColumnMenu: false, enableSorting: false,enableFiltering:false},
 			{field : 'billableStatus',displayName: 'Billability', enableColumnMenu: false, enableSorting: false,enableFiltering:false},
-			{field : 'projectStartDate',displayName: 'Start Date', enableColumnMenu: false, enableSorting: false,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false},
-			{field : 'projectEndDate',displayName: 'End Date', enableColumnMenu: false, enableSorting: false,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false},
+			{field : 'billingStartDate',displayName: 'Start Date', enableColumnMenu: false, enableSorting: false,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false},
+			{field : 'billingEndDate',displayName: 'End Date', enableColumnMenu: false, enableSorting: false,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false},
 			{field : 'shift',displayName: 'Shift', enableColumnMenu: false, enableSorting: false,enableFiltering:false},
-			{field : 'status',displayName: 'Status', enableColumnMenu: false,cellTemplate:getCellActiveTemplate,enableSorting: false,enableFiltering:false}
+			{field : 'resourceStatus',displayName: 'Status', enableColumnMenu: false,enableSorting: false,enableFiltering:false}
 		]
 	};
 	$scope.gridOptions.data = $scope.records;
@@ -64,7 +64,7 @@ myApp.controller("myProjectAllocationsController",function($scope, myFactory, $m
 	$scope.getMyProjectAllocations = function(){
 		$http({
 	        method : "GET",
-	        url : appConfig.appUri + "getMyProjectAllocations?employeeId="+myFactory.getEmpId()
+	        url : appConfig.appUri + "resources/getMyProjectAllocations?employeeId="+myFactory.getEmpId()
 	    }).then(function mySuccess(response) {
 	        $scope.gridOptions.data = response.data.records;
 	        if(response.data.records.length > 10){
@@ -117,7 +117,7 @@ myApp.controller("myProjectAllocationsController",function($scope, myFactory, $m
 				columnDefs : [ 
 					{field : 'employeeId',displayName: 'Emp ID', enableColumnMenu: true, enableSorting: true, width:100},
 					{field : 'employeeName',displayName: 'Empl Name ', enableColumnMenu: false, enableSorting: false},
-					{field : 'role',displayName: 'Role', enableColumnMenu: false, enableSorting: false},
+					{field : 'resourceRole',displayName: 'Role', enableColumnMenu: false, enableSorting: false},
 //					{field : 'emailId',displayName: 'Email Id ', enableColumnMenu: false, enableSorting: false},
 //					{field : 'experience',displayName: 'Exp', enableColumnMenu: true, enableSorting: true,width:80},
 					{field : 'designation',displayName: 'Designation ', enableColumnMenu: false, enableSorting: false},