KG - Step 3 Label Changes / Removed Bootstraptable Helpers

app/views/additional_details/_document_management_submissions.html.haml

@@ -1,3 +1,22 @@
+-# Copyright © 2011-2016 MUSC Foundation for Research Development
+-# All rights reserved.
+
+-# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+-# 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+-# 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
+-# disclaimer in the documentation and/or other materials provided with the distribution.
+
+-# 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products
+-# derived from this software without specific prior written permission.
+
+-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+-# BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+-# SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+-# 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.
 .page-header
   %h3
     = t(:additional_details)[:document_page_header]

app/views/documents/_table.html.haml

@@ -21,7 +21,7 @@
   #documents-custom-toolbar
     %button.btn.btn-success#document-new{ data: { protocol_id: protocol.id } }
       = t(:documents)[:add_document]
-  %table#documents-table{ data: { toggle: 'table', search: "true", "show-columns" => "true", "show-refresh" => "true", "show-toggle" => "true", url: documents_path(format: :json, protocol_id: protocol.id, service_request_id: service_request.id), striped: "true", toolbar: "#documents-custom-toolbar", "show-export" => "false", "export-types" => ['excel'] } }
+  %table#documents-table{ data: { toggle: 'table', url: documents_path(format: :json, protocol_id: protocol.id, service_request_id: service_request.id), striped: "true", toolbar: "#documents-custom-toolbar" } }
     %thead.primary-header
       %tr
         %th{ data: { class: 'type', align: "left", sortable: "true", field: "type" } }

app/views/notes/_table.html.haml

@@ -22,7 +22,7 @@
     #notes-custom-toolbar
       %button.btn.btn-success#note-new{ data: { notable_id: notable_id, notable_type: notable_type } }
         = t(:notes)[:add]
-  %table.table-striped#notes-table{ data: { toggle: 'table', search: "true", "show-columns" => "true", "show-refresh" => "true", "show-toggle" => "true", url: notes_path(format: :json, note: { notable_id: notable_id, notable_type: notable_type }), striped: "true", toolbar: "#notes-custom-toolbar", "show-export" => "false", "export-types" => ['excel'] } }
+  %table.table-striped#notes-table{ data: { toggle: 'table', url: notes_path(format: :json, note: { notable_id: notable_id, notable_type: notable_type }), striped: "true", toolbar: "#notes-custom-toolbar" } }
     %thead.primary-header
       %tr
         %th{ data: { class: 'user', align: "left", sortable: "true", field: "user" } }

app/views/service_requests/document_management/_documents.html.haml

@@ -21,6 +21,4 @@
   .page-header
     %h3
       = t(:proper)[:document_management][:documents_notice]
-      %small
-        = t(:proper)[:document_management][:documents_instructions]
   = render 'documents/table', protocol: service_request.protocol, permission_to_edit: true, in_dashboard: false, service_request: service_request

app/views/service_requests/document_management/_notes.html.haml

@@ -21,6 +21,4 @@
   .page-header
     %h3
       = t(:proper)[:document_management][:notes_notice]
-      %small
-        = t(:proper)[:document_management][:notes_instructions]
   = render 'notes/table', notable_type: notable_type, notable_id: notable_id, notes: service_request.notes, in_dashboard: false

config/locales/additional_details.en.yml

@@ -21,7 +21,6 @@
 en:
   additional_details:
     additional_details_title: 'Form Functionality'
-    document_page_header: 'Form Functionality Submissions'
     label: 'Form Functionality'
     add: 'Add New Form'
     preview_title: 'Form Functionality Survey Preview'
@@ -51,7 +50,7 @@ en:
     take_additional_detail_survey: "Take Form Functionality Survey for %{service_name}"
     complete_or_view: 'Complete/View'
     completed: 'Completed'
-    document_complete_details: 'Complete Form Functionality'
+    document_complete_details: 'Complete Form'
 
     submissions:
       header: "Form Functionality Submissions"

config/locales/proper.en.yml

@@ -142,9 +142,8 @@ en:
     #######################
     document_management:
       documents_notice: "Shared Documents"
-      documents_instructions: "Visible to Authorized Users and selected Service Providers"
       notes_notice: "Notes"
-      notes_instructions: "Important notes for your Study/Project"
+      additional_details_notice: 'Forms'
 
     ##########
     # REVIEW #

spec/features/additional_details/sparc_proper/user_answers_questionnaire_spec.rb

@@ -31,7 +31,7 @@
     end
 
     before :each do
-      click_link 'Complete Form Functionality'
+      click_link 'Complete Form'
       wait_for_javascript_to_finish
     end