Merge pull request #282 in RMS/api-main-service from red-develop to RMSv2

* commit 'f198848c':
  try

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

 from app.entities import models
 from rest_framework import serializers
+from django.db.models import Q
 
 
 class headers(serializers.ModelSerializer):
@@ -7,42 +8,45 @@ class headers(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.count() > 0 and 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:
+        # try:
+        user = self.context['request'].user
+        
+        id_number = user.code
+        
+        current_level = models.ChangeRequestFormApprovers.objects.filter(
+            Q(form_code=instance.form_code) &
+            (Q(action='') | Q(action=None))
+        ).order_by('level')
+        
+        if current_level.count() > 0 and current_level[0].user.code == id_number:
+            if instance.status.lower() == 'rejected':
+                approver = 'No'
+            elif instance.status.lower() == 'cancelled':
                 approver = 'No'
-            
-            ret['action_required'] = approver
-            ret['company'] = instance.requested_to_company.name
-            ret['department'] = instance.requested_to_department.name
-            ret['requested_by'] = instance.requested_by_user.name
-            ret['requested_to_target_date'] = instance.requested_to_target_date.strftime('%Y-%m-%d-%H:%M:%S')
-            ret['created'] = instance.created.strftime('%Y-%m-%d-%H:%M:%S')
-            return ret
-        except Exception as e:
-            ret['action_required'] = "No"
-            ret['company'] = "None"
-            ret['department'] = "None"
-            ret['requested_by'] = "None"
+            elif instance.status.lower() == 'closed':
+                approver = 'No'
+            else:
+                approver = 'Yes'
+        else:
+            approver = 'No'
+        
+        ret['requested_to_company'] = instance.requested_to_company.name
+        ret['requested_to_department'] = instance.requested_to_department.name
+        ret['requested_by_user'] = instance.requested_by_user.name
+        ret['requested_to_target_date'] = instance.requested_to_target_date.strftime('%Y-%m-%d-%H:%M:%S')
+        # ret['created'] = instance.created.strftime('%Y-%m-%d-%H:%M:%S')
+        ret['created'] = instance.created.strftime('%Y-%m-%d-%H:%M:%S')
+        ret['action'] = approver
+        # ret['requested_to_target_date'] = instance.requested_to_target_date.strftime('%Y-%m-%d-%H:%M:%S')
+        print(ret)
+        return ret
+        # except Exception as e:
+        #     ret['action_required'] = "No"
+        #     ret['company'] = "None"
+        #     ret['department'] = "None"
+        #     ret['requested_by'] = "None"
 
-            return ret
+        #     return ret
 
 
     class Meta:
@@ -50,11 +54,12 @@ class headers(serializers.ModelSerializer):
         fields = (
             'requested_to_template_id',
             'requested_to_template_name',
-            'company_desc',
-            'department_desc',
-            'requested_desc',
+            'requested_to_company',
+            'requested_to_department',
+            'requested_by_user',
             'status',
             'requested_to_priority',
+            # 'action',
             'created',
             'requested_to_target_date'
         )

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

@@ -77,9 +77,9 @@ class DownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
             "Requested By",
             "Status",
             "Priority Level",
-            "Action"
             "Date Modified",
             "Date Required"
+            "Action",
         ],
         'column_width': [17, 30, 17],
         'height': 25,

app/applicationlayer/management/user/serializers.py

@@ -43,11 +43,15 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
     applications = serializers.SerializerMethodField()
     department = serializers.SerializerMethodField()
     company = serializers.SerializerMethodField()
+    create_form = serializers.SerializerMethodField()
+    create_template = serializers.SerializerMethodField()
 
     class Meta:
         model = models.User
         fields = (
             'id',
+            'create_form',
+            'create_template',
             'code', 'name',
             'username', 'contact_no',
             'image', 'company',
@@ -75,6 +79,27 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
         }
         return data
 
+    def get_create_form(self, user):
+        check_user = models.AllowedCompany.objects.filter(
+            Q(id_number=user.code) &
+            Q(create_change_request=True)
+        ).count()
+        if check_user <= 0:
+            permission = False
+        else:
+            permission = True
+        return permission
+    def get_create_template(self, user):
+        check_user = models.AllowedCompany.objects.filter(
+            Q(id_number=user.code) &
+            Q(create_change_request_template=True)
+        ).count()
+        if check_user <= 0:
+            permission = False
+        else:
+            permission = True
+        return permission
+
     def get_image(self, user):
         request = self.context.get('request')