Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into red-develop

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/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)
 
@@ -300,7 +303,7 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
             "Unable to edit due to existing transaction",
                 status=status.HTTP_400_BAD_REQUEST
         )
-
+#try
 
 class ChangeRequestTemplatePost(APIView):
 
@@ -375,7 +378,7 @@ class ChangeRequestTemplatePost(APIView):
 
                 serializerAttach = serializers.ChangeRequestTemplateAttachmentsSerializer(
                     data=data_list_attach, many=True)
-                
+
                 if serializerAttach.is_valid(raise_exception=True):
                     serializerAttach.save()
 
@@ -468,7 +471,7 @@ class ChangeRequestTemplateAttachmentsViewset(meviewsets.ModelViewSet):
         self.queryset = QuerySetHelper.Sort(self)
         
         page = self.paginate_queryset(self.queryset)
-
+        
         if page is not None:
             serializer = self.get_serializer(page, many=True)
 

app/applicationlayer/cms/utils_cr.py

@@ -471,3 +471,15 @@ def crhistory_log_bulk_delete(queryset, entity, tbl, form_code,
         return True
     except IntegrityError as exc:
         raise APIException(detail=exc)
+
+
+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'