Merge pull request #766 in RMS/api-main-service from core-dev-gladys to RMSv2

* commit '1d1af12b':
  {dev bugfix} fix validation_vendor_unique_level
  {dev bugfix} remove prints

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/views.py

@@ -552,10 +552,7 @@ 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')

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 approver['level'] in data_level:
-                if (not approver['delegation'] == 'DELEGATION-20191119-0000002'
-                    and not approver['delegation'] == ''):
-                    validate = approver['level']
+            if not approver['delegation'] is None:
+                if approver['level'] in data_level:
+                    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/models.py

@@ -266,9 +266,7 @@ 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
             self.save()
@@ -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)