From c8da651e72c70b72834ee9bac89055de68ab2dbf Mon Sep 17 00:00:00 2001 From: madeliri Date: Thu, 23 Apr 2026 18:04:53 +0300 Subject: [PATCH] feat: vis update --- app.R | 103 ++++++++++++++++++++++++++++---------- app/tasks.R | 140 +++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 184 insertions(+), 59 deletions(-) diff --git a/app.R b/app.R index edf7a6d..8108a4b 100644 --- a/app.R +++ b/app.R @@ -160,30 +160,6 @@ server <- function(input, output, session) { } }) - output$base_data <- renderUI({ - - con <- db$make_db_connection(scheme(),"base_data") - on.exit(db$close_db_connection(con, "base_data"), add = TRUE) - - # записей в базе всего - query <- glue::glue("SELECT COUNT ({mhcs()$get_main_key_id}) FROM main") - records_count <- DBI::dbGetQuery(con, query) |> - dplyr::pull() - - # задачи на сегодня - if ("tasks" %in% DBI::dbListTables(con)) { - query <- glue::glue("SELECT COUNT (task_id) FROM tasks WHERE task_status = 'active'") - tasks_count <- DBI::dbGetQuery(con, query) |> - dplyr::pull() - } else { - tasks_count <- 0 - } - - div( - strong("Записей всего:"), records_count, br(), - if (tasks_count > 0) p(strong("Задач на сегодня:"), actionLink("tasks-show_dt_today", tasks_count)) else "Задач нет" - ) - }) # REACTIVE VALUES ================================= # Create a reactive values object to store the input data @@ -206,21 +182,28 @@ server <- function(input, output, session) { validator_nested <- reactiveVal(NULL) # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - # ГЛАВНАЯ СТРАНИЦА ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + # ГЛАВНАЯ СТРАНИЦА ------------------------------- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ## reactive ui ----------------------------------- + ### main screen ------ output$main_ui_navset <- renderUI({ if (main_form_is_empty()) { validator_main(NULL) div( + h5("Выбрать базу данных для работы:"), shiny::radioButtons( "schmes_selector", - label = strong("Выбрать базу данных для работы:"), + label = NULL, choices = enabled_schemes, selected = scheme() ), + hr(), uiOutput("base_data"), + hr(), "Для начала работы нужно создать новую запись или загрузить существующую!", + hr(), # сво # загрузка панели для работы с базой данных uiOutput("admin_buttons_panel") @@ -235,6 +218,72 @@ server <- function(input, output, session) { } }) + ### bases info ---------------- + observeEvent(main_form_is_empty(), { + + if (main_form_is_empty() == TRUE) { + print("fired!") + output$base_data <- renderUI({ + + con <- db$make_db_connection(scheme(),"base_data") + on.exit(db$close_db_connection(con, "base_data"), add = TRUE) + + # записей в базе всего + query <- glue::glue("SELECT COUNT ({mhcs()$get_main_key_id}) FROM main") + records_count <- DBI::dbGetQuery(con, query) |> + dplyr::pull() + + # задачи на сегодня + if ("tasks" %in% DBI::dbListTables(con)) { + + 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() + + } else { + + tasks_count <- 0 + tasks_today_count <- 0 + tasks_overdue_count <- 0 + + } + + div( + h5("Общая информация о базе данных:"), + strong("Записей всего:"), records_count, + hr(), + h5("Задачи:"), + span(strong("Активных всего:"), if (tasks_count > 0) actionLink("tasks-show_dt_all", tasks_count) else "0", br()), + 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()) + ) + + }) + } + + # buttons_to_toggle <- c( + # "save_data_button", + # "clean_data_button", + # "downloadDocx", + # "tasks-display_task_modal" + # ) + + # purrr::walk( + # buttons_to_toggle, + # \(x) { + # updateActionButton( + # inputId = x, + # disabled = main_form_is_empty() + # ) + # } + # ) + + }) + + # обновление данных схем ------ observeEvent(input$schmes_selector, { scheme(input$schmes_selector) mhcs(schms[[input$schmes_selector]]) @@ -320,6 +369,7 @@ server <- function(input, output, session) { # ==================================== # NESTED FORMS ======================= # ==================================== + ## кнопки для каждой вложенной таблицы ------------------------------- observe({ @@ -349,6 +399,7 @@ server <- function(input, output, session) { observers_started(c( isolate(observers_started()), isolate(scheme()) )) + }) ## функция отображения вложенной формы для выбранной таблицы -------- diff --git a/app/tasks.R b/app/tasks.R index a4730b6..e7503d9 100644 --- a/app/tasks.R +++ b/app/tasks.R @@ -24,6 +24,27 @@ server <- function(id, values, scheme, mhcs) { # }) # functions ------------------- + ## new tasks ---------------- + get_default_task <- function() { + + tibble::tibble( + task_id = paste0(format(Sys.time(), "%Y%m%d%H%M%S"), "_", values$main_key), + task_main_key = values$main_key, + task_status = "active", + task_title = "НОВАЯ ЗАДАЧА", + task_description = "", + task_due_date = NA, + task_user_created = values$current_user, + task_datetime_created = Sys.time(), + task_user_last_updated = NA, + task_datetime_last_updated = NA, + task_user_completed = NA, + task_datetime_completed = NA + ) + } + + # logic --------------------- + ## modal fun ----- show_modal_for_tasks <- function() { if (!is.null(values$tasks_data)) { @@ -82,26 +103,6 @@ server <- function(id, values, scheme, mhcs) { )) } - ## new tasks ---------------- - get_default_task <- function() { - - tibble::tibble( - task_id = paste0(format(Sys.time(), "%Y%m%d%H%M%S"), "_", values$main_key), - task_main_key = values$main_key, - task_status = "active", - task_title = "НОВАЯ ЗАДАЧА", - task_description = "", - task_due_date = NA, - task_user_created = values$current_user, - task_datetime_created = Sys.time(), - task_user_last_updated = NA, - task_datetime_last_updated = NA, - task_user_completed = NA, - task_datetime_completed = NA - ) - } - - # button logic --------------------- ## отображение окна ----------------- observeEvent(input$display_task_modal, { @@ -217,23 +218,41 @@ server <- function(id, values, scheme, mhcs) { ## show DT -------------------------- observeEvent(input$tasks_DT_VIEW, { + rename_cols <- tasks_colnames[tasks_colnames %in% colnames(values$tasks_data)] + + date_cols <- c("task_datetime_created", "task_datetime_completed", "task_datetime_last_updated", "task_due_date") + date_cols <- which(colnames(values$tasks_data) %in% date_cols) + output$dt_tasks <- DT::renderDataTable( DT::datatable( values$tasks_data, caption = 'Table 1: This is a simple caption for the table.', rownames = FALSE, - # colnames = col_types |> dplyr::pull(form_id, form_label), + colnames = rename_cols, extensions = c('KeyTable', "FixedColumns"), # editable = 'cell', + class = 'cell-border stripe', selection = "none", options = list( dom = 'tip', scrollX = TRUE, fixedColumns = list(leftColumns = 1), - keys = TRUE + keys = TRUE, + autoWidth = TRUE, + columnDefs = list( + list( + targets = 3:4, + width = '200px', + render = htmlwidgets::JS( + "function(data, type, row, meta) {", + "return type === 'display' && data.length > 20 ?", + "'' + data.substr(0, 20) + '...' : data;", + "}") + ) + ) ) ) |> - DT::formatDate(c("task_datetime_created", "task_datetime_completed", "task_datetime_last_updated", "task_due_date"), "toLocaleDateString", params = list('ru-RU')) + DT::formatDate(date_cols, "toLocaleDateString", params = list('ru-RU')) ) showModal(modalDialog( @@ -283,8 +302,9 @@ server <- function(id, values, scheme, mhcs) { show_modal_for_tasks() }) - ## отображение списка задач для текущего дня ------------ - observeEvent(input$show_dt_today, { + # review задач ---------------- + ### все активные задачи ------------ + observeEvent(input$show_dt_all, { con <- db$make_db_connection(scheme(),"display_task_modal") on.exit(db$close_db_connection(con, "display_task_modal"), add = TRUE) @@ -293,23 +313,61 @@ server <- function(id, values, scheme, mhcs) { dplyr::mutate(dplyr::across(c("task_datetime_created", "task_datetime_last_updated", "task_datetime_completed"), as.POSIXct)) |> dplyr::mutate(dplyr::across(c("task_due_date"), as.Date)) + display_tasks_dt_review() + }) + + ### задачи для текущего дня ------------ + observeEvent(input$show_dt_today, { + + con <- db$make_db_connection(scheme(),"display_task_modal") + on.exit(db$close_db_connection(con, "display_task_modal"), add = TRUE) + + values$tasks_data <- DBI::dbGetQuery(con, glue::glue("SELECT * FROM tasks WHERE task_status = 'active' AND task_due_date = {as.integer(Sys.Date())}")) |> + dplyr::mutate(dplyr::across(c("task_datetime_created", "task_datetime_last_updated", "task_datetime_completed"), as.POSIXct)) |> + dplyr::mutate(dplyr::across(c("task_due_date"), as.Date)) + + display_tasks_dt_review() + }) + + ### modal ----- + display_tasks_dt_review <- function() { + + values$tasks_data <- values$tasks_data |> + dplyr::select(task_id:task_datetime_last_updated) + + rename_cols <- tasks_colnames[tasks_colnames %in% colnames(values$tasks_data)] + + date_cols <- c("task_datetime_created", "task_datetime_completed", "task_datetime_last_updated", "task_due_date") + date_cols <- which(colnames(values$tasks_data) %in% date_cols) + output$dt_todays_tasks <- DT::renderDataTable( DT::datatable( values$tasks_data, caption = 'Table 1: This is a simple caption for the table.', rownames = FALSE, - # colnames = col_types |> dplyr::pull(form_id, form_label), - extensions = c('KeyTable', "FixedColumns"), + colnames = rename_cols, + extensions = c("FixedColumns"), # editable = 'cell', selection = "single", options = list( dom = 'tip', scrollX = TRUE, fixedColumns = list(leftColumns = 1), - keys = TRUE + autoWidth = TRUE, + columnDefs = list( + list( + targets = 3:4, + width = '200px', + render = htmlwidgets::JS( + "function(data, type, row, meta) {", + "return type === 'display' && data.length > 20 ?", + "'' + data.substr(0, 20) + '...' : data;", + "}") + ) + ) ) ) |> - DT::formatDate(c("task_datetime_created", "task_datetime_completed", "task_datetime_last_updated", "task_due_date"), "toLocaleDateString", params = list('ru-RU')) + DT::formatDate(date_cols, "toLocaleDateString", params = list('ru-RU')) ) showModal(modalDialog( @@ -321,18 +379,19 @@ server <- function(id, values, scheme, mhcs) { easyClose = TRUE )) - }) + } + ### jump to main_key --------- observeEvent(input$jump_to_main_key, { if (is.null(input$dt_todays_tasks_rows_selected)) { showNotification("необходимо выбрать задачу", type = "error") } else { - + # get key new_main_key <- values$tasks_data[input$dt_todays_tasks_rows_selected,]$task_main_key values$main_key <- new_main_key - + showNotification("TODO: если ключа нет в таблице?!", type = "warning", duration = NULL) removeModal() @@ -360,4 +419,19 @@ update_task_button_count <- function(con, values, ns) { } } -} \ No newline at end of file +} + +tasks_colnames <- c( + "id задачи" = "task_id", + "id записи" = "task_main_key", + "статус" = "task_status", + "задача" = "task_title", + "описание" = "task_description", + "срок выполнения" = "task_due_date", + "создана" = "task_user_created", + "дата создания" = "task_datetime_created", + "обновлено" = "task_user_last_updated", + "дата обновления" = "task_datetime_last_updated", + "завершено" = "task_user_completed", + "дата выполнения" = "task_datetime_completed" +)