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
9b9884a0
Commit
9b9884a0
authored
Mar 23, 2020
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
{devbugfix} added function for form save - changing template
parent
4a2779c4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
81 additions
and
11 deletions
+81
-11
app/applicationlayer/ams/asset_type/serializers.py
app/applicationlayer/ams/asset_type/serializers.py
+4
-0
app/applicationlayer/cms/form/header/views.py
app/applicationlayer/cms/form/header/views.py
+28
-11
app/businesslayer/changerequest/change_request.py
app/businesslayer/changerequest/change_request.py
+49
-0
No files found.
app/applicationlayer/ams/asset_type/serializers.py
View file @
9b9884a0
...
...
@@ -9,6 +9,10 @@ class AssetTypeSerializer(serializers.ModelSerializer):
ret
=
super
()
.
to_representation
(
instance
)
assets
=
instance
.
ams_asset_type
.
select_related
()
# assets1 = instance.ams_asset_type.count()
# asset_stock1 = instance.ams_asset_type.values('')
# ams_asset_to_assetdetail
# print(assets1)
ams_stock_counter
=
0
for
asset
in
assets
:
...
...
app/applicationlayer/cms/form/header/views.py
View file @
9b9884a0
...
...
@@ -752,6 +752,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
form_code
=
kwargs
[
'form_code'
]
form_data
=
request
.
data
old_template_code
=
instance
.
template_no
.
template_no
# generate batchno history
batchno
=
get_max_batchno
(
"batch"
)
...
...
@@ -795,17 +797,32 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
new_instance
)
change_request
.
form_add_edit_delete
(
form_data
[
'frm_approvers'
],
models
.
ChangeRequestFormApprovers
,
enums
.
CREntitiesEnum
.
CR_FRM_APPROVER
.
value
,
ChangeRequestFormApproversSerializer
,
partial
,
self
,
form_code
,
batchno
,
enums
.
CREnum
.
SAVE
.
value
)
new_template_code
=
serializer
.
validated_data
[
'template_no'
]
.
template_no
if
old_template_code
==
new_template_code
:
change_request
.
form_add_edit_delete
(
form_data
[
'frm_approvers'
],
models
.
ChangeRequestFormApprovers
,
enums
.
CREntitiesEnum
.
CR_FRM_APPROVER
.
value
,
ChangeRequestFormApproversSerializer
,
partial
,
self
,
form_code
,
batchno
,
enums
.
CREnum
.
SAVE
.
value
)
else
:
change_request
.
form_add_edit_delete_for_draft
(
form_data
[
'frm_approvers'
],
models
.
ChangeRequestFormApprovers
,
enums
.
CREntitiesEnum
.
CR_FRM_APPROVER
.
value
,
ChangeRequestFormApproversSerializer
,
partial
,
self
,
form_code
,
batchno
,
enums
.
CREnum
.
SAVE
.
value
)
change_request
.
form_add_edit_delete
(
form_data
[
'frm_stakes'
],
...
...
app/businesslayer/changerequest/change_request.py
View file @
9b9884a0
...
...
@@ -368,6 +368,55 @@ def form_add_edit_delete(form_request_body,
return
True
def
form_add_edit_delete_for_draft
(
form_request_body
,
queryset
,
entity
,
serializer_data
,
partial
,
self
,
form_code
,
batch_no
,
main_action
):
delete_query
=
queryset
.
objects
.
filter
(
form_code
=
form_code
)
if
delete_query
.
count
()
>
0
:
crhistory_log_bulk_delete
(
delete_query
,
entity
,
queryset
,
form_code
,
batch_no
,
main_action
)
for
i
in
form_request_body
:
frm_code
=
{
"form_code"
:
form_code
}
data
=
{
**
i
,
**
frm_code
}
serializer
=
serializer_data
(
data
=
data
,
context
=
{
"request"
:
self
.
request
})
serializer
.
is_valid
(
raise_exception
=
True
)
self
.
perform_create
(
serializer
)
new_instance
=
serializer
.
data
crhistory_save
(
batch_no
,
main_action
,
enums
.
CREnum
.
ADD
.
value
,
entity
,
form_code
,
None
,
new_instance
)
return
True
def
attachment_add_edit_delete
(
form_request_body
,
queryset
,
entity
,
...
...
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