fix: некорректная загрузка box-модуля

.Rprofile

@@ -1 +1,21 @@
 source("renv/activate.R")
+
+
+(function() {
+
+  paths <- c(
+    "FORM_AUTH_ENABLED",
+    "FORM_VERSION",
+    "FORM_TITLE"
+  )
+
+  lines <- paths[Sys.getenv(paths) == ""]
+
+  if (length(lines) > 0) {
+    cli::cli_h3("Настройка путей окружения")
+    cli::cli_code(paste0(lines, "="))
+    cli::cli_inform(c(
+      "i" = "Для нормальной работы скриптов добавьте в {.file .Renviron}:"
+    ))
+  }
+})()

.gitignore

@@ -1,4 +1,7 @@
 /renv
+/temp
+
+scheme.rds
 
 .Renviron
 .DS_Store

app.R

@@ -9,25 +9,27 @@ suppressPackageStartupMessages({
   library(shinymanager)
 })
 
-source("helpers/functions.R")
+# КАК ЗАПРЯТЯАТЬ ID
 
 # SOURCE FILES ============================
 box::purge_cache()
 box::use(
   modules/utils,
   modules/global_options,
+  modules/global_options[enabled_schemas],
   modules/db,
   modules/data_validation,
   modules/scheme_generator[scheme_R6]
 )
 
 # SETTINGS ================================
-FILE_SCHEME <- fs::path("configs/schemas", "schema.xlsx")
+FILE_SCHEME  <- fs::path("configs/schemas", "schema.xlsx")
 AUTH_ENABLED <- Sys.getenv("FORM_AUTH_ENABLED", FALSE)
-HEADER_TEXT <- sprintf("%s (%s)", Sys.getenv("FORM_TITLE", "NA"), Sys.getenv("FORM_VERSION", "NA"))
+HEADER_TEXT  <- sprintf("%s (%s)", Sys.getenv("FORM_TITLE", "NA"), Sys.getenv("FORM_VERSION", "NA"))
 
 global_options$set_global_options(
   shiny.host = "0.0.0.0"
+  # enabled_schemas = "example_of_scheme"
 )
 global_options$check_and_init_scheme()
 
@@ -39,20 +41,7 @@ rmarkdown::find_pandoc(dir = "/opt/homebrew/bin/")
 if (!rmarkdown::pandoc_available()) warning("Can't find pandoc!")
 
 # SCHEME_MAIN UNPACK ==========================
-schm            <- readRDS("scheme.rds")
+schms <- readRDS("scheme.rds")
-nav_panels_list <- schm$get_main_form_ui
-
-# two_obj <- purrr::map(
-#   c(one = "configs/schemas/schema.xlsx", two = "configs/schemas/schema_example.xlsx"),
-#   scheme_R6$new
-# )
-# two_obj[["a"]]$get_schema("main")
-# object.size(two_obj)
-# saveRDS(schm, "test.rds")
-# readRDS("test.rds")
-
-# check tables
-
 
 # UI =======================
 ui <- page_sidebar(
@@ -61,12 +50,11 @@ ui <- page_sidebar(
   sidebar = sidebar(
     actionButton("add_new_main_key_button", "Добавить новую запись", icon("plus", lib = "font-awesome")),
     actionButton("save_data_button", "Сохранить данные", icon("floppy-disk", lib = "font-awesome")),
-    actionButton("clean_data_button", "Очистить данные", icon("user-plus", lib = "font-awesome")),
+    actionButton("clean_data_button", "Главная страница", icon("house", lib = "font-awesome")),
     actionButton("load_data_button", "Загрузить данные", icon("pencil", lib = "font-awesome")),
     downloadButton("downloadDocx", "get .docx (test only)"),
-    textOutput("status_message"),
+    uiOutput("status_message"),
     textOutput("status_message2"),
-    uiOutput("admin_buttons_panel"),
     uiOutput("display_log"),
     position = "left",
     open = list(mobile = "always")
@@ -79,7 +67,7 @@ ui <- page_sidebar(
 
 # init auth =======================
 if (AUTH_ENABLED) {
-  # shinymanager::set_labels("en", "Please authenticate" = "aboba")
+  # shinymanager::set_labels("en", "Please authenticate" = "scheme()")
   ui <- ui |> 
     shinymanager::secure_app(
       status = "primary",
@@ -106,7 +94,7 @@ if (AUTH_ENABLED) {
 # SERVER LOGIC =============================
 server <- function(input, output, session) {
   
-  # AUTH SETUP ========================================
+  # AUTH SETUP =============================================
   res_auth <- if (AUTH_ENABLED) {
     # check_credentials directly on sqlite db
     shinymanager::secure_server(
@@ -130,18 +118,22 @@ server <- function(input, output, session) {
     if (AUTH_ENABLED) {
       reactiveValuesToList(res_auth)
       if (res_auth$admin) {
-        print("admin")
+        # print("admin")
       } else {
-        print("not_admin")
+        # print("not_admin")
         showing_buttons <- FALSE
       }
     }
 
     if (showing_buttons) {
-      fluidRow(
+      tagList(
-        downloadButton("downloadData", "Экспорт в .xlsx"),
+        br(),
-        p(""), # separate buttons
+        strong("Импорт и экспорт данных для выбранной схемы:"),
-        actionButton("button_upload_data_from_xlsx", "импорт!", icon("file-import", lib = "font-awesome"))
+        verticalLayout(
+          downloadButton("downloadData", "Экспорт в .xlsx", style = "width: 250px; margin-top: 5px"),
+          actionButton("button_upload_data_from_xlsx", "импорт!", icon("file-import", lib = "font-awesome"), style = "width: 250px; margin-top: 10px"),
+          fluid = FALSE 
+        )
       )
     }
   })
@@ -155,26 +147,44 @@ server <- function(input, output, session) {
     nested_form_id = NULL
   )
 
-  # VALIDATIONS ============================
+  scheme <- reactiveVal(enabled_schemas[1]) # наименование выбранной схемы
-  # create new validator
+  mhcs   <- reactiveVal(schms[[enabled_schemas[1]]]) # объект для выбранной схемы
-  # TODO: как осуществить инициализацию валидатора после
+  observers_started <- reactiveVal(NULL)
-  iv_main <- data_validation$init_val(schm$get_schema("main"))
-  iv_main$enable()
 
-  # динамический рендеринг --------------------------
+  main_form_is_empty <- reactiveVal(TRUE)
+  validator_main   <- reactiveVal(NULL)
+  validator_nested <- reactiveVal(NULL)
+
+  # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  # ГЛАВНАЯ СТРАНИЦА ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   output$main_ui_navset <- renderUI({
 
-    shiny::validate(
+    if (main_form_is_empty()) {
-      need(values$main_key, "Для начала работы нужно создать новую запись или загрузить существующую!")
+      validator_main(NULL)
-    )
+      div(
+        shiny::radioButtons(
+          "schmes_selector",
+          label = strong("Выбрать базу данных для работы:"),
+          choices = enabled_schemas,
+          selected = scheme()
+        ),
+        "Для начала работы нужно создать новую запись или загрузить существующую!",
+        # загрузка панели для работы с базой данных
+        uiOutput("admin_buttons_panel")
+      )
+    } else {
 
-    # list of rendered panels
+      # list of rendered panels
-    navset_card_underline(
+      validator_main(data_validation$init_val(mhcs()$get_scheme("main")))
-      id = "main",
+      validator_main()$enable()
-      !!!nav_panels_list,
+      mhcs()$get_main_form_ui
-      header = NULL,
+    }
-      height = NULL
+  })
-    )
+
+  observeEvent(input$schmes_selector, {
+    scheme(input$schmes_selector)
+    mhcs(schms[[input$schmes_selector]])
   })
 
   # ==========================================
@@ -189,13 +199,13 @@ server <- function(input, output, session) {
     ns
   ) {
 
-    input_types <- unname(schm$get_id_type_list(table_name))
+    input_types <- unname(mhcs()$get_id_type_list(table_name))
-    input_ids   <- names(schm$get_id_type_list(table_name))
+    input_ids   <- names(mhcs()$get_id_type_list(table_name))
     if (missing(ns)) ns <- NULL
 
     # transform df to list
-    loaded_df_for_id <- as.list(df)
+    # loaded_df_for_id <- as.list(df)
-    loaded_df_for_id <- df[input_ids]
+    # loaded_df_for_id <- df[input_ids]
 
     # rewrite input forms
     purrr::walk2(
@@ -208,7 +218,7 @@ server <- function(input, output, session) {
           form_id = x_id,
           form_type = x_type,
           value = df[[x_id]],
-          scheme = schm$get_schema(table_name),
+          scheme = mhcs()$get_scheme(table_name),
           ns = ns
         )
       }
@@ -223,9 +233,9 @@ server <- function(input, output, session) {
     con
   ) {
 
-    nested_key_id <- schm$get_key_id(table_name)
+    nested_key_id <- mhcs()$get_key_id(table_name)
-    input_types <- unname(id_and_types_list)
+    input_types   <- unname(id_and_types_list)
-    input_ids   <- names(id_and_types_list)
+    input_ids     <- names(id_and_types_list)
 
     if (missing(ns)) ns <- NULL
 
@@ -260,7 +270,7 @@ server <- function(input, output, session) {
     if (table_name == "main") {
       exported_df <- exported_df |>
         mutate(
-          !!dplyr::sym(schm$get_main_key_id) := values$main_key,
+          !!dplyr::sym(mhcs()$get_main_key_id) := values$main_key,
           .before = 1
         )
     }
@@ -269,8 +279,8 @@ server <- function(input, output, session) {
     if (table_name != "main") {
       exported_df <- exported_df |>
         mutate(
-          !!dplyr::sym(schm$get_main_key_id) := values$main_key,
+          !!dplyr::sym(mhcs()$get_main_key_id) := values$main_key,
-          !!dplyr::sym(nested_key_id) := values$nested_key,
+          !!dplyr::sym(nested_key_id)          := values$nested_key,
           .before = 1
         )
     }
@@ -281,8 +291,8 @@ server <- function(input, output, session) {
     db$write_df_to_db(
       df = exported_df,
       table_name = table_name,
-      schm = schm,
+      schm = mhcs(),
-      main_key_value = values$main_key,
+      main_key_value   = values$main_key,
       nested_key_value = values$nested_key,
       con = con
     )
@@ -292,39 +302,51 @@ server <- function(input, output, session) {
   # NESTED FORMS =======================
   # ====================================
   ## кнопки для каждой вложенной таблицы -------------------------------
-  purrr::walk(
+  observe({
-    .x = schm$nested_tables_names,
-    .f = \(nested_form_id) {
 
-      observeEvent(input[[nested_form_id]], {
+    # проверка инициализированы ли для этой схемы наблюдатели для кнопок вложенных таблиц
-        req(values$main_key)
+    is_observer_is_started <- (isolate(scheme()) %in% isolate(observers_started()))
 
-        con <- db$make_db_connection("nested_tables")
+    if (is_observer_is_started) return()
-        on.exit(db$close_db_connection(con, "nested_tables"), add = TRUE)
+    purrr::walk(
+      .x = mhcs()$nested_tables_names,
+      .f = \(nested_form_id) {
+        
+        observeEvent(input[[nested_form_id]], {
+          req(values$main_key)
+  
+          con <- db$make_db_connection(scheme(),"nested_tables")
+          on.exit(db$close_db_connection(con, "nested_tables"), add = TRUE)
+  
+          values$nested_form_id <- nested_form_id
+          values$nested_key     <- NULL           # для нормальной работы реактивных значений
+          show_modal_for_nested_form(con)
+  
+        })
+      }
+    )
 
-        values$nested_form_id <- nested_form_id
+    # добавить идентификатор текущей схемы в список иницииализированных валидаторов
-        values$nested_key     <- NULL # для нормальной работы реактивных значений
+    observers_started(c(
-        show_modal_for_nested_form(con)
+      isolate(observers_started()), isolate(scheme())
-
+    ))
-      })
+  })
-    }
-  )
 
   ## функция отображения вложенной формы для выбранной таблицы --------
   show_modal_for_nested_form <- function(con) {
 
-    ns <- NS(values$nested_form_id)
+    ns     <- NS(values$nested_form_id)
-    key_id <- schm$get_key_id(values$nested_form_id)
+    key_id <- mhcs()$get_key_id(values$nested_form_id)
 
     # загрузка схемы для данной вложенной формы
-    this_nested_form_scheme <-  schm$get_schema(values$nested_form_id)
+    this_nested_form_scheme <- mhcs()$get_scheme(values$nested_form_id)
 
     # мини-схема для ключа
     this_nested_form_key_scheme <- subset(this_nested_form_scheme, form_id == key_id)
     if (nrow(this_nested_form_key_scheme) > 1) cli::cli_abort("количество строк не может быть больше одного для ключа")
 
     # выбираем все ключи из баз данных
-    kyes_for_this_table <- db$get_nested_keys_from_table(values$nested_form_id, schm, values$main_key, con)
+    kyes_for_this_table <- db$get_nested_keys_from_table(values$nested_form_id, mhcs(), values$main_key, con)
     kyes_for_this_table <- unique(c(values$nested_key, kyes_for_this_table))
     kyes_for_this_table <- sort(kyes_for_this_table)
     values$nested_key <- if (length(kyes_for_this_table) == 0) NULL else kyes_for_this_table[[1]]
@@ -338,8 +360,8 @@ server <- function(input, output, session) {
     }
 
     # nested ui
-    if (!is.null(values$nested_key)) {
+    nested_form_panels <- if (!is.null(values$nested_key)) {
-      yay_its_fun <- purrr::map(
+      purrr::map(
         .x = unique(this_nested_form_scheme$subgroup),
         .f = \(subgroup) {
 
@@ -359,9 +381,8 @@ server <- function(input, output, session) {
         }
       )
     } else {
-      yay_its_fun <- list(bslib::nav_panel("", "empty"))
+      list(bslib::nav_panel("", div("Нет доступных записей.", br(), "Необходимо создать новую запись.")))
     }
-    # yay_its_fun <- !!!yay_its_fun
 
     # ui для всплывающего окна 
     ui_for_inline_table <- navset_card_underline(
@@ -369,23 +390,23 @@ server <- function(input, output, session) {
         width = 300,
         selectizeInput(
           inputId = "nested_key_selector",
-          label = this_nested_form_key_scheme$form_label, 
+          label = strong(this_nested_form_key_scheme$form_label),
           choices = kyes_for_this_table,
           selected = values$nested_key,
           # options = list(placeholder = "действие комиссии", create = FALSE, onInitialize = I('function() { this.setValue(""); }'))
         ),
-        actionButton("add_new_nested_key_button", "add"),
+        actionButton("add_new_nested_key_button", "Добавить новую запись", icon("plus", lib = "font-awesome")),
-        actionButton("nested_form_save_button", "save"),
+        actionButton("nested_form_save_button", "Сохранить данные", icon("floppy-disk", lib = "font-awesome")),
-        actionButton("nested_form_dt_button", "dt"),
+        actionButton("nested_form_dt_button", "DT", icon("table", lib = "font-awesome")),
+        uiOutput("validation_nested"),
         open = list(mobile = "always-above")
       ),
-      # if (!is.null(values$nested_key)) {rlang::syms(!!!yay_its_fun)} else bslib::nav_panel("empty")
+      !!!nested_form_panels
-      !!!yay_its_fun
     )
 
     # проверка данных для внутренних таблиц
-    iv_inner <- data_validation$init_val(this_nested_form_scheme, ns)
+    validator_nested(data_validation$init_val(this_nested_form_scheme, ns))
-    iv_inner$enable()
+    validator_nested()$enable()
 
     showModal(modalDialog(
       ui_for_inline_table,
@@ -398,25 +419,27 @@ server <- function(input, output, session) {
   ### функция для отображения DT-таблицы для выбранной вложенной формы --------
   show_modal_for_nested_form_dt <- function(con) {
 
-    key_id <- schm$get_key_id(values$nested_form_id)
+    key_id <- mhcs()$get_key_id(values$nested_form_id)
 
     # получение дата-фрейма
     values$data <- db$read_df_from_db_by_id(
       table_name = values$nested_form_id, 
-      schm,
+      mhcs(),
       main_key_value = values$main_key,
       con = con
     )
 
-    col_types <- schm$get_schema(values$nested_form_id) |>
+    col_types <- mhcs()$get_scheme_with_values_forms(values$nested_form_id) |>
       dplyr::distinct(form_id, form_type, form_label)
 
-    date_cols <- subset(col_types, form_type == "date", form_id, drop = TRUE)
+    date_cols <- which(col_types$form_type == "date")
+    str_cols  <- which(col_types$form_type != "date")
 
     values$data <- values$data |>
-      select(-schm$get_main_key_id) |>
+      select(-mhcs()$get_main_key_id) |>
       mutate(
-        dplyr::across(tidyselect::all_of({{date_cols}}), as.Date)
+        dplyr::across(tidyselect::all_of({{date_cols}}), as.Date),
+        dplyr::across(tidyselect::all_of({{str_cols}}), as.character),
       ) |>
       arrange({{key_id}})
 
@@ -425,7 +448,7 @@ server <- function(input, output, session) {
         values$data,
         caption = 'Table 1: This is a simple caption for the table.',
         rownames = FALSE,
-        # colnames = dplyr::pull(col_types, form_id, form_label),
+        colnames = col_types |> dplyr::pull(form_id, form_label),
         extensions = c('KeyTable', "FixedColumns"),
         editable = 'cell',
         selection = "none",
@@ -436,7 +459,8 @@ server <- function(input, output, session) {
           keys = TRUE
         )
       ) |>
-        DT::formatDate(date_cols, "toLocaleDateString", params = list('ru-RU'))
+        DT::formatDate(date_cols, "toLocaleDateString", params = list('ru-RU')) |>
+        DT::formatString(str_cols)
     )
 
     showModal(modalDialog(
@@ -450,73 +474,86 @@ server <- function(input, output, session) {
     
   }
 
-  ### обновление данных при изменении --------------------
+  ### обновление данных при изменении DT --------------------
   observeEvent(input$dt_nested_cell_edit, {
     values$data <- DT::editData(values$data, input$dt_nested_cell_edit, 'dt_nested', rownames = FALSE)
   })
 
-  ### кнопка: отображение -----------------------------
+  ### кнопка: отображение DT -----------------------------
   observeEvent(input$nested_form_dt_button, {
-    con <- db$make_db_connection("nested_form_save_button")
+    con <- db$make_db_connection(scheme(),"nested_form_save_button")
     on.exit(db$close_db_connection(con, "nested_form_save_button"), add = TRUE)
 
     removeModal()
     show_modal_for_nested_form_dt(con)
   })
 
-  ### кнопка: сохранить изменения --------------------
+  ### кнопка: сохранить изменения DT --------------------
   observeEvent(input$nested_form_dt_save, {
   
-    con <- db$make_db_connection("nested_form_dt_save")
+    con <- db$make_db_connection(scheme(),"nested_form_dt_save")
     on.exit(db$close_db_connection(con, "nested_form_dt_save"), add = TRUE)
 
     export_df <- values$data |>
       dplyr::distinct() |>
-      dplyr::mutate(!!dplyr::sym(schm$get_main_key_id) := values$main_key, .before = 1)
+      dplyr::mutate(!!dplyr::sym(mhcs()$get_main_key_id) := values$main_key, .before = 1)
 
     db$write_df_to_db(
       df = export_df,
       table_name = values$nested_form_id,
-      schm,
+      mhcs(),
       main_key_value = values$main_key,
       nested_key_value = NULL,
       con = con
     )
 
     log_action_to_db("saving data (gt)", values$main_key, con)
-
+    showNotification(
+      "Данные успешно сохранены",
+      type = "message"
+    )
   })
 
   ## сохранение данных из вложенной формы ---------------
   observeEvent(input$nested_form_save_button, {
     req(values$nested_form_id)
 
-    con <- db$make_db_connection("nested_form_save_button")
+    con <- db$make_db_connection(scheme(),"nested_form_save_button")
     on.exit(db$close_db_connection(con, "nested_form_save_button"), add = TRUE)
     
     # сохраняем данные основной формы!!!
     save_inputs_to_db(
       table_name        = "main",
-      id_and_types_list = schm$get_id_type_list("main"),
+      id_and_types_list = mhcs()$get_id_type_list("main"),
       con               = con
     )
 
     # сохраняем данные текущей вложенной таблицы
     save_inputs_to_db(
       table_name        = values$nested_form_id,
-      id_and_types_list = schm$get_id_type_list(values$nested_form_id),
+      id_and_types_list = mhcs()$get_id_type_list(values$nested_form_id),
       ns                = NS(values$nested_form_id),
       con = con
     )
 
     log_action_to_db("saving data", values$main_key, con)
-
     showNotification(
-      "Данные успешно сохраннены",
+      "Данные успешно сохранены",
       type = "message"
     )
   })
 
+  ## nested validation ------------------------------------
+  output$validation_nested <- renderText({
+    req(validator_nested())
+
+    if (validator_nested()$is_valid()) {
+      "✅ Данные внесены корректно"
+    } else {
+      "⚠️ Данные внесены не полностью или некорректно"
+    }
+  })
+
   ## обновление данных при переключении ключей ------------
   observeEvent(input$nested_key_selector, {
     req(input$nested_key_selector)
@@ -529,17 +566,17 @@ server <- function(input, output, session) {
 
   observeEvent(values$nested_key, {
 
-    con <- db$make_db_connection("nested_tables")
+    con <- db$make_db_connection(scheme(),"nested_tables")
     on.exit(db$close_db_connection(con, "nested_tables"), add = TRUE)
 
-    kyes_for_this_table <- db$get_nested_keys_from_table(values$nested_form_id, schm, values$main_key, con)
+    kyes_for_this_table <- db$get_nested_keys_from_table(values$nested_form_id, mhcs(), values$main_key, con)
 
     if (values$nested_key %in% kyes_for_this_table) {
 
       # выгрузка датафрейма по общим и вложенным ключам
       df <- db$read_df_from_db_by_id(
         table_name = values$nested_form_id,
-        schm,
+        mhcs(),
         main_key_value   = values$main_key,
         nested_key_value = values$nested_key,
         con = con
@@ -549,7 +586,7 @@ server <- function(input, output, session) {
       load_data_to_form(
         df                = df,
         table_name = values$nested_form_id,
-        schm,
+        mhcs(),
         ns                = NS(values$nested_form_id)
       )
     }
@@ -561,8 +598,8 @@ server <- function(input, output, session) {
     removeModal()
 
     # та самая форма для ключа
-    scheme_for_key_input <- schm$get_schema(values$nested_form_id) |>
+    scheme_for_key_input <- mhcs()$get_scheme(values$nested_form_id) |>
-      dplyr::filter(form_id == schm$get_key_id(values$nested_form_id))
+      dplyr::filter(form_id == mhcs()$get_key_id(values$nested_form_id))
 
     ui1 <- rlang::exec(
       .fn = utils$render_forms, 
@@ -583,19 +620,19 @@ server <- function(input, output, session) {
 
   # действие при подтверждении создания новой записи
   observeEvent(input$confirm_create_new_nested_key, {
-    req(input[[schm$get_key_id(values$nested_form_id)]])
+    req(input[[mhcs()$get_key_id(values$nested_form_id)]])
 
-    con <- db$make_db_connection("confirm_create_new_key")
+    con <- db$make_db_connection(scheme(),"confirm_create_new_key")
     on.exit(db$close_db_connection(con, "confirm_create_new_key"), add = TRUE)
 
     existed_key <- db$get_nested_keys_from_table(
       table_name = values$nested_form_id,
-      schm,
+      mhcs(),
       main_key_value = values$main_key,
       con
     )
 
-    if (input[[schm$get_key_id(values$nested_form_id)]] %in% existed_key) {
+    if (input[[mhcs()$get_key_id(values$nested_form_id)]] %in% existed_key) {
       showNotification(
         sprintf("В базе уже запись с данным ключем."),
         type = "error"
@@ -603,8 +640,8 @@ server <- function(input, output, session) {
       return()
     }
     
-    values$nested_key <- input[[schm$get_key_id(values$nested_form_id)]]
+    values$nested_key <- input[[mhcs()$get_key_id(values$nested_form_id)]]
-    utils$clean_forms(values$nested_form_id, schm, NS(values$nested_form_id))
+    utils$clean_forms(values$nested_form_id, mhcs(), NS(values$nested_form_id))
     removeModal()
     show_modal_for_nested_form(con)
 
@@ -612,15 +649,26 @@ server <- function(input, output, session) {
 
   # STATUSES ===============================
   # вывести отображение что что-то не так
-  output$status_message <- renderText({
+  output$status_message <- renderUI({
+
     shiny::validate(
       need(values$main_key, "⚠️ Необходимо указать id пациента!")
     )
-    paste0("ID: ", values$main_key)
+    span(
+      strong("Таблица: "), names(enabled_schemas)[enabled_schemas == scheme()],
+      br(),
+      strong("ID: "), values$main_key
+    )
   })
 
   output$status_message2 <- renderText({
-    iv_main$is_valid()
+    req(validator_main())
+
+    if (validator_main()$is_valid()) {
+      "✅ Данные внесены корректно"
+    } else {
+      "⚠️ Данные внесены не полностью или некорректно"
+    }
   })
 
   # =========================================
@@ -630,8 +678,8 @@ server <- function(input, output, session) {
   observeEvent(input$add_new_main_key_button, {
 
     # данные для главного ключа
-    scheme_for_key_input <- schm$get_schema("main") |>
+    scheme_for_key_input <- mhcs()$get_scheme("main") |>
-      dplyr::filter(form_id == schm$get_main_key_id)
+      dplyr::filter(form_id == mhcs()$get_main_key_id)
 
     # создать форму для выбора ключа
     ui1 <- rlang::exec(
@@ -654,14 +702,14 @@ server <- function(input, output, session) {
 
   ## действие при подтверждении (проверка нового создаваемого ключа) -------
   observeEvent(input$confirm_create_new_main_key, {
-    req(input[[schm$get_main_key_id]])
+    req(input[[mhcs()$get_main_key_id]])
 
-    con <- db$make_db_connection("confirm_create_new_main_key")
+    con <- db$make_db_connection(scheme(),"confirm_create_new_main_key")
     on.exit(db$close_db_connection(con, "confirm_create_new_key"), add = TRUE)
 
-    new_main_key <- trimws(input[[schm$get_main_key_id]])
+    new_main_key <- trimws(input[[mhcs()$get_main_key_id]])
 
-    existed_key <- db$get_keys_from_table("main", schm, con)
+    existed_key <- db$get_keys_from_table("main", mhcs(), con)
 
     # если введенный ключ уже есть в базе
     if (new_main_key %in% existed_key) {
@@ -673,8 +721,9 @@ server <- function(input, output, session) {
     }
     
     values$main_key <- new_main_key
+    main_form_is_empty(FALSE)
     log_action_to_db("creating new key", values$main_key, con)
-    utils$clean_forms("main", schm)
+    utils$clean_forms("main", mhcs())
 
     removeModal()
   })
@@ -697,8 +746,9 @@ server <- function(input, output, session) {
   observeEvent(input$clean_all_action, {
     
     # rewrite all inputs with empty data
-    utils$clean_forms("main", schm)
     values$main_key <- NULL
+    utils$clean_forms("main", mhcs())
+    main_form_is_empty(TRUE)
 
     removeModal()
     showNotification("Данные очищены!", type = "warning")
@@ -708,12 +758,12 @@ server <- function(input, output, session) {
   observeEvent(input$save_data_button, {
     req(values$main_key)
 
-    con <- db$make_db_connection("save_data_button")
+    con <- db$make_db_connection(scheme(),"save_data_button")
     on.exit(db$close_db_connection(con, "save_data_button"), add = TRUE)
 
     save_inputs_to_db(
       table_name = "main",
-      id_and_types_list = schm$get_id_type_list("main"),
+      id_and_types_list = mhcs()$get_id_type_list("main"),
       con = con
     )
 
@@ -727,13 +777,13 @@ server <- function(input, output, session) {
   ## список ключей для загрузки данных -------------------
   observeEvent(input$load_data_button, {
 
-    con <- db$make_db_connection("load_data_button")
+    con <- db$make_db_connection(scheme(),"load_data_button")
     on.exit(db$close_db_connection(con, "load_data_button"))
 
     if (length(dbListTables(con)) != 0 && "main" %in% DBI::dbListTables(con)) {
 
       # GET DATA files
-      ids <- db$get_keys_from_table("main", schm, con)
+      ids <- db$get_keys_from_table("main", mhcs(), con)
 
       ui_load_menu <- renderUI({
         selectizeInput(
@@ -759,8 +809,8 @@ server <- function(input, output, session) {
         ui_load_menu,
         title = "Загрузить имеющиеся данные",
         footer = tagList(
-          actionButton("close_modal_button", "Отмена", class = "btn btn-danger"),
           actionButton("load_data", "Загрузить данные"),
+          actionButton("close_modal_button", "Отмена", class = "btn-danger"),
         ),
         easyClose = TRUE
       )
@@ -771,12 +821,12 @@ server <- function(input, output, session) {
   observeEvent(input$load_data, {
     req(input$load_data_key_selector)
 
-    con <- db$make_db_connection("load_data")
+    con <- db$make_db_connection(scheme(),"load_data")
     on.exit(db$close_db_connection(con, "load_data"), add = TRUE)
 
     df <- db$read_df_from_db_by_id(
       table_name = "main", 
-      schm = schm,
+      schm = mhcs(),
       main_key_value = input$load_data_key_selector,
       con = con
     )
@@ -784,35 +834,41 @@ server <- function(input, output, session) {
     load_data_to_form(
       df = df,
       table_name = "main",
-      schm
+      mhcs()
     )
     
     values$main_key <- input$load_data_key_selector
+    main_form_is_empty(FALSE)
+
     log_action_to_db("loading data", values$main_key, con = con)
     removeModal()
 
   })
 
-  ## export to .xlsx ====
+  ## export to .xlsx ======================
   output$downloadData <- downloadHandler(
-    filename = paste0("test_", format(Sys.time(), "%Y%m%d_%H%M%S"), ".xlsx"),
+    filename = function(){
+      paste0(isolate(scheme()), "_", format(Sys.time(), "%Y%m%d_%H%M%S"), ".xlsx")
+    },
     content = function(file) {
-      con <- db$make_db_connection("downloadData")
+
+      con <- db$make_db_connection(isolate(scheme()),"downloadData")
       on.exit(db$close_db_connection(con, "downloadData"), add = TRUE)
 
       # get all data
       list_of_df <- purrr::map(
-        .x = purrr::set_names(schm$all_tables_names),
+        .x = purrr::set_names(mhcs()$all_tables_names),
         .f = \(x) {
 
           df <- read_df_from_db_all(x, con) |>
             tibble::as_tibble()
 
           # handle with data
-          scheme <- schm$get_schema(x)
+          scheme <- mhcs()$get_scheme(x)
 
           date_columns   <- subset(scheme, form_type == "date", form_id, drop = TRUE)
           number_columns <- subset(scheme, form_type == "number", form_id, drop = TRUE)
+          other_cols     <- which(colnames(df) %in% c(date_columns, number_columns))
 
           df <- df |>
             dplyr::mutate(
@@ -820,12 +876,24 @@ server <- function(input, output, session) {
               dplyr::across(tidyselect::all_of({{date_columns}}), as.Date),
               # числа - к единому формату десятичных значений
               dplyr::across(tidyselect::all_of({{number_columns}}), ~ gsub("\\.", "," , .x)),
-            )
+              dplyr::across(tidyselect::all_of({{other_cols}}), as.character)
+            ) |>
+            # очистка от пустых ключей
+            dplyr::filter(!is.na(mhcs()$get_main_key_id))
 
           df
         }
       )
 
+      # добавить мета информацию
+      list_of_df[["meta"]] <- dplyr::tribble(
+        ~`Параметр`      , ~`Значение`,
+        "Пользователь"   , ifelse(AUTH_ENABLED, res_auth$user, "anonymous"),
+        "Название базы"  , names(enabled_schemas)[enabled_schemas == scheme()],
+        "id базы"        , scheme(),
+        "Время выгрузки" , format(Sys.time(), "%d.%m.%Y %H:%M:%S"),
+      )
+
       # set date params
       options("openxlsx2.dateFormat" = "dd.mm.yyyy")
 
@@ -859,10 +927,11 @@ server <- function(input, output, session) {
         "---",
         "\n"
       )
+      box::use(modules/data_manipulations[is_this_empty_value])
 
       # iterate by scheme parts
       purrr::walk(
-        .x = unique(schm$get_schema("main")$part),
+        .x = unique(mhcs()$get_scheme("main")$part),
         .f = \(x_iter1) {
           # write level 1 header
           HEADER_1 <- paste("#", x_iter1, "\n")
@@ -870,14 +939,14 @@ server <- function(input, output, session) {
 
           # iterate by level2 headers (subgroups)
           purrr::walk(
-            .x = dplyr::pull(unique(subset(schm$get_schema("main"), part == x_iter1, "subgroup"))),
+            .x = dplyr::pull(unique(subset(mhcs()$get_scheme("main"), part == x_iter1, "subgroup"))),
             .f = \(x_iter2) {
               # get header 2 name
               HEADER_2 <- paste("##", x_iter2, "\n")
 
               # for some reason set litle scheme...
               litle_scheme <- subset(
-                x = schm$get_schema("main"),
+                x = mhcs()$get_scheme("main"),
                 subset = part == x_iter1 & subgroup == x_iter2,
                 select = c("form_id", "form_label", "form_type")
               ) |>
@@ -898,7 +967,7 @@ server <- function(input, output, session) {
                     if (length(docx_value) > 1) docx_value <- paste(docx_value, collapse = ", ")
 
                     # if non empty data - add string
-                    if (!check_for_empty_data(docx_value)) paste0("**", docx_label, "**: ", docx_value, "\n") else NA
+                    if (!is_this_empty_value(docx_value)) paste0("**", docx_label, "**: ", docx_value, "\n") else NA
                   } else if (docx_type == "description") {
                     # treat description label as citation text
                     paste0(">", docx_label, "\n")
@@ -953,8 +1022,8 @@ server <- function(input, output, session) {
       ),
       checkboxInput("upload_data_from_xlsx_owerwrite_all_data", "перезаписать все данные", width = 450),
       footer = tagList(
-        modalButton("Отмена"),
+        actionButton("button_upload_data_from_xlsx_confirm", "Добавить"),
-        actionButton("button_upload_data_from_xlsx_confirm", "Добавить")
+        actionButton("close_modal_button", "Отмена", class = "btn-danger")
       ),
       easyClose = FALSE
     ))
@@ -964,56 +1033,55 @@ server <- function(input, output, session) {
   observeEvent(input$button_upload_data_from_xlsx_confirm, {
     req(input$upload_xlsx)
 
-    con <- db$make_db_connection("button_upload_data_from_xlsx_confirm")
+    con <- db$make_db_connection(scheme(),"button_upload_data_from_xlsx_confirm")
     on.exit(db$close_db_connection(con, "button_upload_data_from_xlsx_confirm"), add = TRUE)
 
     file <- input$upload_xlsx$datapath
     wb <- openxlsx2::wb_load(file)
 
-    main_key_id <- schm$get_main_key_id
+    main_key_id <- mhcs()$get_main_key_id
 
     # проверка на наличие всех листов в файле
-    if (!all(schm$all_tables_names %in% openxlsx2::wb_get_sheet_names(wb))) {
+    if (!all(mhcs()$all_tables_names %in% openxlsx2::wb_get_sheet_names(wb))) {
       cli::cli_alert_warning("данные в файле '{file} не соответствуют схеме'")
       return()
     }
 
     # проверка схемы --------------
-    for (table_name in schm$all_tables_names) {
+    for (table_name in mhcs()$all_tables_names) {
 
       df     <- openxlsx2::read_xlsx(wb, table_name) 
-      scheme <- schm$get_schema(table_name) |>
+      scheme <- mhcs()$get_scheme_with_values_forms(table_name) 
-        filter(!form_type %in% c("description", "nested_forms"))
 
       # столбцы в таблицы и схема
       df_to_schema_compare <- setdiff(colnames(df), unique(scheme$form_id))
+      df_to_schema_compare <- df_to_schema_compare[df_to_schema_compare != main_key_id]
       schema_to_df_compare <- setdiff(unique(scheme$form_id), colnames(df))
 
-      if (length(schema_to_df_compare) > 0 ) {
+      if (length(df_to_schema_compare) > 0 ) {
         cli::cli_warn(c("в схеме для '{table_name}' нет следующих столбцов:", paste("- ", df_to_schema_compare)))
       }
 
       # схема и столбцы в таблице
-      schema_to_df_compare <- setdiff(unique(scheme$form_id), colnames(df))
       if (length(schema_to_df_compare) > 0 ) {
 
         message <- glue::glue("столбцы в таблице '{table_name}' не соответсвуют схеме")
-        cli::cli_warn(c(message, paste("- ", schema_to_df_compare)))
         showNotification(message, type = "error")
+        cli::cli_warn(c(message, paste("- ", schema_to_df_compare)))
 
         return()
       }
     }
 
     # обновление данных
-    for (table_name in schm$all_tables_names) {
+    for (table_name in mhcs()$all_tables_names) {
 
       df     <- openxlsx2::read_xlsx(wb, table_name) 
-      scheme <- schm$get_schema(table_name) |>
+      scheme <- mhcs()$get_scheme_with_values_forms(table_name)
-        filter(!form_type %in% c("description", "nested_forms"))
 
-      date_columns <- subset(scheme, form_type == "date", form_id, drop = TRUE)
+      date_columns   <- subset(scheme, form_type == "date", form_id, drop = TRUE)
       number_columns <- subset(scheme, form_type == "number", form_id, drop = TRUE)
+      other_cols     <- which(colnames(df) %in% c(date_columns, number_columns))
 
       # функция для преобразование числовых значений и сохранения "NA"
       num_converter <- function(old_col) {
@@ -1031,25 +1099,37 @@ server <- function(input, output, session) {
       df <- df |>
         dplyr::mutate(
           # даты - к единому формату
-          dplyr::across(tidyselect::all_of({{date_columns}}), \(x) purrr::map_chr(x, db$excel_to_db_dates_converter)),
+          dplyr::across(tidyselect::all_of({{date_columns}}),   \(x) purrr::map_chr(x, db$excel_to_db_dates_converter)),
           dplyr::across(tidyselect::all_of({{number_columns}}), num_converter),
+          dplyr::across(tidyselect::all_of({{other_cols}}),     as.character)
         ) |>
         select(all_of(unique(c(main_key_id, scheme$form_id))))
 
       df_original <- DBI::dbReadTable(con, table_name) |>
         as_tibble()
 
-      if (input$upload_data_from_xlsx_owerwrite_all_data == TRUE) cli::cli_abort("not implemented yet")
+      if (input$upload_data_from_xlsx_owerwrite_all_data == TRUE) {
 
-      walk(
+        DBI::dbRemoveTable(con, table_name)
-        .x = unique(df[[main_key_id]]),
-        .f = \(main_key) {
 
-          if (main_key %in% unique(df_original[[main_key_id]])) {
+      } else {
-            DBI::dbExecute(con, glue::glue("DELETE FROM {table_name} WHERE {main_key_id} = '{main_key}'"))
+
+        # удаление данных в базе данных по ключам
+        walk(
+          .x = unique(df[[main_key_id]]),
+          .f = \(main_key) {
+
+            if (main_key %in% unique(df_original[[main_key_id]])) {
+              DBI::dbExecute(con, glue::glue("DELETE FROM {table_name} WHERE {main_key_id} = '{main_key}'"))
+            }
           }
-        }
+        )
-      )
+     
+      }
+
+      # очистка от пустых ключей
+      df <- df |>
+        dplyr::filter(!is.na({{main_key_id}}))
 
       DBI::dbWriteTable(
         con,
@@ -1058,7 +1138,7 @@ server <- function(input, output, session) {
         append = TRUE
       )
 
-      message <- glue::glue("Данные таблицы '{table_name}' успешно обновлены")
+      message <- glue::glue("Данные таблицы '{table_name}' успешно обновлены (добавлено {nrow(df)} записей)")
       showNotification(
         message,
         type = "message"
@@ -1122,7 +1202,7 @@ server <- function(input, output, session) {
 
   #   output$display_log <- renderUI({
 
-  #     con <- db$make_db_connection("display_log")
+  #     con <- db$make_db_connection(scheme(),"display_log")
   #     on.exit(db$close_db_connection(con, "display_log"), add = TRUE)
 
   #     query <- if (!is.null(values$main_key)) {
@@ -1174,4 +1254,4 @@ server <- function(input, output, session) {
 
 app <- shinyApp(ui = ui, server = server)
 
-runApp(app, launch.browser = TRUE)
+runApp(app, launch.browser = TRUE)

helpers/functions.R

@@ -1,27 +0,0 @@
-
-
-#' @description Function check if variable contains some sort of empty data
-#' (NULL, NA, "", other 0-length data) and return `TRUE` (`FALSE` if data is
-#' not 'empty').
-#'
-#' Needed for proper data validation.
-#' (ДУБЛИРУЕТ МОДУЛЬ `data_manipulation`)
-check_for_empty_data <- function(value_to_check) {
-
-  # for any 0-length
-  if (length(value_to_check) == 0) return(TRUE)
-
-  # for NA
-  if (is.logical(value_to_check) && is.na(value_to_check)) return(TRUE)
-
-  # for NULL
-  if (is.null(value_to_check)) return(TRUE)
-
-  # for non-empty Date (RETURN FALSE)
-  if (inherits(value_to_check, "Date") && length(value_to_check) != 0) return(FALSE)
-
-  # for empty strings (stands before checking non-empty data for avoid mistakes)
-  if (value_to_check == "") return(TRUE)
-
-  FALSE
-}

modules/data_manipulations.R

@@ -4,7 +4,8 @@
 #' not 'empty').
 #'
 #' Needed for proper data validation.
-check_for_empty_data <- function(value_to_check) {
+#' @export
+is_this_empty_value = function(value_to_check) {
 
   # for any 0-length
   if (length(value_to_check) == 0) return(TRUE)
@@ -19,7 +20,14 @@ check_for_empty_data <- function(value_to_check) {
   if (inherits(value_to_check, "Date") && length(value_to_check) != 0) return(FALSE)
 
   # for empty strings (stands before checking non-empty data for avoid mistakes)
-  if (value_to_check == "") return(TRUE)
+  if (is.character(value_to_check)) {
+    if (is.na(value_to_check)) return(TRUE)
+    if (value_to_check == "")   return(TRUE)
+  }
 
-  FALSE
+  if (is.double(value_to_check)) {
+    if (is.na(value_to_check)) return(TRUE)
+  }
+
+  return(FALSE)
 }

modules/data_validation.R

@@ -1,9 +1,9 @@
 
 #' @export
-init_val <- function(scheme, ns) {
+init_val = function(scheme, ns) {
 
   options(box.path = here::here())
-  box::use(modules/data_manipulations[check_for_empty_data])
+  box::use(modules/data_manipulations[is_this_empty_value])
 
   iv <- shinyvalidate::InputValidator$new()
 
@@ -15,7 +15,7 @@ init_val <- function(scheme, ns) {
 
   # формируем список id - тип
   inputs_simple_list <- scheme |>
-    dplyr::filter(!form_type %in% c("nested_forms","description", "description_header")) |>
+    dplyr::filter(!form_type %in% c("nested_forms", "description", "description_header")) |>
     dplyr::distinct(form_id, form_type) |>
     tibble::deframe()
 
@@ -39,7 +39,7 @@ init_val <- function(scheme, ns) {
 
         iv$add_rule(x_input_id, function(x) {
           # exit if empty
-          if (check_for_empty_data(x)) {
+          if (is_this_empty_value(x)) {
             return(NULL)
           }
           # хак для пропуска значений
@@ -64,7 +64,7 @@ init_val <- function(scheme, ns) {
               function(x) {
 
                 # exit if empty
-                if (check_for_empty_data(x)) {
+                if (is_this_empty_value(x)) {
                   return(NULL)
                 }
 
@@ -85,11 +85,11 @@ init_val <- function(scheme, ns) {
         }
       }
 
-      if (form_type %in% c("select_multiple", "select_one")) {
+      if (form_type %in% c("select_multiple", "select_one", "radio", "checkbox")) {
         iv$add_rule(x_input_id, function(x) {
 
           if (length(x) == 1) {
-            if (check_for_empty_data(x)) return(NULL)
+            if (is_this_empty_value(x)) return(NULL)
           }
 
           # проверка на соответствие вариантов схеме ---------

modules/db.R

@@ -2,16 +2,16 @@
 #' @export
 #' @description Function to open connection to db, disigned to easy dubugging.
 #' @param where text mark to distingiush calss
-make_db_connection <- function(where = "") {
+make_db_connection = function(scheme, where = "") {
   if (getOption("APP.DEBUG", FALSE)) message("=== DB CONNECT ", where)
-  DBI::dbConnect(RSQLite::SQLite(), getOption("APP.FILE_DB", FALSE))
+  DBI::dbConnect(RSQLite::SQLite(), fs::path("db", scheme, ext = "sqlite"))
 }
 
 #' @export
 #' @description 
 #' Function to close connection to db, disigned to easy dubugging and
 #' hide warnings.
-close_db_connection <- function(con, where = "") {
+close_db_connection = function(con, where = "") {
   tryCatch(
     expr = DBI::dbDisconnect(con),
     error = function(e) print(e),
@@ -23,7 +23,7 @@ close_db_connection <- function(con, where = "") {
 #' @export
 #' @description
 #' Проверить если таблица есть в базе данных и инициировать ее, если от
-check_if_table_is_exist_and_init_if_not <- function(
+check_if_table_is_exist_and_init_if_not = function(
   schm,
   con = rlang::env_get(rlang::caller_env(), nm = "con")
 ) {
@@ -39,7 +39,7 @@ check_if_table_is_exist_and_init_if_not <- function(
 
       if (table_name %in% DBI::dbListTables(con)) {
 
-        cli::cli_inform(c("*" = "таблица есть такая: '{table_name}'"))
+        cli::cli_inform(c("*" = "проверка таблицы в базе данных: '{table_name}'"))
 
         # если таблица существует, производим проверку структуры таблицы
         compare_existing_table_with_schema(
@@ -79,7 +79,7 @@ check_if_table_is_exist_and_init_if_not <- function(
 
 #' @description
 #' Возращает пустое значение для каждого типа формы
-get_dummy_data <- function(type) {
+get_dummy_data = function(type) {
 
   if (type %in% c("text", "select_one", "select_multiple")) return("dummy")
   if (type %in% c("radio", "checkbox")) return("dummy")
@@ -92,7 +92,7 @@ get_dummy_data <- function(type) {
 #' @description
 #' Генерация пустого датасета с пустыми значениями соответствующие
 #' типу данных
-get_dummy_df <- function(forms_id_type_list) {
+get_dummy_df = function(forms_id_type_list) {
 
   options(box.path = here::here())
   box::use(modules/utils)
@@ -108,7 +108,7 @@ get_dummy_df <- function(forms_id_type_list) {
 #' @description
 #' Сравнение полей в существующей в базе данных таблице и попытка
 #' коррекции таблицы
-compare_existing_table_with_schema <- function(
+compare_existing_table_with_schema = function(
   table_name,
   schm,
   con = rlang::env_get(rlang::caller_env(), nm = "con")
@@ -176,7 +176,7 @@ compare_existing_table_with_schema <- function(
 }
 
 #' @export
-write_df_to_db <- function(
+write_df_to_db = function(
   df, 
   table_name, 
   schm,
@@ -185,12 +185,13 @@ write_df_to_db <- function(
   con
 ) {
 
-  scheme         <- schm$get_schema(table_name)
+  scheme         <- schm$get_scheme(table_name)
   main_key_id    <- schm$get_main_key_id
   nested_key_id  <- schm$get_key_id(table_name)
 
   date_columns   <- subset(scheme, form_type == "date", form_id, drop = TRUE)
   number_columns <- subset(scheme, form_type == "number", form_id, drop = TRUE)
+  other_cols     <- which(colnames(df) %in% c(date_columns, number_columns))
 
   df <- df |>
     dplyr::mutate(
@@ -198,7 +199,11 @@ write_df_to_db <- function(
       dplyr::across(tidyselect::all_of({{date_columns}}), \(x) purrr::map_chr(x, excel_to_db_dates_converter)),
       # числа - к единому формату десятичных значений
       dplyr::across(tidyselect::all_of({{number_columns}}), ~ gsub("\\.", "," , .x)),
+      dplyr::across(tidyselect::all_of({{other_cols}}), as.character),
     )
+  
+  df |>
+    dplyr::glimpse()
 
   if (table_name == "main") {
     del_query <- glue::glue("DELETE FROM main WHERE {main_key_id} = '{main_key_value}'")
@@ -225,7 +230,7 @@ write_df_to_db <- function(
 
 #' @export
 #' reading tables from db by name and id ========
-read_df_from_db_by_id <- function(
+read_df_from_db_by_id = function(
   table_name,
   schm,
   main_key_value, 
@@ -264,7 +269,7 @@ read_df_from_db_by_id <- function(
 }
 
 #' @export
-get_keys_from_table <- function(table_name, schm, con) {
+get_keys_from_table = function(table_name, schm, con) {
 
   main_key_id <- schm$get_main_key_id
   DBI::dbGetQuery(con, glue::glue("SELECT DISTINCT {main_key_id} FROM {table_name}")) |>
@@ -273,7 +278,7 @@ get_keys_from_table <- function(table_name, schm, con) {
 }
 
 #' @export
-get_nested_keys_from_table <- function(table_name, schm, main_key_value, con) {
+get_nested_keys_from_table = function(table_name, schm, main_key_value, con) {
 
   main_key_id <- schm$get_main_key_id
   key_id <- schm$get_key_id(table_name)
@@ -286,7 +291,7 @@ get_nested_keys_from_table <- function(table_name, schm, main_key_value, con) {
 
 ### HELPERS ---------
 #' @export
-excel_to_db_dates_converter <- function(date) {
+excel_to_db_dates_converter = function(date) {
 
   if (is.na(date)) return(NA)
   # cli::cli_inform("date: {date} | nchar: {nchar(date)} | typeof: {typeof(date)}")

modules/global_options.R

@@ -1,17 +1,17 @@
 #' @export
 #' @description костыли для упрощения работы себе
-set_global_options <- function(
+set_global_options = function(
   SYMBOL_DELIM = "; ",
   APP.DEBUG = FALSE,
-  APP.FILE_DB = fs::path("data.sqlite"),
+  # APP.FILE_DB = fs::path("data.sqlite"),
   shiny.host = "127.0.0.1",
-  shiny.port = 1337,
+  shiny.port = 1338,
   ...
 ) {
   options(
     SYMBOL_DELIM = SYMBOL_DELIM,
     APP.DEBUG = APP.DEBUG,
-    APP.FILE_DB = APP.FILE_DB,
+    # APP.FILE_DB = APP.FILE_DB,
     shiny.host = shiny.host,
     shiny.port = shiny.port,
     ...
@@ -19,42 +19,62 @@ set_global_options <- function(
 }
 
 #' @export
-check_and_init_scheme <- function() {
+enabled_schemas <- c(
+  `Тестовая база данных` = "example_of_scheme"
+  # `D2TRA (для отладки)` = "d2tra_t"
+)
+
+#' @export
+check_and_init_scheme = function() {
 
   cli::cli_inform(c("*" = "проверка схемы..."))
 
-  scheme_file <- fs::path("configs/schemas", "schema.xlsx")
+  files_to_watch <- c(
-  hash_file   <- "schema_hash.rds"
+    "modules/scheme_generator.R",
+    "modules/utils.R"
+  )
+
+  scheme_names <- enabled_schemas
+  scheme_file <- paste0("configs/schemas/", scheme_names, ".xlsx")
+  scheme_file <- stats::setNames(scheme_file, scheme_names)
+
+  if (!all(file.exists(scheme_file))) cli::cli_abort(c("Отсутствуют файлы схем для следующих наименований:", paste("-", names(scheme_file)[!file.exists(scheme_file)])))
+  
+  db_files <- paste0("db/", scheme_names, ".sqlite")
+
+  hash_file   <- "temp/schema_hash.rds"
 
   # 
-  exist_hash <- tools::md5sum(scheme_file)
+  exist_hash <- tools::md5sum(c(scheme_file, files_to_watch))
 
   # если первый запуск (нет файла с кешем) инициализация схемы
-  if (!file.exists("schema_hash.rds") | !file.exists("scheme.rds")) {
+  if (!file.exists(hash_file) | !file.exists("scheme.rds") | !all(file.exists(db_files))) {
 
     init_scheme(scheme_file)
 
   # в ином случае - проверяем кэш
   } else {
     
-    saved_hash <- readRDS("schema_hash.rds")
+    saved_hash <- readRDS(hash_file)
 
     # если данные были изменены проводим реинициализацию таблицы и схемы
     if (!all(exist_hash == saved_hash)) {
 
-      cli::cli_inform(c(">" = "Данные схемы были изменены..."))
+      cli::cli_inform(c(">" = "Данные схем были изменены..."))
       init_scheme(scheme_file)
+
     } else {
       cli::cli_alert_success("изменений нет")
     }
   }
 
   # перезаписываем файл
+  if (!dir.exists("temp")) dir.create("temp")
   saveRDS(exist_hash, hash_file)
 }
 
 
-init_scheme <- function(scheme_file) {
+init_scheme = function(scheme_file) {
 
   options(box.path = here::here())
   box::use(
@@ -62,12 +82,36 @@ init_scheme <- function(scheme_file) {
     modules/scheme_generator[scheme_R6]
   )
 
-  con <- db$make_db_connection()
+  if (!dir.exists("db")) dir.create("db")
-  on.exit(db$close_db_connection(con), add = TRUE)
 
   cli::cli_h1("Инициализация схемы")
-  schm <- scheme_R6$new(scheme_file)
+  schms <- purrr::map2(
-  db$check_if_table_is_exist_and_init_if_not(schm, con)
+    .x = scheme_file,
+    .y = names(scheme_file),
+    \(x, y) {
 
-  saveRDS(schm, "scheme.rds")
+      con <- db$make_db_connection(y)
-}
+      on.exit(db$close_db_connection(con), add = TRUE)
+
+      schm <- scheme_R6$new(x)
+      db$check_if_table_is_exist_and_init_if_not(schm, con)
+      schm
+    }
+  )
+
+  # проверка на наличие дублирующихся названий вложенных таблиц
+  nested_tables_ids <- purrr::map(
+    names(schms),
+    \(x) schms[[x]]$nested_tables_names
+  )
+  nested_tables_ids <- unlist(nested_tables_ids)
+  tab <- table(nested_tables_ids)
+
+  # если встречается хоть одно значение несколько раз - начать истошно кричать (могут возникнуть пробемы при вызове всплывающих окон в формах)
+  if (!all(!tab > 1)) {
+    cli::cli_abort(c("В одной или нескольких схемах наименования вложенных форм совпадают:", paste("-", names(tab)[tab > 1])))
+    
+  }
+  
+  saveRDS(schms, "scheme.rds")
+}

modules/scheme_generator.R

@@ -1,14 +1,14 @@
 
 #' @export
 scheme_R6 <- R6::R6Class(
-  "schemes_f",
+  "schemes_generator",
   public = list(
 
     initialize = function(scheme_file_path = NULL) {
 
       private$scheme_file_path <- scheme_file_path
 
-      # make list of schemas
+      # make list of schemes
       private$schemes_list <- list()
       private$schemes_list[["main"]] <- private$load_scheme_from_xlsx("main")
 
@@ -18,6 +18,10 @@ scheme_R6 <- R6::R6Class(
         dplyr::distinct(form_id) |>
         dplyr::pull(form_id)
 
+      # проверка на не пересечение с зарезервированными именами
+      check <- private$reserved_table_names %in% private$nested_forms_names
+      if (any(check)) cli::cli_abort(c("нельзя использовать данные имена вложенных таблиц:", paste("- ", private$reserved_table_names[check])))
+
       purrr::walk(
         .x = purrr::set_names(private$nested_forms_names),
         .f = \(nested_form_id) {
@@ -36,13 +40,18 @@ scheme_R6 <- R6::R6Class(
       private$main_key_id <- self$get_key_id("main")
 
       box::use(modules/utils)
-      private$testest     <- utils$make_list_of_pages(private$schemes_list[["main"]], private$main_key_id)
+      private$bslib_rendered_ui <- bslib::navset_card_underline(
+        id = "main",
+        !!!utils$make_list_of_pages(private$schemes_list[["main"]], private$main_key_id),
+        header = NULL,
+        height = NULL
+      )
     },
 
     get_all_ids = function(table_name) {
 
       private$schemes_list[[table_name]] |>
-        dplyr::filter(!form_type %in% private$exluded_types) |>
+        dplyr::filter(!form_type %in% private$excluded_types) |>
         dplyr::distinct(form_id) |>
         dplyr::pull(form_id)
 
@@ -60,32 +69,24 @@ scheme_R6 <- R6::R6Class(
 
     },
 
-    extract_forms_id_and_types_from_scheme2 = function(scheme) {
+    # возврат схемы ------------------------------------
-
+    ## полностью -------
-      form_id_and_types_list <- scheme |>
+    get_scheme = function(table_name) {
-        dplyr::filter(!form_type %in% private$exluded_types) |>
-        dplyr::distinct(form_id, form_type) |>
-        tibble::deframe()
-
-      list(
-        key = form_id_and_types_list[1],
-        form = form_id_and_types_list[-1]
-      )
-    },
-
-    # get_key_id = function(table_name) {
-    #   self$extract_forms_id_and_types_from_scheme2(private$schemes_list[[table_name]])
-    # },
-    get_schema = function(table_name) {
       private$schemes_list[[table_name]]
     },
+    ## с полями имеющие значение -------
+    get_scheme_with_values_forms = function(table_name) {
+      private$schemes_list[[table_name]] |>
+        dplyr::filter(!form_type %in% private$excluded_types)
+    },
+
     get_id_type_list = function(table_name) {
 
       # wo main key
       this_key_id <- self$get_key_id(table_name)
 
       private$schemes_list[[table_name]] |>
-        dplyr::filter(!form_type %in% private$exluded_types) |>
+        dplyr::filter(!form_type %in% private$excluded_types) |>
         dplyr::filter(form_id != {{this_key_id}}) |>
         dplyr::distinct(form_id, form_type) |>
         tibble::deframe()
@@ -102,7 +103,7 @@ scheme_R6 <- R6::R6Class(
       private$nested_forms_names
     },
     get_main_form_ui = function() {
-      private$testest
+      private$bslib_rendered_ui
     }
   ),
   private = list(
@@ -110,8 +111,9 @@ scheme_R6 <- R6::R6Class(
     schemes_list = NULL,
     main_key_id = NA,
     nested_forms_names = NA,
-    testest = NA,
+    bslib_rendered_ui = NA,
-    exluded_types = c("inline_table", "nested_forms","description", "description_header"),
+    excluded_types = c("nested_forms", "description", "description_header"),
+    reserved_table_names = c("meta", "log", "main"),
 
     load_scheme_from_xlsx = function(sheet_name) {
 
@@ -120,24 +122,41 @@ scheme_R6 <- R6::R6Class(
         c("subgroup", "form_id", "form_label", "form_type")
       )
 
-      readxl::read_xlsx(private$scheme_file_path, sheet = sheet_name) |>
+      table <- readxl::read_xlsx(private$scheme_file_path, sheet = sheet_name) |>
         # fill NA down
         tidyr::fill(all_of(colnames), .direction = "down") |>
         dplyr::group_by(form_id) |>
         tidyr::fill(c(condition, required), .direction = "down") |>
         dplyr::ungroup()
 
+      duplicate_ids <- table |>
+        dplyr::mutate(rleid = dplyr::consecutive_id(form_id)) |>
+        dplyr::distinct(form_id, rleid) |>
+        dplyr::count(form_id) |>
+        dplyr::filter(n > 1) |>
+        dplyr::pull(form_id)
+      
+      if (length(duplicate_ids) > 0) {
+        cli::cli_abort(c("В схеме '{private$scheme_file_path}' для формы '{sheet_name}' содержатся повторяющиеся id:", paste("-", duplicate_ids)))
+      }
+
+      # проверка на корректные id
+      input_names_with_dash <- unique(table$form_id)[grepl("-", unique(table$form_id))]
+      if (length(input_names_with_dash) > 0) {
+        cli::cli_abort(c("В схеме '{private$scheme_file_path}' в id форм содержатся `-`, может привести к некорректной последующей работой с базой данных", paste("-", input_names_with_dash)))
+      }
+
+      table
     }
   )
 )
 
-# schm <- scheme_R6$new(fs::path("configs/schemas", "schema.xlsx"))
 # object.size(schm)
 # schm$get_key_id("main")
 # schm$get_forms_ids("main")
 # schm$get_all_ids("main")
 
-# schm$get_schema("main")
+# schm$get_scheme("main")
 
 # schm$get_id_type_list("allergo_anamnesis")
 

modules/utils.R

@@ -1,6 +1,6 @@
 #' @export
-make_list_of_pages <- function(main_schema, main_key_id) {
+make_list_of_pages = function(main_schema, main_key_id) {
-  cli::cli_alert_success("AAAA")
+
   purrr::map(
     .x = unique(main_schema$part),
     .f = \(page_name) {
@@ -22,7 +22,7 @@ make_list_of_pages <- function(main_schema, main_key_id) {
 }
 
 #' @export
-make_panels <- function(scheme) {
+make_panels = function(scheme) {
 
   cards <- purrr::map(
     .x = unique(scheme$subgroup),
@@ -61,7 +61,7 @@ make_panels <- function(scheme) {
 }
 
 #' @export
-render_forms <- function(
+render_forms = function(
   form_id,
   form_label,
   form_type,
@@ -242,7 +242,7 @@ render_forms <- function(
 #' @export
 #' @description
 #' Функция возращает пустое значение для каждого типа формы
-get_empty_data <- function(type) {
+get_empty_data = function(type) {
   if (type %in% c("text", "select_one", "select_multiple")) return(as.character(NA))
   if (type %in% c("radio", "checkbox")) return(as.character(NA))
   if (type %in% c("date")) return(as.Date(NA))
@@ -255,7 +255,7 @@ get_empty_data <- function(type) {
 #' @param type - type of form;
 #' @param value - value to update;
 #' @param local_delimeter - delimeter to split file
-update_forms_with_data <- function(
+update_forms_with_data = function(
   form_id,
   form_type,
   value,
@@ -263,6 +263,15 @@ update_forms_with_data <- function(
   local_delimeter = getOption("SYMBOL_DELIM"),
   ns
 ) {
+  
+  options(box.path = here::here())
+  box::use(modules/data_manipulations[is_this_empty_value])
+
+  # print("-----------------")
+  # cli::cli_inform("form_id: {form_id} | form_type: {form_type}")
+  # print(value)
+  # print(typeof(value))
+  # print(is_this_empty_value(value))
 
   filterd_line <- scheme |>
     dplyr::filter(form_id == {{form_id}})
@@ -294,54 +303,62 @@ update_forms_with_data <- function(
     new_choices <- unique(c(old_choices, value))
     new_choices <- new_choices[!is.na(new_choices)]
 
-
     shiny::updateSelectizeInput(inputId = form_id, selected = value, choices = new_choices)
-    # shiny::updateSelectizeInput(inputId = form_id, selected = value)
   }
 
   # select_multiple
   # check if value is not NA and split by delimetr
-  if (form_type == "select_multiple" && !is.na(value)) {
+  if (form_type == "select_multiple") {
-    vars <- stringr::str_split_1(value, local_delimeter)
+    if (is_this_empty_value(value)) {
+      shiny::updateSelectizeInput(inputId = form_id, selected = as.character(0))
+    } else {
+      vars <- stringr::str_split_1(value, local_delimeter)
 
-    # update choices
+      # update choices
-    old_choices <- filterd_line$choices
+      old_choices <- filterd_line$choices
-    new_choices <- unique(c(old_choices, vars))
+      new_choices <- unique(c(old_choices, vars))
-    new_choices <- new_choices[!is.na(new_choices)]
+      new_choices <- new_choices[!is.na(new_choices)]
-
+      shiny::updateSelectizeInput(inputId = form_id, selected = vars, choices = new_choices)
-    shiny::updateSelectizeInput(inputId = form_id, selected = vars, choices = new_choices)
+    }
-    # shiny::updateSelectizeInput(inputId = form_id, selected = vars)
-  }
-
-  # in other case fill with `character(0)` to proper reseting form
-  if (form_type == "select_multiple" && is.na(value)) {
-    shiny::updateSelectizeInput(inputId = form_id, selected = character(0))
   }
 
   # radio buttons
-  if (form_type == "radio" && !is.na(value)) {
+  if (form_type == "radio") {
-    shiny::updateRadioButtons(inputId = form_id, selected = value)
+    if (is_this_empty_value(value)) {
-  }
+      shiny::updateRadioButtons(inputId = form_id, selected = character(0))
-  if (form_type == "radio" && is.na(value)) {
+    } else {
-    shiny::updateRadioButtons(inputId = form_id, selected = character(0))
+      # update choices
+      old_choices <- filterd_line$choices
+      new_choices <- unique(c(old_choices, value))
+      new_choices <- new_choices[!is.na(new_choices)]
+
+      shiny::updateRadioButtons(inputId = form_id, selected = value, choices = new_choices)
+    }
   }
 
   # checkboxes
-  if (form_type == "checkbox" && !is.na(value)) {
+  if (form_type == "checkbox") {
-    vars <- stringr::str_split_1(value, local_delimeter)
+
-    shiny::updateCheckboxGroupInput(inputId = form_id, selected = vars)
+    if (is_this_empty_value(value)) {
-  }
+      shiny::updateCheckboxGroupInput(inputId = form_id, selected = character(0))
-  if (form_type == "checkbox" && is.na(value)) {
+    } else {
-    shiny::updateCheckboxGroupInput(inputId = form_id, selected = character(0))
+
+      vars <- stringr::str_split_1(value, local_delimeter)
+  
+      # update choices
+      old_choices <- filterd_line$choices
+      new_choices <- unique(c(old_choices, vars))
+      new_choices <- new_choices[!is.na(new_choices)]
+  
+      shiny::updateCheckboxGroupInput(inputId = form_id, selected = vars, choices = new_choices)
+    }
+
   }
 
-  # if (type == "inline_table") {
-  #   message("EMPTY")
-  # }
 }
 
 #' @export
-clean_forms <- function(
+clean_forms = function(
   table_name,
   schm, 
   ns
@@ -361,10 +378,9 @@ clean_forms <- function(
         form_id   = x_id,
         form_type = x_type,
         value     = get_empty_data(x_type),
-        scheme = schm$get_schema(table_name),
+        scheme = schm$get_scheme(table_name),
         ns = ns
       )
     }
   )
-  
 }

renv.lock

@@ -232,14 +232,14 @@
     },
     "box": {
       "Package": "box",
-      "Version": "1.2.0",
+      "Version": "1.2.2",
       "Source": "Repository",
-      "Repository": "RSPM",
+      "Repository": "CRAN",
       "Requirements": [
         "R",
         "tools"
       ],
-      "Hash": "d94049c1d9446b0abb413fde9e82a505"
+      "Hash": "5fd0a60cdaaea2b97046a82c13e17bfe"
     },
     "bslib": {
       "Package": "bslib",

utils/init_login_db.r

@@ -3,7 +3,7 @@
 # SETUP AUTH =============================
 # Init DB using credentials data
 credentials <- data.frame(
-  user = c("admin", "user"),
+  user     = c("admin", "user"),
   password = c("admin", "user"),
   # password will automatically be hashed
   admin = c(TRUE, FALSE),