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

* commit 'b676eb49':
  fixed issue on rms dashboard max_display, user and department count

app/applicationlayer/master/dashboard/views.py

@@ -19,6 +19,7 @@ class RMSDashBoardViewSet(APIView):
 
             enums_company = enums.UserTypeEnum.COMPANY_USER_ADMIN.value
             enums_department = enums.UserTypeEnum.DEPARTMENT_USER_ADMIN.value
+            enums_oua = enums.UserTypeEnum.OVERALL_USER_ADMIN.value
 
             user_type = request.user.user_type
             user_company = request.user.department.company.code
@@ -32,12 +33,12 @@ class RMSDashBoardViewSet(APIView):
 
             recently_company = {}
 
-            recently_users = User.objects.exclude(id=1).values(
+            recently_users = User.objects.all().values(
                 'name',
                 'department__company__name',
                 'department__name',
                 'date_joined'
-            )[:10]
+            ).order_by('-date_joined')
 
             if user_type == enums_department:
 
@@ -45,12 +46,16 @@ class RMSDashBoardViewSet(APIView):
                 department_count = 1
                 user_count = User.objects.filter(
                     department=str(user_department)
-                ).count()
+                ).exclude(id=1).count()
 
                 recently_company['company_name'] = request.user.department.company.name
-                recently_company['no_department'] = Department.objects.filter(
-                    code=str(user_department)
-                ).count()
+
+                # recently_company['no_department'] = Department.objects.filter(
+                #     code=str(user_department)
+                # ).exclude(id=1).count()
+
+
+                recently_company['no_department'] = 1
 
                 recently_company['no_users'] = user_count
 
@@ -66,18 +71,18 @@ class RMSDashBoardViewSet(APIView):
                 company_count = 1
                 user_count = User.objects.filter(
                     department__company=str(user_company)
-                ).count()
+                ).exclude(id=1).count()
 
                 department_count = Department.objects.filter(
                     company=str(user_company)
-                ).count()
+                ).exclude(id=1).count()
 
                 recently_company['company_name'] = request.user.department.company.name
                 recently_company['no_department'] = department_count
 
                 recently_company['no_users'] = User.objects.filter(
                     department__company__code=str(user_company)
-                ).count()
+                ).exclude(id=1).count()
 
                 recently_company['date_added'] = request.user.department.company.created
 
@@ -87,10 +92,29 @@ class RMSDashBoardViewSet(APIView):
                     department__company__code=str(user_company)
                 )
 
+            elif user_type == enums_oua:
+                company_count = Company.objects.count()
+                department_count = Department.objects.exclude(id=1).count()
+                user_count = User.objects.exclude(id=1).count()
+                companies = Company.objects.all().order_by('-created')[0:10]
+
+                for data in companies:
+                    recently_company['name'] = data.name
+                    recently_company['no_department'] = data.companies.exclude(id=1).count()
+
+                    recently_company['no_users'] = User.objects.filter(
+                        department__company__code=str(data.code)
+                    ).count()
+
+                    recently_company['date_added'] = data.created
+
+                    arr_company.append(recently_company)
+                    recently_company = {}
+
             else:
-                company_count = Company.objects.exclude(id=1).count()
+                company_count = Company.objects.count()
                 companies = Company.objects.all()[0:10]
-                department_count = Department.objects.exclude(id=1).count()
+                department_count = Department.objects.count()
                 user_count = User.objects.all().count()
 
                 for data in companies:
@@ -105,13 +129,21 @@ class RMSDashBoardViewSet(APIView):
 
                     arr_company.append(recently_company)
                     recently_company = {}
+                data = {
+                    "company_count": company_count,
+                    "department_count": department_count,
+                    "user_count": user_count,
+                    "recent_companies": arr_company,
+                    "recent_users": recently_users[:10]
+                }
+
 
             data = {
                 "company_count": company_count,
                 "department_count": department_count,
                 "user_count": user_count,
                 "recent_companies": arr_company,
-                "recent_users": recently_users.order_by('-date_joined')
+                "recent_users": recently_users.exclude(id=1)[:10]
             }