From fe7cb9589e9061b4c60d4c3c336b47f511da2e41 Mon Sep 17 00:00:00 2001
From: madeliri <madeliri@gmail.com>
Date: Wed, 22 Apr 2026 10:38:47 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=20=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B2=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BA=D0=BB=D1=8E?=
 =?UTF-8?q?=D1=87=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.R      | 18 +++++++++++++-----
 config.yml |  4 ++--
 2 files changed, 15 insertions(+), 7 deletions(-)

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