fix: selecting only name, definition and unit columns

SticsRPacks · Oct 12, 2020 · ca206ba · ca206ba
1 parent 61292d4
commit ca206ba
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/R/find_stics_names.R b/R/find_stics_names.R
@@ -179,6 +179,9 @@ find_stics_names <- function(viewer = "pane") {
 
       if (nrow(l)) l <- l[,1:3]
 
+      cat("writing table file ...")
+      write.csv(l, file="/tmp/test.csv", sep = ";")
+
       return(l)
     })
 
@@ -209,7 +212,7 @@ find_stics_names <- function(viewer = "pane") {
       # )
 
 
-      output$table <- DT::renderDataTable(DT::datatable(names_table(),
+      output$table <- DT::renderDataTable(DT::datatable(get_usefull_cols(names_table(), 1:3),
                                                         options = list(searching = FALSE),
                                                         caption = "Click on a line to select or unselect it"),
                                           server = TRUE)
@@ -229,7 +232,7 @@ find_stics_names <- function(viewer = "pane") {
       # )
 
 
-      output$table <- DT::renderDataTable(DT::datatable(names_table(),
+      output$table <- DT::renderDataTable(DT::datatable(get_usefull_cols(names_table(), 1:3),
                                                         options = list(searching = FALSE),
                                                         caption = "Click on a line to select or unselect it"),
                                           server = TRUE)
@@ -250,7 +253,7 @@ find_stics_names <- function(viewer = "pane") {
       # caption.width = getOption("xtable.caption.width", NULL)
       # )
 
-      output$table <- DT::renderDataTable(DT::datatable(names_table(),
+      output$table <- DT::renderDataTable(DT::datatable(get_usefull_cols(names_table(), 1:3),
                                                         options = list(searching = FALSE),
                                                         caption = "Click on a line to select or unselect it"),
                                           server = TRUE)
@@ -271,7 +274,7 @@ find_stics_names <- function(viewer = "pane") {
       # caption.width = getOption("xtable.caption.width", NULL)
       # )
 
-      output$table <- DT::renderDataTable(DT::datatable(names_table(),
+      output$table <- DT::renderDataTable(DT::datatable(get_usefull_cols(names_table(), 1:3),
                                                         options = list(searching = FALSE),
                                                         caption = "Click on a line to select or unselect it"),
                                           server = TRUE)
@@ -292,9 +295,8 @@ find_stics_names <- function(viewer = "pane") {
       # caption.width = getOption("xtable.caption.width", NULL)
       # )
 
-      dt_names <- names_table()
 
-      output$table <- DT::renderDataTable(DT::datatable(dt_names,
+      output$table <- DT::renderDataTable(DT::datatable(get_usefull_cols(names_table(), 1:3),
                                                         options = list(searching = FALSE),
                                                         caption = "Click on a line to select or unselect it"),
                                           server = TRUE)

diff --git a/R/insert_stics_name.R b/R/insert_stics_name.R
@@ -94,6 +94,16 @@ get_names_list <- function(type = "par", stics_version = "last") {
 }
 
 
+get_usefull_cols <- function(df, ids) {
+
+  if (!all(dim(df))) return(df)
+
+  real_ids <- intersect(1:ncol(df), ids)
+
+  if (!length(real_ids)) return(data.frame())
+
+  return(subset(df,select = real_ids))
+}
 
 format_name <- function(name, type = "par", kind = NULL, inline = FALSE, latex = FALSE ) {