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

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

@@ -70,46 +70,6 @@ class ChangeRequestTemplatesSerializer(
 
             return ret
     
-    def is_valid(self, raise_exception=False):
-
-        assert not hasattr(self, 'restore_object'), (
-            'Serializer `%s.%s` has old-style version 2 `.restore_object()` '
-            'that is no longer compatible with REST framework 3. '
-            'Use the new-style `.create()` and `.update()` methods instead.' %
-            (self.__class__.__module__, self.__class__.__name__)
-        )
-
-        assert hasattr(self, 'initial_data'), (
-            'Cannot call `.is_valid()` as no `data=` keyword argument was '
-            'passed when instantiating the serializer instance.'
-        )
-
-        if not hasattr(self, '_validated_data'):
-            try:
-                self._validated_data = self.run_validation(self.initial_data)
-            except ValidationError as exc:
-                self._validated_data = {}
-                self._errors = exc.detail
-            else:
-                self._errors = {}
-
-        # if validation failed
-        if self._errors and raise_exception:
-            error_message = {}
-            message = str(self.errors)
-
-            for k, v in self.errors.items():
-                message = str(v)
-                start = message.find('string=') + 8
-                end = message.find(', code=') - 1
-                message = message[start:end]
-
-                error_message[str(k)] = message
-
-            raise BadRequestException(error_message)
-
-        return not bool(self._errors)
-
     class Meta:
         model = models.ChangeRequestTemplateHeader
         # fields = '__all__'
@@ -123,6 +83,53 @@ class ChangeRequestTemplatesSerializer(
                   'tmp_details')
 
         read_only_fields = ['created', 'template_no']
+        # extra_kwargs = {
+        #      "requested_to_template_id": {
+        #             "error_messages": {
+        #                 "unique": "ssCR prefix should be unique"
+        #                 }
+        #             }
+        #         }
+
+    # def is_valid(self, raise_exception=False):
+
+    #     assert not hasattr(self, 'restore_object'), (
+    #         'Serializer `%s.%s` has old-style version 2 `.restore_object()` '
+    #         'that is no longer compatible with REST framework 3. '
+    #         'Use the new-style `.create()` and `.update()` methods instead.' %
+    #         (self.__class__.__module__, self.__class__.__name__)
+    #     )
+
+    #     assert hasattr(self, 'initial_data'), (
+    #         'Cannot call `.is_valid()` as no `data=` keyword argument was '
+    #         'passed when instantiating the serializer instance.'
+    #     )
+
+    #     if not hasattr(self, '_validated_data'):
+    #         try:
+    #             self._validated_data = self.run_validation(self.initial_data)
+    #         except ValidationError as exc:
+    #             self._validated_data = {}
+    #             self._errors = exc.detail
+    #         else:
+    #             self._errors = {}
+
+    #     # if validation failed
+    #     if self._errors and raise_exception:
+    #         error_message = {}
+    #         message = str(self.errors)
+
+    #         for k, v in self.errors.items():
+    #             message = str(v)
+    #             start = message.find('string=') + 8
+    #             end = message.find(', code=') - 1
+    #             message = message[start:end]
+
+    #             error_message[str(k)] = message
+
+    #         raise BadRequestException(error_message)
+
+    #     return not bool(self._errors)
 
 
 class ChangeRequestTemplatesSerializerList(
@@ -166,4 +173,3 @@ class ChangeRequestTemplatesSerializerList(
         model = models.ChangeRequestTemplateHeader
         fields = '__all__'
         read_only_fields = ['created', 'template_no']
\ No newline at end of file
-        # extra_kwargs = {'client': {'required': False}}
\ No newline at end of file

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

@@ -451,7 +451,7 @@ class ChangeRequestTemplatePost(APIView):
             message = {
                 'code': 500,
                 'status': 'failed',
-                'message': 'Request was not able to process' + str(e),
+                'message': str(e),
             }
             return Response(message,
                             status=status.HTTP_500_INTERNAL_SERVER_ERROR)

app/businesslayer/changerequest/change_request.py

@@ -125,41 +125,31 @@ def filter_base(base_queryset,
             return_queryset = return_queryset.filter(status='Closed')
 
         date_modified = []
-        date_modified_not = []
-    
+        #comment
         if date_modified_from and date_modified_to:        
- 
             for query in return_queryset:
                 created = datetime.strftime(query.created, "%Y-%m-%d")
                 
                 if created >= date_modified_from and created <= date_modified_to:
                     date_modified.append(query.id)
+
             return_queryset = return_queryset.filter(id__in=date_modified)
-                else:      
-                    date_modified_not.append(query.id)
-                    return_queryset = return_queryset.filter(id__nin=date_modified_not)
             
         date_required = []
-        date_required_not = []
         
         if date_required_from and date_required_to:
             for query in return_queryset:
-                
                 if query.requested_to_target_date:
                     requested_to_target_date = datetime.strftime(
                         query.requested_to_target_date,
                         "%Y-%m-%d")
                     
                     if requested_to_target_date >= date_required_from and requested_to_target_date <= date_required_to:
-                        
                         date_required.append(query.id)
-                        return_queryset = return_queryset.filter(id__in=date_required)
-                    else:
-                        date_required_not.append(query.id)
-                        return_queryset = return_queryset.filter(id__nin=date_required_not)
-                else:
-                    date_required_not.append(query.id)
-                    return_queryset = return_queryset.filter(id__nin=date_required_not)
+
+            return_queryset = return_queryset.filter(
+                id__in=date_required
+            )
                 
         return_queryset
 

app/helper/email_service/templates/RMS-ACTIONREQUIRED-VENDOR.html

@@ -3,7 +3,7 @@
 <head>
 <title>RMS: Acknowledgement Notification</title>
 </head>
-<body style="font-family: arial;">
+<body style="font-family: Sans-Serif;">
 
 <h3>Resource Management System &#40;RMS&#41;</h3>
 <h3 style="color:#888888;">Change Request Acknowledgement Notification</h3><br>