diff --git a/app.R b/app.R index 29437e4..bd3b55e 100644 --- a/app.R +++ b/app.R @@ -31,7 +31,7 @@ box::use( ) # SETTINGS ================================ -HEADER_TEXT <- sprintf("%s (%s)", config::get("form_name"), config::get("form_app_version")) +HEADER_TEXT <- config::get("form_name") # sadasdasdasdasdas options(box.path = config::get("form_app_configure_path")) @@ -52,9 +52,14 @@ ui <- page_sidebar( # title = HEADER_TEXT, title = tagList( h4(HEADER_TEXT, style = "margin-top: .5rem"), - tooltip( - span("about", icon("circle-info", lib = "font-awesome")), - "Данный функционал позволяет обрабатывать информацию о пациентах на комиссию, используя Excel (обновление данных возможно через окно формирования списка пациентов)" + popover( + span( + 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"), @@ -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 <- 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]] + + if (length(values$nested_key) == 0) { + 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") { diff --git a/config.yml b/config.yml index cdd6e3d..28e3c7d 100644 --- a/config.yml +++ b/config.yml @@ -5,9 +5,9 @@ default: prod: form_app_configure_path: "." - form_auth_enabled: true + form_auth_enabled: false devel: - form_app_configure_path: _devel/d2tra + form_app_configure_path: _devel/antifib form_auth_enabled: false form_app_version: 0.16.0 dev \ No newline at end of file