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

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

@@ -25,4 +25,22 @@ class ChangeRequestFormAttachmentsSerializer(
     class Meta:
         model = models.ChangeRequestFormAttachments
         fields = '__all__'
-        read_only_fields = ['created', 'code']
\ No newline at end of file
+        read_only_fields = ['created', 'code']
+
+
+
+class ChangeRequestFormAttachmentsFileUploadSerializer(
+    serializers.ModelSerializer
+):
+
+
+    class Meta:
+        model = models.ChangeRequestFormAttachments
+        fields = (
+            'attachment_type',
+            'attachment_name',
+            'file_name',
+            'description',
+            'file_upload'
+        )
+        # read_only_fields = ['created', 'code']
\ No newline at end of file

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

@@ -46,7 +46,7 @@ from app.businesslayer.changerequest.change_request import (
 from app.applicationlayer.cms.form.approver.serializers import ChangeRequestFormApproversSerializer
 from app.applicationlayer.cms.form.stakeholder.serializers import ChangeRequestFormStakeHoldersSerializer
 from app.applicationlayer.cms.form.details.serializers import ChangeRequestFormDetailsSerializer
-from app.applicationlayer.cms.form.attachment.serializers import ChangeRequestFormAttachmentsSerializer
+from app.applicationlayer.cms.form.attachment.serializers import ChangeRequestFormAttachmentsFileUploadSerializer
 from app.applicationlayer.cms.form.header.serializers import (
     ChangeRequestFormHeaderSerializer,
     ChangeRequestFormHeaderSerializerList)
@@ -1225,7 +1225,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                 "date_sent" : convert['date_sent'],
                 "delegation" : convert['delegation'],
                 "action" : convert['action'],
-                "remarks" : convert['remarks']
+                "remarks" : convert['remarks'],
+                "created": convert['action_date']
             }
 
             list_his.append(history_dict)
@@ -1282,7 +1283,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                 attach_body['attachments'],
                 models.ChangeRequestFormAttachments,
                 enums.CREntitiesEnum.CR_FRM_ATTACHMENT.value,
-                ChangeRequestFormAttachmentsSerializer,
+                ChangeRequestFormAttachmentsFileUploadSerializer,
                 partial,
                 self,
                 form_code,