git.iko.soy/typeable/extra-time
on master help sign in
Merge pull request #4 from typeable/ville/add-opm-holidays
3e734ecVille Tirronen
data/opm-holidays.csvnew file+112
compare with master
unifiedsplit
@@ -0,0 +1,112 @@
1+Date holiday observed
2+2018-11-22
3+2018-11-23
4+2018-12-25
5+2019-01-01
6+2020-01-01
7+2020-05-25
8+2020-07-03
9+2020-09-07
10+2020-11-26
11+2020-11-27
12+2020-12-25
13+2021-01-01
14+2022-01-02
15+2022-01-16
16+2022-02-20
17+2022-05-29
18+2022-06-19
19+2022-07-04
20+2022-09-04
21+2022-10-09
22+2022-11-10
23+2022-11-23
24+2022-12-25
25+2023-01-01
26+2023-01-15
27+2023-02-20
28+2023-05-27
29+2023-06-19
30+2023-07-04
31+2023-09-02
32+2023-10-04
33+2023-11-11
34+2023-11-28
35+2023-12-25
36+2024-01-01
37+2024-01-15
38+2024-02-19
39+2024-05-27
40+2024-06-19
41+2024-07-04
42+2024-09-02
43+2024-10-14
44+2024-11-11
45+2024-11-28
46+2024-12-25
47+2025-01-01
48+2025-01-20
49+2025-02-17
50+2025-05-26
51+2025-06-19
52+2025-07-04
53+2025-09-01
54+2025-10-13
55+2025-11-11
56+2025-11-27
57+2025-12-25
58+2026-01-01
59+2026-01-19
60+2026-02-16
61+2026-05-25
62+2026-06-19
63+2026-07-03
64+2026-09-07
65+2026-10-12
66+2026-11-11
67+2026-11-26
68+2026-12-25
69+2027-01-01
70+2027-01-18
71+2027-02-15
72+2027-05-31
73+2027-06-18
74+2027-07-05
75+2027-09-06
76+2027-10-11
77+2027-11-11
78+2027-11-25
79+2027-12-24
80+2027-12-31
81+2028-01-17
82+2028-02-21
83+2028-05-29
84+2028-06-19
85+2028-07-04
86+2028-09-04
87+2028-10-09
88+2028-11-10
89+2028-11-23
90+2028-12-25
91+2029-01-01
92+2029-01-15
93+2029-02-19
94+2029-05-28
95+2029-06-19
96+2029-07-04
97+2029-09-03
98+2029-10-08
99+2029-11-12
100+2029-11-22
101+2029-12-25
102+2030-01-01
103+2030-01-21
104+2030-02-18
105+2030-05-27
106+2030-06-19
107+2030-07-04
108+2030-09-02
109+2030-10-14
110+2030-11-11
111+2030-11-28
112+2030-12-25
extra-time.cabal+11−1
@@ -6,7 +6,7 @@ license-file: LICENSE
6author: typeable.io
6author: typeable.io
7maintainer: giorgio@marinel.li
7maintainer: giorgio@marinel.li
8build-type: Simple
8build-type: Simple
9−extra-source-files: README.md
9+extra-source-files: README.md, data/opm-holidays.csv
10
10
11library
11library
12 hs-source-dirs: src
12 hs-source-dirs: src
@@ -15,7 +15,9 @@ library
15 DataKinds
15 DataKinds
16 DeriveFunctor
16 DeriveFunctor
17 DeriveGeneric
17 DeriveGeneric
18+ DerivingStrategies
18 GeneralizedNewtypeDeriving
19 GeneralizedNewtypeDeriving
20+ ImportQualifiedPost
19 KindSignatures
21 KindSignatures
20 OverloadedStrings
22 OverloadedStrings
21 RankNTypes
23 RankNTypes
@@ -27,10 +29,16 @@ library
27 -- | from ghc
29 -- | from ghc
28 base >= 4.7 && < 5 ,
30 base >= 4.7 && < 5 ,
29 binary ,
31 binary ,
32+ bytestring ,
30 containers ,
33 containers ,
34+ cassava ,
35+ cassava-embed ,
36+ file-embed ,
31 deepseq ,
37 deepseq ,
32 mtl >= 2.2 ,
38 mtl >= 2.2 ,
39+ template-haskell ,
33 text ,
40 text ,
41+ th-lift ,
34 time,
42 time,
35 -- | from hackage
43 -- | from hackage
36 aeson ,
44 aeson ,
@@ -40,6 +48,7 @@ library
40 QuickCheck ,
48 QuickCheck ,
41 quickcheck-instances ,
49 quickcheck-instances ,
42 timezone-series ,
50 timezone-series ,
51+ vector ,
43 if !impl(ghcjs)
52 if !impl(ghcjs)
44 build-depends:
53 build-depends:
45 dom-parser ,
54 dom-parser ,
@@ -52,3 +61,4 @@ library
52 Data.Time.Utils
61 Data.Time.Utils
53 other-modules:
62 other-modules:
54 Data.Time.LocalTime.Instances
63 Data.Time.LocalTime.Instances
64+ Holidays.EDay
src/Data/Time/Holidays.hs+8
@@ -1,5 +1,6 @@
1module Data.Time.Holidays
1module Data.Time.Holidays
2 ( addTimeExcludingHolidays
2 ( addTimeExcludingHolidays
3+ , opmHolidays2023to2030
3 ) where
4 ) where
4
5
5import Data.Proxy
6import Data.Proxy
@@ -7,7 +8,14 @@ import qualified Data.Set as S
7import Data.Time
8import Data.Time
8import Data.Time.Calendar.OrdinalDate
9import Data.Time.Calendar.OrdinalDate
9import Data.Time.LocalTime.TimeZone.Series
10import Data.Time.LocalTime.TimeZone.Series
11+import Data.FileEmbed (makeRelativeToProject)
12+import Data.Csv.Embed (embedRecords)
13+import Holidays.EDay (eDayToDay, EDay)
10
14
15+opmHolidays2023to2030 :: S.Set Day
16+opmHolidays2023to2030 = S.fromList $
17+ eDayToDay <$>
18+ $(makeRelativeToProject "data/opm-holidays.csv" >>= embedRecords (Proxy @(EDay)))
11
19
12addTimeExcludingHolidays
20addTimeExcludingHolidays
13 :: S.Set Day
21 :: S.Set Day
stack.yaml+1
@@ -7,3 +7,4 @@ extra-deps:
7 - xml-lens-0.3.1@sha256:8ed0cea5a2c33d665f8e3d7116c91edc466e6954a287d90d496e70550a04493d,1115
7 - xml-lens-0.3.1@sha256:8ed0cea5a2c33d665f8e3d7116c91edc466e6954a287d90d496e70550a04493d,1115
8 - git: https://github.com/typeable/dom-parser.git
8 - git: https://github.com/typeable/dom-parser.git
9 commit: 7d556ba528bfa216e99714f8a0d4d00f452803a9
9 commit: 7d556ba528bfa216e99714f8a0d4d00f452803a9
10+ - cassava-embed-0.1.0.0