From 56d3bbef29f28aead462c7166711b4f31a59a20b Mon Sep 17 00:00:00 2001 From: Swechhya Date: Tue, 23 Jul 2019 17:54:50 +0545 Subject: [PATCH 1/6] Fix typo --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c314b12..b94f7fc 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,7 @@ This package can be used in `shiny` - Pagination - Lazy loading - Native color picker -- Great data picker: dropdown, autocomplete, multiple, group options and icons +- Data picker dropdown with autocomplete, multiple, and icons feature +- Date picker From 2afbb0dfb0f2d0dc6e18200e499b5569d8653454 Mon Sep 17 00:00:00 2001 From: Swechhya Date: Tue, 23 Jul 2019 17:55:10 +0545 Subject: [PATCH 2/6] Update NEWS --- NEWS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.md b/NEWS.md index 20aacd6..90f80e4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -10,6 +10,8 @@ * begin to add tests +* add communication with shiny + # excelR 0.1.0 From 8889b23101429cd6601bad2275fec41829302cc0 Mon Sep 17 00:00:00 2001 From: Swechhya Date: Tue, 23 Jul 2019 17:56:05 +0545 Subject: [PATCH 3/6] Update description --- DESCRIPTION | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 80a1738..0ba1ef6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,10 @@ Package: excelR Type: Package Title: A Wrapper of the 'JavaScript' Library 'jExcel' -Version: 0.1.0 -Author: Swechhya Bista +Version: 0.2.0 +Authors@R: c(person("Swechhya", "Bista", email = "swechhyabista@gmail.com", + role = c("aut", "cre")), + person("Kent", "Russell", role = c("ctb"))) Maintainer: Swechhya Bista Description: An R interface to 'jExcel' library to create web-based interactive tables and spreadsheets compatible with 'Excel' or any other spreadsheet software. License: MIT + file LICENSE From b42281d1ee3e1fc800d1cf222e37bff56691978b Mon Sep 17 00:00:00 2001 From: Swechhya Date: Tue, 23 Jul 2019 17:59:47 +0545 Subject: [PATCH 4/6] Update github page --- docs/LICENSE-text.html | 2 +- docs/authors.html | 8 +- docs/index.html | 26 ++++- docs/news/index.html | 3 +- docs/reference/excelOutput.html | 2 +- docs/reference/excelTable.html | 2 +- docs/reference/excel_to_R.html | 170 ++++++++++++++++++++++++++++++++ docs/reference/index.html | 8 +- docs/reference/renderExcel.html | 2 +- index.Rmd | 20 ++++ 10 files changed, 233 insertions(+), 10 deletions(-) create mode 100644 docs/reference/excel_to_R.html diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 71e38f0..51e8718 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -60,7 +60,7 @@ excelR - 0.1.0 + 0.2.0 diff --git a/docs/authors.html b/docs/authors.html index d2c61cf..3c8502a 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -60,7 +60,7 @@ excelR - 0.1.0 + 0.2.0 @@ -104,7 +104,11 @@

Authors

  • -

    Swechhya Bista. Maintainer. +

    Swechhya Bista. Author, maintainer. +

    +
    • +
  • +

    Kent Russell. Contributor.

diff --git a/docs/index.html b/docs/index.html index 971d181..ede425a 100644 --- a/docs/index.html +++ b/docs/index.html @@ -30,7 +30,7 @@ excelR - 0.1.0 + 0.2.0 @@ -307,6 +307,9 @@

Shiny Integration

+
+

+Creating excel table in Shiny

  library(shiny)
   library(excelR)
 
@@ -318,6 +321,24 @@ 

       }
     )
+
+

+Reading changed data from excel table in Shiny

+
  library(shiny)
+  library(excelR)
+
+   shinyApp(
+     ui = fluidPage(excelOutput("table")),
+     server = function(input, output, session) {
+       output$table <-
+      renderExcel(excelTable(data = head(iris)))
+      observeEvent(input$table,{
+        print(excel_to_R(input$table))
+      })
+      }
+    )
+
+
@@ -345,7 +366,8 @@

License

Developers

    -
  • Swechhya Bista
    Maintainer
    • +
  • Swechhya Bista
    Author, maintainer
    • +
  • All authors...
diff --git a/docs/news/index.html b/docs/news/index.html index 83ef844..fe3f639 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -60,7 +60,7 @@ excelR - 0.1.0 + 0.2.0 @@ -113,6 +113,7 @@

  • change style argument to a named list of character CSS styles

  • add examples

  • begin to add tests

    • +

  • add communication with shiny

    • diff --git a/docs/reference/excelOutput.html b/docs/reference/excelOutput.html index b1546d8..3989b60 100644 --- a/docs/reference/excelOutput.html +++ b/docs/reference/excelOutput.html @@ -63,7 +63,7 @@ excelR - 0.1.0 + 0.2.0
    diff --git a/docs/reference/excelTable.html b/docs/reference/excelTable.html index 8950e5c..3448393 100644 --- a/docs/reference/excelTable.html +++ b/docs/reference/excelTable.html @@ -63,7 +63,7 @@ excelR - 0.1.0 + 0.2.0 diff --git a/docs/reference/excel_to_R.html b/docs/reference/excel_to_R.html new file mode 100644 index 0000000..71e5bd7 --- /dev/null +++ b/docs/reference/excel_to_R.html @@ -0,0 +1,170 @@ + + + + + + + + +Convert excel object to data.frame — excel_to_R • excelR + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + + + +
    + +
    +
    +
    +

    Convert excel object to data.frame

    + Source: R/excel_to_R.R + +
    + +
    + +

    This function is used to excel data to data.frame. Can be used in shiny app to convert input json to data.frame

    + +
    + + 
    excel_to_R(excelObj)
    + +

    Arguments

    + + + + + + +
    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)))
+     observeEvent(input$table,{
+       print(excel_to_R(input$table))
+     })
+   }
+ )
+}
    +
    + +
    + +
    +
    +

    Developed by Swechhya Bista.

    +
    + +
    +

    Site built with pkgdown 1.3.0.

    +
    +
    +
    + + + + + + diff --git a/docs/reference/index.html b/docs/reference/index.html index 9e34169..91acdeb 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -60,7 +60,7 @@ excelR - 0.1.0 + 0.2.0 @@ -131,6 +131,12 @@

    excel_to_R()

    + +

    Convert excel object to data.frame

    + +

    renderExcel()

    diff --git a/docs/reference/renderExcel.html b/docs/reference/renderExcel.html index f40143b..5920b3e 100644 --- a/docs/reference/renderExcel.html +++ b/docs/reference/renderExcel.html @@ -63,7 +63,7 @@ excelR - 0.1.0 + 0.2.0 diff --git a/index.Rmd b/index.Rmd index ebbf8be..c31d132 100644 --- a/index.Rmd +++ b/index.Rmd @@ -238,6 +238,7 @@ library(excelR) ![](inst/images/formula.gif) #### Style {#style} + ```r library(excelR) @@ -254,6 +255,22 @@ library(excelR) ![](inst/images/style.png) ### Shiny Integration {#shiny-integration} + +#### Creating excel table in Shiny +```r + library(shiny) + library(excelR) + + shinyApp( + ui = fluidPage(excelOutput("table")), + server = function(input, output, session) { + output$table <- + renderExcel(excelTable(data = head(iris))) + } + ) + +``` +#### Reading changed data from excel table in Shiny ```r library(shiny) library(excelR) @@ -263,6 +280,9 @@ library(excelR) server = function(input, output, session) { output$table <- renderExcel(excelTable(data = head(iris))) + observeEvent(input$table,{ + print(excel_to_R(input$table)) + }) } ) From d59b9af714cf31d01b9a925db8b73b385b31ec9c Mon Sep 17 00:00:00 2001 From: Swechhya Date: Wed, 24 Jul 2019 09:35:15 +0545 Subject: [PATCH 5/6] Update styling for version 0.2.0 --- docs/index.html | 51 +++++++++++++++++++++++++++++++------------------ index.Rmd | 17 +++++++++++++++++ 2 files changed, 49 insertions(+), 19 deletions(-) diff --git a/docs/index.html b/docs/index.html index ede425a..7e925cb 100644 --- a/docs/index.html +++ b/docs/index.html @@ -291,6 +291,7 @@

    Style

    +

    Styling in version 0.1.0:

     library(excelR)
 
  data = data.frame( Make = c('Honda', 'Honda', 'Hyundai'),
@@ -302,6 +303,18 @@ 
    
               B1=c('background-color:orange', 'color:green'))
                       
  excelTable(data=data, columns = columns, style = style)
    +

    Styling from version 0.2.0 onwards:

    +
     library(excelR)
+
+ data = data.frame( Make = c('Honda', 'Honda', 'Hyundai'),
+                   Car = c('Civic', 'City', 'Creta'))
+
+ columns = data.frame(title=c('Make', 'Car'), width= c(300, 300))
+  
+ style = list(A1='background-color:orange; color:green;', 
+              B1='background-color:orange; color:green;')
+                      
+ excelTable(data=data, columns = columns, style = style)

    @@ -310,20 +323,6 @@

    Creating excel table in Shiny

    -
      library(shiny)
-  library(excelR)
-
-   shinyApp(
-     ui = fluidPage(excelOutput("table")),
-     server = function(input, output, session) {
-       output$table <-
-      renderExcel(excelTable(data = head(iris)))
-      }
-    )
    -
    -
    -

    -Reading changed data from excel table in Shiny

      library(shiny)
   library(excelR)
 
@@ -332,11 +331,25 @@ 
    
      server = function(input, output, session) {
        output$table <-
       renderExcel(excelTable(data = head(iris)))
-      observeEvent(input$table,{
-        print(excel_to_R(input$table))
-      })
-      }
-    )
    + } + )
    +

    +
    +

    +Reading changed data from excel table in Shiny

    +
      library(shiny)
+  library(excelR)
+
+   shinyApp(
+     ui = fluidPage(excelOutput("table")),
+     server = function(input, output, session) {
+       output$table <-
+      renderExcel(excelTable(data = head(iris)))
+      observeEvent(input$table,{
+        print(excel_to_R(input$table))
+      })
+      }
+    )
    diff --git a/index.Rmd b/index.Rmd index c31d132..fb420b3 100644 --- a/index.Rmd +++ b/index.Rmd @@ -239,6 +239,7 @@ library(excelR) #### Style {#style} +Styling in version `0.1.0`: ```r library(excelR) @@ -252,6 +253,22 @@ library(excelR) excelTable(data=data, columns = columns, style = style) ``` + +Styling from version `0.2.0` onwards: +```r + library(excelR) + + data = data.frame( Make = c('Honda', 'Honda', 'Hyundai'), + Car = c('Civic', 'City', 'Creta')) + + columns = data.frame(title=c('Make', 'Car'), width= c(300, 300)) + + style = list(A1='background-color:orange; color:green;', + B1='background-color:orange; color:green;') + + excelTable(data=data, columns = columns, style = style) +``` + ![](inst/images/style.png) ### Shiny Integration {#shiny-integration} From 8d64327c0353047918fdc91f2a2f58d09c70208f Mon Sep 17 00:00:00 2001 From: Swechhya Date: Wed, 24 Jul 2019 14:59:13 +0545 Subject: [PATCH 6/6] Fix badges URL --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b94f7fc..6619469 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # excelR -[![version](http://www.r-pkg.org/badges/version/excelR)](https://CRAN.R-project.org/package=excelR) -[![CRAN_Download_Badge](http://cranlogs.r-pkg.org/badges/grand-total/excelR)](http://cran.r-project.org/package=excelR) +[![version](https://www.r-pkg.org/badges/version/excelR)](https://CRAN.R-project.org/package=excelR) +[![CRAN_Download_Badge](https://cranlogs.r-pkg.org/badges/grand-total/excelR)](https://cran.r-project.org/package=excelR) [![Travis-CI Build Status](https://travis-ci.org/Swechhya/excelR.svg?branch=master)](https://travis-ci.org/Swechhya/excelR) [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/Swechhya/excelR?branch=master&svg=true)](https://ci.appveyor.com/project/Swechhya/excelR) [![codecov](https://codecov.io/gh/Swechhya/excelR/branch/master/graph/badge.svg)](https://codecov.io/gh/Swechhya/excelR)