Commit 22afad5e authored by dgoud-nisum-com's avatar dgoud-nisum-com Committed by rbonthala-nisum-com

changes done (#102)

parent 1d33ba36
...@@ -23,14 +23,6 @@ myApp.controller("domainController", ...@@ -23,14 +23,6 @@ myApp.controller("domainController",
pageSize : 10, pageSize : 10,
enableFiltering : true, enableFiltering : true,
columnDefs : [ columnDefs : [
{
field : 'domainId',
displayName : 'Domain ID',
enableColumnMenu : false,
enableSorting : true,
enableFiltering : true,
width : 120,
},
{ {
field : 'domainName', field : 'domainName',
displayName : 'Domain', displayName : 'Domain',
...@@ -247,7 +239,7 @@ myApp.controller("domainController", ...@@ -247,7 +239,7 @@ myApp.controller("domainController",
if($scope.employeeModel.length <= 0){ if($scope.employeeModel.length <= 0){
return "Please select a Delivery Lead"; return "Please select a Delivery Lead";
} }
return "Delivery Leads selected : " + $scope.employeeModel.length; return "";
} else { } else {
return "Please select a Delivery Lead"; return "Please select a Delivery Lead";
} }
......
...@@ -45,7 +45,6 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS ...@@ -45,7 +45,6 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
pageSize: 10, pageSize: 10,
enableFiltering: true, enableFiltering: true,
columnDefs: [ columnDefs: [
{ field: 'projectId', displayName: 'Project ID', enableColumnMenu: false, enableSorting: false, enableFiltering: false, width: 120 },
{ field: 'projectName', displayName: 'Project ', enableColumnMenu: false, enableSorting: true, enableFiltering: true }, { field: 'projectName', displayName: 'Project ', enableColumnMenu: false, enableSorting: true, enableFiltering: true },
{ field: 'account', displayName: 'Account ', enableColumnMenu: false, enableSorting: true, enableFiltering: true }, { field: 'account', displayName: 'Account ', enableColumnMenu: false, enableSorting: true, enableFiltering: true },
//{field : 'managerId',displayName: 'Manager ID ', enableColumnMenu: false, enableSorting: false}, //{field : 'managerId',displayName: 'Manager ID ', enableColumnMenu: false, enableSorting: false},
......
...@@ -17,12 +17,11 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo ...@@ -17,12 +17,11 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
pageNumber: 1, pageNumber: 1,
pageSize:10, pageSize:10,
enableFiltering: true, enableFiltering: true,
columnDefs : [ columnDefs : [
{field : 'accountId',displayName: 'Account ID', enableColumnMenu: true, enableSorting: true,enableFiltering: false, width:120,cellClass: 'grid-align'},
{field : 'accountName',displayName: 'Account Name', enableColumnMenu: false, enableSorting: false,enableFiltering: true,cellClass: 'grid-align'}, {field : 'accountName',displayName: 'Account Name', enableColumnMenu: false, enableSorting: false,enableFiltering: true,cellClass: 'grid-align'},
{field : 'industryType',displayName: 'Industry Type', enableColumnMenu: false, enableSorting: true,enableFiltering: true,cellClass: 'grid-align'}, {field : 'industryType',displayName: 'Industry Type', enableColumnMenu: false, enableSorting: true,enableFiltering: true,cellClass: 'grid-align'},
{field : 'status',displayName: 'Status', enableColumnMenu: false, enableSorting: true,enableFiltering: true,cellClass: 'grid-align'}, {field : 'status',displayName: 'Status', enableColumnMenu: false, enableSorting: true,enableFiltering: true,cellClass: 'grid-align'},
{field : 'deliveryManagers',displayName: 'Delivery Managers', cellTemplate: '<div ng-repeat= "item in row.entity[col.field]">{{item.employeeName}}<span ng-hide="$last">,</span></div>' ,enableColumnMenu: false, enableSorting: true,enableFiltering: false,cellClass: 'grid-align'}, {field : 'deliveryManagers',displayName: 'Delivery Managers',cellTemplate: '<div ng-repeat= "item in row.entity[col.field]">{{item.employeeName}}<span ng-hide="$last">,</span></div>' ,enableColumnMenu: false, enableSorting: true,enableFiltering: true,cellClass: 'grid-align'},
{name : 'Actions', displayName: 'Actions',cellTemplate: getCellTemplate, enableColumnMenu: false, enableSorting: false, enableFiltering:false,width:130} {name : 'Actions', displayName: 'Actions',cellTemplate: getCellTemplate, enableColumnMenu: false, enableSorting: false, enableFiltering:false,width:130}
] ]
}; };
...@@ -279,7 +278,7 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo ...@@ -279,7 +278,7 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
if($scope.managersSelectedList.length <= 0){ if($scope.managersSelectedList.length <= 0){
return "Please select Delivery Manager"; return "Please select Delivery Manager";
} }
return "Delivery Managers selected : " + $scope.managersSelectedList.length; return "";
} else { } else {
return "Please select Delivery Manager"; return "Please select Delivery Manager";
} }
......
...@@ -15,13 +15,6 @@ ...@@ -15,13 +15,6 @@
<div class="form-group"> <div class="form-group">
<div class="row" > <div class="row" >
<table width="450px"> <table width="450px">
<tr>
<td colspan="4">
<b >Account ID</b></td>
<td colspan="8"><input type="text" class="form-control" id="accountId" name="accountId"
ng-model="accountId" placeholder="Account Id Auto Generates" ng-blur="" ng-disabled="true"/>
</td>
<tr>
<td colspan="4"> <td colspan="4">
<b >Account Name</b></td> <b >Account Name</b></td>
<td colspan="8"> <td colspan="8">
......
...@@ -15,15 +15,6 @@ ...@@ -15,15 +15,6 @@
<div class="form-group"> <div class="form-group">
<div class="row"> <div class="row">
<table width="450px"> <table width="450px">
<tr>
<td colspan="4"><b>Domain ID</b></td>
<td colspan="8"><input type="text"
class="form-control ng-pristine ng-untouched ng-valid ng-empty"
id="domainId" name="domainId" ng-model="domainId"
placeholder="Domain Id Auto Generates" ng-blur=""
ng-disabled="true" disabled="disabled" aria-invalid="false"
style=""></td>
</tr>
<tr> <tr>
<td colspan="4"><b>Account</b></td> <td colspan="4"><b>Account</b></td>
<td colspan="8"><md-select ng-model="AccountInfo" ng-disabled= "isDisabled" <td colspan="8"><md-select ng-model="AccountInfo" ng-disabled= "isDisabled"
......
...@@ -15,14 +15,6 @@ ...@@ -15,14 +15,6 @@
<div class="form-group"> <div class="form-group">
<div class="row"> <div class="row">
<table width="450px"> <table width="450px">
<tr>
<td colspan="4">
<b>Project ID</b>
</td>
<td colspan="8">
<input type="text" class="form-control" id="projectId" name="projectId" ng-model="projectId" placeholder="Project Id Auto Generates" ng-disabled="true" />
</td>
</tr>
<tr> <tr>
<td colspan="4"> <td colspan="4">
<b>Project Name</b> <b>Project Name</b>
......
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