hide slider under el-switch if no_slider is set to TRUE, fix #245,…

… PR #253

force el-switch on when `app_data$shp_hidden` is `TRUE`

Makefile

@@ -56,6 +56,9 @@ check:
 	echo "\n===== R CMD CHECK =====\n" > check.log 2>&1
 	R --slave -e "devtools::check(build_args = '--no-build-vignettes', args = '--no-build-vignettes', run_dont_test = TRUE, vignettes = FALSE)" >> check.log 2>&1
 
+check-no-multiarch:
+	R --slave -e "devtools::check(args = '--no-multiarch', build_args='--no-multiarch')"
+
 ## check docs for spelling mistakes
 spellcheck:
 	echo "\n===== SPELL CHECK =====\n" > spell.log 2>&1

R/class_Parameter-class.R

@@ -37,6 +37,9 @@ Parameter <- R6::R6Class(
 
     #' @field disable `logical` value.
     disable = NA,
+
+    #' @field no_slider `logical` value.
+    no_slider = NA,     
 
     #' @field units `character` value.
     units = NA_character_,
@@ -58,14 +61,16 @@ Parameter <- R6::R6Class(
     #' @param step_value `numeric` step value.
     #' @param hide `logical` value.
     #' @param disable `logical` value.
+    #' @param no_slider `logical` value.
     #' @param units `character` value.
     #' @param reference_value `numeric` value.
     #' @param reference_units `character` value.
     #' @return A new Parameter object.
     ## constructor
     initialize = function(id, name, status,
                           value, min_value, max_value, step_value, hide, 
-                          disable, units, reference_value, reference_units) {
+                          disable, no_slider, units, reference_value, 
+                          reference_units) {
       ### assert that arguments are valid
       assertthat::assert_that(
         #### id
@@ -104,7 +109,10 @@ Parameter <- R6::R6Class(
         assertthat::noNA(hide),
         #### disable
         assertthat::is.flag(disable),
-        assertthat::noNA(disable),        
+        assertthat::noNA(disable),
+        #### no_slider
+        assertthat::is.flag(no_slider),
+        assertthat::noNA(no_slider),          
         #### units
         assertthat::is.string(units),
         assertthat::noNA(units)
@@ -121,6 +129,7 @@ Parameter <- R6::R6Class(
       self$reference_units <- reference_units
       self$hide <- hide
       self$disable <- disable
+      self$no_slider <- no_slider
       self$units <- units
     },
 
@@ -249,6 +258,7 @@ Parameter <- R6::R6Class(
         step_value = self$step_value,
         hide = self$hide,
         disable = self$disable,
+        no_slider = self$no_slider,
         units = self$units,
         reference_value = self$reference_value,
         reference_units = self$reference_units
@@ -268,6 +278,7 @@ Parameter <- R6::R6Class(
         step_value = self$step_value,
         hide = self$hide,
         disable = self$disable,
+        no_slider = self$no_slider,
         units = self$units,
         reference_value = self$reference_value,
         reference_units = self$reference_units
@@ -324,6 +335,9 @@ Parameter <- R6::R6Class(
 #'   
 #' @param disable `logical` indicating if the setting should be disabled.
 #'   Defaults to `FALSE`.  
+#'   
+#' @param no_slider `logical` indicating if the setting should not have a slider.
+#'   Defaults to `FALSE`.      
 #'
 #' @inheritParams new_theme
 #' @inheritParams new_feature
@@ -339,10 +353,9 @@ Parameter <- R6::R6Class(
 #' @export
 new_parameter <- function(name, status = TRUE, value = 0,
                           min_value = 0, max_value = 100, step_value = 1,
-                          hide = FALSE, disable = FALSE, units = "",
-                          reference_value = NA_real_,
-                          reference_units = "",
-                          id = uuid::UUIDgenerate()) {
+                          hide = FALSE, disable = FALSE, no_slider = FALSE, 
+                          units = "",reference_value = NA_real_, 
+                          reference_units = "", id = uuid::UUIDgenerate()) {
   Parameter$new(
     id = id,
     name = name,
@@ -353,6 +366,7 @@ new_parameter <- function(name, status = TRUE, value = 0,
     step_value = step_value,
     hide = hide,
     disable = disable,
+    no_slider = no_slider,
     reference_value = reference_value,
     reference_units = reference_units,
     units = units

R/server_import_data.R

@@ -50,6 +50,7 @@ import_data <- function(x, mode) {
       reference_units = stringi::stri_unescape_unicode("km\\u00B2"),
       hide = TRUE,
       disable = FALSE,
+      no_slider = FALSE,
       id = "budget_parameter"
     )
 
@@ -64,20 +65,22 @@ import_data <- function(x, mode) {
       units = "%",
       hide = TRUE,
       disable = shiny::isTruthy(app_data$shp_hidden),
+      no_slider = FALSE,
       id = "spatial_parameter"
     )
 
   solution_layer_parameter <-
     wheretowork::new_parameter(
       name = "Hide solution layer from map",
-      status = FALSE,
+      status = shiny::isTruthy(app_data$shp_hidden),
       value = 1,
       min_value = 1,
       max_value = 100,
       step_value = 1,
       units = "%",
       hide = TRUE,
       disable = FALSE,
+      no_slider = TRUE,
       id = "solution_layer_parameter"
     )  
 

docs/pkgdown.yml

@@ -2,5 +2,5 @@ pandoc: 2.17.1.1
 pkgdown: 1.6.1.9001
 pkgdown_sha: ce9781a15c7ea07df9fb17a11295ba4abec0b54b
 articles: {}
-last_built: 2022-09-15T16:03Z
+last_built: 2022-09-29T15:29Z