medivo 0.2.20 → 0.2.21

data/app/assets/javascripts/medivo/lab_appointment/handlers.coffee

@@ -39,6 +39,7 @@ $(document).ready ->
   # override this proc to do your own before send handling
   Appointment.BeforeSendHandler = (form)->
     form.find('.error_message').empty()
+    window.appointment_list.setList([])
     messages = []
     date = form.find('input#date').val()
     valid_date = Date.parseExact(date, "M/d/yyyy")

data/app/models/medivo/appointment.rb

@@ -28,7 +28,7 @@ module Medivo
           data = build_fake_data(date)
         end
         # filter the hash before returning
-        filter_data(data, am_pm, date.to_time)
+        filter_data(data, am_pm, date)
       end
 
       ##
@@ -70,11 +70,22 @@ module Medivo
         true unless !Rails.env.test? and @config.real_data == false
       end
 
-      def filter_data(times, am_pm, search_time)
-        times.collect { |time| AppointmentTime.new(time) }
+      ##
+      # ordering the times, firstly by proximity to search date, and
+      # then by the time in the day
+      def filter_data(times, am_pm, search_date)
+        # get the times into groups by date
+        dates = times
+            .collect { |time| AppointmentTime.new(time) }
             .select { |at| at.match(am_pm, Time.now) }
-            .sort_by {|at| at.nearness_to_time(search_time) }
-            .collect { |at| at.time_str }
+            .group_by(&:date)
+        # order the dates by nearness to search date
+        keys = dates.keys.sort_by {|date| (date - search_date).to_i.abs }
+        # order the times in each day and return the times as a strings
+        keys
+          .collect{|date| dates[date].sort_by(&:time) }
+          .flatten
+          .collect { |at| at.time_str }
       end
 
       def build_fake_data(date)
@@ -101,6 +112,10 @@ class AppointmentTime
     @time = Time.strptime(time_str, Medivo::Appointment::LABCORP_FORMAT) rescue nil
   end
 
+  def date
+    @time.to_date
+  end
+
   def match(am_pm, current_time)
     time and time_str.match(/#{am_pm}/) and (time >= current_time)
   end

data/lib/medivo/version.rb

@@ -1,3 +1,3 @@
 module Medivo
-  VERSION = "0.2.20"
+  VERSION = "0.2.21"
 end

data/spec/dummy/log/development.log

@@ -21794,3 +21794,139 @@ Started GET "/medivo/labs/find_appointment?utf8=%E2%9C%93&date=11%2F19%2F2011&la
   Processing by Medivo::LabsController#find_appointment as JS
   Parameters: {"utf8"=>"✓", "date"=>"11/19/2011", "lab_code"=>"23021", "commit"=>"Search for appointments"}
 Completed 200 OK in 3128ms (Views: 4.7ms)
+
+
+Started GET "/labs/lab_search?zip_code=90210" for 127.0.0.1 at 2011-11-16 18:50:40 -0500
+  Processing by LabsController#lab_search as HTML
+  Parameters: {"zip_code"=>"90210"}
+Rendered labs/search.html.haml within layouts/application (14.9ms)
+Compiled application.js  (10ms)  (pid 14515)
+Compiled medivo/lab_appointment/application.js  (37ms)  (pid 14515)
+Compiled medivo/lab_appointment/handlers.js  (184ms)  (pid 14515)
+Completed 200 OK in 5935ms (Views: 304.8ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2011-11-16 18:50:46 -0500
+Served asset /application.css - 304 Not Modified (0ms)
+
+
+Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2011-11-16 18:50:46 -0500
+Served asset /jquery_ujs.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2011-11-16 18:50:46 -0500
+Served asset /jquery.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/handlebars.js?body=1" for 127.0.0.1 at 2011-11-16 18:50:46 -0500
+Served asset /medivo/handlebars.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/helpers.js?body=1" for 127.0.0.1 at 2011-11-16 18:50:46 -0500
+Served asset /medivo/helpers.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/models.js?body=1" for 127.0.0.1 at 2011-11-16 18:50:46 -0500
+Served asset /medivo/models.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/lab_list/models.js?body=1" for 127.0.0.1 at 2011-11-16 18:50:46 -0500
+Served asset /medivo/lab_list/models.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/views.js?body=1" for 127.0.0.1 at 2011-11-16 18:50:46 -0500
+Served asset /medivo/views.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/lab_list/views.js?body=1" for 127.0.0.1 at 2011-11-16 18:50:46 -0500
+Served asset /medivo/lab_list/views.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/lab_list/handlers.js?body=1" for 127.0.0.1 at 2011-11-16 18:50:46 -0500
+Served asset /medivo/lab_list/handlers.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/lab_list/application.js?body=1" for 127.0.0.1 at 2011-11-16 18:50:46 -0500
+Served asset /medivo/lab_list/application.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/lab_list/sample/show_labs.js?body=1" for 127.0.0.1 at 2011-11-16 18:50:46 -0500
+Served asset /medivo/lab_list/sample/show_labs.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/date.js?body=1" for 127.0.0.1 at 2011-11-16 18:50:46 -0500
+Served asset /medivo/date.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/lab_appointment/models.js?body=1" for 127.0.0.1 at 2011-11-16 18:50:46 -0500
+Served asset /medivo/lab_appointment/models.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/lab_appointment/views.js?body=1" for 127.0.0.1 at 2011-11-16 18:50:46 -0500
+Served asset /medivo/lab_appointment/views.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/lab_appointment/handlers.js?body=1" for 127.0.0.1 at 2011-11-16 18:50:46 -0500
+Served asset /medivo/lab_appointment/handlers.js - 200 OK (3ms)
+
+
+Started GET "/assets/medivo/lab_appointment/application.js?body=1" for 127.0.0.1 at 2011-11-16 18:50:46 -0500
+Served asset /medivo/lab_appointment/application.js - 200 OK (7ms)
+
+
+Started GET "/assets/medivo/lab_appointment/sample/show_appointments.js?body=1" for 127.0.0.1 at 2011-11-16 18:50:46 -0500
+Served asset /medivo/lab_appointment/sample/show_appointments.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2011-11-16 18:50:46 -0500
+Served asset /application.js - 200 OK (1ms)
+
+
+Started GET "/assets/medivo/ajax_waiting.gif" for 127.0.0.1 at 2011-11-16 18:50:46 -0500
+Served asset /medivo/ajax_waiting.gif - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/markerA.png" for 127.0.0.1 at 2011-11-16 18:50:47 -0500
+Served asset /medivo/markerA.png - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/markerB.png" for 127.0.0.1 at 2011-11-16 18:50:47 -0500
+Served asset /medivo/markerB.png - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/markerC.png" for 127.0.0.1 at 2011-11-16 18:50:47 -0500
+Served asset /medivo/markerC.png - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/arrow.png" for 127.0.0.1 at 2011-11-16 18:50:47 -0500
+Served asset /medivo/arrow.png - 304 Not Modified (0ms)
+
+
+Started GET "/medivo/labs?utf8=%E2%9C%93&zip_code=90210&commit=Search" for 127.0.0.1 at 2011-11-16 18:50:52 -0500
+  Processing by Medivo::LabsController#index as JS
+  Parameters: {"utf8"=>"✓", "zip_code"=>"90210", "commit"=>"Search"}
+Completed 200 OK in 1293ms (Views: 11.2ms)
+
+
+Started GET "/assets/medivo/markerA.png" for 127.0.0.1 at 2011-11-16 18:50:54 -0500
+Served asset /medivo/markerA.png - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/markerB.png" for 127.0.0.1 at 2011-11-16 18:50:54 -0500
+Served asset /medivo/markerB.png - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/markerC.png" for 127.0.0.1 at 2011-11-16 18:50:54 -0500
+Served asset /medivo/markerC.png - 304 Not Modified (0ms)
+
+
+Started GET "/medivo/labs/find_appointment?utf8=%E2%9C%93&date=11%2F19%2F2011&lab_code=20060&commit=Search+for+appointments" for 127.0.0.1 at 2011-11-16 18:50:58 -0500
+  Processing by Medivo::LabsController#find_appointment as JS
+  Parameters: {"utf8"=>"✓", "date"=>"11/19/2011", "lab_code"=>"20060", "commit"=>"Search for appointments"}
+Completed 200 OK in 3920ms (Views: 4.7ms)
+
+
+Started GET "/medivo/labs/find_appointment?utf8=%E2%9C%93&date=11%2F19%2F2011&lab_code=20060&commit=Search+for+appointments" for 127.0.0.1 at 2011-11-16 18:51:05 -0500
+  Processing by Medivo::LabsController#find_appointment as JS
+  Parameters: {"utf8"=>"✓", "date"=>"11/19/2011", "lab_code"=>"20060", "commit"=>"Search for appointments"}
+Completed 200 OK in 3137ms (Views: 4.5ms)

data/spec/dummy/log/test.log

@@ -3592,3 +3592,73 @@ Started POST "/medivo/labs/make_appointment" for 127.0.0.1 at 2011-11-16 13:57:2
   Processing by Medivo::LabsController#make_appointment as HTML
   Parameters: {"lab_code"=>"20060", "time"=>"2011-11-01 08:30:00 UTC", "user"=>{"first_name"=>"dude", "last_name"=>nil, "date_of_birth"=>"12/28/1980", "email_address"=>"dudeman@dude.com", "phone_number"=>"4155551212"}}
 Completed 200 OK in 2ms (Views: 0.2ms)
+  Processing by OrdersController#download_requisition as HTML
+Rendered text template (0.0ms)
+Sent data unitedhealthcare_requisition.pdf (73.9ms)
+Completed 200 OK in 991ms (Views: 73.4ms)
+  Processing by OrdersController#download_result as HTML
+Sent data unitedhealthcare_result.pdf (1.8ms)
+Completed 200 OK in 710ms (Views: 1.0ms)
+
+
+Started GET "/medivo/labs?zip_code=90210" for 127.0.0.1 at 2011-11-16 19:19:32 -0500
+  Processing by Medivo::LabsController#index as HTML
+  Parameters: {"zip_code"=>"90210"}
+Completed 200 OK in 204ms (Views: 2.2ms)
+
+
+Started GET "/labs/lab_search?zip_code=90210" for 127.0.0.1 at 2011-11-16 19:19:35 -0500
+  Processing by LabsController#lab_search as HTML
+  Parameters: {"zip_code"=>"90210"}
+Completed 200 OK in 199ms (Views: 53.2ms)
+
+
+Started GET "/assets/application.css" for 127.0.0.1 at 2011-11-16 19:19:36 -0500
+Served asset /application.css - 200 OK (6ms)
+
+
+Started GET "/assets/application.js" for 127.0.0.1 at 2011-11-16 19:19:36 -0500
+Compiled application.js  (11ms)  (pid 15722)
+Compiled medivo/lab_appointment/application.js  (10ms)  (pid 15722)
+Compiled medivo/lab_appointment/handlers.js  (190ms)  (pid 15722)
+Served asset /application.js - 200 OK (729ms)
+
+
+Started GET "/assets/medivo/ajax_waiting.gif" for 127.0.0.1 at 2011-11-16 19:19:36 -0500
+Served asset /medivo/ajax_waiting.gif - 200 OK (2ms)
+
+
+Started GET "/assets/medivo/markerA.png" for 127.0.0.1 at 2011-11-16 19:19:36 -0500
+Served asset /medivo/markerA.png - 200 OK (2ms)
+
+
+Started GET "/assets/medivo/markerB.png" for 127.0.0.1 at 2011-11-16 19:19:36 -0500
+Served asset /medivo/markerB.png - 200 OK (2ms)
+
+
+Started GET "/assets/medivo/arrow.png" for 127.0.0.1 at 2011-11-16 19:19:37 -0500
+Served asset /medivo/arrow.png - 200 OK (4ms)
+
+
+Started GET "/medivo/labs/find_appointment?date=11%2F01%2F2011&lab_code=20060" for 127.0.0.1 at 2011-11-16 19:19:37 -0500
+  Processing by Medivo::LabsController#find_appointment as HTML
+  Parameters: {"date"=>"11/01/2011", "lab_code"=>"20060"}
+Completed 200 OK in 1ms (Views: 0.4ms)
+
+
+Started GET "/medivo/labs/find_appointment?date=11%2F01%2F2011&lab_code=20060" for 127.0.0.1 at 2011-11-16 19:19:37 -0500
+  Processing by Medivo::LabsController#find_appointment as HTML
+  Parameters: {"date"=>"11/01/2011", "lab_code"=>"20060"}
+Completed 200 OK in 1ms (Views: 0.2ms)
+
+
+Started GET "/medivo/labs/find_appointment?date=11%2F01%2F2011&lab_code=20060" for 127.0.0.1 at 2011-11-16 19:19:37 -0500
+  Processing by Medivo::LabsController#find_appointment as HTML
+  Parameters: {"date"=>"11/01/2011", "lab_code"=>"20060"}
+Completed 404 Not Found in 1ms (Views: 0.3ms)
+
+
+Started POST "/medivo/labs/make_appointment" for 127.0.0.1 at 2011-11-16 19:19:37 -0500
+  Processing by Medivo::LabsController#make_appointment as HTML
+  Parameters: {"lab_code"=>"20060", "time"=>"2011-11-01 08:30:00 UTC", "user"=>{"first_name"=>"dude", "last_name"=>nil, "date_of_birth"=>"12/28/1980", "email_address"=>"dudeman@dude.com", "phone_number"=>"4155551212"}}
+Completed 200 OK in 6ms (Views: 0.3ms)

data/spec/models/appointment_spec.rb

@@ -49,8 +49,12 @@ describe Medivo::Appointment do
       end
 
       it "orders the time strings by nearness to search date" do
-        @all_times = ["11/06/2011|12:30 AM", "11/04/2011|08:30 PM", "11/05/2011|08:30 AM"]
-        returned_times('11/06/2011', '', "11/04/2011").should == ["11/06/2011|12:30 AM", "11/05/2011|08:30 AM", "11/04/2011|08:30 PM"]
+        @all_times =
+          ["11/06/2011|12:30 AM", "11/04/2011|08:30 PM", "11/05/2011|08:30 AM",
+           "11/06/2011|01:30 PM", "11/04/2011|10:00 AM", "11/05/2011|3:30 PM"]
+        returned_times('11/06/2011', '', "11/04/2011").should ==
+          ["11/06/2011|12:30 AM", "11/06/2011|01:30 PM", "11/05/2011|08:30 AM",
+           "11/05/2011|3:30 PM", "11/04/2011|10:00 AM", "11/04/2011|08:30 PM"]
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: medivo
 version: !ruby/object:Gem::Version
-  version: 0.2.20
+  version: 0.2.21
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2168896820 !ruby/object:Gem::Requirement
+  requirement: &2169175720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2168896820
+  version_requirements: *2169175720
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2168896380 !ruby/object:Gem::Requirement
+  requirement: &2169174260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168896380
+  version_requirements: *2169174260
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2168895920 !ruby/object:Gem::Requirement
+  requirement: &2169172040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168895920
+  version_requirements: *2169172040
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &2168895500 !ruby/object:Gem::Requirement
+  requirement: &2169170380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168895500
+  version_requirements: *2169170380
 - !ruby/object:Gem::Dependency
   name: geocoder
-  requirement: &2168895080 !ruby/object:Gem::Requirement
+  requirement: &2169169300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168895080
+  version_requirements: *2169169300
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2168894660 !ruby/object:Gem::Requirement
+  requirement: &2169168380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168894660
+  version_requirements: *2169168380
 - !ruby/object:Gem::Dependency
   name: pdfkit
-  requirement: &2168894240 !ruby/object:Gem::Requirement
+  requirement: &2169167040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168894240
+  version_requirements: *2169167040
 - !ruby/object:Gem::Dependency
   name: prawn
-  requirement: &2168880380 !ruby/object:Gem::Requirement
+  requirement: &2169156500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168880380
+  version_requirements: *2169156500
 description: Use the medivo platform to find lab locations, make labcorp appointments,
   place lab orders
 email:
@@ -312,7 +312,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3011274679794770266
+      hash: 949425962482715758
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -321,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3011274679794770266
+      hash: 949425962482715758
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.6.2