diff --git a/DESCRIPTION b/DESCRIPTION index 3ff2960b50ad7a84eb2c26fc83d8a6f74bf95845..87f29d14644eeb820c88c5dfc9596897aa453a03 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: airGRteaching Type: Package Title: Teaching Hydrological Modelling with the GR Rainfall-Runoff Models ('Shiny' Interface Included) -Version: 0.2.10.6 +Version: 0.2.10.7 Date: 2020-04-14 Authors@R: c( person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"), diff --git a/NEWS.md b/NEWS.md index 37894189abffa0f6a8b9c2a57784e973c2ebaf26..a23b990fd72f329df36d29350d0cdc71e9d3e13c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ -### 0.2.10.6 Release Notes (2020-04-14) +### 0.2.10.7 Release Notes (2020-04-14) #### New features diff --git a/inst/ShinyGR/server.R b/inst/ShinyGR/server.R index dc50bacdfb4748bc287197a6fc2a6efee38e43d5..8f1bfb051de952aad2d219f3d89b128182124517 100644 --- a/inst/ShinyGR/server.R +++ b/inst/ShinyGR/server.R @@ -548,14 +548,15 @@ shinyServer(function(input, output, session) { min = as.POSIXct(.ShinyGR.args$SimPer[[input$Dataset]][1L], tz = "UTC"),## + .TypeModelGR(input$HydroModel)$TimeLag, max = as.POSIXct(.ShinyGR.args$SimPer[[input$Dataset]][2L], tz = "UTC"), value = as.POSIXct(.ShinyGR.args$SimPer[[input$Dataset]][1L], tz = "UTC"), + .TypeModelGR(input$HydroModel)$TimeLag, - timeFormat = "%F", timezone = "+0000") + timeFormat = timeFormat, timezone = "+0000") }) observe({ + timeFormat <- ifelse(input$HydroModel == "GR2M", "%Y-%m", "%F") updateSliderInput(session, inputId = "Event", label = "Select the target date:", min = input$Period[1L],## + .TypeModelGR(input$HydroModel)$TimeLag, max = input$Period[2L], - timeFormat = "%F", timezone = "+0000") - }) + timeFormat = timeFormat, timezone = "+0000") + }, priority = -100) ## Graphical parameters