up

Dockerfile

@@ -15,10 +15,10 @@ RUN install2.r --error \
 
 # Install GitHub packages
 RUN installGithub.r \
-    egenn/rtemis \
-    egenn/rtemisbio \
     rstudio/bslib \
-    rstudio/httpuv
+    rstudio/httpuv \
+    egenn/rtemis \
+    egenn/rtemisbio 
 
 COPY . .
 

globals.R

@@ -64,6 +64,10 @@ hilite <- function(x) {
   paste0("<span style='color: #72CDF4;font-weight: bold;'>", x, "</span>")
 }
 
+nannot <- function(n) {
+  ngettext(n, "annotation", "annotations")
+}
+
 #' Summarize a3 object in HTML
 #'
 #' @param x a3 object
@@ -71,23 +75,28 @@ hilite <- function(x) {
 #' @return HTML string
 #' @author EDG
 summarize_a3 <- function(x) {
+  n_site <- length(x$Annotations$Site)
+  n_region <- length(x$Annotations$Region)
+  n_ptm <- length(x$Annotations$PTM)
+  n_cleavage <- length(x$Annotations$Cleavage_site)
+  n_variant <- length(x$Annotations$Variant)
   htmltools::HTML(
     paste0(
+      if (!is.null(x$Description)) paste0("Description: ", hilite(x$Description), "<br>"),
       if (!is.null(x$UniprotID)) paste0("Uniprot ID: ", hilite(x$UniprotID), "<br>"),
       paste0("Sequence length: ", hilite(length(x$Sequence)), "<br>"),
       "<ul>",
-      if (length(x$Annotations$Site) > 0) paste("<li>", hilite(length(x$Annotations$Site)), "site annotations<br>"),
-      if (length(x$Annotations$Region) > 0) paste("<li>", hilite(length(x$Annotations$Region)), "region annotations<br>"),
-      if (length(x$Annotations$PTM) > 0) paste("<li>", hilite(length(x$Annotations$PTM)), "PTM annotations<br>"),
-      if (length(x$Annotations$Cleavage_site) > 0) paste("<li>", hilite(length(x$Annotations$Cleavage_site)), " cleavage site annotations<br>"),
-      if (length(x$Annotations$Variant) > 0) paste("<li>", hilite(length(x$Annotations$Variant)), "variant annotations<br>"),
+      if (n_site > 0) paste("<li>", hilite(n_site), "site", nannot(n_site), "<br>"),
+      if (n_region > 0) paste("<li>", hilite(n_region), "region", nannot(n_region), "<br>"),
+      if (n_ptm > 0) paste("<li>", hilite(n_ptm), "PTM", nannot(n_ptm), "<br>"),
+      if (n_cleavage > 0) paste("<li>", hilite(n_cleavage), " cleavage site", nannot(n_cleavage), "<br>"),
+      if (n_variant > 0) paste("<li>", hilite(n_variant), "variant", nannot(n_variant), "<br>"),
       "</ul>",
       if (!is.null(x$Reference)) a("Reference", href = x$Reference, target = "_blank")
     )
   )
 } # seqvizlive::summarize_a3
 
-
 # Create list using custom bullet
 rhelplist <- function(x, bullet = bsicons::bs_icon("arrow-right-short")) {
   htmltools::HTML(