diff --git a/DESCRIPTION b/DESCRIPTION index 308b4a040d8850be5bc31bf97c122d0d026a2f68..e7a1c979454d3a260e30c8a0ddb429bbbea87b36 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: airGRteaching Type: Package Title: Tools to Simplify the Use of the airGR Hydrological Package for Education (Including a Shiny Interface) -Version: 0.1.5.21 +Version: 0.1.5.22 Date: 2017-09-14 Authors@R: c(person("Olivier", "Delaigue", role = c("aut", "cre"), email = "airGR@irstea.fr"), person("Laurent", "Coron", role = c("aut")), person("Pierre", "Brigode", role = c("aut")), person("Guillaume", "Thirel", role = c("ctb"))) Depends: airGR (>= 1.0.9.43) diff --git a/inst/ShinyGR/server.R b/inst/ShinyGR/server.R index 138a706d04aea0981bf566c1cfb3018bd76e0196..cb838f8817960f29a756e9abebb5252b5a4dcb9a 100644 --- a/inst/ShinyGR/server.R +++ b/inst/ShinyGR/server.R @@ -411,7 +411,7 @@ shinyServer(function(input, output, session) { output$DownloadTab <- downloadHandler( filename = function() { filename <- "TabSim" - filename <- sprintf("airGRteaching_%s.csv", filename) + filename <- sprintf("airGR_%s_%s.csv", filename, gsub("(.*)( )(\\d{2})(:)(\\d{2})(:)(\\d{2})", "\\1_\\3h\\5m\\7s", Sys.time())) }, content = function(file) { OBS <- getPrep()$OBS @@ -447,7 +447,7 @@ shinyServer(function(input, output, session) { "Flow time series" = "PlotFlowTimeSeries", "State variables" = "PlotStateVar", "Model diagram" = "PlotModelDiag") - filename <- sprintf("airGRteaching_%s.png", filename) + filename <- sprintf("airGR_%s_%s.png", filename, gsub("(.*)( )(\\d{2})(:)(\\d{2})(:)(\\d{2})", "\\1_\\3h\\5m\\7s", Sys.time())) }, content = function(file) { k <- 1.75