diff --git a/manifest.webapp b/manifest.webapp
index 82c13c9197505acfb1838db9f2eb81db73378cbc..a583e72d53e277ecc5d2b4e2259d0b0bfaafda35 100644
--- a/manifest.webapp
+++ b/manifest.webapp
@@ -34,15 +34,15 @@
},
"enedis": {
"description": "Utilisé pour partager vos données Enedis",
- "type": "io.enedis.*"
+ "type": "com.grandlyon.enedis.*"
},
"grdf": {
"description": "Utilisé pour partager vos données GRDF",
- "type": "io.grdf.*"
+ "type": "com.grandlyon.grdf.*"
},
"egl": {
"description": "Utilisé pour partager vos données EGL",
- "type": "io.egl.*"
+ "type": "com.grandlyon.egl.*"
},
"accounts": {
"description": "Utilisé pour obtenir les données du compte",
@@ -62,7 +62,7 @@
},
"ecolyo": {
"description": "Utilisé pour partager vos données Ecolyo.",
- "type": "io.ecolyo.*"
+ "type": "com.grandlyon.ecolyo.*"
}
}
}
diff --git a/src/assets/icons/visu/enedis-logo.svg b/src/assets/icons/visu/enedis-logo.svg
index 0e07225ab4de19103fb97e4747d61039ecd4d08a..c9bab7de0e5ef57f72891d2b0bd260726b4cc0e8 100644
--- a/src/assets/icons/visu/enedis-logo.svg
+++ b/src/assets/icons/visu/enedis-logo.svg
@@ -1,4 +1,4 @@
<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0 10C0 4.47715 4.47715 0 10 0H38C43.5229 0 48 4.47715 48 10V38C48 43.5229 43.5228 48 38 48H0V10Z" fill="black"/>
-<path d="M0 21V28H9V30C9 36.6274 14.3726 42 21 42H47.1679C47.7031 40.775 48 39.4222 48 38V35H21C18.2386 35 16 32.7615 16 30V28H33C36.3137 28 39 25.3137 39 22V12C39 8.68628 36.3137 6 33 6H15C11.6863 6 9 8.68628 9 12V19H16V16C16 14.3431 17.3431 13 19 13H29C30.6569 13 32 14.3431 32 16V18C32 19.6569 30.6569 21 29 21H0Z" fill="#F1C017"/>
+<path d="M10 0C4.47715 0 0 4.47715 0 10V21H29C30.6569 21 32 19.6569 32 18V16C32 14.3431 30.6569 13 29 13H19C17.3431 13 16 14.3431 16 16V19H9V12C9 8.68628 11.6863 6 15 6H33C36.3137 6 39 8.68628 39 12V22C39 25.3137 36.3137 28 33 28H16V30C16 32.7615 18.2386 35 21 35H48V10C48 4.47715 43.5229 0 38 0H10Z" fill="black"/>
+<path d="M47.2141 41.8925C47.1989 41.9284 47.1835 41.9643 47.1679 42H21C14.3726 42 9 36.6274 9 30V28H0V48H38C42.1421 48 45.6961 45.4816 47.2141 41.8925Z" fill="black"/>
</svg>
diff --git a/src/components/ContentComponents/Konnector/KonnectorLaunch.tsx b/src/components/ContentComponents/Konnector/KonnectorLaunch.tsx
index cf13ee8a9e2c206a71adf580a5f552765944307f..7d1d78058a595cdcdef3859a11f243cccbfa3d2a 100644
--- a/src/components/ContentComponents/Konnector/KonnectorLaunch.tsx
+++ b/src/components/ContentComponents/Konnector/KonnectorLaunch.tsx
@@ -78,20 +78,20 @@ const KonnectorLaunch: React.FC<KonnectorLaunchProps> = ({
}, [])
return (
- <div className="klaunch-content">
- {!state ? (
- <>
- <Lottie options={loadingOptions} height={50} width={50} />
- <div className="klaunch-content-text klaunch-content-text-center text-16-normal">
- <div>{t('KONNECTORCONFIG.PLZ_WAIT')}</div>
- </div>
- <div className="klaunch-content-text text-16-normal">
- <div>{t('KONNECTORCONFIG.LOADING_DATA')}</div>
- </div>
- </>
- ) : (
- <>
- <Modal open={openModal} handleCloseClick={handleCloseClick} border>
+ <Modal open={openModal} handleCloseClick={handleCloseClick} border>
+ <div className="klaunch-content">
+ {!state ? (
+ <>
+ <Lottie options={loadingOptions} height={50} width={50} speed={2} />
+ <div className="klaunch-content-text klaunch-content-text-center text-16-normal">
+ <div>{t('KONNECTORCONFIG.PLZ_WAIT')}</div>
+ </div>
+ <div className="klaunch-content-text text-16-normal">
+ <div>{t('KONNECTORCONFIG.LOADING_DATA')}</div>
+ </div>
+ </>
+ ) : (
+ <>
<div className="klaunch-info-txt">
{state === ERROR_EVENT
? t('KONNECTORCONFIG.ERROR_DATA')
@@ -100,10 +100,10 @@ const KonnectorLaunch: React.FC<KonnectorLaunchProps> = ({
<div>{t('KONNECTORCONFIG.OK')}</div>
</StyledButton>
</div>
- </Modal>
- </>
- )}
- </div>
+ </>
+ )}
+ </div>
+ </Modal>
)
}
diff --git a/src/components/ContentComponents/Test/Test.tsx b/src/components/ContentComponents/Test/Test.tsx
index f95f6bca257bb24dc4f45021108533b347d08b10..4a71a00751f9bed57194d087db512f5ee5a52ae9 100644
--- a/src/components/ContentComponents/Test/Test.tsx
+++ b/src/components/ContentComponents/Test/Test.tsx
@@ -14,7 +14,7 @@ const Test: React.FC<TestProps> = ({ client }: TestProps) => {
async function loadData() {
const data = await client.query(
client
- .find('io.ecolyo.challengetype')
+ .find('com.grandlyon.ecolyo.challengetype')
.where({ level: { $lte: 0 } })
.include(['availableEcogestures'])
.limitBy(20)
@@ -27,7 +27,7 @@ const Test: React.FC<TestProps> = ({ client }: TestProps) => {
async function loadUserChallenge() {
const data = await client.query(
client
- .find('io.ecolyo.userchallenge')
+ .find('com.grandlyon.ecolyo.userchallenge')
.where({ state: { $eq: 0 } })
.include(['selectedEcogestures', 'challengeType'])
.limitBy(1)
@@ -71,9 +71,9 @@ const Test: React.FC<TestProps> = ({ client }: TestProps) => {
challenge en cours - challenge type:
{userChallenge &&
userChallenge.included.map((item, index) => {
- if (item._type === 'io.ecolyo.challengetype') {
+ if (item._type === 'com.grandlyon.ecolyo.challengetype') {
return <ul key={index}>Challenge Type : {item.title}</ul>
- } else if (item._type === 'io.ecolyo.ecogesture') {
+ } else if (item._type === 'com.grandlyon.ecolyo.ecogesture') {
return <ul key={index}>Ecogeste : {item.shortName}</ul>
}
})}
diff --git a/src/db/challengeTypeData.json b/src/db/challengeTypeData.json
index 028b6669bd4a9523990f224d345dcd5be39eb5f1..033efa5b0f104616fead022f75b38c5ba7bbe069 100644
--- a/src/db/challengeTypeData.json
+++ b/src/db/challengeTypeData.json
@@ -10,8 +10,8 @@
"relationships": {
"availableEcogestures": {
"data": [
- { "_id": "0085", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0092", "_type": "io.ecolyo.ecogesture" }
+ { "_id": "0085", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0092", "_type": "com.grandlyon.ecolyo.ecogesture" }
]
}
}
@@ -27,20 +27,20 @@
"relationships": {
"availableEcogestures": {
"data": [
- { "_id": "0032", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0034", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0041", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0042", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0043", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0045", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0050", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0058", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0064", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0066", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0071", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0078", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0082", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0093", "_type": "io.ecolyo.ecogesture" }
+ { "_id": "0032", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0034", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0041", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0042", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0043", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0045", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0050", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0058", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0064", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0066", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0071", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0078", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0082", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0093", "_type": "com.grandlyon.ecolyo.ecogesture" }
]
}
}
@@ -56,20 +56,20 @@
"relationships": {
"availableEcogestures": {
"data": [
- { "_id": "0032", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0034", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0041", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0042", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0043", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0045", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0050", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0058", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0064", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0066", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0071", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0078", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0082", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0093", "_type": "io.ecolyo.ecogesture" }
+ { "_id": "0032", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0034", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0041", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0042", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0043", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0045", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0050", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0058", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0064", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0066", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0071", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0078", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0082", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0093", "_type": "com.grandlyon.ecolyo.ecogesture" }
]
}
}
@@ -85,20 +85,20 @@
"relationships": {
"availableEcogestures": {
"data": [
- { "_id": "0032", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0034", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0041", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0042", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0043", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0045", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0050", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0058", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0064", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0066", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0071", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0078", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0082", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0093", "_type": "io.ecolyo.ecogesture" }
+ { "_id": "0032", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0034", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0041", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0042", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0043", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0045", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0050", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0058", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0064", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0066", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0071", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0078", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0082", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0093", "_type": "com.grandlyon.ecolyo.ecogesture" }
]
}
}
@@ -114,20 +114,20 @@
"relationships": {
"availableEcogestures": {
"data": [
- { "_id": "0032", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0034", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0041", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0042", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0043", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0045", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0050", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0058", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0064", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0066", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0071", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0078", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0082", "_type": "io.ecolyo.ecogesture" },
- { "_id": "0093", "_type": "io.ecolyo.ecogesture" }
+ { "_id": "0032", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0034", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0041", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0042", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0043", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0045", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0050", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0058", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0064", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0066", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0071", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0078", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0082", "_type": "com.grandlyon.ecolyo.ecogesture" },
+ { "_id": "0093", "_type": "com.grandlyon.ecolyo.ecogesture" }
]
}
}
diff --git a/src/db/userChallengeData.json b/src/db/userChallengeData.json
index dc7c79346fa698f10faad2b5f4291716f67b4e6b..374af7e673198732d20fddba168f2cd51348681d 100644
--- a/src/db/userChallengeData.json
+++ b/src/db/userChallengeData.json
@@ -9,18 +9,18 @@
"challengeType": {
"data": {
"_id": "CHA00000001",
- "_type": "io.ecolyo.challengetype"
+ "_type": "com.grandlyon.ecolyo.challengetype"
}
},
"selectedEcogestures": {
"data": [
{
"_id": "0085",
- "_type": "io.ecolyo.ecogesture"
+ "_type": "com.grandlyon.ecolyo.ecogesture"
},
{
"_id": "0092",
- "_type": "io.ecolyo.ecogesture"
+ "_type": "com.grandlyon.ecolyo.ecogesture"
}
]
}
diff --git a/src/doctypes/index.ts b/src/doctypes/index.ts
index f6888b4bc072f89df99b1b073367d8f069ae0bf7..07e0993b95e2278f74dfb24acb326dcfd6c35282 100644
--- a/src/doctypes/index.ts
+++ b/src/doctypes/index.ts
@@ -1,15 +1,15 @@
-import { ENEDIS_DAY_DOCTYPE } from './io-enedis-day'
-import { GRDF_DAY_DOCTYPE } from './io-grdf-day'
-import { EGL_DAY_DOCTYPE } from './io-egl-day'
+import { ENEDIS_DAY_DOCTYPE } from './com-grandlyon-enedis-day'
+import { GRDF_DAY_DOCTYPE } from './com-grandlyon-grdf-day'
+import { EGL_DAY_DOCTYPE } from './com-grandlyon-egl-day'
import { KONNECTORS_DOCTYPE } from './io-cozy-konnectors'
import { ACCOUNTS_DOCTYPE } from './io-cozy-accounts'
import { JOBS_DOCTYPE } from './io-cozy-jobs'
-import { CHALLENGETYPE_DOCTYPE } from './io-ecolyo-challengetype'
-import { USERCHALLENGE_DOCTYPE } from './io-ecolyo-userchallenge'
-import { ECOGESTURE_DOCTYPE } from './io-ecolyo-ecogesture'
-import { USERPROFILE_DOCTYPE } from './io-ecolyo-userprofile'
+import { CHALLENGETYPE_DOCTYPE } from './com-grandlyon-ecolyo-challengetype'
+import { USERCHALLENGE_DOCTYPE } from './com-grandlyon-ecolyo-userchallenge'
+import { ECOGESTURE_DOCTYPE } from './com-grandlyon-ecolyo-ecogesture'
+import { USERPROFILE_DOCTYPE } from './com-grandlyon-ecolyo-userprofile'
// the documents schema, necessary for CozyClient
const doctypes = {
@@ -82,27 +82,27 @@ const doctypes = {
export default doctypes
// export all doctypes for the application
-export * from './io-enedis-minute'
-export * from './io-enedis-hour'
-export * from './io-enedis-day'
-export * from './io-enedis-month'
-export * from './io-enedis-year'
+export * from './com-grandlyon-enedis-minute'
+export * from './com-grandlyon-enedis-hour'
+export * from './com-grandlyon-enedis-day'
+export * from './com-grandlyon-enedis-month'
+export * from './com-grandlyon-enedis-year'
-export * from './io-grdf-hour'
-export * from './io-grdf-day'
-export * from './io-grdf-month'
-export * from './io-grdf-year'
+export * from './com-grandlyon-grdf-hour'
+export * from './com-grandlyon-grdf-day'
+export * from './com-grandlyon-grdf-month'
+export * from './com-grandlyon-grdf-year'
-export * from './io-egl-day'
-export * from './io-egl-month'
-export * from './io-egl-year'
+export * from './com-grandlyon-egl-day'
+export * from './com-grandlyon-egl-month'
+export * from './com-grandlyon-egl-year'
export * from './io-cozy-konnectors'
export * from './io-cozy-accounts'
export * from './io-cozy-triggers'
export * from './io-cozy-jobs'
-export * from './io-ecolyo-challengetype'
-export * from './io-ecolyo-userchallenge'
-export * from './io-ecolyo-ecogesture'
-export * from './io-ecolyo-userprofile'
+export * from './com-grandlyon-ecolyo-challengetype'
+export * from './com-grandlyon-ecolyo-userchallenge'
+export * from './com-grandlyon-ecolyo-ecogesture'
+export * from './com-grandlyon-ecolyo-userprofile'
diff --git a/src/doctypes/io-ecolyo-challengetype.ts b/src/doctypes/io-ecolyo-challengetype.ts
deleted file mode 100644
index 73862e4c6b7e1c85d214697df3c463ab20556fb7..0000000000000000000000000000000000000000
--- a/src/doctypes/io-ecolyo-challengetype.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const CHALLENGETYPE_DOCTYPE = 'io.ecolyo.challengetype'
diff --git a/src/doctypes/io-ecolyo-ecogesture.ts b/src/doctypes/io-ecolyo-ecogesture.ts
deleted file mode 100644
index f9dc22dd75e9a86db9ae3e41d82701210af0f2f2..0000000000000000000000000000000000000000
--- a/src/doctypes/io-ecolyo-ecogesture.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const ECOGESTURE_DOCTYPE = 'io.ecolyo.ecogesture'
diff --git a/src/doctypes/io-ecolyo-userchallenge.ts b/src/doctypes/io-ecolyo-userchallenge.ts
deleted file mode 100644
index e1d544341f442fcc53dc9ef65ba9bb7b50be90e3..0000000000000000000000000000000000000000
--- a/src/doctypes/io-ecolyo-userchallenge.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const USERCHALLENGE_DOCTYPE = 'io.ecolyo.userchallenge'
diff --git a/src/doctypes/io-ecolyo-userprofile.ts b/src/doctypes/io-ecolyo-userprofile.ts
deleted file mode 100644
index 1f7a1047085c3c8dfaeb707741039ede5cfcee0a..0000000000000000000000000000000000000000
--- a/src/doctypes/io-ecolyo-userprofile.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const USERPROFILE_DOCTYPE = 'io.ecolyo.userprofile'
diff --git a/src/doctypes/io-egl-day.ts b/src/doctypes/io-egl-day.ts
deleted file mode 100644
index 5fac2f15443b3d79d9b36cb14e64deb0f2fac890..0000000000000000000000000000000000000000
--- a/src/doctypes/io-egl-day.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { QueryDefinitionBuilder } from 'cozy-client'
-
-export const EGL_DAY_DOCTYPE = 'io.egl.day'
-
-export type EglDay = {
- time: string
- load: string
- type: string
-}
-
-export function isEglDay(day: any): day is EglDay {
- return day && 'time' in day && 'load' in day
-}
-
-export function isEglData(data: any[]): data is EglDay[] {
- return data.every(isEglDay)
-}
-
-// queries for CozyClient
-export const eglQueryClient: QueryDefinitionBuilder = client =>
- client.find(EGL_DAY_DOCTYPE)
diff --git a/src/doctypes/io-egl-month.ts b/src/doctypes/io-egl-month.ts
deleted file mode 100644
index bf7f689e0b29e61ef6dceacab81e8ffa45cfff88..0000000000000000000000000000000000000000
--- a/src/doctypes/io-egl-month.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const EGL_MONTH_DOCTYPE = 'io.egl.month'
diff --git a/src/doctypes/io-egl-year.ts b/src/doctypes/io-egl-year.ts
deleted file mode 100644
index 6c3d5eec9f8143a69a14039ecfc666ffa62e2705..0000000000000000000000000000000000000000
--- a/src/doctypes/io-egl-year.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const EGL_YEAR_DOCTYPE = 'io.egl.year'
diff --git a/src/doctypes/io-enedis-day.ts b/src/doctypes/io-enedis-day.ts
deleted file mode 100644
index 887cd7f4305f8e8b70314e1129cb27442ca6b7d0..0000000000000000000000000000000000000000
--- a/src/doctypes/io-enedis-day.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { QueryDefinitionBuilder } from 'cozy-client'
-
-export const ENEDIS_DAY_DOCTYPE = 'io.enedis.day'
-
-export type EnedisDay = {
- time: string
- load: string
-}
-
-export function isEnedisDay(day: any): day is EnedisDay {
- return day && 'time' in day && 'load' in day
-}
-
-export function isEnedisData(data: any[]): data is EnedisDay[] {
- return data.every(isEnedisDay)
-}
-
-// queries for CozyClient
-export const enedisQueryClient: QueryDefinitionBuilder = client =>
- client.find(ENEDIS_DAY_DOCTYPE)
diff --git a/src/doctypes/io-enedis-hour.ts b/src/doctypes/io-enedis-hour.ts
deleted file mode 100644
index 61c7ad7d5e83c1166328d95408758d85610c86bb..0000000000000000000000000000000000000000
--- a/src/doctypes/io-enedis-hour.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const ENEDIS_HOUR_DOCTYPE = 'io.enedis.hour'
diff --git a/src/doctypes/io-enedis-minute.ts b/src/doctypes/io-enedis-minute.ts
deleted file mode 100644
index 0481c97d4dd42ecdf11cc0a57ae31f18a0d03d49..0000000000000000000000000000000000000000
--- a/src/doctypes/io-enedis-minute.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const ENEDIS_MINUTE_DOCTYPE = 'io.enedis.minute'
diff --git a/src/doctypes/io-enedis-month.ts b/src/doctypes/io-enedis-month.ts
deleted file mode 100644
index cc1df55cefb898567c6c4ecb4af55d519d1798fa..0000000000000000000000000000000000000000
--- a/src/doctypes/io-enedis-month.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const ENEDIS_MONTH_DOCTYPE = 'io.enedis.month'
diff --git a/src/doctypes/io-enedis-year.ts b/src/doctypes/io-enedis-year.ts
deleted file mode 100644
index 42624bc27a47c6c11b9cd24b01387f8e04b5862a..0000000000000000000000000000000000000000
--- a/src/doctypes/io-enedis-year.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const ENEDIS_YEAR_DOCTYPE = 'io.enedis.year'
diff --git a/src/doctypes/io-grdf-day.ts b/src/doctypes/io-grdf-day.ts
deleted file mode 100644
index 307decc7de8ace60e6d1eeed1f9e8775018a4e9b..0000000000000000000000000000000000000000
--- a/src/doctypes/io-grdf-day.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { QueryDefinitionBuilder } from 'cozy-client'
-
-export const GRDF_DAY_DOCTYPE = 'io.grdf.day'
-
-export type GrdfDay = {
- time: string
- load: string
-}
-
-export function isGrdfDay(day: any): day is GrdfDay {
- return day && 'time' in day && 'load' in day
-}
-
-export function isGrdfData(data: any[]): data is GrdfDay[] {
- return data.every(isGrdfDay)
-}
-
-// queries for CozyClient
-export const grdfQueryClient: QueryDefinitionBuilder = client =>
- client.find(GRDF_DAY_DOCTYPE)
diff --git a/src/doctypes/io-grdf-hour.ts b/src/doctypes/io-grdf-hour.ts
deleted file mode 100644
index dddd4cff39c4725e85afd326ed2aa53c7abbcf20..0000000000000000000000000000000000000000
--- a/src/doctypes/io-grdf-hour.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const GRDF_HOUR_DOCTYPE = 'io.grdf.hour'
diff --git a/src/doctypes/io-grdf-month.ts b/src/doctypes/io-grdf-month.ts
deleted file mode 100644
index 96bb6c2268ffbe49946efca371a82ac610c5aca2..0000000000000000000000000000000000000000
--- a/src/doctypes/io-grdf-month.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const GRDF_MONTH_DOCTYPE = 'io.grdf.month'
diff --git a/src/doctypes/io-grdf-year.ts b/src/doctypes/io-grdf-year.ts
deleted file mode 100644
index fa632ef6e4fd80a955f7032dc044c2aea22d7c80..0000000000000000000000000000000000000000
--- a/src/doctypes/io-grdf-year.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const GRDF_YEAR_DOCTYPE = 'io.grdf.year'
diff --git a/src/styles/components/_challenges.scss b/src/styles/components/_challenges.scss
index a1b4b034469f8e755811ccc7afeba8ef2bba65ea..e72710f8ffc0dcb3f0a0d028e2a4bf83efecb1ac 100644
--- a/src/styles/components/_challenges.scss
+++ b/src/styles/components/_challenges.scss
@@ -259,6 +259,8 @@
.cm-win-star {
grid-column: 1;
grid-row: 1;
+ -webkit-animation: rotating 60s linear infinite;
+ animation: rotating 60s linear infinite;
}
}
.cm-result {
@@ -570,3 +572,20 @@
opacity: 1;
}
}
+
+@-webkit-keyframes rotating {
+ from {
+ -webkit-transform: rotate(0deg);
+ }
+ to {
+ -webkit-transform: rotate(360deg);
+ }
+}
+@keyframes rotating {
+ from {
+ -webkit-transform: rotate(0deg);
+ }
+ to {
+ -webkit-transform: rotate(360deg);
+ }
+}
diff --git a/src/styles/components/_nav.scss b/src/styles/components/_nav.scss
index d8e4e8189cba94b337741c0e5dc4fa6c28d7a617..1c3d2dc6fe710934dffffb019f8912fab3a3042c 100644
--- a/src/styles/components/_nav.scss
+++ b/src/styles/components/_nav.scss
@@ -19,7 +19,7 @@
}
.logo-grand-lyon {
position: absolute;
- top: 50%;
+ bottom: 20px;
left: 100px;
@media #{$tablet} {
display: none;
diff --git a/src/styles/index.css b/src/styles/index.css
index 92ba7db5ccc39fd66aeb06b02fc64b1edb25d582..28692f77d8ea92a0867203f74e44c79de1217f5d 100644
--- a/src/styles/index.css
+++ b/src/styles/index.css
@@ -287,6 +287,14 @@ p {
line-height: 120%; }
/* line 110, src/styles/base/_typography.scss */
+.text-19-bold {
+ font-family: Lato, sans-serif;
+ font-style: normal;
+ font-weight: bold;
+ font-size: 1.188rem;
+ line-height: 120%; }
+
+/* line 117, src/styles/base/_typography.scss */
.text-20-bold {
font-family: Lato, sans-serif;
font-style: normal;
@@ -294,7 +302,7 @@ p {
font-size: 1.25rem;
line-height: 120%; }
-/* line 117, src/styles/base/_typography.scss */
+/* line 124, src/styles/base/_typography.scss */
.text-21-bold {
font-family: Lato, sans-serif;
font-style: normal;
@@ -302,7 +310,7 @@ p {
font-size: 1.313rem;
line-height: 120%; }
-/* line 124, src/styles/base/_typography.scss */
+/* line 131, src/styles/base/_typography.scss */
.text-22-normal {
font-family: Lato, sans-serif;
font-style: normal;
@@ -310,7 +318,7 @@ p {
font-size: 1.375rem;
line-height: 120%; }
-/* line 131, src/styles/base/_typography.scss */
+/* line 138, src/styles/base/_typography.scss */
.text-22-bold {
font-family: Lato, sans-serif;
font-style: normal;
@@ -318,7 +326,7 @@ p {
font-size: 1.375rem;
line-height: 120%; }
-/* line 138, src/styles/base/_typography.scss */
+/* line 145, src/styles/base/_typography.scss */
.text-24-normal {
font-family: Lato, sans-serif;
font-style: normal;
@@ -326,7 +334,7 @@ p {
font-size: 1.5rem;
line-height: 120%; }
-/* line 145, src/styles/base/_typography.scss */
+/* line 152, src/styles/base/_typography.scss */
.text-24-bold {
font-family: Lato, sans-serif;
font-style: normal;
@@ -335,7 +343,7 @@ p {
line-height: 120%; }
/* Button */
-/* line 155, src/styles/base/_typography.scss */
+/* line 162, src/styles/base/_typography.scss */
.button-primary-text span {
font-family: Lato, sans-serif;
font-style: normal;
@@ -344,7 +352,7 @@ p {
line-height: 120%;
color: #e0e0e0; }
-/* line 164, src/styles/base/_typography.scss */
+/* line 171, src/styles/base/_typography.scss */
.button-secondary-text {
font-family: Lato, sans-serif;
font-style: normal;
@@ -354,7 +362,7 @@ p {
color: #e0e0e0; }
/* Card */
-/* line 174, src/styles/base/_typography.scss */
+/* line 181, src/styles/base/_typography.scss */
.card-title-on {
font-family: Lato, sans-serif;
font-style: normal;
@@ -363,7 +371,7 @@ p {
line-height: 120%;
color: #e0e0e0; }
-/* line 182, src/styles/base/_typography.scss */
+/* line 189, src/styles/base/_typography.scss */
.card-title-off {
font-family: Lato, sans-serif;
font-style: normal;
@@ -372,7 +380,7 @@ p {
line-height: 120%;
color: #e0e0e0; }
-/* line 190, src/styles/base/_typography.scss */
+/* line 197, src/styles/base/_typography.scss */
.card-text-bold {
font-family: Lato, sans-serif;
font-style: normal;
@@ -381,7 +389,7 @@ p {
line-height: 120%;
color: #e0e0e0; }
-/* line 198, src/styles/base/_typography.scss */
+/* line 205, src/styles/base/_typography.scss */
.card-result {
font-family: Lato, sans-serif;
font-style: normal;
@@ -390,7 +398,7 @@ p {
line-height: 120%;
color: #e0e0e0; }
-/* line 206, src/styles/base/_typography.scss */
+/* line 213, src/styles/base/_typography.scss */
.card-indicator {
font-family: Lato, sans-serif;
font-style: normal;
@@ -399,7 +407,7 @@ p {
line-height: 120%;
color: #e0e0e0; }
-/* line 214, src/styles/base/_typography.scss */
+/* line 221, src/styles/base/_typography.scss */
.card-text {
font-family: Lato, sans-serif;
font-style: normal;
@@ -409,7 +417,7 @@ p {
color: #e0e0e0; }
/* Chart */
-/* line 224, src/styles/base/_typography.scss */
+/* line 231, src/styles/base/_typography.scss */
.chart-date {
font-family: Lato, sans-serif;
font-style: normal;
@@ -418,7 +426,7 @@ p {
line-height: 123%;
color: #e0e0e0; }
-/* line 232, src/styles/base/_typography.scss */
+/* line 239, src/styles/base/_typography.scss */
.chart-result {
font-family: Lato, sans-serif;
font-style: normal;
@@ -427,7 +435,7 @@ p {
line-height: 120%;
color: #e0e0e0; }
-/* line 240, src/styles/base/_typography.scss */
+/* line 247, src/styles/base/_typography.scss */
.chart-fluid {
font-family: Lato, sans-serif;
font-style: normal;
@@ -436,7 +444,7 @@ p {
line-height: 120%;
color: #e0e0e0; }
-/* line 248, src/styles/base/_typography.scss */
+/* line 255, src/styles/base/_typography.scss */
.chart-switch-text {
font-family: Lato, sans-serif;
font-style: normal;
@@ -445,7 +453,7 @@ p {
line-height: 120%;
color: #e0e0e0; }
-/* line 256, src/styles/base/_typography.scss */
+/* line 263, src/styles/base/_typography.scss */
.chart-ticks-x-text {
font-family: Lato, sans-serif;
font-style: normal;
@@ -453,11 +461,11 @@ p {
font-size: 1rem;
line-height: 120%; }
@media only screen and (max-width: 768px) {
- /* line 256, src/styles/base/_typography.scss */
+ /* line 263, src/styles/base/_typography.scss */
.chart-ticks-x-text {
font-size: 0.875rem; } }
-/* line 266, src/styles/base/_typography.scss */
+/* line 273, src/styles/base/_typography.scss */
.chart-ticks-y-text {
font-family: Lato, sans-serif;
font-style: normal;
@@ -465,12 +473,12 @@ p {
font-size: 0.9rem;
line-height: 120%; }
@media only screen and (max-width: 768px) {
- /* line 266, src/styles/base/_typography.scss */
+ /* line 273, src/styles/base/_typography.scss */
.chart-ticks-y-text {
font-size: 0.75rem; } }
/* Cozy bar */
-/* line 278, src/styles/base/_typography.scss */
+/* line 285, src/styles/base/_typography.scss */
.cozybar {
font-family: Lato, sans-serif;
font-style: normal;
@@ -480,7 +488,7 @@ p {
color: #e0e0e0; }
/* List */
-/* line 288, src/styles/base/_typography.scss */
+/* line 295, src/styles/base/_typography.scss */
.list-title {
font-family: Lato, sans-serif;
font-style: normal;
@@ -491,7 +499,7 @@ p {
color: #e0e0e0; }
/* Tab */
-/* line 299, src/styles/base/_typography.scss */
+/* line 306, src/styles/base/_typography.scss */
.tab-text-on {
font-family: Lato, sans-serif;
font-style: normal;
@@ -499,7 +507,7 @@ p {
font-size: 1rem;
line-height: 120%; }
-/* line 306, src/styles/base/_typography.scss */
+/* line 313, src/styles/base/_typography.scss */
.tab-text-off {
font-family: Lato, sans-serif;
font-style: normal;
@@ -632,29 +640,39 @@ p {
border: 1px solid #7b7b7b;
border-radius: 4px;
color: #e0e0e0;
- padding: 0 5%; }
- /* line 23, src/styles/components/_form.scss */
+ padding: 0 5%;
+ outline-offset: -1px; }
+ /* line 24, src/styles/components/_form.scss */
+ .form .form-input:focus {
+ outline: none;
+ box-shadow: inset 0px 0px 0px 1px #e3b82a; }
+ /* line 28, src/styles/components/_form.scss */
.form .form-group {
display: flex;
- flex-direction: column; }
- /* line 26, src/styles/components/_form.scss */
+ flex-direction: column;
+ margin: 1.5rem 0 0 0; }
+ /* line 32, src/styles/components/_form.scss */
.form .form-group .form-trailing-icon {
float: right;
position: relative;
margin-top: -48px;
margin-right: 15px; }
- /* line 33, src/styles/components/_form.scss */
+ /* line 39, src/styles/components/_form.scss */
.form .form-control {
height: 3rem; }
@media only screen and (max-width: 768px) {
- /* line 33, src/styles/components/_form.scss */
+ /* line 39, src/styles/components/_form.scss */
.form .form-control {
max-width: 100vw; } }
- /* line 39, src/styles/components/_form.scss */
+ /* line 45, src/styles/components/_form.scss */
.form .form-message {
color: #ce3535;
- min-height: 1.25rem; }
- /* line 43, src/styles/components/_form.scss */
+ min-height: 1.25rem;
+ margin-top: 0.125rem; }
+ /* line 50, src/styles/components/_form.scss */
+ .form .form-button {
+ margin-top: 0.125rem; }
+ /* line 53, src/styles/components/_form.scss */
.form ::placeholder {
color: #e0e0e0; }
@@ -846,69 +864,138 @@ p {
flex: 1; }
/* line 45, src/styles/components/_konnector.scss */
.accordion .accordion-header .state-picto {
- position: absolute; }
- /* line 49, src/styles/components/_konnector.scss */
+ position: absolute;
+ display: flex; }
+ /* line 50, src/styles/components/_konnector.scss */
+ .accordion .accordion-update-result {
+ margin: 0.5rem 1.5rem; }
+ @media only screen and (max-width: 768px) {
+ /* line 50, src/styles/components/_konnector.scss */
+ .accordion .accordion-update-result {
+ margin: 0.5rem 0; } }
+ /* line 56, src/styles/components/_konnector.scss */
.accordion .accordion-update {
flex: 2;
padding: 0.5rem 1rem; }
- /* line 53, src/styles/components/_konnector.scss */
+ /* line 60, src/styles/components/_konnector.scss */
.accordion .accordion-state {
flex: 2;
margin-right: 1rem; }
- /* line 57, src/styles/components/_konnector.scss */
+ /* line 64, src/styles/components/_konnector.scss */
.accordion .accordion-frequency {
flex: 1;
padding: 0 1rem; }
- /* line 61, src/styles/components/_konnector.scss */
+ /* line 68, src/styles/components/_konnector.scss */
.accordion .accordion-caption {
- font-size: 0.8rem;
color: #a0a0a0;
text-transform: lowercase; }
- /* line 65, src/styles/components/_konnector.scss */
+ /* line 71, src/styles/components/_konnector.scss */
.accordion .accordion-caption::first-letter {
text-transform: uppercase; }
- /* line 69, src/styles/components/_konnector.scss */
+ /* line 75, src/styles/components/_konnector.scss */
.accordion .accordion-caption-red {
- color: #ce3535; }
- /* line 72, src/styles/components/_konnector.scss */
+ color: #ce3535;
+ text-transform: lowercase; }
+ /* line 78, src/styles/components/_konnector.scss */
+ .accordion .accordion-caption-red::first-letter {
+ text-transform: uppercase; }
+ /* line 82, src/styles/components/_konnector.scss */
.accordion .accordion-content {
overflow: hidden;
transition: max-height 0.6s ease; }
- /* line 76, src/styles/components/_konnector.scss */
+ /* line 86, src/styles/components/_konnector.scss */
.accordion .inline-buttons {
display: flex;
flex-flow: row nowrap; }
- /* line 80, src/styles/components/_konnector.scss */
+ /* line 90, src/styles/components/_konnector.scss */
.accordion .btn-position {
width: 100%;
margin: 0.5rem 1rem; }
-/* line 86, src/styles/components/_konnector.scss */
+/* line 96, src/styles/components/_konnector.scss */
.kv-root {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding: 0 1.5rem; }
- /* line 92, src/styles/components/_konnector.scss */
+ /* line 102, src/styles/components/_konnector.scss */
.kv-root .kv-content {
width: 45.75rem; }
@media only screen and (max-width: 768px) {
- /* line 92, src/styles/components/_konnector.scss */
+ /* line 102, src/styles/components/_konnector.scss */
.kv-root .kv-content {
width: 100%; } }
- /* line 97, src/styles/components/_konnector.scss */
+ /* line 107, src/styles/components/_konnector.scss */
.kv-root .kv-content .kv-header {
margin-top: 2.5rem;
margin-bottom: 1.25rem;
color: #e0e0e0; }
-/* line 105, src/styles/components/_konnector.scss */
+/* line 116, src/styles/components/_konnector.scss */
+.knotfound {
+ margin: 0 1.5rem; }
+ @media only screen and (max-width: 768px) {
+ /* line 116, src/styles/components/_konnector.scss */
+ .knotfound {
+ margin: 0; } }
+ /* line 121, src/styles/components/_konnector.scss */
+ .knotfound .knotfound-text {
+ color: #e0e0e0;
+ padding-top: 1rem; }
+ /* line 125, src/styles/components/_konnector.scss */
+ .knotfound .knotfound-button {
+ margin-bottom: 1rem; }
+
+/* line 131, src/styles/components/_konnector.scss */
+.koauthform {
+ margin: 0 1.5rem; }
+ @media only screen and (max-width: 768px) {
+ /* line 131, src/styles/components/_konnector.scss */
+ .koauthform {
+ margin: 0; } }
+ /* line 136, src/styles/components/_konnector.scss */
+ .koauthform .koauthform-text {
+ color: #e0e0e0;
+ padding-top: 1rem; }
+ /* line 140, src/styles/components/_konnector.scss */
+ .koauthform .koauthform-button {
+ margin-bottom: 1rem; }
+
+/* line 147, src/styles/components/_konnector.scss */
+.kloginauthform .kloginauthform-text {
+ color: #e0e0e0;
+ padding-top: 1rem; }
+
+/* line 151, src/styles/components/_konnector.scss */
+.kloginauthform .kloginauthform-button {
+ margin-bottom: 1rem; }
+
+/* line 158, src/styles/components/_konnector.scss */
+.klaunch-content {
+ margin: 0.5rem 1.5rem; }
+ @media only screen and (max-width: 768px) {
+ /* line 158, src/styles/components/_konnector.scss */
+ .klaunch-content {
+ margin: 0.5rem 0; } }
+ /* line 163, src/styles/components/_konnector.scss */
+ .klaunch-content .klaunch-content-text {
+ color: #e0e0e0;
+ margin: 1rem 0; }
+ /* line 167, src/styles/components/_konnector.scss */
+ .klaunch-content .klaunch-content-text-center {
+ text-align: center; }
+ /* line 170, src/styles/components/_konnector.scss */
+ .klaunch-content .klaunch-info-txt {
+ margin: 1.5rem; }
+
+/* line 175, src/styles/components/_konnector.scss */
.state-icon {
height: 22px;
width: 22px;
- margin-left: 32px;
- margin-bottom: 40px; }
+ position: absolute;
+ bottom: 8px;
+ left: 30px; }
/** BLACK **/
/** TEXT COLOR **/
@@ -1045,6 +1132,50 @@ p {
.fs-root .fs-slide {
min-height: 14rem; } }
+/* line 131, src/styles/components/_fluid.scss */
+.cta-box {
+ background-color: rgba(18, 18, 18, 0.8);
+ position: absolute;
+ left: 0;
+ width: calc(100vw - 220px);
+ padding: 0rem 1rem 0rem 0rem;
+ z-index: 1;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-direction: column;
+ height: 37.5rem; }
+ @media only screen and (max-width: 768px) {
+ /* line 131, src/styles/components/_fluid.scss */
+ .cta-box {
+ height: 29rem;
+ width: 100vw; } }
+ @media only screen and (max-width: 1023px) {
+ /* line 131, src/styles/components/_fluid.scss */
+ .cta-box {
+ width: 100vw; } }
+ /* line 151, src/styles/components/_fluid.scss */
+ .cta-box .cta-box-header {
+ text-align: center;
+ font-weight: bold;
+ letter-spacing: 0.2px;
+ margin-bottom: 1.5em;
+ color: #e0e0e0;
+ width: 50%; }
+ @media only screen and (max-width: 768px) {
+ /* line 151, src/styles/components/_fluid.scss */
+ .cta-box .cta-box-header {
+ width: 80%; } }
+ /* line 162, src/styles/components/_fluid.scss */
+ .cta-box .cta-box-button {
+ margin-left: auto;
+ margin-right: auto;
+ width: 50%; }
+ @media only screen and (max-width: 768px) {
+ /* line 162, src/styles/components/_fluid.scss */
+ .cta-box .cta-box-button {
+ width: 80%; } }
+
/** BLACK **/
/** TEXT COLOR **/
/** RED **/
@@ -1431,58 +1562,89 @@ p {
/* line 4, src/styles/components/_nav.scss */
.o-sidebar {
background-color: #25262b; } }
+ /* line 20, src/styles/components/_nav.scss */
+ .o-sidebar .logo-grand-lyon {
+ position: absolute;
+ bottom: 20px;
+ left: 100px; }
+ @media only screen and (max-width: 1023px) {
+ /* line 20, src/styles/components/_nav.scss */
+ .o-sidebar .logo-grand-lyon {
+ display: none; } }
-/* line 21, src/styles/components/_nav.scss */
+/* line 29, src/styles/components/_nav.scss */
.c-nav-link {
padding: 0 1rem; }
- /* line 23, src/styles/components/_nav.scss */
+ /* line 31, src/styles/components/_nav.scss */
.c-nav-link .on {
display: none; }
- /* line 26, src/styles/components/_nav.scss */
+ /* line 34, src/styles/components/_nav.scss */
.c-nav-link .off {
display: block; }
-/* line 36, src/styles/components/_nav.scss */
+/* line 44, src/styles/components/_nav.scss */
.c-nav-link .c-nav-icon {
padding-right: 0.5rem;
width: 50px;
height: 36px;
fill: none; }
-/* line 43, src/styles/components/_nav.scss */
+/* line 51, src/styles/components/_nav.scss */
.c-nav-link.is-active {
box-shadow: inset 0.25rem 0 0 0 #b2901b; }
-/* line 47, src/styles/components/_nav.scss */
+/* line 55, src/styles/components/_nav.scss */
.c-nav-link.is-active .c-nav-icon {
fill: #b2901b !important; }
-/* line 51, src/styles/components/_nav.scss */
+/* line 59, src/styles/components/_nav.scss */
.c-nav-link.is-active {
color: white;
text-decoration: none; }
- /* line 54, src/styles/components/_nav.scss */
+ /* line 62, src/styles/components/_nav.scss */
.c-nav-link.is-active .on {
display: block; }
- /* line 57, src/styles/components/_nav.scss */
+ /* line 65, src/styles/components/_nav.scss */
.c-nav-link.is-active .off {
display: none; }
@media only screen and (max-width: 1023px) {
- /* line 63, src/styles/components/_nav.scss */
+ /* line 71, src/styles/components/_nav.scss */
.o-sidebar {
height: 56px; }
- /* line 66, src/styles/components/_nav.scss */
+ /* line 74, src/styles/components/_nav.scss */
.c-nav-link {
padding: 0; }
- /* line 70, src/styles/components/_nav.scss */
+ /* line 78, src/styles/components/_nav.scss */
.c-nav-link .c-nav-icon {
padding: 0;
margin: auto; }
- /* line 75, src/styles/components/_nav.scss */
+ /* line 83, src/styles/components/_nav.scss */
.c-nav-link.is-active {
box-shadow: unset; } }
+/* line 88, src/styles/components/_nav.scss */
+.nb-challenge-notif {
+ position: absolute;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ left: 42px;
+ bottom: 22px;
+ width: 1.25rem;
+ height: 1.25rem;
+ color: #25262b;
+ border-radius: 50%;
+ border: 1px solid #25262b;
+ z-index: 1;
+ background: radial-gradient(105.25% 64.58% at 49.68% 70.83%, rgba(1, 153, 163, 0.5) 0%, rgba(255, 255, 255, 0) 100%), #58FFFF;
+ font-size: 12px; }
+ @media only screen and (max-width: 1023px) {
+ /* line 88, src/styles/components/_nav.scss */
+ .nb-challenge-notif {
+ left: 25px;
+ bottom: unset; } }
+
/** BLACK **/
/** TEXT COLOR **/
/** RED **/
@@ -1714,87 +1876,88 @@ p {
flex-direction: row; }
/* line 97, src/styles/components/_challenges.scss */
.cli .cli-left .cli-content .cli-content-icon {
- margin: 0.5rem 0; }
- /* line 100, src/styles/components/_challenges.scss */
+ margin: 0.5rem 0;
+ z-index: 5; }
+ /* line 101, src/styles/components/_challenges.scss */
.cli .cli-left .cli-content .cli-content-title {
color: #ffffff;
margin: 0 1rem;
align-self: center; }
- /* line 105, src/styles/components/_challenges.scss */
+ /* line 106, src/styles/components/_challenges.scss */
.cli .cli-left .cli-content .subtitle-finished {
color: #a0a0a0; }
- /* line 108, src/styles/components/_challenges.scss */
+ /* line 109, src/styles/components/_challenges.scss */
.cli .cli-left .cli-content .title-finished {
color: #e0e0e0; }
- /* line 111, src/styles/components/_challenges.scss */
+ /* line 112, src/styles/components/_challenges.scss */
.cli .cli-left .cli-content .subtitle-ongoing {
color: #58FFFF; }
- /* line 114, src/styles/components/_challenges.scss */
+ /* line 115, src/styles/components/_challenges.scss */
.cli .cli-left .cli-content .title-ongoing {
color: #ffffff; }
- /* line 117, src/styles/components/_challenges.scss */
+ /* line 118, src/styles/components/_challenges.scss */
.cli .cli-left .cli-content .subtitle-available {
color: #121212; }
- /* line 120, src/styles/components/_challenges.scss */
+ /* line 121, src/styles/components/_challenges.scss */
.cli .cli-left .cli-content .title-available {
color: #121212; }
- /* line 123, src/styles/components/_challenges.scss */
+ /* line 124, src/styles/components/_challenges.scss */
.cli .cli-left .cli-content .title-locked {
color: #a0a0a0;
opacity: 0.35; }
- /* line 129, src/styles/components/_challenges.scss */
+ /* line 130, src/styles/components/_challenges.scss */
.cli .cli-right {
align-self: center;
padding-right: 1.2rem; }
- /* line 132, src/styles/components/_challenges.scss */
+ /* line 133, src/styles/components/_challenges.scss */
.cli .cli-right.cli-right-ongoing {
padding-right: calc(1.2rem + 2px); }
- /* line 135, src/styles/components/_challenges.scss */
+ /* line 136, src/styles/components/_challenges.scss */
.cli .cli-right.cli-right-available {
padding-right: calc(1.2rem + 2px); }
-/* line 142, src/styles/components/_challenges.scss */
+/* line 143, src/styles/components/_challenges.scss */
.cc-link {
color: black;
text-decoration: none; }
-/* line 146, src/styles/components/_challenges.scss */
+/* line 147, src/styles/components/_challenges.scss */
.cc {
cursor: pointer;
display: flex;
flex-direction: row;
margin: 0.25rem 0.25rem;
width: 100%; }
- /* line 152, src/styles/components/_challenges.scss */
+ /* line 153, src/styles/components/_challenges.scss */
.cc .cc-content-left {
flex: 1;
display: flex;
flex-direction: column;
justify-content: center;
width: inherit; }
- /* line 158, src/styles/components/_challenges.scss */
+ /* line 159, src/styles/components/_challenges.scss */
.cc .cc-content-left .cc-content-title {
color: #ffffff; }
- /* line 160, src/styles/components/_challenges.scss */
+ /* line 161, src/styles/components/_challenges.scss */
.cc .cc-content-left .cc-content-title.cc-content-title-padding {
padding-top: 1rem; }
- /* line 164, src/styles/components/_challenges.scss */
+ /* line 165, src/styles/components/_challenges.scss */
.cc .cc-content-left .cc-content-progress {
margin-top: 1rem; }
- /* line 167, src/styles/components/_challenges.scss */
+ /* line 168, src/styles/components/_challenges.scss */
.cc .cc-content-left .cc-content-timeline {
padding: 0 0.5rem; }
- /* line 170, src/styles/components/_challenges.scss */
+ /* line 171, src/styles/components/_challenges.scss */
.cc .cc-content-left .cc-content-visu {
padding: 1rem 0; }
- /* line 174, src/styles/components/_challenges.scss */
+ /* line 175, src/styles/components/_challenges.scss */
.cc .cc-content-right {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
align-self: center; }
- /* line 180, src/styles/components/_challenges.scss */
+ /* line 181, src/styles/components/_challenges.scss */
.cc .cc-content-right .cc-notification {
display: flex;
align-items: center;
@@ -1806,133 +1969,168 @@ p {
color: black;
margin-right: 1rem; }
-/* line 195, src/styles/components/_challenges.scss */
+/* line 196, src/styles/components/_challenges.scss */
.cm-content {
display: flex;
flex-direction: column;
justify-content: space-around;
align-items: center;
- padding: 1.5rem 1rem 0.5rem;
+ padding: 1.5rem 1rem 1.5rem;
width: 22.125rem; }
@media only screen and (max-width: 768px) {
- /* line 195, src/styles/components/_challenges.scss */
+ /* line 196, src/styles/components/_challenges.scss */
.cm-content {
width: 90%; } }
- /* line 205, src/styles/components/_challenges.scss */
+ /* line 206, src/styles/components/_challenges.scss */
.cm-content .win {
background: #eed582;
background: Linear-gradient(90deg, #bf723b 0%, #dd9a2b 26.04%, #f6d74c 45.31%, #d1880d 75%, #a05b11 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent; }
- /* line 218, src/styles/components/_challenges.scss */
+ /* line 219, src/styles/components/_challenges.scss */
.cm-content .defeat {
background: #eed582;
background: Linear-gradient(90deg, #a66340 0%, #ae5f38 33.33%, #9e4e24 51.56%, #a4573a 66.67%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent; }
- /* line 230, src/styles/components/_challenges.scss */
+ /* line 231, src/styles/components/_challenges.scss */
.cm-content .cm-title {
- text-align: center;
- margin-bottom: 210px; }
+ text-align: center; }
/* line 234, src/styles/components/_challenges.scss */
.cm-content .cm-win-badge-star {
display: grid;
align-items: center;
justify-items: center;
position: absolute;
- top: 22px; }
- /* line 240, src/styles/components/_challenges.scss */
+ top: 15px; }
+ @media only screen and (max-width: 768px) {
+ /* line 234, src/styles/components/_challenges.scss */
+ .cm-content .cm-win-badge-star {
+ top: 65px; } }
+ /* line 243, src/styles/components/_challenges.scss */
+ .cm-content .cm-win-badge-star.--ecolyo-royal {
+ top: -38px; }
+ @media only screen and (max-width: 768px) {
+ /* line 243, src/styles/components/_challenges.scss */
+ .cm-content .cm-win-badge-star.--ecolyo-royal {
+ top: 12px; } }
+ /* line 250, src/styles/components/_challenges.scss */
.cm-content .cm-win-badge-star .cm-win-badge {
+ -webkit-animation: scale-in-center 0.6s cubic-bezier(0.25, 0.46, 0.45, 0.94) 0.1s both;
+ animation: scale-in-center 0.6s cubic-bezier(0.25, 0.46, 0.45, 0.94) 0.1s both;
grid-column: 1;
grid-row: 1;
z-index: 1; }
- /* line 245, src/styles/components/_challenges.scss */
+ /* line 259, src/styles/components/_challenges.scss */
.cm-content .cm-win-badge-star .cm-win-star {
grid-column: 1;
- grid-row: 1; }
- /* line 250, src/styles/components/_challenges.scss */
+ grid-row: 1;
+ -webkit-animation: rotating 60s linear infinite;
+ animation: rotating 60s linear infinite; }
+ /* line 266, src/styles/components/_challenges.scss */
+ .cm-content .cm-result {
+ color: #e0e0e0;
+ text-align: center;
+ margin-top: 1.5rem;
+ margin-bottom: 0.5rem;
+ margin-bottom: 165px; }
+ /* line 272, src/styles/components/_challenges.scss */
+ .cm-content .cm-result .cm-result-positif {
+ color: #7fd771; }
+ /* line 275, src/styles/components/_challenges.scss */
+ .cm-content .cm-result .cm-result-negatif {
+ color: #d24444; }
+ /* line 279, src/styles/components/_challenges.scss */
.cm-content .cm-badge {
- margin: 2rem; }
- /* line 253, src/styles/components/_challenges.scss */
+ position: absolute;
+ top: 135px; }
+ @media only screen and (max-width: 768px) {
+ /* line 279, src/styles/components/_challenges.scss */
+ .cm-content .cm-badge {
+ top: 142px; } }
+ /* line 286, src/styles/components/_challenges.scss */
.cm-content .cm-button-valid {
margin-top: 1rem;
width: 100%; }
- /* line 257, src/styles/components/_challenges.scss */
+ /* line 290, src/styles/components/_challenges.scss */
.cm-content .cm-txt {
text-align: center;
margin-bottom: 1rem;
width: 100%; }
- /* line 262, src/styles/components/_challenges.scss */
+ /* line 295, src/styles/components/_challenges.scss */
.cm-content .cm-text-new-available {
margin-top: 1.25rem; }
-/* line 266, src/styles/components/_challenges.scss */
-.cm-overspent-value {
- color: #D25959; }
-
-/* line 271, src/styles/components/_challenges.scss */
+/* line 301, src/styles/components/_challenges.scss */
.list-of-days-duration {
display: flex;
flex-direction: row;
justify-content: center;
- margin-top: 1rem;
+ margin-top: 3rem;
width: 100%; }
- /* line 277, src/styles/components/_challenges.scss */
+ @media only screen and (max-width: 768px) {
+ /* line 301, src/styles/components/_challenges.scss */
+ .list-of-days-duration {
+ margin-top: 1rem; } }
+ /* line 310, src/styles/components/_challenges.scss */
.list-of-days-duration .day-solo {
display: flex;
flex-direction: column;
width: 100%; }
- /* line 281, src/styles/components/_challenges.scss */
+ /* line 314, src/styles/components/_challenges.scss */
.list-of-days-duration .day-solo .day-line-label {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
width: 100%; }
- /* line 287, src/styles/components/_challenges.scss */
+ /* line 320, src/styles/components/_challenges.scss */
.list-of-days-duration .day-solo .day-line-label .date-dash {
width: 50%;
height: 2px;
background-color: #7b7b7b; }
- /* line 292, src/styles/components/_challenges.scss */
+ /* line 325, src/styles/components/_challenges.scss */
.list-of-days-duration .day-solo .day-line-label .past {
background-color: #58FFFF; }
- /* line 295, src/styles/components/_challenges.scss */
+ /* line 328, src/styles/components/_challenges.scss */
.list-of-days-duration .day-solo .day-line-label .futur {
background-color: #7b7b7b; }
- /* line 298, src/styles/components/_challenges.scss */
+ /* line 331, src/styles/components/_challenges.scss */
+ .list-of-days-duration .day-solo .day-line-label .none {
+ opacity: 0; }
+ /* line 334, src/styles/components/_challenges.scss */
.list-of-days-duration .day-solo .day-line-label .date-label {
width: 0.625rem;
height: 0.625rem;
border-radius: 50%;
position: absolute; }
- /* line 305, src/styles/components/_challenges.scss */
+ /* line 341, src/styles/components/_challenges.scss */
.list-of-days-duration .day-solo .day-letter {
margin-top: 0.8rem;
text-align: center;
color: #a0a0a0; }
- /* line 310, src/styles/components/_challenges.scss */
+ /* line 346, src/styles/components/_challenges.scss */
.list-of-days-duration .day-solo .day-date {
margin-top: 0.2rem;
text-align: center;
color: #a0a0a0; }
-/* line 319, src/styles/components/_challenges.scss */
+/* line 355, src/styles/components/_challenges.scss */
.view-start-date {
padding: 0.25rem 0;
color: #58FFFF; }
-/* line 325, src/styles/components/_challenges.scss */
+/* line 361, src/styles/components/_challenges.scss */
.pile-energy-follow {
display: flex;
flex-direction: row;
align-items: center;
- justify-content: space-between;
+ justify-content: center;
width: 100%; }
- /* line 331, src/styles/components/_challenges.scss */
+ /* line 367, src/styles/components/_challenges.scss */
.pile-energy-follow .pile-section {
display: grid; }
- /* line 333, src/styles/components/_challenges.scss */
+ /* line 369, src/styles/components/_challenges.scss */
.pile-energy-follow .pile-section .filter-pile {
grid-column: 1;
grid-row: 1;
@@ -1944,133 +2142,145 @@ p {
opacity: 0.8;
background-color: #121212;
z-index: 1; }
- /* line 345, src/styles/components/_challenges.scss */
+ /* line 381, src/styles/components/_challenges.scss */
.pile-energy-follow .pile-section .pile-icon {
grid-column: 1;
grid-row: 1;
margin: -25px 0; }
- /* line 351, src/styles/components/_challenges.scss */
+ /* line 387, src/styles/components/_challenges.scss */
.pile-energy-follow .max-energy {
color: #7b7b7b; }
- /* line 354, src/styles/components/_challenges.scss */
+ /* line 390, src/styles/components/_challenges.scss */
+ .pile-energy-follow .values-section {
+ margin-left: 1rem; }
+ /* line 393, src/styles/components/_challenges.scss */
.pile-energy-follow .no-values-section {
color: #ffffff;
- padding-right: 1rem; }
+ margin-left: 1rem; }
-/* line 361, src/styles/components/_challenges.scss */
+/* line 400, src/styles/components/_challenges.scss */
.ongoing-challenge {
min-height: 620px; }
-/* line 364, src/styles/components/_challenges.scss */
+/* line 403, src/styles/components/_challenges.scss */
.cp-root {
width: 100%; }
- /* line 366, src/styles/components/_challenges.scss */
- .cp-root .cp-content, .cp-root .cp-content.--locked {
+ /* line 405, src/styles/components/_challenges.scss */
+ .cp-root .cp-content, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal, .cp-root .cp-content.--locked {
display: flex;
align-items: center;
flex-direction: column;
color: #e0e0e0;
min-height: 84vh;
justify-content: space-between; }
- /* line 374, src/styles/components/_challenges.scss */
- .cp-root .--locked.cp-content {
+ /* line 413, src/styles/components/_challenges.scss */
+ .cp-root .cm-content .--locked.cm-win-badge-star.--ecolyo-royal, .cm-content .cp-root .--locked.cm-win-badge-star.--ecolyo-royal, .cp-root .--locked.cp-content {
justify-content: center; }
- /* line 379, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-info, .cp-root .cp-content .cp-info.--available {
+ /* line 418, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-info, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-info, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-info, .cp-root .cp-content .cp-info.--available {
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
background-color: #121212;
width: 100%;
+ min-height: 55vh;
padding-top: 1rem;
padding-bottom: 0.5rem; }
- /* line 388, src/styles/components/_challenges.scss */
- .cp-root .cp-content .--available.cp-info {
+ /* line 428, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .--available.cp-info, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .--available.cp-info, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .--available.cp-info {
height: 74vh; }
- /* line 392, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-info .cp-icon {
- margin-bottom: 1rem; }
- /* line 395, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-info .cp-icon-available {
+ /* line 432, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-info .cp-icon, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-info .cp-icon, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-info .cp-icon {
+ margin: 1rem; }
+ /* line 435, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-info .cp-icon-available, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-info .cp-icon-available, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-info .cp-icon-available {
margin: 2rem; }
- /* line 398, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-info .cp-win-badge-star {
+ /* line 438, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-info .cp-win-badge-star, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-info .cp-win-badge-star, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-info .cp-win-badge-star {
display: grid;
align-items: center;
- justify-items: center; }
- /* line 402, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-info .cp-win-badge-star .cp-win-badge {
+ justify-items: center;
+ margin: -100px; }
+ /* line 443, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-info .cp-win-badge-star .cp-win-badge, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-info .cp-win-badge-star .cp-win-badge, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-info .cp-win-badge-star .cp-win-badge {
grid-column: 1;
grid-row: 1;
z-index: 1; }
- /* line 407, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-info .cp-win-badge-star .cp-win-star {
+ /* line 448, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-info .cp-win-badge-star .cp-win-star, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-info .cp-win-badge-star .cp-win-star, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-info .cp-win-badge-star .cp-win-star {
grid-column: 1;
grid-row: 1; }
- /* line 412, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-info .cp-date {
+ /* line 453, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-info .cp-date, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-info .cp-date, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-info .cp-date {
color: #a0a0a0;
text-align: center;
margin-top: 1rem; }
- /* line 417, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-info .cp-title {
+ /* line 458, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-info .cp-title, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-info .cp-title, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-info .cp-title {
color: #e0e0e0;
text-align: center;
margin-top: 0.5rem; }
- /* line 422, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-info .cp-result {
+ /* line 463, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-info .cp-result, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-info .cp-result, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-info .cp-result {
color: #e0e0e0;
text-align: center;
margin-top: 1.5rem;
margin-bottom: 0.5rem; }
- /* line 427, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-info .cp-result .cp-result-positif {
+ /* line 468, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-info .cp-result .cp-result-positif, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-info .cp-result .cp-result-positif, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-info .cp-result .cp-result-positif {
color: #7fd771; }
- /* line 430, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-info .cp-result .cp-result-negatif {
+ /* line 471, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-info .cp-result .cp-result-negatif, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-info .cp-result .cp-result-negatif, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-info .cp-result .cp-result-negatif {
color: #d24444; }
- /* line 434, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-info .cp-description {
+ /* line 475, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-info .cp-description, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-info .cp-description, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-info .cp-description {
text-align: center;
margin-top: 1rem;
margin-bottom: 0.5rem;
margin-left: 1.25rem;
margin-right: 1.25rem;
max-width: 53rem; }
- /* line 442, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-info .cp-valid {
+ /* line 483, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-info .cp-valid, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-info .cp-valid, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-info .cp-valid, .cp-root .cp-content .cp-info .cp-valid.--ongoing {
justify-content: center;
display: flex;
flex-direction: row;
width: 90%;
margin-top: 0.75rem;
max-width: 53rem; }
- /* line 449, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-info .cp-valid .cp-left-button {
+ /* line 490, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-info .--ongoing.cp-valid, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-info .--ongoing.cp-valid, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-info .--ongoing.cp-valid {
+ width: 25%; }
+ @media only screen and (max-width: 768px) {
+ /* line 490, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-info .--ongoing.cp-valid, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-info .--ongoing.cp-valid, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-info .--ongoing.cp-valid {
+ width: 60%; } }
+ /* line 497, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-info .cp-valid .cp-left-button, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-info .cp-valid .cp-left-button, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-info .cp-valid .cp-left-button {
margin-right: 0.25rem;
margin-left: 0;
width: 100%; }
- /* line 454, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-info .cp-valid .cp-right-button {
+ /* line 502, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-info .cp-valid .cp-right-button, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-info .cp-valid .cp-right-button, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-info .cp-valid .cp-right-button {
margin-left: 0.25rem;
margin-right: 0;
width: 100%; }
- /* line 461, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-follow {
+ /* line 509, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-follow, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-follow, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-follow {
width: 90%;
display: flex;
flex-direction: column;
align-items: center;
margin-bottom: 1rem;
max-width: 53rem; }
- /* line 469, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-valid-locked {
+ /* line 517, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-valid-locked, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-valid-locked, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-valid-locked {
margin-top: 2rem;
width: 80%;
max-width: 53rem; }
- /* line 474, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-bottom {
+ /* line 522, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-bottom, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-bottom, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-bottom {
padding: 1.25rem 1.25rem;
width: 90%;
display: flex;
@@ -2079,22 +2289,54 @@ p {
max-width: 53rem;
margin-bottom: 2rem; }
@media only screen and (max-width: 768px) {
- /* line 474, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-bottom {
+ /* line 522, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-bottom, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-bottom, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-bottom {
margin-bottom: 0; } }
- /* line 485, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-bottom .cp-eg-content {
+ /* line 533, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-bottom .cp-eg-content, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-bottom .cp-eg-content, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-bottom .cp-eg-content {
width: 100%; }
- /* line 487, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-bottom .cp-eg-content .linked-ecogestures {
+ /* line 535, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-bottom .cp-eg-content .linked-ecogestures, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-bottom .cp-eg-content .linked-ecogestures, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-bottom .cp-eg-content .linked-ecogestures {
text-transform: uppercase; }
- /* line 490, src/styles/components/_challenges.scss */
- .cp-root .cp-content .cp-bottom .cp-eg-content .cp-ecogestures {
+ /* line 538, src/styles/components/_challenges.scss */
+ .cp-root .cp-content .cp-bottom .cp-eg-content .cp-ecogestures, .cp-root .cm-content .cm-win-badge-star.--ecolyo-royal .cp-bottom .cp-eg-content .cp-ecogestures, .cm-content .cp-root .cm-win-badge-star.--ecolyo-royal .cp-bottom .cp-eg-content .cp-ecogestures {
width: 100%;
display: flex;
flex-direction: row;
justify-content: space-between; }
+@-webkit-keyframes scale-in-center {
+ 0% {
+ -webkit-transform: scale(0);
+ transform: scale(0);
+ opacity: 1; }
+ 100% {
+ -webkit-transform: scale(1);
+ transform: scale(1);
+ opacity: 1; } }
+
+@keyframes scale-in-center {
+ 0% {
+ -webkit-transform: scale(0);
+ transform: scale(0);
+ opacity: 1; }
+ 100% {
+ -webkit-transform: scale(1);
+ transform: scale(1);
+ opacity: 1; } }
+
+@-webkit-keyframes rotating {
+ from {
+ -webkit-transform: rotate(0deg); }
+ to {
+ -webkit-transform: rotate(360deg); } }
+
+@keyframes rotating {
+ from {
+ -webkit-transform: rotate(0deg); }
+ to {
+ -webkit-transform: rotate(360deg); } }
+
/** BLACK **/
/** TEXT COLOR **/
/** RED **/
@@ -2142,7 +2384,7 @@ p {
/* line 32, src/styles/components/_ecogesture.scss */
.ecogesture-root .ecogesture-content .ecogesture-list-item {
width: 48%;
- height: 7rem;
+ height: 8rem;
margin: 1% 1%; }
/* line 37, src/styles/components/_ecogesture.scss */
.ecogesture-root .ecogesture-content .ecogesture-list-item > button {
@@ -2156,41 +2398,50 @@ p {
/* line 48, src/styles/components/_ecogesture.scss */
.ec {
display: flex;
+ justify-content: center;
width: 100%;
height: 100%; }
- /* line 52, src/styles/components/_ecogesture.scss */
+ /* line 53, src/styles/components/_ecogesture.scss */
.ec .ec-content {
display: flex;
flex-direction: column;
- align-items: flex-start;
- justify-content: flex-end; }
- /* line 57, src/styles/components/_ecogesture.scss */
+ align-items: center;
+ justify-content: space-around; }
+ /* line 58, src/styles/components/_ecogesture.scss */
+ .ec .ec-content.ec-content-unlocked {
+ padding: 0.4rem 0; }
+ /* line 61, src/styles/components/_ecogesture.scss */
+ .ec .ec-content.ec-content-challenge {
+ padding: 0.5rem 0; }
+ /* line 64, src/styles/components/_ecogesture.scss */
+ .ec .ec-content .ec-content-icon {
+ min-height: 50px; }
+ /* line 67, src/styles/components/_ecogesture.scss */
.ec .ec-content .ec-content-short-name {
display: flex;
flex: 1;
- align-items: center; }
- /* line 63, src/styles/components/_ecogesture.scss */
- .ec .ec-content .ec-content-nwh-true {
- margin-top: 0.25rem;
- color: #121212; }
- /* line 67, src/styles/components/_ecogesture.scss */
- .ec .ec-content .ec-content-nwh-undefined {
+ align-items: center;
+ text-align: center; }
+ /* line 73, src/styles/components/_ecogesture.scss */
+ .ec .ec-content .ec-content-nwh {
margin-top: 0.25rem;
color: #a0a0a0; }
-/* line 73, src/styles/components/_ecogesture.scss */
+/* line 79, src/styles/components/_ecogesture.scss */
.cp-eg-1 {
+ height: 8rem;
width: 100%;
margin-right: 0.25rem;
text-align: center; }
-/* line 78, src/styles/components/_ecogesture.scss */
+/* line 85, src/styles/components/_ecogesture.scss */
.cp-eg-2 {
+ height: 8rem;
width: 100%;
margin-left: 0.25rem;
text-align: center; }
-/* line 85, src/styles/components/_ecogesture.scss */
+/* line 93, src/styles/components/_ecogesture.scss */
.em-header {
color: #e0e0e0;
border-bottom: 1px solid rgba(163, 163, 163, 0.4);
@@ -2199,38 +2450,38 @@ p {
display: flex;
justify-content: center; }
-/* line 93, src/styles/components/_ecogesture.scss */
+/* line 101, src/styles/components/_ecogesture.scss */
.em-icon {
margin-bottom: 1rem; }
-/* line 96, src/styles/components/_ecogesture.scss */
+/* line 104, src/styles/components/_ecogesture.scss */
.em-title {
margin-bottom: 0; }
-/* line 99, src/styles/components/_ecogesture.scss */
+/* line 107, src/styles/components/_ecogesture.scss */
.em-detail {
display: flex;
flex-direction: row;
margin: 0.5em 0; }
- /* line 103, src/styles/components/_ecogesture.scss */
+ /* line 111, src/styles/components/_ecogesture.scss */
.em-detail .em-detail-nwh {
display: flex;
flex: 1;
align-self: flex-start;
margin-top: 0.65rem;
color: var(--textDark); }
- /* line 109, src/styles/components/_ecogesture.scss */
+ /* line 117, src/styles/components/_ecogesture.scss */
.em-detail .em-detail-nwh .em-detail-nwh-unit {
margin-left: 0.2rem; }
- /* line 113, src/styles/components/_ecogesture.scss */
+ /* line 121, src/styles/components/_ecogesture.scss */
.em-detail .em-picto-flow {
display: flex;
align-self: flex-end; }
- /* line 116, src/styles/components/_ecogesture.scss */
+ /* line 124, src/styles/components/_ecogesture.scss */
.em-detail .em-picto-flow .em-pic-content {
margin: 0.3em; }
-/* line 122, src/styles/components/_ecogesture.scss */
+/* line 130, src/styles/components/_ecogesture.scss */
.em-content-box {
max-height: 25rem;
overflow: auto;
@@ -2240,28 +2491,46 @@ p {
/* width */
/* Track */
/* Handle */ }
- /* line 129, src/styles/components/_ecogesture.scss */
+ /* line 137, src/styles/components/_ecogesture.scss */
.em-content-box::-webkit-scrollbar {
width: 10px; }
- /* line 133, src/styles/components/_ecogesture.scss */
+ /* line 141, src/styles/components/_ecogesture.scss */
.em-content-box::-webkit-scrollbar-track {
background: #3e4045; }
- /* line 137, src/styles/components/_ecogesture.scss */
+ /* line 145, src/styles/components/_ecogesture.scss */
.em-content-box::-webkit-scrollbar-thumb {
background: #6f7074; }
- /* line 140, src/styles/components/_ecogesture.scss */
+ /* line 148, src/styles/components/_ecogesture.scss */
.em-content-box .em-content-box-text {
display: flex;
flex-direction: column;
padding: 1.5rem 1.5rem;
width: 22.125rem; }
@media only screen and (max-width: 768px) {
- /* line 140, src/styles/components/_ecogesture.scss */
+ /* line 148, src/styles/components/_ecogesture.scss */
.em-content-box .em-content-box-text {
width: 100%; } }
- /* line 148, src/styles/components/_ecogesture.scss */
+ /* line 156, src/styles/components/_ecogesture.scss */
+ .em-content-box .em-content-box-text .em-content-box-text-header {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center; }
+ /* line 161, src/styles/components/_ecogesture.scss */
+ .em-content-box .em-content-box-text .em-content-box-text-header .icon {
+ margin-bottom: 1rem; }
+ /* line 165, src/styles/components/_ecogesture.scss */
.em-content-box .em-content-box-text .em-description {
padding-bottom: 2.5rem; }
+ /* line 167, src/styles/components/_ecogesture.scss */
+ .em-content-box .em-content-box-text .em-description .long-name {
+ font-weight: bold; }
+ /* line 171, src/styles/components/_ecogesture.scss */
+ .em-content-box .em-content-box-text .em-description-2 {
+ padding-top: 2rem; }
+ /* line 174, src/styles/components/_ecogesture.scss */
+ .em-content-box .em-content-box-text .em-description-3 {
+ padding-bottom: 0.5rem; }
/** BLACK **/
/** TEXT COLOR **/
@@ -2316,17 +2585,48 @@ p {
.modal-overlay .modal-box.modal-box-bordered {
border: 1px solid #58FFFF40; }
/* line 41, src/styles/components/_modal.scss */
+ .modal-overlay .modal-box.yellow-border {
+ border: 1px solid rgba(227, 184, 42, 0.4); }
+ /* line 44, src/styles/components/_modal.scss */
.modal-overlay .modal-box .modal-close-button {
position: absolute;
top: 0.5rem;
right: 0.5rem;
padding: 5px 5px; }
- /* line 47, src/styles/components/_modal.scss */
+ /* line 50, src/styles/components/_modal.scss */
.modal-overlay .modal-box .modal-content {
display: flex;
flex-direction: column;
align-items: center;
color: #ffffff; }
+ /* line 56, src/styles/components/_modal.scss */
+ .modal-overlay .modal-box .wm-header {
+ background: radial-gradient(105.25% 64.58% at 49.68% 70.83%, rgba(226, 137, 4, 0.5) 0%, rgba(255, 255, 255, 0) 100%), #f1c017;
+ background-clip: 'text';
+ -webkit-background-clip: text;
+ color: transparent;
+ margin-top: 2rem; }
+ /* line 63, src/styles/components/_modal.scss */
+ .modal-overlay .modal-box .wm-name {
+ background: radial-gradient(105.25% 64.58% at 49.68% 70.83%, rgba(226, 137, 4, 0.5) 0%, rgba(255, 255, 255, 0) 100%), #f1c017;
+ background-clip: 'text';
+ -webkit-background-clip: text;
+ color: transparent;
+ margin-bottom: 1.25rem; }
+ /* line 70, src/styles/components/_modal.scss */
+ .modal-overlay .modal-box .button-ok {
+ width: 90%;
+ margin-bottom: 2rem; }
+ /* line 74, src/styles/components/_modal.scss */
+ .modal-overlay .modal-box .wm-perso {
+ text-align: center;
+ width: 60%;
+ margin: 1rem; }
+ /* line 79, src/styles/components/_modal.scss */
+ .modal-overlay .modal-box .wm-connect {
+ text-align: center;
+ width: 88%;
+ margin: 1rem; }
/** BLACK **/
/** TEXT COLOR **/
@@ -2447,46 +2747,13 @@ p {
color: var(--textBright); }
/* line 22, src/styles/components/_splash.scss */
.splash-root .splash-content {
- margin-left: 2rem;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
- flex: 1; }
- @media only screen and (max-width: 768px) {
- /* line 22, src/styles/components/_splash.scss */
- .splash-root .splash-content {
- align-items: flex-start;
- justify-content: flex-start; } }
- /* line 33, src/styles/components/_splash.scss */
- .splash-root .splash-content .splash-step {
- display: flex;
- flex-direction: row;
- width: 60%;
- height: 90px; }
- @media only screen and (max-width: 1023px) {
- /* line 33, src/styles/components/_splash.scss */
- .splash-root .splash-content .splash-step {
- width: 80%; } }
- @media only screen and (max-width: 768px) {
- /* line 33, src/styles/components/_splash.scss */
- .splash-root .splash-content .splash-step {
- width: 100%; } }
- /* line 44, src/styles/components/_splash.scss */
- .splash-root .splash-content .splash-step .splash-step-text {
- display: flex;
- align-items: center;
- justify-content: center;
- flex: 1;
- text-align: center;
- color: #e0e0e0; }
- /* line 52, src/styles/components/_splash.scss */
- .splash-root .splash-content .splash-step .splash-step-icon {
- display: flex;
- align-items: center;
- justify-content: center;
- width: 90px; }
- /* line 61, src/styles/components/_splash.scss */
+ flex: 1;
+ margin-top: 6rem; }
+ /* line 30, src/styles/components/_splash.scss */
.splash-root .splash-footer {
display: flex;
flex-direction: column;
@@ -2494,16 +2761,48 @@ p {
justify-content: flex-start;
height: 10rem;
margin: 0 2rem; }
- /* line 68, src/styles/components/_splash.scss */
+ /* line 37, src/styles/components/_splash.scss */
.splash-root .splash-footer .splash-footer-error-text {
text-align: center;
color: red;
margin: 0.5rem 0; }
- /* line 73, src/styles/components/_splash.scss */
+ /* line 42, src/styles/components/_splash.scss */
.splash-root .splash-footer .splash-footer-button {
max-width: 50vw; }
-/* line 26, src/styles/index.scss */
+/** BLACK **/
+/** TEXT COLOR **/
+/** RED **/
+/** YELLOW **/
+/** ORANGE **/
+/** BLUE **/
+/** GREEN **/
+/** WHITE **/
+/** GREY **/
+/** App colors **/
+/** TABS GRADIENT **/
+/* line 4, src/styles/components/_auth.scss */
+.authform-button-content {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ width: 100%; }
+ @media only screen and (max-width: 768px) {
+ /* line 4, src/styles/components/_auth.scss */
+ .authform-button-content {
+ justify-content: left; } }
+ /* line 12, src/styles/components/_auth.scss */
+ .authform-button-content .authform-button-content-icon {
+ margin: 0 1.375rem; }
+ /* line 15, src/styles/components/_auth.scss */
+ .authform-button-content .authform-button-text {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ text-align: left;
+ max-width: 10.625rem; }
+
+/* line 27, src/styles/index.scss */
:root {
--blue: #58FFFF;
--blue40: #58FFFF40;
@@ -2537,10 +2836,10 @@ p {
--gasColorRadialGradient: radial-gradient(105.25% 64.58% at 49.68% 70.83%, rgba(4, 106, 88, 0.5) 0%, rgba(255, 255, 255, 0) 100%), #45d1b8;
--waterColorRadialGradient: radial-gradient(105.25% 64.58% at 49.68% 70.83%, rgba(2, 93, 174, 0.5) 0%, rgba(255, 255, 255, 0) 100%), #3a98ec; }
-/* line 60, src/styles/index.scss */
+/* line 61, src/styles/index.scss */
.application {
overflow-x: hidden; }
@media only screen and (max-width: 768px) {
- /* line 60, src/styles/index.scss */
+ /* line 61, src/styles/index.scss */
.application {
min-height: 100vh; } }
diff --git a/test/__mocks__/enedis-dayMock.json b/test/__mocks__/enedis-dayMock.json
index b95fe83f813cae40928f485ee080efe4432680be..cc3b4ec8c1f4a7d9cde42e7e3dab354e2b52c16c 100644
--- a/test/__mocks__/enedis-dayMock.json
+++ b/test/__mocks__/enedis-dayMock.json
@@ -2,7 +2,7 @@
{
"id": "70fddfc40223272bd74c286d7c053aa6",
"_id": "70fddfc40223272bd74c286d7c053aa6",
- "_type": "io.enedis.day",
+ "_type": "com.grandlyon.enedis.day",
"_rev": "1-8e5976963701b9d98fb1ddbf6648469b",
"day": 11,
"hour": 0,
@@ -14,7 +14,7 @@
{
"id": "70fddfc40223272bd74c286d7c0520f7",
"_id": "70fddfc40223272bd74c286d7c0520f7",
- "_type": "io.enedis.day",
+ "_type": "com.grandlyon.enedis.day",
"_rev": "1-33fc0ac1cd570c92288dfb655011e744",
"day": 12,
"hour": 0,
@@ -26,7 +26,7 @@
{
"id": "70fddfc40223272bd74c286d7c052bb4",
"_id": "70fddfc40223272bd74c286d7c052bb4",
- "_type": "io.enedis.day",
+ "_type": "com.grandlyon.enedis.day",
"_rev": "1-a131eaf0a1793ccb1f909bf1e051f5e4",
"day": 13,
"hour": 0,
@@ -38,7 +38,7 @@
{
"id": "70fddfc40223272bd74c286d7c056647",
"_id": "70fddfc40223272bd74c286d7c056647",
- "_type": "io.enedis.day",
+ "_type": "com.grandlyon.enedis.day",
"_rev": "1-a4573af893bc614648d4ea6cf85a2a4b",
"day": 14,
"hour": 0,
@@ -50,7 +50,7 @@
{
"id": "70fddfc40223272bd74c286d7c05a874",
"_id": "70fddfc40223272bd74c286d7c05a874",
- "_type": "io.enedis.day",
+ "_type": "com.grandlyon.enedis.day",
"_rev": "1-05c1451ba54d5a44b6af86470d04e319",
"day": 15,
"hour": 0,
@@ -62,7 +62,7 @@
{
"id": "70fddfc40223272bd74c286d7c059c94",
"_id": "70fddfc40223272bd74c286d7c059c94",
- "_type": "io.enedis.day",
+ "_type": "com.grandlyon.enedis.day",
"_rev": "1-fd13c972c85329e61bb86a22f29e0260",
"day": 16,
"hour": 0,
@@ -74,7 +74,7 @@
{
"id": "70fddfc40223272bd74c286d7c05bd72",
"_id": "70fddfc40223272bd74c286d7c05bd72",
- "_type": "io.enedis.day",
+ "_type": "com.grandlyon.enedis.day",
"_rev": "1-f041e50562e991828edd23cf40321709",
"day": 17,
"hour": 0,
@@ -86,7 +86,7 @@
{
"id": "70fddfc40223272bd74c286d7c05af31",
"_id": "70fddfc40223272bd74c286d7c05af31",
- "_type": "io.enedis.day",
+ "_type": "com.grandlyon.enedis.day",
"_rev": "1-47d9d3d3b8abcc835eb7636af317fb22",
"day": 18,
"hour": 0,
@@ -98,7 +98,7 @@
{
"id": "70fddfc40223272bd74c286d7c05bd76",
"_id": "70fddfc40223272bd74c286d7c05bd76",
- "_type": "io.enedis.day",
+ "_type": "com.grandlyon.enedis.day",
"_rev": "1-7b6aa26a76d7ea9a78968e50dc160cd6",
"day": 19,
"hour": 0,
@@ -110,7 +110,7 @@
{
"id": "70fddfc40223272bd74c286d7c05c353",
"_id": "70fddfc40223272bd74c286d7c05c353",
- "_type": "io.enedis.day",
+ "_type": "com.grandlyon.enedis.day",
"_rev": "1-9c3dbf64d5f54972711bcd3b10256e36",
"day": 20,
"hour": 0,
@@ -122,7 +122,7 @@
{
"id": "70fddfc40223272bd74c286d7c05c9a1",
"_id": "70fddfc40223272bd74c286d7c05c9a1",
- "_type": "io.enedis.day",
+ "_type": "com.grandlyon.enedis.day",
"_rev": "1-264ca0611717e7feb8e49dd0625c38a2",
"day": 21,
"hour": 0,
@@ -134,7 +134,7 @@
{
"id": "70fddfc40223272bd74c286d7c05d922",
"_id": "70fddfc40223272bd74c286d7c05d922",
- "_type": "io.enedis.day",
+ "_type": "com.grandlyon.enedis.day",
"_rev": "1-0d14a1a058b9ca9780db9bd2ab3b3c2d",
"day": 22,
"hour": 0,
@@ -146,7 +146,7 @@
{
"id": "70fddfc40223272bd74c286d7c05fa63",
"_id": "70fddfc40223272bd74c286d7c05fa63",
- "_type": "io.enedis.day",
+ "_type": "com.grandlyon.enedis.day",
"_rev": "1-d1367b96c9a986ed4dadecbb36719f61",
"day": 23,
"hour": 0,
@@ -158,7 +158,7 @@
{
"id": "70fddfc40223272bd74c286d7c05e659",
"_id": "70fddfc40223272bd74c286d7c05e659",
- "_type": "io.enedis.day",
+ "_type": "com.grandlyon.enedis.day",
"_rev": "1-a50e07164ec413a26e0f3d82eadf2abf",
"day": 24,
"hour": 0,
diff --git a/test/createDayDataFiles.js b/test/createDayDataFiles.js
index b0da86be1344b4aeb6842519d6a7bd8db3daeae4..f625c79bcae18f982f557aa8b8b91cf465d84abb 100644
--- a/test/createDayDataFiles.js
+++ b/test/createDayDataFiles.js
@@ -113,9 +113,9 @@ const Gaz = generateData(startingdate, endingDate, 16, 68)
const Eau = generateData(startingdate, endingDate, 200, 300)
const dumpElec = {
- 'io.enedis.day': Elec.dailyLoad,
- 'io.enedis.month': Elec.monthlyLoad,
- 'io.enedis.year': Elec.yearlyLoad,
+ 'com.grandlyon.enedis.day': Elec.dailyLoad,
+ 'com.grandlyon.enedis.month': Elec.monthlyLoad,
+ 'com.grandlyon.enedis.year': Elec.yearlyLoad,
}
const dumpStringElec = JSON.stringify(dumpElec)
fs.writeFile('data/dayData-elec.json', dumpStringElec, function(err, result) {
@@ -123,9 +123,9 @@ fs.writeFile('data/dayData-elec.json', dumpStringElec, function(err, result) {
})
const dumpGas = {
- 'io.grdf.day': Gaz.dailyLoad,
- 'io.grdf.month': Gaz.monthlyLoad,
- 'io.grdf.year': Gaz.yearlyLoad,
+ 'com.grandlyon.grdf.day': Gaz.dailyLoad,
+ 'com.grandlyon.grdf.month': Gaz.monthlyLoad,
+ 'com.grandlyon.grdf.year': Gaz.yearlyLoad,
}
const dumpStringGas = JSON.stringify(dumpGas)
fs.writeFile('data/dayData-gas.json', dumpStringGas, function(err, result) {
@@ -133,9 +133,9 @@ fs.writeFile('data/dayData-gas.json', dumpStringGas, function(err, result) {
})
const dumpWater = {
- 'io.egl.day': Eau.dailyLoad,
- 'io.egl.month': Eau.monthlyLoad,
- 'io.egl.year': Eau.yearlyLoad,
+ 'com.grandlyon.egl.day': Eau.dailyLoad,
+ 'com.grandlyon.egl.month': Eau.monthlyLoad,
+ 'com.grandlyon.egl.year': Eau.yearlyLoad,
}
const dumpStringWater = JSON.stringify(dumpWater)
fs.writeFile('data/dayData-water.json', dumpStringWater, function(err, result) {
@@ -143,17 +143,17 @@ fs.writeFile('data/dayData-water.json', dumpStringWater, function(err, result) {
})
const dump = {
- 'io.enedis.day': Elec.dailyLoad,
- 'io.enedis.month': Elec.monthlyLoad,
- 'io.enedis.year': Elec.yearlyLoad,
+ 'com.grandlyon.enedis.day': Elec.dailyLoad,
+ 'com.grandlyon.enedis.month': Elec.monthlyLoad,
+ 'com.grandlyon.enedis.year': Elec.yearlyLoad,
- 'io.grdf.day': Gaz.dailyLoad,
- 'io.grdf.month': Gaz.monthlyLoad,
- 'io.grdf.year': Gaz.yearlyLoad,
+ 'com.grandlyon.grdf.day': Gaz.dailyLoad,
+ 'com.grandlyon.grdf.month': Gaz.monthlyLoad,
+ 'com.grandlyon.grdf.year': Gaz.yearlyLoad,
- 'io.egl.day': Eau.dailyLoad,
- 'io.egl.month': Eau.monthlyLoad,
- 'io.egl.year': Eau.yearlyLoad,
+ 'com.grandlyon.egl.day': Eau.dailyLoad,
+ 'com.grandlyon.egl.month': Eau.monthlyLoad,
+ 'com.grandlyon.egl.year': Eau.yearlyLoad,
}
const dumpString = JSON.stringify(dump)
diff --git a/test/createMockFile.js b/test/createMockFile.js
index ab5b43ef3672e656a9d9ea4f992f3cf7f9f2e3d0..f26e3d3a8d66ac2e662478d0eca8095df08fbc41 100644
--- a/test/createMockFile.js
+++ b/test/createMockFile.js
@@ -146,20 +146,20 @@ fetchData = (y1,y2,withHourlyDetail) =>
*/
const dump = {
- 'io.enedis.minute': Eelec.hourlyLoad,
- 'io.enedis.day': Eelec.dailyLoad,
- 'io.enedis.month': Eelec.monthlyLoad,
- 'io.enedis.year': Eelec.yearlyLoad,
-
- 'io.grdf.hour': Gaz.hourlyLoad,
- 'io.grdf.day': Gaz.dailyLoad,
- 'io.grdf.month': Gaz.monthlyLoad,
- 'io.grdf.year': Gaz.yearlyLoad,
-
- //"io.egl.hour": Eau.hourlyLoad,
- 'io.egl.day': Eau.dailyLoad,
- 'io.egl.month': Eau.monthlyLoad,
- 'io.egl.year': Eau.yearlyLoad,
+ 'com.grandlyon.enedis.minute': Eelec.hourlyLoad,
+ 'com.grandlyon.enedis.day': Eelec.dailyLoad,
+ 'com.grandlyon.enedis.month': Eelec.monthlyLoad,
+ 'com.grandlyon.enedis.year': Eelec.yearlyLoad,
+
+ 'com.grandlyon.grdf.hour': Gaz.hourlyLoad,
+ 'com.grandlyon.grdf.day': Gaz.dailyLoad,
+ 'com.grandlyon.grdf.month': Gaz.monthlyLoad,
+ 'com.grandlyon.grdf.year': Gaz.yearlyLoad,
+
+ //"com.grandlyon.egl.hour": Eau.hourlyLoad,
+ 'com.grandlyon.egl.day': Eau.dailyLoad,
+ 'com.grandlyon.egl.month': Eau.monthlyLoad,
+ 'com.grandlyon.egl.year': Eau.yearlyLoad,
}
const dumpString = JSON.stringify(dump)
diff --git a/test/data/dayData-elec.json b/test/data/dayData-elec.json
index 04df6b4a16c32a758ef4bd862d95cf6792ace829..5dacd1e5536dec375d9ba26261168c8139f8750d 100644
--- a/test/data/dayData-elec.json
+++ b/test/data/dayData-elec.json
@@ -1 +1 @@
-{"io.enedis.day":[{"load":5.25,"year":2020,"month":1,"day":1,"hour":0,"minute":0},{"load":3.76,"year":2020,"month":1,"day":2,"hour":0,"minute":0},{"load":8.03,"year":2020,"month":1,"day":3,"hour":0,"minute":0},{"load":5.32,"year":2020,"month":1,"day":4,"hour":0,"minute":0},{"load":8.72,"year":2020,"month":1,"day":5,"hour":0,"minute":0},{"load":8.17,"year":2020,"month":1,"day":6,"hour":0,"minute":0},{"load":6.08,"year":2020,"month":1,"day":7,"hour":0,"minute":0},{"load":4.06,"year":2020,"month":1,"day":8,"hour":0,"minute":0},{"load":4.82,"year":2020,"month":1,"day":9,"hour":0,"minute":0},{"load":7.5,"year":2020,"month":1,"day":10,"hour":0,"minute":0},{"load":6.21,"year":2020,"month":1,"day":11,"hour":0,"minute":0},{"load":4.63,"year":2020,"month":1,"day":12,"hour":0,"minute":0},{"load":4.32,"year":2020,"month":1,"day":13,"hour":0,"minute":0},{"load":8.79,"year":2020,"month":1,"day":14,"hour":0,"minute":0},{"load":7.88,"year":2020,"month":1,"day":15,"hour":0,"minute":0},{"load":4.1,"year":2020,"month":1,"day":16,"hour":0,"minute":0},{"load":5.09,"year":2020,"month":1,"day":17,"hour":0,"minute":0},{"load":8.58,"year":2020,"month":1,"day":18,"hour":0,"minute":0},{"load":9.97,"year":2020,"month":1,"day":19,"hour":0,"minute":0},{"load":6.68,"year":2020,"month":1,"day":20,"hour":0,"minute":0},{"load":9.13,"year":2020,"month":1,"day":21,"hour":0,"minute":0},{"load":4.77,"year":2020,"month":1,"day":22,"hour":0,"minute":0},{"load":3.6,"year":2020,"month":1,"day":23,"hour":0,"minute":0},{"load":8.33,"year":2020,"month":1,"day":24,"hour":0,"minute":0},{"load":3.42,"year":2020,"month":1,"day":25,"hour":0,"minute":0},{"load":8.46,"year":2020,"month":1,"day":26,"hour":0,"minute":0},{"load":5.85,"year":2020,"month":1,"day":27,"hour":0,"minute":0},{"load":3.01,"year":2020,"month":1,"day":28,"hour":0,"minute":0},{"load":8.06,"year":2020,"month":1,"day":29,"hour":0,"minute":0},{"load":6.39,"year":2020,"month":1,"day":30,"hour":0,"minute":0},{"load":6.9,"year":2020,"month":1,"day":31,"hour":0,"minute":0},{"load":3.9,"year":2020,"month":2,"day":1,"hour":0,"minute":0},{"load":8.07,"year":2020,"month":2,"day":2,"hour":0,"minute":0},{"load":9.85,"year":2020,"month":2,"day":3,"hour":0,"minute":0},{"load":7.23,"year":2020,"month":2,"day":4,"hour":0,"minute":0},{"load":6.05,"year":2020,"month":2,"day":5,"hour":0,"minute":0},{"load":8.02,"year":2020,"month":2,"day":6,"hour":0,"minute":0},{"load":8.45,"year":2020,"month":2,"day":7,"hour":0,"minute":0},{"load":7.01,"year":2020,"month":2,"day":8,"hour":0,"minute":0},{"load":6.36,"year":2020,"month":2,"day":9,"hour":0,"minute":0},{"load":3.07,"year":2020,"month":2,"day":10,"hour":0,"minute":0},{"load":4.03,"year":2020,"month":2,"day":11,"hour":0,"minute":0},{"load":7.2,"year":2020,"month":2,"day":12,"hour":0,"minute":0},{"load":3.66,"year":2020,"month":2,"day":13,"hour":0,"minute":0},{"load":8.3,"year":2020,"month":2,"day":14,"hour":0,"minute":0},{"load":5.93,"year":2020,"month":2,"day":15,"hour":0,"minute":0},{"load":9.08,"year":2020,"month":2,"day":16,"hour":0,"minute":0},{"load":5.32,"year":2020,"month":2,"day":17,"hour":0,"minute":0},{"load":4.72,"year":2020,"month":2,"day":18,"hour":0,"minute":0},{"load":6,"year":2020,"month":2,"day":19,"hour":0,"minute":0},{"load":7.73,"year":2020,"month":2,"day":20,"hour":0,"minute":0},{"load":3.59,"year":2020,"month":2,"day":21,"hour":0,"minute":0},{"load":7.75,"year":2020,"month":2,"day":22,"hour":0,"minute":0},{"load":5.37,"year":2020,"month":2,"day":23,"hour":0,"minute":0},{"load":8.33,"year":2020,"month":2,"day":24,"hour":0,"minute":0},{"load":9.02,"year":2020,"month":2,"day":25,"hour":0,"minute":0},{"load":5.19,"year":2020,"month":2,"day":26,"hour":0,"minute":0},{"load":6.75,"year":2020,"month":2,"day":27,"hour":0,"minute":0},{"load":5.49,"year":2020,"month":2,"day":28,"hour":0,"minute":0},{"load":8.13,"year":2020,"month":2,"day":29,"hour":0,"minute":0},{"load":7.68,"year":2020,"month":3,"day":1,"hour":0,"minute":0},{"load":5.47,"year":2020,"month":3,"day":2,"hour":0,"minute":0},{"load":4.37,"year":2020,"month":3,"day":3,"hour":0,"minute":0},{"load":8.85,"year":2020,"month":3,"day":4,"hour":0,"minute":0},{"load":9.68,"year":2020,"month":3,"day":5,"hour":0,"minute":0},{"load":8.61,"year":2020,"month":3,"day":6,"hour":0,"minute":0},{"load":6.27,"year":2020,"month":3,"day":7,"hour":0,"minute":0},{"load":8.06,"year":2020,"month":3,"day":8,"hour":0,"minute":0},{"load":9.96,"year":2020,"month":3,"day":9,"hour":0,"minute":0},{"load":9.91,"year":2020,"month":3,"day":10,"hour":0,"minute":0},{"load":5.55,"year":2020,"month":3,"day":11,"hour":0,"minute":0},{"load":6.27,"year":2020,"month":3,"day":12,"hour":0,"minute":0},{"load":9.86,"year":2020,"month":3,"day":13,"hour":0,"minute":0},{"load":8.55,"year":2020,"month":3,"day":14,"hour":0,"minute":0},{"load":3.36,"year":2020,"month":3,"day":15,"hour":0,"minute":0},{"load":7.22,"year":2020,"month":3,"day":16,"hour":0,"minute":0},{"load":7.82,"year":2020,"month":3,"day":17,"hour":0,"minute":0},{"load":5.28,"year":2020,"month":3,"day":18,"hour":0,"minute":0},{"load":5.82,"year":2020,"month":3,"day":19,"hour":0,"minute":0},{"load":4.65,"year":2020,"month":3,"day":20,"hour":0,"minute":0},{"load":5.52,"year":2020,"month":3,"day":21,"hour":0,"minute":0},{"load":6.94,"year":2020,"month":3,"day":22,"hour":0,"minute":0},{"load":4.58,"year":2020,"month":3,"day":23,"hour":0,"minute":0},{"load":6.12,"year":2020,"month":3,"day":24,"hour":0,"minute":0},{"load":6.24,"year":2020,"month":3,"day":25,"hour":0,"minute":0},{"load":5.14,"year":2020,"month":3,"day":26,"hour":0,"minute":0},{"load":7.43,"year":2020,"month":3,"day":27,"hour":0,"minute":0},{"load":8.71,"year":2020,"month":3,"day":28,"hour":0,"minute":0},{"load":4.07,"year":2020,"month":3,"day":29,"hour":0,"minute":0},{"load":6.7,"year":2020,"month":3,"day":30,"hour":0,"minute":0},{"load":5.08,"year":2020,"month":3,"day":31,"hour":0,"minute":0},{"load":4.72,"year":2020,"month":4,"day":1,"hour":0,"minute":0},{"load":3.11,"year":2020,"month":4,"day":2,"hour":0,"minute":0},{"load":9.82,"year":2020,"month":4,"day":3,"hour":0,"minute":0},{"load":8.12,"year":2020,"month":4,"day":4,"hour":0,"minute":0},{"load":3.04,"year":2020,"month":4,"day":5,"hour":0,"minute":0},{"load":6.59,"year":2020,"month":4,"day":6,"hour":0,"minute":0},{"load":4.94,"year":2020,"month":4,"day":7,"hour":0,"minute":0},{"load":5.26,"year":2020,"month":4,"day":8,"hour":0,"minute":0},{"load":4.45,"year":2020,"month":4,"day":9,"hour":0,"minute":0},{"load":8.01,"year":2020,"month":4,"day":10,"hour":0,"minute":0},{"load":8.93,"year":2020,"month":4,"day":11,"hour":0,"minute":0},{"load":7.82,"year":2020,"month":4,"day":12,"hour":0,"minute":0},{"load":4.13,"year":2020,"month":4,"day":13,"hour":0,"minute":0},{"load":6.43,"year":2020,"month":4,"day":14,"hour":0,"minute":0},{"load":5.82,"year":2020,"month":4,"day":15,"hour":0,"minute":0},{"load":5.44,"year":2020,"month":4,"day":16,"hour":0,"minute":0},{"load":9.53,"year":2020,"month":4,"day":17,"hour":0,"minute":0},{"load":7.29,"year":2020,"month":4,"day":18,"hour":0,"minute":0},{"load":3.61,"year":2020,"month":4,"day":19,"hour":0,"minute":0},{"load":3.04,"year":2020,"month":4,"day":20,"hour":0,"minute":0},{"load":7.83,"year":2020,"month":4,"day":21,"hour":0,"minute":0},{"load":3.21,"year":2020,"month":4,"day":22,"hour":0,"minute":0},{"load":3.76,"year":2020,"month":4,"day":23,"hour":0,"minute":0},{"load":9.21,"year":2020,"month":4,"day":24,"hour":0,"minute":0},{"load":5.85,"year":2020,"month":4,"day":25,"hour":0,"minute":0},{"load":7.79,"year":2020,"month":4,"day":26,"hour":0,"minute":0},{"load":6.8,"year":2020,"month":4,"day":27,"hour":0,"minute":0},{"load":3.89,"year":2020,"month":4,"day":28,"hour":0,"minute":0},{"load":7.34,"year":2020,"month":4,"day":29,"hour":0,"minute":0}],"io.enedis.month":[{"load":199.78,"year":2020,"month":1,"day":0,"hour":0,"minute":0},{"load":193.38,"year":2020,"month":2,"day":0,"hour":0,"minute":0},{"load":206.81,"year":2020,"month":3,"day":0,"hour":0,"minute":0},{"load":171.06,"year":2020,"month":4,"day":1,"hour":0,"minute":0}],"io.enedis.year":[{"load":771.03,"year":2020,"month":1,"day":1,"hour":0,"minute":0}]}
\ No newline at end of file
+{"com.grandlyon.enedis.day":[{"load":5.25,"year":2020,"month":1,"day":1,"hour":0,"minute":0},{"load":3.76,"year":2020,"month":1,"day":2,"hour":0,"minute":0},{"load":8.03,"year":2020,"month":1,"day":3,"hour":0,"minute":0},{"load":5.32,"year":2020,"month":1,"day":4,"hour":0,"minute":0},{"load":8.72,"year":2020,"month":1,"day":5,"hour":0,"minute":0},{"load":8.17,"year":2020,"month":1,"day":6,"hour":0,"minute":0},{"load":6.08,"year":2020,"month":1,"day":7,"hour":0,"minute":0},{"load":4.06,"year":2020,"month":1,"day":8,"hour":0,"minute":0},{"load":4.82,"year":2020,"month":1,"day":9,"hour":0,"minute":0},{"load":7.5,"year":2020,"month":1,"day":10,"hour":0,"minute":0},{"load":6.21,"year":2020,"month":1,"day":11,"hour":0,"minute":0},{"load":4.63,"year":2020,"month":1,"day":12,"hour":0,"minute":0},{"load":4.32,"year":2020,"month":1,"day":13,"hour":0,"minute":0},{"load":8.79,"year":2020,"month":1,"day":14,"hour":0,"minute":0},{"load":7.88,"year":2020,"month":1,"day":15,"hour":0,"minute":0},{"load":4.1,"year":2020,"month":1,"day":16,"hour":0,"minute":0},{"load":5.09,"year":2020,"month":1,"day":17,"hour":0,"minute":0},{"load":8.58,"year":2020,"month":1,"day":18,"hour":0,"minute":0},{"load":9.97,"year":2020,"month":1,"day":19,"hour":0,"minute":0},{"load":6.68,"year":2020,"month":1,"day":20,"hour":0,"minute":0},{"load":9.13,"year":2020,"month":1,"day":21,"hour":0,"minute":0},{"load":4.77,"year":2020,"month":1,"day":22,"hour":0,"minute":0},{"load":3.6,"year":2020,"month":1,"day":23,"hour":0,"minute":0},{"load":8.33,"year":2020,"month":1,"day":24,"hour":0,"minute":0},{"load":3.42,"year":2020,"month":1,"day":25,"hour":0,"minute":0},{"load":8.46,"year":2020,"month":1,"day":26,"hour":0,"minute":0},{"load":5.85,"year":2020,"month":1,"day":27,"hour":0,"minute":0},{"load":3.01,"year":2020,"month":1,"day":28,"hour":0,"minute":0},{"load":8.06,"year":2020,"month":1,"day":29,"hour":0,"minute":0},{"load":6.39,"year":2020,"month":1,"day":30,"hour":0,"minute":0},{"load":6.9,"year":2020,"month":1,"day":31,"hour":0,"minute":0},{"load":3.9,"year":2020,"month":2,"day":1,"hour":0,"minute":0},{"load":8.07,"year":2020,"month":2,"day":2,"hour":0,"minute":0},{"load":9.85,"year":2020,"month":2,"day":3,"hour":0,"minute":0},{"load":7.23,"year":2020,"month":2,"day":4,"hour":0,"minute":0},{"load":6.05,"year":2020,"month":2,"day":5,"hour":0,"minute":0},{"load":8.02,"year":2020,"month":2,"day":6,"hour":0,"minute":0},{"load":8.45,"year":2020,"month":2,"day":7,"hour":0,"minute":0},{"load":7.01,"year":2020,"month":2,"day":8,"hour":0,"minute":0},{"load":6.36,"year":2020,"month":2,"day":9,"hour":0,"minute":0},{"load":3.07,"year":2020,"month":2,"day":10,"hour":0,"minute":0},{"load":4.03,"year":2020,"month":2,"day":11,"hour":0,"minute":0},{"load":7.2,"year":2020,"month":2,"day":12,"hour":0,"minute":0},{"load":3.66,"year":2020,"month":2,"day":13,"hour":0,"minute":0},{"load":8.3,"year":2020,"month":2,"day":14,"hour":0,"minute":0},{"load":5.93,"year":2020,"month":2,"day":15,"hour":0,"minute":0},{"load":9.08,"year":2020,"month":2,"day":16,"hour":0,"minute":0},{"load":5.32,"year":2020,"month":2,"day":17,"hour":0,"minute":0},{"load":4.72,"year":2020,"month":2,"day":18,"hour":0,"minute":0},{"load":6,"year":2020,"month":2,"day":19,"hour":0,"minute":0},{"load":7.73,"year":2020,"month":2,"day":20,"hour":0,"minute":0},{"load":3.59,"year":2020,"month":2,"day":21,"hour":0,"minute":0},{"load":7.75,"year":2020,"month":2,"day":22,"hour":0,"minute":0},{"load":5.37,"year":2020,"month":2,"day":23,"hour":0,"minute":0},{"load":8.33,"year":2020,"month":2,"day":24,"hour":0,"minute":0},{"load":9.02,"year":2020,"month":2,"day":25,"hour":0,"minute":0},{"load":5.19,"year":2020,"month":2,"day":26,"hour":0,"minute":0},{"load":6.75,"year":2020,"month":2,"day":27,"hour":0,"minute":0},{"load":5.49,"year":2020,"month":2,"day":28,"hour":0,"minute":0},{"load":8.13,"year":2020,"month":2,"day":29,"hour":0,"minute":0},{"load":7.68,"year":2020,"month":3,"day":1,"hour":0,"minute":0},{"load":5.47,"year":2020,"month":3,"day":2,"hour":0,"minute":0},{"load":4.37,"year":2020,"month":3,"day":3,"hour":0,"minute":0},{"load":8.85,"year":2020,"month":3,"day":4,"hour":0,"minute":0},{"load":9.68,"year":2020,"month":3,"day":5,"hour":0,"minute":0},{"load":8.61,"year":2020,"month":3,"day":6,"hour":0,"minute":0},{"load":6.27,"year":2020,"month":3,"day":7,"hour":0,"minute":0},{"load":8.06,"year":2020,"month":3,"day":8,"hour":0,"minute":0},{"load":9.96,"year":2020,"month":3,"day":9,"hour":0,"minute":0},{"load":9.91,"year":2020,"month":3,"day":10,"hour":0,"minute":0},{"load":5.55,"year":2020,"month":3,"day":11,"hour":0,"minute":0},{"load":6.27,"year":2020,"month":3,"day":12,"hour":0,"minute":0},{"load":9.86,"year":2020,"month":3,"day":13,"hour":0,"minute":0},{"load":8.55,"year":2020,"month":3,"day":14,"hour":0,"minute":0},{"load":3.36,"year":2020,"month":3,"day":15,"hour":0,"minute":0},{"load":7.22,"year":2020,"month":3,"day":16,"hour":0,"minute":0},{"load":7.82,"year":2020,"month":3,"day":17,"hour":0,"minute":0},{"load":5.28,"year":2020,"month":3,"day":18,"hour":0,"minute":0},{"load":5.82,"year":2020,"month":3,"day":19,"hour":0,"minute":0},{"load":4.65,"year":2020,"month":3,"day":20,"hour":0,"minute":0},{"load":5.52,"year":2020,"month":3,"day":21,"hour":0,"minute":0},{"load":6.94,"year":2020,"month":3,"day":22,"hour":0,"minute":0},{"load":4.58,"year":2020,"month":3,"day":23,"hour":0,"minute":0},{"load":6.12,"year":2020,"month":3,"day":24,"hour":0,"minute":0},{"load":6.24,"year":2020,"month":3,"day":25,"hour":0,"minute":0},{"load":5.14,"year":2020,"month":3,"day":26,"hour":0,"minute":0},{"load":7.43,"year":2020,"month":3,"day":27,"hour":0,"minute":0},{"load":8.71,"year":2020,"month":3,"day":28,"hour":0,"minute":0},{"load":4.07,"year":2020,"month":3,"day":29,"hour":0,"minute":0},{"load":6.7,"year":2020,"month":3,"day":30,"hour":0,"minute":0},{"load":5.08,"year":2020,"month":3,"day":31,"hour":0,"minute":0},{"load":4.72,"year":2020,"month":4,"day":1,"hour":0,"minute":0},{"load":3.11,"year":2020,"month":4,"day":2,"hour":0,"minute":0},{"load":9.82,"year":2020,"month":4,"day":3,"hour":0,"minute":0},{"load":8.12,"year":2020,"month":4,"day":4,"hour":0,"minute":0},{"load":3.04,"year":2020,"month":4,"day":5,"hour":0,"minute":0},{"load":6.59,"year":2020,"month":4,"day":6,"hour":0,"minute":0},{"load":4.94,"year":2020,"month":4,"day":7,"hour":0,"minute":0},{"load":5.26,"year":2020,"month":4,"day":8,"hour":0,"minute":0},{"load":4.45,"year":2020,"month":4,"day":9,"hour":0,"minute":0},{"load":8.01,"year":2020,"month":4,"day":10,"hour":0,"minute":0},{"load":8.93,"year":2020,"month":4,"day":11,"hour":0,"minute":0},{"load":7.82,"year":2020,"month":4,"day":12,"hour":0,"minute":0},{"load":4.13,"year":2020,"month":4,"day":13,"hour":0,"minute":0},{"load":6.43,"year":2020,"month":4,"day":14,"hour":0,"minute":0},{"load":5.82,"year":2020,"month":4,"day":15,"hour":0,"minute":0},{"load":5.44,"year":2020,"month":4,"day":16,"hour":0,"minute":0},{"load":9.53,"year":2020,"month":4,"day":17,"hour":0,"minute":0},{"load":7.29,"year":2020,"month":4,"day":18,"hour":0,"minute":0},{"load":3.61,"year":2020,"month":4,"day":19,"hour":0,"minute":0},{"load":3.04,"year":2020,"month":4,"day":20,"hour":0,"minute":0},{"load":7.83,"year":2020,"month":4,"day":21,"hour":0,"minute":0},{"load":3.21,"year":2020,"month":4,"day":22,"hour":0,"minute":0},{"load":3.76,"year":2020,"month":4,"day":23,"hour":0,"minute":0},{"load":9.21,"year":2020,"month":4,"day":24,"hour":0,"minute":0},{"load":5.85,"year":2020,"month":4,"day":25,"hour":0,"minute":0},{"load":7.79,"year":2020,"month":4,"day":26,"hour":0,"minute":0},{"load":6.8,"year":2020,"month":4,"day":27,"hour":0,"minute":0},{"load":3.89,"year":2020,"month":4,"day":28,"hour":0,"minute":0},{"load":7.34,"year":2020,"month":4,"day":29,"hour":0,"minute":0}],"com.grandlyon.enedis.month":[{"load":199.78,"year":2020,"month":1,"day":0,"hour":0,"minute":0},{"load":193.38,"year":2020,"month":2,"day":0,"hour":0,"minute":0},{"load":206.81,"year":2020,"month":3,"day":0,"hour":0,"minute":0},{"load":171.06,"year":2020,"month":4,"day":1,"hour":0,"minute":0}],"com.grandlyon.enedis.year":[{"load":771.03,"year":2020,"month":1,"day":1,"hour":0,"minute":0}]}
\ No newline at end of file
diff --git a/test/data/dayData-gas.json b/test/data/dayData-gas.json
index f02ca930706a88478849f81eb30890280753d1d1..a1f2193c7fde22595a7e2b2888104f6acdf058e4 100644
--- a/test/data/dayData-gas.json
+++ b/test/data/dayData-gas.json
@@ -1 +1 @@
-{"io.grdf.day":[{"load":52.41,"year":2020,"month":1,"day":1,"hour":0,"minute":0},{"load":58.73,"year":2020,"month":1,"day":2,"hour":0,"minute":0},{"load":41.05,"year":2020,"month":1,"day":3,"hour":0,"minute":0},{"load":17.93,"year":2020,"month":1,"day":4,"hour":0,"minute":0},{"load":41.19,"year":2020,"month":1,"day":5,"hour":0,"minute":0},{"load":53.38,"year":2020,"month":1,"day":6,"hour":0,"minute":0},{"load":37.93,"year":2020,"month":1,"day":7,"hour":0,"minute":0},{"load":39.38,"year":2020,"month":1,"day":8,"hour":0,"minute":0},{"load":65.88,"year":2020,"month":1,"day":9,"hour":0,"minute":0},{"load":45.74,"year":2020,"month":1,"day":10,"hour":0,"minute":0},{"load":17.4,"year":2020,"month":1,"day":11,"hour":0,"minute":0},{"load":33.71,"year":2020,"month":1,"day":12,"hour":0,"minute":0},{"load":36.05,"year":2020,"month":1,"day":13,"hour":0,"minute":0},{"load":62.06,"year":2020,"month":1,"day":14,"hour":0,"minute":0},{"load":34.61,"year":2020,"month":1,"day":15,"hour":0,"minute":0},{"load":64.29,"year":2020,"month":1,"day":16,"hour":0,"minute":0},{"load":25.38,"year":2020,"month":1,"day":17,"hour":0,"minute":0},{"load":65.92,"year":2020,"month":1,"day":18,"hour":0,"minute":0},{"load":22.58,"year":2020,"month":1,"day":19,"hour":0,"minute":0},{"load":32.96,"year":2020,"month":1,"day":20,"hour":0,"minute":0},{"load":30.61,"year":2020,"month":1,"day":21,"hour":0,"minute":0},{"load":26.95,"year":2020,"month":1,"day":22,"hour":0,"minute":0},{"load":44.24,"year":2020,"month":1,"day":23,"hour":0,"minute":0},{"load":54.35,"year":2020,"month":1,"day":24,"hour":0,"minute":0},{"load":37.44,"year":2020,"month":1,"day":25,"hour":0,"minute":0},{"load":28.66,"year":2020,"month":1,"day":26,"hour":0,"minute":0},{"load":59.73,"year":2020,"month":1,"day":27,"hour":0,"minute":0},{"load":58.37,"year":2020,"month":1,"day":28,"hour":0,"minute":0},{"load":16.59,"year":2020,"month":1,"day":29,"hour":0,"minute":0},{"load":58.36,"year":2020,"month":1,"day":30,"hour":0,"minute":0},{"load":62.08,"year":2020,"month":1,"day":31,"hour":0,"minute":0},{"load":21.78,"year":2020,"month":2,"day":1,"hour":0,"minute":0},{"load":54.82,"year":2020,"month":2,"day":2,"hour":0,"minute":0},{"load":51.54,"year":2020,"month":2,"day":3,"hour":0,"minute":0},{"load":45.73,"year":2020,"month":2,"day":4,"hour":0,"minute":0},{"load":36.5,"year":2020,"month":2,"day":5,"hour":0,"minute":0},{"load":24.41,"year":2020,"month":2,"day":6,"hour":0,"minute":0},{"load":64.03,"year":2020,"month":2,"day":7,"hour":0,"minute":0},{"load":26.36,"year":2020,"month":2,"day":8,"hour":0,"minute":0},{"load":66.75,"year":2020,"month":2,"day":9,"hour":0,"minute":0},{"load":26.88,"year":2020,"month":2,"day":10,"hour":0,"minute":0},{"load":38.9,"year":2020,"month":2,"day":11,"hour":0,"minute":0},{"load":33.79,"year":2020,"month":2,"day":12,"hour":0,"minute":0},{"load":46.06,"year":2020,"month":2,"day":13,"hour":0,"minute":0},{"load":40.21,"year":2020,"month":2,"day":14,"hour":0,"minute":0},{"load":32.47,"year":2020,"month":2,"day":15,"hour":0,"minute":0},{"load":63.28,"year":2020,"month":2,"day":16,"hour":0,"minute":0},{"load":24.66,"year":2020,"month":2,"day":17,"hour":0,"minute":0},{"load":61.52,"year":2020,"month":2,"day":18,"hour":0,"minute":0},{"load":51.06,"year":2020,"month":2,"day":19,"hour":0,"minute":0},{"load":30.18,"year":2020,"month":2,"day":20,"hour":0,"minute":0},{"load":31.51,"year":2020,"month":2,"day":21,"hour":0,"minute":0},{"load":60.22,"year":2020,"month":2,"day":22,"hour":0,"minute":0},{"load":49.48,"year":2020,"month":2,"day":23,"hour":0,"minute":0},{"load":24.37,"year":2020,"month":2,"day":24,"hour":0,"minute":0},{"load":40.91,"year":2020,"month":2,"day":25,"hour":0,"minute":0},{"load":33.09,"year":2020,"month":2,"day":26,"hour":0,"minute":0},{"load":58.14,"year":2020,"month":2,"day":27,"hour":0,"minute":0},{"load":67.46,"year":2020,"month":2,"day":28,"hour":0,"minute":0},{"load":47.03,"year":2020,"month":2,"day":29,"hour":0,"minute":0},{"load":50.89,"year":2020,"month":3,"day":1,"hour":0,"minute":0},{"load":39.84,"year":2020,"month":3,"day":2,"hour":0,"minute":0},{"load":48.55,"year":2020,"month":3,"day":3,"hour":0,"minute":0},{"load":54.28,"year":2020,"month":3,"day":4,"hour":0,"minute":0},{"load":24.52,"year":2020,"month":3,"day":5,"hour":0,"minute":0},{"load":36.45,"year":2020,"month":3,"day":6,"hour":0,"minute":0},{"load":35.05,"year":2020,"month":3,"day":7,"hour":0,"minute":0},{"load":18.47,"year":2020,"month":3,"day":8,"hour":0,"minute":0},{"load":58.52,"year":2020,"month":3,"day":9,"hour":0,"minute":0},{"load":41.14,"year":2020,"month":3,"day":10,"hour":0,"minute":0},{"load":42.74,"year":2020,"month":3,"day":11,"hour":0,"minute":0},{"load":54.73,"year":2020,"month":3,"day":12,"hour":0,"minute":0},{"load":23.45,"year":2020,"month":3,"day":13,"hour":0,"minute":0},{"load":55.12,"year":2020,"month":3,"day":14,"hour":0,"minute":0},{"load":47.33,"year":2020,"month":3,"day":15,"hour":0,"minute":0},{"load":20.84,"year":2020,"month":3,"day":16,"hour":0,"minute":0},{"load":60.22,"year":2020,"month":3,"day":17,"hour":0,"minute":0},{"load":38.98,"year":2020,"month":3,"day":18,"hour":0,"minute":0},{"load":59.29,"year":2020,"month":3,"day":19,"hour":0,"minute":0},{"load":23.69,"year":2020,"month":3,"day":20,"hour":0,"minute":0},{"load":45.61,"year":2020,"month":3,"day":21,"hour":0,"minute":0},{"load":22.03,"year":2020,"month":3,"day":22,"hour":0,"minute":0},{"load":22.81,"year":2020,"month":3,"day":23,"hour":0,"minute":0},{"load":65.09,"year":2020,"month":3,"day":24,"hour":0,"minute":0},{"load":39.38,"year":2020,"month":3,"day":25,"hour":0,"minute":0},{"load":34.56,"year":2020,"month":3,"day":26,"hour":0,"minute":0},{"load":50.35,"year":2020,"month":3,"day":27,"hour":0,"minute":0},{"load":31.03,"year":2020,"month":3,"day":28,"hour":0,"minute":0},{"load":51.73,"year":2020,"month":3,"day":29,"hour":0,"minute":0},{"load":40.89,"year":2020,"month":3,"day":30,"hour":0,"minute":0},{"load":64.64,"year":2020,"month":3,"day":31,"hour":0,"minute":0},{"load":28.41,"year":2020,"month":4,"day":1,"hour":0,"minute":0},{"load":56.89,"year":2020,"month":4,"day":2,"hour":0,"minute":0},{"load":41.85,"year":2020,"month":4,"day":3,"hour":0,"minute":0},{"load":41.24,"year":2020,"month":4,"day":4,"hour":0,"minute":0},{"load":26.86,"year":2020,"month":4,"day":5,"hour":0,"minute":0},{"load":40.83,"year":2020,"month":4,"day":6,"hour":0,"minute":0},{"load":59.65,"year":2020,"month":4,"day":7,"hour":0,"minute":0},{"load":34.4,"year":2020,"month":4,"day":8,"hour":0,"minute":0},{"load":66.36,"year":2020,"month":4,"day":9,"hour":0,"minute":0},{"load":66.64,"year":2020,"month":4,"day":10,"hour":0,"minute":0},{"load":33.56,"year":2020,"month":4,"day":11,"hour":0,"minute":0},{"load":20.23,"year":2020,"month":4,"day":12,"hour":0,"minute":0},{"load":54.13,"year":2020,"month":4,"day":13,"hour":0,"minute":0},{"load":38.69,"year":2020,"month":4,"day":14,"hour":0,"minute":0},{"load":33.34,"year":2020,"month":4,"day":15,"hour":0,"minute":0},{"load":44.67,"year":2020,"month":4,"day":16,"hour":0,"minute":0},{"load":17.46,"year":2020,"month":4,"day":17,"hour":0,"minute":0},{"load":39.25,"year":2020,"month":4,"day":18,"hour":0,"minute":0},{"load":49.73,"year":2020,"month":4,"day":19,"hour":0,"minute":0},{"load":57.52,"year":2020,"month":4,"day":20,"hour":0,"minute":0},{"load":47.97,"year":2020,"month":4,"day":21,"hour":0,"minute":0},{"load":36.41,"year":2020,"month":4,"day":22,"hour":0,"minute":0},{"load":37.39,"year":2020,"month":4,"day":23,"hour":0,"minute":0},{"load":26.73,"year":2020,"month":4,"day":24,"hour":0,"minute":0},{"load":17.99,"year":2020,"month":4,"day":25,"hour":0,"minute":0},{"load":48.2,"year":2020,"month":4,"day":26,"hour":0,"minute":0},{"load":21.47,"year":2020,"month":4,"day":27,"hour":0,"minute":0},{"load":38.01,"year":2020,"month":4,"day":28,"hour":0,"minute":0},{"load":25.59,"year":2020,"month":4,"day":29,"hour":0,"minute":0}],"io.grdf.month":[{"load":1347.74,"year":2020,"month":1,"day":0,"hour":0,"minute":0},{"load":1282.25,"year":2020,"month":2,"day":0,"hour":0,"minute":0},{"load":1279.74,"year":2020,"month":3,"day":0,"hour":0,"minute":0},{"load":1123.06,"year":2020,"month":4,"day":1,"hour":0,"minute":0}],"io.grdf.year":[{"load":5032.79,"year":2020,"month":1,"day":1,"hour":0,"minute":0}]}
\ No newline at end of file
+{"com.grandlyon.grdf.day":[{"load":52.41,"year":2020,"month":1,"day":1,"hour":0,"minute":0},{"load":58.73,"year":2020,"month":1,"day":2,"hour":0,"minute":0},{"load":41.05,"year":2020,"month":1,"day":3,"hour":0,"minute":0},{"load":17.93,"year":2020,"month":1,"day":4,"hour":0,"minute":0},{"load":41.19,"year":2020,"month":1,"day":5,"hour":0,"minute":0},{"load":53.38,"year":2020,"month":1,"day":6,"hour":0,"minute":0},{"load":37.93,"year":2020,"month":1,"day":7,"hour":0,"minute":0},{"load":39.38,"year":2020,"month":1,"day":8,"hour":0,"minute":0},{"load":65.88,"year":2020,"month":1,"day":9,"hour":0,"minute":0},{"load":45.74,"year":2020,"month":1,"day":10,"hour":0,"minute":0},{"load":17.4,"year":2020,"month":1,"day":11,"hour":0,"minute":0},{"load":33.71,"year":2020,"month":1,"day":12,"hour":0,"minute":0},{"load":36.05,"year":2020,"month":1,"day":13,"hour":0,"minute":0},{"load":62.06,"year":2020,"month":1,"day":14,"hour":0,"minute":0},{"load":34.61,"year":2020,"month":1,"day":15,"hour":0,"minute":0},{"load":64.29,"year":2020,"month":1,"day":16,"hour":0,"minute":0},{"load":25.38,"year":2020,"month":1,"day":17,"hour":0,"minute":0},{"load":65.92,"year":2020,"month":1,"day":18,"hour":0,"minute":0},{"load":22.58,"year":2020,"month":1,"day":19,"hour":0,"minute":0},{"load":32.96,"year":2020,"month":1,"day":20,"hour":0,"minute":0},{"load":30.61,"year":2020,"month":1,"day":21,"hour":0,"minute":0},{"load":26.95,"year":2020,"month":1,"day":22,"hour":0,"minute":0},{"load":44.24,"year":2020,"month":1,"day":23,"hour":0,"minute":0},{"load":54.35,"year":2020,"month":1,"day":24,"hour":0,"minute":0},{"load":37.44,"year":2020,"month":1,"day":25,"hour":0,"minute":0},{"load":28.66,"year":2020,"month":1,"day":26,"hour":0,"minute":0},{"load":59.73,"year":2020,"month":1,"day":27,"hour":0,"minute":0},{"load":58.37,"year":2020,"month":1,"day":28,"hour":0,"minute":0},{"load":16.59,"year":2020,"month":1,"day":29,"hour":0,"minute":0},{"load":58.36,"year":2020,"month":1,"day":30,"hour":0,"minute":0},{"load":62.08,"year":2020,"month":1,"day":31,"hour":0,"minute":0},{"load":21.78,"year":2020,"month":2,"day":1,"hour":0,"minute":0},{"load":54.82,"year":2020,"month":2,"day":2,"hour":0,"minute":0},{"load":51.54,"year":2020,"month":2,"day":3,"hour":0,"minute":0},{"load":45.73,"year":2020,"month":2,"day":4,"hour":0,"minute":0},{"load":36.5,"year":2020,"month":2,"day":5,"hour":0,"minute":0},{"load":24.41,"year":2020,"month":2,"day":6,"hour":0,"minute":0},{"load":64.03,"year":2020,"month":2,"day":7,"hour":0,"minute":0},{"load":26.36,"year":2020,"month":2,"day":8,"hour":0,"minute":0},{"load":66.75,"year":2020,"month":2,"day":9,"hour":0,"minute":0},{"load":26.88,"year":2020,"month":2,"day":10,"hour":0,"minute":0},{"load":38.9,"year":2020,"month":2,"day":11,"hour":0,"minute":0},{"load":33.79,"year":2020,"month":2,"day":12,"hour":0,"minute":0},{"load":46.06,"year":2020,"month":2,"day":13,"hour":0,"minute":0},{"load":40.21,"year":2020,"month":2,"day":14,"hour":0,"minute":0},{"load":32.47,"year":2020,"month":2,"day":15,"hour":0,"minute":0},{"load":63.28,"year":2020,"month":2,"day":16,"hour":0,"minute":0},{"load":24.66,"year":2020,"month":2,"day":17,"hour":0,"minute":0},{"load":61.52,"year":2020,"month":2,"day":18,"hour":0,"minute":0},{"load":51.06,"year":2020,"month":2,"day":19,"hour":0,"minute":0},{"load":30.18,"year":2020,"month":2,"day":20,"hour":0,"minute":0},{"load":31.51,"year":2020,"month":2,"day":21,"hour":0,"minute":0},{"load":60.22,"year":2020,"month":2,"day":22,"hour":0,"minute":0},{"load":49.48,"year":2020,"month":2,"day":23,"hour":0,"minute":0},{"load":24.37,"year":2020,"month":2,"day":24,"hour":0,"minute":0},{"load":40.91,"year":2020,"month":2,"day":25,"hour":0,"minute":0},{"load":33.09,"year":2020,"month":2,"day":26,"hour":0,"minute":0},{"load":58.14,"year":2020,"month":2,"day":27,"hour":0,"minute":0},{"load":67.46,"year":2020,"month":2,"day":28,"hour":0,"minute":0},{"load":47.03,"year":2020,"month":2,"day":29,"hour":0,"minute":0},{"load":50.89,"year":2020,"month":3,"day":1,"hour":0,"minute":0},{"load":39.84,"year":2020,"month":3,"day":2,"hour":0,"minute":0},{"load":48.55,"year":2020,"month":3,"day":3,"hour":0,"minute":0},{"load":54.28,"year":2020,"month":3,"day":4,"hour":0,"minute":0},{"load":24.52,"year":2020,"month":3,"day":5,"hour":0,"minute":0},{"load":36.45,"year":2020,"month":3,"day":6,"hour":0,"minute":0},{"load":35.05,"year":2020,"month":3,"day":7,"hour":0,"minute":0},{"load":18.47,"year":2020,"month":3,"day":8,"hour":0,"minute":0},{"load":58.52,"year":2020,"month":3,"day":9,"hour":0,"minute":0},{"load":41.14,"year":2020,"month":3,"day":10,"hour":0,"minute":0},{"load":42.74,"year":2020,"month":3,"day":11,"hour":0,"minute":0},{"load":54.73,"year":2020,"month":3,"day":12,"hour":0,"minute":0},{"load":23.45,"year":2020,"month":3,"day":13,"hour":0,"minute":0},{"load":55.12,"year":2020,"month":3,"day":14,"hour":0,"minute":0},{"load":47.33,"year":2020,"month":3,"day":15,"hour":0,"minute":0},{"load":20.84,"year":2020,"month":3,"day":16,"hour":0,"minute":0},{"load":60.22,"year":2020,"month":3,"day":17,"hour":0,"minute":0},{"load":38.98,"year":2020,"month":3,"day":18,"hour":0,"minute":0},{"load":59.29,"year":2020,"month":3,"day":19,"hour":0,"minute":0},{"load":23.69,"year":2020,"month":3,"day":20,"hour":0,"minute":0},{"load":45.61,"year":2020,"month":3,"day":21,"hour":0,"minute":0},{"load":22.03,"year":2020,"month":3,"day":22,"hour":0,"minute":0},{"load":22.81,"year":2020,"month":3,"day":23,"hour":0,"minute":0},{"load":65.09,"year":2020,"month":3,"day":24,"hour":0,"minute":0},{"load":39.38,"year":2020,"month":3,"day":25,"hour":0,"minute":0},{"load":34.56,"year":2020,"month":3,"day":26,"hour":0,"minute":0},{"load":50.35,"year":2020,"month":3,"day":27,"hour":0,"minute":0},{"load":31.03,"year":2020,"month":3,"day":28,"hour":0,"minute":0},{"load":51.73,"year":2020,"month":3,"day":29,"hour":0,"minute":0},{"load":40.89,"year":2020,"month":3,"day":30,"hour":0,"minute":0},{"load":64.64,"year":2020,"month":3,"day":31,"hour":0,"minute":0},{"load":28.41,"year":2020,"month":4,"day":1,"hour":0,"minute":0},{"load":56.89,"year":2020,"month":4,"day":2,"hour":0,"minute":0},{"load":41.85,"year":2020,"month":4,"day":3,"hour":0,"minute":0},{"load":41.24,"year":2020,"month":4,"day":4,"hour":0,"minute":0},{"load":26.86,"year":2020,"month":4,"day":5,"hour":0,"minute":0},{"load":40.83,"year":2020,"month":4,"day":6,"hour":0,"minute":0},{"load":59.65,"year":2020,"month":4,"day":7,"hour":0,"minute":0},{"load":34.4,"year":2020,"month":4,"day":8,"hour":0,"minute":0},{"load":66.36,"year":2020,"month":4,"day":9,"hour":0,"minute":0},{"load":66.64,"year":2020,"month":4,"day":10,"hour":0,"minute":0},{"load":33.56,"year":2020,"month":4,"day":11,"hour":0,"minute":0},{"load":20.23,"year":2020,"month":4,"day":12,"hour":0,"minute":0},{"load":54.13,"year":2020,"month":4,"day":13,"hour":0,"minute":0},{"load":38.69,"year":2020,"month":4,"day":14,"hour":0,"minute":0},{"load":33.34,"year":2020,"month":4,"day":15,"hour":0,"minute":0},{"load":44.67,"year":2020,"month":4,"day":16,"hour":0,"minute":0},{"load":17.46,"year":2020,"month":4,"day":17,"hour":0,"minute":0},{"load":39.25,"year":2020,"month":4,"day":18,"hour":0,"minute":0},{"load":49.73,"year":2020,"month":4,"day":19,"hour":0,"minute":0},{"load":57.52,"year":2020,"month":4,"day":20,"hour":0,"minute":0},{"load":47.97,"year":2020,"month":4,"day":21,"hour":0,"minute":0},{"load":36.41,"year":2020,"month":4,"day":22,"hour":0,"minute":0},{"load":37.39,"year":2020,"month":4,"day":23,"hour":0,"minute":0},{"load":26.73,"year":2020,"month":4,"day":24,"hour":0,"minute":0},{"load":17.99,"year":2020,"month":4,"day":25,"hour":0,"minute":0},{"load":48.2,"year":2020,"month":4,"day":26,"hour":0,"minute":0},{"load":21.47,"year":2020,"month":4,"day":27,"hour":0,"minute":0},{"load":38.01,"year":2020,"month":4,"day":28,"hour":0,"minute":0},{"load":25.59,"year":2020,"month":4,"day":29,"hour":0,"minute":0}],"com.grandlyon.grdf.month":[{"load":1347.74,"year":2020,"month":1,"day":0,"hour":0,"minute":0},{"load":1282.25,"year":2020,"month":2,"day":0,"hour":0,"minute":0},{"load":1279.74,"year":2020,"month":3,"day":0,"hour":0,"minute":0},{"load":1123.06,"year":2020,"month":4,"day":1,"hour":0,"minute":0}],"com.grandlyon.grdf.year":[{"load":5032.79,"year":2020,"month":1,"day":1,"hour":0,"minute":0}]}
\ No newline at end of file
diff --git a/test/data/dayData-water.json b/test/data/dayData-water.json
index 70f4280c95d468886a2dc995876168129cfb6e7b..268c9df73a7b26381bc1e8775894a04b73fd23fe 100644
--- a/test/data/dayData-water.json
+++ b/test/data/dayData-water.json
@@ -1 +1 @@
-{"io.egl.day":[{"load":299.91,"year":2020,"month":1,"day":1,"hour":0,"minute":0},{"load":296.56,"year":2020,"month":1,"day":2,"hour":0,"minute":0},{"load":240.03,"year":2020,"month":1,"day":3,"hour":0,"minute":0},{"load":236.24,"year":2020,"month":1,"day":4,"hour":0,"minute":0},{"load":291.67,"year":2020,"month":1,"day":5,"hour":0,"minute":0},{"load":210.55,"year":2020,"month":1,"day":6,"hour":0,"minute":0},{"load":203.23,"year":2020,"month":1,"day":7,"hour":0,"minute":0},{"load":281.99,"year":2020,"month":1,"day":8,"hour":0,"minute":0},{"load":250.63,"year":2020,"month":1,"day":9,"hour":0,"minute":0},{"load":259.45,"year":2020,"month":1,"day":10,"hour":0,"minute":0},{"load":238.95,"year":2020,"month":1,"day":11,"hour":0,"minute":0},{"load":236.73,"year":2020,"month":1,"day":12,"hour":0,"minute":0},{"load":280.6,"year":2020,"month":1,"day":13,"hour":0,"minute":0},{"load":205.89,"year":2020,"month":1,"day":14,"hour":0,"minute":0},{"load":254.44,"year":2020,"month":1,"day":15,"hour":0,"minute":0},{"load":292.74,"year":2020,"month":1,"day":16,"hour":0,"minute":0},{"load":296,"year":2020,"month":1,"day":17,"hour":0,"minute":0},{"load":288.7,"year":2020,"month":1,"day":18,"hour":0,"minute":0},{"load":223.4,"year":2020,"month":1,"day":19,"hour":0,"minute":0},{"load":211.4,"year":2020,"month":1,"day":20,"hour":0,"minute":0},{"load":271.46,"year":2020,"month":1,"day":21,"hour":0,"minute":0},{"load":211.2,"year":2020,"month":1,"day":22,"hour":0,"minute":0},{"load":235.32,"year":2020,"month":1,"day":23,"hour":0,"minute":0},{"load":232.02,"year":2020,"month":1,"day":24,"hour":0,"minute":0},{"load":259.27,"year":2020,"month":1,"day":25,"hour":0,"minute":0},{"load":243.77,"year":2020,"month":1,"day":26,"hour":0,"minute":0},{"load":256.47,"year":2020,"month":1,"day":27,"hour":0,"minute":0},{"load":228.03,"year":2020,"month":1,"day":28,"hour":0,"minute":0},{"load":267.64,"year":2020,"month":1,"day":29,"hour":0,"minute":0},{"load":259.33,"year":2020,"month":1,"day":30,"hour":0,"minute":0},{"load":276.25,"year":2020,"month":1,"day":31,"hour":0,"minute":0},{"load":210.73,"year":2020,"month":2,"day":1,"hour":0,"minute":0},{"load":287.85,"year":2020,"month":2,"day":2,"hour":0,"minute":0},{"load":210.99,"year":2020,"month":2,"day":3,"hour":0,"minute":0},{"load":208.92,"year":2020,"month":2,"day":4,"hour":0,"minute":0},{"load":295.65,"year":2020,"month":2,"day":5,"hour":0,"minute":0},{"load":296.67,"year":2020,"month":2,"day":6,"hour":0,"minute":0},{"load":264.52,"year":2020,"month":2,"day":7,"hour":0,"minute":0},{"load":299.73,"year":2020,"month":2,"day":8,"hour":0,"minute":0},{"load":258.76,"year":2020,"month":2,"day":9,"hour":0,"minute":0},{"load":275.98,"year":2020,"month":2,"day":10,"hour":0,"minute":0},{"load":239.97,"year":2020,"month":2,"day":11,"hour":0,"minute":0},{"load":205.36,"year":2020,"month":2,"day":12,"hour":0,"minute":0},{"load":207.2,"year":2020,"month":2,"day":13,"hour":0,"minute":0},{"load":291.79,"year":2020,"month":2,"day":14,"hour":0,"minute":0},{"load":222.06,"year":2020,"month":2,"day":15,"hour":0,"minute":0},{"load":288.42,"year":2020,"month":2,"day":16,"hour":0,"minute":0},{"load":231.57,"year":2020,"month":2,"day":17,"hour":0,"minute":0},{"load":234.53,"year":2020,"month":2,"day":18,"hour":0,"minute":0},{"load":233.43,"year":2020,"month":2,"day":19,"hour":0,"minute":0},{"load":267.26,"year":2020,"month":2,"day":20,"hour":0,"minute":0},{"load":299.93,"year":2020,"month":2,"day":21,"hour":0,"minute":0},{"load":297.36,"year":2020,"month":2,"day":22,"hour":0,"minute":0},{"load":241.96,"year":2020,"month":2,"day":23,"hour":0,"minute":0},{"load":220.85,"year":2020,"month":2,"day":24,"hour":0,"minute":0},{"load":278.39,"year":2020,"month":2,"day":25,"hour":0,"minute":0},{"load":260.37,"year":2020,"month":2,"day":26,"hour":0,"minute":0},{"load":267.83,"year":2020,"month":2,"day":27,"hour":0,"minute":0},{"load":281.76,"year":2020,"month":2,"day":28,"hour":0,"minute":0},{"load":247.64,"year":2020,"month":2,"day":29,"hour":0,"minute":0},{"load":271.26,"year":2020,"month":3,"day":1,"hour":0,"minute":0},{"load":219.47,"year":2020,"month":3,"day":2,"hour":0,"minute":0},{"load":202.65,"year":2020,"month":3,"day":3,"hour":0,"minute":0},{"load":280.34,"year":2020,"month":3,"day":4,"hour":0,"minute":0},{"load":280.48,"year":2020,"month":3,"day":5,"hour":0,"minute":0},{"load":294.57,"year":2020,"month":3,"day":6,"hour":0,"minute":0},{"load":230.79,"year":2020,"month":3,"day":7,"hour":0,"minute":0},{"load":295.34,"year":2020,"month":3,"day":8,"hour":0,"minute":0},{"load":283.26,"year":2020,"month":3,"day":9,"hour":0,"minute":0},{"load":283.79,"year":2020,"month":3,"day":10,"hour":0,"minute":0},{"load":251.3,"year":2020,"month":3,"day":11,"hour":0,"minute":0},{"load":297.2,"year":2020,"month":3,"day":12,"hour":0,"minute":0},{"load":226.87,"year":2020,"month":3,"day":13,"hour":0,"minute":0},{"load":214.02,"year":2020,"month":3,"day":14,"hour":0,"minute":0},{"load":269.95,"year":2020,"month":3,"day":15,"hour":0,"minute":0},{"load":235.28,"year":2020,"month":3,"day":16,"hour":0,"minute":0},{"load":251.1,"year":2020,"month":3,"day":17,"hour":0,"minute":0},{"load":296.24,"year":2020,"month":3,"day":18,"hour":0,"minute":0},{"load":296.49,"year":2020,"month":3,"day":19,"hour":0,"minute":0},{"load":252.83,"year":2020,"month":3,"day":20,"hour":0,"minute":0},{"load":283.27,"year":2020,"month":3,"day":21,"hour":0,"minute":0},{"load":216.5,"year":2020,"month":3,"day":22,"hour":0,"minute":0},{"load":213.42,"year":2020,"month":3,"day":23,"hour":0,"minute":0},{"load":224.05,"year":2020,"month":3,"day":24,"hour":0,"minute":0},{"load":214.4,"year":2020,"month":3,"day":25,"hour":0,"minute":0},{"load":239.42,"year":2020,"month":3,"day":26,"hour":0,"minute":0},{"load":252.32,"year":2020,"month":3,"day":27,"hour":0,"minute":0},{"load":222.37,"year":2020,"month":3,"day":28,"hour":0,"minute":0},{"load":222.35,"year":2020,"month":3,"day":29,"hour":0,"minute":0},{"load":261.47,"year":2020,"month":3,"day":30,"hour":0,"minute":0},{"load":220.18,"year":2020,"month":3,"day":31,"hour":0,"minute":0},{"load":258.52,"year":2020,"month":4,"day":1,"hour":0,"minute":0},{"load":257.72,"year":2020,"month":4,"day":2,"hour":0,"minute":0},{"load":230.25,"year":2020,"month":4,"day":3,"hour":0,"minute":0},{"load":229.2,"year":2020,"month":4,"day":4,"hour":0,"minute":0},{"load":294.61,"year":2020,"month":4,"day":5,"hour":0,"minute":0},{"load":211.77,"year":2020,"month":4,"day":6,"hour":0,"minute":0},{"load":281.43,"year":2020,"month":4,"day":7,"hour":0,"minute":0},{"load":226.14,"year":2020,"month":4,"day":8,"hour":0,"minute":0},{"load":233,"year":2020,"month":4,"day":9,"hour":0,"minute":0},{"load":260.06,"year":2020,"month":4,"day":10,"hour":0,"minute":0},{"load":266.91,"year":2020,"month":4,"day":11,"hour":0,"minute":0},{"load":285.71,"year":2020,"month":4,"day":12,"hour":0,"minute":0},{"load":245.52,"year":2020,"month":4,"day":13,"hour":0,"minute":0},{"load":225.5,"year":2020,"month":4,"day":14,"hour":0,"minute":0},{"load":213.33,"year":2020,"month":4,"day":15,"hour":0,"minute":0},{"load":294.27,"year":2020,"month":4,"day":16,"hour":0,"minute":0},{"load":260.93,"year":2020,"month":4,"day":17,"hour":0,"minute":0},{"load":269.84,"year":2020,"month":4,"day":18,"hour":0,"minute":0},{"load":269.08,"year":2020,"month":4,"day":19,"hour":0,"minute":0},{"load":254.89,"year":2020,"month":4,"day":20,"hour":0,"minute":0},{"load":221.99,"year":2020,"month":4,"day":21,"hour":0,"minute":0},{"load":237.89,"year":2020,"month":4,"day":22,"hour":0,"minute":0},{"load":205.67,"year":2020,"month":4,"day":23,"hour":0,"minute":0},{"load":238.43,"year":2020,"month":4,"day":24,"hour":0,"minute":0},{"load":263.61,"year":2020,"month":4,"day":25,"hour":0,"minute":0},{"load":200.89,"year":2020,"month":4,"day":26,"hour":0,"minute":0},{"load":296.27,"year":2020,"month":4,"day":27,"hour":0,"minute":0},{"load":210.59,"year":2020,"month":4,"day":28,"hour":0,"minute":0},{"load":251.88,"year":2020,"month":4,"day":29,"hour":0,"minute":0}],"io.egl.month":[{"load":8050.6,"year":2020,"month":1,"day":0,"hour":0,"minute":0},{"load":7488.01,"year":2020,"month":2,"day":0,"hour":0,"minute":0},{"load":7790.24,"year":2020,"month":3,"day":0,"hour":0,"minute":0},{"load":6937.38,"year":2020,"month":4,"day":1,"hour":0,"minute":0}],"io.egl.year":[{"load":30266.23,"year":2020,"month":1,"day":1,"hour":0,"minute":0}]}
\ No newline at end of file
+{"com.grandlyon.egl.day":[{"load":299.91,"year":2020,"month":1,"day":1,"hour":0,"minute":0},{"load":296.56,"year":2020,"month":1,"day":2,"hour":0,"minute":0},{"load":240.03,"year":2020,"month":1,"day":3,"hour":0,"minute":0},{"load":236.24,"year":2020,"month":1,"day":4,"hour":0,"minute":0},{"load":291.67,"year":2020,"month":1,"day":5,"hour":0,"minute":0},{"load":210.55,"year":2020,"month":1,"day":6,"hour":0,"minute":0},{"load":203.23,"year":2020,"month":1,"day":7,"hour":0,"minute":0},{"load":281.99,"year":2020,"month":1,"day":8,"hour":0,"minute":0},{"load":250.63,"year":2020,"month":1,"day":9,"hour":0,"minute":0},{"load":259.45,"year":2020,"month":1,"day":10,"hour":0,"minute":0},{"load":238.95,"year":2020,"month":1,"day":11,"hour":0,"minute":0},{"load":236.73,"year":2020,"month":1,"day":12,"hour":0,"minute":0},{"load":280.6,"year":2020,"month":1,"day":13,"hour":0,"minute":0},{"load":205.89,"year":2020,"month":1,"day":14,"hour":0,"minute":0},{"load":254.44,"year":2020,"month":1,"day":15,"hour":0,"minute":0},{"load":292.74,"year":2020,"month":1,"day":16,"hour":0,"minute":0},{"load":296,"year":2020,"month":1,"day":17,"hour":0,"minute":0},{"load":288.7,"year":2020,"month":1,"day":18,"hour":0,"minute":0},{"load":223.4,"year":2020,"month":1,"day":19,"hour":0,"minute":0},{"load":211.4,"year":2020,"month":1,"day":20,"hour":0,"minute":0},{"load":271.46,"year":2020,"month":1,"day":21,"hour":0,"minute":0},{"load":211.2,"year":2020,"month":1,"day":22,"hour":0,"minute":0},{"load":235.32,"year":2020,"month":1,"day":23,"hour":0,"minute":0},{"load":232.02,"year":2020,"month":1,"day":24,"hour":0,"minute":0},{"load":259.27,"year":2020,"month":1,"day":25,"hour":0,"minute":0},{"load":243.77,"year":2020,"month":1,"day":26,"hour":0,"minute":0},{"load":256.47,"year":2020,"month":1,"day":27,"hour":0,"minute":0},{"load":228.03,"year":2020,"month":1,"day":28,"hour":0,"minute":0},{"load":267.64,"year":2020,"month":1,"day":29,"hour":0,"minute":0},{"load":259.33,"year":2020,"month":1,"day":30,"hour":0,"minute":0},{"load":276.25,"year":2020,"month":1,"day":31,"hour":0,"minute":0},{"load":210.73,"year":2020,"month":2,"day":1,"hour":0,"minute":0},{"load":287.85,"year":2020,"month":2,"day":2,"hour":0,"minute":0},{"load":210.99,"year":2020,"month":2,"day":3,"hour":0,"minute":0},{"load":208.92,"year":2020,"month":2,"day":4,"hour":0,"minute":0},{"load":295.65,"year":2020,"month":2,"day":5,"hour":0,"minute":0},{"load":296.67,"year":2020,"month":2,"day":6,"hour":0,"minute":0},{"load":264.52,"year":2020,"month":2,"day":7,"hour":0,"minute":0},{"load":299.73,"year":2020,"month":2,"day":8,"hour":0,"minute":0},{"load":258.76,"year":2020,"month":2,"day":9,"hour":0,"minute":0},{"load":275.98,"year":2020,"month":2,"day":10,"hour":0,"minute":0},{"load":239.97,"year":2020,"month":2,"day":11,"hour":0,"minute":0},{"load":205.36,"year":2020,"month":2,"day":12,"hour":0,"minute":0},{"load":207.2,"year":2020,"month":2,"day":13,"hour":0,"minute":0},{"load":291.79,"year":2020,"month":2,"day":14,"hour":0,"minute":0},{"load":222.06,"year":2020,"month":2,"day":15,"hour":0,"minute":0},{"load":288.42,"year":2020,"month":2,"day":16,"hour":0,"minute":0},{"load":231.57,"year":2020,"month":2,"day":17,"hour":0,"minute":0},{"load":234.53,"year":2020,"month":2,"day":18,"hour":0,"minute":0},{"load":233.43,"year":2020,"month":2,"day":19,"hour":0,"minute":0},{"load":267.26,"year":2020,"month":2,"day":20,"hour":0,"minute":0},{"load":299.93,"year":2020,"month":2,"day":21,"hour":0,"minute":0},{"load":297.36,"year":2020,"month":2,"day":22,"hour":0,"minute":0},{"load":241.96,"year":2020,"month":2,"day":23,"hour":0,"minute":0},{"load":220.85,"year":2020,"month":2,"day":24,"hour":0,"minute":0},{"load":278.39,"year":2020,"month":2,"day":25,"hour":0,"minute":0},{"load":260.37,"year":2020,"month":2,"day":26,"hour":0,"minute":0},{"load":267.83,"year":2020,"month":2,"day":27,"hour":0,"minute":0},{"load":281.76,"year":2020,"month":2,"day":28,"hour":0,"minute":0},{"load":247.64,"year":2020,"month":2,"day":29,"hour":0,"minute":0},{"load":271.26,"year":2020,"month":3,"day":1,"hour":0,"minute":0},{"load":219.47,"year":2020,"month":3,"day":2,"hour":0,"minute":0},{"load":202.65,"year":2020,"month":3,"day":3,"hour":0,"minute":0},{"load":280.34,"year":2020,"month":3,"day":4,"hour":0,"minute":0},{"load":280.48,"year":2020,"month":3,"day":5,"hour":0,"minute":0},{"load":294.57,"year":2020,"month":3,"day":6,"hour":0,"minute":0},{"load":230.79,"year":2020,"month":3,"day":7,"hour":0,"minute":0},{"load":295.34,"year":2020,"month":3,"day":8,"hour":0,"minute":0},{"load":283.26,"year":2020,"month":3,"day":9,"hour":0,"minute":0},{"load":283.79,"year":2020,"month":3,"day":10,"hour":0,"minute":0},{"load":251.3,"year":2020,"month":3,"day":11,"hour":0,"minute":0},{"load":297.2,"year":2020,"month":3,"day":12,"hour":0,"minute":0},{"load":226.87,"year":2020,"month":3,"day":13,"hour":0,"minute":0},{"load":214.02,"year":2020,"month":3,"day":14,"hour":0,"minute":0},{"load":269.95,"year":2020,"month":3,"day":15,"hour":0,"minute":0},{"load":235.28,"year":2020,"month":3,"day":16,"hour":0,"minute":0},{"load":251.1,"year":2020,"month":3,"day":17,"hour":0,"minute":0},{"load":296.24,"year":2020,"month":3,"day":18,"hour":0,"minute":0},{"load":296.49,"year":2020,"month":3,"day":19,"hour":0,"minute":0},{"load":252.83,"year":2020,"month":3,"day":20,"hour":0,"minute":0},{"load":283.27,"year":2020,"month":3,"day":21,"hour":0,"minute":0},{"load":216.5,"year":2020,"month":3,"day":22,"hour":0,"minute":0},{"load":213.42,"year":2020,"month":3,"day":23,"hour":0,"minute":0},{"load":224.05,"year":2020,"month":3,"day":24,"hour":0,"minute":0},{"load":214.4,"year":2020,"month":3,"day":25,"hour":0,"minute":0},{"load":239.42,"year":2020,"month":3,"day":26,"hour":0,"minute":0},{"load":252.32,"year":2020,"month":3,"day":27,"hour":0,"minute":0},{"load":222.37,"year":2020,"month":3,"day":28,"hour":0,"minute":0},{"load":222.35,"year":2020,"month":3,"day":29,"hour":0,"minute":0},{"load":261.47,"year":2020,"month":3,"day":30,"hour":0,"minute":0},{"load":220.18,"year":2020,"month":3,"day":31,"hour":0,"minute":0},{"load":258.52,"year":2020,"month":4,"day":1,"hour":0,"minute":0},{"load":257.72,"year":2020,"month":4,"day":2,"hour":0,"minute":0},{"load":230.25,"year":2020,"month":4,"day":3,"hour":0,"minute":0},{"load":229.2,"year":2020,"month":4,"day":4,"hour":0,"minute":0},{"load":294.61,"year":2020,"month":4,"day":5,"hour":0,"minute":0},{"load":211.77,"year":2020,"month":4,"day":6,"hour":0,"minute":0},{"load":281.43,"year":2020,"month":4,"day":7,"hour":0,"minute":0},{"load":226.14,"year":2020,"month":4,"day":8,"hour":0,"minute":0},{"load":233,"year":2020,"month":4,"day":9,"hour":0,"minute":0},{"load":260.06,"year":2020,"month":4,"day":10,"hour":0,"minute":0},{"load":266.91,"year":2020,"month":4,"day":11,"hour":0,"minute":0},{"load":285.71,"year":2020,"month":4,"day":12,"hour":0,"minute":0},{"load":245.52,"year":2020,"month":4,"day":13,"hour":0,"minute":0},{"load":225.5,"year":2020,"month":4,"day":14,"hour":0,"minute":0},{"load":213.33,"year":2020,"month":4,"day":15,"hour":0,"minute":0},{"load":294.27,"year":2020,"month":4,"day":16,"hour":0,"minute":0},{"load":260.93,"year":2020,"month":4,"day":17,"hour":0,"minute":0},{"load":269.84,"year":2020,"month":4,"day":18,"hour":0,"minute":0},{"load":269.08,"year":2020,"month":4,"day":19,"hour":0,"minute":0},{"load":254.89,"year":2020,"month":4,"day":20,"hour":0,"minute":0},{"load":221.99,"year":2020,"month":4,"day":21,"hour":0,"minute":0},{"load":237.89,"year":2020,"month":4,"day":22,"hour":0,"minute":0},{"load":205.67,"year":2020,"month":4,"day":23,"hour":0,"minute":0},{"load":238.43,"year":2020,"month":4,"day":24,"hour":0,"minute":0},{"load":263.61,"year":2020,"month":4,"day":25,"hour":0,"minute":0},{"load":200.89,"year":2020,"month":4,"day":26,"hour":0,"minute":0},{"load":296.27,"year":2020,"month":4,"day":27,"hour":0,"minute":0},{"load":210.59,"year":2020,"month":4,"day":28,"hour":0,"minute":0},{"load":251.88,"year":2020,"month":4,"day":29,"hour":0,"minute":0}],"com.grandlyon.egl.month":[{"load":8050.6,"year":2020,"month":1,"day":0,"hour":0,"minute":0},{"load":7488.01,"year":2020,"month":2,"day":0,"hour":0,"minute":0},{"load":7790.24,"year":2020,"month":3,"day":0,"hour":0,"minute":0},{"load":6937.38,"year":2020,"month":4,"day":1,"hour":0,"minute":0}],"com.grandlyon.egl.year":[{"load":30266.23,"year":2020,"month":1,"day":1,"hour":0,"minute":0}]}
\ No newline at end of file
diff --git a/test/data/dayData.json b/test/data/dayData.json
index 9a871b21ed3d5ba81579a0b50a78d2f36dcef4d9..9f2082015db2c64b09c79cfe0b1ac22be300844b 100644
--- a/test/data/dayData.json
+++ b/test/data/dayData.json
@@ -1 +1 @@
-{"io.enedis.day":[{"load":5.25,"year":2020,"month":1,"day":1,"hour":0,"minute":0},{"load":3.76,"year":2020,"month":1,"day":2,"hour":0,"minute":0},{"load":8.03,"year":2020,"month":1,"day":3,"hour":0,"minute":0},{"load":5.32,"year":2020,"month":1,"day":4,"hour":0,"minute":0},{"load":8.72,"year":2020,"month":1,"day":5,"hour":0,"minute":0},{"load":8.17,"year":2020,"month":1,"day":6,"hour":0,"minute":0},{"load":6.08,"year":2020,"month":1,"day":7,"hour":0,"minute":0},{"load":4.06,"year":2020,"month":1,"day":8,"hour":0,"minute":0},{"load":4.82,"year":2020,"month":1,"day":9,"hour":0,"minute":0},{"load":7.5,"year":2020,"month":1,"day":10,"hour":0,"minute":0},{"load":6.21,"year":2020,"month":1,"day":11,"hour":0,"minute":0},{"load":4.63,"year":2020,"month":1,"day":12,"hour":0,"minute":0},{"load":4.32,"year":2020,"month":1,"day":13,"hour":0,"minute":0},{"load":8.79,"year":2020,"month":1,"day":14,"hour":0,"minute":0},{"load":7.88,"year":2020,"month":1,"day":15,"hour":0,"minute":0},{"load":4.1,"year":2020,"month":1,"day":16,"hour":0,"minute":0},{"load":5.09,"year":2020,"month":1,"day":17,"hour":0,"minute":0},{"load":8.58,"year":2020,"month":1,"day":18,"hour":0,"minute":0},{"load":9.97,"year":2020,"month":1,"day":19,"hour":0,"minute":0},{"load":6.68,"year":2020,"month":1,"day":20,"hour":0,"minute":0},{"load":9.13,"year":2020,"month":1,"day":21,"hour":0,"minute":0},{"load":4.77,"year":2020,"month":1,"day":22,"hour":0,"minute":0},{"load":3.6,"year":2020,"month":1,"day":23,"hour":0,"minute":0},{"load":8.33,"year":2020,"month":1,"day":24,"hour":0,"minute":0},{"load":3.42,"year":2020,"month":1,"day":25,"hour":0,"minute":0},{"load":8.46,"year":2020,"month":1,"day":26,"hour":0,"minute":0},{"load":5.85,"year":2020,"month":1,"day":27,"hour":0,"minute":0},{"load":3.01,"year":2020,"month":1,"day":28,"hour":0,"minute":0},{"load":8.06,"year":2020,"month":1,"day":29,"hour":0,"minute":0},{"load":6.39,"year":2020,"month":1,"day":30,"hour":0,"minute":0},{"load":6.9,"year":2020,"month":1,"day":31,"hour":0,"minute":0},{"load":3.9,"year":2020,"month":2,"day":1,"hour":0,"minute":0},{"load":8.07,"year":2020,"month":2,"day":2,"hour":0,"minute":0},{"load":9.85,"year":2020,"month":2,"day":3,"hour":0,"minute":0},{"load":7.23,"year":2020,"month":2,"day":4,"hour":0,"minute":0},{"load":6.05,"year":2020,"month":2,"day":5,"hour":0,"minute":0},{"load":8.02,"year":2020,"month":2,"day":6,"hour":0,"minute":0},{"load":8.45,"year":2020,"month":2,"day":7,"hour":0,"minute":0},{"load":7.01,"year":2020,"month":2,"day":8,"hour":0,"minute":0},{"load":6.36,"year":2020,"month":2,"day":9,"hour":0,"minute":0},{"load":3.07,"year":2020,"month":2,"day":10,"hour":0,"minute":0},{"load":4.03,"year":2020,"month":2,"day":11,"hour":0,"minute":0},{"load":7.2,"year":2020,"month":2,"day":12,"hour":0,"minute":0},{"load":3.66,"year":2020,"month":2,"day":13,"hour":0,"minute":0},{"load":8.3,"year":2020,"month":2,"day":14,"hour":0,"minute":0},{"load":5.93,"year":2020,"month":2,"day":15,"hour":0,"minute":0},{"load":9.08,"year":2020,"month":2,"day":16,"hour":0,"minute":0},{"load":5.32,"year":2020,"month":2,"day":17,"hour":0,"minute":0},{"load":4.72,"year":2020,"month":2,"day":18,"hour":0,"minute":0},{"load":6,"year":2020,"month":2,"day":19,"hour":0,"minute":0},{"load":7.73,"year":2020,"month":2,"day":20,"hour":0,"minute":0},{"load":3.59,"year":2020,"month":2,"day":21,"hour":0,"minute":0},{"load":7.75,"year":2020,"month":2,"day":22,"hour":0,"minute":0},{"load":5.37,"year":2020,"month":2,"day":23,"hour":0,"minute":0},{"load":8.33,"year":2020,"month":2,"day":24,"hour":0,"minute":0},{"load":9.02,"year":2020,"month":2,"day":25,"hour":0,"minute":0},{"load":5.19,"year":2020,"month":2,"day":26,"hour":0,"minute":0},{"load":6.75,"year":2020,"month":2,"day":27,"hour":0,"minute":0},{"load":5.49,"year":2020,"month":2,"day":28,"hour":0,"minute":0},{"load":8.13,"year":2020,"month":2,"day":29,"hour":0,"minute":0},{"load":7.68,"year":2020,"month":3,"day":1,"hour":0,"minute":0},{"load":5.47,"year":2020,"month":3,"day":2,"hour":0,"minute":0},{"load":4.37,"year":2020,"month":3,"day":3,"hour":0,"minute":0},{"load":8.85,"year":2020,"month":3,"day":4,"hour":0,"minute":0},{"load":9.68,"year":2020,"month":3,"day":5,"hour":0,"minute":0},{"load":8.61,"year":2020,"month":3,"day":6,"hour":0,"minute":0},{"load":6.27,"year":2020,"month":3,"day":7,"hour":0,"minute":0},{"load":8.06,"year":2020,"month":3,"day":8,"hour":0,"minute":0},{"load":9.96,"year":2020,"month":3,"day":9,"hour":0,"minute":0},{"load":9.91,"year":2020,"month":3,"day":10,"hour":0,"minute":0},{"load":5.55,"year":2020,"month":3,"day":11,"hour":0,"minute":0},{"load":6.27,"year":2020,"month":3,"day":12,"hour":0,"minute":0},{"load":9.86,"year":2020,"month":3,"day":13,"hour":0,"minute":0},{"load":8.55,"year":2020,"month":3,"day":14,"hour":0,"minute":0},{"load":3.36,"year":2020,"month":3,"day":15,"hour":0,"minute":0},{"load":7.22,"year":2020,"month":3,"day":16,"hour":0,"minute":0},{"load":7.82,"year":2020,"month":3,"day":17,"hour":0,"minute":0},{"load":5.28,"year":2020,"month":3,"day":18,"hour":0,"minute":0},{"load":5.82,"year":2020,"month":3,"day":19,"hour":0,"minute":0},{"load":4.65,"year":2020,"month":3,"day":20,"hour":0,"minute":0},{"load":5.52,"year":2020,"month":3,"day":21,"hour":0,"minute":0},{"load":6.94,"year":2020,"month":3,"day":22,"hour":0,"minute":0},{"load":4.58,"year":2020,"month":3,"day":23,"hour":0,"minute":0},{"load":6.12,"year":2020,"month":3,"day":24,"hour":0,"minute":0},{"load":6.24,"year":2020,"month":3,"day":25,"hour":0,"minute":0},{"load":5.14,"year":2020,"month":3,"day":26,"hour":0,"minute":0},{"load":7.43,"year":2020,"month":3,"day":27,"hour":0,"minute":0},{"load":8.71,"year":2020,"month":3,"day":28,"hour":0,"minute":0},{"load":4.07,"year":2020,"month":3,"day":29,"hour":0,"minute":0},{"load":6.7,"year":2020,"month":3,"day":30,"hour":0,"minute":0},{"load":5.08,"year":2020,"month":3,"day":31,"hour":0,"minute":0},{"load":4.72,"year":2020,"month":4,"day":1,"hour":0,"minute":0},{"load":3.11,"year":2020,"month":4,"day":2,"hour":0,"minute":0},{"load":9.82,"year":2020,"month":4,"day":3,"hour":0,"minute":0},{"load":8.12,"year":2020,"month":4,"day":4,"hour":0,"minute":0},{"load":3.04,"year":2020,"month":4,"day":5,"hour":0,"minute":0},{"load":6.59,"year":2020,"month":4,"day":6,"hour":0,"minute":0},{"load":4.94,"year":2020,"month":4,"day":7,"hour":0,"minute":0},{"load":5.26,"year":2020,"month":4,"day":8,"hour":0,"minute":0},{"load":4.45,"year":2020,"month":4,"day":9,"hour":0,"minute":0},{"load":8.01,"year":2020,"month":4,"day":10,"hour":0,"minute":0},{"load":8.93,"year":2020,"month":4,"day":11,"hour":0,"minute":0},{"load":7.82,"year":2020,"month":4,"day":12,"hour":0,"minute":0},{"load":4.13,"year":2020,"month":4,"day":13,"hour":0,"minute":0},{"load":6.43,"year":2020,"month":4,"day":14,"hour":0,"minute":0},{"load":5.82,"year":2020,"month":4,"day":15,"hour":0,"minute":0},{"load":5.44,"year":2020,"month":4,"day":16,"hour":0,"minute":0},{"load":9.53,"year":2020,"month":4,"day":17,"hour":0,"minute":0},{"load":7.29,"year":2020,"month":4,"day":18,"hour":0,"minute":0},{"load":3.61,"year":2020,"month":4,"day":19,"hour":0,"minute":0},{"load":3.04,"year":2020,"month":4,"day":20,"hour":0,"minute":0},{"load":7.83,"year":2020,"month":4,"day":21,"hour":0,"minute":0},{"load":3.21,"year":2020,"month":4,"day":22,"hour":0,"minute":0},{"load":3.76,"year":2020,"month":4,"day":23,"hour":0,"minute":0},{"load":9.21,"year":2020,"month":4,"day":24,"hour":0,"minute":0},{"load":5.85,"year":2020,"month":4,"day":25,"hour":0,"minute":0},{"load":7.79,"year":2020,"month":4,"day":26,"hour":0,"minute":0},{"load":6.8,"year":2020,"month":4,"day":27,"hour":0,"minute":0},{"load":3.89,"year":2020,"month":4,"day":28,"hour":0,"minute":0},{"load":7.34,"year":2020,"month":4,"day":29,"hour":0,"minute":0}],"io.enedis.month":[{"load":199.78,"year":2020,"month":1,"day":0,"hour":0,"minute":0},{"load":193.38,"year":2020,"month":2,"day":0,"hour":0,"minute":0},{"load":206.81,"year":2020,"month":3,"day":0,"hour":0,"minute":0},{"load":171.06,"year":2020,"month":4,"day":1,"hour":0,"minute":0}],"io.enedis.year":[{"load":771.03,"year":2020,"month":1,"day":1,"hour":0,"minute":0}],"io.grdf.day":[{"load":52.41,"year":2020,"month":1,"day":1,"hour":0,"minute":0},{"load":58.73,"year":2020,"month":1,"day":2,"hour":0,"minute":0},{"load":41.05,"year":2020,"month":1,"day":3,"hour":0,"minute":0},{"load":17.93,"year":2020,"month":1,"day":4,"hour":0,"minute":0},{"load":41.19,"year":2020,"month":1,"day":5,"hour":0,"minute":0},{"load":53.38,"year":2020,"month":1,"day":6,"hour":0,"minute":0},{"load":37.93,"year":2020,"month":1,"day":7,"hour":0,"minute":0},{"load":39.38,"year":2020,"month":1,"day":8,"hour":0,"minute":0},{"load":65.88,"year":2020,"month":1,"day":9,"hour":0,"minute":0},{"load":45.74,"year":2020,"month":1,"day":10,"hour":0,"minute":0},{"load":17.4,"year":2020,"month":1,"day":11,"hour":0,"minute":0},{"load":33.71,"year":2020,"month":1,"day":12,"hour":0,"minute":0},{"load":36.05,"year":2020,"month":1,"day":13,"hour":0,"minute":0},{"load":62.06,"year":2020,"month":1,"day":14,"hour":0,"minute":0},{"load":34.61,"year":2020,"month":1,"day":15,"hour":0,"minute":0},{"load":64.29,"year":2020,"month":1,"day":16,"hour":0,"minute":0},{"load":25.38,"year":2020,"month":1,"day":17,"hour":0,"minute":0},{"load":65.92,"year":2020,"month":1,"day":18,"hour":0,"minute":0},{"load":22.58,"year":2020,"month":1,"day":19,"hour":0,"minute":0},{"load":32.96,"year":2020,"month":1,"day":20,"hour":0,"minute":0},{"load":30.61,"year":2020,"month":1,"day":21,"hour":0,"minute":0},{"load":26.95,"year":2020,"month":1,"day":22,"hour":0,"minute":0},{"load":44.24,"year":2020,"month":1,"day":23,"hour":0,"minute":0},{"load":54.35,"year":2020,"month":1,"day":24,"hour":0,"minute":0},{"load":37.44,"year":2020,"month":1,"day":25,"hour":0,"minute":0},{"load":28.66,"year":2020,"month":1,"day":26,"hour":0,"minute":0},{"load":59.73,"year":2020,"month":1,"day":27,"hour":0,"minute":0},{"load":58.37,"year":2020,"month":1,"day":28,"hour":0,"minute":0},{"load":16.59,"year":2020,"month":1,"day":29,"hour":0,"minute":0},{"load":58.36,"year":2020,"month":1,"day":30,"hour":0,"minute":0},{"load":62.08,"year":2020,"month":1,"day":31,"hour":0,"minute":0},{"load":21.78,"year":2020,"month":2,"day":1,"hour":0,"minute":0},{"load":54.82,"year":2020,"month":2,"day":2,"hour":0,"minute":0},{"load":51.54,"year":2020,"month":2,"day":3,"hour":0,"minute":0},{"load":45.73,"year":2020,"month":2,"day":4,"hour":0,"minute":0},{"load":36.5,"year":2020,"month":2,"day":5,"hour":0,"minute":0},{"load":24.41,"year":2020,"month":2,"day":6,"hour":0,"minute":0},{"load":64.03,"year":2020,"month":2,"day":7,"hour":0,"minute":0},{"load":26.36,"year":2020,"month":2,"day":8,"hour":0,"minute":0},{"load":66.75,"year":2020,"month":2,"day":9,"hour":0,"minute":0},{"load":26.88,"year":2020,"month":2,"day":10,"hour":0,"minute":0},{"load":38.9,"year":2020,"month":2,"day":11,"hour":0,"minute":0},{"load":33.79,"year":2020,"month":2,"day":12,"hour":0,"minute":0},{"load":46.06,"year":2020,"month":2,"day":13,"hour":0,"minute":0},{"load":40.21,"year":2020,"month":2,"day":14,"hour":0,"minute":0},{"load":32.47,"year":2020,"month":2,"day":15,"hour":0,"minute":0},{"load":63.28,"year":2020,"month":2,"day":16,"hour":0,"minute":0},{"load":24.66,"year":2020,"month":2,"day":17,"hour":0,"minute":0},{"load":61.52,"year":2020,"month":2,"day":18,"hour":0,"minute":0},{"load":51.06,"year":2020,"month":2,"day":19,"hour":0,"minute":0},{"load":30.18,"year":2020,"month":2,"day":20,"hour":0,"minute":0},{"load":31.51,"year":2020,"month":2,"day":21,"hour":0,"minute":0},{"load":60.22,"year":2020,"month":2,"day":22,"hour":0,"minute":0},{"load":49.48,"year":2020,"month":2,"day":23,"hour":0,"minute":0},{"load":24.37,"year":2020,"month":2,"day":24,"hour":0,"minute":0},{"load":40.91,"year":2020,"month":2,"day":25,"hour":0,"minute":0},{"load":33.09,"year":2020,"month":2,"day":26,"hour":0,"minute":0},{"load":58.14,"year":2020,"month":2,"day":27,"hour":0,"minute":0},{"load":67.46,"year":2020,"month":2,"day":28,"hour":0,"minute":0},{"load":47.03,"year":2020,"month":2,"day":29,"hour":0,"minute":0},{"load":50.89,"year":2020,"month":3,"day":1,"hour":0,"minute":0},{"load":39.84,"year":2020,"month":3,"day":2,"hour":0,"minute":0},{"load":48.55,"year":2020,"month":3,"day":3,"hour":0,"minute":0},{"load":54.28,"year":2020,"month":3,"day":4,"hour":0,"minute":0},{"load":24.52,"year":2020,"month":3,"day":5,"hour":0,"minute":0},{"load":36.45,"year":2020,"month":3,"day":6,"hour":0,"minute":0},{"load":35.05,"year":2020,"month":3,"day":7,"hour":0,"minute":0},{"load":18.47,"year":2020,"month":3,"day":8,"hour":0,"minute":0},{"load":58.52,"year":2020,"month":3,"day":9,"hour":0,"minute":0},{"load":41.14,"year":2020,"month":3,"day":10,"hour":0,"minute":0},{"load":42.74,"year":2020,"month":3,"day":11,"hour":0,"minute":0},{"load":54.73,"year":2020,"month":3,"day":12,"hour":0,"minute":0},{"load":23.45,"year":2020,"month":3,"day":13,"hour":0,"minute":0},{"load":55.12,"year":2020,"month":3,"day":14,"hour":0,"minute":0},{"load":47.33,"year":2020,"month":3,"day":15,"hour":0,"minute":0},{"load":20.84,"year":2020,"month":3,"day":16,"hour":0,"minute":0},{"load":60.22,"year":2020,"month":3,"day":17,"hour":0,"minute":0},{"load":38.98,"year":2020,"month":3,"day":18,"hour":0,"minute":0},{"load":59.29,"year":2020,"month":3,"day":19,"hour":0,"minute":0},{"load":23.69,"year":2020,"month":3,"day":20,"hour":0,"minute":0},{"load":45.61,"year":2020,"month":3,"day":21,"hour":0,"minute":0},{"load":22.03,"year":2020,"month":3,"day":22,"hour":0,"minute":0},{"load":22.81,"year":2020,"month":3,"day":23,"hour":0,"minute":0},{"load":65.09,"year":2020,"month":3,"day":24,"hour":0,"minute":0},{"load":39.38,"year":2020,"month":3,"day":25,"hour":0,"minute":0},{"load":34.56,"year":2020,"month":3,"day":26,"hour":0,"minute":0},{"load":50.35,"year":2020,"month":3,"day":27,"hour":0,"minute":0},{"load":31.03,"year":2020,"month":3,"day":28,"hour":0,"minute":0},{"load":51.73,"year":2020,"month":3,"day":29,"hour":0,"minute":0},{"load":40.89,"year":2020,"month":3,"day":30,"hour":0,"minute":0},{"load":64.64,"year":2020,"month":3,"day":31,"hour":0,"minute":0},{"load":28.41,"year":2020,"month":4,"day":1,"hour":0,"minute":0},{"load":56.89,"year":2020,"month":4,"day":2,"hour":0,"minute":0},{"load":41.85,"year":2020,"month":4,"day":3,"hour":0,"minute":0},{"load":41.24,"year":2020,"month":4,"day":4,"hour":0,"minute":0},{"load":26.86,"year":2020,"month":4,"day":5,"hour":0,"minute":0},{"load":40.83,"year":2020,"month":4,"day":6,"hour":0,"minute":0},{"load":59.65,"year":2020,"month":4,"day":7,"hour":0,"minute":0},{"load":34.4,"year":2020,"month":4,"day":8,"hour":0,"minute":0},{"load":66.36,"year":2020,"month":4,"day":9,"hour":0,"minute":0},{"load":66.64,"year":2020,"month":4,"day":10,"hour":0,"minute":0},{"load":33.56,"year":2020,"month":4,"day":11,"hour":0,"minute":0},{"load":20.23,"year":2020,"month":4,"day":12,"hour":0,"minute":0},{"load":54.13,"year":2020,"month":4,"day":13,"hour":0,"minute":0},{"load":38.69,"year":2020,"month":4,"day":14,"hour":0,"minute":0},{"load":33.34,"year":2020,"month":4,"day":15,"hour":0,"minute":0},{"load":44.67,"year":2020,"month":4,"day":16,"hour":0,"minute":0},{"load":17.46,"year":2020,"month":4,"day":17,"hour":0,"minute":0},{"load":39.25,"year":2020,"month":4,"day":18,"hour":0,"minute":0},{"load":49.73,"year":2020,"month":4,"day":19,"hour":0,"minute":0},{"load":57.52,"year":2020,"month":4,"day":20,"hour":0,"minute":0},{"load":47.97,"year":2020,"month":4,"day":21,"hour":0,"minute":0},{"load":36.41,"year":2020,"month":4,"day":22,"hour":0,"minute":0},{"load":37.39,"year":2020,"month":4,"day":23,"hour":0,"minute":0},{"load":26.73,"year":2020,"month":4,"day":24,"hour":0,"minute":0},{"load":17.99,"year":2020,"month":4,"day":25,"hour":0,"minute":0},{"load":48.2,"year":2020,"month":4,"day":26,"hour":0,"minute":0},{"load":21.47,"year":2020,"month":4,"day":27,"hour":0,"minute":0},{"load":38.01,"year":2020,"month":4,"day":28,"hour":0,"minute":0},{"load":25.59,"year":2020,"month":4,"day":29,"hour":0,"minute":0}],"io.grdf.month":[{"load":1347.74,"year":2020,"month":1,"day":0,"hour":0,"minute":0},{"load":1282.25,"year":2020,"month":2,"day":0,"hour":0,"minute":0},{"load":1279.74,"year":2020,"month":3,"day":0,"hour":0,"minute":0},{"load":1123.06,"year":2020,"month":4,"day":1,"hour":0,"minute":0}],"io.grdf.year":[{"load":5032.79,"year":2020,"month":1,"day":1,"hour":0,"minute":0}],"io.egl.day":[{"load":299.91,"year":2020,"month":1,"day":1,"hour":0,"minute":0},{"load":296.56,"year":2020,"month":1,"day":2,"hour":0,"minute":0},{"load":240.03,"year":2020,"month":1,"day":3,"hour":0,"minute":0},{"load":236.24,"year":2020,"month":1,"day":4,"hour":0,"minute":0},{"load":291.67,"year":2020,"month":1,"day":5,"hour":0,"minute":0},{"load":210.55,"year":2020,"month":1,"day":6,"hour":0,"minute":0},{"load":203.23,"year":2020,"month":1,"day":7,"hour":0,"minute":0},{"load":281.99,"year":2020,"month":1,"day":8,"hour":0,"minute":0},{"load":250.63,"year":2020,"month":1,"day":9,"hour":0,"minute":0},{"load":259.45,"year":2020,"month":1,"day":10,"hour":0,"minute":0},{"load":238.95,"year":2020,"month":1,"day":11,"hour":0,"minute":0},{"load":236.73,"year":2020,"month":1,"day":12,"hour":0,"minute":0},{"load":280.6,"year":2020,"month":1,"day":13,"hour":0,"minute":0},{"load":205.89,"year":2020,"month":1,"day":14,"hour":0,"minute":0},{"load":254.44,"year":2020,"month":1,"day":15,"hour":0,"minute":0},{"load":292.74,"year":2020,"month":1,"day":16,"hour":0,"minute":0},{"load":296,"year":2020,"month":1,"day":17,"hour":0,"minute":0},{"load":288.7,"year":2020,"month":1,"day":18,"hour":0,"minute":0},{"load":223.4,"year":2020,"month":1,"day":19,"hour":0,"minute":0},{"load":211.4,"year":2020,"month":1,"day":20,"hour":0,"minute":0},{"load":271.46,"year":2020,"month":1,"day":21,"hour":0,"minute":0},{"load":211.2,"year":2020,"month":1,"day":22,"hour":0,"minute":0},{"load":235.32,"year":2020,"month":1,"day":23,"hour":0,"minute":0},{"load":232.02,"year":2020,"month":1,"day":24,"hour":0,"minute":0},{"load":259.27,"year":2020,"month":1,"day":25,"hour":0,"minute":0},{"load":243.77,"year":2020,"month":1,"day":26,"hour":0,"minute":0},{"load":256.47,"year":2020,"month":1,"day":27,"hour":0,"minute":0},{"load":228.03,"year":2020,"month":1,"day":28,"hour":0,"minute":0},{"load":267.64,"year":2020,"month":1,"day":29,"hour":0,"minute":0},{"load":259.33,"year":2020,"month":1,"day":30,"hour":0,"minute":0},{"load":276.25,"year":2020,"month":1,"day":31,"hour":0,"minute":0},{"load":210.73,"year":2020,"month":2,"day":1,"hour":0,"minute":0},{"load":287.85,"year":2020,"month":2,"day":2,"hour":0,"minute":0},{"load":210.99,"year":2020,"month":2,"day":3,"hour":0,"minute":0},{"load":208.92,"year":2020,"month":2,"day":4,"hour":0,"minute":0},{"load":295.65,"year":2020,"month":2,"day":5,"hour":0,"minute":0},{"load":296.67,"year":2020,"month":2,"day":6,"hour":0,"minute":0},{"load":264.52,"year":2020,"month":2,"day":7,"hour":0,"minute":0},{"load":299.73,"year":2020,"month":2,"day":8,"hour":0,"minute":0},{"load":258.76,"year":2020,"month":2,"day":9,"hour":0,"minute":0},{"load":275.98,"year":2020,"month":2,"day":10,"hour":0,"minute":0},{"load":239.97,"year":2020,"month":2,"day":11,"hour":0,"minute":0},{"load":205.36,"year":2020,"month":2,"day":12,"hour":0,"minute":0},{"load":207.2,"year":2020,"month":2,"day":13,"hour":0,"minute":0},{"load":291.79,"year":2020,"month":2,"day":14,"hour":0,"minute":0},{"load":222.06,"year":2020,"month":2,"day":15,"hour":0,"minute":0},{"load":288.42,"year":2020,"month":2,"day":16,"hour":0,"minute":0},{"load":231.57,"year":2020,"month":2,"day":17,"hour":0,"minute":0},{"load":234.53,"year":2020,"month":2,"day":18,"hour":0,"minute":0},{"load":233.43,"year":2020,"month":2,"day":19,"hour":0,"minute":0},{"load":267.26,"year":2020,"month":2,"day":20,"hour":0,"minute":0},{"load":299.93,"year":2020,"month":2,"day":21,"hour":0,"minute":0},{"load":297.36,"year":2020,"month":2,"day":22,"hour":0,"minute":0},{"load":241.96,"year":2020,"month":2,"day":23,"hour":0,"minute":0},{"load":220.85,"year":2020,"month":2,"day":24,"hour":0,"minute":0},{"load":278.39,"year":2020,"month":2,"day":25,"hour":0,"minute":0},{"load":260.37,"year":2020,"month":2,"day":26,"hour":0,"minute":0},{"load":267.83,"year":2020,"month":2,"day":27,"hour":0,"minute":0},{"load":281.76,"year":2020,"month":2,"day":28,"hour":0,"minute":0},{"load":247.64,"year":2020,"month":2,"day":29,"hour":0,"minute":0},{"load":271.26,"year":2020,"month":3,"day":1,"hour":0,"minute":0},{"load":219.47,"year":2020,"month":3,"day":2,"hour":0,"minute":0},{"load":202.65,"year":2020,"month":3,"day":3,"hour":0,"minute":0},{"load":280.34,"year":2020,"month":3,"day":4,"hour":0,"minute":0},{"load":280.48,"year":2020,"month":3,"day":5,"hour":0,"minute":0},{"load":294.57,"year":2020,"month":3,"day":6,"hour":0,"minute":0},{"load":230.79,"year":2020,"month":3,"day":7,"hour":0,"minute":0},{"load":295.34,"year":2020,"month":3,"day":8,"hour":0,"minute":0},{"load":283.26,"year":2020,"month":3,"day":9,"hour":0,"minute":0},{"load":283.79,"year":2020,"month":3,"day":10,"hour":0,"minute":0},{"load":251.3,"year":2020,"month":3,"day":11,"hour":0,"minute":0},{"load":297.2,"year":2020,"month":3,"day":12,"hour":0,"minute":0},{"load":226.87,"year":2020,"month":3,"day":13,"hour":0,"minute":0},{"load":214.02,"year":2020,"month":3,"day":14,"hour":0,"minute":0},{"load":269.95,"year":2020,"month":3,"day":15,"hour":0,"minute":0},{"load":235.28,"year":2020,"month":3,"day":16,"hour":0,"minute":0},{"load":251.1,"year":2020,"month":3,"day":17,"hour":0,"minute":0},{"load":296.24,"year":2020,"month":3,"day":18,"hour":0,"minute":0},{"load":296.49,"year":2020,"month":3,"day":19,"hour":0,"minute":0},{"load":252.83,"year":2020,"month":3,"day":20,"hour":0,"minute":0},{"load":283.27,"year":2020,"month":3,"day":21,"hour":0,"minute":0},{"load":216.5,"year":2020,"month":3,"day":22,"hour":0,"minute":0},{"load":213.42,"year":2020,"month":3,"day":23,"hour":0,"minute":0},{"load":224.05,"year":2020,"month":3,"day":24,"hour":0,"minute":0},{"load":214.4,"year":2020,"month":3,"day":25,"hour":0,"minute":0},{"load":239.42,"year":2020,"month":3,"day":26,"hour":0,"minute":0},{"load":252.32,"year":2020,"month":3,"day":27,"hour":0,"minute":0},{"load":222.37,"year":2020,"month":3,"day":28,"hour":0,"minute":0},{"load":222.35,"year":2020,"month":3,"day":29,"hour":0,"minute":0},{"load":261.47,"year":2020,"month":3,"day":30,"hour":0,"minute":0},{"load":220.18,"year":2020,"month":3,"day":31,"hour":0,"minute":0},{"load":258.52,"year":2020,"month":4,"day":1,"hour":0,"minute":0},{"load":257.72,"year":2020,"month":4,"day":2,"hour":0,"minute":0},{"load":230.25,"year":2020,"month":4,"day":3,"hour":0,"minute":0},{"load":229.2,"year":2020,"month":4,"day":4,"hour":0,"minute":0},{"load":294.61,"year":2020,"month":4,"day":5,"hour":0,"minute":0},{"load":211.77,"year":2020,"month":4,"day":6,"hour":0,"minute":0},{"load":281.43,"year":2020,"month":4,"day":7,"hour":0,"minute":0},{"load":226.14,"year":2020,"month":4,"day":8,"hour":0,"minute":0},{"load":233,"year":2020,"month":4,"day":9,"hour":0,"minute":0},{"load":260.06,"year":2020,"month":4,"day":10,"hour":0,"minute":0},{"load":266.91,"year":2020,"month":4,"day":11,"hour":0,"minute":0},{"load":285.71,"year":2020,"month":4,"day":12,"hour":0,"minute":0},{"load":245.52,"year":2020,"month":4,"day":13,"hour":0,"minute":0},{"load":225.5,"year":2020,"month":4,"day":14,"hour":0,"minute":0},{"load":213.33,"year":2020,"month":4,"day":15,"hour":0,"minute":0},{"load":294.27,"year":2020,"month":4,"day":16,"hour":0,"minute":0},{"load":260.93,"year":2020,"month":4,"day":17,"hour":0,"minute":0},{"load":269.84,"year":2020,"month":4,"day":18,"hour":0,"minute":0},{"load":269.08,"year":2020,"month":4,"day":19,"hour":0,"minute":0},{"load":254.89,"year":2020,"month":4,"day":20,"hour":0,"minute":0},{"load":221.99,"year":2020,"month":4,"day":21,"hour":0,"minute":0},{"load":237.89,"year":2020,"month":4,"day":22,"hour":0,"minute":0},{"load":205.67,"year":2020,"month":4,"day":23,"hour":0,"minute":0},{"load":238.43,"year":2020,"month":4,"day":24,"hour":0,"minute":0},{"load":263.61,"year":2020,"month":4,"day":25,"hour":0,"minute":0},{"load":200.89,"year":2020,"month":4,"day":26,"hour":0,"minute":0},{"load":296.27,"year":2020,"month":4,"day":27,"hour":0,"minute":0},{"load":210.59,"year":2020,"month":4,"day":28,"hour":0,"minute":0},{"load":251.88,"year":2020,"month":4,"day":29,"hour":0,"minute":0}],"io.egl.month":[{"load":8050.6,"year":2020,"month":1,"day":0,"hour":0,"minute":0},{"load":7488.01,"year":2020,"month":2,"day":0,"hour":0,"minute":0},{"load":7790.24,"year":2020,"month":3,"day":0,"hour":0,"minute":0},{"load":6937.38,"year":2020,"month":4,"day":1,"hour":0,"minute":0}],"io.egl.year":[{"load":30266.23,"year":2020,"month":1,"day":1,"hour":0,"minute":0}]}
\ No newline at end of file
+{"com.grandlyon.enedis.day":[{"load":5.25,"year":2020,"month":1,"day":1,"hour":0,"minute":0},{"load":3.76,"year":2020,"month":1,"day":2,"hour":0,"minute":0},{"load":8.03,"year":2020,"month":1,"day":3,"hour":0,"minute":0},{"load":5.32,"year":2020,"month":1,"day":4,"hour":0,"minute":0},{"load":8.72,"year":2020,"month":1,"day":5,"hour":0,"minute":0},{"load":8.17,"year":2020,"month":1,"day":6,"hour":0,"minute":0},{"load":6.08,"year":2020,"month":1,"day":7,"hour":0,"minute":0},{"load":4.06,"year":2020,"month":1,"day":8,"hour":0,"minute":0},{"load":4.82,"year":2020,"month":1,"day":9,"hour":0,"minute":0},{"load":7.5,"year":2020,"month":1,"day":10,"hour":0,"minute":0},{"load":6.21,"year":2020,"month":1,"day":11,"hour":0,"minute":0},{"load":4.63,"year":2020,"month":1,"day":12,"hour":0,"minute":0},{"load":4.32,"year":2020,"month":1,"day":13,"hour":0,"minute":0},{"load":8.79,"year":2020,"month":1,"day":14,"hour":0,"minute":0},{"load":7.88,"year":2020,"month":1,"day":15,"hour":0,"minute":0},{"load":4.1,"year":2020,"month":1,"day":16,"hour":0,"minute":0},{"load":5.09,"year":2020,"month":1,"day":17,"hour":0,"minute":0},{"load":8.58,"year":2020,"month":1,"day":18,"hour":0,"minute":0},{"load":9.97,"year":2020,"month":1,"day":19,"hour":0,"minute":0},{"load":6.68,"year":2020,"month":1,"day":20,"hour":0,"minute":0},{"load":9.13,"year":2020,"month":1,"day":21,"hour":0,"minute":0},{"load":4.77,"year":2020,"month":1,"day":22,"hour":0,"minute":0},{"load":3.6,"year":2020,"month":1,"day":23,"hour":0,"minute":0},{"load":8.33,"year":2020,"month":1,"day":24,"hour":0,"minute":0},{"load":3.42,"year":2020,"month":1,"day":25,"hour":0,"minute":0},{"load":8.46,"year":2020,"month":1,"day":26,"hour":0,"minute":0},{"load":5.85,"year":2020,"month":1,"day":27,"hour":0,"minute":0},{"load":3.01,"year":2020,"month":1,"day":28,"hour":0,"minute":0},{"load":8.06,"year":2020,"month":1,"day":29,"hour":0,"minute":0},{"load":6.39,"year":2020,"month":1,"day":30,"hour":0,"minute":0},{"load":6.9,"year":2020,"month":1,"day":31,"hour":0,"minute":0},{"load":3.9,"year":2020,"month":2,"day":1,"hour":0,"minute":0},{"load":8.07,"year":2020,"month":2,"day":2,"hour":0,"minute":0},{"load":9.85,"year":2020,"month":2,"day":3,"hour":0,"minute":0},{"load":7.23,"year":2020,"month":2,"day":4,"hour":0,"minute":0},{"load":6.05,"year":2020,"month":2,"day":5,"hour":0,"minute":0},{"load":8.02,"year":2020,"month":2,"day":6,"hour":0,"minute":0},{"load":8.45,"year":2020,"month":2,"day":7,"hour":0,"minute":0},{"load":7.01,"year":2020,"month":2,"day":8,"hour":0,"minute":0},{"load":6.36,"year":2020,"month":2,"day":9,"hour":0,"minute":0},{"load":3.07,"year":2020,"month":2,"day":10,"hour":0,"minute":0},{"load":4.03,"year":2020,"month":2,"day":11,"hour":0,"minute":0},{"load":7.2,"year":2020,"month":2,"day":12,"hour":0,"minute":0},{"load":3.66,"year":2020,"month":2,"day":13,"hour":0,"minute":0},{"load":8.3,"year":2020,"month":2,"day":14,"hour":0,"minute":0},{"load":5.93,"year":2020,"month":2,"day":15,"hour":0,"minute":0},{"load":9.08,"year":2020,"month":2,"day":16,"hour":0,"minute":0},{"load":5.32,"year":2020,"month":2,"day":17,"hour":0,"minute":0},{"load":4.72,"year":2020,"month":2,"day":18,"hour":0,"minute":0},{"load":6,"year":2020,"month":2,"day":19,"hour":0,"minute":0},{"load":7.73,"year":2020,"month":2,"day":20,"hour":0,"minute":0},{"load":3.59,"year":2020,"month":2,"day":21,"hour":0,"minute":0},{"load":7.75,"year":2020,"month":2,"day":22,"hour":0,"minute":0},{"load":5.37,"year":2020,"month":2,"day":23,"hour":0,"minute":0},{"load":8.33,"year":2020,"month":2,"day":24,"hour":0,"minute":0},{"load":9.02,"year":2020,"month":2,"day":25,"hour":0,"minute":0},{"load":5.19,"year":2020,"month":2,"day":26,"hour":0,"minute":0},{"load":6.75,"year":2020,"month":2,"day":27,"hour":0,"minute":0},{"load":5.49,"year":2020,"month":2,"day":28,"hour":0,"minute":0},{"load":8.13,"year":2020,"month":2,"day":29,"hour":0,"minute":0},{"load":7.68,"year":2020,"month":3,"day":1,"hour":0,"minute":0},{"load":5.47,"year":2020,"month":3,"day":2,"hour":0,"minute":0},{"load":4.37,"year":2020,"month":3,"day":3,"hour":0,"minute":0},{"load":8.85,"year":2020,"month":3,"day":4,"hour":0,"minute":0},{"load":9.68,"year":2020,"month":3,"day":5,"hour":0,"minute":0},{"load":8.61,"year":2020,"month":3,"day":6,"hour":0,"minute":0},{"load":6.27,"year":2020,"month":3,"day":7,"hour":0,"minute":0},{"load":8.06,"year":2020,"month":3,"day":8,"hour":0,"minute":0},{"load":9.96,"year":2020,"month":3,"day":9,"hour":0,"minute":0},{"load":9.91,"year":2020,"month":3,"day":10,"hour":0,"minute":0},{"load":5.55,"year":2020,"month":3,"day":11,"hour":0,"minute":0},{"load":6.27,"year":2020,"month":3,"day":12,"hour":0,"minute":0},{"load":9.86,"year":2020,"month":3,"day":13,"hour":0,"minute":0},{"load":8.55,"year":2020,"month":3,"day":14,"hour":0,"minute":0},{"load":3.36,"year":2020,"month":3,"day":15,"hour":0,"minute":0},{"load":7.22,"year":2020,"month":3,"day":16,"hour":0,"minute":0},{"load":7.82,"year":2020,"month":3,"day":17,"hour":0,"minute":0},{"load":5.28,"year":2020,"month":3,"day":18,"hour":0,"minute":0},{"load":5.82,"year":2020,"month":3,"day":19,"hour":0,"minute":0},{"load":4.65,"year":2020,"month":3,"day":20,"hour":0,"minute":0},{"load":5.52,"year":2020,"month":3,"day":21,"hour":0,"minute":0},{"load":6.94,"year":2020,"month":3,"day":22,"hour":0,"minute":0},{"load":4.58,"year":2020,"month":3,"day":23,"hour":0,"minute":0},{"load":6.12,"year":2020,"month":3,"day":24,"hour":0,"minute":0},{"load":6.24,"year":2020,"month":3,"day":25,"hour":0,"minute":0},{"load":5.14,"year":2020,"month":3,"day":26,"hour":0,"minute":0},{"load":7.43,"year":2020,"month":3,"day":27,"hour":0,"minute":0},{"load":8.71,"year":2020,"month":3,"day":28,"hour":0,"minute":0},{"load":4.07,"year":2020,"month":3,"day":29,"hour":0,"minute":0},{"load":6.7,"year":2020,"month":3,"day":30,"hour":0,"minute":0},{"load":5.08,"year":2020,"month":3,"day":31,"hour":0,"minute":0},{"load":4.72,"year":2020,"month":4,"day":1,"hour":0,"minute":0},{"load":3.11,"year":2020,"month":4,"day":2,"hour":0,"minute":0},{"load":9.82,"year":2020,"month":4,"day":3,"hour":0,"minute":0},{"load":8.12,"year":2020,"month":4,"day":4,"hour":0,"minute":0},{"load":3.04,"year":2020,"month":4,"day":5,"hour":0,"minute":0},{"load":6.59,"year":2020,"month":4,"day":6,"hour":0,"minute":0},{"load":4.94,"year":2020,"month":4,"day":7,"hour":0,"minute":0},{"load":5.26,"year":2020,"month":4,"day":8,"hour":0,"minute":0},{"load":4.45,"year":2020,"month":4,"day":9,"hour":0,"minute":0},{"load":8.01,"year":2020,"month":4,"day":10,"hour":0,"minute":0},{"load":8.93,"year":2020,"month":4,"day":11,"hour":0,"minute":0},{"load":7.82,"year":2020,"month":4,"day":12,"hour":0,"minute":0},{"load":4.13,"year":2020,"month":4,"day":13,"hour":0,"minute":0},{"load":6.43,"year":2020,"month":4,"day":14,"hour":0,"minute":0},{"load":5.82,"year":2020,"month":4,"day":15,"hour":0,"minute":0},{"load":5.44,"year":2020,"month":4,"day":16,"hour":0,"minute":0},{"load":9.53,"year":2020,"month":4,"day":17,"hour":0,"minute":0},{"load":7.29,"year":2020,"month":4,"day":18,"hour":0,"minute":0},{"load":3.61,"year":2020,"month":4,"day":19,"hour":0,"minute":0},{"load":3.04,"year":2020,"month":4,"day":20,"hour":0,"minute":0},{"load":7.83,"year":2020,"month":4,"day":21,"hour":0,"minute":0},{"load":3.21,"year":2020,"month":4,"day":22,"hour":0,"minute":0},{"load":3.76,"year":2020,"month":4,"day":23,"hour":0,"minute":0},{"load":9.21,"year":2020,"month":4,"day":24,"hour":0,"minute":0},{"load":5.85,"year":2020,"month":4,"day":25,"hour":0,"minute":0},{"load":7.79,"year":2020,"month":4,"day":26,"hour":0,"minute":0},{"load":6.8,"year":2020,"month":4,"day":27,"hour":0,"minute":0},{"load":3.89,"year":2020,"month":4,"day":28,"hour":0,"minute":0},{"load":7.34,"year":2020,"month":4,"day":29,"hour":0,"minute":0}],"com.grandlyon.enedis.month":[{"load":199.78,"year":2020,"month":1,"day":0,"hour":0,"minute":0},{"load":193.38,"year":2020,"month":2,"day":0,"hour":0,"minute":0},{"load":206.81,"year":2020,"month":3,"day":0,"hour":0,"minute":0},{"load":171.06,"year":2020,"month":4,"day":1,"hour":0,"minute":0}],"com.grandlyon.enedis.year":[{"load":771.03,"year":2020,"month":1,"day":1,"hour":0,"minute":0}],"com.grandlyon.grdf.day":[{"load":52.41,"year":2020,"month":1,"day":1,"hour":0,"minute":0},{"load":58.73,"year":2020,"month":1,"day":2,"hour":0,"minute":0},{"load":41.05,"year":2020,"month":1,"day":3,"hour":0,"minute":0},{"load":17.93,"year":2020,"month":1,"day":4,"hour":0,"minute":0},{"load":41.19,"year":2020,"month":1,"day":5,"hour":0,"minute":0},{"load":53.38,"year":2020,"month":1,"day":6,"hour":0,"minute":0},{"load":37.93,"year":2020,"month":1,"day":7,"hour":0,"minute":0},{"load":39.38,"year":2020,"month":1,"day":8,"hour":0,"minute":0},{"load":65.88,"year":2020,"month":1,"day":9,"hour":0,"minute":0},{"load":45.74,"year":2020,"month":1,"day":10,"hour":0,"minute":0},{"load":17.4,"year":2020,"month":1,"day":11,"hour":0,"minute":0},{"load":33.71,"year":2020,"month":1,"day":12,"hour":0,"minute":0},{"load":36.05,"year":2020,"month":1,"day":13,"hour":0,"minute":0},{"load":62.06,"year":2020,"month":1,"day":14,"hour":0,"minute":0},{"load":34.61,"year":2020,"month":1,"day":15,"hour":0,"minute":0},{"load":64.29,"year":2020,"month":1,"day":16,"hour":0,"minute":0},{"load":25.38,"year":2020,"month":1,"day":17,"hour":0,"minute":0},{"load":65.92,"year":2020,"month":1,"day":18,"hour":0,"minute":0},{"load":22.58,"year":2020,"month":1,"day":19,"hour":0,"minute":0},{"load":32.96,"year":2020,"month":1,"day":20,"hour":0,"minute":0},{"load":30.61,"year":2020,"month":1,"day":21,"hour":0,"minute":0},{"load":26.95,"year":2020,"month":1,"day":22,"hour":0,"minute":0},{"load":44.24,"year":2020,"month":1,"day":23,"hour":0,"minute":0},{"load":54.35,"year":2020,"month":1,"day":24,"hour":0,"minute":0},{"load":37.44,"year":2020,"month":1,"day":25,"hour":0,"minute":0},{"load":28.66,"year":2020,"month":1,"day":26,"hour":0,"minute":0},{"load":59.73,"year":2020,"month":1,"day":27,"hour":0,"minute":0},{"load":58.37,"year":2020,"month":1,"day":28,"hour":0,"minute":0},{"load":16.59,"year":2020,"month":1,"day":29,"hour":0,"minute":0},{"load":58.36,"year":2020,"month":1,"day":30,"hour":0,"minute":0},{"load":62.08,"year":2020,"month":1,"day":31,"hour":0,"minute":0},{"load":21.78,"year":2020,"month":2,"day":1,"hour":0,"minute":0},{"load":54.82,"year":2020,"month":2,"day":2,"hour":0,"minute":0},{"load":51.54,"year":2020,"month":2,"day":3,"hour":0,"minute":0},{"load":45.73,"year":2020,"month":2,"day":4,"hour":0,"minute":0},{"load":36.5,"year":2020,"month":2,"day":5,"hour":0,"minute":0},{"load":24.41,"year":2020,"month":2,"day":6,"hour":0,"minute":0},{"load":64.03,"year":2020,"month":2,"day":7,"hour":0,"minute":0},{"load":26.36,"year":2020,"month":2,"day":8,"hour":0,"minute":0},{"load":66.75,"year":2020,"month":2,"day":9,"hour":0,"minute":0},{"load":26.88,"year":2020,"month":2,"day":10,"hour":0,"minute":0},{"load":38.9,"year":2020,"month":2,"day":11,"hour":0,"minute":0},{"load":33.79,"year":2020,"month":2,"day":12,"hour":0,"minute":0},{"load":46.06,"year":2020,"month":2,"day":13,"hour":0,"minute":0},{"load":40.21,"year":2020,"month":2,"day":14,"hour":0,"minute":0},{"load":32.47,"year":2020,"month":2,"day":15,"hour":0,"minute":0},{"load":63.28,"year":2020,"month":2,"day":16,"hour":0,"minute":0},{"load":24.66,"year":2020,"month":2,"day":17,"hour":0,"minute":0},{"load":61.52,"year":2020,"month":2,"day":18,"hour":0,"minute":0},{"load":51.06,"year":2020,"month":2,"day":19,"hour":0,"minute":0},{"load":30.18,"year":2020,"month":2,"day":20,"hour":0,"minute":0},{"load":31.51,"year":2020,"month":2,"day":21,"hour":0,"minute":0},{"load":60.22,"year":2020,"month":2,"day":22,"hour":0,"minute":0},{"load":49.48,"year":2020,"month":2,"day":23,"hour":0,"minute":0},{"load":24.37,"year":2020,"month":2,"day":24,"hour":0,"minute":0},{"load":40.91,"year":2020,"month":2,"day":25,"hour":0,"minute":0},{"load":33.09,"year":2020,"month":2,"day":26,"hour":0,"minute":0},{"load":58.14,"year":2020,"month":2,"day":27,"hour":0,"minute":0},{"load":67.46,"year":2020,"month":2,"day":28,"hour":0,"minute":0},{"load":47.03,"year":2020,"month":2,"day":29,"hour":0,"minute":0},{"load":50.89,"year":2020,"month":3,"day":1,"hour":0,"minute":0},{"load":39.84,"year":2020,"month":3,"day":2,"hour":0,"minute":0},{"load":48.55,"year":2020,"month":3,"day":3,"hour":0,"minute":0},{"load":54.28,"year":2020,"month":3,"day":4,"hour":0,"minute":0},{"load":24.52,"year":2020,"month":3,"day":5,"hour":0,"minute":0},{"load":36.45,"year":2020,"month":3,"day":6,"hour":0,"minute":0},{"load":35.05,"year":2020,"month":3,"day":7,"hour":0,"minute":0},{"load":18.47,"year":2020,"month":3,"day":8,"hour":0,"minute":0},{"load":58.52,"year":2020,"month":3,"day":9,"hour":0,"minute":0},{"load":41.14,"year":2020,"month":3,"day":10,"hour":0,"minute":0},{"load":42.74,"year":2020,"month":3,"day":11,"hour":0,"minute":0},{"load":54.73,"year":2020,"month":3,"day":12,"hour":0,"minute":0},{"load":23.45,"year":2020,"month":3,"day":13,"hour":0,"minute":0},{"load":55.12,"year":2020,"month":3,"day":14,"hour":0,"minute":0},{"load":47.33,"year":2020,"month":3,"day":15,"hour":0,"minute":0},{"load":20.84,"year":2020,"month":3,"day":16,"hour":0,"minute":0},{"load":60.22,"year":2020,"month":3,"day":17,"hour":0,"minute":0},{"load":38.98,"year":2020,"month":3,"day":18,"hour":0,"minute":0},{"load":59.29,"year":2020,"month":3,"day":19,"hour":0,"minute":0},{"load":23.69,"year":2020,"month":3,"day":20,"hour":0,"minute":0},{"load":45.61,"year":2020,"month":3,"day":21,"hour":0,"minute":0},{"load":22.03,"year":2020,"month":3,"day":22,"hour":0,"minute":0},{"load":22.81,"year":2020,"month":3,"day":23,"hour":0,"minute":0},{"load":65.09,"year":2020,"month":3,"day":24,"hour":0,"minute":0},{"load":39.38,"year":2020,"month":3,"day":25,"hour":0,"minute":0},{"load":34.56,"year":2020,"month":3,"day":26,"hour":0,"minute":0},{"load":50.35,"year":2020,"month":3,"day":27,"hour":0,"minute":0},{"load":31.03,"year":2020,"month":3,"day":28,"hour":0,"minute":0},{"load":51.73,"year":2020,"month":3,"day":29,"hour":0,"minute":0},{"load":40.89,"year":2020,"month":3,"day":30,"hour":0,"minute":0},{"load":64.64,"year":2020,"month":3,"day":31,"hour":0,"minute":0},{"load":28.41,"year":2020,"month":4,"day":1,"hour":0,"minute":0},{"load":56.89,"year":2020,"month":4,"day":2,"hour":0,"minute":0},{"load":41.85,"year":2020,"month":4,"day":3,"hour":0,"minute":0},{"load":41.24,"year":2020,"month":4,"day":4,"hour":0,"minute":0},{"load":26.86,"year":2020,"month":4,"day":5,"hour":0,"minute":0},{"load":40.83,"year":2020,"month":4,"day":6,"hour":0,"minute":0},{"load":59.65,"year":2020,"month":4,"day":7,"hour":0,"minute":0},{"load":34.4,"year":2020,"month":4,"day":8,"hour":0,"minute":0},{"load":66.36,"year":2020,"month":4,"day":9,"hour":0,"minute":0},{"load":66.64,"year":2020,"month":4,"day":10,"hour":0,"minute":0},{"load":33.56,"year":2020,"month":4,"day":11,"hour":0,"minute":0},{"load":20.23,"year":2020,"month":4,"day":12,"hour":0,"minute":0},{"load":54.13,"year":2020,"month":4,"day":13,"hour":0,"minute":0},{"load":38.69,"year":2020,"month":4,"day":14,"hour":0,"minute":0},{"load":33.34,"year":2020,"month":4,"day":15,"hour":0,"minute":0},{"load":44.67,"year":2020,"month":4,"day":16,"hour":0,"minute":0},{"load":17.46,"year":2020,"month":4,"day":17,"hour":0,"minute":0},{"load":39.25,"year":2020,"month":4,"day":18,"hour":0,"minute":0},{"load":49.73,"year":2020,"month":4,"day":19,"hour":0,"minute":0},{"load":57.52,"year":2020,"month":4,"day":20,"hour":0,"minute":0},{"load":47.97,"year":2020,"month":4,"day":21,"hour":0,"minute":0},{"load":36.41,"year":2020,"month":4,"day":22,"hour":0,"minute":0},{"load":37.39,"year":2020,"month":4,"day":23,"hour":0,"minute":0},{"load":26.73,"year":2020,"month":4,"day":24,"hour":0,"minute":0},{"load":17.99,"year":2020,"month":4,"day":25,"hour":0,"minute":0},{"load":48.2,"year":2020,"month":4,"day":26,"hour":0,"minute":0},{"load":21.47,"year":2020,"month":4,"day":27,"hour":0,"minute":0},{"load":38.01,"year":2020,"month":4,"day":28,"hour":0,"minute":0},{"load":25.59,"year":2020,"month":4,"day":29,"hour":0,"minute":0}],"com.grandlyon.grdf.month":[{"load":1347.74,"year":2020,"month":1,"day":0,"hour":0,"minute":0},{"load":1282.25,"year":2020,"month":2,"day":0,"hour":0,"minute":0},{"load":1279.74,"year":2020,"month":3,"day":0,"hour":0,"minute":0},{"load":1123.06,"year":2020,"month":4,"day":1,"hour":0,"minute":0}],"com.grandlyon.grdf.year":[{"load":5032.79,"year":2020,"month":1,"day":1,"hour":0,"minute":0}],"com.grandlyon.egl.day":[{"load":299.91,"year":2020,"month":1,"day":1,"hour":0,"minute":0},{"load":296.56,"year":2020,"month":1,"day":2,"hour":0,"minute":0},{"load":240.03,"year":2020,"month":1,"day":3,"hour":0,"minute":0},{"load":236.24,"year":2020,"month":1,"day":4,"hour":0,"minute":0},{"load":291.67,"year":2020,"month":1,"day":5,"hour":0,"minute":0},{"load":210.55,"year":2020,"month":1,"day":6,"hour":0,"minute":0},{"load":203.23,"year":2020,"month":1,"day":7,"hour":0,"minute":0},{"load":281.99,"year":2020,"month":1,"day":8,"hour":0,"minute":0},{"load":250.63,"year":2020,"month":1,"day":9,"hour":0,"minute":0},{"load":259.45,"year":2020,"month":1,"day":10,"hour":0,"minute":0},{"load":238.95,"year":2020,"month":1,"day":11,"hour":0,"minute":0},{"load":236.73,"year":2020,"month":1,"day":12,"hour":0,"minute":0},{"load":280.6,"year":2020,"month":1,"day":13,"hour":0,"minute":0},{"load":205.89,"year":2020,"month":1,"day":14,"hour":0,"minute":0},{"load":254.44,"year":2020,"month":1,"day":15,"hour":0,"minute":0},{"load":292.74,"year":2020,"month":1,"day":16,"hour":0,"minute":0},{"load":296,"year":2020,"month":1,"day":17,"hour":0,"minute":0},{"load":288.7,"year":2020,"month":1,"day":18,"hour":0,"minute":0},{"load":223.4,"year":2020,"month":1,"day":19,"hour":0,"minute":0},{"load":211.4,"year":2020,"month":1,"day":20,"hour":0,"minute":0},{"load":271.46,"year":2020,"month":1,"day":21,"hour":0,"minute":0},{"load":211.2,"year":2020,"month":1,"day":22,"hour":0,"minute":0},{"load":235.32,"year":2020,"month":1,"day":23,"hour":0,"minute":0},{"load":232.02,"year":2020,"month":1,"day":24,"hour":0,"minute":0},{"load":259.27,"year":2020,"month":1,"day":25,"hour":0,"minute":0},{"load":243.77,"year":2020,"month":1,"day":26,"hour":0,"minute":0},{"load":256.47,"year":2020,"month":1,"day":27,"hour":0,"minute":0},{"load":228.03,"year":2020,"month":1,"day":28,"hour":0,"minute":0},{"load":267.64,"year":2020,"month":1,"day":29,"hour":0,"minute":0},{"load":259.33,"year":2020,"month":1,"day":30,"hour":0,"minute":0},{"load":276.25,"year":2020,"month":1,"day":31,"hour":0,"minute":0},{"load":210.73,"year":2020,"month":2,"day":1,"hour":0,"minute":0},{"load":287.85,"year":2020,"month":2,"day":2,"hour":0,"minute":0},{"load":210.99,"year":2020,"month":2,"day":3,"hour":0,"minute":0},{"load":208.92,"year":2020,"month":2,"day":4,"hour":0,"minute":0},{"load":295.65,"year":2020,"month":2,"day":5,"hour":0,"minute":0},{"load":296.67,"year":2020,"month":2,"day":6,"hour":0,"minute":0},{"load":264.52,"year":2020,"month":2,"day":7,"hour":0,"minute":0},{"load":299.73,"year":2020,"month":2,"day":8,"hour":0,"minute":0},{"load":258.76,"year":2020,"month":2,"day":9,"hour":0,"minute":0},{"load":275.98,"year":2020,"month":2,"day":10,"hour":0,"minute":0},{"load":239.97,"year":2020,"month":2,"day":11,"hour":0,"minute":0},{"load":205.36,"year":2020,"month":2,"day":12,"hour":0,"minute":0},{"load":207.2,"year":2020,"month":2,"day":13,"hour":0,"minute":0},{"load":291.79,"year":2020,"month":2,"day":14,"hour":0,"minute":0},{"load":222.06,"year":2020,"month":2,"day":15,"hour":0,"minute":0},{"load":288.42,"year":2020,"month":2,"day":16,"hour":0,"minute":0},{"load":231.57,"year":2020,"month":2,"day":17,"hour":0,"minute":0},{"load":234.53,"year":2020,"month":2,"day":18,"hour":0,"minute":0},{"load":233.43,"year":2020,"month":2,"day":19,"hour":0,"minute":0},{"load":267.26,"year":2020,"month":2,"day":20,"hour":0,"minute":0},{"load":299.93,"year":2020,"month":2,"day":21,"hour":0,"minute":0},{"load":297.36,"year":2020,"month":2,"day":22,"hour":0,"minute":0},{"load":241.96,"year":2020,"month":2,"day":23,"hour":0,"minute":0},{"load":220.85,"year":2020,"month":2,"day":24,"hour":0,"minute":0},{"load":278.39,"year":2020,"month":2,"day":25,"hour":0,"minute":0},{"load":260.37,"year":2020,"month":2,"day":26,"hour":0,"minute":0},{"load":267.83,"year":2020,"month":2,"day":27,"hour":0,"minute":0},{"load":281.76,"year":2020,"month":2,"day":28,"hour":0,"minute":0},{"load":247.64,"year":2020,"month":2,"day":29,"hour":0,"minute":0},{"load":271.26,"year":2020,"month":3,"day":1,"hour":0,"minute":0},{"load":219.47,"year":2020,"month":3,"day":2,"hour":0,"minute":0},{"load":202.65,"year":2020,"month":3,"day":3,"hour":0,"minute":0},{"load":280.34,"year":2020,"month":3,"day":4,"hour":0,"minute":0},{"load":280.48,"year":2020,"month":3,"day":5,"hour":0,"minute":0},{"load":294.57,"year":2020,"month":3,"day":6,"hour":0,"minute":0},{"load":230.79,"year":2020,"month":3,"day":7,"hour":0,"minute":0},{"load":295.34,"year":2020,"month":3,"day":8,"hour":0,"minute":0},{"load":283.26,"year":2020,"month":3,"day":9,"hour":0,"minute":0},{"load":283.79,"year":2020,"month":3,"day":10,"hour":0,"minute":0},{"load":251.3,"year":2020,"month":3,"day":11,"hour":0,"minute":0},{"load":297.2,"year":2020,"month":3,"day":12,"hour":0,"minute":0},{"load":226.87,"year":2020,"month":3,"day":13,"hour":0,"minute":0},{"load":214.02,"year":2020,"month":3,"day":14,"hour":0,"minute":0},{"load":269.95,"year":2020,"month":3,"day":15,"hour":0,"minute":0},{"load":235.28,"year":2020,"month":3,"day":16,"hour":0,"minute":0},{"load":251.1,"year":2020,"month":3,"day":17,"hour":0,"minute":0},{"load":296.24,"year":2020,"month":3,"day":18,"hour":0,"minute":0},{"load":296.49,"year":2020,"month":3,"day":19,"hour":0,"minute":0},{"load":252.83,"year":2020,"month":3,"day":20,"hour":0,"minute":0},{"load":283.27,"year":2020,"month":3,"day":21,"hour":0,"minute":0},{"load":216.5,"year":2020,"month":3,"day":22,"hour":0,"minute":0},{"load":213.42,"year":2020,"month":3,"day":23,"hour":0,"minute":0},{"load":224.05,"year":2020,"month":3,"day":24,"hour":0,"minute":0},{"load":214.4,"year":2020,"month":3,"day":25,"hour":0,"minute":0},{"load":239.42,"year":2020,"month":3,"day":26,"hour":0,"minute":0},{"load":252.32,"year":2020,"month":3,"day":27,"hour":0,"minute":0},{"load":222.37,"year":2020,"month":3,"day":28,"hour":0,"minute":0},{"load":222.35,"year":2020,"month":3,"day":29,"hour":0,"minute":0},{"load":261.47,"year":2020,"month":3,"day":30,"hour":0,"minute":0},{"load":220.18,"year":2020,"month":3,"day":31,"hour":0,"minute":0},{"load":258.52,"year":2020,"month":4,"day":1,"hour":0,"minute":0},{"load":257.72,"year":2020,"month":4,"day":2,"hour":0,"minute":0},{"load":230.25,"year":2020,"month":4,"day":3,"hour":0,"minute":0},{"load":229.2,"year":2020,"month":4,"day":4,"hour":0,"minute":0},{"load":294.61,"year":2020,"month":4,"day":5,"hour":0,"minute":0},{"load":211.77,"year":2020,"month":4,"day":6,"hour":0,"minute":0},{"load":281.43,"year":2020,"month":4,"day":7,"hour":0,"minute":0},{"load":226.14,"year":2020,"month":4,"day":8,"hour":0,"minute":0},{"load":233,"year":2020,"month":4,"day":9,"hour":0,"minute":0},{"load":260.06,"year":2020,"month":4,"day":10,"hour":0,"minute":0},{"load":266.91,"year":2020,"month":4,"day":11,"hour":0,"minute":0},{"load":285.71,"year":2020,"month":4,"day":12,"hour":0,"minute":0},{"load":245.52,"year":2020,"month":4,"day":13,"hour":0,"minute":0},{"load":225.5,"year":2020,"month":4,"day":14,"hour":0,"minute":0},{"load":213.33,"year":2020,"month":4,"day":15,"hour":0,"minute":0},{"load":294.27,"year":2020,"month":4,"day":16,"hour":0,"minute":0},{"load":260.93,"year":2020,"month":4,"day":17,"hour":0,"minute":0},{"load":269.84,"year":2020,"month":4,"day":18,"hour":0,"minute":0},{"load":269.08,"year":2020,"month":4,"day":19,"hour":0,"minute":0},{"load":254.89,"year":2020,"month":4,"day":20,"hour":0,"minute":0},{"load":221.99,"year":2020,"month":4,"day":21,"hour":0,"minute":0},{"load":237.89,"year":2020,"month":4,"day":22,"hour":0,"minute":0},{"load":205.67,"year":2020,"month":4,"day":23,"hour":0,"minute":0},{"load":238.43,"year":2020,"month":4,"day":24,"hour":0,"minute":0},{"load":263.61,"year":2020,"month":4,"day":25,"hour":0,"minute":0},{"load":200.89,"year":2020,"month":4,"day":26,"hour":0,"minute":0},{"load":296.27,"year":2020,"month":4,"day":27,"hour":0,"minute":0},{"load":210.59,"year":2020,"month":4,"day":28,"hour":0,"minute":0},{"load":251.88,"year":2020,"month":4,"day":29,"hour":0,"minute":0}],"com.grandlyon.egl.month":[{"load":8050.6,"year":2020,"month":1,"day":0,"hour":0,"minute":0},{"load":7488.01,"year":2020,"month":2,"day":0,"hour":0,"minute":0},{"load":7790.24,"year":2020,"month":3,"day":0,"hour":0,"minute":0},{"load":6937.38,"year":2020,"month":4,"day":1,"hour":0,"minute":0}],"com.grandlyon.egl.year":[{"load":30266.23,"year":2020,"month":1,"day":1,"hour":0,"minute":0}]}
\ No newline at end of file