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

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

@@ -3,19 +3,52 @@ from rest_framework import serializers
 
 
 class headers(serializers.ModelSerializer):
+
+
     def to_representation(self, instance):
-        setattr(
-            instance, 'created', instance.created.strftime('%Y-%m-%d-%H:%M:%S')
-        )
-        setattr(
-            instance, 'requested_to_target_date',
-            instance.requested_to_target_date.strftime('%Y-%m-%d-%H:%M:%S')
-        )
-        return super().to_representation(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:
+                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"
+
+            return ret
+
 
     class Meta:
         model = models.ChangeRequestFormHeader
         fields = (
+            'requested_to_template_id',
             'requested_to_template_name',
             'company_desc',
             'department_desc',

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

@@ -70,6 +70,7 @@ class DownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
 
     column_header = {
         'titles': [
+            "Cr Number",
             "Name",
             "Company Request To",
             "Department Requested To",

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

@@ -1114,37 +1114,59 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
             Q(form_code=instance) &
             Q(main_action='ACTION') &
             Q(entity='CR_FRM_APPROVER')
-        ).values()
+        ).values().order_by('-created')
         list_his = []
         for data in history:
             # list_his.append()
             x = data['toValue'].replace("'", '"').replace('None', '""')
             convert = json.loads(x)
-            print(convert)
-            user_id = convert['user']
-            user_instance = models.User.objects.get(
-                code=str(user_id)
-            )
-
-            name = user_instance.name
-            department = user_instance.department.name
-            company = user_instance.department.company.name
-            date_sent = convert['action_date']
-            delegation = convert['delegation']
-            action = convert['action']
-            remarks = convert['remarks']
+            # print(convert)
+            # user_id = convert['user']
+            # user_instance = models.User.objects.get(
+            #     code=str(user_id)
+            # )
+
+            # name = user_instance.name
+            # department = user_instance.department.name
+            # company = user_instance.department.company.name
+            # date_sent = convert['action_date']
+            # delegation = convert['delegation']
+            # action = convert['action']
+            # remarks = convert['remarks']
 
             history_dict = {
-                "name": name,
-                "department" : department,
-                "company" : company,
-                "date_sent" : date_sent,
-                "delegation" : delegation,
-                "action" : action,
-                "remarks" : remarks,
+                "name": convert['user']['name'],
+                "department" : convert['department']['name'],
+                "company" : convert['company']['name'],
+                "date_sent" : convert['date_sent'],
+                "delegation" : convert['delegation'],
+                "action" : convert['action'],
+                "remarks" : convert['remarks']
             }
-
             list_his.append(history_dict)
+
+        # self.serializer_class = 
+        test = ChangeRequestFormApproversSerializer(list_his)
+        # test.is_valid(raise_exception=False)
+        # page = self.paginate_queryset(test)
+        # serializer = self.get_serializer(page, many=True)
+        # id_number = self.request.user.code
+        # self.queryset = change_request.list_by_user(id_number)
+
+        # self.queryset = change_request.filter_base(
+        #     self.queryset,
+        #     request.query_params.get('company_requested_to'),
+        #     request.query_params.get('department_requested_to'),
+        #     request.query_params.get('date_modified_from'),
+        #     request.query_params.get('date_modified_to'),
+        #     request.query_params.get('date_required_from'),
+        #     request.query_params.get('date_required_to'),
+        #     request.query_params.get('form_type'),
+        # )
+
+        # queryset = self.filter_queryset(self.queryset)
+        
+        
         
 
         return Response(

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

@@ -73,6 +73,7 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
     def list(self, request, *args, **kwargs):
 
         queryset = self.filter_queryset(self.get_queryset())
+        queryset.filter(created_by_user=request.user.code)
 
         self.serializer_class = ChangeRequestTemplatesSerializerList
         

app/applicationlayer/management/department/views.py

@@ -46,6 +46,7 @@ class DepartmentViewSet(viewsets.ModelViewSet):
     def list(self, request, *args, **kwargs):
 
         queryset = self.filter_queryset(self.get_queryset())
+        queryset = queryset.exclude(id=1)
         page = self.paginate_queryset(queryset)
 
         if page is not None: