Merge pull request #287 from bmic-development/saw-cart-protocol-id-2b

Added SRID number to step 2B header [#145704201]

app/helpers/service_requests_helper.rb

@@ -22,9 +22,9 @@ module ServiceRequestsHelper
 
   def protocol_id_display(sub_service_request, service_request)
     if sub_service_request && sub_service_request.protocol.present?
-      " SRID: #{sub_service_request.protocol.id}"
+      " (SRID: #{sub_service_request.protocol.id})"
     elsif service_request && service_request.protocol.present?
-      " SRID: #{service_request.protocol.id}"
+      " (SRID: #{service_request.protocol.id})"
     else
       ""
     end

app/views/service_requests/confirmation.html.haml

@@ -19,7 +19,7 @@
 -# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 = javascript_include_tag 'confirmation'
 
-= render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request_id: @sub_service_request.try(:id), step: @step_text, step_number: @step_number, css_class: @css_class
+= render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request: @sub_service_request, step: @step_text, step_number: @step_number, css_class: @css_class
 .col-sm-12.body-container#confirmation-page
   = form_tag navigate_service_request_path(@service_request) do
     = hidden_field_tag :location, ''

app/views/service_requests/document_management.html.haml

@@ -23,7 +23,7 @@
 = javascript_include_tag 'dashboard/delete_submission'
 = stylesheet_link_tag 'additional_details/styles/document_table'
 
-= render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request_id: @sub_service_request.try(:id), step: @step_text, step_number: @step_number, css_class: @css_class
+= render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request: @sub_service_request, step: @step_text, step_number: @step_number, css_class: @css_class
 .col-sm-12.body-container#documents-page
   = form_tag navigate_service_request_path(@service_request), id: 'service-request-form' do
     - if @sub_service_request

app/views/service_requests/navigation/_steps.html.haml

@@ -22,15 +22,23 @@
     .steps-banner-container
       %ul#steps-banner
         %li
-          = step_nav_button(t(:proper)[:navigation][:steps][:step1], 'blue', ['1','2','3','4'].include?(step_number), protocol_service_request_path(service_request, sub_service_request_id: sub_service_request_id))
+          = step_nav_button(t(:proper)[:navigation][:steps][:step1], 'blue', step_number != '5', protocol_service_request_path(service_request, sub_service_request_id: sub_service_request.try(:id)))
         %li
-          = step_nav_button(t(:proper)[:navigation][:steps][:step2], 'light-blue', ['1','2','3','4'].include?(step_number), service_details_service_request_path(service_request, sub_service_request_id: sub_service_request_id))
+          = step_nav_button(t(:proper)[:navigation][:steps][:step2], 'light-blue', step_number != '5', service_details_service_request_path(service_request, sub_service_request_id: sub_service_request.try(:id)))
         %li
-          = step_nav_button(t(:proper)[:navigation][:steps][:step3], 'orange', ['1','2','3','4'].include?(step_number), document_management_service_request_path(service_request, sub_service_request_id: sub_service_request_id))
+          = step_nav_button(t(:proper)[:navigation][:steps][:step3], 'orange', step_number != '5', document_management_service_request_path(service_request, sub_service_request_id: sub_service_request.try(:id)))
         %li
-          = step_nav_button(t(:proper)[:navigation][:steps][:step4], 'red', ['1','2','3','4'].include?(step_number), review_service_request_path(service_request, sub_service_request_id: sub_service_request_id))
+          = step_nav_button(t(:proper)[:navigation][:steps][:step4], 'red', step_number != '5', review_service_request_path(service_request, sub_service_request_id: sub_service_request.try(:id)))
         %li
-          = step_nav_button(t(:proper)[:navigation][:steps][:step5], 'green', step_number == '5',confirmation_service_request_path(service_request, sub_service_request_id: sub_service_request_id))
+          = step_nav_button(t(:proper)[:navigation][:steps][:step5], 'green', step_number == '5',confirmation_service_request_path(service_request, sub_service_request_id: sub_service_request.try(:id)))
 .col-sm-12.ui-corner-all.step-header{ class: css_class }
-  %h4
-    = step
+  - if step_number == '2B'
+    .col-sm-3.no-padding
+      %h4
+        = step
+    .col-sm-9.no-padding
+      %h4
+        = protocol_id_display(sub_service_request, service_request)
+  - else
+    %h4
+      = step

app/views/service_requests/obtain_research_pricing.html.haml

@@ -19,7 +19,7 @@
 -# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 = javascript_include_tag 'confirmation'
 
-= render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request_id: @sub_service_request.try(:id), step: @step_text, step_number: @step_number, css_class: @css_class
+= render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request: @sub_service_request, step: @step_text, step_number: @step_number, css_class: @css_class
 .col-sm-12.body-container#confirmation-page
   = form_tag navigate_service_request_path(@service_request) do
     = hidden_field_tag :location, ''

app/views/service_requests/protocol.html.haml

@@ -19,7 +19,7 @@
 -# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 = javascript_include_tag 'protocol'
 = stylesheet_link_tag 'associated_users_table'
-= render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request_id: @sub_service_request.try(:id), step: @step_text, step_number: @step_number, css_class: @css_class
+= render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request: @sub_service_request, step: @step_text, step_number: @step_number, css_class: @css_class
 = render 'service_requests/modals/request_submitted_modal', service_request: @service_request
 .col-sm-12.body-container#protocols-page
   = form_tag navigate_service_request_path(@service_request), id: 'service-request-form' do

app/views/service_requests/review.html.haml

@@ -19,7 +19,7 @@
 -# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 = javascript_include_tag 'review'
 
-= render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request_id: @sub_service_request.try(:id), step: @step_text, step_number: @step_number, css_class: @css_class
+= render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request: @sub_service_request, step: @step_text, step_number: @step_number, css_class: @css_class
 .col-sm-12.body-container#review-page
   = form_tag navigate_service_request_path(@service_request), id: 'service-request-form' do
     - if @sub_service_request

app/views/service_requests/service_calendar.html.haml

@@ -19,7 +19,7 @@
 -# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 = javascript_include_tag 'service_calendar'
 
-= render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request_id: @sub_service_request.try(:id), step: @step_text, step_number: @step_number, css_class: @css_class
+= render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request: @sub_service_request, step: @step_text, step_number: @step_number, css_class: @css_class
 .col-sm-12.body-container
   = form_tag navigate_service_request_path(@service_request), id: 'service-request-form' do
     - if @sub_service_request

app/views/service_requests/service_details.html.haml

@@ -19,7 +19,7 @@
 -# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 = javascript_include_tag 'service_details'
 
-= render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request_id: @sub_service_request.try(:id), step: @step_text, step_number: @step_number, css_class: @css_class
+= render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request: @sub_service_request, step: @step_text, step_number: @step_number, css_class: @css_class
 = render 'service_requests/modals/request_submitted_modal', service_request: @service_request
 .col-sm-12.body-container#service-details-page
   = form_tag navigate_service_request_path(@service_request), id: 'service-request-form' do

app/views/service_requests/service_subsidy.html.haml

@@ -19,7 +19,7 @@
 -# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 = javascript_include_tag 'service_subsidy'
 
-= render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request_id: @sub_service_request.try(:id), step: @step_text, step_number: @step_number, css_class: @css_class
+= render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request: @sub_service_request, step: @step_text, step_number: @step_number, css_class: @css_class
 .col-sm-12.body-container#service-subsidy-page
   = form_tag navigate_service_request_path(@service_request), id: 'service-request-form', class: 'form-horizontal' do
     - if @sub_service_request

config/navigation.yml

@@ -34,7 +34,7 @@ protocol:
 
 service_details:
   step_text: 'STEP 2A: Enter Dates and Arm Information'
-  step_number: '2'
+  step_number: '2A'
   css_class: light-blue-provider
   back: protocol
   catalog: catalog
@@ -51,7 +51,7 @@ service_details:
 
 service_calendar:
   step_text: 'STEP 2B: Visit Calendar'
-  step_number: '2'
+  step_number: '2B'
   css_class: light-blue-provider
   back: service_details
   catalog: catalog
@@ -68,7 +68,7 @@ service_calendar:
 
 service_subsidy:
   step_text: 'STEP 2C: Enter Requested Subsidy Information'
-  step_number: '2'
+  step_number: '2C'
   css_class: light-blue-provider
   back: service_calendar
   catalog: catalog

spec/views/proper/service_requests/navigation/_steps.html.haml_spec.rb

@@ -31,69 +31,69 @@
 
   context 'User is currently on step 1' do
     it 'should have links on the arrows for steps 1-4' do
-      render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request_id: nil, step: "Step 1", step_number: '1', css_class: 'blue-provider'
+      render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request: nil, step: "Step 1", step_number: '1', css_class: 'blue-provider'
 
       expect(response).to have_selector('a.step-btn', count: 4)
     end
 
     it 'should just have a div for the arrow for step 5' do
-      render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request_id: nil, step: "Step 1", step_number: '1', css_class: 'blue-provider'
+      render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request: nil, step: "Step 1", step_number: '1', css_class: 'blue-provider'
 
       expect(response).to have_selector('div.step-btn', count: 1)
     end
   end
 
   context 'User is currently on step 2' do
     it 'should have links on the arrows for steps 1-4' do
-      render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request_id: nil, step: "Step 2", step_number: '2', css_class: 'blue-provider'
+      render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request: nil, step: "Step 2", step_number: '2', css_class: 'blue-provider'
 
       expect(response).to have_selector('a.step-btn', count: 4)
     end
 
     it 'should just have a div for the arrow for step 5' do
-      render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request_id: nil, step: "Step 2", step_number: '2', css_class: 'blue-provider'
+      render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request: nil, step: "Step 2", step_number: '2', css_class: 'blue-provider'
 
       expect(response).to have_selector('div.step-btn', count: 1)
     end
   end
 
   context 'User is currently on step 3' do
     it 'should have links on the arrows for steps 1-4' do
-      render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request_id: nil, step: "Step 3", step_number: '3', css_class: 'blue-provider'
+      render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request: nil, step: "Step 3", step_number: '3', css_class: 'blue-provider'
 
       expect(response).to have_selector('a.step-btn', count: 4)
     end
 
     it 'should just have a div for the arrow for step 5' do
-      render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request_id: nil, step: "Step 3", step_number: '3', css_class: 'blue-provider'
+      render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request: nil, step: "Step 3", step_number: '3', css_class: 'blue-provider'
 
       expect(response).to have_selector('div.step-btn', count: 1)
     end
   end
 
   context 'User is currently on step 4' do
     it 'should have links on the arrows for steps 1-4' do
-      render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request_id: nil, step: "Step 4", step_number: '4', css_class: 'blue-provider'
+      render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request: nil, step: "Step 4", step_number: '4', css_class: 'blue-provider'
 
       expect(response).to have_selector('a.step-btn', count: 4)
     end
 
     it 'should just have a div for the arrow for step 5' do
-      render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request_id: nil, step: "Step 4", step_number: '4', css_class: 'blue-provider'
+      render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request: nil, step: "Step 4", step_number: '4', css_class: 'blue-provider'
 
       expect(response).to have_selector('div.step-btn', count: 1)
     end
   end
 
   context 'User is currently on step 5' do
     it 'should just have a div on the arrows for steps 1-4' do
-      render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request_id: nil, step: "Step 5", step_number: '5', css_class: 'blue-provider'
+      render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request: nil, step: "Step 5", step_number: '5', css_class: 'blue-provider'
 
       expect(response).to have_selector('div.step-btn', count: 4)
     end
 
     it 'should have a link on the arrow for step 5' do
-      render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request_id: nil, step: "Step 5", step_number: '5', css_class: 'blue-provider'
+      render '/service_requests/navigation/steps', service_request: @service_request, sub_service_request: nil, step: "Step 5", step_number: '5', css_class: 'blue-provider'
 
       expect(response).to have_selector('a.step-btn', count: 1)
     end