edit template

app/applicationlayer/cms/form/serializers.py

@@ -2,6 +2,7 @@ from app.entities import models
 from rest_framework import serializers
 from django.db.models import Q
 from drf_writable_nested import WritableNestedModelSerializer
+from django.forms.models import model_to_dict
 from app.applicationlayer.cms.utils_cr import (get_account_details,
                                                get_dept_details,
                                                get_companies_details)
@@ -27,6 +28,11 @@ class ChangeRequestFormApproversSerializer(
             ret['name'] = name
             ret['department'] = department
             ret['company'] = company
+            
+            # ret['company'] = model_to_dict(instance.user.department.company)
+            # ret['department'] = model_to_dict(instance.user.department)
+            # ret['name'] = model_to_dict(instance.user)
+            
             return ret
         
         except Exception as e:

app/applicationlayer/cms/form/views.py

@@ -653,7 +653,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
                 form_code,
                 batchno,
                 enums.CREnum.SAVE.value
-            )
+        )
         
         change_request.form_add_edit_delete(
                 form_data['frm_stakes'],
@@ -665,8 +665,8 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
                 form_code,
                 batchno,
                 enums.CREnum.SAVE.value
-            )
-        
+        )
+
         change_request.form_add_edit_delete(
                 form_data['frm_attachments'],
                 models.ChangeRequestFormAttachments,
@@ -677,7 +677,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
                 form_code,
                 batchno,
                 enums.CREnum.SAVE.value
-            )
+        )
 
         change_request.form_add_edit_delete(
                 form_data['frm_details'],
@@ -689,7 +689,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
                 form_code,
                 batchno,
                 enums.CREnum.SAVE.value
-            )
+        )
         
         serializer = self.get_serializer(instance)
 
@@ -708,7 +708,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
     )
     def submit(self, request, *args, **kwargs):
         
-        partial = kwargs.pop('partial', False)
+        partial = kwargs.pop('partial', True)
         instance = self.get_object()
 
         form_code = kwargs['form_code']
@@ -717,16 +717,31 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
         # generate batchno history
         batchno = get_max_batchno("batch")
 
+        # generate requested_to_template_id
+
+        data_update = {
+            "status": 'Pendsing',
+            "created": datetime.now(),
+            "requested_to_template_id": "JTC"
+        }
+
+        data = {**form_data, **data_update}
+
         # update form header
         serializer = self.get_serializer(instance,
-                                         data=form_data,
+                                         data=data,
                                          partial=partial)
 
         serializer.is_valid(raise_exception=True)
         old_instance = model_to_dict(instance)
         self.perform_update(serializer)
-        new_instance = serializer.data
-        print(serializer.errors)
+
+        form_header = get_object_or_404(models.ChangeRequestFormHeader,
+                                        pk=instance.id)
+        
+        new_instance = model_to_dict(form_header)
+
+        # print(serializer.errors)
 
         # save history in form header
         crhistory_save(
@@ -985,20 +1000,14 @@ class ChangeRequestFormPost(APIView):
             
             template_no = serializer.data['template_no']
 
-            tmp_counter = models.ChangeRequestFormHeader.objects.filter(
-                template_no=template_no).count()
-            # tmp_counter = tmp_counter + 1
             CR_Prefix = serializer.data['requested_to_template_id']
 
-            generate_tmp = number_generator(CR_Prefix, tmp_counter)
-            
             frm_id = serializer.data['form_code']
-            print(frm_id)
 
-            models.ChangeRequestFormHeader.objects.filter(
-                form_code=frm_id).update(
-                    requested_to_template_id=generate_tmp)
+            # generate requested template id
 
+            
+            
             # create template approvers
             frm_approvers = form_header['frm_approvers']
             counter = 0

app/applicationlayer/cms/template/views.py

@@ -256,35 +256,38 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
                 template_no
             )
 
-            tmp_add_edit_delete(
-                body_data['tmp_stakes'],
-                models.ChangeRequestTemplateStakeHolders,
-                enums.LogEntitiesEnum.ChangeRequestTemplateStakeHolders.value,
-                serializers.ChangeRequestTemplateStakeHoldersSerializer,
-                partial,
-                self,
-                template_no
-            )
+            if body_data['tmp_stakes']:
+                tmp_add_edit_delete(
+                    body_data['tmp_stakes'],
+                    models.ChangeRequestTemplateStakeHolders,
+                    enums.LogEntitiesEnum.ChangeRequestTemplateStakeHolders.value,
+                    serializers.ChangeRequestTemplateStakeHoldersSerializer,
+                    partial,
+                    self,
+                    template_no
+                )
 
-            tmp_add_edit_delete(
-                body_data['tmp_attachments'],
-                models.ChangeRequestTemplateAttachments,
-                enums.LogEntitiesEnum.ChangeRequestTemplateAttachments.value,
-                serializers.ChangeRequestTemplateAttachmentsSerializer,
-                partial,
-                self,
-                template_no
-            )
+            if body_data['tmp_attachments']:
+                tmp_add_edit_delete(
+                    body_data['tmp_attachments'],
+                    models.ChangeRequestTemplateAttachments,
+                    enums.LogEntitiesEnum.ChangeRequestTemplateAttachments.value,
+                    serializers.ChangeRequestTemplateAttachmentsSerializer,
+                    partial,
+                    self,
+                    template_no
+                )
 
-            tmp_add_edit_delete(
-                body_data['tmp_details'],
-                models.ChangeRequestTemplateDetails,
-                enums.LogEntitiesEnum.ChangeRequestTemplateDetails.value,
-                serializers.ChangeRequestTemplateDetailsSerializer,
-                partial,
-                self,
-                template_no
-            )
+            if body_data['tmp_details']:
+                tmp_add_edit_delete(
+                    body_data['tmp_details'],
+                    models.ChangeRequestTemplateDetails,
+                    enums.LogEntitiesEnum.ChangeRequestTemplateDetails.value,
+                    serializers.ChangeRequestTemplateDetailsSerializer,
+                    partial,
+                    self,
+                    template_no
+                )
 
             serializer = self.get_serializer(instance)
 

app/applicationlayer/cms/utils_cr.py

@@ -473,5 +473,13 @@ def crhistory_log_bulk_delete(queryset, entity, tbl, form_code,
         raise APIException(detail=exc)
 
 
-def generate_template_id(prefix):
-    print("hello")
\ No newline at end of file
+def generate_template_id(prefix, form_code, template_no):
+    print("hello")
+    tmp_counter = models.ChangeRequestFormHeader.objects.filter(
+        template_no=template_no).count()
+
+    generate_tmp = number_generator(prefix, tmp_counter)
+
+    models.ChangeRequestFormHeader.objects.filter(
+        form_code=frm_id).update(
+            requested_to_template_id=generate_tmp)
\ No newline at end of file

app/entities/models.py

@@ -440,7 +440,7 @@ class MasterAttachment(models.Model):
         upload_to='uploads/',
         blank=True,
         null=True)
-
+    
     class Meta:
         db_table = 'master_attachments'