Skip to content

mod_data is now mod_measurements #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sawelch-NIVA wants to merge 1 commit into
base: main
Choose a base branch
from
Open

mod_data is now mod_measurements #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions R/app_server.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ app_server <- function(input, output, session) {
moduleMethods <- mod_methods_server("methods")
moduleSamples <- mod_samples_server("samples")
moduleBiota <- mod_biota_server("biota")
moduleData <- mod_data_server(
"data",
moduleMeasurements <- mod_measurements_server(
"measurements",
parent_session = session
)
moduleReview <- mod_review_server(
Expand All @@ -160,7 +160,7 @@ app_server <- function(input, output, session) {
"06-methods",
"07-samples",
"08-biota",
"09-data",
"09-measurements",
"10-review",
"12-CREED",
"13-Zenodo",
Expand Down
4 changes: 2 additions & 2 deletions R/app_ui.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ app_ui <- function(request) {
"9. Data",
"Enter measured values, units, and uncertainty."
),
value = "09-data",
mod_data_ui("data"),
value = "09-measurements",
mod_measurements_ui("measurements"),
icon = bs_icon("app")
),
nav_panel(
Expand Down
12 changes: 6 additions & 6 deletions R/mod_data.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#' @importFrom rhandsontable rHandsontableOutput
#' @importFrom shinyjs useShinyjs show hide hidden
#' @import eDataDRF
mod_data_ui <- function(id) {
mod_measurements_ui <- function(id) {
ns <- NS(id)

tagList(
Expand Down Expand Up @@ -116,7 +116,7 @@ mod_data_ui <- function(id) {
#' @importFrom utils capture.output head
#' @importFrom purrr is_empty map_lgl
#' @import eDataDRF
mod_data_server <- function(id, parent_session) {
mod_measurements_server <- function(id, parent_session) {
moduleServer(id, function(input, output, session) {
ns <- session$ns

Expand Down Expand Up @@ -542,15 +542,15 @@ mod_data_server <- function(id, parent_session) {

session$userData$reactiveValues$measurementsData <- new_combinations
print_dev(glue(
"mod_data: All modules validated, created {nrow(session$userData$reactiveValues$measurementsData)} measurement combinations"
"mod_measurements: All modules validated, created {nrow(session$userData$reactiveValues$measurementsData)} measurement combinations"
))
}
} else if (
isFALSE(session$userData$reactiveValues$saveExtractionSuccessful)
) {
moduleState$data_entry_ready <- FALSE
session$userData$reactiveValues$measurementsData <- initialise_measurements_tibble()
print_dev("mod_data: Some modules pending, data entry disabled")
print_dev("mod_measurements: Some modules pending, data entry disabled")
}
# We shouldn't need an explicit case for when all modules validate and a save extraction was successful, because
# that should be covered by the existing code in fct_import.R. hopefully...
Expand Down Expand Up @@ -1001,7 +1001,7 @@ mod_data_server <- function(id, parent_session) {
}

## To be copied in the UI ----
# mod_data_ui("data_1")
# mod_measurements_ui("data_1")

## To be copied in the server ----
# mod_data_server("data_1")
# mod_measurements_server("data_1")
Loading