Skip to content

Commit

Permalink
Update dataFilter and dataSelect examples. Bump to version 0.1.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
DillonHammill committed Dec 17, 2020
1 parent 3e688ae commit f0e0945
Show file tree
Hide file tree
Showing 24 changed files with 64 additions and 49 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: DataEditR
Title: An Interactive Editor for Viewing, Entering, Filtering & Editing Data
Version: 0.0.9
Date: 2020-11-12
Version: 0.1.0
Date: 2020-12-17
Authors@R:
person(given = "Dillon",
family = "Hammill",
Expand Down
5 changes: 5 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# DataEditR 0.1.0

* Make the switch to GitHub Actions for continuous integration.
* Update `dataSelect` and `dataFilter` examples now that the return values are lists instead of reactive expressions.

# DataEditR 0.0.9

* Minor improvements to ensure that the original data is retained when new columns are added or renamed. Requires installation of `rhandsontable` from `install_github("DillonHammill/rhandsontable")`.
Expand Down
2 changes: 2 additions & 0 deletions R/dataEdit.R
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
#' @param ... additional arguments passed to
#' \code{\link[rhandsontable:rhandsontable]{rhandsontable}}.
#'
#' @return reactive expression containing the edited data.
#'
#' @author Dillon Hammill, \email{[email protected]}
#'
#' @importFrom shiny reactive reactiveValues observe observeEvent moduleServer
Expand Down
9 changes: 5 additions & 4 deletions R/dataFilter.R
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,18 @@
#' output,
#' session) {
#' data_input <- dataInputServer("input1")
#'
#'
#' # list with slots data and rows (indices)
#' data_filter <- dataFilterServer("filter1",
#' data = data_input
#' )
#'
#' output$data1 <- renderRHandsontable({
#' if (!is.null(data_filter())) {
#' rhandsontable(data_filter())
#' if (!is.null(data_filter$data())) {
#' rhandsontable(data_filter$data())
#' }
#' })

#'
#' }
#'
#' shinyApp(ui, server)
Expand Down
8 changes: 2 additions & 6 deletions R/dataSelect.R
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#' useShinyjs(),
#' dataInputUI("input1"),
#' dataSelectUI("select1"),
#' dataOutputUI("output1"),
#' rHandsontableOutput("data1")
#' )
#'
Expand All @@ -45,14 +44,11 @@
#' )
#'
#' output$data1 <- renderRHandsontable({
#' if (!is.null(data_select())) {
#' rhandsontable(data_select())
#' if (!is.null(data_select$data())) {
#' rhandsontable(data_select$data())
#' }
#' })
#'
#' dataOutputServer("output1",
#' data = data_select
#' )
#' }
#'
#' shinyApp(ui, server)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ citation("DataEditR")
#> To cite package 'DataEditR' in publications use:
#>
#> Dillon Hammill (2020). DataEditR: An Interactive Editor for Viewing,
#> Entering, Filtering & Editing Data. R package version 0.0.9.
#> Entering, Filtering & Editing Data. R package version 0.1.0.
#> https://github.com/DillonHammill/DataEditR
#>
#> A BibTeX entry for LaTeX users is
Expand All @@ -142,7 +142,7 @@ citation("DataEditR")
#> title = {DataEditR: An Interactive Editor for Viewing, Entering, Filtering & Editing Data},
#> author = {Dillon Hammill},
#> year = {2020},
#> note = {R package version 0.0.9},
#> note = {R package version 0.1.0},
#> url = {https://github.com/DillonHammill/DataEditR},
#> }
```
2 changes: 1 addition & 1 deletion docs/404.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/CODE_OF_CONDUCT.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/articles/DataEditR.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/articles/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/authors.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 10 additions & 1 deletion docs/news/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ pkgdown: 1.6.1
pkgdown_sha: ~
articles:
DataEditR: DataEditR.html
last_built: 2020-12-17T06:08Z
last_built: 2020-12-17T06:38Z

5 changes: 4 additions & 1 deletion docs/reference/dataEdit.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions docs/reference/dataFilter.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/dataInput.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/dataOutput.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 3 additions & 7 deletions docs/reference/dataSelect.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/data_edit.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions man/dataEdit.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions man/dataFilter.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 2 additions & 6 deletions man/dataSelect.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f0e0945

Please sign in to comment.