fixing

app/applicationlayer/cms/form/serializers.py

@@ -117,3 +117,49 @@ class ChangeRequestFormHeaderSerializer(
                   'frm_attachments', 'frm_details')
 
         read_only_fields = ['created', 'form_code']
+
+
+class ChangeRequestFormHeaderSerializerList(
+    serializers.ModelSerializer
+):
+    def to_representation(self, instance):
+        ret = super().to_representation(instance)
+        try:
+            user = self.context['request'].user
+            
+            id_number = user.code
+            
+            current_level = models.ChangeRequestFormApprovers.objects.filter(
+                Q(form_code=ret['form_code']) &
+                (Q(action='') | Q(action=None))
+            ).order_by('level')
+            
+            if current_level[0].user.code == id_number:
+                if instance.status.lower() == 'rejected':
+                    approver = 'No'
+                elif instance.status.lower() == 'cancelled':
+                    approver = 'No'
+                elif instance.status.lower() == 'closed':
+                    approver = 'No'
+                else:
+                    approver = 'Yes'
+            else:
+                approver = 'No'
+            ret['action'] = approver
+            ret['company'] = instance.requested_to_company.name
+            ret['department'] = instance.requested_to_department.name
+            ret['requested_by'] = instance.requested_by_user.name
+            
+            return ret
+        except Exception as e:
+            ret['action'] = "No"
+            ret['company'] = "None"
+            ret['department'] = "None"
+            ret['requested_by'] = "None"
+
+            return ret
+
+    class Meta:
+        model = models.ChangeRequestFormHeader
+        fields = '__all__'
+        read_only_fields = ['created', 'form_code']
\ No newline at end of file

app/applicationlayer/cms/form/views.py

@@ -56,6 +56,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
     lookup_field = 'form_code'
 
     def list(self, request, *args, **kwargs):
+        self.serializer_class = serializers.ChangeRequestFormHeaderSerializerList
         id_number = self.request.user.code
         
         self.queryset = change_request.list_by_user(id_number)
@@ -626,7 +627,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
         serializer = self.get_serializer(instance,
                                          data=form_data,
                                          partial=partial)
-
+        
         serializer.is_valid(raise_exception=True)
         old_instance = model_to_dict(instance)
         self.perform_update(serializer)
@@ -718,11 +719,17 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
         # generate batchno history
         batchno = get_max_batchno("batch")
 
-        # generate requested_to_template_id
-        generate_template_id(CR_Prefix, form_code, template_no)
+        print(instance)
 
+        # template_no = serializer.data['template_no']
+        # CR_Prefix = serializer.data['requested_to_template_id']
+        # frm_id = serializer.data['form_code']
+
+        # generate requested_to_template_id
+        # generate_template_id(CR_Prefix, form_code, template_no)
+        
         data_update = {
-            "status": 'Pendsing',
+            "status": 'Pending',
             "created": datetime.now(),
             "requested_to_template_id": "JTC"
         }
@@ -743,7 +750,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
         
         new_instance = model_to_dict(form_header)
 
-        # print(serializer.errors)
+        print(serializer.errors)
 
         # save history in form header
         crhistory_save(
@@ -844,38 +851,38 @@ class ChangeRequestFormAttachmentsViewset(meviewsets.ModelViewSet):
             ChangeRequestFormAttachmentsViewset, self
         ).list(request)
 
-    def create(self, request, *args, **kwargs):
-        attachment_no = request.data.get('attachment_no')
-        ObjectId = request.data.get('id')
-        serializer = self.get_serializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
-
-        if ObjectId:
-            dbExisting = models.ChangeRequestFormAttachments.objects.filter(
-                id=ObjectId).first()
-
-            if dbExisting:
-                dbExisting.archived_at = datetime.now()
-                dbExisting.save()
-
-        self.perform_create(serializer)
-
-        if not attachment_no:
-            id = serializer.data['id']
-            db_counter = models.ChangeRequestFormAttachments.objects.all().count()
-            db_counter = db_counter + 1
-            models.ChangeRequestFormAttachments.objects.filter(id=id).update(
-                set__attachment_no=number_generator(
-                    "ATCH", db_counter
-                )
-            )
-
-        headers = self.get_success_headers(serializer.data)
-        return Response(
-            serializer.data,
-            status=status.HTTP_201_CREATED,
-            headers=headers
-        )
+    # def create(self, request, *args, **kwargs):
+    #     attachment_no = request.data.get('attachment_no')
+    #     ObjectId = request.data.get('id')
+    #     serializer = self.get_serializer(data=request.data)
+    #     serializer.is_valid(raise_exception=True)
+
+    #     if ObjectId:
+    #         dbExisting = models.ChangeRequestFormAttachments.objects.filter(
+    #             id=ObjectId).first()
+
+    #         if dbExisting:
+    #             dbExisting.archived_at = datetime.now()
+    #             dbExisting.save()
+
+    #     self.perform_create(serializer)
+
+    #     if not attachment_no:
+    #         id = serializer.data['id']
+    #         db_counter = models.ChangeRequestFormAttachments.objects.all().count()
+    #         db_counter = db_counter + 1
+    #         models.ChangeRequestFormAttachments.objects.filter(id=id).update(
+    #             set__attachment_no=number_generator(
+    #                 "ATCH", db_counter
+    #             )
+    #         )
+
+    #     headers = self.get_success_headers(serializer.data)
+    #     return Response(
+    #         serializer.data,
+    #         status=status.HTTP_201_CREATED,
+    #         headers=headers
+    #     )
 
     def retrieve(self, request, *args, **kwargs):
         instance = self.queryset.filter(archived_at=None).first()
@@ -895,26 +902,26 @@ class ChangeRequestFormStakeHoldersViewset(meviewsets.ModelViewSet):
         self.queryset = QuerySetHelper.Filter(self)
         return super(ChangeRequestFormStakeHoldersViewset, self).list(request)
 
-    def create(self, request, *args, **kwargs):
-        ObjectId = request.data.get('id')
-        serializer = self.get_serializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
+    # def create(self, request, *args, **kwargs):
+    #     ObjectId = request.data.get('id')
+    #     serializer = self.get_serializer(data=request.data)
+    #     serializer.is_valid(raise_exception=True)
 
-        if ObjectId:
-            dbExisting = models.ChangeRequestFormStakeHolders.objects.filter(
-                id=ObjectId).first()
+    #     if ObjectId:
+    #         dbExisting = models.ChangeRequestFormStakeHolders.objects.filter(
+    #             id=ObjectId).first()
 
-            if dbExisting:
-                dbExisting.save()
+    #         if dbExisting:
+    #             dbExisting.save()
 
-        self.perform_create(serializer)
+    #     self.perform_create(serializer)
 
-        headers = self.get_success_headers(serializer.data)
-        return Response(
-            serializer.data,
-            status=status.HTTP_201_CREATED,
-            headers=headers
-        )
+    #     headers = self.get_success_headers(serializer.data)
+    #     return Response(
+    #         serializer.data,
+    #         status=status.HTTP_201_CREATED,
+    #         headers=headers
+    #     )
 
     def retrieve(self, request, *args, **kwargs):
         instance = self.queryset.filter(archived_at=None).first()
@@ -934,26 +941,26 @@ class ChangeRequestFormDetailsViewset(meviewsets.ModelViewSet):
         self.queryset = QuerySetHelper.Filter(self)
         return super(ChangeRequestFormDetailsViewset, self).list(request)
 
-    def create(self, request, *args, **kwargs):
-        ObjectId = request.data.get('id')
-        serializer = self.get_serializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
+    # def create(self, request, *args, **kwargs):
+    #     ObjectId = request.data.get('id')
+    #     serializer = self.get_serializer(data=request.data)
+    #     serializer.is_valid(raise_exception=True)
 
-        if ObjectId:
-            dbExisting = models.ChangeRequestFormDetails.objects.filter(
-                id=ObjectId).first()
+    #     if ObjectId:
+    #         dbExisting = models.ChangeRequestFormDetails.objects.filter(
+    #             id=ObjectId).first()
 
-            if dbExisting:
-                dbExisting.save()
+    #         if dbExisting:
+    #             dbExisting.save()
 
-        self.perform_create(serializer)
+    #     self.perform_create(serializer)
 
-        headers = self.get_success_headers(serializer.data)
-        return Response(
-            serializer.data,
-            status=status.HTTP_201_CREATED,
-            headers=headers
-        )
+    #     headers = self.get_success_headers(serializer.data)
+    #     return Response(
+    #         serializer.data,
+    #         status=status.HTTP_201_CREATED,
+    #         headers=headers
+    #     )
 
     def retrieve(self, request, *args, **kwargs):
         instance = self.queryset.filter(archived_at=None).first()
@@ -1000,6 +1007,7 @@ class ChangeRequestFormPost(APIView):
             if serializer.is_valid(raise_exception=True):
                 serializer.save()
             
+
             template_no = serializer.data['template_no']
             CR_Prefix = serializer.data['requested_to_template_id']
             frm_id = serializer.data['form_code']

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

@@ -5,6 +5,7 @@ from app.applicationlayer.management.account.serializer import ChangeRequestList
 from app.entities import models
 from rest_framework.response import Response
 from django.db.models import Q
+from rest_framework import status
 
 
 class UserList(APIView):

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

@@ -46,10 +46,10 @@ class ChangeRequestTemplatesSerializer(
         ret = super().to_representation(instance)
         try:
 
-            ret['company'] = model_to_dict(instance.user.department.company)
-            ret['department'] = model_to_dict(instance.user.department)
-            ret['point_of_contact'] = model_to_dict(instance.requested_to_user)
-            ret['created_by'] = instance.created_by_user.code
+            ret['company'] = instance.requested_to_company.name
+            ret['department'] = instance.requested_to_department.name
+            ret['point_of_contact'] = instance.requested_to_user.name
+            ret['created_by'] = instance.created_by_user.name
 
             return ret
         except Exception as e:
@@ -74,3 +74,31 @@ class ChangeRequestTemplatesSerializer(
                   'tmp_details')
 
         read_only_fields = ['created', 'template_no']
+
+
+class ChangeRequestTemplatesSerializerList(
+    serializers.ModelSerializer
+):
+
+    def to_representation(self, instance):
+        ret = super().to_representation(instance)
+        try:
+        
+            ret['company'] = instance.requested_to_company.name
+            ret['department'] = instance.requested_to_department.name
+            ret['point_of_contact'] = instance.requested_to_user.name
+            ret['created_by'] = instance.created_by_user.name
+
+            return ret
+        except Exception as e:
+            ret['company'] = "none"
+            ret['department'] = "none"
+            ret['point_of_contact'] = "none"
+            ret['created_by'] = "none"
+            
+            return ret
+
+    class Meta:
+        model = models.ChangeRequestTemplateHeader
+        fields = '__all__'
+        read_only_fields = ['created', 'template_no']
\ No newline at end of file

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

@@ -31,6 +31,7 @@ from app.applicationlayer.cms.template.stakeholder.serializers import ChangeRequ
 from app.applicationlayer.cms.template.details.serializers import ChangeRequestTemplateDetailsSerializer
 from app.applicationlayer.cms.template.attachment.serializers import ChangeRequestTemplateAttachmentsSerializer
 from app.applicationlayer.cms.template.header.serializers import ChangeRequestTemplatesSerializer
+from app.applicationlayer.cms.template.header.serializers import ChangeRequestTemplatesSerializerList
 from app.applicationlayer.cms.template.header.table_filters import headerFilter
 
 
@@ -60,7 +61,8 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
     )
 
     def list(self, request, *args, **kwargs):
-        
+
+        self.serializer_class = ChangeRequestTemplatesSerializerList
         
         page = self.paginate_queryset(self.queryset)
 

app/applicationlayer/cms/template/serializers.py

@@ -72,3 +72,31 @@ class ChangeRequestTemplatesSerializer(
                   'tmp_details')
 
         read_only_fields = ['created', 'template_no']
+
+
+class ChangeRequestTemplatesSerializerList(
+    serializers.ModelSerializer
+):
+
+    def to_representation(self, instance):
+        ret = super().to_representation(instance)
+        try:
+        
+            ret['company'] = instance.requested_to_company.name
+            ret['department'] = instance.requested_to_department.name
+            ret['point_of_contact'] = instance.requested_to_user.name
+            ret['created_by'] = instance.created_by_user.name
+
+            return ret
+        except Exception as e:
+            ret['company'] = "none"
+            ret['department'] = "none"
+            ret['point_of_contact'] = "none"
+            ret['created_by'] = "none"
+            
+            return ret
+
+    class Meta:
+        model = models.ChangeRequestTemplateHeader
+        fields = '__all__'
+        read_only_fields = ['created', 'template_no']

app/applicationlayer/cms/template/views.py

@@ -106,6 +106,8 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
     
     def list(self, request, *args, **kwargs):
         
+        self.serializer_class = serializers.ChangeRequestTemplatesSerializerList
+
         self.queryset = self.queryset.order_by('-created')
         self.queryset = QuerySetHelper.Sort(self)