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
de349758
Commit
de349758
authored
Jun 13, 2019
by
Prayas Jain
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed Dropdown Issue
parent
d55f627f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
6 deletions
+22
-6
AssignRolesController.js
src/main/webapp/WEB-INF/controllers/AssignRolesController.js
+6
-1
ProjectController.js
src/main/webapp/WEB-INF/controllers/ProjectController.js
+9
-1
custom-theme.css
src/main/webapp/WEB-INF/css/custom-theme.css
+5
-2
projectTeamDetails.html
src/main/webapp/WEB-INF/templates/projectTeamDetails.html
+2
-2
No files found.
src/main/webapp/WEB-INF/controllers/AssignRolesController.js
View file @
de349758
myApp
.
controller
(
"assignRoleController"
,
function
(
$scope
,
myFactory
,
$mdDialog
,
$http
,
appConfig
,
$timeout
){
myApp
.
controller
(
"assignRoleController"
,
function
(
$scope
,
myFactory
,
$mdDialog
,
$http
,
appConfig
,
$timeout
,
$window
,
$mdSelect
){
$scope
.
records
=
[];
$scope
.
empSearchId
=
""
;
$scope
.
status
=
"Active"
;
...
...
@@ -236,6 +236,11 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $
}
}
$window
.
addEventListener
(
'click'
,
function
(
e
)
{
if
(
e
.
target
.
type
!==
'search'
)
{
$mdSelect
.
hide
();
}
});
function
AddRoleController
(
$scope
,
$mdDialog
,
dataToPass
,
gridOptionsData
)
{
$scope
.
templateTitle
=
dataToPass
.
action
;
...
...
src/main/webapp/WEB-INF/controllers/ProjectController.js
100755 → 100644
View file @
de349758
...
...
@@ -609,7 +609,7 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
var
getCellTemplate1
=
'<p class="col-lg-12"><i ng-show="!row.entity.editrow" class="fa fa-pencil-square-o fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.edit(row)"></i>'
+
'<i ng-show="row.entity.editrow" class="fa fa-save fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.saveRow(row.entity,
\'
Update
\'
)"></i>'
+
' <i ng-show="row.entity.editrow" id="cancelEdit" class="fa fa-times fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.cancelEdit(row.entity)"></i>'
+
' <i ng-show="grid.appScope.s
tatus ==
\'
InActive
\'
" id="moveEdit" class="fa fa-arrow-circle-right fa-2x" aria-hidden="true" style="font-size:1.8em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.moveToBench(row.entity)"></i></p>'
+
' <i ng-show="grid.appScope.s
howMoveToBenchIcon(row.entity)" id="moveEdit" class="fa fa-arrow-circle-right fa-2x" aria-hidden="true" style="font-size:1.8em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.moveToBench(row.entity)"></i></p>'
;
//' <i class="fa fa-minus-circle fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.getRowData(row,\'Delete\')"></i></p>';
var
getCellActiveTemplate
=
'<div ng-show="COL_FIELD==true"><p class="col-lg-12">Y</P></div><div ng-show="COL_FIELD==false"><p class="col-lg-12">N</p></div>'
;
...
...
@@ -686,6 +686,14 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
showAlert
(
"Something went wrong while fetching data!!!"
);
$scope
.
gridOptions
.
data
=
[];
});
$scope
.
showMoveToBenchIcon
=
function
(
row
){
if
(
$scope
.
status
==
'InActive'
&&
row
.
projectId
!=
'Nisum0000'
){
return
true
;
}
}
$scope
.
parentData
=
{
"employeeId"
:
""
,
"projectId"
:
""
,
...
...
src/main/webapp/WEB-INF/css/custom-theme.css
View file @
de349758
...
...
@@ -546,9 +546,9 @@ top: 22px;
.md-dialog-container
{
z-index
:
100
!important
;
}
.md-select-menu-container
{
.md-select-menu-container
{
z-index
:
100
!important
;
}
}
.md-dialog-custom-height
{
max-height
:
95%
!important
;
}
...
...
@@ -673,3 +673,6 @@ cursor: pointer;
.viewTeamDetails
{
width
:
100%
;
}
md-content
{
overflow
:
hidden
;
}
\ No newline at end of file
src/main/webapp/WEB-INF/templates/projectTeamDetails.html
View file @
de349758
...
...
@@ -39,14 +39,14 @@
</div>
</div>
<div
class=
"form-group col-lg-
7 col-md-7 col-sm-7
col-xs-12"
></div>
<div
class=
"form-group col-lg-
9 col-md-9 col-sm-9
col-xs-12"
></div>
<div
class=
"row col-lg-12"
style=
"margin-left: 0px;"
>
<input
type=
"radio"
ng-model=
"status"
value=
"Active"
ng-click=
"getTeamMates()"
>
Active
<input
type=
"radio"
ng-model=
"status"
value=
"InActive"
ng-click=
"getTeamMates()"
>
Inactive
<input
type=
"radio"
ng-model=
"status"
value=
"Both"
ng-click=
"getTeamMates()"
>
Both
</div>
<div
id=
"gridTest"
class=
"grid-half-view"
ui-grid=
"gridOptions "
ui-grid-edit
ui-grid-pagination
style=
"width:9
9%;height:230px;margin-left:10
px; "
>
<div
id=
"gridTest"
class=
"grid-half-view"
ui-grid=
"gridOptions "
ui-grid-edit
ui-grid-pagination
style=
"width:9
4.5%;margin-left:25
px; "
>
<div
class=
"watermark "
ng-show=
"!gridOptions.data.length "
>
No data available
</div>
</div>
<div
ng-if =
'templateTitle == "View"'
role=
"alert"
>
...
...
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