diff --git a/src/components/ContentComponents/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx b/src/components/ContentComponents/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx index 96ada65e40ba07cc126cf9957d2f86288756780c..fcf15ef5827175ef6879579d082a2c42d07654c5 100644 --- a/src/components/ContentComponents/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx +++ b/src/components/ContentComponents/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx @@ -79,12 +79,15 @@ const DataloadConsumptionVisualizer = ({ <div className={`cv-load-value ${fluidStyle.toLowerCase()} chart-result`} > - {formatNumberValues(dataload.value)} + {multiFluid && fluidTypes.length === 1 + ? formatNumberValues( + ltcc.Convert(dataload.value, fluidTypes[0]) + ) + : formatNumberValues(dataload.value)} <span className="text-18-medium">{`${t( 'FLUID.' + fluidStyle + '.UNIT' )}`}</span> </div> - {!multiFluid ? ( <div className={`cv-euro ${fluidStyle.toLowerCase()} chart-fluid`} @@ -147,7 +150,9 @@ const DataloadConsumptionVisualizer = ({ icon={getPicto(fluidTypes[0])} size={22} /> - <div>{`${formatNumberValues(dataload.value)} €`}</div> + <div>{`${formatNumberValues( + ltcc.Convert(dataload.value, fluidTypes[0]) + )} €`}</div> </div> </NavLink> )} diff --git a/src/components/ContentComponents/EcogestureCard/EcogestureCard.tsx b/src/components/ContentComponents/EcogestureCard/EcogestureCard.tsx index f2a879782fdafbfbc3ec052f107d88bb9ec07b8d..f639613b2bec76aa67cf8927873848b392a648fa 100644 --- a/src/components/ContentComponents/EcogestureCard/EcogestureCard.tsx +++ b/src/components/ContentComponents/EcogestureCard/EcogestureCard.tsx @@ -56,15 +56,15 @@ const EcogestureCard: React.FC<EcogestureCardProps> = ({ ecogesture.unlocked ? 'ec-content-unlocked' : '' }`} > - {ecogesture.unlocked && ecogesture.iconName && ( - <div> + <div className="ec-content-icon"> + {ecogesture.unlocked && ecogesture.iconName && ( <Icon className="Icon" icon={getEcogestureIconSVG(ecogesture.iconName)} size={50} /> - </div> - )} + )} + </div> <div className="ec-content-short-name text-16-bold"> {ecogesture.shortName} </div> diff --git a/src/db/ecogestureData.json b/src/db/ecogestureData.json index 8cacae4a916b1c472943e9d7ee43b6b16aec7fe1..066087fc058ebe417639b2cbb91579b4b0d24b8a 100644 --- a/src/db/ecogestureData.json +++ b/src/db/ecogestureData.json @@ -153,7 +153,7 @@ "fluidTypes": [0], "pack": 4, "nwh": 3, - "iconName" : "" + "iconName" : "hibernation" }, { "_id": "0052", @@ -321,7 +321,7 @@ "fluidTypes": [0, 1], "pack": 3, "nwh": 2, - "iconName" : "" + "iconName" : "accelerateur" }, { "_id": "0072", diff --git a/src/services/challengeDataManagerService.ts b/src/services/challengeDataManagerService.ts index 1c22d6496a65031493ec2ae8159763fa4e8bdd0f..9550bafa189c4c0d8b22c364180f2d9ebf67039a 100644 --- a/src/services/challengeDataManagerService.ts +++ b/src/services/challengeDataManagerService.ts @@ -616,12 +616,12 @@ export default class ChallengeManager implements IChallengeManager { .find(USERCHALLENGE_DOCTYPE) .where({ state: { - $eq: ChallengeState.FINISHED, + $lte: ChallengeState.FINISHED, }, }) .include(relationShipsToInclude) ) - + console.log(ecogestures) if (ecogestures.data.length === 0) return null const unlocked = ecogestures.data.map( x => x.relationships.selectedEcogestures.data diff --git a/src/styles/components/_ecogesture.scss b/src/styles/components/_ecogesture.scss index 3d1ca1f2674825ab90f7d294e046942ff639d1a7..b5900788c3578ae130b1d2bff715184dc220bc91 100644 --- a/src/styles/components/_ecogesture.scss +++ b/src/styles/components/_ecogesture.scss @@ -31,7 +31,7 @@ } .ecogesture-list-item { width: 48%; - height: 7.45rem; + height: 8rem; margin: 1% 1%; } .ecogesture-list-item > button { @@ -59,7 +59,10 @@ padding: 0.4rem 0; } &.ec-content-challenge { - padding: 0.1rem 0; + padding: 0.5rem 0; + } + .ec-content-icon{ + min-height: 50px; } .ec-content-challenge-text { display: flex; @@ -69,7 +72,7 @@ .ec-content-short-name { display: flex; flex: 1; - align-items: flex-end; + align-items: center; text-align: center; } .ec-content-nwh { @@ -79,13 +82,13 @@ } } .cp-eg-1 { - height: 6.3rem; + height: 8rem; width: 100%; margin-right: 0.25rem; text-align: center; } .cp-eg-2 { - height: 6.3rem; + height: 8rem; width: 100%; margin-left: 0.25rem; text-align: center;