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
9505e38c
Commit
9505e38c
authored
Oct 04, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
try action rejected
parent
856ea16d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
34 additions
and
13 deletions
+34
-13
app/applicationlayer/cms/form/header/views.py
app/applicationlayer/cms/form/header/views.py
+34
-13
No files found.
app/applicationlayer/cms/form/header/views.py
View file @
9505e38c
...
@@ -190,7 +190,25 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
...
@@ -190,7 +190,25 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
overdue_filtered
=
change_request
.
filter_overdue
(
self
.
queryset
)
overdue_filtered
=
change_request
.
filter_overdue
(
self
.
queryset
)
overdue
=
overdue_filtered
.
count
()
overdue
=
overdue_filtered
.
count
()
# to disable create cr and cr template in dashboard
can_create_cr
=
models
.
AllowedCompany
.
objects
.
filter
(
id_number
=
id_number
,
create_change_request
=
1
)
can_create_cr_temp
=
models
.
AllowedCompany
.
objects
.
filter
(
id_number
=
id_number
,
create_change_request_template
=
1
)
cr
=
False
cr_temp
=
False
if
can_create_cr
.
count
()
>
0
:
cr
=
True
if
can_create_cr_temp
.
count
()
>
0
:
cr_temp
=
True
message
=
{
message
=
{
'account_no'
:
id_number
,
'account_no'
:
id_number
,
'pending'
:
pending
,
'pending'
:
pending
,
...
@@ -202,6 +220,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
...
@@ -202,6 +220,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
'normal'
:
normal
,
'normal'
:
normal
,
'awaiting'
:
awaiting
,
'awaiting'
:
awaiting
,
'overdue'
:
overdue
,
'overdue'
:
overdue
,
'cr'
:
cr
,
'cr_temp'
:
cr_temp
,
'code'
:
200
,
'code'
:
200
,
'status'
:
'success'
,
'status'
:
'success'
,
'message'
:
'Dashboard Summary'
'message'
:
'Dashboard Summary'
...
@@ -571,7 +591,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
...
@@ -571,7 +591,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
tmp_prefix
=
models
.
ChangeRequestTemplateHeader
.
objects
.
get
(
tmp_prefix
=
models
.
ChangeRequestTemplateHeader
.
objects
.
get
(
template_no
=
frm
.
template_no
.
template_no
template_no
=
frm
.
template_no
.
template_no
)
)
data_update
=
{
data_update
=
{
"status"
:
'Draft'
,
"status"
:
'Draft'
,
"created"
:
datetime
.
now
(),
"created"
:
datetime
.
now
(),
...
@@ -646,23 +666,24 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
...
@@ -646,23 +666,24 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
url_path
=
'actions'
,
url_name
=
'actions'
url_path
=
'actions'
,
url_name
=
'actions'
)
)
def
actions
(
self
,
request
,
*
args
,
**
kwargs
):
def
actions
(
self
,
request
,
*
args
,
**
kwargs
):
# get request data
id
=
request
.
data
[
'id'
]
# current_user = request.data['user']
current_user
=
self
.
request
.
user
.
code
current_user
=
self
.
request
.
user
.
code
form_code
=
request
.
data
[
'form_code'
]
delegation
=
request
.
data
[
'delegation'
]
action_body
=
request
.
data
action
=
request
.
data
[
'action'
]
level
=
request
.
data
[
'level'
]
id
=
action_body
.
get
(
'id'
,
False
)
next_level
=
int
(
request
.
data
[
'level'
])
+
1
form_code
=
action_body
.
get
(
'form_code'
,
False
)
remarks
=
request
.
data
[
'remarks'
]
delegation
=
action_body
.
get
(
'delegation'
,
False
)
action
=
action_body
.
get
(
'action'
,
False
)
level
=
action_body
.
get
(
'level'
,
False
)
next_level
=
int
(
level
)
+
1
remarks
=
action_body
.
get
(
'remarks'
,
False
)
# generate batchno history
# generate batchno history
batchno
=
get_max_batchno
(
"batch"
)
batchno
=
get_max_batchno
(
"batch"
)
action_data
=
{
action_data
=
{
'id'
:
i
nt
(
request
.
data
[
'id'
])
,
'id'
:
i
d
,
'action'
:
action
,
'action'
:
action
,
'remarks'
:
remarks
,
'remarks'
:
remarks
,
'action_date'
:
datetime
.
now
()
'action_date'
:
datetime
.
now
()
...
...
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