Updated Designation Page Validation Message and Css

src/main/java/com/nisum/myteam/controller/ReportsController.java

@@ -432,7 +432,6 @@ public class ReportsController {
             produces = MediaType.APPLICATION_JSON_VALUE)
     public ReportVo allBillabilityReport(@RequestParam("byType") String byType,
                                                        @RequestParam("onDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) Date onDate) throws MyTeamException {
-        System.out.println("allBillabilityReport start");
         return reportService.getPieChartReport(byType,onDate);
     }
 

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

 myApp.controller("designationsController", function ($scope, appConfig, $http, uiGridConstants, $mdDialog) {
 
-	var TEXT_ENABLE = 'enable';
-	var TEXT_DISABLE = 'disable';
-	var TEXT_ENABLED = 'enabled';
-	var TEXT_DISABLED = 'disabled';
+	var TEXT_ENABLE = 'Enable';
+	var TEXT_DISABLE = 'Disable';
+	var TEXT_ENABLED = 'Enabled';
+	var TEXT_DISABLED = 'Disabled';
 
 	var actionsCellTemplate = '<div class="action-cell-template text-align-center" ng-show="grid.appScope.showActions(row)"><span id="action-container"><md-switch ng-model="row.entity.active" aria-label="Finished?" ng-change="grid.appScope.changeDesignationStatus(row,$event)" class="no-margin"></md-switch>  <i class="fa fa-trash fa-2x delete-action-icon" aria-hidden="true" ng-show="!row.entity.active" ng-click="grid.appScope.deleteDesignation(row,$event)"></i></span></div>'
 
@@ -143,13 +143,13 @@ myApp.controller("designationsController", function ($scope, appConfig, $http, u
 		}
 
 		var isDesignationNameValid = function (designationName) {
-			let pattern = /^([a-zA-Z\d\s-]{1,30})$/;
+			let pattern = /^(?!\d+$)(?:[a-zA-Z0-9][a-zA-Z0-9\s-]*)?$/;
 			if (!Boolean(designationName)) {
-				$scope.newDesignationValidationMessage = "designation name can't be empty";
+				$scope.newDesignationValidationMessage = "Designation name can't be empty";
 				return false;
 			}
 			else if (!pattern.test(designationName)) {
-				$scope.newDesignationValidationMessage = "designation name can contain alphanumeric, space and hyphen(-) upto 30 characters";
+				$scope.newDesignationValidationMessage = "Designation name can contain alphanumeric, space and hyphen(-) value";
 				return false;
 			}
 			return true;
@@ -162,7 +162,6 @@ myApp.controller("designationsController", function ($scope, appConfig, $http, u
 	};
 
 	$scope.changeDesignationStatus = function (row, ev) {
-		console.log(row.entity);
 		let designationData = row.entity;
 		let action = (!designationData.active) ? TEXT_DISABLE : TEXT_ENABLE;
 

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

@@ -817,3 +817,12 @@ cursor: pointer;
 #manage-designation md-switch.md-checked .md-ink-ripple { 
    color: #333; /* selected switch ripple color */ 
 }
+.add-designation-dialog {
+	overflow: hidden;
+}
+.add-designation-dialog .designation-error-message {
+	margin: 5px 0 0 0;
+}
+.error{
+	color: red;
+}
\ No newline at end of file

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

@@ -11,14 +11,14 @@
             </div>
         </md-toolbar>
 
-        <md-dialog-content>
+        <md-dialog-content class="add-designation-dialog">
             <div class="md-dialog-content">
                 <div class="form-group">
                     <div class="row">
                         <input type="text" class="form-control" id="designationName" name="designationName"
-                            ng-model="newDesignationName" placeholder="designation name (contains alphanumerics, space, -)" ng-disabled="false" />
-                        <div role="alert" style="text-align: center">
-                            <span class="error" style="color: red;">{{newDesignationValidationMessage}}</span>
+                            ng-model="newDesignationName" placeholder="Enter Designation name" ng-disabled="false" />
+                        <div role="alert" class="designation-error-message">
+                            <span class="error">{{newDesignationValidationMessage}}</span>
                         </div>
                     </div>
                 </div>

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

@@ -248,7 +248,7 @@
 
 	<md-dialog-actions layout="row" style="margin-bottom:20px;"> 
       	<div role="alert" class="col-sm-8 error-msg">
-			<span ng-if="errorMessage" class="error" style="color: red; text-align:left;">{{alertMsg}}</span>
+			<span ng-if="errorMessage" class="error" style="text-align:left;">{{alertMsg}}</span>
 		</div>
 		<div class="col-sm-4 action-content">
 	<md-button