reafactor: некоторый рефакторинг кода

app.R

@@ -21,8 +21,8 @@ box::use(
 
 global_options$set_global_options(
   shiny.host = "0.0.0.0"
+  # APP.DEBUG = TRUE
 )
-
 global_options$check_and_init_scheme()
 
 # global vars
@@ -30,12 +30,16 @@ box::use(
   modules/global_options[AUTH_ENABLED]
 )
 
-# SETTINGS ================================
-HEADER_TEXT  <- config::get("form_name")
+# MODULES
+box::use(app/forms)
+box::use(app/tasks)
 
-# sadasdasdasdasdas
-options(box.path = config::get("form_app_configure_path"))
-box::use(configs/enabled_schemes[enabled_schemes])
+# refactor LATER ---------
+vv <- unlist(config::get()$form_schemes)
+enabled_schemes <- names(vv)
+vvvv            <- unname(vv)
+names(enabled_schemes) <- vvvv
+# ------------------------
 
 # CHECK FOR PANDOC
 # TEMP ! NEED TO HANDLE
@@ -49,9 +53,9 @@ schms <- readRDS("scheme.rds")
 
 # UI =======================
 ui <- page_sidebar(
-  # title = HEADER_TEXT,
+  # title = config::get("form_name"),
   title = tagList(
-    h4(HEADER_TEXT, style = "margin-top: .5rem"),
+    h4(config::get("form_name"), style = "margin-top: .5rem"),
     popover(
       span(
         config::get("form_app_version"), 
@@ -59,7 +63,7 @@ ui <- page_sidebar(
         style = "color: #9c9c9c"),
       title = "about",
       placement = "left",
-      p("a"), p("b")
+      tagList(span("здесь пока ничего нет"), br(), span("вот"))
     )
   ),
   theme = bs_theme(version = 5, preset = "bootstrap"),
@@ -72,7 +76,7 @@ ui <- page_sidebar(
     uiOutput("status_message"),
     textOutput("status_message2"),
     uiOutput("display_log"),
-    actionButton("shieesh", "Задачи: нет активных"),
+    actionButton("tasks-display_task_modal", "Задачи: нет активных"),
     position = "left",
     open = list(mobile = "always")
   ),
@@ -87,7 +91,7 @@ if (AUTH_ENABLED) {
     shinymanager::secure_app(
       status = "primary",
       tags_top = tags$div(
-        tags$h3(HEADER_TEXT, style = "align:center"),
+        tags$h3(config::get("form_name"), style = "align:center"),
         # tags$img(
         #   src = "https://www.r-project.org/logo/Rlogo.png", width = 100
         # )
@@ -140,6 +144,9 @@ server <- function(input, output, session) {
       }
     }
 
+    # update user name
+    values$current_user <- ifelse(AUTH_ENABLED, res_auth$user, "anonymous")
+
     if (showing_buttons) {
       tagList(
         br(),
@@ -153,6 +160,31 @@ server <- function(input, output, session) {
     }
   })
 
+  output$base_data <- renderUI({
+
+    con <- db$make_db_connection(scheme(),"base_data")
+    on.exit(db$close_db_connection(con, "base_data"), add = TRUE)
+
+    # записей в базе всего
+    query <- glue::glue("SELECT COUNT ({mhcs()$get_main_key_id}) FROM main")
+    records_count <- DBI::dbGetQuery(con, query) |>
+      dplyr::pull()
+
+    # задачи на сегодня
+    if ("tasks" %in% DBI::dbListTables(con)) {
+      query <- glue::glue("SELECT COUNT (task_id) FROM tasks WHERE task_status = 'active'")
+      tasks_count <- DBI::dbGetQuery(con, query) |>
+        dplyr::pull()
+    } else {
+      tasks_count <- 0
+    }
+
+    div(
+      strong("Записей всего:"), records_count, br(),
+      if (tasks_count > 0) p(strong("Задач на сегодня:"), actionLink("tasks-show_dt_today", tasks_count)) else "Задач нет"
+    )
+  })
+
   # REACTIVE VALUES =================================
   # Create a reactive values object to store the input data
   values <- reactiveValues(
@@ -161,7 +193,8 @@ server <- function(input, output, session) {
     main_key = NULL,
     nested_key = NULL,
     nested_form_id = NULL,
-    tasks_id_selector = NULL
+    tasks_id = NULL,
+    current_user = NULL
   )
 
   scheme <- reactiveVal(enabled_schemes[1]) # наименование выбранной схемы
@@ -186,7 +219,9 @@ server <- function(input, output, session) {
           choices = enabled_schemes,
           selected = scheme()
         ),
+        uiOutput("base_data"),
         "Для начала работы нужно создать новую запись или загрузить существующую!",
+        # сво
         # загрузка панели для работы с базой данных
         uiOutput("admin_buttons_panel")
       )
@@ -196,6 +231,7 @@ server <- function(input, output, session) {
       validator_main(data_validation$init_val(mhcs()$get_scheme("main")))
       validator_main()$enable()
       mhcs()$get_main_form_ui
+
     }
   })
 
@@ -208,40 +244,6 @@ server <- function(input, output, session) {
   # ОБЩИЕ ФУНКЦИИ ============================
   # ==========================================
 
-  ## перенос данных из датафрейма в форму -----------------------
-  load_data_to_form <- function(
-    df,
-    table_name = "main",
-    schm,
-    ns
-  ) {
-
-    input_types <- unname(mhcs()$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 <- df[input_ids]
-
-    # rewrite input forms
-    purrr::walk2(
-      .x = input_types,
-      .y = input_ids,
-      .f = \(x_type, x_id) {
-
-        # updating forms with loaded data
-        utils$update_forms_with_data(
-          form_id   = x_id,
-          form_type = x_type,
-          value = df[[x_id]],
-          scheme = mhcs()$get_scheme(table_name),
-          ns = ns
-        )
-      }
-    )
-  }
-
   ## сохранение данных из форм в базу данных --------
   save_inputs_to_db <- function(
     table_name, 
@@ -608,10 +610,10 @@ server <- function(input, output, session) {
       )
 
       # загрузка данных в формы
-      load_data_to_form(
+      forms$load_data_to_form(
         df                = df,
         table_name = values$nested_form_id,
-        mhcs(),
+        mhcs = mhcs,
         ns                = NS(values$nested_form_id)
       )
     } else {
@@ -701,7 +703,9 @@ server <- function(input, output, session) {
   # =========================================
   # MAIN BUTTONS LOGIC ======================
   # =========================================
+
   ## добавить новый главный ключ  ------------------------
+  ### modal -------
   observeEvent(input$add_new_main_key_button, {
 
     # данные для главного ключа
@@ -727,7 +731,7 @@ server <- function(input, output, session) {
 
   })
 
-  ## действие при подтверждении (проверка нового создаваемого ключа) -------
+  ### подтверждение(проверка нового создаваемого ключа) -------
   observeEvent(input$confirm_create_new_main_key, {
     req(input[[mhcs()$get_main_key_id]])
 
@@ -735,7 +739,6 @@ server <- function(input, output, session) {
     on.exit(db$close_db_connection(con, "confirm_create_new_key"), add = TRUE)
 
     new_main_key <- trimws(input[[mhcs()$get_main_key_id]])
-
     existed_key <- db$get_keys_from_table("main", mhcs(), con)
 
     # если введенный ключ уже есть в базе
@@ -746,17 +749,14 @@ server <- function(input, output, session) {
       )
       return()
     }
-    
-    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", mhcs())
 
+    values$main_key <- new_main_key
+    log_action_to_db("creating new key", values$main_key, con)
     removeModal()
   })
 
-  ## очистка всех полей -----------------------
-  # show modal on click of button
+  ## переход на главный акран -----------------------
+  ### show modal  -------
   observeEvent(input$clean_data_button, {
     showModal(modalDialog(
       "Данное действие очистит все заполненные данные. Убедитесь, что нужные данные сохранены.",
@@ -769,7 +769,7 @@ server <- function(input, output, session) {
     ))
   })
 
-  # when action confirm - perform action
+  ### when action confirm - perform action ---
   observeEvent(input$clean_all_action, {
     
     # rewrite all inputs with empty data
@@ -779,6 +779,7 @@ server <- function(input, output, session) {
 
     removeModal()
     showNotification("Данные очищены!", type = "warning")
+
   })
 
   ## сохранение даннных -------------------------------
@@ -801,7 +802,8 @@ server <- function(input, output, session) {
     )
   })
 
-  ## список ключей для загрузки данных -------------------
+  ## загрузка данных -------------------
+  ### modal with keys -----
   observeEvent(input$load_data_button, {
 
     con <- db$make_db_connection(scheme(),"load_data_button")
@@ -844,32 +846,50 @@ server <- function(input, output, session) {
     )
   })
 
-  ## загрузка данных по главному ключу ------------------
+  ### confirm ------------------
   observeEvent(input$load_data, {
     req(input$load_data_key_selector)
 
+    values$main_key <- input$load_data_key_selector
+
+  })
+
+  ## логика: смена ключа -------
+  observeEvent(values$main_key, {
+    req(values$main_key)
+
     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 = mhcs(),
-      main_key_value = input$load_data_key_selector,
-      con = con
-    )
+    existed_main_keys <- db$get_keys_from_table("main", mhcs(), con)
+
+    if (values$main_key %in% existed_main_keys) {
+
+      df <- db$read_df_from_db_by_id(
+        table_name = "main", 
+        schm = mhcs(),
+        main_key_value = values$main_key,
+        con = con
+      )
+
+      forms$load_data_to_form(
+        df = df,
+        table_name = "main",
+        mhcs
+      )
+
+      log_action_to_db("loading data", values$main_key, con = con)
+
+    } else {
+
+      utils$clean_forms("main", mhcs())
+
+    }
+  
+    # обновление счетичка задач
+    tasks$update_task_button_count(con, values, NS("tasks"))
 
-    load_data_to_form(
-      df = df,
-      table_name = "main",
-      mhcs()
-    )
-    
-    values$main_key <- input$load_data_key_selector
     main_form_is_empty(FALSE)
-
-    update_task_button_count(con)
-
-    log_action_to_db("loading data", values$main_key, con = con)
     removeModal()
 
   })
@@ -917,7 +937,7 @@ server <- function(input, output, session) {
       # добавить мета информацию
       list_of_df[["meta"]] <- dplyr::tribble(
         ~`Параметр`      , ~`Значение`,
-        "Пользователь"   , ifelse(AUTH_ENABLED, res_auth$user, "anonymous"),
+        "Пользователь"   , values$current_user,
         "Название базы"  , names(enabled_schemes)[enabled_schemes == scheme()],
         "id базы"        , scheme(),
         "id формы"       , config::get("form_id"),
@@ -1038,6 +1058,7 @@ server <- function(input, output, session) {
   )
 
   ## import data from xlsx ----------------------
+  ### modal -----
   observeEvent(input$button_upload_data_from_xlsx, {
 
     showModal(modalDialog(
@@ -1061,6 +1082,7 @@ server <- function(input, output, session) {
 
   })
 
+  ### confirm --------
   observeEvent(input$button_upload_data_from_xlsx_confirm, {
     req(input$upload_xlsx)
 
@@ -1219,7 +1241,7 @@ server <- function(input, output, session) {
 
     action_row <- tibble(
       date        = Sys.time(),
-      user        = ifelse(AUTH_ENABLED, res_auth$user, "anonymous"),
+      user        = values$current_user,
       app_id      = config::get("form_id"),
       app_ver     = config::get("form_app_version"),
       remote_addr = session$request$REMOTE_ADDR,
@@ -1231,311 +1253,8 @@ server <- function(input, output, session) {
   }
 
   # TASKS ---------------------------------------
-  ## show button watcher -------------------------
-  observeEvent(input$shieesh, {
+  tasks$server("tasks", values, scheme, mhcs)
 
-    con <- db$make_db_connection(scheme(),"nested_tables")
-    on.exit(db$close_db_connection(con, "nested_tables"), add = TRUE)
-
-    values$tasks_data <- if ("tasks" %in% DBI::dbListTables(con)) {
-      DBI::dbGetQuery(con, glue::glue("SELECT * FROM tasks WHERE task_main_key = '{values$main_key}'")) |>
-        dplyr::mutate(dplyr::across(c("task_datetime_created", "task_datetime_last_updated", "task_datetime_completed"), as.POSIXct))
-    } else {
-      get_default_task()
-    }
-
-    if (nrow(values$tasks_data) == 0) {
-      values$tasks_data <- get_default_task()
-    }
-
-    values$tasks_id_selector <- NULL
-    show_modal_for_tasks()
-
-  })
-
-  show_modal_for_tasks <- function() {
-
-    tasks_selector <- values$tasks_data |>
-      dplyr::filter(task_status != "completed") |>
-      dplyr::pull(task_id)
-
-    tasks_selector <- unique(c(values$tasks_id_selector, tasks_selector))
-    tasks_selector <- sort(tasks_selector)
-
-    if (length(values$tasks_id_selector) == 0) {
-      values$tasks_id_selector <- if (length(tasks_selector) == 0) NULL else tasks_selector[[1]]
-    }
-
-    # ui 
-    # очень большой костыль
-    subroup_scheme <- mhcs()$get_scheme("tasks") |>
-      dplyr::filter(form_id != "dummy")
-
-    tab <- bslib::nav_panel(
-      title = "no name provided",
-      purrr::pmap(
-        .l = dplyr::distinct(subroup_scheme, form_id, form_label, form_type),
-        .f = utils$render_forms,
-        main_scheme = subroup_scheme
-      )
-    )
-
-    ui <- layout_sidebar(
-      sidebar = tagList(
-        selectizeInput("hhhhhhh", label = "what", choices = tasks_selector, selected = values$tasks_id_selector),
-        actionButton("tasks_create_new_task", "new_task"),
-        actionButton("tasks_add_autoreview", "add autotask"),
-        actionButton("tasks_DT_VIEW", "DT")
-      ),
-      tab
-    )
-  
-    showModal(modalDialog(
-      ui,
-      size = "l",
-      footer = tagList(
-        actionButton("tasks_saving_button", "сохранить изменения")
-      ),
-      easyClose = TRUE
-    ))
-  }
-
-  observeEvent(input$hhhhhhh, {
-    req(input$hhhhhhh)
-    req(values$tasks_id_selector)
-
-    # выбранный ключ в форме - перемещаем в RV
-    values$tasks_id_selector <- input$hhhhhhh
-
-  })
-
-  observeEvent(values$tasks_id_selector, {
-
-    df <- values$tasks_data |>
-      dplyr::filter(task_id == values$tasks_id_selector)
-
-    load_data_to_form(
-      df         = df,
-      table_name = "tasks",
-      mhcs()
-    )
-  })
-
-  ## saving button watcher ------------------------------
-  observeEvent(input$tasks_saving_button, {
-
-    con <- db$make_db_connection(scheme(),"tasks_saving_button")
-    on.exit(db$close_db_connection(con, "tasks_saving_button"), add = TRUE)
-
-    id_and_types_list <- schms$example_of_scheme$get_id_type_list("tasks")
-    input_types   <- unname(id_and_types_list)
-    input_ids     <- names(id_and_types_list)
-
-    exported_values <- purrr::map2(
-      .x = input_ids,
-      .y = input_types,
-      .f = \(x_id, x_type) {
-
-        input_d <- input[[x_id]]
-
-        # return empty if 0 element
-        if (length(input_d) == 0) {
-          return(utils$get_empty_data(x_type))
-        } else {
-          input_d
-        }
-      }
-    )
-
-    exported_df <- setNames(exported_values, input_ids) |>
-        as_tibble()
-
-    df <- values$tasks_data
-
-    df[df$task_id == values$tasks_id_selector,]$task_status                <- exported_df$task_status
-    df[df$task_id == values$tasks_id_selector,]$task_title                 <- exported_df$task_title
-    df[df$task_id == values$tasks_id_selector,]$task_description           <- exported_df$task_description
-    df[df$task_id == values$tasks_id_selector,]$task_due_date              <- exported_df$task_due_date
-    df[df$task_id == values$tasks_id_selector,]$task_user_last_updated     <- ifelse(AUTH_ENABLED, res_auth$user, "anonymous")
-    df[df$task_id == values$tasks_id_selector,]$task_datetime_last_updated <- Sys.time()
-
-    if (exported_df$task_status == "completed") {
-      df[df$task_id == values$tasks_id_selector,]$task_user_completed     <- ifelse(AUTH_ENABLED, res_auth$user, "anonymous") 
-      df[df$task_id == values$tasks_id_selector,]$task_datetime_completed <- Sys.time() 
-    }
-
-    values$tasks_data <- df
-
-    if ("tasks" %in% DBI::dbListTables(con)) {
-      query <- glue::glue("
-        DELETE 
-        FROM tasks 
-        WHERE task_main_key = '{values$main_key}'
-      ")
-      DBI::dbExecute(con, query)
-    }
-
-    DBI::dbWriteTable(con, "tasks", df, append = TRUE)
-
-    update_task_button_count(con)
-    showNotification("Задача успешно создана/обновлена", type = "message")
-
-    tasks_selector <- values$tasks_data |>
-      dplyr::filter(task_status != "completed") |>
-      dplyr::pull(task_id)
-
-    selector <- ifelse(!values$tasks_id_selector %in% tasks_selector, tasks_selector[1], values$tasks_id_selector)
-
-    updateSelectInput(inputId = "hhhhhhh", choices = tasks_selector, selected = selector)
-
-  })
-
-  observeEvent(input$tasks_DT_VIEW, {
-
-    output$dt_tasks <- DT::renderDataTable(
-      DT::datatable(
-        values$tasks_data,
-        caption = 'Table 1: This is a simple caption for the table.',
-        rownames = FALSE,
-        # colnames = col_types |> dplyr::pull(form_id, form_label),
-        extensions = c('KeyTable', "FixedColumns"),
-        # editable = 'cell',
-        selection = "none",
-        options = list(
-          dom = 'tip',
-          scrollX = TRUE,
-          fixedColumns = list(leftColumns = 1),
-          keys = TRUE
-        )
-      ) |>
-        DT::formatDate(c("task_datetime_created", "task_datetime_completed", "task_datetime_last_updated"), "toLocaleDateString", params = list('ru-RU'))
-    )
-
-    showModal(modalDialog(
-      DT::dataTableOutput("dt_tasks"),
-      size = "xl",
-      # footer = tagList(
-      #   actionButton("nested_form_dt_save", "сохранить изменения")
-      # ),
-      easyClose = TRUE
-    ))
-
-  })
-
-  ## functions ----------------------------------
-  get_default_task <- function() {
-
-    tibble::tibble(
-      task_id = paste0(format(Sys.time(), "%Y%m%d%H%M%S"), "_", values$main_key),
-      task_main_key = values$main_key,
-      task_status = "active",
-      task_title = "new task",
-      task_description = "description",
-      task_due_date = NA,
-      task_user_created = ifelse(AUTH_ENABLED, res_auth$user, "anonymous"),
-      task_datetime_created = Sys.time(),
-      task_user_last_updated = NA,
-      task_datetime_last_updated = NA,
-      task_user_completed = NA,
-      task_datetime_completed = NA
-    )
-  }
-
-  observeEvent(input$tasks_create_new_task, {
-    new_task <- get_default_task()
-    
-    values$tasks_data <- rbind(values$tasks_data, new_task)
-    values$tasks_id_selector <- new_task$task_id
-
-    tasks_selector <- values$tasks_data |>
-      dplyr::filter(task_status != "completed") |>
-      dplyr::pull(task_id)
-
-    updateSelectInput(inputId = "hhhhhhh", choices = tasks_selector, selected = values$tasks_id_selector)
-  })
-  
-  observeEvent(input$tasks_add_autoreview, {
-    new_task <- get_default_task()
-
-    new_task$task_title       <- "autoreview"
-    new_task$task_description <- "напоминание об актуализации данных"
-    new_task$task_due_date <- Sys.Date() + 28
-    
-    values$tasks_data <- rbind(values$tasks_data, new_task)
-    values$tasks_id_selector <- new_task$task_id
-
-    tasks_selector <- values$tasks_data |>
-      dplyr::filter(task_status != "completed") |>
-      dplyr::pull(task_id)
-
-    updateSelectInput(inputId = "hhhhhhh", choices = tasks_selector, selected = values$tasks_id_selector)
-  })
-
-
-  update_task_button_count <- function(con) {
-    if ("tasks" %in% DBI::dbListTables(con)) {
-      tasks_num <- DBI::dbGetQuery(con, glue::glue("SELECT COUNT ('task_id') FROM tasks WHERE task_main_key = '{values$main_key}' AND task_status = 'active'")) |>
-        pull()
-      if (tasks_num > 0) {
-        updateActionButton(inputId = "shieesh", label = paste("активных задач:", tasks_num))
-      } else {
-        updateActionButton(inputId = "shieesh", label = "Задачи: нет активных")
-      }
-    }
-  }
-
-  # КРАТКАЯ СВОДКА ПРО ЛОГГИНГ ------------------
-  # observe({
-
-  #   output$display_log <- renderUI({
-
-  #     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)) {
-  #       sprintf("SELECT * FROM log WHERE key = '%s'", values$main_key)
-  #     } else {
-  #       "SELECT * FROM log"
-  #     }
-
-  #     log_rows <- DBI::dbGetQuery(con, query)
-
-  #     if (nrow(log_rows) > 0) {
-
-  #       lines <- log_rows |>
-  #         mutate(date = as.POSIXct(date)) |>
-  #         mutate(
-  #           # date = date + lubridate::hours(3), # fix datetime
-  #           date_day = as.Date(date)
-  #         ) |>
-  #         mutate(cons_actions = dplyr::consecutive_id(action, user)) |>
-  #         mutate(n_actions = row_number(), .by = c(cons_actions, user, action, date_day)) |>
-  #         slice(which.max(n_actions), .by = c(user, action, date_day)) |>
-  #         mutate(string_to_print = sprintf(
-  #           "<b>[%s %s]</b>: %s - %s (%s)",
-  #           format(date, "%d.%m.%y"),
-  #           format(date, "%H:%M"),
-  #           user,
-  #           action,
-  #           n_actions
-  #         )) |>
-  #         pull(string_to_print) |>
-  #         paste(collapse = "</br>")
-
-  #     } else {
-  #       lines <- ""
-  #     }
-
-  #     tagList(
-  #       paste0("ID: ", values$main_key),
-  #       br(),
-  #       p(
-  #         HTML(lines),
-  #         style = "font-size:10px;"
-  #       )
-  #     )
-  #   })
-  # })
 }
 
 

app/forms.R

@@ -0,0 +1,39 @@
+options(box.path = here::here())
+box::use(
+  modules/utils,
+)
+
+
+#' @export
+load_data_to_form <- function(
+  df,
+  table_name = "main",
+  mhcs,
+  ns
+) {
+
+  input_types <- unname(mhcs()$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 <- df[input_ids]
+
+  # rewrite input forms
+  purrr::walk2(
+    .x = input_types,
+    .y = input_ids,
+    .f = \(x_type, x_id) {
+
+      # updating forms with loaded data
+      utils$update_forms_with_data(
+        form_id   = x_id,
+        form_type = x_type,
+        value = df[[x_id]],
+        scheme = mhcs()$get_scheme(table_name),
+        ns = ns
+      )
+    }
+  )
+}

app/tasks.R

@@ -0,0 +1,363 @@
+
+box::use(
+  shiny[...],
+  bslib[...]
+)
+
+options(box.path = here::here())
+box::use(
+  modules/db,
+  modules/utils,
+  app/forms
+)
+
+#' @export
+server <- function(id, values, scheme, mhcs) {
+
+  ns <- NS(id)
+
+  moduleServer(id, function(input, output, session) {
+
+    # BOOKMARKS SETUP ========================
+    # observe({
+    #   # print(values$current_user)
+    # })
+
+    # functions -------------------
+    show_modal_for_tasks <- function() {
+
+      if (!is.null(values$tasks_data)) {
+
+        tasks_selector <- values$tasks_data |>
+          dplyr::filter(task_status != "completed") |>
+          dplyr::pull(task_id)
+
+        tasks_selector <- unique(c(values$tasks_id, tasks_selector))
+        tasks_selector <- sort(tasks_selector)
+
+        if (length(values$tasks_id) == 0) {
+          values$tasks_id <- if (length(tasks_selector) == 0) NULL else tasks_selector[[1]]
+        }
+
+      } else {
+        tasks_selector <- NULL
+      }
+
+      # ui --------------------
+      # очень большой костыль
+      subroup_scheme <- mhcs()$get_scheme("tasks") |>
+        dplyr::filter(form_id != "dummy")
+
+      tab <- if (length(tasks_selector) > 0) {
+        bslib::nav_panel(
+          title = "no name provided",
+          purrr::pmap(
+            .l = dplyr::distinct(subroup_scheme, form_id, form_label, form_type),
+            .f = utils$render_forms,
+            main_scheme = subroup_scheme,
+            ns = ns
+          )
+        )
+      } else {
+        bslib::nav_panel("", div("Нет доступных записей.", br(), "Необходимо создать новую запись."))
+      }
+
+      ui <- layout_sidebar(
+        sidebar = tagList(
+          selectizeInput(ns("tasks_id_selector"), label = "ID задачи:", choices = tasks_selector, selected = values$tasks_id),
+          actionButton(ns("tasks_create_new_task"), "new_task"),
+          actionButton(ns("tasks_add_autoreview"), "add autotask"),
+          actionButton(ns("tasks_DT_VIEW"), "DT")
+        ),
+        tab
+      )
+    
+      showModal(modalDialog(
+        ui,
+        size = "l",
+        footer = tagList(
+          actionButton(ns("tasks_saving_button"), "сохранить изменения")
+        ),
+        easyClose = TRUE
+      ))
+    }
+
+    ## new tasks ----------------
+    get_default_task <- function() {
+
+      tibble::tibble(
+        task_id = paste0(format(Sys.time(), "%Y%m%d%H%M%S"), "_", values$main_key),
+        task_main_key = values$main_key,
+        task_status = "active",
+        task_title = "НОВАЯ ЗАДАЧА",
+        task_description = "",
+        task_due_date = NA,
+        task_user_created = values$current_user,
+        task_datetime_created = Sys.time(),
+        task_user_last_updated = NA,
+        task_datetime_last_updated = NA,
+        task_user_completed = NA,
+        task_datetime_completed = NA
+      )
+    }
+
+    # button logic ---------------------
+    ## отображение окна -----------------
+    observeEvent(input$display_task_modal, {
+
+      con <- db$make_db_connection(scheme(),"display_task_modal")
+      on.exit(db$close_db_connection(con, "display_task_modal"), add = TRUE)
+
+      values$tasks_data <- if ("tasks" %in% DBI::dbListTables(con)) {
+        DBI::dbGetQuery(con, glue::glue("SELECT * FROM tasks WHERE task_main_key = '{values$main_key}'")) |>
+          dplyr::mutate(dplyr::across(c("task_datetime_created", "task_datetime_last_updated", "task_datetime_completed"), as.POSIXct)) |>
+          dplyr::mutate(dplyr::across(c("task_due_date"), as.Date))
+      } else {
+        NULL
+      }
+
+      values$tasks_id <- NULL
+      show_modal_for_tasks()
+
+    })
+
+    ## изменение выбранной задачи -------
+    observeEvent(input$tasks_id_selector, {
+      req(input$tasks_id_selector)
+      req(values$tasks_id)
+
+      # выбранный ключ в форме - перемещаем в RV
+      values$tasks_id <- input$tasks_id_selector
+
+    })
+
+    ## обновление формы при измененнии id ключа ------
+    observeEvent(values$tasks_id, {
+
+      df <- values$tasks_data |>
+        dplyr::filter(task_id == values$tasks_id)
+
+      forms$load_data_to_form(
+        df         = df,
+        table_name = "tasks",
+        mhcs
+        # ns = ns
+      )
+    })
+
+    ## saving button ------------------------------
+    observeEvent(input$tasks_saving_button, {
+
+      con <- db$make_db_connection(scheme(),"tasks_saving_button")
+      on.exit(db$close_db_connection(con, "tasks_saving_button"), add = TRUE)
+
+      id_and_types_list <- mhcs()$get_id_type_list("tasks")
+      input_types   <- unname(id_and_types_list)
+      input_ids     <- names(id_and_types_list)
+
+      exported_values <- purrr::map2(
+        .x = input_ids,
+        .y = input_types,
+        .f = \(x_id, x_type) {
+
+          input_d <- input[[x_id]]
+
+          # return empty if 0 element
+          if (length(input_d) == 0) {
+            return(utils$get_empty_data(x_type))
+          } else {
+            input_d
+          }
+        }
+      )
+
+      exported_df <- stats::setNames(exported_values, input_ids) |>
+        dplyr::as_tibble()
+
+      df <- values$tasks_data
+
+      df[df$task_id == values$tasks_id,]$task_status                <- exported_df$task_status
+      df[df$task_id == values$tasks_id,]$task_title                 <- exported_df$task_title
+      df[df$task_id == values$tasks_id,]$task_description           <- exported_df$task_description
+      df[df$task_id == values$tasks_id,]$task_due_date              <- exported_df$task_due_date
+      df[df$task_id == values$tasks_id,]$task_user_last_updated     <- values$current_user
+      df[df$task_id == values$tasks_id,]$task_datetime_last_updated <- Sys.time()
+
+      if (exported_df$task_status == "completed") {
+        df[df$task_id == values$tasks_id,]$task_user_completed     <- values$current_user 
+        df[df$task_id == values$tasks_id,]$task_datetime_completed <- Sys.time() 
+      }
+
+      values$tasks_data <- df
+
+      if ("tasks" %in% DBI::dbListTables(con)) {
+        query <- glue::glue("
+          DELETE 
+          FROM tasks 
+          WHERE task_main_key = '{values$main_key}'
+        ")
+        DBI::dbExecute(con, query)
+      }
+
+      DBI::dbWriteTable(con, "tasks", df, append = TRUE)
+
+      update_task_button_count(con, values)
+      showNotification("Задача успешно создана/обновлена", type = "message")
+
+      tasks_selector <- values$tasks_data |>
+        dplyr::filter(task_status != "completed") |>
+        dplyr::pull(task_id)
+
+      selector <- ifelse(!values$tasks_id %in% tasks_selector, tasks_selector[1], values$tasks_id)
+
+      updateSelectInput(inputId = "tasks_id_selector", choices = tasks_selector, selected = selector)
+
+    })
+
+    ## show DT --------------------------
+    observeEvent(input$tasks_DT_VIEW, {
+
+      output$dt_tasks <- DT::renderDataTable(
+        DT::datatable(
+          values$tasks_data,
+          caption = 'Table 1: This is a simple caption for the table.',
+          rownames = FALSE,
+          # colnames = col_types |> dplyr::pull(form_id, form_label),
+          extensions = c('KeyTable', "FixedColumns"),
+          # editable = 'cell',
+          selection = "none",
+          options = list(
+            dom = 'tip',
+            scrollX = TRUE,
+            fixedColumns = list(leftColumns = 1),
+            keys = TRUE
+          )
+        ) |>
+          DT::formatDate(c("task_datetime_created", "task_datetime_completed", "task_datetime_last_updated", "task_due_date"), "toLocaleDateString", params = list('ru-RU'))
+      )
+
+      showModal(modalDialog(
+        DT::dataTableOutput(ns("dt_tasks")),
+        size = "xl",
+        # footer = tagList(
+        #   actionButton("nested_form_dt_save", "сохранить изменения")
+        # ),
+        easyClose = TRUE
+      ))
+
+    })
+
+    ## создание новой задачи -------------
+    observeEvent(input$tasks_create_new_task, {
+      new_task <- get_default_task()
+      
+      values$tasks_data <- rbind(values$tasks_data, new_task)
+      values$tasks_id <- new_task$task_id
+
+      tasks_selector <- values$tasks_data |>
+        dplyr::filter(task_status != "completed") |>
+        dplyr::pull(task_id)
+
+      updateSelectInput(inputId = "tasks_id_selector", choices = tasks_selector, selected = values$tasks_id)
+      removeModal()
+      show_modal_for_tasks()
+    })
+    
+    ## создание новой авто-задачи -------------
+    observeEvent(input$tasks_add_autoreview, {
+      new_task <- get_default_task()
+
+      new_task$task_title       <- "autoreview"
+      new_task$task_description <- "напоминание об актуализации данных"
+      new_task$task_due_date <- Sys.Date() + 28
+      
+      values$tasks_data <- rbind(values$tasks_data, new_task)
+      values$tasks_id <- new_task$task_id
+
+      tasks_selector <- values$tasks_data |>
+        dplyr::filter(task_status != "completed") |>
+        dplyr::pull(task_id)
+
+      updateSelectInput(inputId = "tasks_id_selector", choices = tasks_selector, selected = values$tasks_id)
+      removeModal()
+      show_modal_for_tasks()
+    })
+
+    ## отображение списка задач для текущего дня ------------
+    observeEvent(input$show_dt_today, {
+
+      con <- db$make_db_connection(scheme(),"display_task_modal")
+      on.exit(db$close_db_connection(con, "display_task_modal"), add = TRUE)
+
+      values$tasks_data <- DBI::dbGetQuery(con, glue::glue("SELECT * FROM tasks WHERE task_status = 'active'")) |>
+        dplyr::mutate(dplyr::across(c("task_datetime_created", "task_datetime_last_updated", "task_datetime_completed"), as.POSIXct)) |>
+        dplyr::mutate(dplyr::across(c("task_due_date"), as.Date))
+
+      output$dt_todays_tasks <- DT::renderDataTable(
+        DT::datatable(
+          values$tasks_data,
+          caption = 'Table 1: This is a simple caption for the table.',
+          rownames = FALSE,
+          # colnames = col_types |> dplyr::pull(form_id, form_label),
+          extensions = c('KeyTable', "FixedColumns"),
+          # editable = 'cell',
+          selection = "single",
+          options = list(
+            dom = 'tip',
+            scrollX = TRUE,
+            fixedColumns = list(leftColumns = 1),
+            keys = TRUE
+          )
+        ) |>
+          DT::formatDate(c("task_datetime_created", "task_datetime_completed", "task_datetime_last_updated", "task_due_date"), "toLocaleDateString", params = list('ru-RU'))
+      )
+
+      showModal(modalDialog(
+        DT::dataTableOutput(ns("dt_todays_tasks")),
+        size = "xl",
+        footer = tagList(
+          actionButton(ns("jump_to_main_key"), "перейти к id")
+        ),
+        easyClose = TRUE
+      ))
+
+    })
+
+    observeEvent(input$jump_to_main_key, {
+
+      if (is.null(input$dt_todays_tasks_rows_selected)) {
+        showNotification("необходимо выбрать задачу", type = "error")
+      } else {
+        
+        # get key
+        new_main_key <- values$tasks_data[input$dt_todays_tasks_rows_selected,]$task_main_key
+        values$main_key <- new_main_key
+        
+        showNotification("TODO: если ключа нет в таблице?!", type = "warning", duration = NULL)
+        removeModal()
+
+        # log_action_to_db("loading data", values$main_key, con = con)
+
+      }
+    })
+
+  })
+}
+
+#' @export
+update_task_button_count <- function(con, values, ns) {
+
+  inputID <- "display_task_modal"
+  if (!missing(ns)) inputID <- ns(inputID)
+
+  if ("tasks" %in% DBI::dbListTables(con)) {
+    tasks_num <- DBI::dbGetQuery(con, glue::glue("SELECT COUNT ('task_id') FROM tasks WHERE task_main_key = '{values$main_key}' AND task_status = 'active'")) |>
+      dplyr::pull()
+    if (tasks_num > 0) {
+      updateActionButton(inputId = inputID, label = paste("активных задач:", tasks_num))
+    } else {
+      updateActionButton(inputId = inputID, label = "Задачи: нет активных")
+    }
+  }
+
+}

config.yml

@@ -6,8 +6,13 @@ default:
 prod:
   form_app_configure_path: "."
   form_auth_enabled: false
+  form_schemes:
+    example_of_scheme: Тестовая база данных
+    main_register: АВЗ и АМИЛОИОДОЗЫ
 
 devel:
   form_app_configure_path: _devel/antifib
   form_auth_enabled: false
-  form_app_version: 0.16.0 dev
+  form_app_version: 0.16.0 dev
+  form_schemes:
+    antifib: антифибротическая

configs/enabled_schemes.R

@@ -1,4 +0,0 @@
-#' @export
-enabled_schemes <- c(
-  `Тестовая база данных` = "example_of_scheme"
-)

modules/global_options.R

@@ -43,19 +43,16 @@ check_and_init_scheme = function() {
   options(box.path = here::here())
   box::use(modules/db[local_db_backup])
 
-  options(box.path = config::get("form_app_configure_path"))
-  box::use(configs/enabled_schemes[enabled_schemes])
-
   # список файлов, изменение которых, приведут к переинициализиации схемы
   files_to_watch <- c(
-    fs::path(config::get("form_app_configure_path"), "configs", "enabled_schemes.R"),
+    "config.yml",
     "modules/scheme_generator.R",
     "modules/utils.R"
   )
 
-  scheme_names <- enabled_schemes
-  scheme_file <- paste0(config::get("form_app_configure_path"), "/configs/schemas/", scheme_names, ".xlsx")
-  scheme_file <- stats::setNames(scheme_file, scheme_names)
+  scheme_names <- names(config::get()$form_schemes)
+  scheme_file  <- paste0(config::get("form_app_configure_path"), "/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)])))

modules/utils.R

@@ -263,7 +263,7 @@ 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])