Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mytime
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Narendar Vakiti
mytime
Commits
0182a217
Commit
0182a217
authored
Jul 25, 2018
by
dgoud-nisum-com
Committed by
rbonthala-nisum-com
Jul 25, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modified search(case insensitive) (#53)
parent
f3af757e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
15 deletions
+19
-15
DomainController.js
src/main/webapp/WEB-INF/controllers/DomainController.js
+4
-3
ProjectController.js
src/main/webapp/WEB-INF/controllers/ProjectController.js
+4
-3
ProjectTeamController.js
src/main/webapp/WEB-INF/controllers/ProjectTeamController.js
+4
-3
assignAccountsController.js
...in/webapp/WEB-INF/controllers/assignAccountsController.js
+6
-5
newAccount.html
src/main/webapp/WEB-INF/templates/newAccount.html
+1
-1
No files found.
src/main/webapp/WEB-INF/controllers/DomainController.js
View file @
0182a217
...
@@ -211,9 +211,10 @@ myApp.controller("domainController",
...
@@ -211,9 +211,10 @@ myApp.controller("domainController",
e
.
stopPropagation
();
e
.
stopPropagation
();
}
}
$scope
.
searchFilter
=
function
(
obj
)
{
$scope
.
searchFilter
=
function
(
obj
)
{
var
re
=
$scope
.
searchTerm
;
var
stringToGoIntoTheRegex
=
$scope
.
searchTerm
;
var
filteredWord
=
!
$scope
.
searchTerm
||
obj
.
employeeName
.
startsWith
(
re
);
var
regex
=
new
RegExp
(
"^"
+
stringToGoIntoTheRegex
,
"i"
);
return
filteredWord
;
var
filteredWord
=
!
$scope
.
searchTerm
||
obj
.
employeeName
.
match
(
regex
);
return
filteredWord
;
};
};
$scope
.
clearSearchTerm
=
function
()
{
$scope
.
clearSearchTerm
=
function
()
{
$scope
.
searchTerm
=
''
;
$scope
.
searchTerm
=
''
;
...
...
src/main/webapp/WEB-INF/controllers/ProjectController.js
View file @
0182a217
...
@@ -277,9 +277,10 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
...
@@ -277,9 +277,10 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
e
.
stopPropagation
();
e
.
stopPropagation
();
}
}
$scope
.
searchFilter
=
function
(
obj
)
{
$scope
.
searchFilter
=
function
(
obj
)
{
var
re
=
$scope
.
searchTerm
;
var
stringToGoIntoTheRegex
=
$scope
.
searchTerm
;
var
filteredWord
=
!
$scope
.
searchTerm
||
obj
.
employeeName
.
startsWith
(
re
);
var
regex
=
new
RegExp
(
"^"
+
stringToGoIntoTheRegex
,
"i"
);
return
filteredWord
;
var
filteredWord
=
!
$scope
.
searchTerm
||
obj
.
employeeName
.
match
(
regex
);
return
filteredWord
;
};
};
...
...
src/main/webapp/WEB-INF/controllers/ProjectTeamController.js
View file @
0182a217
...
@@ -299,9 +299,10 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog,
...
@@ -299,9 +299,10 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog,
e
.
stopPropagation
();
e
.
stopPropagation
();
}
}
$scope
.
searchFilter
=
function
(
obj
)
{
$scope
.
searchFilter
=
function
(
obj
)
{
var
re
=
$scope
.
searchTerm
;
var
stringToGoIntoTheRegex
=
$scope
.
searchTerm
;
var
filteredWord
=
!
$scope
.
searchTerm
||
obj
.
employeeName
.
startsWith
(
re
);
var
regex
=
new
RegExp
(
"^"
+
stringToGoIntoTheRegex
,
"i"
);
return
filteredWord
;
;
var
filteredWord
=
!
$scope
.
searchTerm
||
obj
.
employeeName
.
match
(
regex
);
return
filteredWord
;
};
};
...
...
src/main/webapp/WEB-INF/controllers/assignAccountsController.js
View file @
0182a217
...
@@ -22,7 +22,7 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
...
@@ -22,7 +22,7 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
{
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
:
'
Account
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
:
false
,
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
}
]
]
};
};
...
@@ -116,7 +116,7 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
...
@@ -116,7 +116,7 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
$scope
.
accountName
;
$scope
.
accountName
;
$scope
.
industryType
;
$scope
.
industryType
;
$scope
.
clientAddress
;
$scope
.
clientAddress
;
$scope
.
searchTerm
;
$scope
.
searchTerm
=
''
;
$scope
.
templateTitle
=
dataToPass
.
action
;
$scope
.
templateTitle
=
dataToPass
.
action
;
$scope
.
accountValidationMessage
=
''
;
$scope
.
accountValidationMessage
=
''
;
$scope
.
addButtonvisible
=
false
;
$scope
.
addButtonvisible
=
false
;
...
@@ -178,9 +178,10 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
...
@@ -178,9 +178,10 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
e
.
stopPropagation
();
e
.
stopPropagation
();
}
}
$scope
.
searchFilter
=
function
(
obj
)
{
$scope
.
searchFilter
=
function
(
obj
)
{
var
re
=
$scope
.
searchTerm
;
var
stringToGoIntoTheRegex
=
$scope
.
searchTerm
;
var
filteredWord
=
!
$scope
.
searchTerm
||
obj
.
employeeName
.
startsWith
(
re
);
var
regex
=
new
RegExp
(
"^"
+
stringToGoIntoTheRegex
,
"i"
);
return
filteredWord
;
var
filteredWord
=
!
$scope
.
searchTerm
||
obj
.
employeeName
.
match
(
regex
);
return
filteredWord
;
};
};
$scope
.
removeSelectedLead
=
function
(
item
){
$scope
.
removeSelectedLead
=
function
(
item
){
var
index
=
$scope
.
managersSelectedList
.
indexOf
(
item
);
var
index
=
$scope
.
managersSelectedList
.
indexOf
(
item
);
...
...
src/main/webapp/WEB-INF/templates/newAccount.html
View file @
0182a217
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
</tr>
</tr>
<tr>
<tr>
<td
colspan=
"4"
>
<td
colspan=
"4"
>
<b
>
Account
Managers
</b></td>
<b
>
Delivery
Managers
</b></td>
<td
id=
"lead"
colspan=
"8"
>
<td
id=
"lead"
colspan=
"8"
>
<div
class=
"leads-data"
ng-show=
"managersSelectedList.length > 0"
>
<div
class=
"leads-data"
ng-show=
"managersSelectedList.length > 0"
>
<div
ng-repeat=
"item in managersSelectedList"
>
<div
ng-repeat=
"item in managersSelectedList"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment