Verification and change for current arv number workflow in art initial

jeffrafter · Jun 20, 2010 · d140478 · d140478
1 parent f62b59e
commit d140478
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/app/helpers/touchscreen_helper.rb b/app/helpers/touchscreen_helper.rb
@@ -130,7 +130,7 @@ def touch_identifier_tag(patient, type, value, options={}, time=DateTime.now())
     }.merge(options)                 
     content = ""
     content << hidden_field_tag("identifiers[][patient_id]", patient.id) 
-    content << hidden_field_tag("identifiers[][location_id]", Location.current_health_center) 
+    content << hidden_field_tag("identifiers[][location_id]", Location.current_health_center.location_id) 
     content << hidden_field_tag("identifiers[][identifier_type]", PatientIdentifierType.find_by_name(type).patient_identifier_type_id)
     content << text_field_tag("identifiers[][identifier]", value, options) 
     content

diff --git a/app/views/encounters/art_initial.rhtml b/app/views/encounters/art_initial.rhtml
@@ -36,18 +36,18 @@
      :condition => '$("ever_received_art").value == "YES"',
      :helpText => "Has transfer letter?"} %>
 
+  <%= touch_text_field_tag "ART NUMBER AT PREVIOUS LOCATION", @patient, nil,
+    {:id => "previous_art_number",
+     :condition => '$("ever_received_art").value == "YES"',
+     :optional => false,
+     :helpText => "ART number at previous location" } %>
+
   <%= touch_yes_no_tag "HAS THE PATIENT TAKEN ART IN THE LAST TWO WEEKS", @patient, nil,
     {:id => "taken_art_in_last_two_weeks",
      :optional => false,
      :condition => '$("ever_received_art").value == "YES"',
      :helpText => "Taken ART in the last two weeks?" } %>
 
-  <%= touch_identifier_tag @patient, "ARV Number", nil, 
-    {:id => "previous_art_number",
-     :optional => false,
-     :condition => '$("ever_received_art").value == "YES"',
-     :helpText => "ART number at previous location" } %>
-
   <%= touch_yes_no_tag "FOLLOW UP AGREEMENT", @patient, nil,
     {:id => "agrees_to_followup",
      :optional => false,
@@ -66,7 +66,7 @@
     {:id => "first_positive_hiv_test_date",
      :helpText => "Date of first positive HIV test"} %>
 
-  <%= touch_text_field_tag "ART NUMBER AT PREVIOUS LOCATION", @patient, nil,
+  <%= touch_identifier_tag @patient, "ARV Number", nil, 
     {:id => "art_number",
      :optional => false,
      :helpText => "ART number at current location" } %>

diff --git a/features/art_initial.feature b/features/art_initial.feature
@@ -48,14 +48,14 @@ Feature: Clinician Visit
     Then I should see "Has transfer letter?"                                    
     When I select the option "Yes"
     And I press "Next"
-    Then I should see "Taken ART in the last two weeks?"                                    
-    When I select the option "Yes"
-    And I press "Next"
     Then I should see "ART number at previous location"
     When I type "KCH"
     And I press "0-9"
     And I type "1234"    
     And I press "Next"
+    Then I should see "Taken ART in the last two weeks?"                                    
+    When I select the option "Yes"
+    And I press "Next"
     Then I should see "Agrees to followup?"
     When I select an option
     And I press "Next"