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
b0dccfb8
Commit
b0dccfb8
authored
Jun 26, 2019
by
Prayas Jain
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated substaus report screen design
parent
3d0b653a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
9 deletions
+8
-9
AllocationChangeController.js
.../webapp/WEB-INF/controllers/AllocationChangeController.js
+0
-4
SubStatusReportController.js
...n/webapp/WEB-INF/controllers/SubStatusReportController.js
+2
-2
custom-theme.css
src/main/webapp/WEB-INF/css/custom-theme.css
+1
-1
subStatusReport.html
src/main/webapp/WEB-INF/templates/subStatusReport.html
+5
-2
No files found.
src/main/webapp/WEB-INF/controllers/AllocationChangeController.js
View file @
b0dccfb8
...
...
@@ -6,10 +6,6 @@ myApp.controller("allocationChangeReportController",function($scope,exportUiGrid
$scope
.
toDate
=
today
;
$scope
.
fromDate
=
priorDt
;
// +' <i ng-show="row.entity.status == \'InActive\'"> </i><i class="fa fa-minus-circle fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="left" title="Delete" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Delete\')"></i></p>';
$scope
.
gridOptions
=
{
paginationPageSizes
:
[
10
,
20
,
30
,
40
,
50
,
100
],
paginationPageSize
:
10
,
...
...
src/main/webapp/WEB-INF/controllers/SubStatusReportController.js
View file @
b0dccfb8
...
...
@@ -7,7 +7,7 @@ myApp.controller("subStatusController", function($scope, $http, myFactory, $mdDi
// Date picker related code
var
today
=
new
Date
();
var
priorDt
=
today
;
var
priorDt
=
new
Date
(
today
.
getTime
()
-
(
30
*
24
*
60
*
60
*
1000
))
;
$scope
.
maxDate
=
today
;
$scope
.
fromDate
=
priorDt
;
$scope
.
toDate
=
today
;
...
...
@@ -24,7 +24,7 @@ myApp.controller("subStatusController", function($scope, $http, myFactory, $mdDi
{
field
:
'empStatus'
,
displayName
:
'Sub Status'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
true
,
width
:
'*'
},
{
field
:
'fromDate'
,
displayName
:
'From Date'
,
enableColumnMenu
:
false
,
enableFiltering
:
false
,
cellFilter
:
'date:"dd-MMM-yyyy"'
,
width
:
'*'
},
{
field
:
'toDate'
,
displayName
:
'To Date'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
false
,
cellFilter
:
'date:"dd-MMM-yyyy"'
,
width
:
'*'
},
{
field
:
'functionalGroup'
,
displayName
:
'Functional Group'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
false
,
enableFiltering
:
true
,
width
:
'*'
}
{
field
:
'functionalGroup'
,
displayName
:
'Functional Group'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
true
,
width
:
'*'
}
],
enableGridMenu
:
true
,
enableSelectAll
:
true
,
...
...
src/main/webapp/WEB-INF/css/custom-theme.css
View file @
b0dccfb8
...
...
@@ -692,5 +692,5 @@ cursor: pointer;
margin
:
0
;
}
.substatus-report-grid
{
height
:
calc
(
85vh
-
243
px
)
!important
;
height
:
calc
(
85vh
-
150
px
)
!important
;
}
\ No newline at end of file
src/main/webapp/WEB-INF/templates/subStatusReport.html
View file @
b0dccfb8
...
...
@@ -49,11 +49,14 @@
</div>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col-lg-12"
>
<div
id=
"gridTest"
ui-grid=
"gridOptions"
ui-grid-pagination
ui-grid-exporter
class=
"my
g
rid substatus-report-grid"
>
class=
"my
G
rid substatus-report-grid"
>
<div
class=
"watermark"
ng-show=
"!gridOptions.data.length"
>
No
data available
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
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