From ad2ab3c8238c6b21f6c35b1ca42f92ea4b4ba705 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Tue, 16 Feb 2021 20:48:49 +0100 Subject: [PATCH] Make sure to round up for the 'to' date --- hledger-lib/hledger-lib.cabal | 13 +++++++------ hledger-ui/hledger-ui.cabal | 9 +++++---- hledger-web/hledger-web.cabal | 9 +++++---- hledger-web/templates/chart.hamlet | 4 +++- hledger/hledger.cabal | 7 ++++--- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index 8169fa23f..8b5a55f5e 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.3. -- -- see: https://github.com/sol/hpack -- --- hash: 02ce04c7a484333ff2c8fbcaccbc26164fc238840f86cb69976f4d73280c9e7f +-- hash: aa9217e7e1959660c6302d2761ceae1c141739e5e6524850c2b631ad00b41061 name: hledger-lib version: 1.20.99 @@ -27,7 +27,8 @@ author: Simon Michael maintainer: Simon Michael license: GPL-3 license-file: LICENSE -tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC==8.10.0.20200123 +tested-with: + GHC==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC==8.10.0.20200123 build-type: Simple extra-source-files: CHANGES.md @@ -94,7 +95,7 @@ library Text.WideString Paths_hledger_lib hs-source-dirs: - ./. + ./ ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans build-depends: Decimal >=0.5.1 @@ -142,7 +143,7 @@ test-suite doctest type: exitcode-stdio-1.0 main-is: doctests.hs hs-source-dirs: - ./. + ./ test ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans build-depends: @@ -194,7 +195,7 @@ test-suite unittest type: exitcode-stdio-1.0 main-is: unittest.hs hs-source-dirs: - ./. + ./ test ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans build-depends: diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index 8582d41ae..b195153b1 100644 --- a/hledger-ui/hledger-ui.cabal +++ b/hledger-ui/hledger-ui.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.3. -- -- see: https://github.com/sol/hpack -- --- hash: eb7db07bad998397cfe2c32c3ecd66eed728e3685cbfa878ec38d305c4b2be6d +-- hash: 304ed633e8939a895e1d00fcaeac5bec442a08d5c7761299a968ce7d37a2fb7c name: hledger-ui version: 1.20.99 @@ -27,7 +27,8 @@ author: Simon Michael maintainer: Simon Michael license: GPL-3 license-file: LICENSE -tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC==8.10.0.20200123 +tested-with: + GHC==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC==8.10.0.20200123 build-type: Simple extra-source-files: CHANGES.md @@ -62,7 +63,7 @@ executable hledger-ui Hledger.UI.UIUtils Paths_hledger_ui hs-source-dirs: - ./. + ./ ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans cpp-options: -DVERSION="1.20.99" build-depends: diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 54a1c725f..67a46d0db 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 841707d59f94d90a72271f64d3bfad787a69c51e0530815d90088bb750953891 +-- hash: 256d170fe0b3e33cdbca8a02e228e510ebc57ce3325951aeb946647148ecc476 name: hledger-web version: 1.20.99 @@ -28,7 +28,8 @@ author: Simon Michael maintainer: Simon Michael license: GPL-3 license-file: LICENSE -tested-with: GHC==8.2.2, GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC==8.10.0.20200123 +tested-with: + GHC==8.2.2, GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC==8.10.0.20200123 build-type: Simple extra-source-files: CHANGES.md @@ -150,7 +151,7 @@ library other-modules: Paths_hledger_web hs-source-dirs: - ./. + ./ ghc-options: -Wall -fwarn-tabs -Wcompat -Wincomplete-uni-patterns -Wincomplete-record-updates -Wredundant-constraints cpp-options: -DVERSION="1.20.99" build-depends: diff --git a/hledger-web/templates/chart.hamlet b/hledger-web/templates/chart.hamlet index 921c5766c..02e7ab273 100644 --- a/hledger-web/templates/chart.hamlet +++ b/hledger-web/templates/chart.hamlet @@ -58,8 +58,10 @@ plot.setSelection({ xaxis: { from: 500, to: 700 } }); \$chartdiv.bind("plotselected", function(event, ranges) { console.log("selected", ranges.xaxis.from, ranges.xaxis.to); + /* Round down for the 'from' day: */ var from = new Date(ranges.xaxis.from); - var to = new Date(ranges.xaxis.to); + /* Round up for the 'to' day: */ + var to = new Date(ranges.xaxis.to + (24 * 60 * 60 * 1000) - 1); var range = from.getFullYear() + "/" + (from.getMonth() + 1) + "/" + from.getDate() + "-" + to.getFullYear() + "/" + (to.getMonth() + 1) + "/" + to.getDate(); diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 01bd55583..8d7ba180b 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.3. -- -- see: https://github.com/sol/hpack -- --- hash: 3bc66d37b391ba389cc1ab65460d1ede6666abe423973867ec35036d95477b25 +-- hash: 0b5bbadde58a7664f9a9b58d9b9bb8a26c56740885de870edccbd0cb464fb91e name: hledger version: 1.20.99 @@ -27,7 +27,8 @@ author: Simon Michael maintainer: Simon Michael license: GPL-3 license-file: LICENSE -tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC==8.10.0.20200123 +tested-with: + GHC==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC==8.10.0.20200123 build-type: Simple extra-source-files: CHANGES.md