Fixed Reserved Report and Login Report Issue

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

@@ -968,6 +968,7 @@ public class ResourceService implements IResourceService {
 
         List<ReserveReportsVO> reserveReportsList = new ArrayList<>();
         if (resourcesList != null && resourcesList.size() > 0) {
+        	resourcesList = resourcesList.stream().filter(r -> isAllocationActiveToday(r)).collect(Collectors.toList());
             Project project = null;
             for (Resource resource : resourcesList) {
                 ReserveReportsVO reserveReportsVO = new ReserveReportsVO();

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

@@ -23,7 +23,7 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $
 		enableHorizontalScrollbar:1,
 		columnDefs : [ 
 			{field : 'employeeId',displayName: 'EmpId', enableColumnMenu: true, enableSorting: true,enableFiltering: true, width:'*',cellClass: 'grid-align'},
-			{field : 'employeeName',displayName: 'Employee Name', enableColumnMenu: true, enableSorting: true,enableFiltering: true,cellClass: 'grid-align',width:'*'},
+			{field : 'employeeName',displayName: 'Emp Name', enableColumnMenu: true, enableSorting: true,enableFiltering: true,cellClass: 'grid-align',width:'*'},
 			{field : 'mobileNumber',displayName: 'Mobile', enableColumnMenu: false, enableSorting: false,enableFiltering: false,cellClass: 'grid-align', width:'*'},
 			{field : 'empStatus',displayName: 'Status', enableColumnMenu: false, enableSorting: false,enableFiltering: true,width:'*'},
 			{field : 'empSubStatus.subStatus',displayName: 'Sub Status', enableColumnMenu: false, enableSorting: true,enableFiltering:true,width:'*',cellClass:function(grid,row,col){
@@ -690,8 +690,8 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $
 			$mdDialog.show($mdDialog.confirm({
 				skipHide: true,
 				textContent: 'Are you sure you want to cancel this?',
-				ok: 'ok',
-				cancel: 'cancel'
+				ok: 'Yes',
+				cancel: 'No'
 			})).then(function () {
 				$mdDialog.hide('Cancelled');
 			})

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

@@ -1737,8 +1737,8 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
 						$mdDialog.show($mdDialog.confirm({
 							skipHide: true,
 							textContent: 'Are you sure you want to cancel this?',
-							ok: 'ok',
-							cancel: 'cancel'
+							ok: 'Yes',
+							cancel: 'No'
 						})).then(function () {
 							$mdDialog.hide('Cancelled');
 						})
@@ -1748,8 +1748,8 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
 					$mdDialog.show($mdDialog.confirm({
 						skipHide: true, 
 						textContent: 'Are you sure you want to cancel this?',
-						ok: 'ok',
-						cancel: 'cancel'
+						ok: 'Yes',
+						cancel: 'No'
 					})).then(function () {
 						$mdDialog.hide('Cancelled');
 					})
@@ -1767,8 +1767,8 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
 					$mdDialog.show($mdDialog.confirm({
 						skipHide: true,
 						textContent: 'Are you sure you want to cancel this?',
-						ok: 'ok',
-						cancel: 'cancel'
+						ok: 'Yes',
+						cancel: 'No'
 					})).then(function () {
 						$mdDialog.hide('Cancelled');
 					})
@@ -1824,8 +1824,8 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
 						$mdDialog.show($mdDialog.confirm({
 							skipHide: true,
 							textContent: 'Are you sure you want to cancel this?',
-							ok: 'ok',
-							cancel: 'cancel'
+							ok: 'Yes',
+							cancel: 'No'
 						})).then(function () {
 							removeTab("cancel");
 							$scope.myForm.$setPristine();
@@ -1838,8 +1838,8 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
 						$mdDialog.show($mdDialog.confirm({
 							skipHide: true,
 							textContent: 'Are you sure you want to cancel this?',
-							ok: 'ok',
-							cancel: 'cancel'
+							ok: 'Yes',
+							cancel: 'No'
 						})).then(function () {
 							removeTab("cancel");
 							$scope.myForm.$setPristine();

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

@@ -639,6 +639,23 @@ cursor: pointer;
 .update-Teammate .form-inline {
 	margin-bottom : 15px;
 }
+.new-role-template {
+	overflow:none;
+	width:1500px;
+	height:1200px; 
+	margin-left: 1%;
+}
+.new-role-dialog-content{
+	overflow-x:hidden;
+	overflow-y:auto;
+	padding:15px 15px 0 15px;
+}
+.new-role-template .action-content{
+	padding:0;
+}
+.new-role-template .error-msg {
+	padding:0;
+}
 .billable-table {
 	margin-top : 10px;
 }

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

-<md-dialog aria-label="Role Template"
-	style="width:1500px;height:1200px; margin-left: 1%;">
+<md-dialog aria-label="Role Template" class="new-role-template">
 
 <form ng-cloak name="myForm">
 	<md-toolbar>
@@ -12,7 +11,7 @@
 	</div>
 	</md-toolbar>
 
-	<md-dialog-content style="padding: 15px;">
+	<md-dialog-content  class="new-role-dialog-content">
 
 	<div class="row">
 		<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
@@ -117,13 +116,13 @@
 						
 					</tr>
 
-					<tr>
+<!-- 					<tr>
 						<td colspan="12">
 							<div role="alert">
 								<span ng-if="errorMessage" class="error" style="color: red;">{{alertMsg}}</span>
 							</div>
 						</td>
-					</tr>
+					</tr> -->
 
 				</table>
 			</div>
@@ -241,12 +240,20 @@
 
 	<!--row--> </md-dialog-content>
 
-	<md-dialog-actions layout="row"> <md-button
+	<md-dialog-actions layout="row"> 
+      	<div role="alert" class="col-sm-9 error-msg">
+			<span ng-if="errorMessage" class="error" style="color: red; text-align:left;">{{alertMsg}}</span>
+		</div>
+		<div class="col-sm-3 action-content">
+	<md-button
 		class="md-raised" data-ng-click="validateFields(); button=true" 
 		style="width:120px;background: cadetblue;color:white;">
-	{{templateTitle}} </md-button> <md-button class="md-raised" ng-click="cancel()"
+	{{templateTitle}} </md-button>
+	 <md-button class="md-raised" ng-click="cancel()"
 		style="width:120px;background: cadetblue;color:white;">
-	Cancel </md-button> </md-dialog-actions>
+	Cancel </md-button>
+	</div>
+	 </md-dialog-actions>
 </form>
 </md-dialog>