fix: выбор нового добавленного вложенного ключа

This commit is contained in:
2026-04-22 10:38:47 +03:00
parent e7497c7d53
commit fe7cb9589e
2 changed files with 15 additions and 7 deletions

16
app.R
View File

@@ -31,7 +31,7 @@ box::use(
) )
# SETTINGS ================================ # SETTINGS ================================
HEADER_TEXT <- sprintf("%s (%s)", config::get("form_name"), config::get("form_app_version")) HEADER_TEXT <- config::get("form_name")
# sadasdasdasdasdas # sadasdasdasdasdas
options(box.path = config::get("form_app_configure_path")) options(box.path = config::get("form_app_configure_path"))
@@ -52,9 +52,14 @@ ui <- page_sidebar(
# title = HEADER_TEXT, # title = HEADER_TEXT,
title = tagList( title = tagList(
h4(HEADER_TEXT, style = "margin-top: .5rem"), h4(HEADER_TEXT, style = "margin-top: .5rem"),
tooltip( popover(
span("about", icon("circle-info", lib = "font-awesome")), span(
"Данный функционал позволяет обрабатывать информацию о пациентах на комиссию, используя Excel (обновление данных возможно через окно формирования списка пациентов)" config::get("form_app_version"),
fontawesome::fa("circle-info", a11y = "sem", title = "Settings"),
style = "color: #9c9c9c"),
title = "about",
placement = "left",
p("a"), p("b")
) )
), ),
theme = bs_theme(version = 5, preset = "bootstrap"), theme = bs_theme(version = 5, preset = "bootstrap"),
@@ -362,7 +367,10 @@ server <- function(input, output, session) {
kyes_for_this_table <- db$get_nested_keys_from_table(values$nested_form_id, mhcs(), 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 <- unique(c(values$nested_key, kyes_for_this_table))
kyes_for_this_table <- sort(kyes_for_this_table) kyes_for_this_table <- sort(kyes_for_this_table)
if (length(values$nested_key) == 0) {
values$nested_key <- if (length(kyes_for_this_table) == 0) NULL else kyes_for_this_table[[1]] values$nested_key <- if (length(kyes_for_this_table) == 0) NULL else kyes_for_this_table[[1]]
}
# если ключ в формате даты - дать человекочитаемые данные # если ключ в формате даты - дать человекочитаемые данные
if (this_nested_form_key_scheme_smoll$form_type == "date") { if (this_nested_form_key_scheme_smoll$form_type == "date") {

View File

@@ -5,9 +5,9 @@ default:
prod: prod:
form_app_configure_path: "." form_app_configure_path: "."
form_auth_enabled: true form_auth_enabled: false
devel: devel:
form_app_configure_path: _devel/d2tra form_app_configure_path: _devel/antifib
form_auth_enabled: false form_auth_enabled: false
form_app_version: 0.16.0 dev form_app_version: 0.16.0 dev