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
83a6d280
Commit
83a6d280
authored
Sep 26, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
undo
parent
266a8408
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
61 additions
and
101 deletions
+61
-101
app/applicationlayer/cms/form/views.py
app/applicationlayer/cms/form/views.py
+55
-99
app/applicationlayer/cms/template/views.py
app/applicationlayer/cms/template/views.py
+2
-2
app/applicationlayer/cms/utils_cr.py
app/applicationlayer/cms/utils_cr.py
+4
-0
No files found.
app/applicationlayer/cms/form/views.py
View file @
83a6d280
...
@@ -375,12 +375,21 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
...
@@ -375,12 +375,21 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
form_code
=
kwargs
[
'form_code'
]
form_code
=
kwargs
[
'form_code'
]
# get prefix from template header
frm
=
models
.
ChangeRequestFormHeader
.
objects
.
get
(
form_code
=
form_code
)
tmp_prefix
=
models
.
ChangeRequestTemplateHeader
.
objects
.
get
(
template_no
=
frm
.
template_no
.
template_no
)
data_update
=
{
status_update
=
{
"status"
:
'Draft'
}
"status"
:
'Draft'
,
"created"
:
datetime
.
now
(),
"requested_to_template_id"
:
tmp_prefix
.
requested_to_template_id
}
serializer
=
self
.
get_serializer
(
instance
,
serializer
=
self
.
get_serializer
(
instance
,
data
=
status
_update
,
data
=
data
_update
,
partial
=
partial
)
partial
=
partial
)
serializer
.
is_valid
(
raise_exception
=
True
)
serializer
.
is_valid
(
raise_exception
=
True
)
...
@@ -415,7 +424,8 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
...
@@ -415,7 +424,8 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
'action'
:
None
,
'action'
:
None
,
'remarks'
:
None
,
'remarks'
:
None
,
'date_sent'
:
None
,
'date_sent'
:
None
,
'action_date'
:
None
'action_date'
:
None
,
'created'
:
datetime
.
now
()
}
}
approver_data
.
append
(
approver_add
)
approver_data
.
append
(
approver_add
)
...
@@ -602,7 +612,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
...
@@ -602,7 +612,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
)
)
def
save
(
self
,
request
,
*
args
,
**
kwargs
):
def
save
(
self
,
request
,
*
args
,
**
kwargs
):
partial
=
kwargs
.
pop
(
'partial'
,
Fals
e
)
partial
=
kwargs
.
pop
(
'partial'
,
Tru
e
)
instance
=
self
.
get_object
()
instance
=
self
.
get_object
()
form_code
=
kwargs
[
'form_code'
]
form_code
=
kwargs
[
'form_code'
]
...
@@ -794,59 +804,6 @@ class ChangeRequestFormApproversViewset(meviewsets.ModelViewSet):
...
@@ -794,59 +804,6 @@ class ChangeRequestFormApproversViewset(meviewsets.ModelViewSet):
pagination_class
=
paginators
.
SimplePageNumberPagination
pagination_class
=
paginators
.
SimplePageNumberPagination
lookup_field
=
'code'
lookup_field
=
'code'
# def create(self, request, *args, **kwargs):
# ObjectId = request.data.get('id')
# sent = False
# if 'form_status' in request.data:
# # for email
# if str(request.data['level']) == '1' and request.data['form_status'].lower() == 'pending':
# user = request.data['user']
# form_code = request.data['form_code']
# delegation = request.data['delegation']
# # initial_email(user, form_code, delegation)
# # EMAIL CODE FOR APPROVER
# notification_msg = APPROVER_MESSAGE.split(';')[0]
# email_code = APPROVER_MESSAGE.split(';')[1]
# next_appover_email(
# user, form_code, delegation,
# notification_msg, 'initial', email_code
# )
# request.data['date_sent'] = datetime.now().strftime('%Y-%m-%d, %H:%M:%S')
# request.data['created'] = datetime.now().strftime('%Y-%m-%d, %H:%M:%S') #correct
# sent = True
# serializer = self.get_serializer(data=request.data)
# serializer.is_valid(raise_exception=True)
# if ObjectId:
# dbExisting = models.ChangeRequestFormApprovers.objects.filter(
# id=ObjectId,
# archived_at=None).first()
# if dbExisting:
# dbExisting.archived_at = datetime.now()
# dbExisting.save()
# # x = self.perform_create(serializer)
# serializer.id = None
# x = serializer.save()
# if sent == True:
# x.date_sent = datetime.now().strftime('%Y-%m-%d, %H:%M:%S')
# x.created = datetime.now().strftime('%Y-%m-%d, %H:%M:%S') #correct
# x.save()
# headers = self.get_success_headers(serializer.data)
# return Response(
# serializer.data,
# status=status.HTTP_201_CREATED,
# headers=headers
# )
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
self
.
queryset
=
QuerySetHelper
.
Sort
(
self
)
self
.
queryset
=
QuerySetHelper
.
Sort
(
self
)
return
super
(
ChangeRequestFormApproversViewset
,
self
)
.
list
(
request
)
return
super
(
ChangeRequestFormApproversViewset
,
self
)
.
list
(
request
)
...
@@ -1018,12 +975,7 @@ class ChangeRequestFormPost(APIView):
...
@@ -1018,12 +975,7 @@ class ChangeRequestFormPost(APIView):
'template_no'
:
form_header
[
'template_no'
]
'template_no'
:
form_header
[
'template_no'
]
}
}
frm_approvers
=
form_header
[
'frm_approvers'
]
sp1
=
transaction
.
savepoint
()
# nothing will save to db
frm_stakes
=
form_header
[
'frm_stakes'
]
frm_attachments
=
form_header
[
'frm_attachments'
]
frm_details
=
form_header
[
'frm_details'
]
# sp1 = transaction.savepoint() # nothing will save to db
serializer
=
serializers
.
ChangeRequestFormHeaderSerializer
(
serializer
=
serializers
.
ChangeRequestFormHeaderSerializer
(
data
=
form_header_data
)
data
=
form_header_data
)
...
@@ -1048,12 +1000,14 @@ class ChangeRequestFormPost(APIView):
...
@@ -1048,12 +1000,14 @@ class ChangeRequestFormPost(APIView):
requested_to_template_id
=
generate_tmp
)
requested_to_template_id
=
generate_tmp
)
# create template approvers
# create template approvers
frm_approvers
=
form_header
[
'frm_approvers'
]
counter
=
0
counter
=
0
for
frm_approver
in
frm_approvers
:
for
frm_approver
in
frm_approvers
:
frm_approver
[
'form_code'
]
=
frm_id
frm_approver
[
'form_code'
]
=
frm_id
counter
=
counter
+
1
counter
=
counter
+
1
data_list_approver
.
append
(
frm_approver
)
data_list_approver
.
append
(
frm_approver
)
#append vendor and requestor in routing table
counter
=
counter
+
1
counter
=
counter
+
1
vendor_data
=
{
vendor_data
=
{
'level'
:
counter
,
'level'
:
counter
,
...
@@ -1063,7 +1017,6 @@ class ChangeRequestFormPost(APIView):
...
@@ -1063,7 +1017,6 @@ class ChangeRequestFormPost(APIView):
}
}
data_list_approver
.
append
(
vendor_data
)
data_list_approver
.
append
(
vendor_data
)
counter
=
counter
+
1
counter
=
counter
+
1
requestor_data
=
{
requestor_data
=
{
'level'
:
counter
,
'level'
:
counter
,
...
@@ -1081,7 +1034,8 @@ class ChangeRequestFormPost(APIView):
...
@@ -1081,7 +1034,8 @@ class ChangeRequestFormPost(APIView):
serializerApprover
.
save
()
serializerApprover
.
save
()
# create template stakes
# create template stakes
if
form_header
[
'frm_stakes'
]:
frm_stakes
=
form_header
[
'frm_stakes'
]
for
frm_stake
in
frm_stakes
:
for
frm_stake
in
frm_stakes
:
frm_stake
[
'form_code'
]
=
frm_id
frm_stake
[
'form_code'
]
=
frm_id
data_list_stake
.
append
(
frm_stake
)
data_list_stake
.
append
(
frm_stake
)
...
@@ -1093,7 +1047,8 @@ class ChangeRequestFormPost(APIView):
...
@@ -1093,7 +1047,8 @@ class ChangeRequestFormPost(APIView):
serializerStake
.
save
()
serializerStake
.
save
()
# create template attachments
# create template attachments
if
form_header
[
'frm_attachments'
]:
frm_attachments
=
form_header
[
'frm_attachments'
]
for
frm_attachment
in
frm_attachments
:
for
frm_attachment
in
frm_attachments
:
frm_attachment
[
'form_code'
]
=
frm_id
frm_attachment
[
'form_code'
]
=
frm_id
data_list_attach
.
append
(
frm_attachment
)
data_list_attach
.
append
(
frm_attachment
)
...
@@ -1105,7 +1060,8 @@ class ChangeRequestFormPost(APIView):
...
@@ -1105,7 +1060,8 @@ class ChangeRequestFormPost(APIView):
serializerAttach
.
save
()
serializerAttach
.
save
()
# create template details
# create template details
if
form_header
[
'frm_details'
]:
frm_details
=
form_header
[
'frm_details'
]
for
frm_detail
in
frm_details
:
for
frm_detail
in
frm_details
:
frm_detail
[
'form_code'
]
=
frm_id
frm_detail
[
'form_code'
]
=
frm_id
data_list_detail
.
append
(
frm_detail
)
data_list_detail
.
append
(
frm_detail
)
...
@@ -1126,7 +1082,7 @@ class ChangeRequestFormPost(APIView):
...
@@ -1126,7 +1082,7 @@ class ChangeRequestFormPost(APIView):
return
Response
(
message
,
status
=
status
.
HTTP_201_CREATED
)
return
Response
(
message
,
status
=
status
.
HTTP_201_CREATED
)
except
ValidationError
as
e
:
except
ValidationError
as
e
:
#
transaction.savepoint_rollback(sp1)
transaction
.
savepoint_rollback
(
sp1
)
message
=
{
message
=
{
'code'
:
400
,
'code'
:
400
,
'status'
:
'failed'
,
'status'
:
'failed'
,
...
@@ -1135,7 +1091,7 @@ class ChangeRequestFormPost(APIView):
...
@@ -1135,7 +1091,7 @@ class ChangeRequestFormPost(APIView):
return
Response
(
message
,
status
=
status
.
HTTP_400_BAD_REQUEST
)
return
Response
(
message
,
status
=
status
.
HTTP_400_BAD_REQUEST
)
except
Exception
as
e
:
except
Exception
as
e
:
#
transaction.savepoint_rollback(sp1)
transaction
.
savepoint_rollback
(
sp1
)
message
=
{
message
=
{
'code'
:
500
,
'code'
:
500
,
'status'
:
'failed'
,
'status'
:
'failed'
,
...
...
app/applicationlayer/cms/template/views.py
View file @
83a6d280
app/applicationlayer/cms/utils_cr.py
View file @
83a6d280
...
@@ -471,3 +471,7 @@ def crhistory_log_bulk_delete(queryset, entity, tbl, form_code,
...
@@ -471,3 +471,7 @@ def crhistory_log_bulk_delete(queryset, entity, tbl, form_code,
return
True
return
True
except
IntegrityError
as
exc
:
except
IntegrityError
as
exc
:
raise
APIException
(
detail
=
exc
)
raise
APIException
(
detail
=
exc
)
def
generate_template_id
(
prefix
):
print
(
"hello"
)
\ 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