app.R

@@ -16,40 +16,35 @@ box::use(
   modules/global_options,
   modules/db,
   modules/data_validation,
-  modules/scheme_generator[scheme_R6]
+  app/forms,
+  app/tasks
 )
 
+# global settings:
 global_options$set_global_options(
-  shiny.host = "0.0.0.0"
+  shiny.host = "0.0.0.0",
-  # APP.DEBUG = TRUE
+  APP.DEBUG = FALSE
 )
+
+# init:
 global_options$check_and_init_scheme()
 
-# global vars
+# global vars:
 box::use(
   modules/global_options[AUTH_ENABLED]
 )
+enabled_schemes <- unlist(config::get()$form_schemes)
+enabled_schemes <- setNames(names(enabled_schemes), enabled_schemes)
 
-# MODULES
+# load schemes object:
-box::use(app/forms)
+schms <- readRDS("scheme.rds")
-box::use(app/tasks)
 
-# refactor LATER ---------
+# CHECK FOR PANDOC ----------
-vv <- unlist(config::get()$form_schemes)
-enabled_schemes <- names(vv)
-vvvv            <- unname(vv)
-names(enabled_schemes) <- vvvv
-# ------------------------
-
-# CHECK FOR PANDOC
-# TEMP ! NEED TO HANDLE
 rmarkdown::find_pandoc(dir = "/opt/homebrew/bin/")
 
 # TODO: dynamic button render depend on pandoc installation
 if (!rmarkdown::pandoc_available()) warning("Can't find pandoc!")
 
-# SCHEME_MAIN UNPACK ==========================
-schms <- readRDS("scheme.rds")
 
 # UI =======================
 ui <- page_sidebar(
@@ -76,7 +71,7 @@ ui <- page_sidebar(
     uiOutput("status_message"),
     textOutput("status_message2"),
     uiOutput("display_log"),
-    actionButton("tasks-display_task_modal", "Задачи: нет активных"),
+    actionButton("tasks-display_task_modal", "Задачи: нет активных", icon("list-check")),
     position = "left",
     open = list(mobile = "always")
   ),
@@ -137,9 +132,7 @@ server <- function(input, output, session) {
     if (AUTH_ENABLED) {
       reactiveValuesToList(res_auth)
       if (res_auth$admin) {
-        # print("admin")
       } else {
-        # print("not_admin")
         showing_buttons <- FALSE
       }
     }
@@ -160,8 +153,10 @@ server <- function(input, output, session) {
     }
   })
 
-
+  # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   # REACTIVE VALUES =================================
+  # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
   # Create a reactive values object to store the input data
   values <- reactiveValues(
     data     = NULL,
@@ -182,7 +177,7 @@ server <- function(input, output, session) {
   validator_nested <- reactiveVal(NULL)
 
   # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  # ГЛАВНАЯ СТРАНИЦА -------------------------------
+  # reactive ui       -------------------------------
   # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
   ## reactive ui -----------------------------------
@@ -221,10 +216,9 @@ server <- function(input, output, session) {
   ### bases info ----------------
   observeEvent(main_form_is_empty(), {
 
-    if (main_form_is_empty() == TRUE) {
-
     output$base_data <- renderUI({
 
+      if (main_form_is_empty() == TRUE) {
         con <- db$make_db_connection(scheme(),"base_data")
         on.exit(db$close_db_connection(con, "base_data"), add = TRUE)
 
@@ -239,8 +233,10 @@ server <- function(input, output, session) {
 
           tasks_count <- DBI::dbGetQuery(con, glue::glue("SELECT COUNT (task_id) FROM tasks WHERE task_status = 'active'")) |>
             dplyr::pull()
+
           tasks_today_count <- DBI::dbGetQuery(con, glue::glue("SELECT COUNT (task_id) FROM tasks WHERE task_status = 'active' AND task_due_date = {as.integer(Sys.Date())}")) |>
             dplyr::pull()
+
           tasks_overdue_count <- DBI::dbGetQuery(con, glue::glue("SELECT COUNT (task_id) FROM tasks WHERE task_status = 'active' AND task_due_date < {as.integer(Sys.Date())}")) |>
             dplyr::pull()
 
@@ -261,15 +257,16 @@ server <- function(input, output, session) {
           span(strong("Активных на сегодня:"), if (tasks_today_count > 0) actionLink("tasks-show_dt_today", tasks_today_count) else "0", br()),
           span(strong("Просроченных:"),        if (tasks_overdue_count > 0) actionLink("tasks-show_dt_overdue", tasks_overdue_count) else "0", br())
         )
-      })
       }
-
+    })
   })
 
   # обновление данных схем ------
   observeEvent(input$schmes_selector, {
+
     scheme(input$schmes_selector)
     mhcs(schms[[input$schmes_selector]])
+
   })
 
   # ==========================================
@@ -422,6 +419,7 @@ server <- function(input, output, session) {
 
     # nested ui
     nested_form_panels <- if (!is.null(values$nested_key)) {
+
       purrr::map(
         .x = unique(this_nested_form_scheme$subgroup),
         .f = \(subgroup) {
@@ -442,7 +440,9 @@ server <- function(input, output, session) {
         }
       )
     } else {
+
       list(bslib::nav_panel("", div("Нет доступных записей.", br(), "Необходимо создать новую запись.")))
+
     }
 
     # ui для всплывающего окна 
@@ -507,7 +507,7 @@ server <- function(input, output, session) {
     output$dt_nested <- DT::renderDataTable(
       DT::datatable(
         values$data,
-        caption = 'Table 1: This is a simple caption for the table.',
+        caption = 'В данной таблице можно изменять данные',
         rownames = FALSE,
         colnames = col_types |> dplyr::pull(form_id, form_label),
         extensions = c('KeyTable', "FixedColumns"),
@@ -528,7 +528,7 @@ server <- function(input, output, session) {
       DT::dataTableOutput("dt_nested"),
       size = "xl",
       footer = tagList(
-        actionButton("nested_form_dt_save", "сохранить изменения")
+        actionButton("nested_form_dt_save", "Сохранить изменения", icon("floppy-disk"))
       ),
       easyClose = TRUE
     ))
@@ -542,8 +542,9 @@ server <- function(input, output, session) {
 
   ### кнопка: отображение DT -----------------------------
   observeEvent(input$nested_form_dt_button, {
-    con <- db$make_db_connection(scheme(),"nested_form_save_button")
+
-    on.exit(db$close_db_connection(con, "nested_form_save_button"), add = TRUE)
+    con <- db$make_db_connection(scheme(),"nested_form_dt_button")
+    on.exit(db$close_db_connection(con, "nested_form_dt_button"), add = TRUE)
 
     removeModal()
     show_modal_for_nested_form_dt(con)
@@ -627,8 +628,8 @@ server <- function(input, output, session) {
 
   observeEvent(values$nested_key, {
 
-    con <- db$make_db_connection(scheme(),"nested_tables")
+    con <- db$make_db_connection(scheme(),"nested_key")
-    on.exit(db$close_db_connection(con, "nested_tables"), add = TRUE)
+    on.exit(db$close_db_connection(con, "nested_key"), add = TRUE)
 
     kyes_for_this_table <- db$get_nested_keys_from_table(values$nested_form_id, mhcs(), values$main_key, con)
 
@@ -685,8 +686,8 @@ server <- function(input, output, session) {
   observeEvent(input$confirm_create_new_nested_key, {
     req(input[[mhcs()$get_key_id(values$nested_form_id)]])
 
-    con <- db$make_db_connection(scheme(),"confirm_create_new_key")
+    con <- db$make_db_connection(scheme(),"confirm_create_new_nested_key")
-    on.exit(db$close_db_connection(con, "confirm_create_new_key"), add = TRUE)
+    on.exit(db$close_db_connection(con, "confirm_create_new_nested_key"), add = TRUE)
 
     existed_key <- db$get_nested_keys_from_table(
       table_name = values$nested_form_id,

app/forms.R

@@ -3,7 +3,6 @@ box::use(
   modules/utils,
 )
 
-
 #' @export
 load_data_to_form <- function(
   df,
@@ -16,10 +15,6 @@ load_data_to_form <- function(
   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,

app/tasks.R

@@ -61,7 +61,9 @@ server <- function(id, values, scheme, mhcs) {
         }
 
       } else {
+
         tasks_selector <- NULL
+
       }
 
       # ui --------------------
@@ -86,9 +88,9 @@ server <- function(id, values, scheme, mhcs) {
       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_create_new_task"), "Новая задача", icon("plus")),
-          actionButton(ns("tasks_add_autoreview"), "add autotask"),
+          actionButton(ns("tasks_add_autoreview"), "Новая авто-задача (тест)", icon("calendar")),
-          actionButton(ns("tasks_DT_VIEW"), "DT")
+          actionButton(ns("tasks_DT_VIEW"), "DT", icon("table"))
         ),
         tab
       )
@@ -97,7 +99,7 @@ server <- function(id, values, scheme, mhcs) {
         ui,
         size = "l",
         footer = tagList(
-          actionButton(ns("tasks_saving_button"), "сохранить изменения")
+          actionButton(ns("tasks_saving_button"), "Сохранить изменения", icon("floppy-disk"))
         ),
         easyClose = TRUE
       ))
@@ -106,6 +108,11 @@ server <- function(id, values, scheme, mhcs) {
     ## отображение окна -----------------
     observeEvent(input$display_task_modal, {
       
+      if (is.null(values$main_key)) {
+        showNotification("необходимо выбрать запись", type = "error")
+        return()
+      }
+
       con <- db$make_db_connection(scheme(),"display_task_modal")
       on.exit(db$close_db_connection(con, "display_task_modal"), add = TRUE)
 
@@ -387,7 +394,7 @@ server <- function(id, values, scheme, mhcs) {
         DT::dataTableOutput(ns("dt_todays_tasks")),
         size = "xl",
         footer = tagList(
-          actionButton(ns("jump_to_main_key"), "перейти к id")
+          actionButton(ns("jump_to_main_key"), "перейти к id", icon("right-to-bracket"))
         ),
         easyClose = TRUE
       ))
@@ -422,24 +429,25 @@ update_task_button_count <- function(con, values, ns) {
   inputID <- "display_task_modal"
   if (!missing(ns)) inputID <- ns(inputID)
   
+
+  # если ключ не определен - выход из функции
   if (is.null(values$main_key)) {
-    updateActionButton(inputId = inputID, label = "Задачи: нет активных")
+
+    updateActionButton(inputId = inputID, label = "Задачи")
     return()
+
   }
 
+  # при наличии таблицы - полу
   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

@@ -11,8 +11,10 @@ prod:
     main_register: АВЗ и АМИЛОИОДОЗЫ
 
 devel:
-  form_app_configure_path: _devel/antifib
+  form_app_configure_path: _devel/new_bases
   form_auth_enabled: false
   form_app_version: 0.16.0 dev
   form_schemes:
     antifib: антифибротическая
+    d2tra_t: D2TRA_test
+    

modules/data_validation.R

@@ -71,6 +71,7 @@ val_is_a_number = function(x) {
 
   # exit if empty
   if (is_this_empty_value(x)) return(NULL)
+
   # хак для пропуска значений
   if (x == "NA") return(NULL)
 

modules/db.R

@@ -46,8 +46,6 @@ check_if_table_is_exist_and_init_if_not = function(
 
       if (table_name %in% DBI::dbListTables(con)) {
 
-        cli::cli_inform(c("*" = "проверка таблицы в базе данных: '{table_name}'"))
-
         # если таблица существует, производим проверку структуры таблицы
         compare_existing_table_with_schema(
           table_name = table_name,
@@ -121,6 +119,8 @@ compare_existing_table_with_schema = function(
   con = rlang::env_get(rlang::caller_env(), nm = "con")
 ) {
 
+  cli::cli_progress_step("проверка таблицы в базе данных: '{table_name}'")
+
   main_key  <- schm$get_main_key_id
   key_id    <- schm$get_key_id(table_name)
   forms_ids <- schm$get_forms_ids(table_name)
@@ -402,4 +402,3 @@ local_db_backup <- function(
     }
   )
 }
-

modules/scheme_generator.R

@@ -48,8 +48,8 @@ scheme_R6 <- R6::R6Class(
         "task_status",        "select_one",  "Статус задачи",          NA,                 "completed",
         "task_status",        "select_one",  "Статус задачи",          NA,                 "deleted",
         "task_title",         "text",        "Название задачи",        NA,                 NA,
-        "task_description",   "text",        "Описание задачи",        "краткое описание", NA,
+        "task_description",   "text",        "Описание задачи",        "краткое описание", "2",
-        "task_due_date",      "date",        "Дата выполнения задачи", "YE DJN",           NA,
+        "task_due_date",      "date",        "Дата выполнения задачи", NA,                 NA,
       ) |>
         dplyr::mutate(condition = NA)
 

modules/utils.R

@@ -135,7 +135,8 @@ render_forms = function(
     form <- shiny::textAreaInput(
       inputId = form_id,
       label = label,
-      rows = 1
+      rows = 1,
+      resize = "none"
     )
   }