Commit 70aa0fe2 authored by Prayas Jain's avatar Prayas Jain

Updated validation message for alias and updated checkbox message

parent 128a3390
......@@ -34,7 +34,7 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export
{field : 'accountName',displayName: 'Client', enableColumnMenu: false, enableSorting: true,enableFiltering:true,width:100},
{field : 'domain',displayName: 'Domain', enableColumnMenu: false, enableSorting: true,enableFiltering:true,width:100},
{field : 'projectName',displayName: 'Project', enableColumnMenu: false, enableSorting: false,enableFiltering:true,width:150},
{field : 'onBehalfOf',displayName: 'Alias For', enableColumnMenu: false, enableSorting: true,enableFiltering: true,width:180},
{field : 'onBehalfOf',displayName: 'On Behalf Of', enableColumnMenu: false, enableSorting: true,enableFiltering: true,width:180},
{field : 'billableStatus',displayName: 'Billable Status', enableColumnMenu: false, enableSorting: true,enableFiltering: true,width:120},
{field : 'billingStartDate',displayName: 'Billing Start Date', enableColumnMenu: false, enableSorting: true,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false,width:150},
{field : 'billingEndDate',displayName: 'Billing End Date', enableColumnMenu: false, enableSorting: true,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false,width:150},
......
......@@ -649,7 +649,7 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
direction: uiGridConstants.ASC,
priority: 0,
} },
{ name: 'onBehalfOf', displayName: 'Alias For', enableColumnMenu: true, enableSorting: true, enableFiltering:true,width:'*' },
{ name: 'onBehalfOf', displayName: 'On Behalf Of', enableColumnMenu: true, enableSorting: true, enableFiltering:true,width:'*' },
// { field: 'emailId', displayName: 'Email Id ', enableColumnMenu: false, enableSorting: false },
// { field: 'experience', displayName: 'Exp', enableColumnMenu: true, enableSorting: true, width: 80 },
{
......@@ -1533,11 +1533,11 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
angular.element(document.getElementById('empRole')).focus();
}
else if(action === "Add" && $scope.toggleAlias == true && $scope.aliasModel.employeeName == undefined || $scope.aliasModel == {}){
$scope.alertMsg = "Please select a Alias Resource";
$scope.alertMsg = "Please select a OnBehalf Of Resource";
angular.element(document.getElementById('selectAlias')).focus();
}
else if(action === "Add" && employeeModel != undefined && employeeModel.employeeName != undefined && employeeModel.employeeName == $scope.aliasModel.employeeName){
$scope.alertMsg = "Selected Employee and Alias Resource could not be same";
$scope.alertMsg = "Selected Employee and OnBehalf Of Resource could not be same";
angular.element(document.getElementById('selectAlias')).focus();
}
else if(action === "Add" && $scope.empAllocationStatus == undefined){
......
......@@ -186,13 +186,10 @@
<td></td>
<td class="Employee"><md-checkbox ng-model="toggleAlias" ng-change="changeCheckboxValue(toggleAlias)"
aria-label="aliasCheck" class="md-primary" style="margin: 10px 0px 10px -7.5pc;" id="selectAlias">
Do You want to add alias resource for this Employee ?</md-checkbox></td>
<!-- <td><input type="checkbox" ng-model="toggleAlias" ng-change="changeCheckboxValue(toggleAlias)" aria-label="aliasCheck" /></td>
<td>Do You want to add alias resource for this Employee ?</td> -->
Are you adding this resource on behalf of any other resource ?</md-checkbox></td>
</tr>
<tr ng-show="toggleAlias">
<td>Alias For </td>
<td>Behalf Of </td>
<td>
<md-select ng-model="aliasModel" data-md-container-class="selectHeader" md-selected-text="getSelectedAlias() " id="selectAlias"
name="aliasModel">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment