Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
R
red-ci-cd
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
red-group-test
red-ci-cd
Commits
061b7d00
Commit
061b7d00
authored
Oct 21, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #401 in RMS/api-main-service from gladys-dev2 to RMSv2
* commit '
605c5771
': overdue dashboard added filter
parents
a9e32d09
605c5771
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/applicationlayer/cms/form/approver/serializers.py
app/applicationlayer/cms/form/approver/serializers.py
+1
-1
app/businesslayer/changerequest/change_request.py
app/businesslayer/changerequest/change_request.py
+3
-3
No files found.
app/applicationlayer/cms/form/approver/serializers.py
View file @
061b7d00
app/businesslayer/changerequest/change_request.py
View file @
061b7d00
...
@@ -164,7 +164,7 @@ def filter_overdue(base_queryset):
...
@@ -164,7 +164,7 @@ def filter_overdue(base_queryset):
return_queryset
=
base_queryset
return_queryset
=
base_queryset
try
:
try
:
exclude_status
=
[
'Cancelled'
,
'Completed & Accepted'
]
now
=
datetime
.
now
()
now
=
datetime
.
now
()
overdue
=
[]
overdue
=
[]
...
@@ -174,7 +174,7 @@ def filter_overdue(base_queryset):
...
@@ -174,7 +174,7 @@ def filter_overdue(base_queryset):
return_queryset
=
return_queryset
.
filter
(
return_queryset
=
return_queryset
.
filter
(
form_code__in
=
overdue
form_code__in
=
overdue
)
)
.
exclude
(
status__in
=
exclude_status
)
except
Exception
as
e
:
except
Exception
as
e
:
pass
pass
...
...
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