fix: некорректная выгрузка xlsx
This commit is contained in:
37
app.R
37
app.R
@@ -9,6 +9,8 @@ suppressPackageStartupMessages({
|
|||||||
library(shinymanager)
|
library(shinymanager)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
# КАК ЗАПРЯТЯАТЬ ID
|
||||||
|
|
||||||
source("helpers/functions.R")
|
source("helpers/functions.R")
|
||||||
|
|
||||||
# SOURCE FILES ============================
|
# SOURCE FILES ============================
|
||||||
@@ -507,7 +509,10 @@ server <- function(input, output, session) {
|
|||||||
)
|
)
|
||||||
|
|
||||||
log_action_to_db("saving data (gt)", values$main_key, con)
|
log_action_to_db("saving data (gt)", values$main_key, con)
|
||||||
|
showNotification(
|
||||||
|
"Данные успешно сохранены",
|
||||||
|
type = "message"
|
||||||
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
## сохранение данных из вложенной формы ---------------
|
## сохранение данных из вложенной формы ---------------
|
||||||
@@ -533,7 +538,6 @@ server <- function(input, output, session) {
|
|||||||
)
|
)
|
||||||
|
|
||||||
log_action_to_db("saving data", values$main_key, con)
|
log_action_to_db("saving data", values$main_key, con)
|
||||||
|
|
||||||
showNotification(
|
showNotification(
|
||||||
"Данные успешно сохранены",
|
"Данные успешно сохранены",
|
||||||
type = "message"
|
type = "message"
|
||||||
@@ -839,30 +843,13 @@ server <- function(input, output, session) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
## export to .xlsx ======================
|
## export to .xlsx ======================
|
||||||
observeEvent(input$export_to_xlsx, {
|
|
||||||
|
|
||||||
ui <- shiny::radioButtons(
|
|
||||||
"export_scheme_selector",
|
|
||||||
label = strong("Выбрать базу данных для работы:"),
|
|
||||||
choices = enabled_schemas,
|
|
||||||
selected = scheme()
|
|
||||||
)
|
|
||||||
|
|
||||||
showModal(modalDialog(
|
|
||||||
title = "чего учидил",
|
|
||||||
ui,
|
|
||||||
footer = tagList(
|
|
||||||
actionButton("one", "one"),
|
|
||||||
actionButton("close_modal_button", "Отмена")
|
|
||||||
)
|
|
||||||
))
|
|
||||||
|
|
||||||
})
|
|
||||||
|
|
||||||
output$downloadData <- downloadHandler(
|
output$downloadData <- downloadHandler(
|
||||||
filename = paste0(isolate(scheme()), "_", format(Sys.time(), "%Y%m%d_%H%M%S"), ".xlsx"),
|
filename = function(){
|
||||||
|
paste0(isolate(scheme()), "_", format(Sys.time(), "%Y%m%d_%H%M%S"), ".xlsx")
|
||||||
|
},
|
||||||
content = function(file) {
|
content = function(file) {
|
||||||
con <- db$make_db_connection(scheme(),"downloadData")
|
|
||||||
|
con <- db$make_db_connection(isolate(scheme()),"downloadData")
|
||||||
on.exit(db$close_db_connection(con, "downloadData"), add = TRUE)
|
on.exit(db$close_db_connection(con, "downloadData"), add = TRUE)
|
||||||
|
|
||||||
# get all data
|
# get all data
|
||||||
@@ -1239,4 +1226,4 @@ server <- function(input, output, session) {
|
|||||||
|
|
||||||
app <- shinyApp(ui = ui, server = server)
|
app <- shinyApp(ui = ui, server = server)
|
||||||
|
|
||||||
runApp(app, launch.browser = TRUE)
|
runApp(app, launch.browser = TRUE)
|
||||||
|
|||||||
Binary file not shown.
@@ -19,7 +19,10 @@ set_global_options = function(
|
|||||||
}
|
}
|
||||||
|
|
||||||
#' @export
|
#' @export
|
||||||
enabled_schemas <- c(`Тестовая база данных` = "example_of_scheme")
|
enabled_schemas <- c(
|
||||||
|
`Тестовая база данных` = "example_of_scheme"
|
||||||
|
# `D2TRA (для отладки)` = "d2tra_t"
|
||||||
|
)
|
||||||
|
|
||||||
#' @export
|
#' @export
|
||||||
check_and_init_scheme = function() {
|
check_and_init_scheme = function() {
|
||||||
|
|||||||
Reference in New Issue
Block a user