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
c5abfae8
Commit
c5abfae8
authored
Oct 02, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added is active
parent
a6bf5ce1
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
895 additions
and
488 deletions
+895
-488
app/applicationlayer/cms/form/header/views.py
app/applicationlayer/cms/form/header/views.py
+43
-0
app/businesslayer/changerequest/change_request.py
app/businesslayer/changerequest/change_request.py
+30
-2
app/entities/models.py
app/entities/models.py
+2
-0
requirements/RMSv2.postman_collection.json
requirements/RMSv2.postman_collection.json
+820
-486
No files found.
app/applicationlayer/cms/form/header/views.py
View file @
c5abfae8
...
@@ -1058,6 +1058,49 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
...
@@ -1058,6 +1058,49 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
return
Response
(
message
,
status
=
status
.
HTTP_200_OK
)
return
Response
(
message
,
status
=
status
.
HTTP_200_OK
)
@
action
(
methods
=
[
'GET'
],
detail
=
False
,
url_path
=
'archived'
,
url_name
=
'archived'
)
def
archived
(
self
,
request
,
*
args
,
**
kwargs
):
self
.
serializer_class
=
ChangeRequestFormHeaderSerializerList
id_number
=
self
.
request
.
user
.
code
self
.
queryset
=
change_request
.
list_by_user_archived
(
id_number
)
self
.
queryset
=
change_request
.
filter_base
(
self
.
queryset
,
request
.
query_params
.
get
(
'company_requested_to'
),
request
.
query_params
.
get
(
'department_requested_to'
),
request
.
query_params
.
get
(
'date_modified_from'
),
request
.
query_params
.
get
(
'date_modified_to'
),
request
.
query_params
.
get
(
'date_required_from'
),
request
.
query_params
.
get
(
'date_required_to'
),
request
.
query_params
.
get
(
'form_type'
),
)
queryset
=
self
.
filter_queryset
(
self
.
queryset
)
page
=
self
.
paginate_queryset
(
queryset
)
if
page
is
not
None
:
serializer
=
self
.
get_serializer
(
page
,
many
=
True
)
message
=
status_message_response
(
200
,
'success'
,
'List of Archived Change Request Form found'
,
serializer
.
data
)
return
self
.
get_paginated_response
(
message
)
serializer
=
self
.
get_serializer
(
self
.
queryset
,
many
=
True
)
return
Response
(
serializer
.
data
,
status
=
status
.
HTTP_200_OK
)
class
ChangeRequestFormPost
(
APIView
):
class
ChangeRequestFormPost
(
APIView
):
...
...
app/businesslayer/changerequest/change_request.py
View file @
c5abfae8
...
@@ -38,7 +38,8 @@ def list_by_user(user_id_number):
...
@@ -38,7 +38,8 @@ def list_by_user(user_id_number):
Q
(
requested_to_department__in
=
priviledgeCrs
)
Q
(
requested_to_department__in
=
priviledgeCrs
)
)
.
exclude
(
)
.
exclude
(
Q
(
status__icontains
=
'Draft'
)
&
Q
(
status__icontains
=
'Draft'
)
&
~
Q
(
requested_by_user
=
user_id_number
)
~
Q
(
requested_by_user
=
user_id_number
)
|
Q
(
status__icontains
=
'Archived'
)
)
.
distinct
()
)
.
distinct
()
return
return_queryset
return
return_queryset
...
@@ -49,6 +50,32 @@ def list_by_user(user_id_number):
...
@@ -49,6 +50,32 @@ def list_by_user(user_id_number):
return
return_queryset
return
return_queryset
def
list_by_user_archived
(
user_id_number
):
try
:
priviledgeCrs
=
models
.
AllowedCompany
.
objects
.
filter
(
Q
(
id_number
=
user_id_number
)
&
Q
(
view_all_change_request
=
True
)
)
.
values
(
'group_pivots'
)
return_queryset
=
models
.
ChangeRequestFormHeader
.
objects
.
filter
(
Q
(
status__icontains
=
'Archived'
)
|
Q
(
frm_approvers__user__code
=
user_id_number
)
|
Q
(
frm_stakes__user__code
=
user_id_number
)
|
Q
(
requested_by_user
=
user_id_number
)
|
Q
(
requested_to_department__in
=
priviledgeCrs
)
)
.
exclude
(
Q
(
status__icontains
=
'Draft'
)
&
~
Q
(
requested_by_user
=
user_id_number
)
)
.
distinct
()
return
return_queryset
except
Exception
as
e
:
return_queryset
=
None
return
return_queryset
def
list_by_user_without_dept
(
user_id_number
):
def
list_by_user_without_dept
(
user_id_number
):
try
:
try
:
...
@@ -58,7 +85,8 @@ def list_by_user_without_dept(user_id_number):
...
@@ -58,7 +85,8 @@ def list_by_user_without_dept(user_id_number):
Q
(
requested_by_user
=
user_id_number
)
Q
(
requested_by_user
=
user_id_number
)
)
.
exclude
(
)
.
exclude
(
Q
(
status__icontains
=
'Draft'
)
&
Q
(
status__icontains
=
'Draft'
)
&
~
Q
(
requested_by_user
=
user_id_number
)
~
Q
(
requested_by_user
=
user_id_number
)
|
Q
(
status__icontains
=
'Archived'
)
)
.
distinct
()
)
.
distinct
()
return
return_queryset
return
return_queryset
...
...
app/entities/models.py
View file @
c5abfae8
...
@@ -397,6 +397,8 @@ class BaseHeader(models.Model):
...
@@ -397,6 +397,8 @@ class BaseHeader(models.Model):
created
=
models
.
DateTimeField
(
auto_now_add
=
True
)
created
=
models
.
DateTimeField
(
auto_now_add
=
True
)
is_active
=
models
.
BooleanField
(
default
=
False
)
class
Meta
:
class
Meta
:
abstract
=
True
abstract
=
True
...
...
requirements/RMSv2.postman_collection.json
View file @
c5abfae8
This diff is collapsed.
Click to expand it.
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