Jtm optional information label change

app/views/dashboard/protocols/form/_study_fields.html.haml

@@ -18,7 +18,7 @@
 -# 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.
 = render 'dashboard/protocols/form/study_form_sections/study_information', protocol: protocol, form: form, admin: admin, permission_to_edit: permission_to_edit, action_name: action_name, edit_answers: edit_answers, rmid_server_down: rmid_server_down
-= render 'dashboard/protocols/form/study_form_sections/optional_information', protocol: protocol, form: form
+= render 'dashboard/protocols/form/study_form_sections/financial_information', protocol: protocol, form: form
 = render 'dashboard/protocols/form/study_form_sections/research_involving', protocol: protocol, form: form
 = render 'dashboard/protocols/form/study_form_sections/study_type', protocol: protocol, form: form
 = render 'dashboard/protocols/form/study_form_sections/impact_areas', protocol: protocol, form: form

app/views/dashboard/protocols/form/study_form_sections/_optional_information.html.haml → app/views/dashboard/protocols/form/study_form_sections/_financial_information.html.haml

@@ -21,32 +21,32 @@
 .panel.panel-default
   .panel-heading
     %h4.panel-title
-      = t(:protocols)[:studies][:optional_information][:header]
+      = t(:protocols)[:studies][:financial_information][:header]
     .sub_text
-      = t(:protocols)[:studies][:optional_information][:subtext]
+      = t(:protocols)[:studies][:financial_information][:subtext]
   .panel-body
     .form-group.row#udak-number
-      = form.label :udak_project_number, t(:protocols)[:studies][:optional_information][:udak_project_number], class: 'col-lg-2 control-label'
+      = form.label :udak_project_number, t(:protocols)[:studies][:financial_information][:udak_project_number], class: 'col-lg-2 control-label'
       .col-lg-10
         = form.text_field :udak_project_number, class: 'form-control'
 
     - if Setting.find_by_key("use_indirect_cost").value
       .form-group.row
-        = form.label :indirect_cost_rate, t(:protocols)[:studies][:optional_information][:rate], class: 'col-lg-2 control-label'
+        = form.label :indirect_cost_rate, t(:protocols)[:studies][:financial_information][:rate], class: 'col-lg-2 control-label'
         .col-lg-10
           = form.text_field :indirect_cost_rate, class: 'form-control'
 
     .form-group.row.funding_status_dependent.pending_funding{ display_if(protocol.funding_status, "pending_funding") }
-      = form.label :funding_rfa, t(:protocols)[:studies][:optional_information][:rfa], class: 'col-lg-2 control-label'
+      = form.label :funding_rfa, t(:protocols)[:studies][:financial_information][:rfa], class: 'col-lg-2 control-label'
       .col-lg-10
         = form.text_field :funding_rfa, class: 'form-control'
 
     .form-group.row.funding_status_dependent.pending_funding{ display_if(protocol.funding_status, "pending_funding") }
-      = form.label :potential_funding_start_date, t(:protocols)[:studies][:optional_information][:potential_start_date], class: 'col-lg-2 control-label'
+      = form.label :potential_funding_start_date, t(:protocols)[:studies][:financial_information][:potential_start_date], class: 'col-lg-2 control-label'
       .col-lg-10
         = form.text_field :potential_funding_start_date, class: 'datetimepicker form-control', value: (protocol.potential_funding_start_date.strftime('%-m/%d/%Y') rescue nil)
 
     .form-group.row.funding_status_dependent.funded{ display_if(protocol.funding_status, "funded") }
-      = form.label :funding_start_date, t(:protocols)[:studies][:optional_information][:start_date], class: 'col-lg-2 control-label'
+      = form.label :funding_start_date, t(:protocols)[:studies][:financial_information][:start_date], class: 'col-lg-2 control-label'
       .col-lg-10
         = form.text_field :funding_start_date, class: 'datetimepicker form-control', value: (protocol.funding_start_date.strftime('%-m/%d/%Y') rescue nil)

app/views/protocols/form/_study_fields.html.haml

@@ -18,7 +18,7 @@
 -# 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.
 = render 'protocols/form/study_form_sections/study_information', protocol: protocol, form: form, rmid_server_down: rmid_server_down
-= render 'protocols/form/study_form_sections/optional_information', protocol: protocol, form: form
+= render 'protocols/form/study_form_sections/financial_information', protocol: protocol, form: form
 = render 'protocols/form/study_form_sections/research_involving', protocol: protocol, form: form
 = render 'protocols/form/study_form_sections/study_type', protocol: protocol, form: form
 = render 'protocols/form/study_form_sections/impact_areas', protocol: protocol, form: form

app/views/protocols/form/study_form_sections/_optional_information.html.haml → app/views/protocols/form/study_form_sections/_financial_information.html.haml

@@ -21,31 +21,31 @@
 .panel.panel-default
   .panel-heading
     %h4.panel-title
-      = t(:protocols)[:studies][:optional_information][:header]
+      = t(:protocols)[:studies][:financial_information][:header]
     .sub_text
-      = t(:protocols)[:studies][:optional_information][:subtext]
+      = t(:protocols)[:studies][:financial_information][:subtext]
   .panel-body
     .form-group.row#udak-number
-      = form.label :udak_project_number, t(:protocols)[:studies][:optional_information][:udak_project_number], class: 'col-lg-2 control-label'
+      = form.label :udak_project_number, t(:protocols)[:studies][:financial_information][:udak_project_number], class: 'col-lg-2 control-label'
       .col-lg-10
         = form.text_field :udak_project_number, class: 'form-control'
 
     - if Setting.find_by_key("use_indirect_cost").value
       .form-group.row
-        = form.label :indirect_cost_rate, t(:protocols)[:studies][:optional_information][:rate], class: 'col-lg-2 control-label'
+        = form.label :indirect_cost_rate, t(:protocols)[:studies][:financial_information][:rate], class: 'col-lg-2 control-label'
         .col-lg-10
           = form.text_field :indirect_cost_rate, class: 'form-control'
 
     .form-group.row.funding_status_dependent.pending_funding{ display_if(protocol.funding_status, "pending_funding") }
-      = form.label :funding_rfa, t(:protocols)[:studies][:optional_information][:rfa], class: 'col-lg-2 control-label'
+      = form.label :funding_rfa, t(:protocols)[:studies][:financial_information][:rfa], class: 'col-lg-2 control-label'
       .col-lg-10
         = form.text_field :funding_rfa, class: 'form-control'
 
     .form-group.row.funding_status_dependent.pending_funding{ display_if(protocol.funding_status, "pending_funding") }
-      = form.label :potential_funding_start_date, t(:protocols)[:studies][:optional_information][:potential_start_date], class: 'col-lg-2 control-label'
+      = form.label :potential_funding_start_date, t(:protocols)[:studies][:financial_information][:potential_start_date], class: 'col-lg-2 control-label'
       .col-lg-10
         = form.text_field :potential_funding_start_date, class: 'datetimepicker form-control', value: (protocol.potential_funding_start_date.strftime('%-m/%d/%Y') rescue nil)
     .form-group.row.funding_status_dependent.funded{ display_if(protocol.funding_status, "funded") }
-      = form.label :funding_start_date, t(:protocols)[:studies][:optional_information][:start_date], class: 'col-lg-2 control-label'
+      = form.label :funding_start_date, t(:protocols)[:studies][:financial_information][:start_date], class: 'col-lg-2 control-label'
       .col-lg-10
         = form.text_field :funding_start_date, class: 'datetimepicker form-control', value: (protocol.funding_start_date.strftime('%-m/%d/%Y') rescue nil)

app/views/protocols/view_details/_optional_information.html.haml → app/views/protocols/view_details/_financial_information.html.haml

@@ -21,26 +21,26 @@
   .panel-heading
     %h5
       %strong
-        = t(:protocols)[:studies][:optional_information][:header]
+        = t(:protocols)[:studies][:financial_information][:header]
   %table.table
     %tbody
       %tr.row
         %td
           %label.col-lg-4
-            = t(:protocols)[:studies][:optional_information][:udak_project_number]
+            = t(:protocols)[:studies][:financial_information][:udak_project_number]
           .col-lg-8
             = protocol.udak_project_number
       - if Setting.find_by_key("use_indirect_cost").value
         %tr.row
           %td
             %label.col-lg-4
-              = t(:protocols)[:studies][:optional_information][:rate]
+              = t(:protocols)[:studies][:financial_information][:rate]
             .col-lg-8
               = protocol.indirect_cost_rate
       %tr.row
         %td
           %label.col-lg-4
-            = t(:protocols)[:studies][:optional_information][:rfa]
+            = t(:protocols)[:studies][:financial_information][:rfa]
           .col-lg-8
             = protocol.funding_rfa
 
@@ -49,11 +49,11 @@
         %td
           - if protocol.funding_status == "funded" 
             %label.col-lg-4
-              = t(:protocols)[:studies][:optional_information][:start_date]
+              = t(:protocols)[:studies][:financial_information][:start_date]
             .col-lg-8
               = format_date(protocol.funding_start_date)
           - else
             %label.col-lg-4
-              = t(:protocols)[:studies][:optional_information][:potential_start_date]
+              = t(:protocols)[:studies][:financial_information][:potential_start_date]
             .col-lg-8
               = format_date(protocol.potential_funding_start_date)

app/views/protocols/view_details/_study_fields.html.haml

@@ -20,7 +20,7 @@
 = stylesheet_link_tag 'view_details'
 
 = render 'protocols/view_details/study_information', protocol: protocol
-= render 'protocols/view_details/optional_information', protocol: protocol
+= render 'protocols/view_details/financial_information', protocol: protocol
 = render 'protocols/view_details/research_involving', protocol: protocol
 = render 'protocols/view_details/study_type', protocol: protocol
 = render 'protocols/view_details/impact_areas', protocol: protocol

config/locales/en.yml

@@ -464,8 +464,8 @@ en:
         push_to_epic: "Publish Study in Epic:"
         study_type_questions: "Study Type Questions:"
         note: "Note: "
-      optional_information:
-        header: "Optional Information"
+      financial_information:
+        header: "Financial Information"
         subtext: "Used for reporting purposes and saved for your future use"
         udak_project_number: "Financial Account (UDAK #):"
         rate: "Indirect Cost Rate:"

spec/views/proper/protocols/view_details.html.haml_spec.rb

@@ -67,7 +67,7 @@
       expect(response).to render_template("protocols/_view_details.html.haml")
       expect(response).to render_template(partial: "protocols/view_details/_study_fields")
       expect(response).to render_template(partial: "protocols/view_details/_study_information")
-      expect(response).to render_template(partial: "protocols/view_details/_optional_information")
+      expect(response).to render_template(partial: "protocols/view_details/_financial_information")
       expect(response).to render_template(partial: "protocols/view_details/_research_involving")
       expect(response).to render_template(partial: "protocols/view_details/_study_type")
       expect(response).to render_template(partial: "protocols/view_details/_impact_areas")