Merge branch 'master' of github.com:Swechhya/excelR into changes-for-…

…0.4-release
ericnewkirk · Mar 9, 2020 · cd9d272 · cd9d272
2 parents 4301a72 + 6ad8c3c
commit cd9d272
Show file tree

Hide file tree

Showing 15 changed files with 332 additions and 202 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -5,6 +5,7 @@ export(excelTable)
 export(excel_to_R)
 export(getComments)
 export(get_selected_data)
+export(get_selected_data_boundary)
 export(renderExcel)
 export(setComments)
 import(htmlwidgets)

diff --git a/R/excel_to_R.R b/R/excel_to_R.R
@@ -20,7 +20,12 @@
 #'}
 
 excel_to_R <- function(excelObj) {
-   if (!is.null(excelObj) && !excelObj$forSelectedVals ) {
+   if (!is.null(excelObj)) {
+      if( excelObj$forSelectedVals )
+      {
+         excelObj = excelObj$fullData
+      }
+
       data <- excelObj$data
       colHeaders <- excelObj$colHeaders
       colType <- excelObj$colType

diff --git a/R/get_selected_data.R b/R/get_selected_data.R
@@ -1,6 +1,6 @@
 #' Get selected cells from excel table
 #'
-#' This function is used to the data selected in excel table
+#' This function is used to get the data selected in excel table
 #' @export
 #' @param excelObj the json data retuned from excel table
 #' @examples
@@ -11,7 +11,7 @@
 #'    ui = fluidPage(excelOutput("table")),
 #'    server = function(input, output, session) {
 #'      output$table <-
-#'        renderExcel(excelTable(data = head(iris)))
+#'        renderExcel(excelTable(data = head(iris), getSelectedData = TRUE))
 #'      observeEvent(input$table,{
 #'        print(get_selected_data(input$table))
 #'      })
@@ -21,7 +21,7 @@
 
 get_selected_data<- function(excelObj) {
    if (!is.null(excelObj) && excelObj$forSelectedVals) {
-      data <- excelObj$data
+      data <- excelObj$selectedData
       dataOutput <- do.call(rbind.data.frame, data)
       rownames(dataOutput) <- NULL
       colnames(dataOutput) <- NULL
@@ -30,3 +30,31 @@ get_selected_data<- function(excelObj) {
    }
 
 }
+
+#' Get selected cells boundary from excel table
+#'
+#' This function is used to the boundary points of data selected in excel table
+#' @export
+#' @param excelObj the json data retuned from excel table
+#' @examples
+#'if(interactive()){
+#'  library(shiny)
+#'  library(excelR)
+#'  shinyApp(
+#'    ui = fluidPage(excelOutput("table")),
+#'    server = function(input, output, session) {
+#'      output$table <-
+#'        renderExcel(excelTable(data = head(iris), getSelectedData = TRUE))
+#'      observeEvent(input$table,{
+#'        print(get_selected_data_boundary(input$table))
+#'      })
+#'    }
+#'  )
+#'}
+get_selected_data_boundary<- function(excelObj) {
+   if (!is.null(excelObj) && excelObj$forSelectedVals) {
+      boundaryIndex <- excelObj$selectedDataBoundary
+      boundaryCell = lapply(boundaryIndex, function(x){x+1})
+      return(boundaryCell)
+   }
+}
diff --git a/R/jexcel.R b/R/jexcel.R
@@ -51,8 +51,10 @@
 #' @param digits number of decimal digits passed to \code{jsonlite::toJSON}. By default it is set to 4, use \code{NA} for max precision.
 #' @param autoWidth a boolean value indicating should the width of the column be automatically adjusted. By default this value is set to TRUE.
 #' The width value specified in 'columns' param will have higher precedence.
-#' @param autoFill a boolen value indicating wheather the excel table fill the container. By default this value is set to false.
+#' @param autoFill a boolen value indicating whether the excel table fill the container. By default this value is set to false.
 #' The width value specified in 'columns' param will have highest precendence followed by autoWidth.
+#' @param getSelectedData a boolean value indicating whether the there should be trigger for data selection or not.
+#' By default this is set to false.
 #' @param  ... other jexcel parameters, e.g., updateTable
 #' @import jsonlite
 #' @import htmlwidgets
@@ -92,6 +94,7 @@ excelTable <-
            digits = 4,
            autoWidth = TRUE,
            autoFill = FALSE,
+           getSelectedData = FALSE,
            ...
            ) {
     # List of parameters to send to js
@@ -338,7 +341,8 @@ excelTable <-
       "loadingSpin",
       "showToolbar",
       "autoWidth",
-      "autoFill"
+      "autoFill",
+      "getSelectedData"
     )) {
       argvalue <- get(arg)
       if(!is.null(argvalue)) {

diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/reference/excelTable.html b/docs/reference/excelTable.html
diff --git a/docs/reference/get_selected_data.html b/docs/reference/get_selected_data.html
diff --git a/index.Rmd b/index.Rmd
@@ -345,7 +345,11 @@ library(excelR)
        output$table <-
       renderExcel(excelTable(data = head(iris)))
       observeEvent(input$table,{
-        print(excel_to_R(input$table))
+        table_data <- excel_to_R(input$table)
+        if(!is.null(table_data)){
+        print(table_data)
+        }
+
       })
       }
     )
@@ -402,7 +406,7 @@ shinyApp(
 
   server = function(input, output, session) {
 
-    output$table <- renderExcel(excelTable(data = head(iris), allowComments = TRUE))
+    output$table <- renderExcel(excelTable(data = head(iris), getSelectedData = TRUE))
 
     # Print the selected data in table
     observeEvent(input$table,{