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
962a29ba
Commit
962a29ba
authored
Aug 30, 2018
by
Manikanta SKPB Duppanapudi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Filtered repeatedly adding 'All' in the shift list
parent
703a2b20
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
AttendanceReportController.js
.../webapp/WEB-INF/controllers/AttendanceReportController.js
+4
-1
ShiftDetailsController.js
...main/webapp/WEB-INF/controllers/ShiftDetailsController.js
+3
-1
No files found.
src/main/webapp/WEB-INF/controllers/AttendanceReportController.js
View file @
962a29ba
...
@@ -4,7 +4,10 @@ myApp.controller("attendanceReportController", function($scope, $http, myFactory
...
@@ -4,7 +4,10 @@ myApp.controller("attendanceReportController", function($scope, $http, myFactory
$scope
.
empName
=
myFactory
.
getEmpName
();
$scope
.
empName
=
myFactory
.
getEmpName
();
$scope
.
empEmailId
=
myFactory
.
getEmpEmailId
();
$scope
.
empEmailId
=
myFactory
.
getEmpEmailId
();
$scope
.
shifts
=
myFactory
.
getShifts
();
$scope
.
shifts
=
myFactory
.
getShifts
();
$scope
.
shifts
.
unshift
(
"All"
);
if
(
$scope
.
shifts
.
indexOf
(
"All"
)
==
"-1"
){
$scope
.
shifts
.
unshift
(
"All"
);
}
// Date picker related code
// Date picker related code
var
today
=
new
Date
();
var
today
=
new
Date
();
$scope
.
maxDate
=
today
;
$scope
.
maxDate
=
today
;
...
...
src/main/webapp/WEB-INF/controllers/ShiftDetailsController.js
View file @
962a29ba
...
@@ -71,7 +71,9 @@ myApp.controller("shiftDetailsController",function($scope, myFactory,exportUiGri
...
@@ -71,7 +71,9 @@ myApp.controller("shiftDetailsController",function($scope, myFactory,exportUiGri
$scope
.
getShiftDetails
=
function
(){
$scope
.
getShiftDetails
=
function
(){
$scope
.
shifts
=
myFactory
.
getShifts
();
//["Shift 1(09:00 AM - 06:00 PM)","Shift 2(03:30 PM - 12:30 PM)", "Shift 3(09:00 PM - 06:00 AM)"];
$scope
.
shifts
=
myFactory
.
getShifts
();
//["Shift 1(09:00 AM - 06:00 PM)","Shift 2(03:30 PM - 12:30 PM)", "Shift 3(09:00 PM - 06:00 AM)"];
if
(
$scope
.
shifts
.
indexOf
(
"All"
)
!=
"-1"
){
$scope
.
shifts
.
shift
();
}
var
shiftV
=
$scope
.
shiftValue
;
var
shiftV
=
$scope
.
shiftValue
;
if
(
shiftV
==
undefined
||
shiftV
==
""
){
if
(
shiftV
==
undefined
||
shiftV
==
""
){
shiftV
=
"Shift 1(9:00 AM - 6:00 PM)"
;
shiftV
=
"Shift 1(9:00 AM - 6:00 PM)"
;
...
...
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