From 0d15c67c596021de592f62a24bcd28c2e407cc26 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Tue, 14 Apr 2020 08:07:55 +0200
Subject: [PATCH] v0.2.10.7 UPDATE: missing daily Event sliders are now
displayed monthly dates in the GUI when GR2M is used #14
---
DESCRIPTION | 2 +-
NEWS.md | 2 +-
inst/ShinyGR/server.R | 7 ++++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 3ff2960..87f29d1 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 3789418..a23b990 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 dc50bac..8f1bfb0 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
--
GitLab