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

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

app/applicationlayer/cms/form/approver/serializers.py

@@ -8,7 +8,7 @@ class ChangeRequestFormApproversSerializer(
 ):
     def to_representation(self, instance):
         ret = super().to_representation(instance)
-        print(instance)
+        
         try:
             ret['company'] = {
                 "id": instance.user.department.company.id,
@@ -58,9 +58,6 @@ class ChangeRequestFormApproversSerializer(
                     else:
                         ret['editable_deleg'] = True
 
-                    # print(instance.tmp_approver.delegation.name)
-                    # comment
-
                     if instance.tmp_approver.delegation:
                         if instance.tmp_approver.delegation.name.lower() == 'requestor':
                             ret['editable_user'] = False
@@ -127,7 +124,6 @@ class ChangeRequestFormApproversSerializer(
                         ret['delegation'] = None
                         ret['editable_deleg'] = True
 
-                    # print(instance.tmp_approver.delegation.name)
                     if instance.tmp_approver.delegation:
                         if instance.tmp_approver.delegation.name.lower() == 'requestor':
                             ret['editable_user'] = False

app/applicationlayer/cms/form/header/serializers.py

@@ -98,7 +98,7 @@ class ChangeRequestFormHeaderSerializer(
             ret['template_object'] = "None"
 
             return ret
-    # 'company_desc', 'department_desc', 'requested_desc',
+    
     class Meta:
         model = models.ChangeRequestFormHeader
         # fields = '__all__'

app/applicationlayer/cms/form/header/views.py

@@ -552,9 +552,6 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
             form_code=str(form_code)
         ).values('file_upload__url')
         attch_list = [data['file_upload__url'].split('/')[1] for data in attch]
-        # print(attch.query)
-        # print(attch)
-        # print(attch_list)
         
         if os.path.isdir(my_folder):
             shutil.rmtree(my_folder)
@@ -580,7 +577,6 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
         #     full_file_name = os.path.join(my_folder, file_name)
         #     if os.path.isfile(full_file_name):
         #         shutil.copy(full_file_name, dest)
-        print(attch)
 
         for file_name in attch:
             print(file_name['file_upload__url'])
@@ -588,7 +584,6 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
             # full_file_name = os.path.join(my_folder, file_name['file_upload__url'])
             # print(full_file_name)
             if os.path.isfile(a):
-                print('ddd')
                 print(a)
                 # print(type(a))
                 b = open(a, 'r')
@@ -1196,7 +1191,6 @@ class ChangeRequestFormPost(APIView):
     def post(self, request):
         
         form_header = request.data
-        # comment
         try:
             data_list_approver = []
             data_list_stake = []
@@ -1211,9 +1205,6 @@ class ChangeRequestFormPost(APIView):
                 'requested_to_priority': form_header['requested_to_priority'],
                 'description': form_header['description'],
                 'status': form_header['status'],
-                'company_desc': None,
-                'department_desc': None,
-                'requested_desc': None,
                 'requested_by_department': form_header['requested_by_department'],
                 'requested_by_user': form_header['requested_by_user'],
                 'requested_to_company': form_header['requested_to_company'],
@@ -1222,6 +1213,10 @@ class ChangeRequestFormPost(APIView):
                 'template_no': form_header['template_no']
             }
 
+            # 'company_desc': None,
+            # 'department_desc': None,
+            # 'requested_desc': None,
+            
             sp1 = transaction.savepoint()  # nothing will save to db
 
             serializer = ChangeRequestFormHeaderSerializer(

app/applicationlayer/cms/form/serializers.py

@@ -118,7 +118,6 @@ class ChangeRequestFormHeaderSerializer(
         fields = ('form_code', 'requested_to_template_name', 'requested_to_objective',
                   'requested_to_target_date', 'requested_to_priority',
                   'description', 'created', 'cancel_date', 'status',
-                  'company_desc', 'department_desc', 'requested_desc',
                   'requested_to_template_id', 'requested_to_company',
                   'requested_to_department', 'requested_to_user',
                   'requested_by_user', 'requested_by_department',
@@ -127,7 +126,7 @@ class ChangeRequestFormHeaderSerializer(
 
         read_only_fields = ['created', 'form_code']
 
-
+        # 'company_desc', 'department_desc', 'requested_desc',
 class ChangeRequestFormHeaderSerializerList(
     serializers.ModelSerializer
 ):

app/applicationlayer/cms/form/views.py

@@ -941,9 +941,6 @@ class ChangeRequestFormPost(APIView):
                 'requested_to_priority': form_header['requested_to_priority'],
                 'description': form_header['description'],
                 'status': form_header['status'],
-                'company_desc': form_header['company_desc'],
-                'department_desc': form_header['department_desc'],
-                'requested_desc': form_header['requested_desc'],
                 'requested_by_department': form_header['requested_by_department'],
                 'requested_by_user': form_header['requested_by_user'],
                 'requested_to_company': form_header['requested_to_company'],
@@ -952,6 +949,10 @@ class ChangeRequestFormPost(APIView):
                 'template_no': form_header['template_no']
             }
 
+            # 'company_desc': form_header['company_desc'],
+            # 'department_desc': form_header['department_desc'],
+            # 'requested_desc': form_header['requested_desc'],
+
             sp1 = transaction.savepoint()  # nothing will save to db
 
             serializer = serializers.ChangeRequestFormHeaderSerializer(

app/applicationlayer/cms/master/template/account/views.py

@@ -26,8 +26,6 @@ class UserListTemplate(APIView):
             user_list = models.User.objects.filter(
                 code__in=verified_users
             )
-            print(user_list)
-            
             page = self.paginate_queryset(user_list)
 
             if page is not None:

app/applicationlayer/cms/utils_cr.py

@@ -396,11 +396,9 @@ def next_approver_email(form_code, next_level):
                                                 level=str(next_level),
                                                 form_code=form_code
                                                 )
-    # print(next_approver.values())
     
     # LOOP on next approver for sending email
     for n_approver in next_approver:
-        # print(n_approver.delegation)
         
         # NOTIF MSG FOR NEXT APPROVER
         msg = APPROVER_MESSAGE.split(';')[0]
@@ -564,7 +562,6 @@ def crhistory_log_bulk_delete_masterattach(queryset, entity, tbl, form_code,
     try:
         for data in queryset:
             test = model_to_dict(data)
-            # print(test)
             crhistory_save(batch_no,
                            main_action,
                            enums.CREnum.DELETED.value,

app/applicationlayer/download/accounts/views.py

@@ -28,7 +28,6 @@ class UserDownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
         data = User.objects.all()
         serializer = headers(data=data, many=True)
         serializer.is_valid(raise_exception=False)
-        print(serializer.data)
         return Response(serializer.data)
 
     column_header = {

app/businesslayer/changerequest/change_request_template.py

@@ -186,8 +186,8 @@ def validation_vendor_unique_level(approvers):
 
     for approver in approvers:
         if 'delegation' in approver:
+            if not approver['delegation'] is None:
                 if approver['level'] in data_level:
-                if (not approver['delegation'] == 'DELEGATION-20191119-0000002'
-                    and not approver['delegation'] == ''):
+                    if not approver['delegation'] == 'DELEGATION-20191119-0000002':
                         validate = approver['level']
     return validate

app/datalayer/serializer_handler.py

@@ -13,11 +13,9 @@ def custom_exception_handler(exc, context):
 
     # Update the structure of the response data.
     if response is not None:
-        print('dd')
         error_message = {}
 
         for key, value in response.data.items():
-            print(value)
             if type(value) == list and value[0].code == 'blank':
                 value = value[0].replace('This field', key)
             # elif type(value) == dict:

app/entities/migrations/0003_auto_20200206_1422.py

+# Generated by Django 2.2 on 2020-02-06 14:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0002_auto_20200205_1707'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='changerequestformheader',
+            name='company_desc',
+        ),
+        migrations.RemoveField(
+            model_name='changerequestformheader',
+            name='department_desc',
+        ),
+        migrations.RemoveField(
+            model_name='changerequestformheader',
+            name='requested_desc',
+        ),
+    ]

app/entities/models.py

@@ -266,8 +266,6 @@ class ExtractTransformLoad(AuditClass):
     def save(self, *args, **kwargs):
         super(ExtractTransformLoad, self).save(*args, **kwargs)
         code = number_generator(enums.GenerateCode.ETL.value, self.id)
-        print(type(self.code))
-
         
         if self.code == '' or self.code == None:
             self.code = code
@@ -527,7 +525,6 @@ class MasterAttachment(models.Model):
     attch_ref = models.TextField()
 
     def delete(self,*args,**kwargs):
-        # print(self.url.name)
         if os.path.isfile(self.url.path):
             os.remove(self.url.path)
         
@@ -784,18 +781,6 @@ class ChangeRequestFormHeader(BaseHeader):
         on_delete=models.PROTECT,
         to_field='template_no')
     status = models.CharField(max_length=50)
-    company_desc = models.CharField(
-        max_length=255,
-        null=True,
-        blank=True)
-    department_desc = models.CharField(
-        max_length=255,
-        null=True,
-        blank=True)
-    requested_desc = models.CharField(
-        max_length=255,
-        null=True,
-        blank=True)
     requested_to_template_id = models.CharField(
         max_length=255)
     requested_to_target_date = models.DateTimeField(
@@ -817,6 +802,18 @@ class ChangeRequestFormHeader(BaseHeader):
             self.form_code = code
             self.save()
 
+    # company_desc = models.CharField(
+    #     max_length=255,
+    #     null=True,
+    #     blank=True)
+    # department_desc = models.CharField(
+    #     max_length=255,
+    #     null=True,
+    #     blank=True)
+    # requested_desc = models.CharField(
+    #     max_length=255,
+    #     null=True,
+    #     blank=True)
 
 class ChangeRequestFormApprovers(BaseApprover):
     code = models.CharField(