Improvements for spreadsheet download#2535
Draft
kdp-cloud wants to merge 13 commits into
Draft
Conversation
When an optional CV list attribute is added to an existing sample type, the value is nil and raises an error when executing the compact_blank method
kdp-cloud
force-pushed
the
2246-create-inputs-tab-in-spreadsheet
branch
from
7ce0633 to
87c93bf
Compare
Comment on lines
+82
to
+92
| col_ref = Axlsx.cell_r(col_nr, 1).gsub(/\d+/, '') | ||
| dv_range = "#{col_ref}2:#{col_ref}100000" | ||
| hide_drop_down = !requires_data_validation?(attribute) || sa_terms_size.zero? || false | ||
| sheet.add_data_validation(dv_range, | ||
| type: :list, | ||
| formula1: "'Controlled Vocabularies'!$#{col_ref}$2:$#{col_ref}$#{sa_terms_size + 1}", | ||
| # Field that do not require data validation should not have dropdown | ||
| hideDropDown: hide_drop_down, | ||
| # If the attribute requires data validation, show Error message | ||
| # If attribute does not allow free text for CVs, Error message | ||
| showErrorMessage: !attribute.allow_cv_free_text && requires_data_validation?(attribute), |
Comment on lines
+56
to
+62
| elsif attribute.sample_attribute_type.seek_sample_multi? | ||
| unless value.blank? | ||
| non_blank_values = value.map do |v| | ||
| v unless v[:id].blank? | ||
| end.compact | ||
| non_blank_values unless non_blank_values.blank? | ||
| end |
Comment on lines
+115
to
118
| def get_values_for_strains | ||
| strains = Strain.authorized_for(:view) | ||
| strains.map { |strain| { id: strain.id, type: 'Strain', title: strain.title }.to_json } | ||
| end |
Comment on lines
+21
to
23
| <button id=<%= "remove-#{new_sample_id}" %> class="btn glyphicon glyphicon-trash danger" | ||
| style="background-color:#d9534f;color:white;" | ||
| onclick=<%= "removeSample('new-sample-#{new_sample_id}')" %>></button> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.