Skip to content

Commit

Permalink
If there is only one Slide ID, don't offer to remove it as a prefix.
Browse files Browse the repository at this point in the history
Things will break if you do #46
  • Loading branch information
AB-Kent committed Jun 14, 2021
1 parent 3e1d3b5 commit 9f27903
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: phenoptrReports
Title: Create reports using Phenoptics data
Version: 0.2.12.9000
Version: 0.2.13
Date: 2021-06-10
Authors@R: c(
person("Kent S", "Johnson", role = c("aut", "cre"),
Expand Down
7 changes: 6 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
# phenoptrReports 0.2.13
**2021-06-14**

Analysis addin:
- Fix problems with chart generation #46

# phenoptrReports 0.2.12
**2021-06-10**

- Fix a critical bug in the consolidate and summarize addin
- Fix problems with chart generation in the analyze addin #46

# phenoptrReports 0.2.11
**2021-06-01**
Expand Down
3 changes: 2 additions & 1 deletion inst/analysis_app/server.R
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,9 @@ shinyServer(function(input, output, server) {

# Slide ID prefix and aggregation choices
if ('Slide ID' %in% names(d)) {
unique_ids = unique(d$`Slide ID`)
the_data$slide_id_prefix = slide_id_prefix =
find_common_prefix(unique(d$`Slide ID`))
ifelse(length(unique_ids) > 1, find_common_prefix(unique_ids), '')
by_choices = c('Slide ID', phenoptr::field_column(d))
} else {
# No Slide ID column
Expand Down

0 comments on commit 9f27903

Please sign in to comment.