wth - organization lock warning message

I updated the locked organization warning message to be more helpful to
the user. I added a new controller action that requests the necessary
data and moved some pieces around that I feel reflects a more MVC
approach. [#134877103]

app/assets/javascripts/catalog.js.coffee

@@ -33,7 +33,6 @@ $(document).ready ->
     else if $(this).hasClass('program-link')
       $('.program-link').removeClass('clicked')
     $(this).addClass('clicked')
-
     id    = $(this).data('id')
     data  = process_ssr_found : $(this).data('process-ssr-found') 
     $.ajax
@@ -42,8 +41,12 @@ $(document).ready ->
       url: "/catalogs/#{id}/update_description"
 
   $(document).on 'click', '.program-link.locked-program', ->
-    $('#modal_place').html($('#locked-organization-modal').html())
-    $('#modal_place').modal('show')
+    organizationId = $(this).data('id')
+    protocolId = $('.protocol-id').val()
+    serviceRequestId = $('.service-request-id').val()
+    $.ajax
+      type: 'GET'
+      url: "/locked_organizations?org_id=#{organizationId}&protocol_id=#{protocolId}&service_request_id=#{serviceRequestId}"
 
   $(document).on 'click', '.core-header', ->
     $('.service-description').addClass('hidden')

app/controllers/locked_organizations_controller.rb

@@ -0,0 +1,10 @@
+class LockedOrganizationsController < ApplicationController
+
+  def show
+    @organization = Organization.find(params[:org_id])
+    @service_provider = @organization.service_providers.where(is_primary_contact: true).first
+    @identity = Identity.find(@service_provider.identity_id)
+    @protocol = Protocol.find(params[:protocol_id])
+    @ssr = SubServiceRequest.where(service_request_id: params[:service_request_id], organization_id: @organization.id).first
+  end
+end

app/views/locked_organizations/show.js.coffee

@@ -0,0 +1,2 @@
+$('#modal_place').html("<%= j render 'service_requests/modals/locked_organization_modal', organization: @organization, identity: @identity, protocol: @protocol, ssr: @ssr %>")
+$('#modal_place').modal('show')

app/views/service_requests/catalog.html.haml

@@ -21,6 +21,8 @@
 
 = hidden_field_tag :signed_in, identity_signed_in? ? 1 : 0
 = hidden_field_tag :has_protocol, @service_request.protocol ? 1 : 0
+= hidden_field_tag :service_request_id, @service_request.id, class: 'service-request-id'
+= hidden_field_tag :protocol_id, @service_request.protocol.id, class: 'protocol-id'
 
 = render 'catalogs/about_section'
 = render 'catalogs/service_accordion', institutions: @institutions, ssr_org: @sub_service_request.try(:organization), locked_org_ids: @locked_org_ids
@@ -32,4 +34,3 @@
 = render 'service_requests/modals/new_request_modal'
 = render 'service_requests/modals/request_submitted_modal', service_request: @service_request
 = render 'service_requests/modals/login_required_modal'
-= render 'service_requests/modals/locked_organization_modal'

app/views/service_requests/modals/_locked_organization_modal.html.haml

@@ -17,7 +17,7 @@
 -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 -# 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.
-#locked-organization-modal.hidden
+#locked-organization-modal
   .modal-dialog
     .modal-content
       .modal-header
@@ -28,7 +28,7 @@
       .modal-body
         #modal_errors
         .form-group.text-center
-          = raw(t(:proper)[:catalog][:locked_organization][:warning])
+          = raw(t('proper.catalog.locked_organization.warning', organization: organization.name, request: "#{protocol.id}-#{ssr.ssr_id}", title: "#{protocol.short_title}", contact_name: "#{identity.first_name} #{identity.last_name}", contact_info: identity.phone.blank? ? identity.email : identity.phone))
       .modal-footer
         .center-block
           %button.btn.btn-default{ type: 'button', data: { dismiss: 'modal' } }

config/locales/proper.en.yml

@@ -74,7 +74,7 @@ en:
         warning: "Deleting this service from the service cart will be irreversible and will cause it to be deleted from the associated protocol (%{protocol_id}). Are you sure you want to proceed?"
       locked_organization:
         header: "Locked Organization"
-        warning: "This Organization has locked your request, pending approval.<br>Please wait for the Organization to finish processing your request.<br><br>If this is incorrect, please contact them directly."
+        warning: "%{organization} services are already present on request %{request} pertaining to this Study/Project, %{title}.<br>Please contact %{contact_name} at %{contact_info} to edit existing request."
 
     ############
     # PROTOCOL #

config/routes.rb

@@ -57,6 +57,8 @@
 
   resources :contact_forms, only: [:new, :create]
 
+  resource :locked_organizations, only: [:show]
+
   resources :subsidies, only: [:new, :create, :edit, :update, :destroy]
 
   resources :service_requests, only: [:show] do