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
0783a2b7
Commit
0783a2b7
authored
Jul 11, 2018
by
vpalle-nisum-com
Committed by
rbonthala-nisum-com
Jul 11, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MT-75_FIlter_based_on_employeename_in_the_add_teammate_page. (#10)
parent
937ad689
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
98 additions
and
17 deletions
+98
-17
ProjectTeamController.js
src/main/webapp/WEB-INF/controllers/ProjectTeamController.js
+12
-0
default-styles.css
src/main/webapp/WEB-INF/css/default-styles.css
+23
-0
newTeamMate.html
src/main/webapp/WEB-INF/templates/newTeamMate.html
+63
-17
No files found.
src/main/webapp/WEB-INF/controllers/ProjectTeamController.js
View file @
0783a2b7
...
...
@@ -294,6 +294,18 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog,
}
function
AddProjectTeamController
(
$scope
,
$mdDialog
,
dataToPass
,
gridOptionsData
,
employees
)
{
$scope
.
searchTerm
=
""
;
$scope
.
updateSearch
=
function
(
e
){
e
.
stopPropagation
();
}
$scope
.
searchFilter
=
function
(
obj
)
{
var
re
=
new
RegExp
(
$scope
.
searchTerm
,
'i'
);
//return !$scope.searchTerm || re.test(obj.employeeId) || re.test(obj.employeeName) ||re.test(obj.emailId) ;
return
!
$scope
.
searchTerm
||
re
.
test
(
obj
.
employeeName
)
;
};
$scope
.
templateTitle
=
dataToPass
.
action
;
$scope
.
alertMsg
=
""
;
$scope
.
isDisabled
=
false
;
...
...
src/main/webapp/WEB-INF/css/default-styles.css
View file @
0783a2b7
...
...
@@ -113,3 +113,26 @@ md-dialog{
overflow-y
:
auto
;
max-height
:
206px
;
}
.selectdemoSelectHeader
{
Please
note
:
All
these
selectors
are
only
applied
to
children
of
elements
with
the
'selectdemoSelectHeader'
class
}
.selectdemoSelectHeader
.demo-header-searchbox
{
border
:
none
;
outline
:
none
;
}
.selectdemoSelectHeader
.demo-select-header
{
box-shadow
:
0
1px
0
0
rgba
(
0
,
0
,
0
,
0.1
),
0
0
0
0
rgba
(
0
,
0
,
0
,
0.14
),
0
0
0
0
rgba
(
0
,
0
,
0
,
0.12
);
padding-left
:
10.667px
;
height
:
48px
;
cursor
:
pointer
;
position
:
relative
;
display
:
flex
;
width
:
auto
;
position
:
fixed
;
z-index
:
10
;
background
:
white
;
width
:
100%
;}
.selectdemoSelectHeader
md-content
._md
{
max-height
:
240px
;
}
src/main/webapp/WEB-INF/templates/newTeamMate.html
View file @
0783a2b7
...
...
@@ -14,25 +14,70 @@
<md-dialog-content>
<div
class=
"md-dialog-content"
>
<div
class=
"form-group"
>
<md-select
ng-model=
"projectModel"
md-selected-text=
"getProjectSelected()"
id=
"selectProject"
>
<md-optgroup
label=
"Project"
>
<md-option
ng-value=
"project"
ng-repeat=
"project in projectList"
>
{{project.projectName}}
</md-option>
</md-optgroup>
</md-select>
<md-select
ng-model=
"employeeModel"
md-selected-text=
"getEmployeeSelected()"
id=
"selectEmp"
>
<md-optgroup
label=
"Employee"
>
<md-option
ng-value=
"employee"
ng-repeat=
"employee in employeeList"
>
{{employee.employeeName}}
</md-option>
</md-optgroup>
</md-select>
<output>
Employee Name : {{employeeModel.employeeName}}
</output>
<output>
Employee Id : {{employeeModel.employeeId}}
</output>
<output>
Email Id : {{employeeModel.emailId}}
</output>
<output>
Role : {{employeeModel.role}}
</output>
<output>
Designation : {{employeeModel.designation}}
</output>
<md-select
ng-model=
"empBillableStatus"
md-selected-text=
"getSelectedBillableStatus()"
id=
"empBillableStatus"
>
<md-optgroup
label=
"billable statuses"
>
<md-option
ng-value=
"billableStatus"
ng-repeat=
"billableStatus in billableStatuses"
>
{{billableStatus}}
</md-option>
</md-optgroup>
</md-select>
<md-datepicker
ng-model=
"startDate"
md-placeholder=
"Start Date"
id =
"startDate"
<md-select
ng-model=
"projectModel"
md-selected-text=
"getProjectSelected()"
id=
"selectProject"
>
<md-optgroup
label=
"Project"
>
<md-option
ng-value=
"project"
ng-repeat=
"project in projectList"
>
{{project.projectName}}
</md-option>
</md-optgroup>
</md-select>
<md-select
ng-model=
"employeeModel"
md-selected-text=
"getEmployeeSelected()"
id=
"selectEmp"
data-md-container-class=
"selectdemoSelectHeader"
>
<md-select-header
layout=
"column"
class=
"demo-select-header"
>
<md-input-container>
<input
ng-model=
"searchTerm"
type=
"search"
ng-keydown=
"$event.stopPropagation()"
ng-model-options=
"{debounce: {'default': 500, 'blur': 0}}"
placeholder=
"Search..."
class=
"demo-header-searchbox md-text"
/>
</md-input-container>
</md-select-header>
<md-optgroup
label=
"Employee"
class=
"optionScroll"
>
<md-option
ng-value=
"employee"
ng-repeat=
"employee in employeeList | filter:searchFilter"
>
{{employee.employeeName}}
</md-option>
</md-optgroup>
</md-select>
<output>
Employee Name : {{employeeModel.employeeName}}
</output>
<output>
Employee Id : {{employeeModel.employeeId}}
</output>
<output>
Email Id : {{employeeModel.emailId}}
</output>
<output>
Role : {{employeeModel.role}}
</output>
<output>
Designation : {{employeeModel.designation}}
</output>
<div
ng-repeat=
"project in projectInfoList"
>
<output>
Previous Project Name : {{project.projectName}}
</output>
<output>
Billability Status : {{project.billableStatus}}
</output>
<output>
Previous Project Start Date : {{ project.startDate | date : "dd-MM-yyyy"}}
</output>
<output>
Previous Project End Date : {{project.endDate | date : "dd-MM-yyyy"}}
</output>
</div>
<md-select
ng-model=
"empBillableStatus"
md-selected-text=
"getSelectedBillableStatus()"
id=
"empBillableStatus"
>
<md-optgroup
label=
"billable statuses"
>
<md-option
ng-value=
"billableStatus"
ng-repeat=
"billableStatus in billableStatuses"
>
{{billableStatus}}
</md-option>
</md-optgroup>
</md-select>
<div
ng-show=
"empBillableStatus"
>
<output>
Current Billability Start Date :
<md-datepicker
ng-model=
"newBillingStartDate"
md-placeholder=
"Please Select Date"
id =
"newBillingStartDate"
md-min-date=
"minDate"
md-max-date=
"maxDate"
ng-change=
"currentBillabilityDateChange()"
onkeydown=
"return false"
></md-datepicker></br></output>
</div>
<md-datepicker
ng-model=
"startDate"
md-placeholder=
"Assignment Start Date"
id =
"startDate"
md-min-date=
"minDate"
md-max-date=
"maxDate"
ng-disabled=
"newBillingStartDate"
onkeydown=
"return false"
></md-datepicker></br>
<md-datepicker
ng-model=
"endDate"
md-placeholder=
"
Projected
End Date"
id=
"endDate"
<md-datepicker
ng-model=
"endDate"
md-placeholder=
"
Assignment
End Date"
id=
"endDate"
md-min-date=
"minDate"
md-max-date=
"maxDate"
onkeydown=
"return false"
></md-datepicker>
...
...
@@ -40,8 +85,9 @@
<div
role=
"alert"
>
<span
class=
"error"
style=
"color: red;"
>
{{alertMsg}}
</span>
</div>
</div>
</div>
</div>
</md-dialog-content>
<md-dialog-actions
layout=
"row"
>
<md-button
...
...
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