Move patient count to admin admin module since it is a function used …

…exclusively by the admin panel.
d3vtoolsmith · Aug 27, 2014 · f085854 · f085854
1 parent 10a8d1b
commit f085854
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/app/controllers/api/admin/patients_controller.rb b/app/controllers/api/admin/patients_controller.rb
@@ -11,6 +11,15 @@ class PatientsController < ApplicationController
       before_filter :validate_authorization!
       skip_before_action :verify_authenticity_token
 
+      api :GET, "/patients/count", "Get count of patients in the database"
+      formats ['json']
+      example '{"patient_count":56}'
+      def count
+        json = {}
+        json['patient_count'] = Record.count
+        render :json => json
+      end
+
       api :POST, "/admin/patients", "Upload a zip file of patients."
       param :file, nil, :desc => 'The zip file of patients to upload.', :required => true
       def create

diff --git a/app/controllers/api/patients_controller.rb b/app/controllers/api/patients_controller.rb
@@ -34,15 +34,6 @@ def index
       respond_with  paginate(api_patients_url,records)
     end
 
-    api :GET, "/patients/count", "Get count of patients in the database"
-    formats ['json']
-    example '{"patient_count":56}'
-    def count
-      json = {}
-      json['patient_count'] = Record.count
-      render :json => json
-    end
-
     api :GET, "/patients/:id[?include_results=:include_results]", "Retrieve an individual patient"
     formats ['json']
     param :id, String, :desc => "Patient ID", :required => true

diff --git a/app/views/admin/patients.html.erb b/app/views/admin/patients.html.erb
@@ -69,7 +69,7 @@
     });
     (function poll(){
        setTimeout(function(){
-        $.getJSON( "<%= count_api_patients_path %>", function(data){
+        $.getJSON( "<%= count_api_admin_patients_path %>", function(data){
           $('#patient_count').html(data.patient_count);
           //Setup the next poll recursively
           poll();

diff --git a/config/routes.rb b/config/routes.rb
@@ -47,7 +47,11 @@
           get :count
         end
       end
-      resource :patients
+      resource :patients do
+        collection do
+          get :count
+        end
+      end
       resource :providers do
         collection do
           get :count
@@ -73,9 +77,6 @@
       end
     end
     resources :patients do
-      collection do
-        get :count
-      end
       member do
         get :results
       end