diff --git a/app/frontend/stylesheets/all/sequencescape.scss b/app/frontend/stylesheets/all/sequencescape.scss index f385b3be1c..9cae7195e9 100644 --- a/app/frontend/stylesheets/all/sequencescape.scss +++ b/app/frontend/stylesheets/all/sequencescape.scss @@ -823,6 +823,15 @@ td.qc_pass { background-color: #ff8; } +#template_form_body table { + @extend .mb-2; +} + +#template_form_body td { + vertical-align: top; + line-height: 1.1em; +} + #plate td.selected { background-color: #72cf3f; } diff --git a/app/helpers/samples_helper.rb b/app/helpers/samples_helper.rb index 9cb4cfbbcd..9e75a388a1 100644 --- a/app/helpers/samples_helper.rb +++ b/app/helpers/samples_helper.rb @@ -36,7 +36,9 @@ def should_be_accessioned_warning(sample) def no_accessionable_studies_warning(sample) accession_warning( 'Sample cannot be accessioned:', - sample.studies.map { |study| "Study '#{link(study)}' is missing an accession number" } + sample.studies.map do |study| # Add list item for each study + "Study '#{link(study)}' is not accessionable - #{accessioning_checklist_link(study)}" + end ) end @@ -65,4 +67,8 @@ def accession_warning(message, items) def link(study) link_to(ERB::Util.html_escape(study.name), study_path(study)) end + + def accessioning_checklist_link(study) + link_to 'view accessioning checklist', properties_study_path(study, anchor: 'study-accessioning-checklist') + end end diff --git a/app/views/studies/properties.html.erb b/app/views/studies/properties.html.erb index 2dabc1e796..5f09d52620 100644 --- a/app/views/studies/properties.html.erb +++ b/app/views/studies/properties.html.erb @@ -4,31 +4,40 @@ <% if can? :edit, @study %> <% add :menu, "Edit" => edit_study_path(@study) -%> <% end %> +<% if can? :administer, @study %> + <% add :menu, "Manage" => url_for(controller: "admin/studies", action: "show", id: @study.id) -%> +<% end %> <% add :back_menu, I18n.t("navigation.menu.back_to_study") => study_path(@study) -%> - - - +
+
+

Study Specification

- - - - - - - - - - - - - - - -
Name:<%=h @study.name %>
Created at:<%=h @study.created_at.to_formatted_s(:day_full_with_time) %>
Study reference genome:<%= @study.study_metadata.reference_genome&.name %>
+
+ + + + + + + + + + + + + + + +
Name:<%=h @study.name %>
Created at:<%=h @study.created_at.to_formatted_s(:day_full_with_time) %>
Study reference genome:<%= @study.study_metadata.reference_genome&.name %>
+ <%= render partial: 'shared/metadata/show/study', locals: { study: @study } %> +
+
+
-
- <%= render partial: 'shared/metadata/show/study', locals: { study: @study } %> +
+
Study Accessioning Checklist
+
+ <%= render partial: 'studies/information/study_accession_checklist' %> +