Merge pull request #638 in RMS/api-main-service from red-develop to product-dev

* commit '2c0eb015':
  refactor code on dashboard and current user

app/applicationlayer/management/account/serializer.py

@@ -41,20 +41,15 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
 
 
     def get_cms_settings(self, user):
-        data = ChangeRequestSettings.objects.filter(
-            behalf_user=str(user.code)
+
+        data = user.cms_settings_behalf_users.filter(
+            behalf_user=user.code
         ).values(
-            'active_user__name',
-            'active_user__code',
-            # 'behalf_user__name',
-            # 'behalf_user__code',
-            'behalf_approved',
-            'behalf_accepted',
-            'behalf_rejected',
-            'behalf_implemented',
-            'behalf_completed',
+            'active_user__name', 'active_user__code',
+            "behalf_approved", 'behalf_accepted',
+            'behalf_rejected', 'behalf_implemented',
+            'behalf_completed'
         )
-        print(user.code)
 
         return data
 

app/applicationlayer/master/dashboard/views.py

@@ -39,14 +39,6 @@ class RMSDashBoardViewSet(APIView):
                 'date_joined'
             )
 
-            # recently_users = User.objects.all().values(
-            #     'name',
-            #     'department__company__name',
-            #     'department__name',
-            #     'date_joined'
-            # ).order_by('-date_joined')[0:10]
-
-
             if user_type == enums_department:
 
                 company_count = 1
@@ -103,9 +95,7 @@ class RMSDashBoardViewSet(APIView):
 
                 for data in companies:
                     recently_company['name'] = data.name
-                    recently_company['no_department'] = Department.objects.filter(
-                        company=str(data.code)
-                    ).count()
+                    recently_company['no_department'] = data.companies.count()
 
                     recently_company['no_users'] = User.objects.filter(
                         department__company__code=str(data.code)
@@ -121,7 +111,7 @@ class RMSDashBoardViewSet(APIView):
                 "department_count": department_count,
                 "user_count": user_count,
                 "recent_companies": arr_company,
-                "recent_users": recently_users
+                "recent_users": recently_users.order_by('-date_joined')
             }