Permalink
Browse files

Merge branch 'develop' of http://github.com/projectcypress/cypress in…

…to develop
  • Loading branch information...
2 parents c292f67 + 4672ea6 commit f886163f3f5c0f74407fd8bd1a23c0a33fa0c3fc @timbrown01886 committed May 11, 2012
Showing with 406 additions and 168 deletions.
  1. +0 −1 .gitignore
  2. +5 −30 Gemfile
  3. +233 −0 Gemfile.lock
  4. +1 −1 app/controllers/api/api_controller.rb
  5. +4 −4 app/controllers/api/vendors_controller.rb
  6. +5 −5 app/controllers/patients_controller.rb
  7. +10 −7 app/controllers/product_tests_controller.rb
  8. +8 −7 app/controllers/products_controller.rb
  9. +2 −2 app/controllers/vendors_controller.rb
  10. +1 −0 app/models/product.rb
  11. +2 −0 app/models/product_test.rb
  12. +2 −1 app/models/user.rb
  13. +1 −1 app/models/vendor.rb
  14. +40 −28 app/views/patients/table.html.erb
  15. +15 −0 app/views/product_tests/_pqri_errors.html.erb
  16. +8 −36 app/views/product_tests/show.html.erb
  17. +12 −1 lib/remove_duplicate_patients.rb
  18. +1 −0 test/fixtures/product_tests/product_test1.json
  19. +1 −0 test/fixtures/product_tests/product_test2.json
  20. +1 −0 test/fixtures/product_tests/product_test3.json
  21. +1 −0 test/fixtures/product_tests/product_test4.json
  22. +1 −0 test/fixtures/product_tests/product_test5.json
  23. +2 −1 test/fixtures/products/product1.json
  24. +1 −0 test/fixtures/products/product2.json
  25. +1 −0 test/fixtures/products/product3.json
  26. +1 −0 test/fixtures/products/product4_with_mapped_measures.json
  27. +2 −1 test/fixtures/users/bobby.json
  28. +0 −1 test/fixtures/vendors/ehr1.json
  29. +0 −1 test/fixtures/vendors/ehr2.json
  30. +4 −4 test/functional/api/product_controller_test.rb
  31. +5 −5 test/functional/api/product_tests_controller_test.rb
  32. +5 −5 test/functional/api/test_executions_controller_test.rb
  33. +10 −11 test/functional/api/vendor_controllers_test.rb
  34. +2 −2 test/functional/patients_controller_test.rb
  35. +7 −2 test/functional/product_tests_controller_test.rb
  36. +12 −11 test/functional/vendors_controller_test.rb
View
@@ -1,5 +1,4 @@
.bundle
-Gemfile.lock
db/*.sqlite3
log/*.log
tmp/
View
35 Gemfile
@@ -1,12 +1,13 @@
source 'http://rubygems.org'
+#gem 'bson', '1.3.2'
gem 'rails', '3.2.2'
gem 'jquery-rails'
gem 'rake'
-gem 'quality-measure-engine', :git => 'https://github.com/pophealth/quality-measure-engine.git', :branch => 'develop'
-#gem 'quality-measure-engine', '1.1.1'
-gem 'health-data-standards', :git => 'https://github.com/projectcypress/health-data-standards.git', :branch => 'develop'
-#gem 'health-data-standards', '0.7.1'
+#gem 'quality-measure-engine', :git => 'https://github.com/pophealth/quality-measure-engine.git', :branch => 'develop'
+gem 'quality-measure-engine', '1.1.2'
+#gem 'health-data-standards', :git => 'https://github.com/projectcypress/health-data-standards.git', :branch => 'develop'
+gem 'health-data-standards', '0.8.0'
gem 'bson_ext', :platforms => :mri
gem 'mongoid', '~> 2.0'
@@ -42,29 +43,3 @@ group :production do
gem 'therubyracer', :platforms => [:ruby, :jruby]
end
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-
-
-# Use unicorn as the web server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
-# gem 'ruby-debug'
-# gem 'ruby-debug19', :require => 'ruby-debug'
-
-# Bundle the extra gems:
-# gem 'bj'
-# gem 'nokogiri'
-# gem 'sqlite3-ruby', :require => 'sqlite3'
-# gem 'aws-s3', :require => 'aws/s3'
-
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
-# group :development, :test do
-# gem 'webrat'
-# end
View
@@ -0,0 +1,233 @@
+GEM
+ remote: http://rubygems.org/
+ specs:
+ Ascii85 (1.0.1)
+ actionmailer (3.2.2)
+ actionpack (= 3.2.2)
+ mail (~> 2.4.0)
+ actionpack (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ journey (~> 1.0.1)
+ rack (~> 1.4.0)
+ rack-cache (~> 1.1)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.1.2)
+ activemodel (3.2.2)
+ activesupport (= 3.2.2)
+ builder (~> 3.0.0)
+ activerecord (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
+ arel (~> 3.0.2)
+ tzinfo (~> 0.3.29)
+ activeresource (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
+ activesupport (3.2.2)
+ i18n (~> 0.6)
+ multi_json (~> 1.0)
+ ansi (1.4.2)
+ arel (3.0.2)
+ bcrypt-ruby (3.0.1)
+ bson (1.6.2)
+ bson_ext (1.6.2)
+ bson (~> 1.6.2)
+ builder (3.0.0)
+ coderay (1.0.6)
+ coffee-rails (3.2.2)
+ coffee-script (>= 2.2.0)
+ railties (~> 3.2.0)
+ coffee-script (2.2.0)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.3.1)
+ devise (2.0.4)
+ bcrypt-ruby (~> 3.0)
+ orm_adapter (~> 0.0.3)
+ railties (~> 3.1)
+ warden (~> 1.1.1)
+ erubis (2.7.0)
+ execjs (1.3.2)
+ multi_json (~> 1.0)
+ health-data-standards (0.8.0)
+ builder (~> 3.0.0)
+ erubis (~> 2.6)
+ mongoid (~> 2.4.2)
+ nokogiri (~> 1.4.7)
+ uuid (~> 2.3.4)
+ hike (1.2.1)
+ i18n (0.6.0)
+ journey (1.0.3)
+ jquery-rails (2.0.2)
+ railties (>= 3.2.0, < 5.0)
+ thor (~> 0.14)
+ json (1.4.6)
+ libv8 (3.3.10.4)
+ log_switch (0.3.0)
+ macaddr (1.6.0)
+ systemu (~> 2.2.0)
+ mail (2.4.4)
+ i18n (>= 0.4.0)
+ mime-types (~> 1.16)
+ treetop (~> 1.4.8)
+ metaclass (0.0.1)
+ method_source (0.7.1)
+ mime-types (1.18)
+ minitest (3.0.0)
+ mocha (0.11.4)
+ metaclass (~> 0.0.1)
+ mongo (1.6.2)
+ bson (~> 1.6.2)
+ mongoid (2.4.9)
+ activemodel (~> 3.1)
+ mongo (~> 1.3)
+ tzinfo (~> 0.3.22)
+ multi_json (1.3.4)
+ nokogiri (1.4.7)
+ orm_adapter (0.0.7)
+ pdf-reader (1.1.1)
+ Ascii85 (~> 1.0.0)
+ ruby-rc4
+ polyglot (0.3.3)
+ prawn (0.12.0)
+ pdf-reader (>= 0.9.0)
+ ttfunk (~> 1.0.2)
+ prawnto_2 (0.2.5)
+ prawn (>= 0.6.0)
+ rails (>= 3.1)
+ pry (0.9.9.6)
+ coderay (~> 1.0.5)
+ method_source (~> 0.7.1)
+ slop (>= 2.4.4, < 3)
+ pry-nav (0.2.1)
+ pry (~> 0.9.9)
+ quality-measure-engine (1.1.2)
+ mongo (~> 1.3)
+ nokogiri (~> 1.4.4)
+ resque (~> 1.15.0)
+ resque-status (~> 0.2.3)
+ rubyzip (~> 0.9.4)
+ rack (1.4.1)
+ rack-cache (1.2)
+ rack (>= 0.4)
+ rack-protection (1.2.0)
+ rack
+ rack-ssl (1.3.2)
+ rack
+ rack-test (0.6.1)
+ rack (>= 1.0)
+ rails (3.2.2)
+ actionmailer (= 3.2.2)
+ actionpack (= 3.2.2)
+ activerecord (= 3.2.2)
+ activeresource (= 3.2.2)
+ activesupport (= 3.2.2)
+ bundler (~> 1.0)
+ railties (= 3.2.2)
+ railties (3.2.2)
+ actionpack (= 3.2.2)
+ activesupport (= 3.2.2)
+ rack-ssl (~> 1.3.2)
+ rake (>= 0.8.7)
+ rdoc (~> 3.4)
+ thor (~> 0.14.6)
+ rake (0.9.2.2)
+ rdoc (3.12)
+ json (~> 1.4)
+ redis (2.2.2)
+ redis-namespace (1.1.0)
+ redis (< 3.0.0)
+ redisk (0.2.2)
+ redis (>= 0.1.1)
+ redis-namespace (>= 0.1.0)
+ resque (1.15.0)
+ json (~> 1.4.6)
+ redis-namespace (>= 0.10.0)
+ sinatra (>= 0.9.2)
+ vegas (~> 0.1.2)
+ resque-status (0.2.4)
+ redisk (>= 0.2.1)
+ resque (>= 1.3.1)
+ uuid (>= 2.0.2)
+ ruby-rc4 (0.1.5)
+ rubyzip (0.9.8)
+ sass (3.1.17)
+ sass-rails (3.2.5)
+ railties (~> 3.2.0)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
+ simple_form (2.0.2)
+ actionpack (~> 3.0)
+ activemodel (~> 3.0)
+ simplecov (0.6.3)
+ multi_json (~> 1.0)
+ simplecov-html (~> 0.5.3)
+ simplecov-html (0.5.3)
+ sinatra (1.3.2)
+ rack (~> 1.3, >= 1.3.6)
+ rack-protection (~> 1.2)
+ tilt (~> 1.3, >= 1.3.3)
+ slop (2.4.4)
+ sprockets (2.1.3)
+ hike (~> 1.2)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
+ systemu (2.2.0)
+ tailor (1.1.0)
+ log_switch (>= 0.3.0)
+ term-ansicolor (>= 1.0.5)
+ text-table (>= 1.2.2)
+ term-ansicolor (1.0.7)
+ text-table (1.2.2)
+ therubyracer (0.10.1)
+ libv8 (~> 3.3.10)
+ thor (0.14.6)
+ tilt (1.3.3)
+ treetop (1.4.10)
+ polyglot
+ polyglot (>= 0.3.1)
+ ttfunk (1.0.3)
+ turn (0.9.5)
+ ansi
+ tzinfo (0.3.33)
+ uglifier (1.2.4)
+ execjs (>= 0.3.0)
+ multi_json (>= 1.0.2)
+ uuid (2.3.5)
+ macaddr (~> 1.0)
+ vegas (0.1.11)
+ rack (>= 1.0.0)
+ warden (1.1.1)
+ rack (>= 1.0)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ bson_ext
+ coffee-rails
+ devise (~> 2.0)
+ health-data-standards (= 0.8.0)
+ jquery-rails
+ minitest
+ mocha
+ mongoid (~> 2.0)
+ nokogiri (~> 1.4.4)
+ prawn
+ prawnto_2
+ pry
+ pry-nav
+ quality-measure-engine (= 1.1.2)
+ rails (= 3.2.2)
+ rake
+ sass-rails
+ simple_form
+ simplecov
+ tailor
+ therubyracer
+ turn
+ uglifier
+ win32-eventlog
@@ -2,7 +2,7 @@ module Api
class ApiController < ApplicationController
before_filter :authenticate_user!
def find_vendor
- @vendor = current_user.vendors.find(params[:vendor_id])
+ @vendor = Vendor.find(params[:vendor_id])
end
def find_product
@@ -5,13 +5,13 @@ class VendorsController < ApiController
respond_to :json
def index
- @vendors = current_user.vendors
+ @vendors = Vendor.all
render :json=> @vendors
end
def create
json = JSON.parse(request.body.read)
- @vendor = current_user.vendors.build json
+ @vendor = Vendor.new json
@vendor.save
redirect_to api_vendor_url(@vendor)
@@ -24,7 +24,7 @@ def show
def update
json = JSON.parse(request.body.read)
- @vendor .update_attributes json
+ @vendor.update_attributes json
@vendor.save
redirect_to api_vendor_url(@vendor)
@@ -40,7 +40,7 @@ def destroy
private
def find_vendor
- @vendor = current_user.vendors.find(params[:id])
+ @vendor = Vendor.find(params[:id])
end
end
@@ -80,15 +80,15 @@ def table_measure
end
def table_all
- @showAll = true
+ @showAll = true
+ @patients = nil
if params[:product_test_id]
@test = ProductTest.find(params[:product_test_id])
+ @patients = Record.where("test_id" => @test.id).order_by([["last", :asc]])
+ else
+ @patients = Record.where("test_id" => nil).order_by([["last", :asc]])
end
- @patients = Result.where("value.test_id" => !@test.nil? ? @test.id : nil).where("value.population" => true)
- .order_by([["value.last", :asc]])
- @patients = Cypress::DuplicateRemover.remove_duplicates(@patients)
-
render 'table'
end
Oops, something went wrong.

0 comments on commit f886163

Please sign in to comment.