Fixed Screen Size for Project Team Details Screen

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

@@ -612,7 +612,8 @@ public class ResourceService implements IResourceService {
             } else {
                 resourceVO.setResourceStatus(ResourceStatus.IN_ACTIVE.getStatus());
             }
-            if(projectId.equalsIgnoreCase(MyTeamUtils.BENCH_PROJECT_ID) && employee.getEmpStatus().equalsIgnoreCase(MyTeamUtils.ACTIVE)) {
+            if(projectId.equalsIgnoreCase(MyTeamUtils.BENCH_PROJECT_ID) && employee.getEmpStatus().equalsIgnoreCase(MyTeamUtils.ACTIVE) 
+            		&& (resource.getBillingEndDate().compareTo(new Date())>0)) {
             	finalResourcesList.add(resourceVO);
             }
             else if(!projectId.equalsIgnoreCase(MyTeamUtils.BENCH_PROJECT_ID)){

src/main/resources/logback-spring.xml

@@ -29,9 +29,9 @@
     </appender>
 
 
-    <appender name="fileAppender" class="ch.qos.logback.core.FileAppender">
+    <!-- <appender name="fileAppender" class="ch.qos.logback.core.FileAppender">
         <file>/var/lib/Applications/myTeam/logs/myTeam-app.log</file>
-        <!--<file>/Users/nisum/Desktop/myTeamLogs/myTeam-app.log</file>-->
+        <file>/Users/nisum/Desktop/myTeamLogs/myTeam-app.log</file>
 
 
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
@@ -61,13 +61,13 @@
             </springProfile>
 
         </encoder>
-    </appender>
+    </appender> -->
 
 
     <springProfile name="default">
         <root level="INFO">
             <appender-ref ref="consoleAppender"/>
-            <appender-ref ref="fileAppender"/>
+            <!-- <appender-ref ref="fileAppender"/> -->
             fileAppender
         </root>
     </springProfile>
@@ -76,21 +76,21 @@
     <springProfile name="development">
         <root level="INFO">
             <appender-ref ref="consoleAppender"/>
-            <appender-ref ref="fileAppender"/>
+            <!-- <appender-ref ref="fileAppender"/> -->
         </root>
     </springProfile>
 
     <springProfile name="qa">
         <root level="INFO">
             <appender-ref ref="consoleAppender"/>
-            <appender-ref ref="fileAppender"/>
+            <!-- <appender-ref ref="fileAppender"/> -->
         </root>
     </springProfile>
 
     <springProfile name="production">
         <root level="INFO">
             <appender-ref ref="consoleAppender"/>
-            <appender-ref ref="fileAppender"/>
+            <!-- <appender-ref ref="fileAppender"/> -->
         </root>
     </springProfile>
 

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

@@ -664,12 +664,12 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
 				enableRowSelection: true,
 				rowEditWaitInterval: 0,
 				columnDefs: [
-					{ name: 'employeeId', displayName: 'Emp ID', enableColumnMenu: true, enableSorting: true, enableFiltering:true,width:70  },
-					{ name: 'employeeName', displayName: 'Emp Name',width:100, enableSorting: false, enableColumnMenu: false ,enableFiltering:true,sort: {
+					{ name: 'employeeId', displayName: 'Emp ID', enableColumnMenu: true, enableSorting: true, enableFiltering:true,width:"*"  },
+					{ name: 'employeeName', displayName: 'Emp Name',width:"*", enableSorting: false, enableColumnMenu: false ,enableFiltering:true,sort: {
 				          direction: uiGridConstants.ASC,
 				          priority: 0,
 				        } },
-				    { field: 'onBehalfOf', displayName: 'On Behalf Of', enableColumnMenu: true, enableSorting: true, enableFiltering:true,width:120, 
+				    { field: 'onBehalfOf', displayName: 'On Behalf Of', enableColumnMenu: true, enableSorting: true, enableFiltering:true,width:"*", 
 				        cellTemplate:onBehalfOfCellTemplate
 				    },
 					{
@@ -694,9 +694,9 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
                                   'Reserved' ,
                                    'Trainee' ]
                         	},
-					{ name: 'billingStartDate',width:"*", displayName: 'Start Date', enableColumnMenu: false, enableSorting: false , cellFilter:'date:"dd-MMM-yyyy"',enableFiltering:false,width:120,
+					{ name: 'billingStartDate',width:"*", displayName: 'Start Date', enableColumnMenu: false, enableSorting: false , cellFilter:'date:"dd-MMM-yyyy"',enableFiltering:false,
                        cellTemplate: '<div class="ui-grid-cell-contents"  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-min-date="grid.appScope.minBillingStartDate" md-max-date="grid.appScope.maxBillingStartDate"></md-datepicker></div>'},
-					{ field: 'billingEndDate',width:"*", displayName: 'End Date', enableColumnMenu: false, enableSorting: false , cellFilter:'date:"dd-MMM-yyyy"',enableFiltering:false,width:120,
+					{ field: 'billingEndDate',width:"*", displayName: 'End Date', enableColumnMenu: false, enableSorting: false , cellFilter:'date:"dd-MMM-yyyy"',enableFiltering:false,
                        cellTemplate: '<div class="ui-grid-cell-contents"  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-min-date="row.entity.billingStartDate" md-max-date="grid.appScope.maxBillingEndDate"></md-datepicker></div>'},
 					{name : 'Actions',width:140, displayName: 'Actions',cellTemplate: getCellTemplate1, enableColumnMenu: false, enableSorting: false,enableFiltering: false} 
 				]

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

@@ -689,6 +689,7 @@ cursor: pointer;
 }
 .viewTeamDetails{
 	width:100%;
+	max-width: 90%;
 }
 .view-team-details-grid {
 	height: calc(85vh - 243px) !important;