Commit a50f1000 authored by Gladys Forte's avatar Gladys Forte

Merge branch 'prod-dev-gladys' into 'feature/RMS.v2.1-AMS'

{devbugfix} added function for form save - changing template

See merge request rms/Backend/api-main-service!1021
parents 723e5b81 9b9884a0
...@@ -9,6 +9,10 @@ class AssetTypeSerializer(serializers.ModelSerializer): ...@@ -9,6 +9,10 @@ class AssetTypeSerializer(serializers.ModelSerializer):
ret = super().to_representation(instance) ret = super().to_representation(instance)
assets = instance.ams_asset_type.select_related() 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 ams_stock_counter = 0
for asset in assets: for asset in assets:
......
...@@ -752,6 +752,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -752,6 +752,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
form_code = kwargs['form_code'] form_code = kwargs['form_code']
form_data = request.data form_data = request.data
old_template_code = instance.template_no.template_no
# generate batchno history # generate batchno history
batchno = get_max_batchno("batch") batchno = get_max_batchno("batch")
...@@ -795,17 +797,32 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -795,17 +797,32 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
new_instance new_instance
) )
change_request.form_add_edit_delete( new_template_code = serializer.validated_data['template_no'].template_no
form_data['frm_approvers'],
models.ChangeRequestFormApprovers, if old_template_code == new_template_code:
enums.CREntitiesEnum.CR_FRM_APPROVER.value, change_request.form_add_edit_delete(
ChangeRequestFormApproversSerializer, form_data['frm_approvers'],
partial, models.ChangeRequestFormApprovers,
self, enums.CREntitiesEnum.CR_FRM_APPROVER.value,
form_code, ChangeRequestFormApproversSerializer,
batchno, partial,
enums.CREnum.SAVE.value 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( change_request.form_add_edit_delete(
form_data['frm_stakes'], form_data['frm_stakes'],
......
...@@ -368,6 +368,55 @@ def form_add_edit_delete(form_request_body, ...@@ -368,6 +368,55 @@ def form_add_edit_delete(form_request_body,
return True 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, def attachment_add_edit_delete(form_request_body,
queryset, queryset,
entity, entity,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment