madeliri/formy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: небольшие изменения

Browse Source
This commit is contained in:
madeliri
2026-06-13 17:21:04 +03:00
parent 358a238f4e
commit 835f053584
6 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app.R
View File

@@ -175,7 +175,6 @@ server <- function(input, output, session) {
}
})
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# REACTIVE VALUES =================================
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -253,7 +252,6 @@ server <- function(input, output, session) {
hr(),
"Для начала работы нужно создать новую запись или загрузить существующую!",
hr(),
# сво
# загрузка панели для работы с базой данных
uiOutput("admin_buttons_panel")
)
@@ -280,6 +278,7 @@ server <- function(input, output, session) {
output$base_data <- renderUI({
if (main_form_is_empty() == "main_menu") {
con <- db$make_db_connection(scheme(),"base_data")
on.exit(db$close_db_connection(con, "base_data"), add = TRUE)
@@ -292,13 +291,13 @@ server <- function(input, output, session) {
# задачи на сегодня
if ("tasks" %in% DBI::dbListTables(con)) {
tasks_count <- DBI::dbGetQuery(con, glue::glue("SELECT COUNT (task_id) FROM tasks WHERE task_status = 'active'")) |>
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())}")) |>
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())}")) |>
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 {
@@ -709,10 +708,11 @@ server <- function(input, output, session) {
# загрузка данных в формы
forms$load_data_to_form(
df = df,
table_name = values$nested_form_id,
mhcs = mhcs,
table_name = values$nested_form_id,
mhcs = mhcs,
ns = NS(values$nested_form_id)
)
} else {
utils$clean_forms(values$nested_form_id, mhcs(), NS(values$nested_form_id))
}
@@ -1258,7 +1258,7 @@ server <- function(input, output, session) {
df <- df |>
dplyr::mutate(
# даты - к единому формату
dplyr::across(tidyselect::all_of({{date_columns}}), \(x) purrr::map_chr(x, db$excel_to_db_dates_converter)),
dplyr::across(tidyselect::all_of({{date_columns}}), \(x) purrr::map_chr(x, db$excel_to_db_dates_converter)),
dplyr::across(tidyselect::all_of({{number_columns}}), num_converter),
dplyr::across(tidyselect::all_of({{other_cols}}), \(x) dplyr::if_else(x == "", as.character(NA), as.character(x)))
) |>