Merge pull request #837 from sparc-request/wth-additional-details-lin…

…k-bug wth - step 3 additional details link bug
sparc-request · Jan 2, 2017 · d7d6bed · d7d6bed
2 parents 096edef + 8a5c3b6
commit d7d6bed
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 29 deletions.
diff --git a/app/views/additional_details/_dashboard_complete_additional_details.html.haml b/app/views/additional_details/_dashboard_complete_additional_details.html.haml
@@ -1,7 +1,8 @@
 - if service_request.additional_detail_services.present?
   - service_request.line_items.each do |line_item|
-    - unless line_item.submissions.present?
+    - service = Service.find(line_item.service_id)
+    - if service.questionnaires.active.present? && !line_item.submissions.present?
       %div.alert.alert-warning
         %h5.text-center
-          = link_to t("additional_details.dashboard_complete_details", service_name: Service.find(line_item.service_id).name),
+          = link_to t("additional_details.dashboard_complete_details", service_name: service.name),
             new_service_additional_details_submission_path(line_item.service_id, protocol_id: @protocol.id, line_item_id: line_item.id), remote: true
diff --git a/app/views/additional_details/_document_management_submissions.html.haml b/app/views/additional_details/_document_management_submissions.html.haml
@@ -15,30 +15,33 @@
       %th.text-center
         = t(:additional_details)[:delete_questionnaire]
   %tbody
-    - service_request.additional_detail_services.each do |service|
-      %tr
-        %td
-          = service.name
-        %td
-          .text-center
-            - if service.identity_submission(current_identity).present?
-              = link_to service_additional_details_submission_path(service, service.identity_submission(current_identity).first),
-                remote: true, class: 'btn btn-primary' do
-                %span.glyphicon.glyphicon-search
-            - else
-              = link_to new_service_additional_details_submission_path(service, protocol_id: @service_request.protocol_id, sr_id: @service_request.id), remote: true, class: 'btn btn-primary' do
-                = t(:additional_details)[:document_complete_details]
-                %span.glyphicon.glyphicon-modal-window
-        %td
-          .text-center
-            = service.identity_submission(current_identity).present? ? "True" : "False"
-        %td
-          .text-center
-            - if service.identity_submission(current_identity).present?
-              = link_to edit_service_additional_details_submission_path(service, service.identity_submission(current_identity).first, sr_id: @service_request.id), remote: true, class: 'btn btn-warning' do
-                %span.glyphicon.glyphicon-edit
-        %td
-          .text-center
-            - if service.identity_submission(current_identity).present?
-              = link_to "javascript:void(0);", class: 'btn btn-danger delete-submission', data: { id: "#{service.identity_submission(current_identity).first.id}", service_id: "#{service.id}", sr_id: "#{@service_request.id}", protocol_id: "#{@service_request.protocol_id}" } do
-                %span.glyphicon.glyphicon-remove
+    - if service_request.additional_detail_services.present?
+      - service_request.line_items.each do |line_item|
+        - service = Service.find(line_item.service_id)
+        - if service.questionnaires.active.present?
+          %tr
+            %td
+              = service.name
+            %td
+              .text-center
+                - if service.identity_submission(current_identity).present?
+                  = link_to service_additional_details_submission_path(service, service.identity_submission(current_identity).first),
+                    remote: true, class: 'btn btn-primary' do
+                    %span.glyphicon.glyphicon-search
+                - else
+                  = link_to new_service_additional_details_submission_path(service, protocol_id: @service_request.protocol_id, sr_id: @service_request.id, line_item_id: line_item.id), remote: true, class: 'btn btn-primary' do
+                    = t(:additional_details)[:document_complete_details]
+                    %span.glyphicon.glyphicon-modal-window
+            %td
+              .text-center
+                = service.identity_submission(current_identity).present? ? "True" : "False"
+            %td
+              .text-center
+                - if service.identity_submission(current_identity).present?
+                  = link_to edit_service_additional_details_submission_path(service, service.identity_submission(current_identity).first, sr_id: @service_request.id), remote: true, class: 'btn btn-warning' do
+                    %span.glyphicon.glyphicon-edit
+            %td
+              .text-center
+                - if service.identity_submission(current_identity).present?
+                  = link_to "javascript:void(0);", class: 'btn btn-danger delete-submission', data: { id: service.identity_submission(current_identity).first.id, service_id: service.id, sr_id: @service_request.id, protocol_id: @service_request.protocol_id, line_item_id: line_item.id } do
+                    %span.glyphicon.glyphicon-remove