add new check that excludes the first column when checking if all are…

… numeric (#65)

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: DataTools
 Type: Package
 Title: Data Tools for Shiny Apps
-Version: 23.12.2.1
+Version: 23.12.2.2
 Authors@R: c(
             person("Antonia", "Runge", email = "antonia.runge@inwt-statistics.de", role = c("cre", "aut"))
             )

NAMESPACE

@@ -3,6 +3,7 @@
 export("%>%")
 export(checkAnyNonNumericColumns)
 export(checkErrorNoNumericColumns)
+export(checkNonNumericColumnsExceptFirst)
 export(checkWarningEmptyValues)
 export(cutAllLongStrings)
 export(downUploadButtonServer)

R/02-importData-selectData.R

@@ -477,6 +477,8 @@ selectSourceServer <- function(id,
 
                    # reset ckanGroup, ckanRecord, ckanResourceTypes
                    updateTextInput(session, "repoFilter-ckanMeta", value = "")
+
+                   req(internetCon())
                    updatePickerInput(session,
                                      "repoFilter-ckanGroup",
                                      choices = getCKANGroupChoices(groupList = ckanNetworks()),
@@ -529,6 +531,7 @@ selectSourceServer <- function(id,
                    bindEvent(input[["resourceLoad-resetCKAN"]])
 
                  observe({
+                   req(internetCon())
                    logDebug("Apply Meta filter")
                    updateSelectizeInput(session,
                                         "resourceFilter-ckanRecord",
@@ -545,6 +548,7 @@ selectSourceServer <- function(id,
                    bindEvent(input[["repoFilter-applyMeta"]])
 
                  observe({
+                   req(internetCon())
                    logDebug("Apply Network filter")
                    updateSelectizeInput(session,
                                         "resourceFilter-ckanRecord",

R/03-checks.R

@@ -40,6 +40,30 @@ checkAnyNonNumericColumns <- function(data) {
   TRUE
 }
 
+#' Check Non-Numeric Columns Except First
+#'
+#' Check for any non-numeric columns, exclude the first column. Check can be applied as custom
+#'  checks in importDataServer.
+#'
+#' @param data data to be checked
+#' @export
+checkNonNumericColumnsExceptFirst <- function(data) {
+  if (ncol(data) < 2) {
+    return("Less than 2 columns.")
+  }
+
+  data <- data[, -1, drop = FALSE]
+
+  nNumericCol <- sum(findNumericCol(as.data.frame(data,
+                                                  stringsAsFactors = FALSE)))
+
+  if (nNumericCol < ncol(data)) {
+    return("Please provide a dataset with all numeric variables except the first column.")
+  }
+
+  TRUE
+}
+
 #' Check Error No Numeric Columns
 #'
 #' Check for minimal numeric columns. Check can be applied as customErrorChecks in importDataServer.

tests/testthat/test-checks.R

@@ -22,6 +22,24 @@ test_that("Test checkAnyNonNumericColumns()", {
   expect_true(checkAnyNonNumericColumns(testData))
 })
 
+test_that("Test checkAnyNonNumericColumns()", {
+  testData <- data.frame(x = 1:3,
+                         y = c("a", "b", "c"),
+                         stringsAsFactors = FALSE)
+  expect_equal(checkNonNumericColumnsExceptFirst(testData),
+               "Please provide a dataset with all numeric variables except the first column.")
+
+  testData <- data.frame(x = 1:3,
+                         y = 5:7)
+  expect_true(checkNonNumericColumnsExceptFirst(testData))
+
+  testData <- data.frame(a = c("a", "b", "c"),
+                         x = 1:3,
+                         y = 5:7,
+                         stringsAsFactors = FALSE)
+  expect_true(checkNonNumericColumnsExceptFirst(testData))
+})
+
 test_that("Test checkErrorNoNumericColumns()", {
   testData <- data.frame(x = 1:3,
                          y = c("a", "b", "c"),