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

* commit '436f79b9':
  change spelling of dashbaord to dashboard change key of recently_company to recently_companies and recently_users to recent_user

app/applicationlayer/master/dashboard/views.py

@@ -104,8 +104,8 @@ class RMSDashBoardViewSet(APIView):
                 "company_count": company_count,
                 "department_count": department_count,
                 "user_count": user_count,
-                "recently_company": arr_company,
-                "recently_users": recently_users
+                "recent_companies": arr_company,
+                "recent_users": recently_users
             }
 
 

app/applicationlayer/master/urls.py

@@ -13,10 +13,9 @@ router.register(r'users', AdminAccountViewSet)
 router.register(r'companies', AdminCompanyViewSet)
 router.register(r'departments', AdminDepartmentViewSet)
 router.register(r'attachments', MasterAttachmentViewSet)
-# router.register(r'dashboard', RMSDashBoardViewSet)
 
 urlpatterns = [
     path('', include(router.urls)),
     url(r'^user-types/$', UserTypeViewSet.as_view(), name="user-types"),
-    url(r'^dashbaord/$', RMSDashBoardViewSet.as_view(), name="dashbaord"),
+    url(r'^dashboard/$', RMSDashBoardViewSet.as_view(), name="dashboard"),
 ]
\ No newline at end of file