Skip to content

Commit

Permalink
856 - niftany changes
Browse files Browse the repository at this point in the history
  • Loading branch information
jlandiseigsti committed Oct 30, 2024
1 parent aff63ba commit 8d36219
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 48 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,3 @@
<% end %>
</div>
</div>

Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
<strong>Federal Funding Statement</strong>
<br>
<%= render partial: 'shared/federal_funding_form', locals: {f: f} %>
</div>
</div>
23 changes: 11 additions & 12 deletions app/views/approver/_federal_funding_language_approver.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,39 @@
<strong>Federal Funding Statement</strong>
<p><%= I18n.t("#{current_partner.id}.federal_funding_admin.intro_1").html_safe %></p>
<%= f.label :federal_funding_used, I18n.t("#{current_partner.id}.federal_funding_admin.question_1").html_safe %><br>
<%= f.label :federal_funding_used, 'Yes'%>
<%= f.label :federal_funding_used, 'Yes' %>
<%= f.radio_button :federal_funding_used, true %><br>
<div class="ml-5 collapse hide" id="fed_funding_confirmation_approver" aria-live="polite">
<% if @submission.federal_funding == false %>
<div class='alert alert-danger'>
<p><%= I18n.t("#{current_partner.id}.federal_funding_admin.error_message_2").html_safe%></p>
<p><%= I18n.t("#{current_partner.id}.federal_funding_admin.error_message_2").html_safe %></p>
</div>
<% else %>
<div class='alert alert-info'>
<p><%= I18n.t("#{current_partner.id}.federal_funding_admin.confirmation").html_safe%></p>
<%= f.label :federal_funding_confirmation, 'Yes'%>
<p><%= I18n.t("#{current_partner.id}.federal_funding_admin.confirmation").html_safe %></p>
<%= f.label :federal_funding_confirmation, 'Yes' %>
<%= f.radio_button :federal_funding_confirmation, true %><br>
<%= f.label :federal_funding_confirmation, 'No'%>
<%= f.label :federal_funding_confirmation, 'No' %>
<%= f.radio_button :federal_funding_confirmation, false %>
</div>
<p id="fed_funding_error_approver" class="collapse hide alert alert-danger"><%= I18n.t("#{current_partner.id}.federal_funding_admin.error_message_2").html_safe%></p>
<p id="fed_funding_error_approver" class="collapse hide alert alert-danger"><%= I18n.t("#{current_partner.id}.federal_funding_admin.error_message_2").html_safe %></p>
<% end %>
</div>
<noscript>
<div class="ml-5">
<% if @submission.federal_funding == false %>
<p><%= I18n.t("#{current_partner.id}.federal_funding_admin.error_message_1").html_safe%></p>
<p><%= I18n.t("#{current_partner.id}.federal_funding_admin.error_message_1").html_safe %></p>
<% else %>
<div>
<p><%= I18n.t("#{current_partner.id}.federal_funding_admin.confirmation").html_safe%></p>
<%= f.label :federal_funding_confirmation, 'Yes'%>
<p><%= I18n.t("#{current_partner.id}.federal_funding_admin.confirmation").html_safe %></p>
<%= f.label :federal_funding_confirmation, 'Yes' %>
<%= f.radio_button :federal_funding_confirmation, true %><br>
<%= f.label :federal_funding_confirmation, 'No'%>
<%= f.label :federal_funding_confirmation, 'No' %>
<%= f.radio_button :federal_funding_confirmation, false %>
</div>
<% end %>
</div>
</noscript>
<%= f.label :federal_funding_used, 'No'%>
<%= f.label :federal_funding_used, 'No' %>
<%= f.radio_button :federal_funding_used, false %>
</div>

6 changes: 3 additions & 3 deletions app/views/approver/_review_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div id="file_links">
<%= raw @most_relevant_file_links %>
</div>
<br/>
<br>
<% if current_partner.graduate? && @committee_member == @submission.advisor %>
<%= f.label :federal_funding_used, 'Were Federal Funds utilized for this submission?'.html_safe %>
<div class="alert alert-info">
Expand All @@ -24,7 +24,7 @@
wrapper: :vertical_radio_and_checkboxes,
label: false %>
<% end %>
<br/>
<br>
<% end %>
<strong>Approval</strong>
<p>I accept and approve <%= @author.full_name %>'s <%= @submission.degree.degree_type.name.to_s.downcase %> and agree to distribution as indicated by the access level.</p>
Expand All @@ -35,7 +35,7 @@
label: false %>
</div>
<%= f.input :notes, :label => "Notes for Student (required only if rejecting)", :input_html => { :class => 'notes_select' } %>

<div class="form-group actions col-xs-4">
<%= f.button :submit, "Submit Review", class: 'btn-success' %>
<% if @review_complete %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
<li><%= I18n.t("#{current_partner.id}.federal_funding_author.intro_4_3").html_safe %></li>
</ol>
<p><%= I18n.t("#{current_partner.id}.federal_funding_author.intro_5").html_safe %></p>
<p><%= I18n.t("#{current_partner.id}.federal_funding_author.intro_6").html_safe %></p>
<p><%= I18n.t("#{current_partner.id}.federal_funding_author.intro_6").html_safe %></p>
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
<br>
<%= render partial: 'shared/federal_funding_form', locals: {f: f} %>
</div>

18 changes: 9 additions & 9 deletions app/views/author/submissions/acknowledge.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,34 @@
<h1><%= I18n.t("graduate.submission.acknowledge.title") %></h1>
<div class="col-xs-12">
<p class="mt-3"><%= I18n.t("graduate.submission.acknowledge.description") %> </p>
<%= simple_form_for @ack, url: author_submission_acknowledge_update_path, method: :patch do |form| %>
<div class="form-group actions col-xs-6">
<%= simple_form_for @ack, url: author_submission_acknowledge_update_path, method: :patch do |form| %>
<div class="form-group actions col-xs-6">
<%= form.label :sig_1, I18n.t("graduate.submission.acknowledge.point1", degree_type: @degree_type, thesis_guide: I18n.t("graduate.partner.thesis_guide")).html_safe %>
<%= form.input :sig_1, label: false, placeholder: I18n.t("graduate.submission.acknowledge.initial").html_safe %>
<%= form.label :sig_2, I18n.t("graduate.submission.acknowledge.point2", degree_type: @degree_type.capitalize) %>
<%= form.label :sig_2, I18n.t("graduate.submission.acknowledge.point2", degree_type: @degree_type.capitalize) %>
<%= form.input :sig_2, label: false, placeholder: I18n.t("graduate.submission.acknowledge.initial") %>
<%= form.label :sig_3, I18n.t("graduate.submission.acknowledge.point3", degree_type: @degree_type) %>
<%= form.input :sig_3, label: false, placeholder: I18n.t("graduate.submission.acknowledge.initial") %>
<%= form.label :sig_4, I18n.t("graduate.submission.acknowledge.point4") %>
<%= form.label :sig_4, I18n.t("graduate.submission.acknowledge.point4") %>
<%= form.input :sig_4, label: false, placeholder: I18n.t("graduate.submission.acknowledge.initial") %>
<%= form.label :sig_5, I18n.t("graduate.submission.acknowledge.point5", degree_type: @degree_type) %>
<%= form.label :sig_5, I18n.t("graduate.submission.acknowledge.point5", degree_type: @degree_type) %>
<%= form.input :sig_5, label: false, placeholder: I18n.t("graduate.submission.acknowledge.initial") %>
<%= form.label :sig_6, I18n.t("graduate.submission.acknowledge.point6") %>
<%= form.label :sig_6, I18n.t("graduate.submission.acknowledge.point6") %>
<%= form.input :sig_6, label: false, placeholder: I18n.t("graduate.submission.acknowledge.initial") %>
<%= form.label :sig_7, I18n.t("graduate.submission.acknowledge.point7") %>
<%= form.input :sig_7, label: false, placeholder: I18n.t("graduate.submission.acknowledge.initial") %>
<% if @submission.degree_type.slug == 'master_thesis' %>
<%= form.label :sig_8, I18n.t("graduate.submission.acknowledge.point8_masters") %>
<%= I18n.t("graduate.submission.acknowledge.confidential_hold", degree_type: @degree_type) if @submission.author.confidential_hold?%>
<%= I18n.t("graduate.submission.acknowledge.confidential_hold", degree_type: @degree_type) if @submission.author.confidential_hold? %>
<%= form.input :sig_8, label: false, placeholder: I18n.t("graduate.submission.acknowledge.initial") %>
<% else %>
<%= form.label :sig_8, I18n.t("graduate.submission.acknowledge.point8_dissertation") %>
<%= I18n.t("graduate.submission.acknowledge.confidential_hold", degree_type: @degree_type) if @submission.author.confidential_hold?%>
<%= I18n.t("graduate.submission.acknowledge.confidential_hold", degree_type: @degree_type) if @submission.author.confidential_hold? %>
<%= form.input :sig_8, label: false, placeholder: I18n.t("graduate.submission.acknowledge.initial") %>
<% end %>
<%= form.button :submit, class: "btn-primary", value: "Submit" %>
<%= link_to "Cancel", author_root_path, class: 'btn btn-light' %>
</div>
<% end %>
</div>
</div>
</div>
4 changes: 2 additions & 2 deletions app/views/author/submissions/edit_final_submission.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
<div id="admin-feedback-files" class="col-sm-12">
<% @submission.admin_feedback_files.each do |file| %>
<% if file.feedback_type == 'final-submission' %>
<div id="admin-feedback-file-<%=file.id%>" class = "pl-2 pb-2">
<div id="admin-feedback-file-<%= file.id %>" class="pl-2 pb-2">
<%= link_to file.asset_identifier, "/author/files/#{file.link_identifier}/#{file.id}", class: 'file-link', target: '_blank' %>
</div>
<% end %>
<% end %>
<% end %>
<% end %>
<%= render partial: 'title_and_checkbox', locals: {f: f} %>
<%= render partial: 'semester_year', locals: {f: f} %>
Expand Down
8 changes: 4 additions & 4 deletions app/views/author/submissions/edit_format_review.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@
</div>
</div>
<% end %>
<% if @submission.format_review_feedback_files? %>
<div id="admin-feedback-files" class="col-sm-12">
<% @submission.admin_feedback_files.each do |file| %>
<% if file.feedback_type == 'format-review' %>
<div id="admin-feedback-file-<%=file.id%>" class = "pl-2 pb-2">
<div id="admin-feedback-file-<%= file.id %>" class="pl-2 pb-2">
<%= link_to file.asset_identifier, "/author/files/#{file.link_identifier}/#{file.id}", class: 'file-link', target: '_blank' %>
</div>
<% end %>
<% end %>
</div>
<% end %>
</div>
<% end %>
<%= render partial: '/author/submissions/title_and_checkbox', locals: {f: f} %>
<%= render partial: '/author/submissions/semester_year', locals: {f: f} %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/author/submissions/format_review.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<% end %>
<% @submission.admin_feedback_files.each do |file| %>
<div id="admin-feedback-file-<%=file.id%>" class = "pl-2 pb-2">
<div id="admin-feedback-file-<%= file.id %>" class="pl-2 pb-2">
<%= link_to file.asset_identifier, "/author/files/#{file.link_identifier}/#{file.id}", class: 'file-link', target: '_blank' %>
</div>
<% end %>
Expand Down
25 changes: 12 additions & 13 deletions app/views/shared/_federal_funding_form.html.erb
Original file line number Diff line number Diff line change
@@ -1,40 +1,39 @@
<div tabindex="0">
<%= f.simple_fields_for :federal_funding_details, @submission.federal_funding_details do |g| %>
<%= g.label :training_support_funding, I18n.t("#{current_partner.id}.federal_funding_author.question_1").html_safe %>
<%= g.label :training_support_funding, 'Yes'%>
<%= g.label :training_support_funding, 'Yes' %>
<%= g.radio_button :training_support_funding, true %><br>

<div id="fed_funding_confirmation_author_1" class="ml-5 collapse hide" aria-live="polite">
<div class="alert alert-info">
<p><%= I18n.t("#{current_partner.id}.federal_funding_author.confirmation").html_safe%></p>
<%= g.label :training_support_acknowledged, 'Yes'%>
<p><%= I18n.t("#{current_partner.id}.federal_funding_author.confirmation").html_safe %></p>
<%= g.label :training_support_acknowledged, 'Yes' %>
<%= g.radio_button :training_support_acknowledged, true %><br>
<%= g.label :training_support_acknowledged, 'No'%>
<%= g.label :training_support_acknowledged, 'No' %>
<%= g.radio_button :training_support_acknowledged, false %>
</div>
<p id="fed_funding_error_message_author_1" class="collapse hide alert alert-danger"><%= I18n.t("#{current_partner.id}.federal_funding_author.error_message").html_safe%></p>
<p id="fed_funding_error_message_author_1" class="collapse hide alert alert-danger"><%= I18n.t("#{current_partner.id}.federal_funding_author.error_message").html_safe %></p>
</div>

<%= g.label :training_support_funding, 'No'%>
<%= g.label :training_support_funding, 'No' %>
<%= g.radio_button :training_support_funding, false %>
<br>
<%= g.label :other_funding, I18n.t("#{current_partner.id}.federal_funding_author.question_2").html_safe %><br>
<%= g.label :other_funding, 'Yes'%>
<%= g.label :other_funding, 'Yes' %>
<%= g.radio_button :other_funding, true %><br>
<div id="fed_funding_confirmation_author_2" class="ml-5 collapse hide" aria-live="polite">
<div class="alert alert-info">
<p><%= I18n.t("#{current_partner.id}.federal_funding_author.confirmation").html_safe %></p>
<%= g.label :other_funding_acknowledged, 'Yes'%>
<%= g.label :other_funding_acknowledged, 'Yes' %>
<%= g.radio_button :other_funding_acknowledged, true %><br>
<%= g.label :other_funding_acknowledged, 'No'%>
<%= g.label :other_funding_acknowledged, 'No' %>
<%= g.radio_button :other_funding_acknowledged, false %>
</div>
<p id="fed_funding_error_message_author_2" class="collapse hide alert alert-danger"><%= I18n.t("#{current_partner.id}.federal_funding_author.error_message").html_safe%></p>
<p id="fed_funding_error_message_author_2" class="collapse hide alert alert-danger"><%= I18n.t("#{current_partner.id}.federal_funding_author.error_message").html_safe %></p>
</div>

<%= g.label :other_funding, 'No'%>
<%= g.label :other_funding, 'No' %>
<%= g.radio_button :other_funding, false %>
<% end %>
</div>

0 comments on commit 8d36219

Please sign in to comment.