mirror of
https://github.com/agdamsbo/FreesearchR.git
synced 2026-06-19 04:27:30 +02:00
ready for new version
This commit is contained in:
parent
3facad1c21
commit
42f91e903b
18 changed files with 552 additions and 1230 deletions
|
|
@ -1,4 +1,4 @@
|
|||
FROM rocker/geospatial:4.4.1
|
||||
FROM rocker/tidyverse:4.4.1
|
||||
RUN apt-get update -y && apt-get install -y cmake make libcurl4-openssl-dev libicu-dev libssl-dev pandoc zlib1g-dev libsecret-1-dev libxml2-dev libx11-dev libcairo2-dev libfontconfig1-dev libfreetype6-dev libfribidi-dev libharfbuzz-dev libjpeg-dev libpng-dev libtiff-dev libwebp-dev libfftw3-dev && rm -rf /var/lib/apt/lists/*
|
||||
RUN mkdir -p /usr/local/lib/R/etc/ /usr/lib/R/etc/
|
||||
RUN echo "options(renv.config.pak.enabled = FALSE, repos = c(CRAN = 'https://cran.rstudio.com/'), download.file.method = 'libcurl', Ncpus = 4)" | tee /usr/local/lib/R/etc/Rprofile.site | tee /usr/lib/R/etc/Rprofile.site
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
|
||||
########
|
||||
#### Current file: /var/folders/9l/xbc19wxx0g79jdd2sf_0v291mhwh7f/T//RtmpfypcRk/file94c84b9cb1cb.R
|
||||
#### Current file: /var/folders/9l/xbc19wxx0g79jdd2sf_0v291mhwh7f/T//RtmpBwniSk/file141b664b382fa.R
|
||||
########
|
||||
|
||||
i18n_path <- here::here("translations")
|
||||
|
|
@ -62,7 +62,7 @@ i18n$set_translation_language("en")
|
|||
#### Current file: /Users/au301842/FreesearchR/R//app_version.R
|
||||
########
|
||||
|
||||
app_version <- function()'25.12.7'
|
||||
app_version <- function()'26.1.2'
|
||||
|
||||
|
||||
########
|
||||
|
|
@ -4486,7 +4486,7 @@ data_types <- function() {
|
|||
#### Current file: /Users/au301842/FreesearchR/R//hosted_version.R
|
||||
########
|
||||
|
||||
hosted_version <- function()'v25.12.7-251218'
|
||||
hosted_version <- function()'v26.1.2-260112'
|
||||
|
||||
|
||||
########
|
||||
|
|
@ -5566,6 +5566,7 @@ landing_page_ui <- function(i18n) {
|
|||
p(
|
||||
class = "lead",
|
||||
i18n$t("Start with FreesearchR for basic data evaluation and analysis."),
|
||||
i18n$t("The app contains a selelct number of features and will guide you through key analyses."),
|
||||
i18n$t("When you need more advanced tools, you'll be prepared to use R directly."),
|
||||
style = "font-size: 1.2rem; color: #555;"
|
||||
)
|
||||
|
|
@ -10386,9 +10387,11 @@ gg_theme_export <- function() {
|
|||
|
||||
language_choices <- function() {
|
||||
c(
|
||||
"🇩🇰 Dansk" = "da",
|
||||
# "🇩🇪 Deutsch" = "de",
|
||||
"🇬🇧 English" = "en",
|
||||
"🇹🇿 Kiswahili" = "sw",
|
||||
"🇩🇰 Dansk" = "da"
|
||||
"🇹🇿 Kiswahili" = "sw"#,
|
||||
# "🇸🇪 Svenska" = "sv"
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -10672,11 +10675,11 @@ ui_elements <- function(selection) {
|
|||
width = 3,
|
||||
shiny::actionButton(
|
||||
inputId = "modal_update",
|
||||
label = i18n$t("Reorder factor levels"),
|
||||
label = i18n$t("Modify factor levels"),
|
||||
width = "100%"
|
||||
),
|
||||
shiny::tags$br(),
|
||||
shiny::helpText(i18n$t("Reorder the levels of factor/categorical variables.")),
|
||||
shiny::helpText(i18n$t("Reorder or rename the levels of factor/categorical variables.")),
|
||||
shiny::tags$br(),
|
||||
shiny::tags$br()
|
||||
),
|
||||
|
|
@ -11184,16 +11187,16 @@ update_factor_server <- function(id, data_r = reactive(NULL)) {
|
|||
decreasing <- FALSE
|
||||
label <- tagList(
|
||||
phosphoricons::ph("sort-descending"),
|
||||
"Sort Levels"
|
||||
i18n$t("Sort by Levels")
|
||||
)
|
||||
} else {
|
||||
decreasing <- TRUE
|
||||
label <- tagList(
|
||||
phosphoricons::ph("sort-ascending"),
|
||||
"Sort Levels"
|
||||
i18n$t("Sort by Levels")
|
||||
)
|
||||
}
|
||||
updateActionButton(inputId = "sort_levels", label = as.character(label))
|
||||
updateActionButton(inputId = "sort_levels", label = label)
|
||||
rv$data_grid <- rv$data_grid[order(rv$data_grid[[1]], decreasing = decreasing), ]
|
||||
})
|
||||
|
||||
|
|
@ -11202,16 +11205,16 @@ update_factor_server <- function(id, data_r = reactive(NULL)) {
|
|||
decreasing <- FALSE
|
||||
label <- tagList(
|
||||
phosphoricons::ph("sort-descending"),
|
||||
i18n$t("Sort count")
|
||||
i18n$t("Sort by count")
|
||||
)
|
||||
} else {
|
||||
decreasing <- TRUE
|
||||
label <- tagList(
|
||||
phosphoricons::ph("sort-ascending"),
|
||||
i18n$t("Sort count")
|
||||
i18n$t("Sort by count")
|
||||
)
|
||||
}
|
||||
updateActionButton(inputId = "sort_occurrences", label = as.character(label))
|
||||
updateActionButton(inputId = "sort_occurrences", label = label)
|
||||
rv$data_grid <- rv$data_grid[order(rv$data_grid[[2]], decreasing = decreasing), ]
|
||||
})
|
||||
|
||||
|
|
@ -11347,7 +11350,6 @@ factor_new_levels_labels <- function(
|
|||
labels = ifelse(new_labels == "New label", new_levels, new_labels)
|
||||
)
|
||||
|
||||
# browser()
|
||||
|
||||
if (isTRUE(new_variable)) {
|
||||
append_column(
|
||||
|
|
@ -11356,7 +11358,7 @@ factor_new_levels_labels <- function(
|
|||
name = unique_names(new = paste0(variable, "_updated"), existing = names(data))
|
||||
)
|
||||
} else {
|
||||
data[[variable]] <- new_variable
|
||||
data[[variable]] <- with_label
|
||||
data
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue