diff --git a/CHANGELOG.md b/CHANGELOG.md index fdc49012ef7846932913e7a861a16485c54745c8..d1277f8a49b616e456b258a03277413cbe4cef93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,20 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [2.7.2](https://forge.grandlyon.com/web-et-numerique/factory/llle_project/ecolyo/compare/v2.7.1...v2.7.2) (2023-11-30) + + +### Bug Fixes + +* **fluidsPrices:** correct argument for DateTime ([0285aaa](https://forge.grandlyon.com/web-et-numerique/factory/llle_project/ecolyo/commit/0285aaa4b9fc211c2901147c3ba5e20a08131b6e)) + +### [2.7.1](https://forge.grandlyon.com/web-et-numerique/factory/llle_project/ecolyo/compare/v2.7.0...v2.7.1) (2023-11-29) + + +### Bug Fixes + +* **duel:** card height ([a3db9cd](https://forge.grandlyon.com/web-et-numerique/factory/llle_project/ecolyo/commit/a3db9cd7da0a7f164dbad6444b0d826eb781ed7c)) + ## [2.7.0](https://forge.grandlyon.com/web-et-numerique/factory/llle_project/ecolyo/compare/v2.6.0...v2.7.0) (2023-11-29) diff --git a/manifest.webapp b/manifest.webapp index dfbb1ae27a3c1566cd6e47d2e8c58b55aaa271e6..bab84280f862fdf7ea1424e350fd26bf7555c25e 100644 --- a/manifest.webapp +++ b/manifest.webapp @@ -3,7 +3,7 @@ "slug": "ecolyo", "icon": "icon.svg", "categories": ["energy"], - "version": "2.7.0", + "version": "2.7.2", "licence": "AGPL-3.0", "editor": "Métropole de Lyon", "default_locale": "fr", diff --git a/package.json b/package.json index d8f47b78ff98f59b1feb564ba46919834f317bfd..b673860e1c4d66ea9d2670b67db9109a6b16fbca 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ecolyo", - "version": "2.7.0", + "version": "2.7.2", "engines": { "node": "16" }, diff --git a/src/components/Challenge/ChallengeCard/ChallengeCard.tsx b/src/components/Challenge/ChallengeCard/ChallengeCard.tsx index b8a5e91037a7e06959a4e983fbefdef8cae288ca..52248f325d94af0b9ab758de41b3a59d4c7426da 100644 --- a/src/components/Challenge/ChallengeCard/ChallengeCard.tsx +++ b/src/components/Challenge/ChallengeCard/ChallengeCard.tsx @@ -42,13 +42,14 @@ const ChallengeCard = ({ } return ( + // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions <div onClick={() => moveToSlide(index)} className={indexSlider === index ? 'slide active' : 'slide inactive'} style={{ minWidth: `${cardWidth}px`, maxWidth: `${cardWidth}px`, - height: `${cardHeight}px`, + minHeight: `${cardHeight}px`, }} > {renderCard(userChallenge)} diff --git a/src/components/Challenge/ChallengeCard/__snapshots__/ChallengeCard.spec.tsx.snap b/src/components/Challenge/ChallengeCard/__snapshots__/ChallengeCard.spec.tsx.snap index 457e831873e25c8b68b34837237b03bc42e06aca..f0c8b96afed6824c2a8027eb3f14d2aaae024c8c 100644 --- a/src/components/Challenge/ChallengeCard/__snapshots__/ChallengeCard.spec.tsx.snap +++ b/src/components/Challenge/ChallengeCard/__snapshots__/ChallengeCard.spec.tsx.snap @@ -4,7 +4,7 @@ exports[`ChallengeCard component should be rendered correctly 1`] = ` <div> <div class="slide active" - style="min-width: 200px; max-width: 200px; height: 400px;" + style="min-width: 200px; max-width: 200px; min-height: 400px;" > <div class="cardContent cardDone" diff --git a/src/components/Challenge/ChallengeCard/challengeCard.scss b/src/components/Challenge/ChallengeCard/challengeCard.scss index ac7c9ebca6f8563570e67e724fe3529ca81ba5e3..c9133b2d6c18afc284af86c5a472776b9e15fc6b 100644 --- a/src/components/Challenge/ChallengeCard/challengeCard.scss +++ b/src/components/Challenge/ChallengeCard/challengeCard.scss @@ -23,5 +23,6 @@ padding: 1rem; transition: all 300ms ease; border-radius: 4px; + flex: 1; } } diff --git a/src/targets/services/fluidsPrices.ts b/src/targets/services/fluidsPrices.ts index cd71bf29c611e5991c0b373624ecf8aa285252a7..32ad62df05c206c88c1ad0bb145b207b451dae1c 100644 --- a/src/targets/services/fluidsPrices.ts +++ b/src/targets/services/fluidsPrices.ts @@ -140,7 +140,11 @@ const aggregatePrices = async ( `Aggregation started for fluid: ${fluidType}, from ${firstDate} ` ) for (const timeStep of timeSteps) { - let aggregationDate = DateTime.fromObject(firstDate) + let aggregationDate = DateTime.fromObject({ + year: firstDate.year, + month: firstDate.month, + day: firstDate.day, + }) try { do { const timePeriod = await getTimePeriod(timeStep, aggregationDate)