Skip to content

R
red-ci-cd
Commit fea815fa authored by Gladys Forte's avatar Gladys Forte
Browse files
Options

Merge pull request #131 in RMS/api-main-service from gladys-dev2 to RMSv2 

* commit 'cd98baab':
  updated DB
  update submit
parents 1a40d0d8 cd98baab
Hide whitespace changes
Inline Side-by-side
Showing with 1817 additions and 52 deletions
app/applicationlayer/cms/form/views.py
View file @ fea815fa
...@@ -20,13 +20,14 @@ import requests ...@@ -20,13 +20,14 @@ import requests
from django.conf import settings from django.conf import settings
from rest_framework.exceptions import ValidationError from rest_framework.exceptions import ValidationError
from django.db import transaction, IntegrityError, connection from django.db import transaction, IntegrityError, connection
from app.applicationlayer.utils import QuerySetHelper from app.applicationlayer.utils import QuerySetHelper, status_message_response
from app.businesslayer.changerequest import change_request from app.businesslayer.changerequest import change_request
from app.applicationlayer.cms.utils_cr import (number_generator, from app.applicationlayer.cms.utils_cr import (number_generator,
send_mail_requestor, send_mail_requestor,
next_approver_email, next_approver_email,
crhistory_save, crhistory_save,
send_mail_vendor) send_mail_vendor,
get_max_batchno)
from app.entities import enums from app.entities import enums
from django.forms.models import model_to_dict from django.forms.models import model_to_dict
import json import json
...@@ -267,6 +268,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -267,6 +268,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
serializer = self.get_serializer(instance) serializer = self.get_serializer(instance)
return Response(serializer.data) return Response(serializer.data)
@action( @action(
methods=['PATCH'], detail=True, methods=['PATCH'], detail=True,
url_path='re_route', url_name='re_route' url_path='re_route', url_name='re_route'
...@@ -274,6 +276,9 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -274,6 +276,9 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
def re_route(self, request, *args, **kwargs): def re_route(self, request, *args, **kwargs):
form_code = kwargs['form_code'] form_code = kwargs['form_code']
# generate batchno history
batchno = get_max_batchno("batch")
# get old data # get old data
old_instance = models.ChangeRequestFormHeader.objects.filter( old_instance = models.ChangeRequestFormHeader.objects.filter(
...@@ -293,7 +298,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -293,7 +298,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form header # save history in form header
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.REROUTE.value, enums.CREnum.REROUTE.value,
enums.CREnum.UPDATE.value, enums.CREnum.UPDATE.value,
enums.CREntitiesEnum.CR_FRM_HEADER.value, enums.CREntitiesEnum.CR_FRM_HEADER.value,
...@@ -315,8 +320,10 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -315,8 +320,10 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# reset details # reset details
models.ChangeRequestFormApprovers.objects.filter( models.ChangeRequestFormApprovers.objects.filter(
code=approver.code).update(action=None, remarks=None, code=approver.code).update(action=None,
date_sent=None, created=None) remarks=None,
date_sent=None,
action_date=None)
# get new data # get new data
new_instance = models.ChangeRequestFormApprovers.objects.filter( new_instance = models.ChangeRequestFormApprovers.objects.filter(
...@@ -326,7 +333,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -326,7 +333,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.REROUTE.value, enums.CREnum.REROUTE.value,
enums.CREnum.UPDATE.value, enums.CREnum.UPDATE.value,
enums.CREntitiesEnum.CR_FRM_APPROVER.value, enums.CREntitiesEnum.CR_FRM_APPROVER.value,
...@@ -348,6 +355,9 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -348,6 +355,9 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
form_code = kwargs['form_code'] form_code = kwargs['form_code']
# generate batchno history
batchno = get_max_batchno("batch")
# get old data # get old data
old_instance = models.ChangeRequestFormHeader.objects.filter( old_instance = models.ChangeRequestFormHeader.objects.filter(
form_code=form_code).values() form_code=form_code).values()
...@@ -358,21 +368,15 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -358,21 +368,15 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
tmp_no = models.ChangeRequestFormHeader.objects.values_list( tmp_no = models.ChangeRequestFormHeader.objects.values_list(
'template_no', flat=True).get(form_code=form_code) 'template_no', flat=True).get(form_code=form_code)
# count total records in cr
frm_count = models.ChangeRequestFormHeader.objects.all().count()
frm_count = frm_count + 1
# get prefix of template # get prefix of template
CR_Prefix = models.ChangeRequestTemplateHeader.objects.values_list( CR_Prefix = models.ChangeRequestTemplateHeader.objects.values_list(
'requested_to_template_id', flat=True).get(template_no=tmp_no) 'requested_to_template_id', flat=True).get(template_no=tmp_no)
# generate new template id # update form header to draft and template id to prefix
generate_tmp = number_generator(CR_Prefix, frm_count)
# update form header to draft and update new template id
models.ChangeRequestFormHeader.objects.filter( models.ChangeRequestFormHeader.objects.filter(
form_code=form_code).update(requested_to_template_id=generate_tmp, form_code=form_code).update(
status='Draft') requested_to_template_id=CR_Prefix,
status='Draft')
# get new data # get new data
new_instance = models.ChangeRequestFormHeader.objects.filter( new_instance = models.ChangeRequestFormHeader.objects.filter(
...@@ -382,7 +386,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -382,7 +386,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form header # save history in form header
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.RESUBMIT.value, enums.CREnum.RESUBMIT.value,
enums.CREnum.UPDATE.value, enums.CREnum.UPDATE.value,
enums.CREntitiesEnum.CR_FRM_HEADER.value, enums.CREntitiesEnum.CR_FRM_HEADER.value,
...@@ -404,8 +408,10 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -404,8 +408,10 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# reset details # reset details
models.ChangeRequestFormApprovers.objects.filter( models.ChangeRequestFormApprovers.objects.filter(
code=approver.code).update(action=None, remarks=None, code=approver.code).update(action=None,
date_sent=None, created=None) remarks=None,
date_sent=None,
action_date=None)
# get new data # get new data
new_instance = models.ChangeRequestFormApprovers.objects.filter( new_instance = models.ChangeRequestFormApprovers.objects.filter(
...@@ -415,7 +421,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -415,7 +421,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.RESUBMIT.value, enums.CREnum.RESUBMIT.value,
enums.CREnum.UPDATE.value, enums.CREnum.UPDATE.value,
enums.CREntitiesEnum.CR_FRM_APPROVER.value, enums.CREntitiesEnum.CR_FRM_APPROVER.value,
...@@ -447,6 +453,9 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -447,6 +453,9 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
next_level = int(request.data['level']) + 1 next_level = int(request.data['level']) + 1
remarks = request.data['remarks'] remarks = request.data['remarks']
# generate batchno history
batchno = get_max_batchno("batch")
# get old data # get old data
old_instance = models.ChangeRequestFormApprovers.objects.filter( old_instance = models.ChangeRequestFormApprovers.objects.filter(
pk=id).values() pk=id).values()
...@@ -468,7 +477,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -468,7 +477,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
crenum = action.upper() crenum = action.upper()
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
"ACTION", "ACTION",
crenum, crenum,
enums.CREntitiesEnum.CR_FRM_APPROVER.value, enums.CREntitiesEnum.CR_FRM_APPROVER.value,
...@@ -601,6 +610,9 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -601,6 +610,9 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# get pk # get pk
frm_id = models.ChangeRequestFormHeader.objects.get(form_code=form_code) frm_id = models.ChangeRequestFormHeader.objects.get(form_code=form_code)
# generate batchno history
batchno = get_max_batchno("batch")
# get old data # get old data
old_instance = models.ChangeRequestFormHeader.objects.filter( old_instance = models.ChangeRequestFormHeader.objects.filter(
...@@ -626,7 +638,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -626,7 +638,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form header # save history in form header
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SAVE.value, enums.CREnum.SAVE.value,
enums.CREnum.UPDATE.value, enums.CREnum.UPDATE.value,
enums.CREntitiesEnum.CR_FRM_HEADER.value, enums.CREntitiesEnum.CR_FRM_HEADER.value,
...@@ -667,7 +679,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -667,7 +679,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SAVE.value, enums.CREnum.SAVE.value,
enums.CREnum.DELETED.value, enums.CREnum.DELETED.value,
enums.CREntitiesEnum.CR_FRM_APPROVER.value, enums.CREntitiesEnum.CR_FRM_APPROVER.value,
...@@ -706,7 +718,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -706,7 +718,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SAVE.value, enums.CREnum.SAVE.value,
enums.CREnum.UPDATE.value, enums.CREnum.UPDATE.value,
enums.CREntitiesEnum.CR_FRM_APPROVER.value, enums.CREntitiesEnum.CR_FRM_APPROVER.value,
...@@ -741,7 +753,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -741,7 +753,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SAVE.value, enums.CREnum.SAVE.value,
enums.CREnum.ADD.value, enums.CREnum.ADD.value,
enums.CREntitiesEnum.CR_FRM_APPROVER.value, enums.CREntitiesEnum.CR_FRM_APPROVER.value,
...@@ -781,7 +793,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -781,7 +793,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SAVE.value, enums.CREnum.SAVE.value,
enums.CREnum.DELETED.value, enums.CREnum.DELETED.value,
enums.CREntitiesEnum.CR_FRM_STAKE.value, enums.CREntitiesEnum.CR_FRM_STAKE.value,
...@@ -816,7 +828,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -816,7 +828,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SAVE.value, enums.CREnum.SAVE.value,
enums.CREnum.UPDATE.value, enums.CREnum.UPDATE.value,
enums.CREntitiesEnum.CR_FRM_STAKE.value, enums.CREntitiesEnum.CR_FRM_STAKE.value,
...@@ -849,7 +861,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -849,7 +861,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SAVE.value, enums.CREnum.SAVE.value,
enums.CREnum.ADD.value, enums.CREnum.ADD.value,
enums.CREntitiesEnum.CR_FRM_STAKE.value, enums.CREntitiesEnum.CR_FRM_STAKE.value,
...@@ -890,7 +902,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -890,7 +902,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SAVE.value, enums.CREnum.SAVE.value,
enums.CREnum.DELETED.value, enums.CREnum.DELETED.value,
enums.CREntitiesEnum.CR_FRM_ATTACHMENT.value, enums.CREntitiesEnum.CR_FRM_ATTACHMENT.value,
...@@ -928,7 +940,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -928,7 +940,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SAVE.value, enums.CREnum.SAVE.value,
enums.CREnum.UPDATE.value, enums.CREnum.UPDATE.value,
enums.CREntitiesEnum.CR_FRM_ATTACHMENT.value, enums.CREntitiesEnum.CR_FRM_ATTACHMENT.value,
...@@ -966,7 +978,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -966,7 +978,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SAVE.value, enums.CREnum.SAVE.value,
enums.CREnum.ADD.value, enums.CREnum.ADD.value,
enums.CREntitiesEnum.CR_FRM_ATTACHMENT.value, enums.CREntitiesEnum.CR_FRM_ATTACHMENT.value,
...@@ -1007,7 +1019,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -1007,7 +1019,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SAVE.value, enums.CREnum.SAVE.value,
enums.CREnum.DELETED.value, enums.CREnum.DELETED.value,
enums.CREntitiesEnum.CR_FRM_DETAIL.value, enums.CREntitiesEnum.CR_FRM_DETAIL.value,
...@@ -1043,7 +1055,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -1043,7 +1055,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SAVE.value, enums.CREnum.SAVE.value,
enums.CREnum.UPDATE.value, enums.CREnum.UPDATE.value,
enums.CREntitiesEnum.CR_FRM_DETAIL.value, enums.CREntitiesEnum.CR_FRM_DETAIL.value,
...@@ -1076,7 +1088,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -1076,7 +1088,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SAVE.value, enums.CREnum.SAVE.value,
enums.CREnum.ADD.value, enums.CREnum.ADD.value,
enums.CREntitiesEnum.CR_FRM_DETAIL.value, enums.CREntitiesEnum.CR_FRM_DETAIL.value,
...@@ -1085,7 +1097,14 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -1085,7 +1097,14 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
new_instance new_instance
) )
return Response(serializer.data) serializer = self.get_serializer(frm_id)
message = status_message_response(
200, 'success',
'Change Request successfully saved', serializer.data
)
return Response(message, status=status.HTTP_200_OK)
@action( @action(
...@@ -1093,29 +1112,33 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -1093,29 +1112,33 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
url_path='submit', url_name='submit' url_path='submit', url_name='submit'
) )
def submit(self, request, *args, **kwargs): def submit(self, request, *args, **kwargs):
form_code = kwargs['form_code'] form_code = kwargs['form_code']
form_header_data = request.data form_header_data = request.data
# get pk # get pk
frm_id = models.ChangeRequestFormHeader.objects.get(form_code=form_code) frm_id = models.ChangeRequestFormHeader.objects.get(form_code=form_code)
# generate batchno history
batchno = get_max_batchno("batch")
# get old data # get old data
old_instance = models.ChangeRequestFormHeader.objects.filter( old_instance = models.ChangeRequestFormHeader.objects.filter(
form_code=form_code).values() form_code=form_code).values()
old_instance = list(old_instance) old_instance = list(old_instance)
# get data CR Form Header # get data CR Form Header
form_header = get_object_or_404( form_header = get_object_or_404(
models.ChangeRequestFormHeader.objects.all(), pk=frm_id.id) models.ChangeRequestFormHeader.objects.all(), pk=frm_id.id)
serializer = serializers.ChangeRequestFormHeaderSerializer( serializer = serializers.ChangeRequestFormHeaderSerializer(
form_header, data=form_header_data) form_header, data=form_header_data)
if serializer.is_valid(): if serializer.is_valid():
serializer.save() serializer.save()
print(serializer.errors)
# get new data # get new data
new_instance = models.ChangeRequestFormHeader.objects.filter( new_instance = models.ChangeRequestFormHeader.objects.filter(
form_code=form_code).values() form_code=form_code).values()
...@@ -1124,7 +1147,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -1124,7 +1147,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form header # save history in form header
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SUBMIT.value, enums.CREnum.SUBMIT.value,
enums.CREnum.UPDATE.value, enums.CREnum.UPDATE.value,
enums.CREntitiesEnum.CR_FRM_HEADER.value, enums.CREntitiesEnum.CR_FRM_HEADER.value,
...@@ -1165,7 +1188,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -1165,7 +1188,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SUBMIT.value, enums.CREnum.SUBMIT.value,
enums.CREnum.DELETED.value, enums.CREnum.DELETED.value,
enums.CREntitiesEnum.CR_FRM_APPROVER.value, enums.CREntitiesEnum.CR_FRM_APPROVER.value,
...@@ -1204,7 +1227,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -1204,7 +1227,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SUBMIT.value, enums.CREnum.SUBMIT.value,
enums.CREnum.UPDATE.value, enums.CREnum.UPDATE.value,
enums.CREntitiesEnum.CR_FRM_APPROVER.value, enums.CREntitiesEnum.CR_FRM_APPROVER.value,
...@@ -1239,7 +1262,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -1239,7 +1262,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SUBMIT.value, enums.CREnum.SUBMIT.value,
enums.CREnum.ADD.value, enums.CREnum.ADD.value,
enums.CREntitiesEnum.CR_FRM_APPROVER.value, enums.CREntitiesEnum.CR_FRM_APPROVER.value,
...@@ -1279,7 +1302,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -1279,7 +1302,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SUBMIT.value, enums.CREnum.SUBMIT.value,
enums.CREnum.DELETED.value, enums.CREnum.DELETED.value,
enums.CREntitiesEnum.CR_FRM_STAKE.value, enums.CREntitiesEnum.CR_FRM_STAKE.value,
...@@ -1314,7 +1337,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -1314,7 +1337,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SUBMIT.value, enums.CREnum.SUBMIT.value,
enums.CREnum.UPDATE.value, enums.CREnum.UPDATE.value,
enums.CREntitiesEnum.CR_FRM_STAKE.value, enums.CREntitiesEnum.CR_FRM_STAKE.value,
...@@ -1347,7 +1370,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -1347,7 +1370,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SUBMIT.value, enums.CREnum.SUBMIT.value,
enums.CREnum.ADD.value, enums.CREnum.ADD.value,
enums.CREntitiesEnum.CR_FRM_STAKE.value, enums.CREntitiesEnum.CR_FRM_STAKE.value,
...@@ -1388,7 +1411,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -1388,7 +1411,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SUBMIT.value, enums.CREnum.SUBMIT.value,
enums.CREnum.DELETED.value, enums.CREnum.DELETED.value,
enums.CREntitiesEnum.CR_FRM_ATTACHMENT.value, enums.CREntitiesEnum.CR_FRM_ATTACHMENT.value,
...@@ -1426,7 +1449,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -1426,7 +1449,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SUBMIT.value, enums.CREnum.SUBMIT.value,
enums.CREnum.UPDATE.value, enums.CREnum.UPDATE.value,
enums.CREntitiesEnum.CR_FRM_ATTACHMENT.value, enums.CREntitiesEnum.CR_FRM_ATTACHMENT.value,
...@@ -1464,7 +1487,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -1464,7 +1487,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SUBMIT.value, enums.CREnum.SUBMIT.value,
enums.CREnum.ADD.value, enums.CREnum.ADD.value,
enums.CREntitiesEnum.CR_FRM_ATTACHMENT.value, enums.CREntitiesEnum.CR_FRM_ATTACHMENT.value,
...@@ -1505,7 +1528,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -1505,7 +1528,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SUBMIT.value, enums.CREnum.SUBMIT.value,
enums.CREnum.DELETED.value, enums.CREnum.DELETED.value,
enums.CREntitiesEnum.CR_FRM_DETAIL.value, enums.CREntitiesEnum.CR_FRM_DETAIL.value,
...@@ -1541,7 +1564,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -1541,7 +1564,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SUBMIT.value, enums.CREnum.SUBMIT.value,
enums.CREnum.UPDATE.value, enums.CREnum.UPDATE.value,
enums.CREntitiesEnum.CR_FRM_DETAIL.value, enums.CREntitiesEnum.CR_FRM_DETAIL.value,
...@@ -1574,7 +1597,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -1574,7 +1597,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# save history in form approver # save history in form approver
crhistory_save( crhistory_save(
"BATCH-20190920-000001", batchno,
enums.CREnum.SUBMIT.value, enums.CREnum.SUBMIT.value,
enums.CREnum.ADD.value, enums.CREnum.ADD.value,
enums.CREntitiesEnum.CR_FRM_DETAIL.value, enums.CREntitiesEnum.CR_FRM_DETAIL.value,
...@@ -1583,7 +1606,14 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -1583,7 +1606,14 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
new_instance new_instance
) )
return Response(serializer.data) serializer = self.get_serializer(frm_id)
message = status_message_response(
200, 'success',
'Change Request successfully submitted', serializer.data
)
return Response(message, status=status.HTTP_200_OK)
class ChangeRequestFormApproversViewset(meviewsets.ModelViewSet): class ChangeRequestFormApproversViewset(meviewsets.ModelViewSet):
......
app/applicationlayer/cms/utils_cr.py
View file @ fea815fa
...@@ -396,6 +396,23 @@ def cancel_overdue(request): ...@@ -396,6 +396,23 @@ def cancel_overdue(request):
return True return True
def get_max_batchno(request):
try:
max_id = models.ChangeRequestHistory.objects.all(
).order_by("-batch_no")[0]
if max_id:
max_batch = max_id.batch_no.split("-")
max_batch = int(max_batch[2].lstrip("0")) + 1
batchno = number_generator("BATCH", max_batch)
else:
batchno = number_generator("BATCH", 1)
except:
batchno = number_generator("BATCH", 1)
return batchno
def crhistory_save(batch_no, main_action, def crhistory_save(batch_no, main_action,
action, entity, form_code, action, entity, form_code,
fromValue, toValue): fromValue, toValue):
......
requirements/rms_092319.sql 0 → 100644
View file @ fea815fa
This source diff could not be displayed because it is too large. You can view the blob instead.
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