Merge remote-tracking branch 'origin/FEATURE/REPORTS_ENHANCEMENTS' into...

Merge remote-tracking branch 'origin/FEATURE/REPORTS_ENHANCEMENTS' into FEATURE/REPORTS_ENHANCEMENTS

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

@@ -69,6 +69,8 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $
 		};
 	
 	$scope.getRowData = function(row, action){
+
+		$scope.parentData.id = row.entity.id;
 		$scope.parentData.employeeId = row.entity.employeeId;
 		$scope.parentData.employeeName = row.entity.employeeName;
 		$scope.parentData.gender = row.entity.gender;
@@ -249,6 +251,7 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $
 		$scope.alertMsg = "";
 		$scope.isDisabled = false;
 		$scope.result = "";
+		$scope.disableSubStatus = false;
 		if(dataToPass.action == "Add"){
 			$scope.empId = "";
 			$scope.empName = "";
@@ -269,6 +272,13 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $
 			 $scope.subStatusEndDate;
 			 $scope.subStatusStartDate;
 		}else if(dataToPass.action == "Update") {
+			if(dataToPass.empSubStatus == null){
+				$scope.disableSubStatus = false;
+			}
+			else {
+				$scope.disableSubStatus = true;
+			}
+			$scope.id = dataToPass.id;
 			$scope.empId = dataToPass.employeeId;
 			$scope.empName = dataToPass.employeeName;
 			$scope.gender = dataToPass.gender;
@@ -447,8 +457,9 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $
 		}
 		
 		$scope.endSubStatus = function() {
+			
 			var record = {	
-				id:null,
+				id:$scope.id,
 				employeeID: $scope.empId,
 				subStatus : $scope.empSubStatus,
 				fromDate: $scope.subStatusStartDate,

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

@@ -79,20 +79,20 @@
 								md-max-date="maxDate" onkeydown="return false"></md-datepicker>
 						</td>
 					</tr>
-					<tr ng-show="empStatus == 'Active' && templateTitle != 'Add' && empSubStatus == null"  >
+					<tr ng-show="empStatus == 'Active' && templateTitle != 'Add'" >
 						<td colspan="4"><b>Select Sub Status :</b></td>
 						<td colspan="8"><md-select ng-model="empSubStatus" name ="empSubStatus"
-								ng-model ="empSubStatus" placeholder ="Select a Sub Status Type" id="empSubStatus" ng-change="changeEmpSubStatus()">
+							 placeholder ="Select a Sub Status Type" id="empSubStatus" ng-change="changeEmpSubStatus()" ng-disabled="disableSubStatus">
 							<md-optgroup label="Sub Status Type"> 
 							<md-option  ng-value ="None">None</md-option> 
 							<md-option ng-value="status" ng-repeat="status in empSubStatuses">{{status}}</md-option>
 							</md-optgroup> </md-select></td>
 					</tr>
-					<tr ng-show="empStatus == 'Active' && templateTitle != 'Add' && empSubStatus != null 
+					<!-- <tr ng-show="empStatus == 'Active' && templateTitle != 'Add' && empSubStatus != null 
 					|| subStatusStartDate !=null || subStatusEndDate !=null"   >
 						<td colspan="4"><b>Sub Status :</b></td>
 						<td colspan="8"> {{ empSubStatus }} </td>
-					</tr>
+					</tr>  -->
 					<tr ng-show="empSubStatus != null && empSubStatus != '' && empStatus == 'Active' && templateTitle != 'Add'">
 						<td colspan="4"><b>{{empSubStatus}} Start Date:</b><span class="mandatory"></span></td>
 						<td colspan="8"><md-datepicker ng-model="subStatusStartDate" name="subStatusStartDate" id="subStatusStartDate"
@@ -110,7 +110,7 @@
 					
 					<tr ng-show="empSubStatus != null && empSubStatus != '' && empStatus == 'Active' && templateTitle != 'Add'">
 						<td colspan="4">
-						<md-button class="md-raised" ng-click="endSubStatus()" style="margin-top:10px;width:88px;background: #3f51b5;color:white;">
+						<md-button class="md-raised" ng-show="disableSubStatus" ng-click="endSubStatus()" style="margin-top:10px;width:88px;background: #3f51b5;color:white;">
 								End </md-button>
 						</td>
 						
@@ -241,7 +241,7 @@
 	<!--row--> </md-dialog-content>
 
 	<md-dialog-actions layout="row"> <md-button
-		class="md-raised" data-ng-click="validateFields()"
+		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()"
 		style="width:120px;background: cadetblue;color:white;">