diff --git a/R/modules/scheme_generator.R b/R/modules/scheme_generator.R index 25c76cc..b8593a3 100644 --- a/R/modules/scheme_generator.R +++ b/R/modules/scheme_generator.R @@ -49,7 +49,7 @@ scheme_R6 <- R6::R6Class( "task_status", "select_one", "Статус задачи", NA, "deleted", "task_title", "text", "Название задачи", NA, NA, "task_description", "text", "Описание задачи", "краткое описание", "3", - "task_due_date", "date", "Дата выполнения задачи", NA, NA, + "task_due_date", "date", "Срок выполнения задачи", NA, NA, ) |> dplyr::mutate(condition = NA) diff --git a/app.R b/app.R index 195b980..253446f 100644 --- a/app.R +++ b/app.R @@ -460,7 +460,7 @@ server <- function(input, output, session) { # если ключ в формате даты - дать человекочитаемые данные if (this_nested_form_key_scheme_smoll$form_type == "date") { - kyes_for_this_table <- setNames( + kyes_for_this_table <- stats::setNames( kyes_for_this_table, format(as.Date(kyes_for_this_table), "%d.%m.%Y") ) @@ -695,10 +695,10 @@ server <- function(input, output, session) { # загрузка данных в формы forms$load_data_to_form( - df = df, - table_name = values$nested_form_id, - mhcs = mhcs, - ns = NS(values$nested_form_id) + df = df, + table_name = values$nested_form_id, + mhcs = mhcs, + ns = NS(values$nested_form_id) ) } else { @@ -717,7 +717,7 @@ server <- function(input, output, session) { ui1 <- rlang::exec( .fn = utils$render_forms, - !!!distinct(scheme_for_key_input, form_id, form_label, form_type), + !!!dplyr::distinct(scheme_for_key_input, form_id, form_label, form_type), main_scheme = scheme_for_key_input ) @@ -801,7 +801,7 @@ server <- function(input, output, session) { # создать форму для выбора ключа ui1 <- rlang::exec( .fn = utils$render_forms, - !!!distinct(scheme_for_key_input, form_id, form_label, form_type), + !!!dplyr::distinct(scheme_for_key_input, form_id, form_label, form_type), main_scheme = scheme_for_key_input ) @@ -910,7 +910,7 @@ server <- function(input, output, session) { choices = ids, selected = NULL, options = list( - placeholder = "id пациента", + placeholder = "id", onInitialize = I('function() { this.setValue(""); }') ) )