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
c8e144f5
Commit
c8e144f5
authored
Jul 24, 2018
by
dgoud-nisum-com
Committed by
rbonthala-nisum-com
Jul 24, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Defect Fixed for MT-69 (#49)
parent
e8f9ef32
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
14 deletions
+17
-14
DomainController.js
src/main/webapp/WEB-INF/controllers/DomainController.js
+3
-3
ProjectController.js
src/main/webapp/WEB-INF/controllers/ProjectController.js
+3
-2
ProjectTeamController.js
src/main/webapp/WEB-INF/controllers/ProjectTeamController.js
+3
-4
assignAccountsController.js
...in/webapp/WEB-INF/controllers/assignAccountsController.js
+7
-4
newProject.html
src/main/webapp/WEB-INF/templates/newProject.html
+1
-1
No files found.
src/main/webapp/WEB-INF/controllers/DomainController.js
View file @
c8e144f5
...
...
@@ -211,9 +211,9 @@ myApp.controller("domainController",
e
.
stopPropagation
();
}
$scope
.
searchFilter
=
function
(
obj
)
{
var
re
=
new
RegExp
(
$scope
.
searchTerm
,
'i'
)
;
return
!
$scope
.
searchTerm
||
re
.
test
(
obj
.
employeeName
)
;
var
re
=
$scope
.
searchTerm
;
var
filteredWord
=
!
$scope
.
searchTerm
||
obj
.
employeeName
.
startsWith
(
re
);
return
filteredWord
;
};
$scope
.
clearSearchTerm
=
function
()
{
$scope
.
searchTerm
=
''
;
...
...
src/main/webapp/WEB-INF/controllers/ProjectController.js
View file @
c8e144f5
...
...
@@ -277,8 +277,9 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
e
.
stopPropagation
();
}
$scope
.
searchFilter
=
function
(
obj
)
{
var
re
=
new
RegExp
(
$scope
.
searchTerm
,
'i'
);
return
!
$scope
.
searchTerm
||
re
.
test
(
obj
.
employeeName
);
var
re
=
$scope
.
searchTerm
;
var
filteredWord
=
!
$scope
.
searchTerm
||
obj
.
employeeName
.
startsWith
(
re
);
return
filteredWord
;
};
...
...
src/main/webapp/WEB-INF/controllers/ProjectTeamController.js
View file @
c8e144f5
...
...
@@ -300,10 +300,9 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog,
e
.
stopPropagation
();
}
$scope
.
searchFilter
=
function
(
obj
)
{
var
re
=
new
RegExp
(
$scope
.
searchTerm
,
'i'
);
// searching the employee based on name , employeeid and email
//return !$scope.searchTerm || re.test(obj.employeeId) || re.test(obj.employeeName) ||re.test(obj.emailId) ;
return
!
$scope
.
searchTerm
||
re
.
test
(
obj
.
employeeName
)
;
var
re
=
$scope
.
searchTerm
;
var
filteredWord
=
!
$scope
.
searchTerm
||
obj
.
employeeName
.
startsWith
(
re
);
return
filteredWord
;
;
};
...
...
src/main/webapp/WEB-INF/controllers/assignAccountsController.js
View file @
c8e144f5
...
...
@@ -26,6 +26,7 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
{
name
:
'Actions'
,
displayName
:
'Actions'
,
cellTemplate
:
getCellTemplate
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
false
,
width
:
130
}
]
};
$scope
.
nameFields
=
[
'employeeName'
]
$scope
.
gridOptions
.
data
=
$scope
.
records
;
$scope
.
getRowData
=
function
(
row
,
action
){
$scope
.
parentData
.
id
=
row
.
entity
.
id
;
...
...
@@ -58,7 +59,7 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
$
(
'#home'
).
addClass
(
'md-scroll-mask'
);
userData
.
action
=
action
;
$mdDialog
.
show
({
clickOutsideToClose
:
tru
e
,
clickOutsideToClose
:
fals
e
,
scope
:
$scope
,
preserveScope
:
true
,
templateUrl
:
'templates/newAccount.html'
,
...
...
@@ -165,8 +166,9 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
e
.
stopPropagation
();
}
$scope
.
searchFilter
=
function
(
obj
)
{
var
re
=
new
RegExp
(
$scope
.
searchTerm
,
'i'
);
return
!
$scope
.
searchTerm
||
re
.
test
(
obj
.
employeeName
);
var
re
=
$scope
.
searchTerm
;
var
filteredWord
=
!
$scope
.
searchTerm
||
obj
.
employeeName
.
startsWith
(
re
);
return
filteredWord
;
};
$scope
.
removeSelectedLead
=
function
(
item
){
var
index
=
$scope
.
managersSelectedList
.
indexOf
(
item
);
...
...
@@ -293,3 +295,4 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
}
}
});
src/main/webapp/WEB-INF/templates/newProject.html
View file @
c8e144f5
...
...
@@ -78,7 +78,7 @@
<span
class=
"glyphicon glyphicon-remove close-mdselect"
ng-click=
"closeSelectBox()"
></span>
</md-select-header>
<md-optgroup
label=
"managers"
class=
"optionScroll"
>
<md-option
ng-value=
"manager"
ng-repeat=
"manager in managerDetails | filter:search
Term
"
>
{{manager.employeeName}}
</md-option>
<md-option
ng-value=
"manager"
ng-repeat=
"manager in managerDetails | filter:search
Filter
"
>
{{manager.employeeName}}
</md-option>
</md-optgroup>
</md-select>
</div>
...
...
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